September 2021 - Wine-Commits

Zebediah Figura : server: Check the status code to determine whether the async has failed.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 15b8f91e247ef7a8838c377da1d7457eec02eb08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15b8f91e247ef7a8838c377d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 2 19:08:49 2021 -0500 server: Check the status code to determine whether the async has failed. Instead of manually specifying success or failure. Based on test_return_status() in ntoskrnl. The changes in this patch don't affect device IRPs, but the tests show the heuristic that Windows uses, and in practice it turns out to be correct for all known asyncs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 4 ++-- server/async.c | 4 ++-- server/fd.c | 15 ++++++++++----- server/file.h | 2 +- server/sock.c | 34 ++++++++++------------------------ 5 files changed, 25 insertions(+), 34 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ec010acebc6..8cbb393b542 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1934,8 +1934,8 @@ static void test_ip_pktinfo(void) todo_wine ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); rc = SleepEx(1000, TRUE); - todo_wine ok(rc == WAIT_IO_COMPLETION, "got %d\n", rc); - todo_wine ok(got_ip_pktinfo_apc == 1, "apc was called %u times\n", got_ip_pktinfo_apc); + ok(rc == WAIT_IO_COMPLETION, "got %d\n", rc); + ok(got_ip_pktinfo_apc == 1, "apc was called %u times\n", got_ip_pktinfo_apc); ok(hdr.dwFlags == MSG_CTRUNC, "got flags %#x\n", hdr.dwFlags); got_ip_pktinfo_apc = 0; diff --git a/server/async.c b/server/async.c index 4e9f3253759..50cb47dec92 100644 --- a/server/async.c +++ b/server/async.c @@ -296,7 +296,7 @@ void set_async_pending( struct async *async, int signal ) } /* return async object status and wait handle to client */ -obj_handle_t async_handoff( struct async *async, int success, data_size_t *result, int force_blocking ) +obj_handle_t async_handoff( struct async *async, data_size_t *result, int force_blocking ) { if (async->unknown_status) { @@ -305,7 +305,7 @@ obj_handle_t async_handoff( struct async *async, int success, data_size_t *resul return async->wait_handle; } - if (!success) + if (!async->pending && NT_ERROR( get_error() )) { close_handle( async->thread->process, async->wait_handle ); async->wait_handle = 0; diff --git a/server/fd.c b/server/fd.c index a09fc9edfcf..e4ef29806f2 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2692,7 +2692,8 @@ DECL_HANDLER(flush) if ((async = create_request_async( fd, fd->comp_flags, &req->async ))) { - reply->event = async_handoff( async, fd->fd_ops->flush( fd, async ), NULL, 1 ); + fd->fd_ops->flush( fd, async ); + reply->event = async_handoff( async, NULL, 1 ); release_object( async ); } release_object( fd ); @@ -2720,7 +2721,8 @@ DECL_HANDLER(get_volume_info) if ((async = create_request_async( fd, fd->comp_flags, &req->async ))) { - reply->wait = async_handoff( async, fd->fd_ops->get_volume_info( fd, async, req->info_class ), NULL, 1 ); + fd->fd_ops->get_volume_info( fd, async, req->info_class ); + reply->wait = async_handoff( async, NULL, 1 ); release_object( async ); } release_object( fd ); @@ -2795,7 +2797,8 @@ DECL_HANDLER(read) if ((async = create_request_async( fd, fd->comp_flags, &req->async ))) { - reply->wait = async_handoff( async, fd->fd_ops->read( fd, async, req->pos ), NULL, 0 ); + fd->fd_ops->read( fd, async, req->pos ); + reply->wait = async_handoff( async, NULL, 0 ); reply->options = fd->options; release_object( async ); } @@ -2812,7 +2815,8 @@ DECL_HANDLER(write) if ((async = create_request_async( fd, fd->comp_flags, &req->async ))) { - reply->wait = async_handoff( async, fd->fd_ops->write( fd, async, req->pos ), &reply->size, 0 ); + fd->fd_ops->write( fd, async, req->pos ); + reply->wait = async_handoff( async, &reply->size, 0 ); reply->options = fd->options; release_object( async ); } @@ -2830,7 +2834,8 @@ DECL_HANDLER(ioctl) if ((async = create_request_async( fd, fd->comp_flags, &req->async ))) { - reply->wait = async_handoff( async, fd->fd_ops->ioctl( fd, req->code, async ), NULL, 0 ); + fd->fd_ops->ioctl( fd, req->code, async ); + reply->wait = async_handoff( async, NULL, 0 ); reply->options = fd->options; release_object( async ); } diff --git a/server/file.h b/server/file.h index 9b8a620359e..592ee6b4e6b 100644 --- a/server/file.h +++ b/server/file.h @@ -219,7 +219,7 @@ typedef void (*async_completion_callback)( void *private ); extern void free_async_queue( struct async_queue *queue ); extern struct async *create_async( struct fd *fd, struct thread *thread, const async_data_t *data, struct iosb *iosb ); extern struct async *create_request_async( struct fd *fd, unsigned int comp_flags, const async_data_t *data ); -extern obj_handle_t async_handoff( struct async *async, int success, data_size_t *result, int force_blocking ); +extern obj_handle_t async_handoff( struct async *async, data_size_t *result, int force_blocking ); extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total ); diff --git a/server/sock.c b/server/sock.c index bf109eb781a..fc181e85744 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2839,8 +2839,8 @@ static int poll_single_socket( struct sock *sock, int mask ) return get_poll_flags( sock, pollfd.revents ) & mask; } -static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t timeout, - unsigned int count, const struct poll_socket_input *input ) +static void poll_socket( struct sock *poll_sock, struct async *async, timeout_t timeout, + unsigned int count, const struct poll_socket_input *input ) { struct poll_socket_output *output; BOOL signaled = FALSE; @@ -2848,13 +2848,13 @@ static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t t unsigned int i, j; if (!(output = mem_alloc( count * sizeof(*output) ))) - return 0; + return; memset( output, 0, count * sizeof(*output) ); if (!(req = mem_alloc( offsetof( struct poll_req, sockets[count] ) ))) { free( output ); - return 0; + return; } req->timeout = NULL; @@ -2863,7 +2863,7 @@ static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t t { free( req ); free( output ); - return 0; + return; } for (i = 0; i < count; ++i) @@ -2875,7 +2875,7 @@ static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t t if (req->timeout) remove_timeout_user( req->timeout ); free( req ); free( output ); - return 0; + return; } req->sockets[i].flags = input[i].flags; } @@ -2917,7 +2917,6 @@ static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t t for (i = 0; i < req->count; ++i) sock_reselect( req->sockets[i].sock ); set_error( STATUS_PENDING ); - return 1; } #ifdef HAVE_LINUX_RTNETLINK_H @@ -3249,18 +3248,11 @@ DECL_HANDLER(recv_socket) if ((async = create_request_async( fd, get_fd_comp_flags( fd ), &req->async ))) { - int success = 0; - if (status == STATUS_SUCCESS) { struct iosb *iosb = async_get_iosb( async ); iosb->result = req->total; release_object( iosb ); - success = 1; - } - else if (status == STATUS_PENDING) - { - success = 1; } set_error( status ); @@ -3273,7 +3265,7 @@ DECL_HANDLER(recv_socket) /* always reselect; we changed reported_events above */ sock_reselect( sock ); - reply->wait = async_handoff( async, success, NULL, 0 ); + reply->wait = async_handoff( async, NULL, 0 ); reply->options = get_fd_options( fd ); release_object( async ); } @@ -3293,7 +3285,8 @@ DECL_HANDLER(poll_socket) if ((async = create_request_async( sock->fd, get_fd_comp_flags( sock->fd ), &req->async ))) { - reply->wait = async_handoff( async, poll_socket( sock, async, req->timeout, count, input ), NULL, 0 ); + poll_socket( sock, async, req->timeout, count, input ); + reply->wait = async_handoff( async, NULL, 0 ); reply->options = get_fd_options( sock->fd ); release_object( async ); } @@ -3357,18 +3350,11 @@ DECL_HANDLER(send_socket) if ((async = create_request_async( fd, get_fd_comp_flags( fd ), &req->async ))) { - int success = 0; - if (status == STATUS_SUCCESS) { struct iosb *iosb = async_get_iosb( async ); iosb->result = req->total; release_object( iosb ); - success = 1; - } - else if (status == STATUS_PENDING) - { - success = 1; } set_error( status ); @@ -3381,7 +3367,7 @@ DECL_HANDLER(send_socket) /* always reselect; we changed reported_events above */ sock_reselect( sock ); - reply->wait = async_handoff( async, success, NULL, 0 ); + reply->wait = async_handoff( async, NULL, 0 ); reply->options = get_fd_options( fd ); release_object( async ); }

1 0

Jacek Caban : gdi32: Use NtGdiDeleteObjectApp instead of DeleteObject in ntgdi functions.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 8e70a0a5cc2ca7bb2fe127afed8b8545ebc93acf URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e70a0a5cc2ca7bb2fe127af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 3 13:59:52 2021 +0100 gdi32: Use NtGdiDeleteObjectApp instead of DeleteObject in ntgdi functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 12 ++++++------ dlls/gdi32/bitmap.c | 4 ++-- dlls/gdi32/clipping.c | 14 +++++++------- dlls/gdi32/dc.c | 12 ++++++------ dlls/gdi32/dib.c | 14 +++++++------- dlls/gdi32/dibdrv/bitblt.c | 2 +- dlls/gdi32/dibdrv/graphics.c | 38 +++++++++++++++++++------------------- dlls/gdi32/dibdrv/objects.c | 8 ++++---- dlls/gdi32/font.c | 6 +++--- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/painting.c | 2 +- dlls/gdi32/path.c | 2 +- dlls/gdi32/region.c | 2 +- 13 files changed, 59 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8e70a0a5cc2ca7bb2fe1…

1 0

Jacek Caban : gdi32: Use NtGdiGetDCObject for GetCurrentObject.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 05a3384ca8186404280085da1d1744da474a60d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05a3384ca8186404280085da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 3 13:59:48 2021 +0100 gdi32: Use NtGdiGetDCObject for GetCurrentObject. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 3 ++- dlls/gdi32/bitmap.c | 3 ++- dlls/gdi32/dib.c | 5 +++-- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/gdiobj.c | 53 ++++++++++++++++---------------------------------- dlls/gdi32/objects.c | 26 +++++++++++++++++++++++++ include/ntgdi.h | 2 ++ 7 files changed, 53 insertions(+), 41 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index c10b9d37199..e6a846c3d74 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -866,7 +866,8 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, SetStretchBltMode(hdcSrc, COLORONCOLOR); hdcWork = NtGdiCreateCompatibleDC( hdcDest ); if ((GetObjectType( hdcDest ) != OBJ_MEMDC || - GetObjectW( GetCurrentObject( hdcDest, OBJ_BITMAP ), sizeof(dib), &dib ) == sizeof(BITMAP)) && + GetObjectW( NtGdiGetDCObject( hdcDest, NTGDI_OBJ_SURF ), + sizeof(dib), &dib ) == sizeof(BITMAP)) && GetDeviceCaps( hdcDest, BITSPIXEL ) == 32) { /* screen DCs or DDBs are not supposed to have an alpha channel, so use a 24-bpp bitmap as copy */ diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index db6a4c44c84..1ce0e940235 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -63,7 +63,8 @@ HBITMAP WINAPI NtGdiCreateCompatibleBitmap( HDC hdc, INT width, INT height ) NtGdiGetDeviceCaps( hdc, PLANES ), NtGdiGetDeviceCaps( hdc, BITSPIXEL ), NULL ); - switch (NtGdiExtGetObjectW( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(dib), &dib )) + switch (NtGdiExtGetObjectW( NtGdiGetDCObject( hdc, NTGDI_OBJ_SURF ), + sizeof(dib), &dib )) { case sizeof(BITMAP): /* A device-dependent bitmap is selected in the DC */ return NtGdiCreateBitmap( width, height, dib.dsBm.bmPlanes, dib.dsBm.bmBitsPixel, NULL ); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 68ca1c31664..f00d5cf13e2 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -253,7 +253,7 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * static int fill_color_table_from_palette( BITMAPINFO *info, HDC hdc ) { PALETTEENTRY palEntry[256]; - HPALETTE palette = GetCurrentObject( hdc, OBJ_PAL ); + HPALETTE palette = NtGdiGetDCObject( hdc, NTGDI_OBJ_PAL ); int i, colors = 1 << info->bmiHeader.biBitCount; info->bmiHeader.biClrUsed = colors; @@ -284,7 +284,8 @@ BOOL fill_color_table_from_pal_colors( BITMAPINFO *info, HDC hdc ) int i, count, colors = info->bmiHeader.biClrUsed; if (!colors) return TRUE; - if (!(palette = GetCurrentObject( hdc, OBJ_PAL ))) return FALSE; + if (!(palette = NtGdiGetDCObject( hdc, NTGDI_OBJ_PAL ))) + return FALSE; if (!(count = get_palette_entries( palette, 0, colors, entries ))) return FALSE; for (i = 0; i < colors; i++, index++) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index c31845d30a9..6336e3f23fe 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -534,7 +534,7 @@ static BOOL WINAPI dibdrv_wglMakeCurrent( HDC hdc, struct wgl_context *context ) if (!osmesa_funcs) return FALSE; if (!context) return osmesa_funcs->make_current( NULL, NULL, 0, 0, 0, 0 ); - bitmap = GetCurrentObject( hdc, OBJ_BITMAP ); + bitmap = NtGdiGetDCObject( hdc, NTGDI_OBJ_SURF ); bmp = GDI_GetObjPtr( bitmap, NTGDI_OBJ_BITMAP ); if (!bmp) return FALSE; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index cc68070674a..14b65429d4a 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1005,47 +1005,28 @@ INT WINAPI NtGdiExtGetObjectW( HGDIOBJ handle, INT count, void *buffer ) } /*********************************************************************** - * GetCurrentObject (GDI32.@) + * NtGdiGetDCObject (win32u.@) * * Get the currently selected object of a given type in a device context. - * - * PARAMS - * hdc [I] Device context to get the current object from - * type [I] Type of current object to get (OBJ_* defines from "wingdi.h") - * - * RETURNS - * Success: The current object of the given type selected in hdc. - * Failure: A NULL handle. - * - * NOTES - * - only the following object types are supported: - *| OBJ_PEN - *| OBJ_BRUSH - *| OBJ_PAL - *| OBJ_FONT - *| OBJ_BITMAP */ -HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) +HANDLE WINAPI NtGdiGetDCObject( HDC hdc, UINT type ) { HGDIOBJ ret = 0; - DC * dc = get_dc_ptr( hdc ); - - if (!dc) return 0; - - switch (type) { - case OBJ_EXTPEN: /* fall through */ - case OBJ_PEN: ret = dc->hPen; break; - case OBJ_BRUSH: ret = dc->hBrush; break; - case OBJ_PAL: ret = dc->hPalette; break; - case OBJ_FONT: ret = dc->hFont; break; - case OBJ_BITMAP: ret = dc->hBitmap; break; - - /* tests show that OBJ_REGION is explicitly ignored */ - case OBJ_REGION: break; - default: - /* the SDK only mentions those above */ - FIXME("(%p,%d): unknown type.\n",hdc,type); - break; + DC *dc; + + if (!(dc = get_dc_ptr( hdc ))) return 0; + + switch (type) + { + case NTGDI_OBJ_EXTPEN: /* fall through */ + case NTGDI_OBJ_PEN: ret = dc->hPen; break; + case NTGDI_OBJ_BRUSH: ret = dc->hBrush; break; + case NTGDI_OBJ_PAL: ret = dc->hPalette; break; + case NTGDI_OBJ_FONT: ret = dc->hFont; break; + case NTGDI_OBJ_SURF: ret = dc->hBitmap; break; + default: + FIXME( "(%p, %d): unknown type.\n", hdc, type ); + break; } release_dc_ptr( dc ); return ret; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index b989a83daa1..b656c2a3f1e 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -353,6 +353,32 @@ INT WINAPI GetObjectW( HGDIOBJ handle, INT count, void *buffer ) return result; } +/*********************************************************************** + * GetCurrentObject (GDI32.@) + */ +HGDIOBJ WINAPI GetCurrentObject( HDC hdc, UINT type ) +{ + unsigned int obj_type; + + switch (type) + { + case OBJ_EXTPEN: obj_type = NTGDI_OBJ_EXTPEN; break; + case OBJ_PEN: obj_type = NTGDI_OBJ_PEN; break; + case OBJ_BRUSH: obj_type = NTGDI_OBJ_BRUSH; break; + case OBJ_PAL: obj_type = NTGDI_OBJ_PAL; break; + case OBJ_FONT: obj_type = NTGDI_OBJ_FONT; break; + case OBJ_BITMAP: obj_type = NTGDI_OBJ_SURF; break; + case OBJ_REGION: + /* tests show that OBJ_REGION is explicitly ignored */ + return 0; + default: + FIXME( "(%p,%d): unknown type.\n", hdc, type ); + return 0; + } + + return NtGdiGetDCObject( hdc, obj_type ); +} + /*********************************************************************** * GetObjectA (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 2ee70cf3971..9e07268a307 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -57,6 +57,7 @@ typedef struct _GDI_HANDLE_ENTRY #define NTGDI_OBJ_DC 0x010000 #define NTGDI_OBJ_ENHMETADC 0x210000 #define NTGDI_OBJ_REGION 0x040000 +#define NTGDI_OBJ_SURF 0x050000 #define NTGDI_OBJ_METAFILE 0x260000 #define NTGDI_OBJ_ENHMETAFILE 0x460000 #define NTGDI_OBJ_METADC 0x660000 @@ -296,6 +297,7 @@ BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first_char, UINT last_char, WC ULONG flags, void *buffer ); BOOL WINAPI NtGdiGetColorAdjustment( HDC hdc, COLORADJUSTMENT *ca ); BOOL WINAPI NtGdiGetDCDword( HDC hdc, UINT method, DWORD *result ); +HANDLE WINAPI NtGdiGetDCObject( HDC hdc, UINT type ); BOOL WINAPI NtGdiGetDCPoint( HDC hdc, UINT method, POINT *result ); INT WINAPI NtGdiGetDIBitsInternal( HDC hdc, HBITMAP hbitmap, UINT startscan, UINT lines, void *bits, BITMAPINFO *info, UINT coloruse,

1 0

Eric Pouech : dbghelp: Fix dwarf constants.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 50144e27320e02a4e42f884b6fc151136fe762b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50144e27320e02a4e42f884b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 2 11:22:19 2021 +0200 dbghelp: Fix dwarf constants. The 32bit CIE_ID is an unsigned integer (will become important when handling 32 vs 64 bit values). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index 33ea9ef40ca..d4355d72e80 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -503,7 +503,7 @@ enum dwarf_calling_convention #define DW_LNE_lo_user 0x80 #define DW_LNE_hi_user 0xff -#define DW_CIE_ID ~(0x0) +#define DW_CIE_ID ~(0x0U) enum dwarf_call_frame_info {

1 0

Alexandre Julliard : configure: Remove some no longer needed configure checks.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 21cec48570d4f358312409c778675c2d8502f272 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21cec48570d4f358312409c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 3 14:54:16 2021 +0200 configure: Remove some no longer needed configure checks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 19 ++-------- configure.ac | 12 +----- include/config.h.in | 24 ------------ include/wine/port.h | 24 ------------ libs/port/Makefile.in | 3 -- libs/port/poll.c | 101 -------------------------------------------------- libs/port/pread.c | 50 ------------------------- libs/port/pwrite.c | 50 ------------------------- 8 files changed, 5 insertions(+), 278 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21cec48570d4f3583124…

1 0

Eric Pouech : dbghelp: Add a couple of more traces when querying an attribute's value.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 598e5774750d2a1544802ccede16d7048a252f46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=598e5774750d2a1544802cce… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 2 11:22:07 2021 +0200 dbghelp: Add a couple of more traces when querying an attribute's value. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index b62e1a2cce8..6d2c843fb94 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -550,6 +550,7 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, case DW_FORM_udata: attr->u.uvalue = dwarf2_get_leb128_as_unsigned(data, NULL); + TRACE("udata<0x%lx>\n", attr->u.uvalue); break; case DW_FORM_string: @@ -567,21 +568,25 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, case DW_FORM_block: attr->u.block.size = dwarf2_get_leb128_as_unsigned(data, &attr->u.block.ptr); + TRACE("block<%p,%u>\n", attr->u.block.ptr, attr->u.block.size); break; case DW_FORM_block1: attr->u.block.size = dwarf2_get_byte(data); attr->u.block.ptr = data + 1; + TRACE("block<%p,%u>\n", attr->u.block.ptr, attr->u.block.size); break; case DW_FORM_block2: attr->u.block.size = dwarf2_get_u2(data); attr->u.block.ptr = data + 2; + TRACE("block<%p,%u>\n", attr->u.block.ptr, attr->u.block.size); break; case DW_FORM_block4: attr->u.block.size = dwarf2_get_u4(data); attr->u.block.ptr = data + 4; + TRACE("block<%p,%u>\n", attr->u.block.ptr, attr->u.block.size); break; default:

1 0

Eric Pouech : dbghelp: Update/clarify dwarf definitions for 3/3f/4 standard versions.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 1a2d1e1a8a9fa9f17c4a81e2c47e282dcc0ecfea URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a2d1e1a8a9fa9f17c4a81e2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 2 11:22:13 2021 +0200 dbghelp: Update/clarify dwarf definitions for 3/3f/4 standard versions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.h | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index 683d4e1e911..33ea9ef40ca 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -167,8 +167,7 @@ typedef enum dwarf_attribute_e DW_AT_allocated = 0x4e, DW_AT_associated = 0x4f, DW_AT_data_location = 0x50, - DW_AT_byte_stride = 0x51, - DW_AT_stride = 0x51, + DW_AT_byte_stride = 0x51, /* used to be DW_AT_stride in Dwarf3 (not final) */ DW_AT_entry_pc = 0x52, DW_AT_use_UTF8 = 0x53, DW_AT_extension = 0x54, @@ -178,7 +177,7 @@ typedef enum dwarf_attribute_e DW_AT_call_file = 0x58, DW_AT_call_line = 0x59, DW_AT_description = 0x5a, - /** Dwarf3 new values */ + /** Dwarf3 (final) new values */ DW_AT_binary_scale = 0x5b, DW_AT_decimal_scale = 0x5c, DW_AT_small = 0x5d, @@ -283,12 +282,15 @@ typedef enum dwarf_type_e DW_ATE_unsigned_char = 0x8, /* Dwarf3 new values */ DW_ATE_imaginary_float = 0x9, + /* Dwarf3 (final) new values */ DW_ATE_packed_decimal = 0xa, DW_ATE_numeric_string = 0xb, DW_ATE_edited = 0xc, DW_ATE_signed_fixed = 0xd, DW_ATE_unsigned_fixed = 0xe, DW_ATE_decimal_float = 0xf, + /* Dwarf4 new values */ + DW_ATE_UTF = 0x10, } dwarf_type_t; typedef enum dwarf_operation_e @@ -443,6 +445,7 @@ typedef enum dwarf_operation_e DW_OP_call2 = 0x98, DW_OP_call4 = 0x99, DW_OP_call_ref = 0x9a, + /** Dwarf3 (final) new values */ DW_OP_form_tls_address = 0x9b, DW_OP_call_frame_cfa = 0x9c, DW_OP_bit_piece = 0x9d, @@ -497,6 +500,8 @@ enum dwarf_calling_convention #define DW_LNE_define_file 0x03 /* Dwarf4 new values */ #define DW_LNE_set_discriminator 0x04 +#define DW_LNE_lo_user 0x80 +#define DW_LNE_hi_user 0xff #define DW_CIE_ID ~(0x0) @@ -520,11 +525,13 @@ enum dwarf_call_frame_info DW_CFA_def_cfa = 0x0c, DW_CFA_def_cfa_register = 0x0d, DW_CFA_def_cfa_offset = 0x0e, + /* Dwarf3 new values */ DW_CFA_def_cfa_expression = 0x0f, DW_CFA_expression = 0x10, DW_CFA_offset_extended_sf = 0x11, DW_CFA_def_cfa_sf = 0x12, DW_CFA_def_cfa_offset_sf = 0x13, + /* Dwarf3 (final) new values */ DW_CFA_val_offset = 0x14, DW_CFA_val_offset_sf = 0x15, DW_CFA_val_expression = 0x16, @@ -554,3 +561,32 @@ enum dwarf_call_frame_info #define DW_INL_inlined 0x01 #define DW_INL_declared_not_inlined 0x02 #define DW_INL_declared_inlined 0x03 + +/* DWARF languages */ +enum +{ + DW_LANG_C89 = 0x0001, + DW_LANG_C = 0x0002, + DW_LANG_Ada83 = 0x0003, + DW_LANG_C_plus_plus = 0x0004, + DW_LANG_Cobol74 = 0x0005, + DW_LANG_Cobol85 = 0x0006, + DW_LANG_Fortran77 = 0x0007, + DW_LANG_Fortran90 = 0x0008, + DW_LANG_Pascal83 = 0x0009, + DW_LANG_Modula2 = 0x000a, + /* Dwarf3 additions */ + DW_LANG_Java = 0x000b, + DW_LANG_C99 = 0x000c, + DW_LANG_Ada95 = 0x000d, + DW_LANG_Fortran95 = 0x000e, + DW_LANG_PLI = 0x000f, + /* Dwarf3 (final) additions */ + DW_LANG_ObjC = 0x0010, + DW_LANG_ObjC_plus_plus = 0x0011, + DW_LANG_UPC = 0x0012, + DW_LANG_D = 0x0013, + + DW_LANG_lo_user = 0x8000, + DW_LANG_hi_user = 0xffff + };

1 0

Francois Gouget : nsi/tests: Improve the error messages.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: d5dd1920278ac0e9f36151828e41141a9e762c33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5dd1920278ac0e9f3615182… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 3 11:41:53 2021 +0200 nsi/tests: Improve the error messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 132 +++++++++++++++++++++++---------------------------- 1 file changed, 60 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d5dd1920278ac0e9f361…

1 0

Francois Gouget : wininet/tests: Remove some unnecessary traces from the http test.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: ab227d2eca1cd182dd4beead716e5c48d596feee URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab227d2eca1cd182dd4beead… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 3 11:42:12 2021 +0200 wininet/tests: Remove some unnecessary traces from the http test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index d4845188d39..bf4dce80bef 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -596,11 +596,9 @@ static void InternetReadFile_test(int flags, const test_data_t *test) trace("Starting InternetReadFile test with flags 0x%x on url %s\n",flags,test->url); reset_events(); - trace("InternetOpenA <--\n"); hi = InternetOpenA((test->flags & TESTF_COMPRESSED) ? "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)" : "", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, flags); ok((hi != 0x0),"InternetOpen failed with error %u\n", GetLastError()); - trace("InternetOpenA -->\n"); if (hi == 0x0) goto abort; @@ -608,18 +606,15 @@ static void InternetReadFile_test(int flags, const test_data_t *test) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - trace("InternetConnectA <--\n"); hic=InternetConnectA(hi, test->host, INTERNET_INVALID_PORT_NUMBER, NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); ok((hic != 0x0),"InternetConnect failed with error %u\n", GetLastError()); - trace("InternetConnectA -->\n"); if (hic == 0x0) goto abort; CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - trace("HttpOpenRequestA <--\n"); hor = HttpOpenRequestA(hic, test->post_data ? "POST" : "GET", test->path, NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RELOAD, 0xdeadbead); @@ -633,7 +628,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test) } else { ok((hor != 0x0),"HttpOpenRequest failed with error %u\n", GetLastError()); } - trace("HttpOpenRequestA -->\n"); if (hor == 0x0) goto abort; @@ -684,7 +678,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test) test_status_code(hor, 0); - trace("HttpSendRequestA -->\n"); if(test->post_data) { post_len = strlen(test->post_data); post_data = HeapAlloc(GetProcessHeap(), 0, post_len); @@ -698,7 +691,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test) else ok(res || (GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED), "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); - trace("HttpSendRequestA <--\n"); if (flags & INTERNET_FLAG_ASYNC) { WaitForSingleObject(complete_event, INFINITE); @@ -968,22 +960,17 @@ static void InternetReadFile_chunked_test(void) trace("Starting InternetReadFile chunked test\n"); - trace("InternetOpenA <--\n"); hi = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok((hi != 0x0),"InternetOpen failed with error %u\n", GetLastError()); - trace("InternetOpenA -->\n"); if (hi == 0x0) goto abort; - trace("InternetConnectA <--\n"); hic=InternetConnectA(hi, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); ok((hic != 0x0),"InternetConnect failed with error %u\n", GetLastError()); - trace("InternetConnectA -->\n"); if (hic == 0x0) goto abort; - trace("HttpOpenRequestA <--\n"); hor = HttpOpenRequestA(hic, "GET", "/tests/chunked", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RELOAD, 0xdeadbead); @@ -997,16 +984,13 @@ static void InternetReadFile_chunked_test(void) } else { ok((hor != 0x0),"HttpOpenRequest failed with error %u\n", GetLastError()); } - trace("HttpOpenRequestA -->\n"); if (hor == 0x0) goto abort; - trace("HttpSendRequestA -->\n"); SetLastError(0xdeadbeef); res = HttpSendRequestA(hor, "", -1, NULL, 0); ok(res || (GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED), "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); - trace("HttpSendRequestA <--\n"); test_request_flags(hor, 0); @@ -1092,10 +1076,8 @@ static void InternetReadFileExA_test(int flags) trace("Starting InternetReadFileExA test with flags 0x%x\n",flags); reset_events(); - trace("InternetOpenA <--\n"); hi = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, flags); ok((hi != 0x0),"InternetOpen failed with error %u\n", GetLastError()); - trace("InternetOpenA -->\n"); if (hi == 0x0) goto abort; @@ -1103,18 +1085,15 @@ static void InternetReadFileExA_test(int flags) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - trace("InternetConnectA <--\n"); hic=InternetConnectA(hi, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); ok((hic != 0x0),"InternetConnect failed with error %u\n", GetLastError()); - trace("InternetConnectA -->\n"); if (hic == 0x0) goto abort; CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - trace("HttpOpenRequestA <--\n"); hor = HttpOpenRequestA(hic, "GET", "/tests/redirect", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RELOAD, 0xdeadbead); @@ -1128,7 +1107,6 @@ static void InternetReadFileExA_test(int flags) } else { ok((hor != 0x0),"HttpOpenRequest failed with error %u\n", GetLastError()); } - trace("HttpOpenRequestA -->\n"); if (hor == 0x0) goto abort; @@ -1157,7 +1135,6 @@ static void InternetReadFileExA_test(int flags) else SET_WINE_ALLOW(INTERNET_STATUS_REQUEST_COMPLETE); - trace("HttpSendRequestA -->\n"); SetLastError(0xdeadbeef); rc = HttpSendRequestA(hor, "", -1, NULL, 0); if (flags & INTERNET_FLAG_ASYNC) @@ -1166,7 +1143,6 @@ static void InternetReadFileExA_test(int flags) else ok((rc != 0) || GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED, "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); - trace("HttpSendRequestA <--\n"); if (!rc && (GetLastError() == ERROR_IO_PENDING)) { WaitForSingleObject(complete_event, INFINITE);

1 0

Jacek Caban : gdi32: Use shifted values for NTGDI_OBJ_* constants.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 5794b2da18328ea22464b70cd243d279a236df7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5794b2da18328ea22464b70c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 3 13:59:47 2021 +0100 gdi32: Use shifted values for NTGDI_OBJ_* constants. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 4 ++-- dlls/gdi32/gdi_private.h | 6 +++--- dlls/gdi32/gdidc.c | 4 ++-- dlls/gdi32/gdiobj.c | 24 ++++++++++++------------ dlls/gdi32/ntgdi_private.h | 8 ++++---- dlls/gdi32/objects.c | 8 ++++---- dlls/gdi32/pen.c | 4 ++-- dlls/gdi32/tests/gdiobj.c | 9 ++++++--- include/ntgdi.h | 26 +++++++++++++------------- 9 files changed, 48 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5794b2da18328ea22464…

1 0