February 2019 - Wine-commits

Dmitry Timoshkov : windowscodecs/tests: Add a test for 8bpp indexed TIFF format.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: 7e9c1784546d0ca0398050a4180e59f4de7cee32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e9c1784546d0ca0398050a4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 12:06:55 2019 +0800 windowscodecs/tests: Add a test for 8bpp indexed TIFF format. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/tiffformat.c | 187 +++++++++++++++++++++++++++++----- 1 file changed, 161 insertions(+), 26 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 7651ea1..2f9a0ca 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -1,5 +1,5 @@ /* - * Copyright 2012 Dmitry Timoshkov + * Copyright 2012,2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -145,6 +145,49 @@ static const struct tiff_8bpp_alpha { 0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88 } }; +static const struct tiff_8bpp_data +{ + USHORT byte_order; + USHORT version; + ULONG dir_offset; + USHORT number_of_entries; + struct IFD_entry entry[14]; + ULONG next_IFD; + struct IFD_rational res; + short palette_data[3][256]; + BYTE pixel_data[4]; +} tiff_8bpp_data = +{ +#ifdef WORDS_BIGENDIAN + 'M' | 'M' << 8, +#else + 'I' | 'I' << 8, +#endif + 42, + FIELD_OFFSET(struct tiff_8bpp_data, number_of_entries), + 14, + { + { 0xff, IFD_SHORT, 1, 0 }, /* SUBFILETYPE */ + { 0x100, IFD_LONG, 1, 4 }, /* IMAGEWIDTH */ + { 0x101, IFD_LONG, 1, 1 }, /* IMAGELENGTH */ + { 0x102, IFD_SHORT, 1, 8 }, /* BITSPERSAMPLE: XP doesn't accept IFD_LONG here */ + { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION: XP doesn't accept IFD_LONG here */ + { 0x106, IFD_SHORT, 1, 3 }, /* PHOTOMETRIC */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_8bpp_data, pixel_data) }, /* STRIPOFFSETS */ + { 0x115, IFD_SHORT, 1, 1 }, /* SAMPLESPERPIXEL */ + { 0x116, IFD_LONG, 1, 1 }, /* ROWSPERSTRIP */ + { 0x117, IFD_LONG, 1, 1 }, /* STRIPBYTECOUNT */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_data, res) }, + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_data, res) }, + { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ + { 0x140, IFD_SHORT, 256*3, FIELD_OFFSET(struct tiff_8bpp_data, palette_data) } /* COLORMAP */ + }, + 0, + { 96, 1 }, + { { 0 } }, + { 0,1,2,3 } +}; + static const struct tiff_resolution_test_data { struct IFD_rational resx; @@ -284,29 +327,41 @@ static IStream *create_stream(const void *data, int data_size) return stream; } -static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size) +static HRESULT create_decoder(const void *image_data, UINT image_size, IWICBitmapDecoder **decoder) { + HGLOBAL hmem; + BYTE *data; HRESULT hr; IStream *stream; - IWICBitmapDecoder *decoder = NULL; - GUID guid; + GUID format; + LONG refcount; - stream = create_stream(image_data, image_size); + *decoder = NULL; - hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); - ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); - if (FAILED(hr)) return NULL; + hmem = GlobalAlloc(0, image_size); + data = GlobalLock(hmem); + memcpy(data, image_data, image_size); + GlobalUnlock(hmem); - hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guid); - ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); - ok(IsEqualGUID(&guid, &GUID_ContainerFormatTiff), "container format is not TIFF\n"); + hr = CreateStreamOnHGlobal(hmem, TRUE, &stream); + ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); - IStream_Release(stream); + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, decoder); + if (hr == S_OK) + { + hr = IWICBitmapDecoder_GetContainerFormat(*decoder, &format); + ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_ContainerFormatTiff), + "wrong container format %s\n", wine_dbgstr_guid(&format)); - return decoder; + refcount = IStream_Release(stream); + ok(refcount > 0, "expected stream refcount > 0\n"); + } + + return hr; } -static void test_tiff_palette(void) +static void test_tiff_1bpp_palette(void) { HRESULT hr; IWICBitmapDecoder *decoder; @@ -314,9 +369,9 @@ static void test_tiff_palette(void) IWICPalette *palette; GUID format; - decoder = create_decoder(&tiff_1bpp_data, sizeof(tiff_1bpp_data)); - ok(decoder != 0, "Failed to load TIFF image data\n"); - if (!decoder) return; + hr = create_decoder(&tiff_1bpp_data, sizeof(tiff_1bpp_data), &decoder); + ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr); + if (hr != S_OK) return; hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "GetFrame error %#x\n", hr); @@ -448,9 +503,9 @@ static void test_tiff_8bpp_alpha(void) static const BYTE expected_data[16] = { 0x11,0x11,0x11,0x22,0x33,0x33,0x33,0x44, 0x55,0x55,0x55,0x66,0x77,0x77,0x77,0x88 }; - decoder = create_decoder(&tiff_8bpp_alpha, sizeof(tiff_8bpp_alpha)); - ok(decoder != 0, "Failed to load TIFF image data\n"); - if (!decoder) return; + hr = create_decoder(&tiff_8bpp_alpha, sizeof(tiff_8bpp_alpha), &decoder); + ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr); + if (hr != S_OK) return; hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); ok(hr == S_OK, "GetFrameCount error %#x\n", hr); @@ -497,6 +552,84 @@ static void test_tiff_8bpp_alpha(void) IWICBitmapFrameDecode_Release(frame); } +static void generate_tiff_palette(void *buf, unsigned count) +{ + unsigned short *r, *g, *b; + unsigned i; + + r = buf; + g = r + count; + b = g + count; + + r[0] = 0x11 * 257; + g[0] = 0x22 * 257; + b[0] = 0x33 * 257; + r[1] = 0x44 * 257; + g[1] = 0x55 * 257; + b[1] = 0x66 * 257; + r[2] = 0x77 * 257; + g[2] = 0x88 * 257; + b[2] = 0x99 * 257; + r[3] = 0xa1 * 257; + g[3] = 0xb5 * 257; + b[3] = 0xff * 257; + + for (i = 4; i < count; i++) + { + r[i] = i * 257; + g[i] = (i | 0x40) * 257; + b[i] = (i | 0x80) * 257; + } +} + +static void test_tiff_8bpp_palette(void) +{ + char buf[sizeof(tiff_8bpp_data)]; + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + IWICPalette *palette; + GUID format; + UINT count, ret; + WICColor color[256]; + + memcpy(buf, &tiff_8bpp_data, sizeof(tiff_8bpp_data)); + generate_tiff_palette(buf + FIELD_OFFSET(struct tiff_8bpp_data, palette_data), 256); + + hr = create_decoder(buf, sizeof(buf), &decoder); + ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr); + if (hr != S_OK) return; + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed), + "expected GUID_WICPixelFormat8bppIndexed, got %s\n", wine_dbgstr_guid(&format)); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 256, "expected 256, got %u\n", count); + + hr = IWICPalette_GetColors(palette, 256, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[0] == 0xff112233, "got %#x\n", color[0]); + ok(color[1] == 0xff445566, "got %#x\n", color[1]); + ok(color[2] == 0xff778899, "got %#x\n", color[2]); + ok(color[3] == 0xffa1b5ff, "got %#x\n", color[3]); + + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + static void test_tiff_resolution(void) { HRESULT hr; @@ -512,9 +645,9 @@ static void test_tiff_resolution(void) tiff_resolution_image_data.resy = test_data->resy; tiff_resolution_image_data.entry[12].value = test_data->resolution_unit; - decoder = create_decoder(&tiff_resolution_image_data, sizeof(tiff_resolution_image_data)); - ok(decoder != 0, "%d: Failed to load TIFF image data\n", i); - if (!decoder) continue; + hr = create_decoder(&tiff_resolution_image_data, sizeof(tiff_resolution_image_data), &decoder); + ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr); + if (hr != S_OK) return; hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "%d: GetFrame error %#x\n", i, hr); @@ -561,8 +694,9 @@ static void test_tiff_24bpp(void) BYTE data[3]; static const BYTE expected_data[] = { 0x33,0x22,0x11 }; - decoder = create_decoder(&tiff_24bpp_data, sizeof(tiff_24bpp_data)); - ok(decoder != NULL, "Failed to load TIFF image data\n"); + hr = create_decoder(&tiff_24bpp_data, sizeof(tiff_24bpp_data), &decoder); + ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr); + if (hr != S_OK) return; hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); ok(hr == S_OK, "GetFrameCount error %#x\n", hr); @@ -620,7 +754,8 @@ START_TEST(tiffformat) ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); if (FAILED(hr)) return; - test_tiff_palette(); + test_tiff_1bpp_palette(); + test_tiff_8bpp_palette(); test_QueryCapability(); test_tiff_8bpp_alpha(); test_tiff_resolution();

1 0

Dmitry Timoshkov : windowscodecs: Fix the SupportsTransparency flag value for various pixel formats.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: 4af1c0c246b95737ae14cbe1a72784cdf4428af0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4af1c0c246b95737ae14cbe1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 12:07:10 2019 +0800 windowscodecs: Fix the SupportsTransparency flag value for various pixel formats. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/regsvr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index c8338f1..d215e30 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1775,7 +1775,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_1bit, WICPixelFormatNumericRepresentationIndexed, - 1 + 0 }, { &GUID_WICPixelFormat2bppIndexed, "The Wine Project", @@ -1786,7 +1786,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_2bit, WICPixelFormatNumericRepresentationIndexed, - 1 + 0 }, { &GUID_WICPixelFormat4bppIndexed, "The Wine Project", @@ -1797,7 +1797,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_4bit, WICPixelFormatNumericRepresentationIndexed, - 1 + 0 }, { &GUID_WICPixelFormat8bppIndexed, "The Wine Project", @@ -1808,7 +1808,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_8bit, WICPixelFormatNumericRepresentationIndexed, - 1 + 0 }, { &GUID_WICPixelFormatBlackWhite, "The Wine Project", @@ -1995,7 +1995,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_32bit, WICPixelFormatNumericRepresentationFloat, - 1 + 0 }, { &GUID_WICPixelFormat48bppRGB, "The Wine Project",

1 0

Dmitry Timoshkov : windowscodecs: Fail earlier in TIFF decoder' s Initialize method for unsupported pixel formats.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: ea6118e9b740c8f0ede866b45b71b162c6f315e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea6118e9b740c8f0ede866b4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 12:07:36 2019 +0800 windowscodecs: Fail earlier in TIFF decoder's Initialize method for unsupported pixel formats. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tiffformat.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 58cd04e..3bc8d69 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -638,6 +638,7 @@ static HRESULT WINAPI TiffDecoder_Initialize(IWICBitmapDecoder *iface, IStream * { TiffDecoder *This = impl_from_IWICBitmapDecoder(iface); TIFF *tiff; + tiff_decode_info decode_info; HRESULT hr=S_OK; TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); @@ -651,13 +652,20 @@ static HRESULT WINAPI TiffDecoder_Initialize(IWICBitmapDecoder *iface, IStream * } tiff = tiff_open_stream(pIStream, "r"); - if (!tiff) { hr = E_FAIL; goto exit; } + /* make sure that TIFF format is supported */ + hr = tiff_get_decode_info(tiff, &decode_info); + if (hr != S_OK) + { + pTIFFClose(tiff); + goto exit; + } + This->tiff = tiff; This->stream = pIStream; IStream_AddRef(pIStream);

1 0

Michael Stefaniuc : msxml3: Remove useless casts to self.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: 979c9db3ec248119580257e21eeb3173a3d0c851 URL: https://source.winehq.org/git/wine.git/?a=commit;h=979c9db3ec248119580257e2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 18 21:14:02 2019 +0100 msxml3: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/httprequest.c | 2 +- dlls/msxml3/node.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 07eeb74..c6f9fdb 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -759,7 +759,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * case VT_ARRAY|VT_UI1: { sa = V_ARRAY(body); - if ((hr = SafeArrayAccessData(sa, (void **)&ptr)) != S_OK) + if ((hr = SafeArrayAccessData(sa, &ptr)) != S_OK) { heap_free(bsc); return hr; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index fc18935..27abf94 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1217,7 +1217,7 @@ static HRESULT node_transform_write(xsltStylesheetPtr style, xmlDocPtr result, B htmlSetMetaEncoding(result, (const xmlChar *)encoding); if (indent == -1) indent = 1; - htmldoc_dumpcontent(output, result, (const char*)encoding, indent); + htmldoc_dumpcontent(output, result, encoding, indent); } else if (method && xmlStrEqual(method, (const xmlChar *)"xhtml")) {

1 0

Michael Stefaniuc : msxml3/tests: Floating point numeric constants are by default doubles.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: 94e76b1b3c49460198c85297d6a07b05da804b55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94e76b1b3c49460198c85297… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 18 21:14:01 2019 +0100 msxml3/tests: Floating point numeric constants are by default doubles. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/schema.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 9e5116f..f1f3e42 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1371,10 +1371,10 @@ static void test_XDR_datatypes(void) break; case VT_R8: if (!strcmp(ptr->typename, "float")) - ok(V_R8(&v) == (double)3.14159, "got %f\n", V_R8(&v)); + ok(V_R8(&v) == 3.14159, "got %f\n", V_R8(&v)); else todo_wine - ok(V_R8(&v) == (double)3.14159265358979323846, "got %.20f\n", V_R8(&v)); + ok(V_R8(&v) == 3.14159265358979323846, "got %.20f\n", V_R8(&v)); break; case VT_UI1: ok(V_UI1(&v) == 0xFF, "got %02x\n", V_UI1(&v));

1 0

Zebediah Figura : user32: Move iconic windows as their border instead of their icon.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: 50bc18201d4ae0c530096950325f754e14e52fb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50bc18201d4ae0c530096950… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 19 19:10:34 2019 -0600 user32: Move iconic windows as their border instead of their icon. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 50 ++++++++++++-------------------------------------- 1 file changed, 12 insertions(+), 38 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a938fa9..5837c17 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2709,12 +2709,10 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) HWND parent; LONG hittest = (LONG)(wParam & 0x0f); WPARAM syscommand = wParam & 0xfff0; - HCURSOR hDragCursor = 0, hOldCursor = 0; MINMAXINFO minmax; POINT capturePoint, pt; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); BOOL thickframe = HAS_THICKFRAME( style ); - BOOL iconic = style & WS_MINIMIZE; BOOL moved = FALSE; DWORD dwPoint = GetMessagePos (); BOOL DragFullWindows = TRUE; @@ -2794,13 +2792,6 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) /* Retrieve a default cache DC (without using the window style) */ hdc = GetDCEx( parent, 0, DCX_CACHE ); - if( iconic ) /* create a cursor for dragging */ - { - hDragCursor = (HCURSOR)GetClassLongPtrW( hwnd, GCLP_HICON); - if( !hDragCursor ) hDragCursor = (HCURSOR)SendMessageW( hwnd, WM_QUERYDRAGICON, 0, 0L); - if( !hDragCursor ) iconic = FALSE; - } - /* we only allow disabling the full window drag for child windows */ if (parent) SystemParametersInfoW( SPI_GETDRAGFULLWINDOWS, 0, &DragFullWindows, 0 ); @@ -2870,20 +2861,14 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) if( !moved ) { moved = TRUE; - - if( iconic ) /* ok, no system popup tracking */ - { - hOldCursor = SetCursor(hDragCursor); - ShowCursor( TRUE ); - } - else if(!DragFullWindows) + if (!DragFullWindows) draw_moving_frame( parent, hdc, &sizingRect, thickframe ); } if (msg.message == WM_KEYDOWN) SetCursorPos( pt.x, pt.y ); else { - if(!iconic && !DragFullWindows) draw_moving_frame( parent, hdc, &sizingRect, thickframe ); + if (!DragFullWindows) draw_moving_frame( parent, hdc, &sizingRect, thickframe ); if (hittest == HTCAPTION) OffsetRect( &sizingRect, dx, dy ); if (ON_LEFT_BORDER(hittest)) sizingRect.left += dx; else if (ON_RIGHT_BORDER(hittest)) sizingRect.right += dx; @@ -2903,32 +2888,21 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) else SendMessageW( hwnd, WM_MOVING, 0, (LPARAM)&sizingRect ); - if (!iconic) + if (!DragFullWindows) + draw_moving_frame( parent, hdc, &sizingRect, thickframe ); + else { - if(!DragFullWindows) - draw_moving_frame( parent, hdc, &sizingRect, thickframe ); - else - { - RECT rect = sizingRect; - MapWindowPoints( 0, parent, (POINT *)&rect, 2 ); - SetWindowPos( hwnd, 0, rect.left, rect.top, - rect.right - rect.left, rect.bottom - rect.top, - ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 ); - } + RECT rect = sizingRect; + MapWindowPoints( 0, parent, (POINT *)&rect, 2 ); + SetWindowPos( hwnd, 0, rect.left, rect.top, + rect.right - rect.left, rect.bottom - rect.top, + (hittest == HTCAPTION) ? SWP_NOSIZE : 0 ); } } } } - if( iconic ) - { - if( moved ) /* restore cursors, show icon title later on */ - { - ShowCursor( FALSE ); - SetCursor( hOldCursor ); - } - } - else if (moved && !DragFullWindows) + if (moved && !DragFullWindows) { draw_moving_frame( parent, hdc, &sizingRect, thickframe ); } @@ -2952,7 +2926,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) if (!((msg.message == WM_KEYDOWN) && (msg.wParam == VK_ESCAPE)) ) { /* NOTE: SWP_NOACTIVATE prevents document window activation in Word 6 */ - if(!DragFullWindows || iconic) + if (!DragFullWindows) SetWindowPos( hwnd, 0, sizingRect.left, sizingRect.top, sizingRect.right - sizingRect.left, sizingRect.bottom - sizingRect.top,

1 0

Zebediah Figura : user32: Replace the minimize box with a restore box when the window is minimized.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: 73b50a24e79b43536364a81d7de263151068cfc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73b50a24e79b43536364a81d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 19 19:10:35 2019 -0600 user32: Replace the minimize box with a restore box when the window is minimized. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 372b1be..0aee137 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -749,13 +749,15 @@ static void NC_DrawMaxButton(HWND hwnd,HDC hdc,BOOL down, BOOL bGrayed) static void NC_DrawMinButton(HWND hwnd,HDC hdc,BOOL down, BOOL bGrayed) { RECT rect; - UINT flags = DFCS_CAPTIONMIN; + UINT flags; DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); DWORD ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); /* never draw minimize box when window has WS_EX_TOOLWINDOW style */ if (ex_style & WS_EX_TOOLWINDOW) return; + flags = (style & WS_MINIMIZE) ? DFCS_CAPTIONRESTORE : DFCS_CAPTIONMIN; + NC_GetInsideRect( hwnd, COORDS_WINDOW, &rect, style, ex_style ); if (style & WS_SYSMENU) rect.right -= GetSystemMetrics(SM_CXSIZE); @@ -1245,7 +1247,8 @@ static void NC_TrackMinMaxBox( HWND hwnd, WORD wParam ) return; if (wParam == HTMINBUTTON) - SendMessageW( hwnd, WM_SYSCOMMAND, SC_MINIMIZE, MAKELONG(msg.pt.x,msg.pt.y) ); + SendMessageW( hwnd, WM_SYSCOMMAND, + IsIconic(hwnd) ? SC_RESTORE : SC_MINIMIZE, MAKELONG(msg.pt.x,msg.pt.y) ); else SendMessageW( hwnd, WM_SYSCOMMAND, IsZoomed(hwnd) ? SC_RESTORE:SC_MAXIMIZE, MAKELONG(msg.pt.x,msg.pt.y) );

1 0

Nikolay Sivov : mf: Add attributes store to topology object.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: 8d996644de426114898b0490a8fa009a82f77c6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d996644de426114898b0490… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 20 08:28:01 2019 +0300 mf: Add attributes store to topology object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 1 + dlls/mf/topology.c | 459 ++++++++++++++++++++++++++-------------------------- 2 files changed, 226 insertions(+), 234 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d996644de426114898b…

1 0

Nikolay Sivov : mf: Add IMFTopologyNode stub.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: 2de2bf6ddfe5cf2bc4575e58694e6ae9ebe64f99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2de2bf6ddfe5cf2bc4575e58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 20 08:28:02 2019 +0300 mf: Add IMFTopologyNode stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 8 + dlls/mf/topology.c | 538 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 548 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2de2bf6ddfe5cf2bc457…

1 0

Alistair Leslie-Hughes : mf: Add IMFSequencerSource stub.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: 19ede86938fd48a9a9ddb08cb102902ffa79d7cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=19ede86938fd48a9a9ddb08c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 20 08:28:03 2019 +0300 mf: Add IMFSequencerSource stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/mf.spec | 2 +- dlls/mf/tests/Makefile.in | 2 +- dlls/mf/tests/mf.c | 19 +++++++ dlls/mf/topology.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 5 files changed, 152 insertions(+), 2 deletions(-) diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index e356310..b2e0b9b 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -54,7 +54,7 @@ @ stub MFCreateSampleGrabberSinkActivate @ stub MFCreateSecureHttpSchemePlugin @ stub MFCreateSequencerSegmentOffset -@ stub MFCreateSequencerSource +@ stdcall MFCreateSequencerSource(ptr ptr) @ stub MFCreateSequencerSourceRemoteStream @ stub MFCreateSimpleTypeHandler @ stdcall MFCreateSourceResolver(ptr) mfplat.MFCreateSourceResolver diff --git a/dlls/mf/tests/Makefile.in b/dlls/mf/tests/Makefile.in index f989baa..f233cff 100644 --- a/dlls/mf/tests/Makefile.in +++ b/dlls/mf/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mf.dll -IMPORTS = mf +IMPORTS = mf mfplat C_SRCS = \ mf.c diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index acbba2c..6e77f6b 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "initguid.h" +#include "mfapi.h" #include "mfidl.h" #include "wine/test.h" @@ -178,8 +179,26 @@ static void test_MFGetService(void) ok(unk == (void *)0xdeadbeef, "Unexpected out object.\n"); } +static void test_MFCreateSequencerSource(void) +{ + IMFSequencerSource *seq_source; + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Startup failure, hr %#x.\n", hr); + + hr = MFCreateSequencerSource(NULL, &seq_source); + ok(hr == S_OK, "Failed to create sequencer source, hr %#x.\n", hr); + + IMFSequencerSource_Release(seq_source); + + hr = MFShutdown(); + ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); +} + START_TEST(mf) { test_topology(); test_MFGetService(); + test_MFCreateSequencerSource(); } diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 6d7c9f3..308a1e3 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -47,6 +47,12 @@ struct topology_node MF_TOPOLOGY_TYPE node_type; }; +struct seq_source +{ + IMFSequencerSource IMFSequencerSource_iface; + LONG refcount; +}; + static inline struct topology *impl_from_IMFTopology(IMFTopology *iface) { return CONTAINING_RECORD(iface, struct topology, IMFTopology_iface); @@ -57,6 +63,11 @@ static struct topology_node *impl_from_IMFTopologyNode(IMFTopologyNode *iface) return CONTAINING_RECORD(iface, struct topology_node, IMFTopologyNode_iface); } +static struct seq_source *impl_from_IMFSequencerSource(IMFSequencerSource *iface) +{ + return CONTAINING_RECORD(iface, struct seq_source, IMFSequencerSource_iface); +} + static HRESULT WINAPI topology_QueryInterface(IMFTopology *iface, REFIID riid, void **out) { struct topology *topology = impl_from_IMFTopology(iface); @@ -1052,3 +1063,122 @@ HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode return S_OK; } + +static HRESULT WINAPI seq_source_QueryInterface(IMFSequencerSource *iface, REFIID riid, void **out) +{ + struct seq_source *seq_source = impl_from_IMFSequencerSource(iface); + + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFSequencerSource) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = &seq_source->IMFSequencerSource_iface; + IMFSequencerSource_AddRef(iface); + return S_OK; + } + + WARN("Unimplemented %s.\n", debugstr_guid(riid)); + *out = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI seq_source_AddRef(IMFSequencerSource *iface) +{ + struct seq_source *seq_source = impl_from_IMFSequencerSource(iface); + ULONG refcount = InterlockedIncrement(&seq_source->refcount); + + TRACE("(%p) refcount=%u\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI seq_source_Release(IMFSequencerSource *iface) +{ + struct seq_source *seq_source = impl_from_IMFSequencerSource(iface); + ULONG refcount = InterlockedDecrement(&seq_source->refcount); + + TRACE("(%p) refcount=%u\n", iface, refcount); + + if (!refcount) + { + heap_free(seq_source); + } + + return refcount; +} + +static HRESULT WINAPI seq_source_AppendTopology(IMFSequencerSource *iface, IMFTopology *topology, + DWORD flags, MFSequencerElementId *id) +{ + FIXME("%p, %p, %x, %p\n", iface, topology, flags, id); + + return E_NOTIMPL; +} + +static HRESULT WINAPI seq_source_DeleteTopology(IMFSequencerSource *iface, MFSequencerElementId id) +{ + FIXME("%p, %#x\n", iface, id); + + return E_NOTIMPL; +} + +static HRESULT WINAPI seq_source_GetPresentationContext(IMFSequencerSource *iface, + IMFPresentationDescriptor *descriptor, MFSequencerElementId *id, IMFTopology **topology) +{ + FIXME("%p, %p, %p, %p\n", iface, descriptor, id, topology); + + return E_NOTIMPL; +} + +static HRESULT WINAPI seq_source_UpdateTopology(IMFSequencerSource *iface, MFSequencerElementId id, + IMFTopology *topology) +{ + FIXME("%p, %#x, %p\n", iface, id, topology); + + return E_NOTIMPL; +} + +static HRESULT WINAPI seq_source_UpdateTopologyFlags(IMFSequencerSource *iface, MFSequencerElementId id, DWORD flags) +{ + FIXME("%p, %#x, %#x\n", iface, id, flags); + + return E_NOTIMPL; +} + +static const IMFSequencerSourceVtbl seqsourcevtbl = +{ + seq_source_QueryInterface, + seq_source_AddRef, + seq_source_Release, + seq_source_AppendTopology, + seq_source_DeleteTopology, + seq_source_GetPresentationContext, + seq_source_UpdateTopology, + seq_source_UpdateTopologyFlags, +}; + +/*********************************************************************** + * MFCreateSequencerSource (mf.@) + */ +HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource **seq_source) +{ + struct seq_source *object; + + TRACE("(%p, %p)\n", reserved, seq_source); + + if (!seq_source) + return E_POINTER; + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFSequencerSource_iface.lpVtbl = &seqsourcevtbl; + object->refcount = 1; + + *seq_source = &object->IMFSequencerSource_iface; + + return S_OK; +} diff --git a/include/mfidl.idl b/include/mfidl.idl index 2670c36..82a87ba 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -307,6 +307,7 @@ interface IMFSequencerSource : IUnknown cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) +cpp_quote("HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource **seq_source);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMediaTypes,") cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);")

1 0