February 2021 - Wine-Devel - list.winehq.org

[PATCH] explorerframe: Handle NSTCS_SINGLECLICKEXPAND style.
by Nikolay Sivov Feb. 11, 2021

Feb. 11, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/explorerframe/nstc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index b1ecace5fae..0698e6fa065 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -68,7 +68,7 @@ typedef struct { } NSTC2Impl; static const DWORD unsupported_styles = - NSTCS_SINGLECLICKEXPAND | NSTCS_NOREPLACEOPEN | NSTCS_NOORDERSTREAM | NSTCS_FAVORITESMODE | + NSTCS_NOREPLACEOPEN | NSTCS_NOORDERSTREAM | NSTCS_FAVORITESMODE | NSTCS_EMPTYTEXT | NSTCS_ALLOWJUNCTIONS | NSTCS_SHOWTABSBUTTON | NSTCS_SHOWDELETEBUTTON | NSTCS_SHOWREFRESHBUTTON | NSTCS_SPRINGEXPAND | NSTCS_RICHTOOLTIP | NSTCS_NOINDENTCHECKS; static const DWORD unsupported_styles2 = @@ -213,6 +213,7 @@ static DWORD treeview_style_from_nstcs(NSTC2Impl *This, NSTCSTYLE nstcs, if(nstcs_mask & NSTCS_DISABLEDRAGDROP) tv_mask |= TVS_DISABLEDRAGDROP; if(nstcs_mask & NSTCS_NOEDITLABELS) tv_mask |= TVS_EDITLABELS; if(nstcs_mask & NSTCS_CHECKBOXES) tv_mask |= TVS_CHECKBOXES; + if(nstcs_mask & NSTCS_SINGLECLICKEXPAND) tv_mask |= TVS_SINGLEEXPAND; *new_style = 0; @@ -227,6 +228,7 @@ static DWORD treeview_style_from_nstcs(NSTC2Impl *This, NSTCSTYLE nstcs, if(nstcs & NSTCS_DISABLEDRAGDROP) *new_style |= TVS_DISABLEDRAGDROP; if(!(nstcs & NSTCS_NOEDITLABELS)) *new_style |= TVS_EDITLABELS; if(nstcs & NSTCS_CHECKBOXES) *new_style |= TVS_CHECKBOXES; + if(nstcs & NSTCS_SINGLECLICKEXPAND) *new_style |= TVS_SINGLEEXPAND; *new_style = (old_style & ~tv_mask) | (*new_style & tv_mask); -- 2.30.0

1 0

[PATCH 1/3] dwrite: Fix setting canBreakShapingAfter when applying ligatures.
by Nikolay Sivov Feb. 11, 2021

Feb. 11, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/opentype.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7dc4a1f7b55..8885306a84d 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -5126,10 +5126,28 @@ static BOOL opentype_layout_context_match_input(const struct match_context *mc, return TRUE; } -static void opentype_layout_unsafe_to_break(struct scriptshaping_context *context, unsigned int idx) +/* Marks text segment as unsafe to break between [start, end) glyphs. */ +static void opentype_layout_unsafe_to_break(struct scriptshaping_context *context, unsigned int start, + unsigned int end) { - if (context->u.buffer.glyph_props[idx].isClusterStart) - context->u.buffer.text_props[context->glyph_infos[idx].start_text_idx].canBreakShapingAfter = 0; + unsigned int i; + + while (start && !context->u.buffer.glyph_props[start].isClusterStart) + --start; + + while (--end && !context->u.buffer.glyph_props[end].isClusterStart) + ; + + if (start == end) + { + context->u.buffer.text_props[context->glyph_infos[start].start_text_idx].canBreakShapingAfter = 0; + return; + } + + for (i = context->glyph_infos[start].start_text_idx; i < context->glyph_infos[end].start_text_idx; ++i) + { + context->u.buffer.text_props[i].canBreakShapingAfter = 0; + } } static void opentype_layout_delete_glyph(struct scriptshaping_context *context, unsigned int idx) @@ -5194,10 +5212,8 @@ static BOOL opentype_layout_apply_ligature(struct scriptshaping_context *context { context->u.buffer.glyph_props[j++].lig_component = comp_count - i; } - opentype_layout_unsafe_to_break(context, i); - context->u.buffer.glyph_props[i].isClusterStart = 0; - context->glyph_infos[i].start_text_idx = 0; } + opentype_layout_unsafe_to_break(context, match_positions[0], match_positions[comp_count - 1] + 1); /* Delete ligated glyphs, backwards to preserve index. */ for (i = 1; i < comp_count; ++i) -- 2.30.0

1 2

[PATCH v2] gdi32/tests: Add tests for the advanced graphics mode
by Ralf Habacker Feb. 11, 2021

Feb. 11, 2021

Because drawing simple lines already gives different results than a native Windows, the comparison of hashes does not work anymore. Therefore, the tests associated to advanced graphics mode creates bitmap files for each processed test in the current directoy, which can then be compared visually. Signed-off-by: Ralf Habacker <ralf.habacker(a)freenet.de> --- dlls/gdi32/tests/dib.c | 242 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 242 insertions(+) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index bdc3d9ed55b..3e48694f143 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -3529,11 +3529,253 @@ static void test_simple_graphics(void) DeleteDC(mem_dc); } +/* Comparing hashes does not work because drawing simple lines is already different from native win32 */ +/* #define WITH_HASH */ + +typedef struct { + HDC dc; + BITMAPINFO *bmi; + BYTE *bits; + HBITMAP dib; +#ifdef WITH_HASH + char *hash_dib; +#endif + char test_name[1024]; + char save_path[MAX_PATH]; + char hash_name[1024]; + RECT bounds; + double angle; + double shearX; +} test_data; + +static test_data _test_data; +test_data *td = &_test_data; + +double radians ( double d ) +{ + return d * M_PI / 180; +} + +BOOL save_bitmap_to_file(HBITMAP hBitmap, LPSTR lpszFileName) +{ + HDC hDC; + int iBits; + WORD wBitCount; + DWORD dwPaletteSize = 0, dwBmBitsSize = 0, dwDIBSize = 0, dwWritten = 0; + BITMAP Bitmap0; + BITMAPFILEHEADER bmfHdr; + BITMAPINFOHEADER bi; + LPBITMAPINFOHEADER lpbi; + HANDLE fh, hDib, hPal, hOldPal2 = NULL; + hDC = CreateDCA("DISPLAY", NULL, NULL, NULL); + iBits = GetDeviceCaps(hDC, BITSPIXEL) * GetDeviceCaps(hDC, PLANES); + DeleteDC(hDC); + if (iBits <= 1) + wBitCount = 1; + else if (iBits <= 4) + wBitCount = 4; + else if (iBits <= 8) + wBitCount = 8; + else + wBitCount = 24; + GetObjectA(hBitmap, sizeof(Bitmap0), (LPSTR)&Bitmap0); + bi.biSize = sizeof(BITMAPINFOHEADER); + bi.biWidth = Bitmap0.bmWidth; + bi.biHeight = -Bitmap0.bmHeight; + bi.biPlanes = 1; + bi.biBitCount = wBitCount; + bi.biCompression = BI_RGB; + bi.biSizeImage = 0; + bi.biXPelsPerMeter = 0; + bi.biYPelsPerMeter = 0; + bi.biClrImportant = 0; + bi.biClrUsed = 256; + dwBmBitsSize = ((Bitmap0.bmWidth * wBitCount + 31) & ~31) / 8 + * Bitmap0.bmHeight; + hDib = GlobalAlloc(GHND, dwBmBitsSize + dwPaletteSize + sizeof(BITMAPINFOHEADER)); + lpbi = (LPBITMAPINFOHEADER)GlobalLock(hDib); + *lpbi = bi; + + hPal = GetStockObject(DEFAULT_PALETTE); + if (hPal) + { + hDC = GetDC(NULL); + hOldPal2 = SelectPalette(hDC, (HPALETTE)hPal, FALSE); + RealizePalette(hDC); + } + + + GetDIBits(hDC, hBitmap, 0, (UINT)Bitmap0.bmHeight, (LPSTR)lpbi + sizeof(BITMAPINFOHEADER) + + dwPaletteSize, (BITMAPINFO *)lpbi, DIB_RGB_COLORS); + + if (hOldPal2) + { + SelectPalette(hDC, (HPALETTE)hOldPal2, TRUE); + RealizePalette(hDC); + ReleaseDC(NULL, hDC); + } + + fh = CreateFileA(lpszFileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); + + if (fh == INVALID_HANDLE_VALUE) + return FALSE; + + bmfHdr.bfType = 0x4D42; // "BM" + dwDIBSize = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + dwPaletteSize + dwBmBitsSize; + bmfHdr.bfSize = dwDIBSize; + bmfHdr.bfReserved1 = 0; + bmfHdr.bfReserved2 = 0; + bmfHdr.bfOffBits = (DWORD)sizeof(BITMAPFILEHEADER) + (DWORD)sizeof(BITMAPINFOHEADER) + dwPaletteSize; + + WriteFile(fh, (LPSTR)&bmfHdr, sizeof(BITMAPFILEHEADER), &dwWritten, NULL); + + WriteFile(fh, (LPSTR)lpbi, dwDIBSize, &dwWritten, NULL); + GlobalUnlock(hDib); + GlobalFree(hDib); + CloseHandle(fh); + return TRUE; +} + +void set_transform( HDC dc, RECT *bounds, double angle ) +{ + XFORM xf; + double r = radians( angle ); + xf.eM11 = cos( r ) + sin( r ) * td->shearX; + xf.eM22 = cos( r ); + xf.eM12 = -sin( r ); + xf.eM21 = sin( r ) + cos( r ) * td->shearX; + xf.eDx = ( bounds->right - bounds->left ) / 4; + xf.eDy = ( bounds->bottom - bounds->top ) / 4; + SetWorldTransform( dc, &xf ); +} + + +void init( test_data *td, const char *test_name ) +{ + sprintf( td->test_name, "%s", test_name ); + sprintf( td->save_path, "%s-%3.1f-%2.1f.bmp", td->test_name, td->shearX, td->angle ); + sprintf( td->hash_name, "sha1_advanced_%s_%3.1f_%2.1f", td->test_name, td->shearX, td->angle ); + trace( "%s\n", td->test_name ); + reset_bits( td->dc, td->bmi, td->bits ); + MoveToEx( td->dc, -5, 0, NULL ); + LineTo( td->dc, 5, 0 ); + MoveToEx( td->dc, 0, 5, NULL ); + LineTo( td->dc, 0, -5 ); +} + +void check_hash( test_data *td ) +{ +#ifdef WITH_HASH + if ( td->hash_dib ) + HeapFree( GetProcessHeap(), 0, td->hash_dib ); + td->hash_dib = hash_dib( td->dc, td->bmi, td->bits ); + printf( "const char *%s = \"%s\";\n", td->hash_name, td->hash_dib ); +#endif + // instead we dump the display to a file for visual inspection + save_bitmap_to_file( td->dib, td->save_path ); +} + +static void test_gdi( double angle, double shearX ) +{ + char bmibuf[sizeof( BITMAPINFO ) + 256 * sizeof( RGBQUAD )]; + HBITMAP orig_bm; + HPALETTE default_palette, old_hpal; + RECT r; + + td->bmi = ( BITMAPINFO * )bmibuf; + td->dc = CreateCompatibleDC( NULL ); + td->angle = angle; + td->shearX = shearX; + + SetGraphicsMode( td->dc, GM_ADVANCED ); + set_transform( td->dc, &td->bounds, td->angle ); + + memset( td->bmi, 0, sizeof( bmibuf )); + td->bmi->bmiHeader.biSize = sizeof( td->bmi->bmiHeader ); + td->bmi->bmiHeader.biHeight = td->bounds.right; + td->bmi->bmiHeader.biWidth = td->bounds.bottom; + td->bmi->bmiHeader.biBitCount = 32; + td->bmi->bmiHeader.biPlanes = 1; + td->bmi->bmiHeader.biCompression = BI_RGB; + + td->dib = CreateDIBSection( 0, td->bmi, DIB_RGB_COLORS, ( void** )&( td->bits ), NULL, 0 ); + orig_bm = SelectObject( td->dc, td->dib ); + + default_palette = create_default_palette( 8 ); + old_hpal = SelectPalette( td->dc, default_palette, FALSE ); + + current_bounds = &td->bounds; + SetBoundsRect( td->dc, &td->bounds, DCB_SET ); + + SetRect( &r, 0, 0, 128, 128 ); + + init( td, "LineTo" ); + MoveToEx( td->dc, r.left, r.top, NULL ); + LineTo( td->dc, r.right, r.bottom ); + check_hash( td ); + + init( td, "Rectangle" ); + ok( Rectangle( td->dc, r.left, r.top, r.right, r.bottom ), td->test_name ); + check_hash( td ); + + init( td, "Ellipse" ); + ok( Ellipse( td->dc, r.left, r.top, r.right, r.bottom ), td->test_name ); + check_hash( td ); + + init( td, "Arc" ); + ok( Arc( td->dc, r.left, r.top, r.right, r.bottom, r.left+10, r.top, r.right-10, r.bottom ), td->test_name ); + check_hash( td ); + + init( td, "ArcTo" ); + ok( ArcTo( td->dc, r.left, r.top, r.right, r.bottom, r.left+10, r.top, r.right-10, r.bottom ), td->test_name ); + check_hash( td ); + + init( td, "Chord" ); + ok( Chord( td->dc, r.left, r.top, r.right, r.bottom, r.left+10, r.top, r.right-10, r.bottom ), td->test_name ); + check_hash( td ); + + init( td, "Pie" ); + ok( Pie( td->dc, r.left, r.top, r.right, r.bottom, r.left+10, r.top, r.right-10, r.bottom ), td->test_name ); + check_hash( td ); + + init( td, "FillRect" ); + ok( FillRect( td->dc, &r, GetStockObject( WHITE_BRUSH )), td->test_name ); + check_hash( td ); + + SelectObject( td->dc, orig_bm ); + DeleteObject( td->dib ); + SelectPalette( td->dc, old_hpal, FALSE ); + DeleteDC( td->dc ); +} + +static void test_advanced_graphics( void ) +{ + td->bounds.left = 0; + td->bounds.top = 0; + td->bounds.right = 256; + td->bounds.bottom = 256; + + test_gdi( 0, 0.0 ); + test_gdi( 30, 0.0 ); + test_gdi( 60, 0.0 ); + test_gdi( 90, 0.0 ); + test_gdi( 120, 0.0 ); + test_gdi( 150, 0.0 ); + test_gdi( 0, 0.1 ); + test_gdi( 30, 0.1 ); + test_gdi( 60, 0.1 ); + test_gdi( 90, 0.1 ); + test_gdi( 120, 0.1 ); + test_gdi( 150, 0.1 ); +} + START_TEST(dib) { CryptAcquireContextW(&crypt_prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); test_simple_graphics(); + test_advanced_graphics(); CryptReleaseContext(crypt_prov, 0); } -- 2.26.2

4 4

[PATCH v2 1/5] ntoskrnl/tests: Test the contents of the user IO_STATUS_BLOCK.
by Zebediah Figura Feb. 11, 2021

Feb. 11, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/tests/driver.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 5617342d803..eb4620ad25d 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -846,6 +846,8 @@ static void test_call_driver(DEVICE_OBJECT *device) KEVENT event; NTSTATUS status; + iosb.Status = 0xdeadbeef; + iosb.Information = 0xdeadbeef; irp = IoBuildAsynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &iosb); ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); @@ -854,6 +856,10 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), "IRP thread is not the current thread\n"); + ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); + ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); + ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); @@ -863,10 +869,16 @@ static void test_call_driver(DEVICE_OBJECT *device) status = IoCallDriver(device, irp); ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); + ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); + ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); + ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); irp->IoStatus.Status = STATUS_SUCCESS; - irp->IoStatus.Information = 0; + irp->IoStatus.Information = 123; IoCompleteRequest(irp, IO_NO_INCREMENT); + todo_wine ok(iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status); + todo_wine ok(iosb.Information == 123, "got information %#x\n", iosb.Information); KeInitializeEvent(&event, NotificationEvent, FALSE); -- 2.20.1

1 4

[PATCH 1/5] ntoskrnl/tests: Test the contents of the user IO_STATUS_BLOCK.
by Zebediah Figura Feb. 11, 2021

Feb. 11, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/tests/driver.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 16ef861299d..29fc838a012 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -846,6 +846,8 @@ static void test_call_driver(DEVICE_OBJECT *device) KEVENT event; NTSTATUS status; + iosb.Status = 0xdeadbeef; + iosb.Information = 0xdeadbeef; irp = IoBuildAsynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &iosb); ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); @@ -854,6 +856,10 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), "IRP thread is not the current thread\n"); + ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); + ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); + ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); @@ -863,10 +869,16 @@ static void test_call_driver(DEVICE_OBJECT *device) status = IoCallDriver(device, irp); ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); + ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); + ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); + ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); irp->IoStatus.Status = STATUS_SUCCESS; - irp->IoStatus.Information = 0; + irp->IoStatus.Information = 123; IoCompleteRequest(irp, IO_NO_INCREMENT); + todo_wine ok(iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status); + todo_wine ok(iosb.Information == 123, "got information %#x\n", iosb.Information); KeInitializeEvent(&event, NotificationEvent, FALSE); -- 2.20.1

2 7

[PATCH 1/6] winegstreamer: Store the wg_parser_stream pointers as our sink pads' private data.
by Zebediah Figura Feb. 10, 2021

Feb. 10, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e1309e97c4c..ba632f3297d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -102,6 +102,8 @@ struct wg_parser_event struct wg_parser_stream { + struct wg_parser *parser; + GstPad *their_src, *post_sink, *post_src, *my_sink; GstElement *flip; struct wg_format preferred_format, current_format; @@ -917,10 +919,9 @@ static bool wg_format_compare(const struct wg_format *a, const struct wg_format static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) { - struct parser_source *pin = gst_pad_get_element_private(pad); - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_parser_stream *stream = gst_pad_get_element_private(pad); - GST_LOG("pin %p, type \"%s\".", pin, gst_query_type_get_name(query->type)); + GST_LOG("stream %p, type \"%s\".", stream, gst_query_type_get_name(query->type)); switch (query->type) { @@ -1053,10 +1054,9 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) return ret; } -static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct wg_parser_event *event) +static GstFlowReturn queue_stream_event(struct wg_parser_stream *stream, const struct wg_parser_event *event) { - struct wg_parser *parser = impl_from_strmbase_filter(pin->pin.pin.filter)->wg_parser; - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_parser *parser = stream->parser; /* Unlike request_buffer_src() [q.v.], we need to watch for GStreamer * flushes here. The difference is that we can be blocked by the streaming @@ -1082,12 +1082,10 @@ static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) { - struct parser_source *pin = gst_pad_get_element_private(pad); - struct wg_parser_stream *stream = pin->wg_stream; - struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); - struct wg_parser *parser = filter->wg_parser; + struct wg_parser_stream *stream = gst_pad_get_element_private(pad); + struct wg_parser *parser = stream->parser; - GST_LOG("pin %p, type \"%s\".", pin, GST_EVENT_TYPE_NAME(event)); + GST_LOG("stream %p, type \"%s\".", stream, GST_EVENT_TYPE_NAME(event)); switch (event->type) { @@ -1109,7 +1107,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) stream_event.u.segment.position = segment->position / 100; stream_event.u.segment.stop = segment->stop / 100; stream_event.u.segment.rate = segment->rate * segment->applied_rate; - queue_stream_event(pin, &stream_event); + queue_stream_event(stream, &stream_event); } break; @@ -1119,7 +1117,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) struct wg_parser_event stream_event; stream_event.type = WG_PARSER_EVENT_EOS; - queue_stream_event(pin, &stream_event); + queue_stream_event(stream, &stream_event); } else { @@ -1237,12 +1235,11 @@ static void *push_data(void *arg) static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *buffer) { - struct parser_source *pin = gst_pad_get_element_private(pad); - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_parser_stream *stream = gst_pad_get_element_private(pad); struct wg_parser_event stream_event; GstFlowReturn ret; - GST_LOG("pin %p, buffer %p.", pin, buffer); + GST_LOG("stream %p, buffer %p.", stream, buffer); if (!stream->enabled) { @@ -1253,7 +1250,7 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu stream_event.type = WG_PARSER_EVENT_BUFFER; stream_event.u.buffer = buffer; /* Transfer our reference to the buffer to the thread. */ - if ((ret = queue_stream_event(pin, &stream_event)) != GST_FLOW_OK) + if ((ret = queue_stream_event(stream, &stream_event)) != GST_FLOW_OK) gst_buffer_unref(buffer); return ret; } @@ -2842,6 +2839,7 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name } pin->wg_stream = stream; + stream->parser = parser; strmbase_source_init(&pin->pin, &filter->filter, name, &source_ops); pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; strmbase_seeking_init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, @@ -2855,7 +2853,7 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name sprintf(pad_name, "qz_sink_%u", filter->source_count); stream->my_sink = gst_pad_new(pad_name, GST_PAD_SINK); - gst_pad_set_element_private(stream->my_sink, pin); + gst_pad_set_element_private(stream->my_sink, stream); gst_pad_set_chain_function(stream->my_sink, got_data_sink); gst_pad_set_event_function(stream->my_sink, event_sink); gst_pad_set_query_function(stream->my_sink, query_sink); -- 2.30.0

1 5

[PATCH] winebuild: Use lld-link for static libraries on msvc target.
by Jacek Caban Feb. 10, 2021

Feb. 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winebuild/build.h | 1 + tools/winebuild/import.c | 45 +++++++++++++++++++++++++++++----------- tools/winebuild/utils.c | 11 ++++++++++ 3 files changed, 45 insertions(+), 12 deletions(-)

1 0

[PATCH] winex11.drv: Add missing Vulkan extensions.
by Giovanni Mascellani Feb. 10, 2021

Feb. 10, 2021

They were flagged by validation layers as required: VK_EXT_direct_mode_display depends on VK_KHR_display and transitively on VK_KHR_surface. VK_KHR_external_fence_capabilities is required by VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index fa748c2af04..cf4683571bc 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -598,6 +598,9 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, "VK_EXT_acquire_xlib_display", "VK_EXT_direct_mode_display", + "VK_KHR_display", + "VK_KHR_surface", + "VK_KHR_external_fence_capabilities", }; const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ); VkResult (*pvkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * ); -- 2.30.0

2 2

[tools] testbot/web: Fix the $Task->TestFailures check.
by Francois Gouget Feb. 10, 2021

Feb. 10, 2021

If it has not been set to a numeric value, $Task->TestFailures is undefined so comparing it to an empty string makes no sense. Fortunately undef ne "" is false (as well as undef eq "") so the code was doing the right thing and was not generating a warning since warnings are not turned on. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/index.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 088aea111..248622955 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -131,7 +131,7 @@ sub GenerateDataCell($$$$) foreach my $Task (@{$Step->Tasks->GetItems()}) { my $TaskFailures = $Task->TestFailures; - if ($TaskFailures ne "") + if (defined $TaskFailures) { $HasTestResult = 1; $Failures += $TaskFailures; -- 2.20.1

1 0

[PATCH] explorerframe: Do not block clicks on the item button.
by Nikolay Sivov Feb. 10, 2021

Feb. 10, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28786 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- I don't see behaviour mentioned in removed comment. By default expand buttons are hidden, that's controlled by NSTCS_HASEXPANDOS style. Once visible single click on the button expands/collapses, and double click on the label does the same. Additional flag NSTCS_SINGLECLICKEXPAND controls label clicks, enabling single click there. That maps directly to TreeView styles, requiring no fixups in notification handlers. dlls/explorerframe/nstc.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 0abaded85a6..b1ecace5fae 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -678,7 +678,7 @@ static LRESULT on_nm_click(NSTC2Impl *This, NMHDR *nmhdr) { TVHITTESTINFO tvhit; IShellItem *psi; - HRESULT hr; + TRACE("%p (%p)\n", This, nmhdr); GetCursorPos(&tvhit.pt); @@ -690,17 +690,7 @@ static LRESULT on_nm_click(NSTC2Impl *This, NMHDR *nmhdr) /* TVHT_ maps onto the corresponding NSTCEHT_ */ psi = shellitem_from_treeitem(This, tvhit.hItem); - hr = events_OnItemClick(This, psi, tvhit.flags, NSTCECT_LBUTTON); - - /* The expando should not be expanded unless - * double-clicked. */ - if(tvhit.flags == TVHT_ONITEMBUTTON) - return TRUE; - - if(SUCCEEDED(hr)) - return FALSE; - else - return TRUE; + return FAILED(events_OnItemClick(This, psi, tvhit.flags, NSTCECT_LBUTTON)); } static LRESULT on_wm_mbuttonup(NSTC2Impl *This, WPARAM wParam, LPARAM lParam) -- 2.30.0

1 0