September 2021 - Wine-commits

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: c263dfcbaaaa8c3f8244ce30c278a277c31aa746 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c263dfcbaaaa8c3f8244ce30… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Sep 11 13:37:20 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 | 188 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 94 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c263dfcbaaaa8c3f8244…

1 0

Roberto Pungartnik : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: df71272b0c373dafd5882a8c683c0dd84c0ac797 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df71272b0c373dafd5882a8c… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sun Sep 12 11:14:32 2021 -0300 po: Update Brazilian Portuguese translation. Signed-off-by: Bob <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 452 ++++++++++++++++++++++++------------------------------------ 1 file changed, 183 insertions(+), 269 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=df71272b0c373dafd588…

1 0

Zebediah Figura : nsiproxy: Return the IOSB status from nsi_ioctl().
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: f18d72ac1856056070d396ecb732d0bf5061dfb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f18d72ac1856056070d396ec… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Sep 12 16:07:49 2021 -0500 nsiproxy: Return the IOSB status from nsi_ioctl(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index c4db45dfad2..80a025acfc9 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -159,6 +159,7 @@ static void nsiproxy_get_parameter( IRP *irp ) static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + NTSTATUS status; TRACE( "ioctl %x insize %u outsize %u\n", irpsp->Parameters.DeviceIoControl.IoControlCode, @@ -185,8 +186,9 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) break; } + status = irp->IoStatus.u.Status; IoCompleteRequest( irp, IO_NO_INCREMENT ); - return STATUS_SUCCESS; + return status; } static int add_device( DRIVER_OBJECT *driver )

1 0

Zebediah Figura : ntoskrnl: Report IRP completion via get_next_device_request if possible.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: 69ea35a9540e88d7486d804ada8c90d6ec46d967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ea35a9540e88d7486d804a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Sep 12 16:07:50 2021 -0500 ntoskrnl: Report IRP completion via get_next_device_request if possible. Although there is arguably an advantage to saving a server request, the impetus for this patch is make it easier for the server to process the IRP return status before (or at the same time as) it processes the IOSB status. This allows simpler handling of the case where the IRP handler returns STATUS_PENDING but completes the IRP before returning. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 150 ++++++++++++++++++++++++++++++----------- include/wine/server_protocol.h | 5 +- server/device.c | 21 +++--- server/protocol.def | 2 + server/request.h | 3 +- server/trace.c | 3 +- 6 files changed, 131 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=69ea35a9540e88d7486d…

1 0

Zebediah Figura : ntoskrnl: Report the initial status of an IRP separately from the IOSB status.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: 484b78bda01b4943023cae859271aa32b949c6ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=484b78bda01b4943023cae85… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Sep 12 16:07:51 2021 -0500 ntoskrnl: Report the initial status of an IRP separately from the IOSB status. Based on a patch by Chip Davis. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30155 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 22 ++++++++--------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 49 ++++++++++++++++---------------------- include/wine/server_protocol.h | 4 ++-- server/async.c | 38 ++++++++++++++++++++++------- server/device.c | 31 +++++++++++++++++------- server/file.h | 2 ++ server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 1 + 9 files changed, 91 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=484b78bda01b4943023c…

1 0

Alexandre Julliard : Wine release 6.17
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: website Branch: master Commit: 3e737a8f14d9deefe03f580c92443763f25c39d2 URL: https://source.winehq.org/git/website.git/?a=commit;h=3e737a8f14d9deefe03f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 10 22:30:02 2021 +0200 Wine release 6.17 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021091001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2021091001.xml b/news/en/2021091001.xml new file mode 100644 index 00000000..f8d87ade --- /dev/null +++ b/news/en/2021091001.xml @@ -0,0 +1,17 @@ +<news> +<date>September 10, 2021</date> +<title>Wine 6.17 Released</title> +<body> + The Wine development release 6.17 is now available. + <a href="{$root}/announce/6.17">What's new</a> in this release: +<ul> + <li>WineCfg program converted to PE.</li> + <li>Better high-DPI support in builtin applications.</li> + <li>More preparation work for the GDI syscall interface.</li> + <li>Improved debugger support in Wow64 mode.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.17.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Jacek Caban : gdi32: Directly use ntgdi functions in font.c.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: a8131cb3e709eeab34f1f4e2b078f1935a921e66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8131cb3e709eeab34f1f4e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 10 14:28:30 2021 +0200 gdi32: Directly use ntgdi functions in font.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/font.c | 51 +++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d32e8b8fe40..5758a999561 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3760,9 +3760,9 @@ static HFONT CDECL font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) { LOGFONTW lf; FMAT2 dcmat; - BOOL can_use_bitmap = !!(GetDeviceCaps( dc->hSelf, TEXTCAPS ) & TC_RA_ABLE); + BOOL can_use_bitmap = !!(NtGdiGetDeviceCaps( dc->hSelf, TEXTCAPS ) & TC_RA_ABLE); - GetObjectW( hfont, sizeof(lf), &lf ); + NtGdiExtGetObjectW( hfont, sizeof(lf), &lf ); switch (lf.lfQuality) { case NONANTIALIASED_QUALITY: @@ -4218,7 +4218,7 @@ static void update_font_code_page( DC *dc, HANDLE font ) { LOGFONTW lf; - GetObjectW( font, sizeof(lf), &lf ); + NtGdiExtGetObjectW( font, sizeof(lf), &lf ); if (!(lf.lfClipPrecision & CLIP_DFA_DISABLE)) charset = DEFAULT_CHARSET; } @@ -4515,8 +4515,8 @@ BOOL WINAPI NtGdiGetTextMetricsW( HDC hdc, TEXTMETRICW *metrics, ULONG flags ) /* device layer returns values in device units * therefore we have to convert them to logical */ - metrics->tmDigitizedAspectX = GetDeviceCaps(hdc, LOGPIXELSX); - metrics->tmDigitizedAspectY = GetDeviceCaps(hdc, LOGPIXELSY); + metrics->tmDigitizedAspectX = NtGdiGetDeviceCaps(hdc, LOGPIXELSX); + metrics->tmDigitizedAspectY = NtGdiGetDeviceCaps(hdc, LOGPIXELSY); metrics->tmHeight = height_to_LP( dc, metrics->tmHeight ); metrics->tmAscent = height_to_LP( dc, metrics->tmAscent ); metrics->tmDescent = height_to_LP( dc, metrics->tmDescent ); @@ -4578,8 +4578,8 @@ UINT WINAPI NtGdiGetOutlineTextMetricsInternalW( HDC hdc, UINT cbData, if (lpOTM && ret) { - output->otmTextMetrics.tmDigitizedAspectX = GetDeviceCaps(hdc, LOGPIXELSX); - output->otmTextMetrics.tmDigitizedAspectY = GetDeviceCaps(hdc, LOGPIXELSY); + output->otmTextMetrics.tmDigitizedAspectX = NtGdiGetDeviceCaps(hdc, LOGPIXELSX); + output->otmTextMetrics.tmDigitizedAspectY = NtGdiGetDeviceCaps(hdc, LOGPIXELSY); output->otmTextMetrics.tmHeight = height_to_LP( dc, output->otmTextMetrics.tmHeight ); output->otmTextMetrics.tmAscent = height_to_LP( dc, output->otmTextMetrics.tmAscent ); output->otmTextMetrics.tmDescent = height_to_LP( dc, output->otmTextMetrics.tmDescent ); @@ -4700,7 +4700,7 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT flags, UINT aa_flags, for (i = 0; i < ARRAY_SIZE( indices ); i++) { index = indices[i]; - ret = GetGlyphOutlineW( hdc, index, aa_flags, metrics, 0, NULL, &identity ); + ret = NtGdiGetGlyphOutline( hdc, index, aa_flags, metrics, 0, NULL, &identity, FALSE ); if (ret != GDI_ERROR) break; } @@ -4722,7 +4722,8 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT flags, UINT aa_flags, image->is_copy = TRUE; image->free = free_heap_bits; - ret = GetGlyphOutlineW( hdc, index, aa_flags, metrics, size, image->ptr, &identity ); + ret = NtGdiGetGlyphOutline( hdc, index, aa_flags, metrics, size, image->ptr, + &identity, FALSE ); if (ret == GDI_ERROR) { HeapFree( GetProcessHeap(), 0, image->ptr ); @@ -4811,7 +4812,11 @@ static void draw_glyph( DC *dc, INT origin_x, INT origin_y, const GLYPHMETRICS * } assert( count <= max_count ); dp_to_lp( dc, pts, count ); - for (i = 0; i < count; i += 2) Polyline( dc->hSelf, pts + i, 2 ); + for (i = 0; i < count; i += 2) + { + const UINT pts_count = 2; + NtGdiPolyPolyDraw( dc->hSelf, pts + i, &pts_count, 1, NtGdiPolyPolyline ); + } HeapFree( GetProcessHeap(), 0, pts ); } @@ -4830,7 +4835,8 @@ BOOL CDECL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT if (flags & ETO_OPAQUE) { RECT rc = *rect; - HBRUSH brush = CreateSolidBrush( NtGdiGetNearestColor( dev->hdc, dc->attr->background_color )); + COLORREF brush_color = NtGdiGetNearestColor( dev->hdc, dc->attr->background_color ); + HBRUSH brush = NtGdiCreateSolidBrush( brush_color, NULL); if (brush) { @@ -4922,7 +4928,7 @@ BOOL CDECL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT } } - pen = CreatePen( PS_SOLID, 1, dc->attr->text_color ); + pen = NtGdiCreatePen( PS_SOLID, 1, dc->attr->text_color, NULL ); orig = NtGdiSelectPen( dev->hdc, pen ); for (i = 0; i < count; i++) @@ -5062,8 +5068,8 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr y = pt.y; } - GetTextMetricsW(hdc, &tm); - GetObjectW(dc->hFont, sizeof(lf), &lf); + NtGdiGetTextMetricsW( hdc, &tm, 0 ); + NtGdiExtGetObjectW( dc->hFont, sizeof(lf), &lf ); if(!(tm.tmPitchAndFamily & TMPF_VECTOR)) /* Non-scalable fonts shouldn't be rotated */ lf.lfEscapement = 0; @@ -5107,8 +5113,8 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr x = pt.x; y = pt.y; - char_extra = GetTextCharacterExtra(hdc); - if (char_extra && lpDx && GetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER) + char_extra = dc->attr->char_extra; + if (char_extra && lpDx && NtGdiGetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER) char_extra = 0; /* Printer drivers don't add char_extra if lpDx is supplied */ if(char_extra || dc->breakExtra || breakRem || lpDx || lf.lfEscapement != 0) @@ -5185,10 +5191,7 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr { POINT desired[2]; - if(flags & ETO_GLYPH_INDEX) - GetTextExtentPointI(hdc, str, count, &sz); - else - GetTextExtentPointW(hdc, str, count, &sz); + NtGdiGetTextExtentExW( hdc, str, count, 0, NULL, NULL, &sz, !!(flags & ETO_GLYPH_INDEX) ); desired[0].x = desired[0].y = 0; desired[1].x = sz.cx; desired[1].y = 0; @@ -5216,7 +5219,7 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr pt.x = x + width.x; pt.y = y + width.y; dp_to_lp(dc, &pt, 1); - MoveToEx(hdc, pt.x, pt.y, NULL); + NtGdiMoveTo( hdc, pt.x, pt.y, NULL ); } break; @@ -5233,7 +5236,7 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr pt.x = x; pt.y = y; dp_to_lp(dc, &pt, 1); - MoveToEx(hdc, pt.x, pt.y, NULL); + NtGdiMoveTo( hdc, pt.x, pt.y, NULL ); } break; } @@ -5289,7 +5292,7 @@ done: OUTLINETEXTMETRICW* otm = NULL; POINT pts[5]; HPEN hpen = NtGdiSelectPen( hdc, get_stock_object(NULL_PEN) ); - HBRUSH hbrush = CreateSolidBrush( dc->attr->text_color ); + HBRUSH hbrush = NtGdiCreateSolidBrush( dc->attr->text_color, NULL ); hbrush = NtGdiSelectBrush(hdc, hbrush); @@ -5821,7 +5824,7 @@ static BOOL CALLBACK load_enumed_resource(HMODULE hModule, LPCWSTR type, LPWSTR DWORD num_in_res; TRACE("Found resource %s - trying to load\n", wine_dbgstr_w(type)); - if (!AddFontMemResourceEx(pMem, SizeofResource(hModule, rsrc), NULL, &num_in_res)) + if (!NtGdiAddFontMemResourceEx( pMem, SizeofResource(hModule, rsrc), NULL, 0, &num_in_res )) { ERR("Failed to load PE font resource mod=%p ptr=%p\n", hModule, hMem); return FALSE;

1 0

Jacek Caban : gdi32: Remove no longer needed metafile special case from NtGdiExtTextOutW.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: 5e012f7bec0947a9e047d79d1b7bc7c42bdbab91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e012f7bec0947a9e047d79d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 10 14:28:44 2021 +0200 gdi32: Remove no longer needed metafile special case from NtGdiExtTextOutW. 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/font.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5758a999561..21cfe9ecb0b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5020,7 +5020,6 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr SIZE sz; RECT rc; POINT *deltas = NULL, width = {0, 0}; - DWORD type; DC * dc = get_dc_ptr( hdc ); PHYSDEV physdev; INT breakRem; @@ -5041,13 +5040,6 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pExtTextOut ); - type = GetObjectType(hdc); - if(type == OBJ_METADC || type == OBJ_ENHMETADC) - { - ret = physdev->funcs->pExtTextOut( physdev, x, y, flags, lprect, str, count, lpDx ); - release_dc_ptr( dc ); - return ret; - } if (flags & ETO_RTLREADING) align |= TA_RTLREADING; if (layout & LAYOUT_RTL)

1 0

Dmitry Timoshkov : wininet: Add handling for remaining special errors to InternetErrorDlg.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: 03236a391aa5e4b34367bdba6d5d7dad6d05ef6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=03236a391aa5e4b34367bdba… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 10 16:01:12 2021 +0200 wininet: Add handling for remaining special errors to InternetErrorDlg. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/dialogs.c | 48 +++++++++++++++++++++++++++++++++++++++++-- dlls/wininet/tests/internet.c | 40 +++++------------------------------- 2 files changed, 51 insertions(+), 37 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 25ed1f2a651..a48c75865ac 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -514,11 +514,17 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, } break; } + + case ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED: + if(!req) + return ERROR_INVALID_PARAMETER; + /* fall through */ case ERROR_INTERNET_SEC_CERT_ERRORS: case ERROR_INTERNET_SEC_CERT_CN_INVALID: case ERROR_INTERNET_SEC_CERT_DATE_INVALID: case ERROR_INTERNET_INVALID_CA: case ERROR_INTERNET_SEC_CERT_REV_FAILED: + case ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE: if( dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI ) { res = ERROR_CANCELLED; break; @@ -530,13 +536,51 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_INVCERTDLG ), hWnd, WININET_InvalidCertificateDialog, (LPARAM) &params ); break; + + case ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION: + if(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI) { + res = ERROR_HTTP_COOKIE_DECLINED; + break; + } + FIXME("Need to display dialog for error %d\n", dwError); + res = ERROR_CANCELLED; + break; + + case ERROR_INTERNET_INSERT_CDROM: + if(!req) + return ERROR_INVALID_PARAMETER; + /* fall through */ + case ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION: + case ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT: + case ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT: + case ERROR_INTERNET_MIXED_SECURITY: + case ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR: + if(!(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI)) + FIXME("Need to display dialog for error %d\n", dwError); + res = ERROR_CANCELLED; + break; + + case ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR: + case ERROR_INTERNET_CHG_POST_IS_NON_SECURE: + if(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI) { + res = ERROR_SUCCESS; + break; + } + FIXME("Need to display dialog for error %d\n", dwError); + res = ERROR_CANCELLED; + break; + case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR: case ERROR_INTERNET_POST_IS_NON_SECURE: - FIXME("Need to display dialog for error %d\n", dwError); + if (!(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI)) + FIXME("Need to display dialog for error %d\n", dwError); res = ERROR_SUCCESS; break; + default: - res = ERROR_CANCELLED; + if(!(dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS)) + res = ERROR_CANCELLED; + break; } if(req) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index e83b142e998..8513aabe174 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1566,29 +1566,14 @@ static void test_InternetErrorDlg(void) break; } - todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || - i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR || - i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) - ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); + ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); /* Same thing with NULL hwnd */ res = InternetErrorDlg(NULL, req, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || - i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR || - i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) - ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); + ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); res = InternetErrorDlg(NULL, req, i, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(i != ERROR_INTERNET_INCORRECT_PASSWORD && i != ERROR_INTERNET_SEC_CERT_DATE_INVALID && - i != ERROR_INTERNET_SEC_CERT_CN_INVALID && i != ERROR_INTERNET_INVALID_CA && - i != ERROR_INTERNET_SEC_CERT_ERRORS && i != ERROR_INTERNET_SEC_CERT_REV_FAILED && - i != ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR && i != ERROR_INTERNET_POST_IS_NON_SECURE && - i != ERROR_INTERNET_MIXED_SECURITY && - i != ERROR_INTERNET_POST_IS_NON_SECURE && i != ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED && - i != ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR && i != ERROR_INTERNET_INSERT_CDROM && - i != ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE && i != ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT && - i != ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT && i != ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION) - ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); + ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); /* With a null req */ if(test_flags & FLAG_NEEDREQ) @@ -1598,31 +1583,16 @@ static void test_InternetErrorDlg(void) } res = InternetErrorDlg(hwnd, NULL, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || - i == ERROR_INTERNET_INSERT_CDROM || - i == ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED || - i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR || - i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) - ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); + ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); res = InternetErrorDlg(NULL, NULL, i, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(i != ERROR_INTERNET_SEC_CERT_DATE_INVALID && i != ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR && - i != ERROR_INTERNET_SEC_CERT_CN_INVALID && i != ERROR_INTERNET_INVALID_CA && - i != ERROR_INTERNET_SEC_CERT_ERRORS && i != ERROR_INTERNET_SEC_CERT_REV_FAILED && - i != ERROR_INTERNET_MIXED_SECURITY && i != ERROR_INTERNET_POST_IS_NON_SECURE && - i != ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR && i != ERROR_INTERNET_INCORRECT_PASSWORD && - i != ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE && i != ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT && - i != ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT && - i != ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION) - ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); + ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); } res = InternetErrorDlg(NULL, req, 0xdeadbeef, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); -todo_wine ok(res == ERROR_SUCCESS, "Got %d, expected ERROR_SUCCESS\n", res); res = InternetErrorDlg(NULL, NULL, 0xdeadbeef, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); -todo_wine ok(res == ERROR_SUCCESS, "Got %d, expected ERROR_SUCCESS\n", res); res = InternetCloseHandle(req);

1 0

Rémi Bernon : winexinput.sys: Look for caps in the lower HID report descriptor.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: b027f70a91421c01ee6ce4cee3572c0615f99506 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b027f70a91421c01ee6ce4ce… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 10 09:08:20 2021 +0200 winexinput.sys: Look for caps in the lower HID report descriptor. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winexinput.sys/main.c | 69 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 7 deletions(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 60f7a8ed5dd..dfe747d6515 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -82,6 +82,14 @@ struct func_device WCHAR instance_id[MAX_DEVICE_ID_LEN]; + HIDP_VALUE_CAPS lx_caps; + HIDP_VALUE_CAPS ly_caps; + HIDP_VALUE_CAPS lt_caps; + HIDP_VALUE_CAPS rx_caps; + HIDP_VALUE_CAPS ry_caps; + HIDP_VALUE_CAPS rt_caps; + HIDP_DEVICE_DESC device_desc; + /* everything below requires holding the cs */ CRITICAL_SECTION cs; ULONG report_len; @@ -442,13 +450,27 @@ static NTSTATUS sync_ioctl(DEVICE_OBJECT *device, DWORD code, void *in_buf, DWOR return io.Status; } +static void check_value_caps(struct func_device *fdo, USHORT usage, HIDP_VALUE_CAPS *caps) +{ + switch (usage) + { + case HID_USAGE_GENERIC_X: fdo->lx_caps = *caps; break; + case HID_USAGE_GENERIC_Y: fdo->ly_caps = *caps; break; + case HID_USAGE_GENERIC_Z: fdo->lt_caps = *caps; break; + case HID_USAGE_GENERIC_RX: fdo->rx_caps = *caps; break; + case HID_USAGE_GENERIC_RY: fdo->ry_caps = *caps; break; + case HID_USAGE_GENERIC_RZ: fdo->rt_caps = *caps; break; + } +} + static NTSTATUS initialize_device(DEVICE_OBJECT *device) { struct func_device *fdo = fdo_from_DEVICE_OBJECT(device); - ULONG i, report_desc_len, report_count; + ULONG i, u, button_count, report_desc_len, report_count; PHIDP_REPORT_DESCRIPTOR report_desc; PHIDP_PREPARSED_DATA preparsed; - HIDP_DEVICE_DESC device_desc; + HIDP_BUTTON_CAPS *button_caps; + HIDP_VALUE_CAPS *value_caps; HIDP_REPORT_IDS *reports; HID_DESCRIPTOR hid_desc; NTSTATUS status; @@ -461,16 +483,49 @@ static NTSTATUS initialize_device(DEVICE_OBJECT *device) if (!(report_desc = malloc(report_desc_len))) return STATUS_NO_MEMORY; status = sync_ioctl(fdo->bus_device, IOCTL_HID_GET_REPORT_DESCRIPTOR, NULL, 0, report_desc, report_desc_len); - if (!status) status = HidP_GetCollectionDescription(report_desc, report_desc_len, PagedPool, &device_desc); + if (!status) status = HidP_GetCollectionDescription(report_desc, report_desc_len, PagedPool, &fdo->device_desc); free(report_desc); if (status != HIDP_STATUS_SUCCESS) return status; - preparsed = device_desc.CollectionDesc->PreparsedData; + preparsed = fdo->device_desc.CollectionDesc->PreparsedData; status = HidP_GetCaps(preparsed, &caps); if (status != HIDP_STATUS_SUCCESS) return status; - reports = device_desc.ReportIDs; - report_count = device_desc.ReportIDsLength; + button_count = 0; + if (!(button_caps = malloc(sizeof(*button_caps) * caps.NumberInputButtonCaps))) return STATUS_NO_MEMORY; + status = HidP_GetButtonCaps(HidP_Input, button_caps, &caps.NumberInputButtonCaps, preparsed); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetButtonCaps returned %#x\n", status); + else for (i = 0; i < caps.NumberInputButtonCaps; i++) + { + if (button_caps[i].UsagePage != HID_USAGE_PAGE_BUTTON) continue; + if (button_caps[i].IsRange) button_count = max(button_count, button_caps[i].Range.UsageMax); + else button_count = max(button_count, button_caps[i].NotRange.Usage); + } + free(button_caps); + if (status != HIDP_STATUS_SUCCESS) return status; + if (button_count < 10) WARN("only %u buttons found\n", button_count); + + if (!(value_caps = malloc(sizeof(*value_caps) * caps.NumberInputValueCaps))) return STATUS_NO_MEMORY; + status = HidP_GetValueCaps(HidP_Input, value_caps, &caps.NumberInputValueCaps, preparsed); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetValueCaps returned %#x\n", status); + else for (i = 0; i < caps.NumberInputValueCaps; i++) + { + HIDP_VALUE_CAPS *caps = value_caps + i; + if (caps->UsagePage != HID_USAGE_PAGE_GENERIC) continue; + if (!caps->IsRange) check_value_caps(fdo, caps->NotRange.Usage, caps); + else for (u = caps->Range.UsageMin; u <=caps->Range.UsageMax; u++) check_value_caps(fdo, u, value_caps + i); + } + free(value_caps); + if (status != HIDP_STATUS_SUCCESS) return status; + if (!fdo->lx_caps.UsagePage) WARN("missing lx axis\n"); + if (!fdo->ly_caps.UsagePage) WARN("missing ly axis\n"); + if (!fdo->lt_caps.UsagePage) WARN("missing lt axis\n"); + if (!fdo->rx_caps.UsagePage) WARN("missing rx axis\n"); + if (!fdo->ry_caps.UsagePage) WARN("missing ry axis\n"); + if (!fdo->rt_caps.UsagePage) WARN("missing rt axis\n"); + + reports = fdo->device_desc.ReportIDs; + report_count = fdo->device_desc.ReportIDsLength; for (i = 0; i < report_count; ++i) if (!reports[i].ReportID || reports[i].InputLength) break; if (i == report_count) i = 0; /* no input report?!, just use first ID */ @@ -478,7 +533,6 @@ static NTSTATUS initialize_device(DEVICE_OBJECT *device) if (!(fdo->report_buf = malloc(fdo->report_len))) return STATUS_NO_MEMORY; fdo->report_buf[0] = reports[i].ReportID; - HidP_FreeCollectionDescription(&device_desc); return STATUS_SUCCESS; } @@ -556,6 +610,7 @@ static NTSTATUS WINAPI fdo_pnp(DEVICE_OBJECT *device, IRP *irp) status = IoCallDriver(fdo->bus_device, irp); IoDetachDevice(fdo->bus_device); RtlDeleteCriticalSection(&fdo->cs); + HidP_FreeCollectionDescription(&fdo->device_desc); free(fdo->report_buf); IoDeleteDevice(device); return status;

1 0