September 2021 - Wine-Commits

Zebediah Figura : server: Use a separate field to track whether an async is blocking.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 386c4bcf2f0d86a5a19c4836fc4b160c36ccb499 URL: https://source.winehq.org/git/wine.git/?a=commit;h=386c4bcf2f0d86a5a19c4836… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 3 23:11:41 2021 -0500 server: Use a separate field to track whether an async is blocking. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index d1627069086..8dba55afb01 100644 --- a/server/async.c +++ b/server/async.c @@ -55,6 +55,7 @@ struct async unsigned int terminated :1; /* async has been terminated */ unsigned int canceled :1; /* have we already queued cancellation for this async? */ unsigned int unknown_status :1; /* initial status is not known yet */ + unsigned int blocking :1; /* async is blocking */ struct completion *completion; /* completion associated with fd */ apc_param_t comp_key; /* completion key associated with fd */ unsigned int comp_flags; /* completion flags */ @@ -262,6 +263,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->terminated = 0; async->canceled = 0; async->unknown_status = 0; + async->blocking = !is_fd_overlapped( fd ); async->completion = fd_get_completion( fd, &async->comp_key ); async->comp_flags = 0; async->completion_callback = NULL; @@ -300,6 +302,8 @@ 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, data_size_t *result, int force_blocking ) { + async->blocking = force_blocking || async->blocking; + if (async->unknown_status) { /* even the initial status is not known yet */ @@ -338,7 +342,7 @@ obj_handle_t async_handoff( struct async *async, data_size_t *result, int force_ { async->direct_result = 0; async->pending = 1; - if (!force_blocking && async->fd && is_fd_overlapped( async->fd )) + if (!async->blocking) { close_handle( async->thread->process, async->wait_handle); async->wait_handle = 0;

1 0

Jacek Caban : gdi32: Factor out get_bitmap_info.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 839a951f673cf00decd33b212aff60127ffb72ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=839a951f673cf00decd33b21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 9 14:00:47 2021 +0200 gdi32: Factor out get_bitmap_info. 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/emfdc.c | 152 +++++++++++++++++++++++++++++------------------------ 1 file changed, 84 insertions(+), 68 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index df4515aee8e..84069bdba3a 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -107,6 +107,84 @@ static void emfdc_update_bounds( struct emf *emf, RECTL *rect ) } } +static UINT get_bitmap_info( HDC *hdc, HBITMAP *bitmap, BITMAPINFO *info ) +{ + HBITMAP blit_bitmap; + HDC blit_dc; + UINT info_size, bpp; + DIBSECTION dib; + + if (!(info_size = GetObjectW( *bitmap, sizeof(dib), &dib ))) return 0; + + if (info_size == sizeof(dib)) + { + blit_dc = *hdc; + blit_bitmap = *bitmap; + } + else + { + unsigned char dib_info_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *dib_info = (BITMAPINFO *)dib_info_buffer; + BITMAP bmp = dib.dsBm; + HPALETTE palette; + void *bits; + + assert( info_size == sizeof(BITMAP) ); + + dib_info->bmiHeader.biSize = sizeof(dib_info->bmiHeader); + dib_info->bmiHeader.biWidth = bmp.bmWidth; + dib_info->bmiHeader.biHeight = bmp.bmHeight; + dib_info->bmiHeader.biPlanes = 1; + dib_info->bmiHeader.biBitCount = bmp.bmBitsPixel; + dib_info->bmiHeader.biCompression = BI_RGB; + dib_info->bmiHeader.biSizeImage = 0; + dib_info->bmiHeader.biXPelsPerMeter = 0; + dib_info->bmiHeader.biYPelsPerMeter = 0; + dib_info->bmiHeader.biClrUsed = 0; + dib_info->bmiHeader.biClrImportant = 0; + switch (dib_info->bmiHeader.biBitCount) + { + case 16: + ((DWORD *)dib_info->bmiColors)[0] = 0xf800; + ((DWORD *)dib_info->bmiColors)[1] = 0x07e0; + ((DWORD *)dib_info->bmiColors)[2] = 0x001f; + break; + case 32: + ((DWORD *)dib_info->bmiColors)[0] = 0xff0000; + ((DWORD *)dib_info->bmiColors)[1] = 0x00ff00; + ((DWORD *)dib_info->bmiColors)[2] = 0x0000ff; + break; + default: + if (dib_info->bmiHeader.biBitCount > 8) break; + if (!(palette = GetCurrentObject( *hdc, OBJ_PAL ))) return FALSE; + if (!GetPaletteEntries( palette, 0, 256, (PALETTEENTRY *)dib_info->bmiColors )) + return FALSE; + } + + if (!(blit_dc = NtGdiCreateCompatibleDC( *hdc ))) return FALSE; + if (!(blit_bitmap = CreateDIBSection( blit_dc, dib_info, DIB_RGB_COLORS, &bits, NULL, 0 ))) + goto err; + if (!SelectObject( blit_dc, blit_bitmap )) goto err; + if (!BitBlt( blit_dc, 0, 0, bmp.bmWidth, bmp.bmHeight, *hdc, 0, 0, SRCCOPY )) + goto err; + } + if (!GetDIBits( blit_dc, blit_bitmap, 0, INT_MAX, NULL, info, DIB_RGB_COLORS )) + goto err; + + bpp = info->bmiHeader.biBitCount; + if (bpp <= 8) + return sizeof(BITMAPINFOHEADER) + (1 << bpp) * sizeof(RGBQUAD); + else if (bpp == 16 || bpp == 32) + return sizeof(BITMAPINFOHEADER) + 3 * sizeof(RGBQUAD); + + return sizeof(BITMAPINFOHEADER); + +err: + if (blit_dc && blit_dc != *hdc) DeleteDC( blit_dc ); + if (blit_bitmap && blit_bitmap != *bitmap) DeleteObject( blit_bitmap ); + return 0; +} + static UINT emfdc_add_handle( struct emf *emf, HGDIOBJ obj ) { UINT index; @@ -1178,80 +1256,18 @@ static BOOL emfdrv_stretchblt( struct emf *emf, INT x_dst, INT y_dst, INT width_ DWORD rop, DWORD type ) { BITMAPINFO src_info = {{ sizeof( src_info.bmiHeader ) }}; - UINT bmi_size, emr_size, size, bpp; + UINT bmi_size, emr_size, size; HBITMAP bitmap, blit_bitmap = NULL; EMRBITBLT *emr = NULL; BITMAPINFO *bmi; - DIBSECTION dib; HDC blit_dc; - int info_size; BOOL ret = FALSE; if (!(bitmap = GetCurrentObject( hdc_src, OBJ_BITMAP ))) return FALSE; - if (!(info_size = GetObjectW( bitmap, sizeof(dib), &dib ))) return FALSE; - - if (info_size == sizeof(DIBSECTION)) - { - blit_dc = hdc_src; - blit_bitmap = bitmap; - } - else - { - unsigned char dib_info_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; - BITMAPINFO *dib_info = (BITMAPINFO *)dib_info_buffer; - BITMAP bmp = dib.dsBm; - HPALETTE palette; - void *bits; - - assert( info_size == sizeof(BITMAP) ); - - dib_info->bmiHeader.biSize = sizeof(dib_info->bmiHeader); - dib_info->bmiHeader.biWidth = bmp.bmWidth; - dib_info->bmiHeader.biHeight = bmp.bmHeight; - dib_info->bmiHeader.biPlanes = 1; - dib_info->bmiHeader.biBitCount = bmp.bmBitsPixel; - dib_info->bmiHeader.biCompression = BI_RGB; - dib_info->bmiHeader.biSizeImage = 0; - dib_info->bmiHeader.biXPelsPerMeter = 0; - dib_info->bmiHeader.biYPelsPerMeter = 0; - dib_info->bmiHeader.biClrUsed = 0; - dib_info->bmiHeader.biClrImportant = 0; - switch (dib_info->bmiHeader.biBitCount) - { - case 16: - ((DWORD *)dib_info->bmiColors)[0] = 0xf800; - ((DWORD *)dib_info->bmiColors)[1] = 0x07e0; - ((DWORD *)dib_info->bmiColors)[2] = 0x001f; - break; - case 32: - ((DWORD *)dib_info->bmiColors)[0] = 0xff0000; - ((DWORD *)dib_info->bmiColors)[1] = 0x00ff00; - ((DWORD *)dib_info->bmiColors)[2] = 0x0000ff; - break; - default: - if (dib_info->bmiHeader.biBitCount > 8) break; - if (!(palette = GetCurrentObject( hdc_src, OBJ_PAL ))) return FALSE; - if (!GetPaletteEntries( palette, 0, 256, (PALETTEENTRY *)dib_info->bmiColors )) - return FALSE; - } - - if (!(blit_dc = NtGdiCreateCompatibleDC( hdc_src ))) return FALSE; - if (!(blit_bitmap = CreateDIBSection( blit_dc, dib_info, DIB_RGB_COLORS, &bits, NULL, 0 ))) - goto err; - if (!SelectObject( blit_dc, blit_bitmap )) goto err; - if (!BitBlt( blit_dc, 0, 0, bmp.bmWidth, bmp.bmHeight, hdc_src, 0, 0, SRCCOPY )) - goto err; - } - if (!GetDIBits( blit_dc, blit_bitmap, 0, INT_MAX, NULL, &src_info, DIB_RGB_COLORS )) - goto err; - bpp = src_info.bmiHeader.biBitCount; - if (bpp <= 8) - bmi_size = sizeof(BITMAPINFOHEADER) + (1 << bpp) * sizeof(RGBQUAD); - else if (bpp == 16 || bpp == 32) - bmi_size = sizeof(BITMAPINFOHEADER) + 3 * sizeof(RGBQUAD); - else - bmi_size = sizeof(BITMAPINFOHEADER); + blit_dc = hdc_src; + blit_bitmap = bitmap; + if (!(bmi_size = get_bitmap_info( &blit_dc, &blit_bitmap, &src_info ))) return FALSE; /* EMRSTRETCHBLT and EMRALPHABLEND have the same structure */ emr_size = type == EMR_BITBLT ? sizeof(EMRBITBLT) : sizeof(EMRSTRETCHBLT); @@ -1298,8 +1314,8 @@ static BOOL emfdrv_stretchblt( struct emf *emf, INT x_dst, INT y_dst, INT width_ err: HeapFree( GetProcessHeap(), 0, emr ); - if (blit_bitmap && blit_bitmap != bitmap) DeleteObject( blit_bitmap ); - if (blit_dc && blit_dc != hdc_src) DeleteDC( blit_dc ); + if (blit_bitmap != bitmap) DeleteObject( blit_bitmap ); + if (blit_dc != hdc_src) DeleteDC( blit_dc ); return ret; }

1 0

Jacek Caban : gdi32: Use EMR_MASKBLT to record MaskBlt.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: dcf7d7d5c4f550fa255b33adc0542f8a1934c48f URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcf7d7d5c4f550fa255b33ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 9 14:00:56 2021 +0200 gdi32: Use EMR_MASKBLT to record MaskBlt. And use NtGdiMaskBlt. 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 | 29 ++++++++------- dlls/gdi32/emfdc.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/gdidc.c | 17 +++++++++ include/ntgdi.h | 3 ++ 5 files changed, 134 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dcf7d7d5c4f550fa255b…

1 0

Jacek Caban : gdi32: Factor out get_icm_profile.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 5f139f141118cf99157c648ad4974d342f32f8db URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f139f141118cf99157c648a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 9 14:02:03 2021 +0200 gdi32: Factor out get_icm_profile. And move it to dc.c. 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 | 17 +++++++++++++++++ dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/icm.c | 32 ++++---------------------------- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index ae6119529f5..f7b56b06f6f 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1241,3 +1241,20 @@ DWORD WINAPI NtGdiSetLayout( HDC hdc, LONG wox, DWORD layout ) return old_layout; } + +/********************************************************************** + * get_icm_profile (win32u.@) + */ +BOOL get_icm_profile( HDC hdc, BOOL allow_default, DWORD *size, WCHAR *filename ) +{ + PHYSDEV physdev; + DC *dc; + BOOL ret; + + if (!(dc = get_dc_ptr(hdc))) return FALSE; + + physdev = GET_DC_PHYSDEV( dc, pGetICMProfile ); + ret = physdev->funcs->pGetICMProfile( physdev, allow_default, size, filename ); + release_dc_ptr(dc); + return ret; +} diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e1ba092a08e..efadf3a7c82 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -278,6 +278,8 @@ extern HENHMETAFILE EMF_Create_HENHMETAFILE( ENHMETAHEADER *emh, DWORD filesize, extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void *bits, UINT *usage ) DECLSPEC_HIDDEN; +extern BOOL get_icm_profile( HDC hdc, BOOL allow_default, DWORD *size, + WCHAR *filename ) DECLSPEC_HIDDEN; static inline int get_dib_stride( int width, int bpp ) { diff --git a/dlls/gdi32/icm.c b/dlls/gdi32/icm.c index 22aacb762e3..63377a9ab88 100644 --- a/dlls/gdi32/icm.c +++ b/dlls/gdi32/icm.c @@ -19,16 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <string.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" +#include "gdi_private.h" #include "winnls.h" -#include "winreg.h" - -#include "ntgdi_private.h" #include "wine/debug.h" @@ -78,20 +70,13 @@ INT WINAPI EnumICMProfilesW(HDC hdc, ICMENUMPROCW func, LPARAM lparam) { WCHAR profile[MAX_PATH]; DWORD size = ARRAYSIZE(profile); - DC *dc; - BOOL ret = FALSE; TRACE( "%p, %p, 0x%08lx\n", hdc, func, lparam ); if (!func) return -1; - if ((dc = get_dc_ptr(hdc))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetICMProfile ); - ret = physdev->funcs->pGetICMProfile( physdev, FALSE, &size, profile ); - release_dc_ptr(dc); - } + if (!get_icm_profile( hdc, FALSE, &size, profile )) return -1; /* FIXME: support multiple profiles */ - return ret ? func( profile, lparam ) : -1; + return func( profile, lparam ); } /********************************************************************** @@ -144,18 +129,9 @@ BOOL WINAPI GetICMProfileA(HDC hdc, LPDWORD size, LPSTR filename) */ BOOL WINAPI GetICMProfileW(HDC hdc, LPDWORD size, LPWSTR filename) { - BOOL ret = FALSE; - DC *dc = get_dc_ptr(hdc); - TRACE("%p, %p, %p\n", hdc, size, filename); - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetICMProfile ); - ret = physdev->funcs->pGetICMProfile( physdev, TRUE, size, filename ); - release_dc_ptr(dc); - } - return ret; + return get_icm_profile( hdc, TRUE, size, filename ); } /**********************************************************************

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 1be6c7f8da59486f5fe611d237756a024d2c4924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1be6c7f8da59486f5fe611d2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Sep 9 22:33:12 2021 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 428 +++++++++++++++++++++------------------------------------------ 1 file changed, 144 insertions(+), 284 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1be6c7f8da59486f5fe6…

1 0

Zebediah Figura : server: Cancel asyncs through fd_ops.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 4f1c7ba5f90b1627314b63c573b48baee575f387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f1c7ba5f90b1627314b63c5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 3 23:11:38 2021 -0500 server: Cancel asyncs through fd_ops. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 2 +- server/change.c | 1 + server/console.c | 6 ++++++ server/device.c | 1 + server/fd.c | 10 ++++++++++ server/file.c | 1 + server/file.h | 4 ++++ server/mailslot.c | 3 +++ server/mapping.c | 1 + server/named_pipe.c | 3 +++ server/serial.c | 1 + server/sock.c | 2 ++ 12 files changed, 34 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f1c7ba5f90b1627314b…

1 0

Zebediah Figura : server: Queue a cancel IRP in the device file cancel_async callback.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 32347fcf08440d9faad8902896df3e107699e35e URL: https://source.winehq.org/git/wine.git/?a=commit;h=32347fcf08440d9faad89028… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 3 23:11:39 2021 -0500 server: Queue a cancel IRP in the device file cancel_async callback. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 2 ++ dlls/ntoskrnl.exe/ntoskrnl.c | 22 ---------------------- server/async.c | 9 ++++++++- server/device.c | 23 ++++++++++------------- 4 files changed, 20 insertions(+), 36 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 1d1ad56e9f6..b0431b0f3fd 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -349,6 +349,8 @@ static void test_v1_server(void) ret = CancelIo(queue); ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + ret = WaitForSingleObject(ovl.hEvent, 100); + ok(!ret, "Got %u.\n", ret); ret_size = 0xdeadbeef; ret = GetOverlappedResult(queue, &ovl, &ret_size, FALSE); ok(!ret, "Expected failure.\n"); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 5c3a42c3d76..f7a9d8e8efe 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -419,17 +419,6 @@ static void *create_file_object( HANDLE handle ) DECLARE_CRITICAL_SECTION(irp_completion_cs); -static void WINAPI cancel_completed_irp( DEVICE_OBJECT *device, IRP *irp ) -{ - TRACE( "(%p %p)\n", device, irp ); - - IoReleaseCancelSpinLock(irp->CancelIrql); - - irp->IoStatus.u.Status = STATUS_CANCELLED; - irp->IoStatus.Information = 0; - IoCompleteRequest(irp, IO_NO_INCREMENT); -} - /* transfer result of IRP back to wineserver */ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) { @@ -455,17 +444,6 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, } SERVER_END_REQ; - if (status == STATUS_MORE_PROCESSING_REQUIRED) - { - /* IRP is complete, but server may have already ordered cancel call. In such case, - * it will return STATUS_MORE_PROCESSING_REQUIRED, leaving the IRP alive until - * cancel frees it. */ - if (irp->Cancel) - status = STATUS_SUCCESS; - else - IoSetCancelRoutine( irp, cancel_completed_irp ); - } - if (irp->UserBuffer != irp->AssociatedIrp.SystemBuffer) { HeapFree( GetProcessHeap(), 0, irp->UserBuffer ); diff --git a/server/async.c b/server/async.c index 278048bc7a3..d1627069086 100644 --- a/server/async.c +++ b/server/async.c @@ -53,6 +53,7 @@ struct async unsigned int direct_result :1;/* a flag if we're passing result directly from request instead of APC */ unsigned int alerted :1; /* fd is signaled, but we are waiting for client-side I/O */ unsigned int terminated :1; /* async has been terminated */ + unsigned int canceled :1; /* have we already queued cancellation for this async? */ unsigned int unknown_status :1; /* initial status is not known yet */ struct completion *completion; /* completion associated with fd */ apc_param_t comp_key; /* completion key associated with fd */ @@ -259,6 +260,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->direct_result = 0; async->alerted = 0; async->terminated = 0; + async->canceled = 0; async->unknown_status = 0; async->completion = fd_get_completion( fd, &async->comp_key ); async->comp_flags = 0; @@ -494,14 +496,19 @@ static int cancel_async( struct process *process, struct object *obj, struct thr struct async *async; int woken = 0; + /* FIXME: it would probably be nice to replace the "canceled" flag with a + * single LIST_FOR_EACH_ENTRY_SAFE, but currently cancelling an async can + * cause other asyncs to be removed via async_reselect() */ + restart: LIST_FOR_EACH_ENTRY( async, &process->asyncs, struct async, process_entry ) { - if (async->terminated) continue; + if (async->terminated || async->canceled) continue; if ((!obj || (get_fd_user( async->fd ) == obj)) && (!thread || async->thread == thread) && (!iosb || async->data.iosb == iosb)) { + async->canceled = 1; fd_cancel_async( async->fd, async ); woken++; goto restart; diff --git a/server/device.c b/server/device.c index 2310de43ac4..9515d238fb4 100644 --- a/server/device.c +++ b/server/device.c @@ -205,7 +205,7 @@ static void device_file_read( struct fd *fd, struct async *async, file_pos_t pos static void device_file_write( struct fd *fd, struct async *async, file_pos_t pos ); static void device_file_flush( struct fd *fd, struct async *async ); static void device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); -static void device_file_reselect_async( struct fd *fd, struct async_queue *queue ); +static void device_file_cancel_async( struct fd *fd, struct async *async ); static void device_file_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); static const struct object_ops device_file_ops = @@ -243,9 +243,9 @@ static const struct fd_ops device_file_fd_ops = default_fd_get_file_info, /* get_file_info */ device_file_get_volume_info, /* get_volume_info */ device_file_ioctl, /* ioctl */ - default_fd_cancel_async, /* cancel_async */ + device_file_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ - device_file_reselect_async /* reselect_async */ + default_fd_reselect_async, /* reselect_async */ }; @@ -687,21 +687,21 @@ static void cancel_irp_call( struct irp_call *irp ) add_irp_to_queue( irp->file->device->manager, cancel_irp, NULL ); release_object( cancel_irp ); } - - set_irp_result( irp, STATUS_CANCELLED, NULL, 0, 0 ); } -static void device_file_reselect_async( struct fd *fd, struct async_queue *queue ) +static void device_file_cancel_async( struct fd *fd, struct async *async ) { struct device_file *file = get_fd_user( fd ); struct irp_call *irp; LIST_FOR_EACH_ENTRY( irp, &file->requests, struct irp_call, dev_entry ) - if (irp->iosb->status != STATUS_PENDING) + { + if (irp->async == async) { cancel_irp_call( irp ); return; } + } } static struct device *create_device( struct object *root, const struct unicode_str *name, @@ -1018,12 +1018,9 @@ DECL_HANDLER(set_irp_result) if ((irp = (struct irp_call *)get_handle_obj( current->process, req->handle, 0, &irp_call_ops ))) { - if (!irp->canceled) - set_irp_result( irp, req->status, get_req_data(), get_req_data_size(), req->size ); - else if(irp->user_ptr) /* cancel already queued */ - set_error( STATUS_MORE_PROCESSING_REQUIRED ); - else /* we may be still dispatching the IRP. don't bother queuing cancel if it's already complete */ - irp->canceled = 0; + set_irp_result( irp, req->status, get_req_data(), get_req_data_size(), req->size ); + /* we may be still dispatching the IRP. don't bother queuing cancel if it's already complete */ + irp->canceled = 0; close_handle( current->process, req->handle ); /* avoid an extra round-trip for close */ release_object( irp ); }

1 0

Zebediah Figura : ntoskrnl/tests: Test a pending NtQueryVolumeInformation call on an overlapped file handle.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 0f7c784fb7b1309382d0b2cf4656f28c297f9383 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f7c784fb7b1309382d0b2cf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 3 23:11:40 2021 -0500 ntoskrnl/tests: Test a pending NtQueryVolumeInformation call on an overlapped file handle. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 59 +++++++++++++++++++++++++++++++------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 44 ++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 10 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 0d40053b0e6..8cb97507ab5 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1959,15 +1959,12 @@ static void test_object_name(void) ok(!name->Name.MaximumLength, "got maximum length %u\n", name->Name.MaximumLength); } -static PIO_WORKITEM main_test_work_item; +static PIO_WORKITEM work_item; static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) { IRP *irp = context; - IoFreeWorkItem(main_test_work_item); - main_test_work_item = NULL; - test_current_thread(TRUE); test_critical_region(FALSE); test_call_driver(device); @@ -2337,13 +2334,8 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_process_memory(test_input); test_permanence(); - if (main_test_work_item) return STATUS_UNEXPECTED_IO_ERROR; - - main_test_work_item = IoAllocateWorkItem(lower_device); - ok(main_test_work_item != NULL, "main_test_work_item = NULL\n"); - IoMarkIrpPending(irp); - IoQueueWorkItem(main_test_work_item, main_test_task, DelayedWorkQueue, irp); + IoQueueWorkItem(work_item, main_test_task, DelayedWorkQueue, irp); return STATUS_PENDING; } @@ -2611,6 +2603,32 @@ static NTSTATUS WINAPI driver_FlushBuffers(DEVICE_OBJECT *device, IRP *irp) return STATUS_PENDING; } +static void WINAPI blocking_irp_task(DEVICE_OBJECT *device, void *context) +{ + LARGE_INTEGER timeout; + IRP *irp = context; + + timeout.QuadPart = -100 * 10000; + KeDelayExecutionThread( KernelMode, FALSE, &timeout ); + + irp->IoStatus.Status = STATUS_SUCCESS; + irp->IoStatus.Information = 0; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + +static void WINAPI blocking_irp_failure_task(DEVICE_OBJECT *device, void *context) +{ + LARGE_INTEGER timeout; + IRP *irp = context; + + timeout.QuadPart = -100 * 10000; + KeDelayExecutionThread( KernelMode, FALSE, &timeout ); + + irp->IoStatus.Status = STATUS_DEVICE_NOT_READY; + irp->IoStatus.Information = 0; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + static BOOL compare_file_name(const struct file_context *context, const WCHAR *expect) { return context->namelen == wcslen(expect) * sizeof(WCHAR) @@ -2717,6 +2735,21 @@ static NTSTATUS WINAPI driver_QueryVolumeInformation(DEVICE_OBJECT *device, IRP ret = STATUS_SUCCESS; break; } + + case FileFsSizeInformation: + { + IoMarkIrpPending(irp); + IoQueueWorkItem(work_item, blocking_irp_task, DelayedWorkQueue, irp); + return STATUS_PENDING; + } + + case FileFsFullSizeInformation: + { + IoMarkIrpPending(irp); + IoQueueWorkItem(work_item, blocking_irp_failure_task, DelayedWorkQueue, irp); + return STATUS_PENDING; + } + default: ret = STATUS_NOT_IMPLEMENTED; break; @@ -2744,6 +2777,9 @@ static VOID WINAPI driver_Unload(DRIVER_OBJECT *driver) DbgPrint("unloading driver\n"); + IoFreeWorkItem(work_item); + work_item = NULL; + RtlInitUnicodeString(&linkW, L"\\DosDevices\\WineTestDriver"); IoDeleteSymbolicLink(&linkW); @@ -2802,5 +2838,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) IoAttachDeviceToDeviceStack(upper_device, lower_device); upper_device->Flags &= ~DO_DEVICE_INITIALIZING; + work_item = IoAllocateWorkItem(lower_device); + ok(work_item != NULL, "work_item = NULL\n"); + return STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 7b61f131e96..682af256b43 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1139,6 +1139,49 @@ static void test_object_info(void) CloseHandle(file); } +static void test_blocking_irp(void) +{ + char buffer[40]; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE file; + + file = CreateFileA("\\\\.\\WineTestDriver\\", FILE_ALL_ACCESS, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); + + memset(&io, 0xcc, sizeof(io)); + status = NtQueryVolumeInformationFile(file, &io, buffer, sizeof(buffer), FileFsSizeInformation); + ok(!status, "got %#x\n", status); + ok(!io.Status, "got iosb status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); + + io.Status = 0xdeadf00d; + io.Information = 0xdeadf00d; + status = NtQueryVolumeInformationFile(file, &io, buffer, sizeof(buffer), FileFsFullSizeInformation); + ok(status == STATUS_DEVICE_NOT_READY, "got %#x\n", status); + todo_wine ok(io.Status == 0xdeadf00d, "got iosb status %#x\n", io.Status); + todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); + + CloseHandle(file); + + file = CreateFileA("\\\\.\\WineTestDriver\\", FILE_ALL_ACCESS, 0, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); + ok(file != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); + + memset(&io, 0xcc, sizeof(io)); + status = NtQueryVolumeInformationFile(file, &io, buffer, sizeof(buffer), FileFsSizeInformation); + todo_wine ok(!status, "got %#x\n", status); + todo_wine ok(!io.Status, "got iosb status %#x\n", io.Status); + todo_wine ok(!io.Information, "got information %#Ix\n", io.Information); + + memset(&io, 0xcc, sizeof(io)); + status = NtQueryVolumeInformationFile(file, &io, buffer, sizeof(buffer), FileFsFullSizeInformation); + todo_wine ok(status == STATUS_DEVICE_NOT_READY, "got %#x\n", status); + todo_wine ok(io.Status == STATUS_DEVICE_NOT_READY, "got iosb status %#x\n", io.Status); + todo_wine ok(!io.Information, "got information %#Ix\n", io.Information); + + CloseHandle(file); +} + static void test_driver3(struct testsign_context *ctx) { WCHAR filename[MAX_PATH]; @@ -3487,6 +3530,7 @@ START_TEST(ntoskrnl) test_file_handles(); test_return_status(); test_object_info(); + test_blocking_irp(); /* We need a separate ioctl to call IoDetachDevice(); calling it in the * driver unload routine causes a live-lock. */

1 0

Jacek Caban : gdi32: Use EMR_PLGBLT to record PlgBlt.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 03ec246e5282ab3f76e1df312272598eeba69260 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03ec246e5282ab3f76e1df31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 9 14:01:02 2021 +0200 gdi32: Use EMR_PLGBLT to record PlgBlt. And use NtGdiPlgBlt. 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 | 23 +++++------ dlls/gdi32/emfdc.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/gdidc.c | 16 ++++++++ include/ntgdi.h | 3 ++ 5 files changed, 134 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index a1b4b6fa393..33ce6966f87 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -1014,12 +1014,11 @@ BOOL WINAPI NtGdiAlphaBlend( HDC hdcDst, int xDst, int yDst, int widthDst, int h } /********************************************************************* - * PlgBlt [GDI32.@] - * + * NtGdiPlgBlt (win32u.@) */ -BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, - HDC hdcSrc, INT nXSrc, INT nYSrc, INT nWidth, - INT nHeight, HBITMAP hbmMask, INT xMask, INT yMask) +BOOL WINAPI NtGdiPlgBlt( HDC hdcDest, const POINT *lpPoint, HDC hdcSrc, INT nXSrc, INT nYSrc, + INT nWidth, INT nHeight, HBITMAP hbmMask, INT xMask, INT yMask, + DWORD bk_color ) { DWORD prev_mode; /* parallelogram coords */ @@ -1071,20 +1070,18 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, rect[2].x*(rect[0].y*plg[1].y - rect[1].y*plg[0].y) ) / det; - GetWorldTransform(hdcSrc,&SrcXf); + NtGdiGetTransform( hdcSrc, 0x203, &SrcXf ); combine_transform( &xf, &xf, &SrcXf ); /* save actual dest transform */ - GetWorldTransform(hdcDest,&oldDestXf); + NtGdiGetTransform( hdcDest, 0x203, &oldDestXf ); - SetWorldTransform(hdcDest,&xf); + NtGdiModifyWorldTransform( hdcDest, &xf, MWT_SET ); /* now destination and source DCs use same coords */ - MaskBlt(hdcDest,nXSrc,nYSrc,nWidth,nHeight, - hdcSrc, nXSrc,nYSrc, - hbmMask,xMask,yMask, - SRCCOPY); + NtGdiMaskBlt( hdcDest, nXSrc, nYSrc, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, + hbmMask, xMask, yMask, SRCCOPY, 0 ); /* restore dest DC */ - SetWorldTransform(hdcDest,&oldDestXf); + NtGdiModifyWorldTransform( hdcDest, &oldDestXf, MWT_SET ); NtGdiGetAndSetDCDword( hdcDest, NtGdiSetGraphicsMode, prev_mode, NULL ); return TRUE; diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 66c87ef9412..79220a5e1e0 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -1484,6 +1484,109 @@ err: return ret; } +BOOL EMFDC_PlgBlt( DC_ATTR *dc_attr, const POINT *points, HDC hdc_src, INT x_src, INT y_src, + INT width, INT height, HBITMAP mask, INT x_mask, INT y_mask ) +{ + unsigned char mask_info_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *mask_bits_info = (BITMAPINFO *)mask_info_buffer; + struct emf *emf = dc_attr->emf; + BITMAPINFO mask_info = {{ sizeof( mask_info.bmiHeader ) }}; + BITMAPINFO src_info = {{ sizeof( src_info.bmiHeader ) }}; + HBITMAP bitmap, blit_bitmap = NULL, mask_bitmap = NULL; + UINT bmi_size, size, mask_info_size = 0; + EMRPLGBLT *emr = NULL; + BITMAPINFO *bmi; + HDC blit_dc, mask_dc = NULL; + int x_min, y_min, x_max, y_max, i; + BOOL ret = FALSE; + + if (!(bitmap = GetCurrentObject( hdc_src, OBJ_BITMAP ))) return FALSE; + + blit_dc = hdc_src; + blit_bitmap = bitmap; + if (!(bmi_size = get_bitmap_info( &blit_dc, &blit_bitmap, &src_info ))) return FALSE; + + if (mask) + { + mask_dc = hdc_src; + mask_bitmap = mask; + if (!(mask_info_size = get_bitmap_info( &mask_dc, &mask_bitmap, &mask_info ))) goto err; + if (mask_info.bmiHeader.biBitCount == 1) + mask_info_size = sizeof(BITMAPINFOHEADER); /* don't include colors */ + } + else mask_info.bmiHeader.biSizeImage = 0; + + size = sizeof(*emr) + bmi_size + src_info.bmiHeader.biSizeImage + + mask_info_size + mask_info.bmiHeader.biSizeImage; + + if (!(emr = HeapAlloc(GetProcessHeap(), 0, size))) goto err; + + emr->emr.iType = EMR_PLGBLT; + emr->emr.nSize = size; + + /* FIXME: not exactly what native does */ + x_min = x_max = points[1].x + points[2].x - points[0].x; + y_min = y_max = points[1].y + points[2].y - points[0].y; + for (i = 0; i < ARRAYSIZE(emr->aptlDest); i++) + { + x_min = min( x_min, points[i].x ); + y_min = min( y_min, points[i].y ); + x_max = max( x_max, points[i].x ); + y_max = max( y_min, points[i].y ); + } + emr->rclBounds.left = x_min; + emr->rclBounds.top = y_min; + emr->rclBounds.right = x_max; + emr->rclBounds.bottom = y_max; + memcpy( emr->aptlDest, points, sizeof(emr->aptlDest) ); + emr->xSrc = x_src; + emr->ySrc = y_src; + emr->cxSrc = width; + emr->cySrc = height; + NtGdiGetTransform( hdc_src, 0x204, &emr->xformSrc ); + emr->crBkColorSrc = GetBkColor( hdc_src ); + emr->iUsageSrc = DIB_RGB_COLORS; + emr->offBmiSrc = sizeof(*emr); + emr->cbBmiSrc = bmi_size; + emr->offBitsSrc = emr->offBmiSrc + bmi_size; + emr->cbBitsSrc = src_info.bmiHeader.biSizeImage; + emr->xMask = x_mask; + emr->yMask = y_mask; + emr->iUsageMask = DIB_PAL_MONO; + emr->offBmiMask = mask_info_size ? emr->offBitsSrc + emr->cbBitsSrc : 0; + emr->cbBmiMask = mask_info_size; + emr->offBitsMask = emr->offBmiMask + emr->cbBmiMask; + emr->cbBitsMask = mask_info.bmiHeader.biSizeImage; + + bmi = (BITMAPINFO *)((char *)emr + emr->offBmiSrc); + bmi->bmiHeader = src_info.bmiHeader; + ret = GetDIBits( blit_dc, blit_bitmap, 0, src_info.bmiHeader.biHeight, + (char *)emr + emr->offBitsSrc, bmi, DIB_RGB_COLORS ); + if (!ret) goto err; + + if (mask_info_size) + { + mask_bits_info->bmiHeader = mask_info.bmiHeader; + ret = GetDIBits( blit_dc, mask_bitmap, 0, mask_info.bmiHeader.biHeight, + (char *)emr + emr->offBitsMask, mask_bits_info, DIB_RGB_COLORS ); + if (ret) memcpy( (char *)emr + emr->offBmiMask, mask_bits_info, mask_info_size ); + } + + if (ret) + { + ret = emfdc_record( emf, (EMR *)emr ); + if (ret) emfdc_update_bounds( emf, &emr->rclBounds ); + } + +err: + HeapFree( GetProcessHeap(), 0, emr ); + if (mask_bitmap != mask) DeleteObject( mask_bitmap ); + if (mask_dc != hdc_src) DeleteObject( mask_dc ); + if (blit_bitmap != bitmap) DeleteObject( blit_bitmap ); + if (blit_dc != hdc_src) DeleteDC( blit_dc ); + return ret; +} + BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, INT height_dst, INT x_src, INT y_src, INT width_src, INT height_src, const void *bits, const BITMAPINFO *info, UINT usage, DWORD rop ) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2f0a6b4c0d7..e1ba092a08e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -212,6 +212,8 @@ extern BOOL EMFDC_MoveTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_OffsetClipRgn( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PaintRgn( DC_ATTR *dc_attr, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PatBlt( DC_ATTR *dc_attr, INT left, INT top, INT width, INT height, DWORD rop ); +extern BOOL EMFDC_PlgBlt( DC_ATTR *dc_attr, const POINT *point, HDC hdc_src, INT x_src, INT y_src, + INT width, INT height, HBITMAP mask, INT x_mask, INT y_mask ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PolyBezier( DC_ATTR *dc_attr, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PolyBezierTo( DC_ATTR *dc_attr, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PolyDraw( DC_ATTR *dc_attr, const POINT *points, const BYTE *types, diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 25ef85f2db5..61b318ce067 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1516,6 +1516,22 @@ BOOL WINAPI MaskBlt( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT height_ds mask, x_mask, y_mask, rop, 0 /* FIXME */ ); } +/*********************************************************************** + * PlgBlt (GDI32.@) + */ +BOOL WINAPI PlgBlt( HDC hdc, const POINT *points, HDC hdc_src, INT x_src, INT y_src, + INT width, INT height, HBITMAP mask, INT x_mask, INT y_mask ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_PlgBlt( dc_attr, points, hdc_src, x_src, y_src, + width, height, mask, x_mask, y_mask )) + return FALSE; + return NtGdiPlgBlt( hdc, points, hdc_src, x_src, y_src, width, height, + mask, x_mask, y_mask, 0 /* FIXME */ ); +} + /****************************************************************************** * GdiAlphaBlend (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index cb7b9639e20..44a27878792 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -353,6 +353,9 @@ INT WINAPI NtGdiOffsetClipRgn( HDC hdc, INT x, INT y ); INT WINAPI NtGdiOffsetRgn( HRGN hrgn, INT x, INT y ); BOOL WINAPI NtGdiPatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop ); HRGN WINAPI NtGdiPathToRegion( HDC hdc ); +BOOL WINAPI NtGdiPlgBlt( HDC hdc, const POINT *point, HDC hdc_src, INT x_src, INT y_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, DWORD count, UINT function );

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 6e18d3d2e250e48bcd0df298a7406077bf9b45d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e18d3d2e250e48bcd0df298… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Sep 8 22:39:59 2021 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 232 ++++++++++++++++++++------------------------------------------- 1 file changed, 74 insertions(+), 158 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e18d3d2e250e48bcd0d…

1 0