[PATCH 00/17] Some more preparation for migration to long types.
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(-)
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/basetsd.h | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 329db66c8f0..6a6a3945205 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -165,6 +165,17 @@ static inline long HandleToLong(const void *h) return (long)(LONG_PTR)h; } +static inline unsigned long PtrToUlong(const void *p) +{ + return (unsigned long)(ULONG_PTR)p; +} + +static inline long PtrToLong(const void *p) +{ + return (long)(LONG_PTR)p; +} + + #else static inline unsigned HandleToULong(const void *h) @@ -177,26 +188,27 @@ static inline int HandleToLong(const void *h) return (int)(LONG_PTR)h; } -#endif /* !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) */ - -static inline void *ULongToHandle(ULONG32 ul) +static inline unsigned PtrToUlong(const void *p) { - return (void *)(ULONG_PTR)ul; + return (unsigned)(ULONG_PTR)p; } -static inline void *LongToHandle(LONG32 l) +static inline int PtrToLong(const void *p) { - return (void *)(LONG_PTR)l; + return (int)(LONG_PTR)p; } -static inline ULONG32 PtrToUlong(const void *p) + +#endif /* !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) */ + +static inline void *ULongToHandle(ULONG32 ul) { - return (ULONG32)(ULONG_PTR)p; + return (void *)(ULONG_PTR)ul; } -static inline LONG32 PtrToLong(const void *p) +static inline void *LongToHandle(LONG32 l) { - return (LONG32)(LONG_PTR)p; + return (void *)(LONG_PTR)l; } static inline UINT32 PtrToUint(const void *p)
as suggested by Nikolay Sivov Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/gdi32/dc.c | 6 +++--- dlls/gdi32/objects.c | 2 +- dlls/win32u/font.c | 6 +++--- dlls/win32u/painting.c | 6 +++--- dlls/win32u/wrappers.c | 2 +- include/ntgdi.h | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index ea8047a4285..d609185be76 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1438,7 +1438,7 @@ BOOL WINAPI Polygon( HDC hdc, const POINT *points, INT count ) if (is_meta_dc( hdc )) return METADC_Polygon( hdc, points, count ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_Polygon( dc_attr, points, count )) return FALSE; - return NtGdiPolyPolyDraw( hdc, points, (const UINT *)&count, 1, NtGdiPolyPolygon ); + return NtGdiPolyPolyDraw( hdc, points, (const ULONG *)&count, 1, NtGdiPolyPolygon ); } /********************************************************************** @@ -1453,7 +1453,7 @@ BOOL WINAPI PolyPolygon( HDC hdc, const POINT *points, const INT *counts, UINT p if (is_meta_dc( hdc )) return METADC_PolyPolygon( hdc, points, counts, polygons ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_PolyPolygon( dc_attr, points, counts, polygons )) return FALSE; - return NtGdiPolyPolyDraw( hdc, points, (const UINT *)counts, polygons, NtGdiPolyPolygon ); + return NtGdiPolyPolyDraw( hdc, points, (const ULONG *)counts, polygons, NtGdiPolyPolygon ); } /********************************************************************** @@ -1468,7 +1468,7 @@ BOOL WINAPI Polyline( HDC hdc, const POINT *points, INT count ) if (is_meta_dc( hdc )) return METADC_Polyline( hdc, points, count ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_Polyline( dc_attr, points, count )) return FALSE; - return NtGdiPolyPolyDraw( hdc, points, (const UINT *)&count, 1, NtGdiPolyPolyline ); + return NtGdiPolyPolyDraw( hdc, points, (const ULONG *)&count, 1, NtGdiPolyPolyline ); } /********************************************************************** diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 42d2c202e98..50240b7b29a 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -674,7 +674,7 @@ HRGN WINAPI ExtCreateRegion( const XFORM *xform, DWORD count, const RGNDATA *dat */ HRGN WINAPI CreatePolyPolygonRgn( const POINT *points, const INT *counts, INT count, INT mode ) { - ULONG ret = NtGdiPolyPolyDraw( ULongToHandle(mode), points, (const UINT *)counts, + ULONG ret = NtGdiPolyPolyDraw( ULongToHandle(mode), points, (const ULONG *)counts, count, NtGdiPolyPolygonRgn ); return ULongToHandle( ret ); } diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index e7d2c3a13e3..b8213ac9e6a 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -5248,7 +5248,7 @@ static void draw_glyph( DC *dc, INT origin_x, INT origin_y, const GLYPHMETRICS * dp_to_lp( dc, pts, count ); for (i = 0; i < count; i += 2) { - const UINT pts_count = 2; + const ULONG pts_count = 2; NtGdiPolyPolyDraw( dc->hSelf, pts + i, &pts_count, 1, NtGdiPolyPolyline ); } free( pts ); @@ -5745,7 +5745,7 @@ done: if (lf.lfUnderline) { - const UINT cnt = 5; + const ULONG cnt = 5; pts[0].x = x - (underlinePos + underlineWidth / 2) * sinEsc; pts[0].y = y - (underlinePos + underlineWidth / 2) * cosEsc; pts[1].x = x + width.x - (underlinePos + underlineWidth / 2) * sinEsc; @@ -5762,7 +5762,7 @@ done: if (lf.lfStrikeOut) { - const UINT cnt = 5; + const ULONG cnt = 5; pts[0].x = x - (strikeoutPos + strikeoutWidth / 2) * sinEsc; pts[0].y = y - (strikeoutPos + strikeoutWidth / 2) * cosEsc; pts[1].x = x + width.x - (strikeoutPos + strikeoutWidth / 2) * sinEsc; diff --git a/dlls/win32u/painting.c b/dlls/win32u/painting.c index 5a080bb5a0b..87871e23ff0 100644 --- a/dlls/win32u/painting.c +++ b/dlls/win32u/painting.c @@ -117,7 +117,7 @@ BOOL CDECL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) return ret; } -static BOOL polyline( HDC hdc, const POINT *points, UINT count ) +static BOOL polyline( HDC hdc, const POINT *points, ULONG count ) { return NtGdiPolyPolyDraw( hdc, points, &count, 1, NtGdiPolyPolyline ); } @@ -147,7 +147,7 @@ BOOL CDECL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) pts[0] = dc->attr->cur_pos; memcpy( pts + 1, points, sizeof(POINT) * count ); count++; - ret = NtGdiPolyPolyDraw( dev->hdc, pts, (UINT *)&count, 1, NtGdiPolyBezier ); + ret = NtGdiPolyPolyDraw( dev->hdc, pts, &count, 1, NtGdiPolyBezier ); free( pts ); } return ret; @@ -549,7 +549,7 @@ BOOL WINAPI NtGdiInvertRgn( HDC hdc, HRGN hrgn ) /********************************************************************** * NtGdiPolyPolyDraw (win32u.@) */ -ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts, +ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const ULONG *counts, DWORD count, UINT function ) { PHYSDEV physdev; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index fe56f5e0e3c..aaabf51a2f8 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -450,7 +450,7 @@ BOOL WINAPI NtGdiPolyDraw( HDC hdc, const POINT *points, const BYTE *types, DWOR return unix_funcs->pNtGdiPolyDraw( hdc, points, types, count ); } -ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts, +ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const ULONG *counts, DWORD count, UINT function ) { if (!unix_funcs) return 0; diff --git a/include/ntgdi.h b/include/ntgdi.h index 4ea5549c223..d8103e3f995 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -364,7 +364,7 @@ BOOL WINAPI NtGdiPlgBlt( HDC hdc, const POINT *point, HDC hdc_src, INT x_src INT width, INT height, HBITMAP mask, INT x_mask, INT y_mask, DWORD bk_color ); BOOL WINAPI NtGdiPolyDraw(HDC hdc, const POINT *points, const BYTE *types, DWORD count ); -ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts, +ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const ULONG *counts, DWORD count, UINT function ); BOOL WINAPI NtGdiPtInRegion( HRGN hrgn, INT x, INT y ); BOOL WINAPI NtGdiPtVisible( HDC hdc, INT x, INT y );
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- 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 +++++++++-------- 8 files changed, 35 insertions(+), 28 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 5f61f997a9b..56727f905f3 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -53,7 +53,7 @@ unsigned array_get_length(jsdisp_t *array) return array_from_jsdisp(array)->length; } -static HRESULT get_length(script_ctx_t *ctx, vdisp_t *vdisp, jsdisp_t **jsthis, DWORD *ret) +static HRESULT get_length(script_ctx_t *ctx, vdisp_t *vdisp, jsdisp_t **jsthis, UINT32 *ret) { ArrayInstance *array; jsval_t val; @@ -314,7 +314,7 @@ static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne jsval_t *r) { jsdisp_t *jsthis; - DWORD length; + UINT32 length; HRESULT hres; TRACE("\n"); @@ -346,7 +346,7 @@ static HRESULT Array_pop(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned { jsdisp_t *jsthis; jsval_t val; - DWORD length; + UINT32 length; HRESULT hres; TRACE("\n"); @@ -395,7 +395,7 @@ static HRESULT Array_push(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne jsval_t *r) { jsdisp_t *jsthis; - DWORD length = 0; + UINT32 length = 0; unsigned i; HRESULT hres; @@ -424,7 +424,7 @@ static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi jsval_t *r) { jsdisp_t *jsthis; - DWORD length, k, l; + UINT32 length, k, l; jsval_t v1, v2; HRESULT hres1, hres2; @@ -479,7 +479,7 @@ static HRESULT Array_shift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign jsval_t *r) { jsdisp_t *jsthis; - DWORD length = 0, i; + UINT32 length = 0, i; jsval_t v, ret; HRESULT hres; @@ -534,7 +534,7 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign { jsdisp_t *arr, *jsthis; DOUBLE range; - DWORD length, start, end, idx; + UINT32 length, start, end, idx; HRESULT hres; TRACE("\n"); @@ -656,7 +656,7 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne { jsdisp_t *jsthis, *cmp_func = NULL; jsval_t *vtab, **sorttab = NULL; - DWORD length; + UINT32 length; DWORD i; HRESULT hres = S_OK; @@ -800,7 +800,7 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - DWORD length, start=0, delete_cnt=0, i, add_args = 0; + UINT32 length, start=0, delete_cnt=0, i, add_args = 0; jsdisp_t *ret_array = NULL, *jsthis; jsval_t val; double d; @@ -1037,7 +1037,7 @@ static HRESULT Array_map(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned IDispatch *context_this = NULL, *callback; jsval_t callback_args[3], mapped_value; jsdisp_t *jsthis, *array; - DWORD length, k; + UINT32 length, k; HRESULT hres; TRACE("\n"); @@ -1100,7 +1100,7 @@ static HRESULT Array_reduce(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig jsval_t callback_args[4], acc, new_acc; BOOL have_value = FALSE; jsdisp_t *jsthis; - DWORD length, k; + UINT32 length, k; HRESULT hres; TRACE("\n"); @@ -1168,7 +1168,7 @@ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi { jsdisp_t *jsthis; WCHAR buf[14], *buf_end, *str; - DWORD i, length; + UINT32 i, length; jsval_t val; DISPID id; HRESULT hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 47b4e56e8e4..ae002fc56e8 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -147,7 +147,7 @@ static inline HRESULT stack_pop_int(script_ctx_t *ctx, INT *r) return to_int32(ctx, stack_pop(ctx), r); } -static inline HRESULT stack_pop_uint(script_ctx_t *ctx, DWORD *r) +static inline HRESULT stack_pop_uint(script_ctx_t *ctx, UINT32 *r) { return to_uint32(ctx, stack_pop(ctx), r); } @@ -2643,7 +2643,7 @@ static HRESULT interp_neg(script_ctx_t *ctx) /* ECMA-262 3rd Edition 11.7.1 */ static HRESULT interp_lshift(script_ctx_t *ctx) { - DWORD r; + UINT32 r; INT l; HRESULT hres; @@ -2661,7 +2661,7 @@ static HRESULT interp_lshift(script_ctx_t *ctx) /* ECMA-262 3rd Edition 11.7.2 */ static HRESULT interp_rshift(script_ctx_t *ctx) { - DWORD r; + UINT32 r; INT l; HRESULT hres; @@ -2679,7 +2679,7 @@ static HRESULT interp_rshift(script_ctx_t *ctx) /* ECMA-262 3rd Edition 11.7.3 */ static HRESULT interp_rshift2(script_ctx_t *ctx) { - DWORD r, l; + UINT32 r, l; HRESULT hres; hres = stack_pop_uint(ctx, &r); diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 3eef1aa2dd6..f24d53977bd 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -297,7 +297,7 @@ static HRESULT Function_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, unsigned *argc, jsval_t **ret) { jsval_t *argv, val; - DWORD length, i; + UINT32 length, i; HRESULT hres; hres = jsdisp_propget_name(arg_array, L"length", &val); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index c192ec7c216..8ca2ea938af 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -366,6 +366,7 @@ HRESULT to_boolean(jsval_t,BOOL*) DECLSPEC_HIDDEN; HRESULT to_number(script_ctx_t*,jsval_t,double*) DECLSPEC_HIDDEN; HRESULT to_integer(script_ctx_t*,jsval_t,double*) DECLSPEC_HIDDEN; HRESULT to_int32(script_ctx_t*,jsval_t,INT*) DECLSPEC_HIDDEN; +HRESULT to_long(script_ctx_t*,jsval_t,LONG*) DECLSPEC_HIDDEN; HRESULT to_uint32(script_ctx_t*,jsval_t,UINT32*) DECLSPEC_HIDDEN; HRESULT to_string(script_ctx_t*,jsval_t,jsstr_t**) DECLSPEC_HIDDEN; HRESULT to_flat_string(script_ctx_t*,jsval_t,jsstr_t**,const WCHAR**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index cb6c051176f..0dc4aa1806c 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -642,7 +642,7 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg, jsdisp_t **ret) { - unsigned flags = 0; + DWORD flags = 0; const WCHAR *opt = NULL; jsstr_t *src; HRESULT hres = S_OK; @@ -695,7 +695,7 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *jsstr, jsv { RegExpInstance *regexp = regexp_from_jsdisp(re); match_result_t *match_result; - unsigned match_cnt, i; + DWORD match_cnt, i; const WCHAR *str; jsdisp_t *array; HRESULT hres; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 3c3cd012490..d3a41facc6c 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -706,6 +706,11 @@ HRESULT to_int32(script_ctx_t *ctx, jsval_t v, INT *ret) return S_OK; } +HRESULT to_long(script_ctx_t *ctx, jsval_t v, LONG *ret) +{ + return to_int32(ctx, v, (INT*)ret); +} + /* ECMA-262 3rd Edition 9.6 */ HRESULT to_uint32(script_ctx_t *ctx, jsval_t val, UINT32 *ret) { diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 5958216b861..cca14cbbb95 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1596,7 +1596,7 @@ static HRESULT StringConstr_fromCharCode(script_ctx_t *ctx, vdisp_t *jsthis, WOR unsigned argc, jsval_t *argv, jsval_t *r) { WCHAR *ret_str; - DWORD i, code; + UINT32 i, code; jsstr_t *ret; HRESULT hres; diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 41faa20ed79..74b9a29fc9c 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -63,7 +63,8 @@ static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, un jsval_t *r) { VBArrayInstance *vbarray; - int i, *indexes; + unsigned i; + LONG *indexes; VARIANT out; HRESULT hres; @@ -76,12 +77,12 @@ static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, un if(argc < SafeArrayGetDim(vbarray->safearray)) return JS_E_SUBSCRIPT_OUT_OF_RANGE; - indexes = heap_alloc(sizeof(int)*argc); + indexes = heap_alloc(sizeof(indexes[0])*argc); if(!indexes) return E_OUTOFMEMORY; for(i=0; i<argc; i++) { - hres = to_int32(ctx, argv[i], indexes+i); + hres = to_long(ctx, argv[i], indexes + i); if(FAILED(hres)) { heap_free(indexes); return hres; @@ -106,7 +107,7 @@ static HRESULT VBArray_lbound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, uns jsval_t *r) { VBArrayInstance *vbarray; - int dim; + LONG dim; HRESULT hres; TRACE("\n"); @@ -116,7 +117,7 @@ static HRESULT VBArray_lbound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, uns return JS_E_VBARRAY_EXPECTED; if(argc) { - hres = to_int32(ctx, argv[0], &dim); + hres = to_long(ctx, argv[0], &dim); if(FAILED(hres)) return hres; } else @@ -140,7 +141,7 @@ static HRESULT VBArray_toArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, un jsdisp_t *array; jsval_t val; VARIANT *v; - int i, size = 1, ubound, lbound; + LONG i, size = 1, ubound, lbound; HRESULT hres; TRACE("\n"); @@ -192,7 +193,7 @@ static HRESULT VBArray_ubound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, uns jsval_t *r) { VBArrayInstance *vbarray; - int dim; + LONG dim; HRESULT hres; TRACE("\n"); @@ -202,7 +203,7 @@ static HRESULT VBArray_ubound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, uns return JS_E_VBARRAY_EXPECTED; if(argc) { - hres = to_int32(ctx, argv[0], &dim); + hres = to_long(ctx, argv[0], &dim); if(FAILED(hres)) return hres; } else
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/concrt140/details.c | 2 +- dlls/msvcp90/details.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/concrt140/details.c b/dlls/concrt140/details.c index 13a2fbbca96..59345c52871 100644 --- a/dlls/concrt140/details.c +++ b/dlls/concrt140/details.c @@ -434,7 +434,7 @@ typedef struct compact_block /* Return the integer base-2 logarithm of (x|1). Result is 0 for x == 0. */ static inline unsigned int log2i(unsigned int x) { - unsigned int index; + ULONG index; BitScanReverse(&index, x|1); return index; } diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index d2969516af4..6b54ea9597f 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -448,7 +448,7 @@ typedef struct compact_block /* Return the integer base-2 logarithm of (x|1). Result is 0 for x == 0. */ static inline unsigned int log2i(unsigned int x) { - unsigned int index; + ULONG index; BitScanReverse(&index, x|1); return index; }
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- 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 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 2fff4d444b2..450bc8efe51 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -945,7 +945,7 @@ static HRESULT invoke_disp_value(DispatchEx *This, IDispatch *func_disp, LCID lc hres = IDispatchEx_InvokeEx(dispex, DISPID_VALUE, lcid, flags, &new_dp, res, ei, caller); IDispatchEx_Release(dispex); }else { - ULONG err = 0; + UINT err = 0; hres = IDispatch_Invoke(func_disp, DISPID_VALUE, &IID_NULL, lcid, flags, &new_dp, res, ei, &err); } if(SUCCEEDED(hres)) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 7ed1dfd2adc..50ca4cbb168 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1198,7 +1198,7 @@ static HRESULT WINAPI DOMUIEvent_get_view(IDOMUIEvent *iface, IHTMLWindow2 **p) static HRESULT WINAPI DOMUIEvent_get_detail(IDOMUIEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMUIEvent(iface); - INT32 detail; + LONG detail; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -1314,7 +1314,7 @@ static HRESULT WINAPI DOMMouseEvent_Invoke(IDOMMouseEvent *iface, DISPID dispIdM static HRESULT WINAPI DOMMouseEvent_get_screenX(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - INT32 screen_x; + LONG screen_x; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -1330,7 +1330,7 @@ static HRESULT WINAPI DOMMouseEvent_get_screenX(IDOMMouseEvent *iface, LONG *p) static HRESULT WINAPI DOMMouseEvent_get_screenY(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - INT32 screen_y; + LONG screen_y; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -1346,7 +1346,7 @@ static HRESULT WINAPI DOMMouseEvent_get_screenY(IDOMMouseEvent *iface, LONG *p) static HRESULT WINAPI DOMMouseEvent_get_clientX(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - INT32 client_x; + LONG client_x; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -1362,7 +1362,7 @@ static HRESULT WINAPI DOMMouseEvent_get_clientX(IDOMMouseEvent *iface, LONG *p) static HRESULT WINAPI DOMMouseEvent_get_clientY(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - INT32 client_y; + LONG client_y; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -1653,7 +1653,7 @@ static HRESULT WINAPI DOMMouseEvent_get_offsetY(IDOMMouseEvent *iface, LONG *p) static HRESULT WINAPI DOMMouseEvent_get_pageX(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - INT32 r; + LONG r; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -1669,7 +1669,7 @@ static HRESULT WINAPI DOMMouseEvent_get_pageX(IDOMMouseEvent *iface, LONG *p) static HRESULT WINAPI DOMMouseEvent_get_pageY(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - INT32 r; + LONG r; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -2375,7 +2375,7 @@ static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, IHTMLEventObj *event { DISPPARAMS dp = {NULL,NULL,0,0}; VARIANT event_arg; - ULONG argerr; + UINT argerr; EXCEPINFO ei; TRACE("%p,%d,%p,%p\n", disp, dispid, event_obj, retv); diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index e9b53dadb92..c0f6db8dd3b 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1245,7 +1245,7 @@ static HRESULT WINAPI HTMLInputTextElement2_put_selectionStart(IHTMLInputTextEle static HRESULT WINAPI HTMLInputTextElement2_get_selectionStart(IHTMLInputTextElement2 *iface, LONG *p) { HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - INT32 selection_start; + LONG selection_start; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -1278,7 +1278,7 @@ static HRESULT WINAPI HTMLInputTextElement2_put_selectionEnd(IHTMLInputTextEleme static HRESULT WINAPI HTMLInputTextElement2_get_selectionEnd(IHTMLInputTextElement2 *iface, LONG *p) { HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - INT32 selection_end; + LONG selection_end; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 23ab7195aca..9918174fa41 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -107,7 +107,7 @@ static ULONG WINAPI HTMLDOMChildrenCollectionEnum_Release(IEnumVARIANT *iface) static ULONG get_enum_len(HTMLDOMChildrenCollectionEnum *This) { - ULONG len; + UINT32 len; nsresult nsres; nsres = nsIDOMNodeList_GetLength(This->col->nslist, &len); diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index b2c10f725bb..9400ee043b6 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -792,7 +792,7 @@ static HRESULT WINAPI HTMLSelectElement_put_size(IHTMLSelectElement *iface, LONG static HRESULT WINAPI HTMLSelectElement_get_size(IHTMLSelectElement *iface, LONG *p) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - DWORD val; + UINT32 val; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 389552c3088..5aa2351f5f0 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2428,7 +2428,7 @@ static HRESULT WINAPI HTMLWindow7_get_performance(IHTMLWindow7 *iface, VARIANT * static HRESULT WINAPI HTMLWindow7_get_innerWidth(IHTMLWindow7 *iface, LONG *p) { HTMLWindow *This = impl_from_IHTMLWindow7(iface); - INT32 ret; + LONG ret; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -2446,7 +2446,7 @@ static HRESULT WINAPI HTMLWindow7_get_innerWidth(IHTMLWindow7 *iface, LONG *p) static HRESULT WINAPI HTMLWindow7_get_innerHeight(IHTMLWindow7 *iface, LONG *p) { HTMLWindow *This = impl_from_IHTMLWindow7(iface); - INT32 ret; + LONG ret; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -2465,7 +2465,7 @@ static HRESULT WINAPI HTMLWindow7_get_pageXOffset(IHTMLWindow7 *iface, LONG *p) { HTMLWindow *This = impl_from_IHTMLWindow7(iface); nsresult nsres; - INT32 ret; + LONG ret; TRACE("(%p)->(%p)\n", This, p); @@ -2483,7 +2483,7 @@ static HRESULT WINAPI HTMLWindow7_get_pageYOffset(IHTMLWindow7 *iface, LONG *p) { HTMLWindow *This = impl_from_IHTMLWindow7(iface); nsresult nsres; - INT32 ret; + LONG ret; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index ad67db5548c..b6a2c57479c 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -378,7 +378,7 @@ static BOOL check_script_safety(PluginHost *host) DWORD policy_size, policy; struct CONFIRMSAFETY cs; BYTE *ppolicy; - ULONG err = 0; + UINT err = 0; VARIANT v; HRESULT hres; @@ -412,7 +412,7 @@ static void update_readystate(PluginHost *host) DISPPARAMS params = {NULL,NULL,0,0}; IDispatchEx *dispex; IDispatch *disp; - ULONG err = 0; + UINT err = 0; VARIANT v; HRESULT hres; @@ -643,7 +643,7 @@ static void notif_enabled(PluginHost *plugin_host) { DISPPARAMS args = {NULL, NULL, 0, 0}; IDispatch *disp; - ULONG err = 0; + UINT err = 0; VARIANT res; HRESULT hres; diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index bea5ac6b371..375f76de40c 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -1389,7 +1389,7 @@ static HRESULT WINAPI HTMLTxtRange_setEndPoint(IHTMLTxtRange *iface, BSTR how, HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); HTMLTxtRange *src_range; nsIDOMNode *ref_node; - INT32 ref_offset; + LONG ref_offset; BOOL set_start; int how_type; INT16 cmp; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 4cd47acd107..cd8ba65b5b8 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -395,7 +395,7 @@ static HRESULT WINAPI HTMLXMLHttpRequest_get_responseXML(IHTMLXMLHttpRequest *if static HRESULT WINAPI HTMLXMLHttpRequest_get_status(IHTMLXMLHttpRequest *iface, LONG *p) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - DWORD val; + UINT32 val; nsresult nsres; TRACE("(%p)->(%p)\n", This, p);
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
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); }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/oleaut32/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 7dcc8d815a3..2a453a1f0e0 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9890,7 +9890,7 @@ static DWORD WMSFT_compile_typeinfo_aux(ITypeInfoImpl *info, ++memid; } - name = (UINT*)memid; + name = (DWORD*)memid; for(i = 0; i < info->typeattr.cFuncs; ++i){ TLBFuncDesc *desc = &info->funcdescs[i]; if(desc->Name)
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/oledb32/convert.c | 2 +- dlls/oledb32/datainit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 81483dc0a09..9bd93b6ca66 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -313,7 +313,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_I4: { - signed int *d = dst; + LONG *d = dst; switch(src_type) { case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index ec26d0a11ee..08bc60bce92 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -677,7 +677,7 @@ HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID if (*datasource && prov) { DBPROPIDSET propidset; - enum DBPROPENUM prop; + DWORD prop; CLSID initprov; ULONG count;
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;
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=106706 Your paranoid android. === debian11 (build log) === error: patch failed: include/basetsd.h:165 error: patch failed: dlls/gdi32/dc.c:1438 error: patch failed: dlls/gdi32/objects.c:674 error: patch failed: dlls/win32u/font.c:5248 error: patch failed: dlls/win32u/painting.c:117 error: patch failed: dlls/win32u/wrappers.c:450 error: patch failed: include/ntgdi.h:364 error: patch failed: dlls/jscript/array.c:53 error: patch failed: dlls/jscript/engine.c:147 error: patch failed: dlls/jscript/function.c:297 error: patch failed: dlls/jscript/jscript.h:366 error: patch failed: dlls/jscript/jsregexp.c:642 error: patch failed: dlls/jscript/jsutils.c:706 error: patch failed: dlls/jscript/string.c:1596 error: patch failed: dlls/jscript/vbarray.c:63 error: patch failed: dlls/concrt140/details.c:434 error: patch failed: dlls/msvcp90/details.c:448 error: patch failed: dlls/mshtml/dispex.c:945 error: patch failed: dlls/mshtml/htmlevent.c:1198 error: patch failed: dlls/mshtml/htmlinput.c:1245 error: patch failed: dlls/mshtml/htmlnode.c:107 error: patch failed: dlls/mshtml/htmlselect.c:792 error: patch failed: dlls/mshtml/htmlwindow.c:2428 error: patch failed: dlls/mshtml/pluginhost.c:378 error: patch failed: dlls/mshtml/range.c:1389 error: patch failed: dlls/mshtml/xmlhttprequest.c:395 error: patch failed: dlls/oleaut32/typelib.c:9890 error: patch failed: dlls/oledb32/convert.c:313 error: patch failed: dlls/oledb32/datainit.c:677 Task: Patch failed to apply === debian11 (build log) === error: patch failed: include/basetsd.h:165 error: patch failed: dlls/gdi32/dc.c:1438 error: patch failed: dlls/gdi32/objects.c:674 error: patch failed: dlls/win32u/font.c:5248 error: patch failed: dlls/win32u/painting.c:117 error: patch failed: dlls/win32u/wrappers.c:450 error: patch failed: include/ntgdi.h:364 error: patch failed: dlls/jscript/array.c:53 error: patch failed: dlls/jscript/engine.c:147 error: patch failed: dlls/jscript/function.c:297 error: patch failed: dlls/jscript/jscript.h:366 error: patch failed: dlls/jscript/jsregexp.c:642 error: patch failed: dlls/jscript/jsutils.c:706 error: patch failed: dlls/jscript/string.c:1596 error: patch failed: dlls/jscript/vbarray.c:63 error: patch failed: dlls/concrt140/details.c:434 error: patch failed: dlls/msvcp90/details.c:448 error: patch failed: dlls/mshtml/dispex.c:945 error: patch failed: dlls/mshtml/htmlevent.c:1198 error: patch failed: dlls/mshtml/htmlinput.c:1245 error: patch failed: dlls/mshtml/htmlnode.c:107 error: patch failed: dlls/mshtml/htmlselect.c:792 error: patch failed: dlls/mshtml/htmlwindow.c:2428 error: patch failed: dlls/mshtml/pluginhost.c:378 error: patch failed: dlls/mshtml/range.c:1389 error: patch failed: dlls/mshtml/xmlhttprequest.c:395 error: patch failed: dlls/oleaut32/typelib.c:9890 error: patch failed: dlls/oledb32/convert.c:313 error: patch failed: dlls/oledb32/datainit.c:677 Task: Patch failed to apply
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 {
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=106707 Your paranoid android. === debian11 (build log) === error: patch failed: include/basetsd.h:165 error: patch failed: dlls/gdi32/dc.c:1438 error: patch failed: dlls/gdi32/objects.c:674 error: patch failed: dlls/win32u/font.c:5248 error: patch failed: dlls/win32u/painting.c:117 error: patch failed: dlls/win32u/wrappers.c:450 error: patch failed: include/ntgdi.h:364 error: patch failed: dlls/jscript/array.c:53 error: patch failed: dlls/jscript/engine.c:147 error: patch failed: dlls/jscript/function.c:297 error: patch failed: dlls/jscript/jscript.h:366 error: patch failed: dlls/jscript/jsregexp.c:642 error: patch failed: dlls/jscript/jsutils.c:706 error: patch failed: dlls/jscript/string.c:1596 error: patch failed: dlls/jscript/vbarray.c:63 error: patch failed: dlls/concrt140/details.c:434 error: patch failed: dlls/msvcp90/details.c:448 error: patch failed: dlls/mshtml/dispex.c:945 error: patch failed: dlls/mshtml/htmlevent.c:1198 error: patch failed: dlls/mshtml/htmlinput.c:1245 error: patch failed: dlls/mshtml/htmlnode.c:107 error: patch failed: dlls/mshtml/htmlselect.c:792 error: patch failed: dlls/mshtml/htmlwindow.c:2428 error: patch failed: dlls/mshtml/pluginhost.c:378 error: patch failed: dlls/mshtml/range.c:1389 error: patch failed: dlls/mshtml/xmlhttprequest.c:395 error: patch failed: dlls/oleaut32/typelib.c:9890 error: patch failed: dlls/oledb32/convert.c:313 error: patch failed: dlls/oledb32/datainit.c:677 Task: Patch failed to apply === debian11 (build log) === error: patch failed: include/basetsd.h:165 error: patch failed: dlls/gdi32/dc.c:1438 error: patch failed: dlls/gdi32/objects.c:674 error: patch failed: dlls/win32u/font.c:5248 error: patch failed: dlls/win32u/painting.c:117 error: patch failed: dlls/win32u/wrappers.c:450 error: patch failed: include/ntgdi.h:364 error: patch failed: dlls/jscript/array.c:53 error: patch failed: dlls/jscript/engine.c:147 error: patch failed: dlls/jscript/function.c:297 error: patch failed: dlls/jscript/jscript.h:366 error: patch failed: dlls/jscript/jsregexp.c:642 error: patch failed: dlls/jscript/jsutils.c:706 error: patch failed: dlls/jscript/string.c:1596 error: patch failed: dlls/jscript/vbarray.c:63 error: patch failed: dlls/concrt140/details.c:434 error: patch failed: dlls/msvcp90/details.c:448 error: patch failed: dlls/mshtml/dispex.c:945 error: patch failed: dlls/mshtml/htmlevent.c:1198 error: patch failed: dlls/mshtml/htmlinput.c:1245 error: patch failed: dlls/mshtml/htmlnode.c:107 error: patch failed: dlls/mshtml/htmlselect.c:792 error: patch failed: dlls/mshtml/htmlwindow.c:2428 error: patch failed: dlls/mshtml/pluginhost.c:378 error: patch failed: dlls/mshtml/range.c:1389 error: patch failed: dlls/mshtml/xmlhttprequest.c:395 error: patch failed: dlls/oleaut32/typelib.c:9890 error: patch failed: dlls/oledb32/convert.c:313 error: patch failed: dlls/oledb32/datainit.c:677 Task: Patch failed to apply
On Tue, Feb 01, 2022 at 02:05:45PM +0100, Eric Pouech wrote:
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;
Please avoid PLONG, PULONG, etc. Also, please format the commit message correctly (no leading "dlls/" or "programs/", and a capital letter after the ':') - take a look a what Alexandre actually commits. I've sent in v2 of this patch and the ole32 one. Thanks, Huw.
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/comdlg32/colordlg.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index d5254736b24..1d459dd2d87 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -340,7 +340,7 @@ static BOOL CC_MouseCheckColorGraph( HWND hDlg, int dlgitem, int *hori, int *ver HWND hwnd; POINT point; RECT rect; - long x,y; + int x,y; CONV_LPARAMTOPOINT(lParam, &point); ClientToScreen(hDlg, &point); @@ -353,10 +353,8 @@ static BOOL CC_MouseCheckColorGraph( HWND hDlg, int dlgitem, int *hori, int *ver GetClientRect(hwnd, &rect); ScreenToClient(hwnd, &point); - x = (long) point.x * MAXHORI; - x /= rect.right; - y = (long) (rect.bottom - point.y) * MAXVERT; - y /= rect.bottom; + x = (point.x * MAXHORI) / rect.right; + y = ((rect.bottom - point.y) * MAXVERT) / rect.bottom; if (x < 0) x = 0; if (y < 0) y = 0; @@ -398,7 +396,6 @@ static BOOL CC_MouseCheckResultWindow( HWND hDlg, LPARAM lParam ) static int CC_CheckDigitsInEdit( HWND hwnd, int maxval ) { int i, k, m, result, value; - long editpos; char buffer[30]; GetWindowTextA(hwnd, buffer, ARRAY_SIZE(buffer)); @@ -425,7 +422,7 @@ static int CC_CheckDigitsInEdit( HWND hwnd, int maxval ) } if (result) { - editpos = SendMessageA(hwnd, EM_GETSEL, 0, 0); + LRESULT editpos = SendMessageA(hwnd, EM_GETSEL, 0, 0); SetWindowTextA(hwnd, buffer ); SendMessageA(hwnd, EM_SETSEL, 0, editpos); } @@ -465,7 +462,7 @@ static void CC_PaintSelectedColor(const CCPRIV *infoPtr) static void CC_PaintTriangle(CCPRIV *infoPtr) { HDC hDC; - long temp; + int temp; int w = LOWORD(GetDialogBaseUnits()) / 2; POINT points[3]; int height; @@ -485,9 +482,9 @@ static void CC_PaintTriangle(CCPRIV *infoPtr) ScreenToClient(infoPtr->hwndSelf, points); /* |< | */ oben = points[0].y; /* | \ | */ /* | \| */ - temp = (long)height * (long)infoPtr->l; + temp = height * infoPtr->l; points[0].x += 1; - points[0].y = oben + height - temp / (long)MAXVERT; + points[0].y = oben + height - temp / MAXVERT; points[1].y = points[0].y + w; points[2].y = points[0].y - w; points[2].x = points[1].x = points[0].x + w; @@ -536,8 +533,8 @@ static void CC_PaintCross(CCPRIV *infoPtr) SelectClipRgn(hDC, region); DeleteObject(region); - point.x = ((long)rect.right * (long)x) / (long)MAXHORI; - point.y = rect.bottom - ((long)rect.bottom * (long)y) / (long)MAXVERT; + point.x = (rect.right * x) / MAXHORI; + point.y = rect.bottom - (rect.bottom * y) / MAXVERT; if ( infoPtr->oldcross.left != infoPtr->oldcross.right ) BitBlt(hDC, infoPtr->oldcross.left, infoPtr->oldcross.top, infoPtr->oldcross.right - infoPtr->oldcross.left,
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=106708 Your paranoid android. === debian11 (build log) === error: patch failed: include/basetsd.h:165 error: patch failed: dlls/gdi32/dc.c:1438 error: patch failed: dlls/gdi32/objects.c:674 error: patch failed: dlls/win32u/font.c:5248 error: patch failed: dlls/win32u/painting.c:117 error: patch failed: dlls/win32u/wrappers.c:450 error: patch failed: include/ntgdi.h:364 error: patch failed: dlls/jscript/array.c:53 error: patch failed: dlls/jscript/engine.c:147 error: patch failed: dlls/jscript/function.c:297 error: patch failed: dlls/jscript/jscript.h:366 error: patch failed: dlls/jscript/jsregexp.c:642 error: patch failed: dlls/jscript/jsutils.c:706 error: patch failed: dlls/jscript/string.c:1596 error: patch failed: dlls/jscript/vbarray.c:63 error: patch failed: dlls/concrt140/details.c:434 error: patch failed: dlls/msvcp90/details.c:448 error: patch failed: dlls/mshtml/dispex.c:945 error: patch failed: dlls/mshtml/htmlevent.c:1198 error: patch failed: dlls/mshtml/htmlinput.c:1245 error: patch failed: dlls/mshtml/htmlnode.c:107 error: patch failed: dlls/mshtml/htmlselect.c:792 error: patch failed: dlls/mshtml/htmlwindow.c:2428 error: patch failed: dlls/mshtml/pluginhost.c:378 error: patch failed: dlls/mshtml/range.c:1389 error: patch failed: dlls/mshtml/xmlhttprequest.c:395 error: patch failed: dlls/oleaut32/typelib.c:9890 error: patch failed: dlls/oledb32/convert.c:313 error: patch failed: dlls/oledb32/datainit.c:677 error: patch failed: dlls/comdlg32/colordlg.c:340 Task: Patch failed to apply === debian11 (build log) === error: patch failed: include/basetsd.h:165 error: patch failed: dlls/gdi32/dc.c:1438 error: patch failed: dlls/gdi32/objects.c:674 error: patch failed: dlls/win32u/font.c:5248 error: patch failed: dlls/win32u/painting.c:117 error: patch failed: dlls/win32u/wrappers.c:450 error: patch failed: include/ntgdi.h:364 error: patch failed: dlls/jscript/array.c:53 error: patch failed: dlls/jscript/engine.c:147 error: patch failed: dlls/jscript/function.c:297 error: patch failed: dlls/jscript/jscript.h:366 error: patch failed: dlls/jscript/jsregexp.c:642 error: patch failed: dlls/jscript/jsutils.c:706 error: patch failed: dlls/jscript/string.c:1596 error: patch failed: dlls/jscript/vbarray.c:63 error: patch failed: dlls/concrt140/details.c:434 error: patch failed: dlls/msvcp90/details.c:448 error: patch failed: dlls/mshtml/dispex.c:945 error: patch failed: dlls/mshtml/htmlevent.c:1198 error: patch failed: dlls/mshtml/htmlinput.c:1245 error: patch failed: dlls/mshtml/htmlnode.c:107 error: patch failed: dlls/mshtml/htmlselect.c:792 error: patch failed: dlls/mshtml/htmlwindow.c:2428 error: patch failed: dlls/mshtml/pluginhost.c:378 error: patch failed: dlls/mshtml/range.c:1389 error: patch failed: dlls/mshtml/xmlhttprequest.c:395 error: patch failed: dlls/oleaut32/typelib.c:9890 error: patch failed: dlls/oledb32/convert.c:313 error: patch failed: dlls/oledb32/datainit.c:677 error: patch failed: dlls/comdlg32/colordlg.c:340 Task: Patch failed to apply
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernelbase/debug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 45bb6c019e9..74709bef89a 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -461,13 +461,13 @@ static BOOL start_debugger( EXCEPTION_POINTERS *epointers, HANDLE event ) { size_t format_size = lstrlenW( format ) + 2*20; cmdline = HeapAlloc( GetProcessHeap(), 0, format_size * sizeof(WCHAR) ); - swprintf( cmdline, format_size, format, (long)GetCurrentProcessId(), (long)HandleToLong(event) ); + swprintf( cmdline, format_size, format, GetCurrentProcessId(), HandleToLong(event) ); HeapFree( GetProcessHeap(), 0, format ); } else { cmdline = HeapAlloc( GetProcessHeap(), 0, 80 * sizeof(WCHAR) ); - swprintf( cmdline, 80, L"winedbg --auto %ld %ld", (long)GetCurrentProcessId(), (long)HandleToLong(event) ); + swprintf( cmdline, 80, L"winedbg --auto %ld %ld", GetCurrentProcessId(), HandleToLong(event) ); } if (!autostart)
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=106709 Your paranoid android. === debian11 (build log) === error: patch failed: include/basetsd.h:165 error: patch failed: dlls/gdi32/dc.c:1438 error: patch failed: dlls/gdi32/objects.c:674 error: patch failed: dlls/win32u/font.c:5248 error: patch failed: dlls/win32u/painting.c:117 error: patch failed: dlls/win32u/wrappers.c:450 error: patch failed: include/ntgdi.h:364 error: patch failed: dlls/jscript/array.c:53 error: patch failed: dlls/jscript/engine.c:147 error: patch failed: dlls/jscript/function.c:297 error: patch failed: dlls/jscript/jscript.h:366 error: patch failed: dlls/jscript/jsregexp.c:642 error: patch failed: dlls/jscript/jsutils.c:706 error: patch failed: dlls/jscript/string.c:1596 error: patch failed: dlls/jscript/vbarray.c:63 error: patch failed: dlls/concrt140/details.c:434 error: patch failed: dlls/msvcp90/details.c:448 error: patch failed: dlls/mshtml/dispex.c:945 error: patch failed: dlls/mshtml/htmlevent.c:1198 error: patch failed: dlls/mshtml/htmlinput.c:1245 error: patch failed: dlls/mshtml/htmlnode.c:107 error: patch failed: dlls/mshtml/htmlselect.c:792 error: patch failed: dlls/mshtml/htmlwindow.c:2428 error: patch failed: dlls/mshtml/pluginhost.c:378 error: patch failed: dlls/mshtml/range.c:1389 error: patch failed: dlls/mshtml/xmlhttprequest.c:395 error: patch failed: dlls/oleaut32/typelib.c:9890 error: patch failed: dlls/oledb32/convert.c:313 error: patch failed: dlls/oledb32/datainit.c:677 error: patch failed: dlls/comdlg32/colordlg.c:340 error: patch failed: dlls/kernelbase/debug.c:461 Task: Patch failed to apply === debian11 (build log) === error: patch failed: include/basetsd.h:165 error: patch failed: dlls/gdi32/dc.c:1438 error: patch failed: dlls/gdi32/objects.c:674 error: patch failed: dlls/win32u/font.c:5248 error: patch failed: dlls/win32u/painting.c:117 error: patch failed: dlls/win32u/wrappers.c:450 error: patch failed: include/ntgdi.h:364 error: patch failed: dlls/jscript/array.c:53 error: patch failed: dlls/jscript/engine.c:147 error: patch failed: dlls/jscript/function.c:297 error: patch failed: dlls/jscript/jscript.h:366 error: patch failed: dlls/jscript/jsregexp.c:642 error: patch failed: dlls/jscript/jsutils.c:706 error: patch failed: dlls/jscript/string.c:1596 error: patch failed: dlls/jscript/vbarray.c:63 error: patch failed: dlls/concrt140/details.c:434 error: patch failed: dlls/msvcp90/details.c:448 error: patch failed: dlls/mshtml/dispex.c:945 error: patch failed: dlls/mshtml/htmlevent.c:1198 error: patch failed: dlls/mshtml/htmlinput.c:1245 error: patch failed: dlls/mshtml/htmlnode.c:107 error: patch failed: dlls/mshtml/htmlselect.c:792 error: patch failed: dlls/mshtml/htmlwindow.c:2428 error: patch failed: dlls/mshtml/pluginhost.c:378 error: patch failed: dlls/mshtml/range.c:1389 error: patch failed: dlls/mshtml/xmlhttprequest.c:395 error: patch failed: dlls/oleaut32/typelib.c:9890 error: patch failed: dlls/oledb32/convert.c:313 error: patch failed: dlls/oledb32/datainit.c:677 error: patch failed: dlls/comdlg32/colordlg.c:340 error: patch failed: dlls/kernelbase/debug.c:461 Task: Patch failed to apply
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mciseq/mcimidi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 33f9fde42c7..f1a262e178c 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -179,7 +179,7 @@ static DWORD MIDI_mciReadByte(WINE_MCIMIDI* wmm, BYTE *lpbyt) { DWORD ret = 0; - if (mmioRead(wmm->hFile, (HPSTR)lpbyt, sizeof(BYTE)) != (long)sizeof(BYTE)) { + if (mmioRead(wmm->hFile, (HPSTR)lpbyt, sizeof(BYTE)) != sizeof(BYTE)) { WARN("Error reading wmm=%p\n", wmm); ret = MCIERR_INVALID_FILE; } @@ -319,8 +319,7 @@ static DWORD MIDI_mciReadMTrk(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt) DWORD toberead; FOURCC fourcc; - if (mmioRead(wmm->hFile, (HPSTR)&fourcc, (long)sizeof(FOURCC)) != - (long)sizeof(FOURCC)) { + if (mmioRead(wmm->hFile, (HPSTR)&fourcc, sizeof(FOURCC)) != sizeof(FOURCC)) { return MCIERR_INVALID_FILE; } @@ -413,8 +412,7 @@ static DWORD MIDI_mciReadMThd(WINE_MCIMIDI* wmm, DWORD dwOffset) WARN("Can't seek at %08X begin of 'MThd'\n", dwOffset); return MCIERR_INVALID_FILE; } - if (mmioRead(wmm->hFile, (HPSTR)&fourcc, - (long) sizeof(FOURCC)) != (long) sizeof(FOURCC)) + if (mmioRead(wmm->hFile, (HPSTR)&fourcc, sizeof(FOURCC)) != sizeof(FOURCC)) return MCIERR_INVALID_FILE; if (fourcc != mmioFOURCC('M', 'T', 'h', 'd')) {
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=106710 Your paranoid android. === debian11 (build log) === error: patch failed: include/basetsd.h:165 error: patch failed: dlls/gdi32/dc.c:1438 error: patch failed: dlls/gdi32/objects.c:674 error: patch failed: dlls/win32u/font.c:5248 error: patch failed: dlls/win32u/painting.c:117 error: patch failed: dlls/win32u/wrappers.c:450 error: patch failed: include/ntgdi.h:364 error: patch failed: dlls/jscript/array.c:53 error: patch failed: dlls/jscript/engine.c:147 error: patch failed: dlls/jscript/function.c:297 error: patch failed: dlls/jscript/jscript.h:366 error: patch failed: dlls/jscript/jsregexp.c:642 error: patch failed: dlls/jscript/jsutils.c:706 error: patch failed: dlls/jscript/string.c:1596 error: patch failed: dlls/jscript/vbarray.c:63 error: patch failed: dlls/concrt140/details.c:434 error: patch failed: dlls/msvcp90/details.c:448 error: patch failed: dlls/mshtml/dispex.c:945 error: patch failed: dlls/mshtml/htmlevent.c:1198 error: patch failed: dlls/mshtml/htmlinput.c:1245 error: patch failed: dlls/mshtml/htmlnode.c:107 error: patch failed: dlls/mshtml/htmlselect.c:792 error: patch failed: dlls/mshtml/htmlwindow.c:2428 error: patch failed: dlls/mshtml/pluginhost.c:378 error: patch failed: dlls/mshtml/range.c:1389 error: patch failed: dlls/mshtml/xmlhttprequest.c:395 error: patch failed: dlls/oleaut32/typelib.c:9890 error: patch failed: dlls/oledb32/convert.c:313 error: patch failed: dlls/oledb32/datainit.c:677 error: patch failed: dlls/comdlg32/colordlg.c:340 error: patch failed: dlls/kernelbase/debug.c:461 error: patch failed: dlls/mciseq/mcimidi.c:179 Task: Patch failed to apply === debian11 (build log) === error: patch failed: include/basetsd.h:165 error: patch failed: dlls/gdi32/dc.c:1438 error: patch failed: dlls/gdi32/objects.c:674 error: patch failed: dlls/win32u/font.c:5248 error: patch failed: dlls/win32u/painting.c:117 error: patch failed: dlls/win32u/wrappers.c:450 error: patch failed: include/ntgdi.h:364 error: patch failed: dlls/jscript/array.c:53 error: patch failed: dlls/jscript/engine.c:147 error: patch failed: dlls/jscript/function.c:297 error: patch failed: dlls/jscript/jscript.h:366 error: patch failed: dlls/jscript/jsregexp.c:642 error: patch failed: dlls/jscript/jsutils.c:706 error: patch failed: dlls/jscript/string.c:1596 error: patch failed: dlls/jscript/vbarray.c:63 error: patch failed: dlls/concrt140/details.c:434 error: patch failed: dlls/msvcp90/details.c:448 error: patch failed: dlls/mshtml/dispex.c:945 error: patch failed: dlls/mshtml/htmlevent.c:1198 error: patch failed: dlls/mshtml/htmlinput.c:1245 error: patch failed: dlls/mshtml/htmlnode.c:107 error: patch failed: dlls/mshtml/htmlselect.c:792 error: patch failed: dlls/mshtml/htmlwindow.c:2428 error: patch failed: dlls/mshtml/pluginhost.c:378 error: patch failed: dlls/mshtml/range.c:1389 error: patch failed: dlls/mshtml/xmlhttprequest.c:395 error: patch failed: dlls/oleaut32/typelib.c:9890 error: patch failed: dlls/oledb32/convert.c:313 error: patch failed: dlls/oledb32/datainit.c:677 error: patch failed: dlls/comdlg32/colordlg.c:340 error: patch failed: dlls/kernelbase/debug.c:461 error: patch failed: dlls/mciseq/mcimidi.c:179 Task: Patch failed to apply
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. */
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=106711 Your paranoid android. === debian11 (build log) === error: patch failed: include/basetsd.h:165 error: patch failed: dlls/gdi32/dc.c:1438 error: patch failed: dlls/gdi32/objects.c:674 error: patch failed: dlls/win32u/font.c:5248 error: patch failed: dlls/win32u/painting.c:117 error: patch failed: dlls/win32u/wrappers.c:450 error: patch failed: include/ntgdi.h:364 error: patch failed: dlls/jscript/array.c:53 error: patch failed: dlls/jscript/engine.c:147 error: patch failed: dlls/jscript/function.c:297 error: patch failed: dlls/jscript/jscript.h:366 error: patch failed: dlls/jscript/jsregexp.c:642 error: patch failed: dlls/jscript/jsutils.c:706 error: patch failed: dlls/jscript/string.c:1596 error: patch failed: dlls/jscript/vbarray.c:63 error: patch failed: dlls/concrt140/details.c:434 error: patch failed: dlls/msvcp90/details.c:448 error: patch failed: dlls/mshtml/dispex.c:945 error: patch failed: dlls/mshtml/htmlevent.c:1198 error: patch failed: dlls/mshtml/htmlinput.c:1245 error: patch failed: dlls/mshtml/htmlnode.c:107 error: patch failed: dlls/mshtml/htmlselect.c:792 error: patch failed: dlls/mshtml/htmlwindow.c:2428 error: patch failed: dlls/mshtml/pluginhost.c:378 error: patch failed: dlls/mshtml/range.c:1389 error: patch failed: dlls/mshtml/xmlhttprequest.c:395 error: patch failed: dlls/oleaut32/typelib.c:9890 error: patch failed: dlls/oledb32/convert.c:313 error: patch failed: dlls/oledb32/datainit.c:677 error: patch failed: dlls/comdlg32/colordlg.c:340 error: patch failed: dlls/kernelbase/debug.c:461 error: patch failed: dlls/mciseq/mcimidi.c:179 Task: Patch failed to apply === debian11 (build log) === error: patch failed: include/basetsd.h:165 error: patch failed: dlls/gdi32/dc.c:1438 error: patch failed: dlls/gdi32/objects.c:674 error: patch failed: dlls/win32u/font.c:5248 error: patch failed: dlls/win32u/painting.c:117 error: patch failed: dlls/win32u/wrappers.c:450 error: patch failed: include/ntgdi.h:364 error: patch failed: dlls/jscript/array.c:53 error: patch failed: dlls/jscript/engine.c:147 error: patch failed: dlls/jscript/function.c:297 error: patch failed: dlls/jscript/jscript.h:366 error: patch failed: dlls/jscript/jsregexp.c:642 error: patch failed: dlls/jscript/jsutils.c:706 error: patch failed: dlls/jscript/string.c:1596 error: patch failed: dlls/jscript/vbarray.c:63 error: patch failed: dlls/concrt140/details.c:434 error: patch failed: dlls/msvcp90/details.c:448 error: patch failed: dlls/mshtml/dispex.c:945 error: patch failed: dlls/mshtml/htmlevent.c:1198 error: patch failed: dlls/mshtml/htmlinput.c:1245 error: patch failed: dlls/mshtml/htmlnode.c:107 error: patch failed: dlls/mshtml/htmlselect.c:792 error: patch failed: dlls/mshtml/htmlwindow.c:2428 error: patch failed: dlls/mshtml/pluginhost.c:378 error: patch failed: dlls/mshtml/range.c:1389 error: patch failed: dlls/mshtml/xmlhttprequest.c:395 error: patch failed: dlls/oleaut32/typelib.c:9890 error: patch failed: dlls/oledb32/convert.c:313 error: patch failed: dlls/oledb32/datainit.c:677 error: patch failed: dlls/comdlg32/colordlg.c:340 error: patch failed: dlls/kernelbase/debug.c:461 error: patch failed: dlls/mciseq/mcimidi.c:179 Task: Patch failed to apply
Signed-off-by: Esme Povirk <esme(a)codeweavers.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/bcrypt/bcrypt_internal.h | 22 +++++++++++----------- dlls/bcrypt/gnutls.c | 14 +++++++------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index c0a53f9068b..6d115e10e54 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -155,7 +155,7 @@ struct algorithm struct object hdr; enum alg_id id; enum mode_id mode; - ULONG flags; + unsigned flags; }; struct key_symmetric @@ -165,7 +165,7 @@ struct key_symmetric UCHAR *vector; ULONG vector_len; UCHAR *secret; - ULONG secret_len; + unsigned secret_len; CRITICAL_SECTION cs; }; @@ -174,9 +174,9 @@ struct key_symmetric struct key_asymmetric { ULONG bitlen; /* ignored for ECC keys */ - ULONG flags; + unsigned flags; UCHAR *pubkey; - ULONG pubkey_len; + unsigned pubkey_len; DSSSEED dss_seed; }; @@ -208,7 +208,7 @@ struct key_symmetric_encrypt_params { struct key *key; const UCHAR *input; - ULONG input_len; + unsigned input_len; UCHAR *output; ULONG output_len; }; @@ -217,7 +217,7 @@ struct key_symmetric_decrypt_params { struct key *key; const UCHAR *input; - ULONG input_len; + unsigned input_len; UCHAR *output; ULONG output_len; }; @@ -233,7 +233,7 @@ struct key_asymmetric_decrypt_params { struct key *key; UCHAR *input; - ULONG input_len; + unsigned input_len; UCHAR *output; ULONG output_len; ULONG *ret_len; @@ -250,11 +250,11 @@ struct key_asymmetric_sign_params struct key *key; void *padding; UCHAR *input; - ULONG input_len; + unsigned input_len; UCHAR *output; ULONG output_len; ULONG *ret_len; - ULONG flags; + unsigned flags; }; struct key_asymmetric_verify_params @@ -262,10 +262,10 @@ struct key_asymmetric_verify_params struct key *key; void *padding; UCHAR *hash; - ULONG hash_len; + unsigned hash_len; UCHAR *signature; ULONG signature_len; - ULONG flags; + unsigned flags; }; struct key_export_params diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 26da55ee758..56479197bf5 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -610,7 +610,7 @@ static ULONG export_gnutls_datum( UCHAR *buffer, ULONG buflen, gnutls_datum_t *d } #define EXPORT_SIZE(d,f,p) export_gnutls_datum( NULL, bitlen / f, &d, p ) -static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, ULONG *pubkey_len ) +static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, unsigned *pubkey_len ) { BCRYPT_RSAKEY_BLOB *rsa_blob = pubkey; gnutls_datum_t m, e; @@ -649,7 +649,7 @@ static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bit } static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_id alg_id, void *pubkey, - ULONG *pubkey_len ) + unsigned *pubkey_len ) { BCRYPT_ECCKEY_BLOB *ecc_blob = pubkey; gnutls_ecc_curve_t curve; @@ -709,7 +709,7 @@ static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_ return STATUS_SUCCESS; } -static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, ULONG *pubkey_len ) +static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, unsigned *pubkey_len ) { BCRYPT_DSA_KEY_BLOB *dsa_blob = pubkey; gnutls_datum_t p, q, g, y; @@ -773,8 +773,8 @@ static void reverse_bytes( UCHAR *buf, ULONG len ) } #define Q_SIZE 20 -static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, const DSSSEED *seed, ULONG bitlen, - void *pubkey, ULONG *pubkey_len ) +static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, const DSSSEED *seed, unsigned bitlen, + void *pubkey, unsigned *pubkey_len ) { BLOBHEADER *hdr = pubkey; DSSPUBKEY *dsskey; @@ -1492,7 +1492,7 @@ static NTSTATUS key_asymmetric_verify( void *args ) { const struct key_asymmetric_verify_params *params = args; struct key *key = params->key; - ULONG flags = params->flags; + unsigned flags = params->flags; gnutls_digest_algorithm_t hash_alg; gnutls_sign_algorithm_t sign_alg; gnutls_datum_t gnutls_hash, gnutls_signature; @@ -1644,7 +1644,7 @@ static NTSTATUS key_asymmetric_sign( void *args ) { const struct key_asymmetric_sign_params *params = args; struct key *key = params->key; - ULONG flags = params->flags; + unsigned flags = params->flags; BCRYPT_PKCS1_PADDING_INFO *pad = params->padding; gnutls_datum_t hash, signature; gnutls_digest_algorithm_t hash_alg;
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=106712 Your paranoid android. === debian11 (build log) === error: patch failed: include/basetsd.h:165 error: patch failed: dlls/gdi32/dc.c:1438 error: patch failed: dlls/gdi32/objects.c:674 error: patch failed: dlls/win32u/font.c:5248 error: patch failed: dlls/win32u/painting.c:117 error: patch failed: dlls/win32u/wrappers.c:450 error: patch failed: include/ntgdi.h:364 error: patch failed: dlls/jscript/array.c:53 error: patch failed: dlls/jscript/engine.c:147 error: patch failed: dlls/jscript/function.c:297 error: patch failed: dlls/jscript/jscript.h:366 error: patch failed: dlls/jscript/jsregexp.c:642 error: patch failed: dlls/jscript/jsutils.c:706 error: patch failed: dlls/jscript/string.c:1596 error: patch failed: dlls/jscript/vbarray.c:63 error: patch failed: dlls/concrt140/details.c:434 error: patch failed: dlls/msvcp90/details.c:448 error: patch failed: dlls/mshtml/dispex.c:945 error: patch failed: dlls/mshtml/htmlevent.c:1198 error: patch failed: dlls/mshtml/htmlinput.c:1245 error: patch failed: dlls/mshtml/htmlnode.c:107 error: patch failed: dlls/mshtml/htmlselect.c:792 error: patch failed: dlls/mshtml/htmlwindow.c:2428 error: patch failed: dlls/mshtml/pluginhost.c:378 error: patch failed: dlls/mshtml/range.c:1389 error: patch failed: dlls/mshtml/xmlhttprequest.c:395 error: patch failed: dlls/oleaut32/typelib.c:9890 error: patch failed: dlls/oledb32/convert.c:313 error: patch failed: dlls/oledb32/datainit.c:677 error: patch failed: dlls/comdlg32/colordlg.c:340 error: patch failed: dlls/kernelbase/debug.c:461 error: patch failed: dlls/mciseq/mcimidi.c:179 error: patch failed: dlls/bcrypt/bcrypt_internal.h:155 error: patch failed: dlls/bcrypt/gnutls.c:610 Task: Patch failed to apply === debian11 (build log) === error: patch failed: include/basetsd.h:165 error: patch failed: dlls/gdi32/dc.c:1438 error: patch failed: dlls/gdi32/objects.c:674 error: patch failed: dlls/win32u/font.c:5248 error: patch failed: dlls/win32u/painting.c:117 error: patch failed: dlls/win32u/wrappers.c:450 error: patch failed: include/ntgdi.h:364 error: patch failed: dlls/jscript/array.c:53 error: patch failed: dlls/jscript/engine.c:147 error: patch failed: dlls/jscript/function.c:297 error: patch failed: dlls/jscript/jscript.h:366 error: patch failed: dlls/jscript/jsregexp.c:642 error: patch failed: dlls/jscript/jsutils.c:706 error: patch failed: dlls/jscript/string.c:1596 error: patch failed: dlls/jscript/vbarray.c:63 error: patch failed: dlls/concrt140/details.c:434 error: patch failed: dlls/msvcp90/details.c:448 error: patch failed: dlls/mshtml/dispex.c:945 error: patch failed: dlls/mshtml/htmlevent.c:1198 error: patch failed: dlls/mshtml/htmlinput.c:1245 error: patch failed: dlls/mshtml/htmlnode.c:107 error: patch failed: dlls/mshtml/htmlselect.c:792 error: patch failed: dlls/mshtml/htmlwindow.c:2428 error: patch failed: dlls/mshtml/pluginhost.c:378 error: patch failed: dlls/mshtml/range.c:1389 error: patch failed: dlls/mshtml/xmlhttprequest.c:395 error: patch failed: dlls/oleaut32/typelib.c:9890 error: patch failed: dlls/oledb32/convert.c:313 error: patch failed: dlls/oledb32/datainit.c:677 error: patch failed: dlls/comdlg32/colordlg.c:340 error: patch failed: dlls/kernelbase/debug.c:461 error: patch failed: dlls/mciseq/mcimidi.c:179 error: patch failed: dlls/bcrypt/bcrypt_internal.h:155 error: patch failed: dlls/bcrypt/gnutls.c:610 Task: Patch failed to apply
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kerberos/unixlib.c | 6 +++--- dlls/kerberos/unixlib.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 2ee19d6fe69..d83dd37592d 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -825,7 +825,7 @@ static NTSTATUS query_context_attributes( void *args ) return SEC_E_UNSUPPORTED_FUNCTION; } -static NTSTATUS seal_message_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, ULONG qop ) +static NTSTATUS seal_message_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, unsigned qop ) { gss_iov_buffer_desc iov[4]; OM_uint32 ret, minor_status; @@ -874,7 +874,7 @@ static NTSTATUS seal_message_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, ULONG return status_gss_to_sspi( ret ); } -static NTSTATUS seal_message_no_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, ULONG qop ) +static NTSTATUS seal_message_no_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, unsigned qop ) { gss_buffer_desc input, output; OM_uint32 ret, minor_status; @@ -902,7 +902,7 @@ static NTSTATUS seal_message_no_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, UL if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) { - DWORD len_data = msg->pBuffers[data_idx].cbBuffer, len_token = msg->pBuffers[token_idx].cbBuffer; + unsigned len_data = msg->pBuffers[data_idx].cbBuffer, len_token = msg->pBuffers[token_idx].cbBuffer; if (len_token < output.length - len_data) { TRACE( "buffer too small %lu > %u\n", (SIZE_T)output.length - len_data, len_token ); diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index 05b24d6fadf..4a31712bfe8 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -66,7 +66,7 @@ struct make_signature_params struct query_context_attributes_params { LSA_SEC_HANDLE context; - ULONG attr; + unsigned attr; void *buf; }; @@ -80,7 +80,7 @@ struct seal_message_params { LSA_SEC_HANDLE context; SecBufferDesc *msg; - ULONG qop; + unsigned qop; }; struct unseal_message_params
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=106713 Your paranoid android. === debian11 (build log) === error: patch failed: include/basetsd.h:165 error: patch failed: dlls/gdi32/dc.c:1438 error: patch failed: dlls/gdi32/objects.c:674 error: patch failed: dlls/win32u/font.c:5248 error: patch failed: dlls/win32u/painting.c:117 error: patch failed: dlls/win32u/wrappers.c:450 error: patch failed: include/ntgdi.h:364 error: patch failed: dlls/jscript/array.c:53 error: patch failed: dlls/jscript/engine.c:147 error: patch failed: dlls/jscript/function.c:297 error: patch failed: dlls/jscript/jscript.h:366 error: patch failed: dlls/jscript/jsregexp.c:642 error: patch failed: dlls/jscript/jsutils.c:706 error: patch failed: dlls/jscript/string.c:1596 error: patch failed: dlls/jscript/vbarray.c:63 error: patch failed: dlls/concrt140/details.c:434 error: patch failed: dlls/msvcp90/details.c:448 error: patch failed: dlls/mshtml/dispex.c:945 error: patch failed: dlls/mshtml/htmlevent.c:1198 error: patch failed: dlls/mshtml/htmlinput.c:1245 error: patch failed: dlls/mshtml/htmlnode.c:107 error: patch failed: dlls/mshtml/htmlselect.c:792 error: patch failed: dlls/mshtml/htmlwindow.c:2428 error: patch failed: dlls/mshtml/pluginhost.c:378 error: patch failed: dlls/mshtml/range.c:1389 error: patch failed: dlls/mshtml/xmlhttprequest.c:395 error: patch failed: dlls/oleaut32/typelib.c:9890 error: patch failed: dlls/oledb32/convert.c:313 error: patch failed: dlls/oledb32/datainit.c:677 error: patch failed: dlls/comdlg32/colordlg.c:340 error: patch failed: dlls/kernelbase/debug.c:461 error: patch failed: dlls/mciseq/mcimidi.c:179 error: patch failed: dlls/bcrypt/bcrypt_internal.h:155 error: patch failed: dlls/bcrypt/gnutls.c:610 error: patch failed: dlls/kerberos/unixlib.c:825 error: patch failed: dlls/kerberos/unixlib.h:66 Task: Patch failed to apply === debian11 (build log) === error: patch failed: include/basetsd.h:165 error: patch failed: dlls/gdi32/dc.c:1438 error: patch failed: dlls/gdi32/objects.c:674 error: patch failed: dlls/win32u/font.c:5248 error: patch failed: dlls/win32u/painting.c:117 error: patch failed: dlls/win32u/wrappers.c:450 error: patch failed: include/ntgdi.h:364 error: patch failed: dlls/jscript/array.c:53 error: patch failed: dlls/jscript/engine.c:147 error: patch failed: dlls/jscript/function.c:297 error: patch failed: dlls/jscript/jscript.h:366 error: patch failed: dlls/jscript/jsregexp.c:642 error: patch failed: dlls/jscript/jsutils.c:706 error: patch failed: dlls/jscript/string.c:1596 error: patch failed: dlls/jscript/vbarray.c:63 error: patch failed: dlls/concrt140/details.c:434 error: patch failed: dlls/msvcp90/details.c:448 error: patch failed: dlls/mshtml/dispex.c:945 error: patch failed: dlls/mshtml/htmlevent.c:1198 error: patch failed: dlls/mshtml/htmlinput.c:1245 error: patch failed: dlls/mshtml/htmlnode.c:107 error: patch failed: dlls/mshtml/htmlselect.c:792 error: patch failed: dlls/mshtml/htmlwindow.c:2428 error: patch failed: dlls/mshtml/pluginhost.c:378 error: patch failed: dlls/mshtml/range.c:1389 error: patch failed: dlls/mshtml/xmlhttprequest.c:395 error: patch failed: dlls/oleaut32/typelib.c:9890 error: patch failed: dlls/oledb32/convert.c:313 error: patch failed: dlls/oledb32/datainit.c:677 error: patch failed: dlls/comdlg32/colordlg.c:340 error: patch failed: dlls/kernelbase/debug.c:461 error: patch failed: dlls/mciseq/mcimidi.c:179 error: patch failed: dlls/bcrypt/bcrypt_internal.h:155 error: patch failed: dlls/bcrypt/gnutls.c:610 error: patch failed: dlls/kerberos/unixlib.c:825 error: patch failed: dlls/kerberos/unixlib.h:66 Task: Patch failed to apply
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/netapi32/unixlib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/netapi32/unixlib.c b/dlls/netapi32/unixlib.c index c6b389950f7..19132791567 100644 --- a/dlls/netapi32/unixlib.c +++ b/dlls/netapi32/unixlib.c @@ -132,7 +132,7 @@ static NET_API_STATUS server_info_101_from_samba( const unsigned char *buf, void return NERR_Success; } -static NET_API_STATUS server_info_from_samba( DWORD level, const unsigned char *buf, void *buffer, ULONG *size ) +static NET_API_STATUS server_info_from_samba( unsigned int level, const unsigned char *buf, void *buffer, ULONG *size ) { switch (level) { @@ -438,9 +438,9 @@ static unsigned char ace_flags_to_samba( BYTE flags ) #define GENERIC_WRITE_ACCESS (1u << 30) #define GENERIC_READ_ACCESS (1u << 31) -static unsigned int access_mask_to_samba( DWORD mask ) +static unsigned int access_mask_to_samba( unsigned int mask ) { - static const DWORD known_rights = + static const unsigned int known_rights = GENERIC_ALL | GENERIC_EXECUTE | GENERIC_WRITE | GENERIC_READ; unsigned int ret = 0; @@ -692,7 +692,7 @@ static NET_API_STATUS share_info_502_to_samba( const BYTE *buf, unsigned char ** return NERR_Success; } -static NET_API_STATUS share_info_to_samba( DWORD level, const BYTE *buf, unsigned char **bufptr ) +static NET_API_STATUS share_info_to_samba( unsigned int level, const BYTE *buf, unsigned char **bufptr ) { switch (level) { @@ -793,7 +793,7 @@ static NET_API_STATUS wksta_info_100_from_samba( const unsigned char *buf, void return NERR_Success; } -static NET_API_STATUS wksta_info_from_samba( DWORD level, const unsigned char *buf, void *buffer, ULONG *size ) +static NET_API_STATUS wksta_info_from_samba( unsigned int level, const unsigned char *buf, void *buffer, ULONG *size ) { switch (level) { @@ -826,7 +826,7 @@ static NTSTATUS wksta_getinfo( void *args ) static NTSTATUS netapi_init( void *args ) { - DWORD status; + unsigned int status; void *ctx; if (!(libnetapi_handle = dlopen( SONAME_LIBNETAPI, RTLD_NOW )))
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=106714 Your paranoid android. === debian11 (build log) === error: patch failed: include/basetsd.h:165 error: patch failed: dlls/gdi32/dc.c:1438 error: patch failed: dlls/gdi32/objects.c:674 error: patch failed: dlls/win32u/font.c:5248 error: patch failed: dlls/win32u/painting.c:117 error: patch failed: dlls/win32u/wrappers.c:450 error: patch failed: include/ntgdi.h:364 error: patch failed: dlls/jscript/array.c:53 error: patch failed: dlls/jscript/engine.c:147 error: patch failed: dlls/jscript/function.c:297 error: patch failed: dlls/jscript/jscript.h:366 error: patch failed: dlls/jscript/jsregexp.c:642 error: patch failed: dlls/jscript/jsutils.c:706 error: patch failed: dlls/jscript/string.c:1596 error: patch failed: dlls/jscript/vbarray.c:63 error: patch failed: dlls/concrt140/details.c:434 error: patch failed: dlls/msvcp90/details.c:448 error: patch failed: dlls/mshtml/dispex.c:945 error: patch failed: dlls/mshtml/htmlevent.c:1198 error: patch failed: dlls/mshtml/htmlinput.c:1245 error: patch failed: dlls/mshtml/htmlnode.c:107 error: patch failed: dlls/mshtml/htmlselect.c:792 error: patch failed: dlls/mshtml/htmlwindow.c:2428 error: patch failed: dlls/mshtml/pluginhost.c:378 error: patch failed: dlls/mshtml/range.c:1389 error: patch failed: dlls/mshtml/xmlhttprequest.c:395 error: patch failed: dlls/oleaut32/typelib.c:9890 error: patch failed: dlls/oledb32/convert.c:313 error: patch failed: dlls/oledb32/datainit.c:677 error: patch failed: dlls/comdlg32/colordlg.c:340 error: patch failed: dlls/kernelbase/debug.c:461 error: patch failed: dlls/mciseq/mcimidi.c:179 error: patch failed: dlls/bcrypt/bcrypt_internal.h:155 error: patch failed: dlls/bcrypt/gnutls.c:610 error: patch failed: dlls/kerberos/unixlib.c:825 error: patch failed: dlls/kerberos/unixlib.h:66 error: patch failed: dlls/netapi32/unixlib.c:132 Task: Patch failed to apply === debian11 (build log) === error: patch failed: include/basetsd.h:165 error: patch failed: dlls/gdi32/dc.c:1438 error: patch failed: dlls/gdi32/objects.c:674 error: patch failed: dlls/win32u/font.c:5248 error: patch failed: dlls/win32u/painting.c:117 error: patch failed: dlls/win32u/wrappers.c:450 error: patch failed: include/ntgdi.h:364 error: patch failed: dlls/jscript/array.c:53 error: patch failed: dlls/jscript/engine.c:147 error: patch failed: dlls/jscript/function.c:297 error: patch failed: dlls/jscript/jscript.h:366 error: patch failed: dlls/jscript/jsregexp.c:642 error: patch failed: dlls/jscript/jsutils.c:706 error: patch failed: dlls/jscript/string.c:1596 error: patch failed: dlls/jscript/vbarray.c:63 error: patch failed: dlls/concrt140/details.c:434 error: patch failed: dlls/msvcp90/details.c:448 error: patch failed: dlls/mshtml/dispex.c:945 error: patch failed: dlls/mshtml/htmlevent.c:1198 error: patch failed: dlls/mshtml/htmlinput.c:1245 error: patch failed: dlls/mshtml/htmlnode.c:107 error: patch failed: dlls/mshtml/htmlselect.c:792 error: patch failed: dlls/mshtml/htmlwindow.c:2428 error: patch failed: dlls/mshtml/pluginhost.c:378 error: patch failed: dlls/mshtml/range.c:1389 error: patch failed: dlls/mshtml/xmlhttprequest.c:395 error: patch failed: dlls/oleaut32/typelib.c:9890 error: patch failed: dlls/oledb32/convert.c:313 error: patch failed: dlls/oledb32/datainit.c:677 error: patch failed: dlls/comdlg32/colordlg.c:340 error: patch failed: dlls/kernelbase/debug.c:461 error: patch failed: dlls/mciseq/mcimidi.c:179 error: patch failed: dlls/bcrypt/bcrypt_internal.h:155 error: patch failed: dlls/bcrypt/gnutls.c:610 error: patch failed: dlls/kerberos/unixlib.c:825 error: patch failed: dlls/kerberos/unixlib.h:66 error: patch failed: dlls/netapi32/unixlib.c:132 Task: Patch failed to apply
participants (6)
-
Eric Pouech -
Esme Povirk (she/they) -
Huw Davies -
Jacek Caban -
Marvin -
Piotr Caban