October 2015 - Wine-commits

Anton Baskanov : gdi32: Return default palette entries from GetSystemPaletteEntries for non-palette-based devices.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 18dc14ed9aaace447dfd3647031bdb0a8f700c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18dc14ed9aaace447dfd36470… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Oct 20 22:16:29 2015 +0600 gdi32: Return default palette entries from GetSystemPaletteEntries for non-palette-based devices. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 5 -- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/palette.c | 31 +++++++++++ dlls/gdi32/tests/palette.c | 126 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/palette.c | 5 ++ 5 files changed, 163 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index a6b138c..d052e04 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -371,11 +371,6 @@ static UINT nulldrv_GetOutlineTextMetrics( PHYSDEV dev, UINT size, LPOUTLINETEXT return 0; } -static UINT nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries ) -{ - return 0; -} - static UINT nulldrv_GetTextCharsetInfo( PHYSDEV dev, LPFONTSIGNATURE fs, DWORD flags ) { return DEFAULT_CHARSET; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 337fe27..cde9867 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -370,6 +370,7 @@ extern BOOL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, IN extern LONG nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size ) DECLSPEC_HIDDEN; extern COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; +extern UINT nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries ) DECLSPEC_HIDDEN; extern BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, void * grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN; extern INT nulldrv_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index d850d0f..be84b71 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -426,6 +426,37 @@ UINT WINAPI GetSystemPaletteEntries( } +/* null driver fallback implementation for GetSystemPaletteEntries */ +UINT nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries ) +{ + if (entries && start < 256) + { + UINT i; + const RGBQUAD *default_entries; + + if (start + count > 256) count = 256 - start; + + default_entries = get_default_color_table( 8 ); + for (i = 0; i < count; ++i) + { + if (start + i < 10 || start + i >= 246) + { + entries[i].peRed = default_entries[start + i].rgbRed; + entries[i].peGreen = default_entries[start + i].rgbGreen; + entries[i].peBlue = default_entries[start + i].rgbBlue; + } + else + { + entries[i].peRed = 0; + entries[i].peGreen = 0; + entries[i].peBlue = 0; + } + entries[i].peFlags = 0; + } + } + return 0; +} + /*********************************************************************** * GetNearestPaletteIndex [GDI32.@] * diff --git a/dlls/gdi32/tests/palette.c b/dlls/gdi32/tests/palette.c index f95c0d3..045f530 100644 --- a/dlls/gdi32/tests/palette.c +++ b/dlls/gdi32/tests/palette.c @@ -191,9 +191,135 @@ static void test_halftone_palette(void) ReleaseDC( 0, hdc ); } +static void check_system_palette_entries(HDC hdc) +{ + PALETTEENTRY entries[256]; + PALETTEENTRY defpal[20]; + int i, count; + + memset( defpal, 0xaa, sizeof(defpal) ); + count = GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, 20, defpal ); + ok( count == 20, "wrong size %u\n", count ); + + memset( entries, 0x55, sizeof(entries) ); + count = GetSystemPaletteEntries( hdc, 0, 256, entries ); + ok( count == 0, "wrong size %u\n", count); + for (i = 0; i < 10; i++) + { + ok( entries[i].peRed == defpal[i].peRed && + entries[i].peGreen == defpal[i].peGreen && + entries[i].peBlue == defpal[i].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, + defpal[i].peRed, defpal[i].peGreen, defpal[i].peBlue ); + } + for (i = 10; i < 246; ++i) + { + ok( !entries[i].peRed && + !entries[i].peGreen && + !entries[i].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of 0,0,0\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags); + } + for (i = 246; i < 256; i++) + { + int idx = i - 246 + 10; + ok( entries[i].peRed == defpal[idx].peRed && + entries[i].peGreen == defpal[idx].peGreen && + entries[i].peBlue == defpal[idx].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, + defpal[idx].peRed, defpal[idx].peGreen, defpal[idx].peBlue ); + } + + memset( entries, 0x55, sizeof(entries) ); + count = GetSystemPaletteEntries( hdc, 0, 10, entries ); + ok( count == 0, "wrong size %u\n", count); + for (i = 0; i < 10; i++) + { + ok( entries[i].peRed == defpal[i].peRed && + entries[i].peGreen == defpal[i].peGreen && + entries[i].peBlue == defpal[i].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, + defpal[i].peRed, defpal[i].peGreen, defpal[i].peBlue ); + } + + memset( entries, 0x55, sizeof(entries) ); + count = GetSystemPaletteEntries( hdc, 10, 246, entries ); + ok( count == 0, "wrong size %u\n", count); + for (i = 0; i < 236; ++i) + { + ok( !entries[i].peRed && + !entries[i].peGreen && + !entries[i].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of 0,0,0\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags); + } + for (i = 236; i < 246; i++) + { + int idx = i - 236 + 10; + ok( entries[i].peRed == defpal[idx].peRed && + entries[i].peGreen == defpal[idx].peGreen && + entries[i].peBlue == defpal[idx].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, + defpal[idx].peRed, defpal[idx].peGreen, defpal[idx].peBlue ); + } + + memset( entries, 0x55, sizeof(entries) ); + count = GetSystemPaletteEntries( hdc, 246, 10, entries ); + ok( count == 0, "wrong size %u\n", count); + for (i = 0; i < 10; i++) + { + int idx = i + 10; + ok( entries[i].peRed == defpal[idx].peRed && + entries[i].peGreen == defpal[idx].peGreen && + entries[i].peBlue == defpal[idx].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, + defpal[idx].peRed, defpal[idx].peGreen, defpal[idx].peBlue ); + } +} + +static void test_system_palette_entries(void) +{ + HDC hdc; + HDC metafile_dc; + HMETAFILE metafile; + + hdc = GetDC(0); + + if (!(GetDeviceCaps( hdc, RASTERCAPS ) & RC_PALETTE)) + { + check_system_palette_entries(hdc); + } + else + { + skip( "device is palette-based, skipping test\n" ); + } + + ReleaseDC( 0, hdc ); + + metafile_dc = CreateMetaFileA(NULL); + + check_system_palette_entries(metafile_dc); + + metafile = CloseMetaFile(metafile_dc); + DeleteMetaFile(metafile); +} + START_TEST(palette) { test_DIB_PAL_COLORS(); test_palette_entries(); test_halftone_palette(); + test_system_palette_entries(); } diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index a399ec9..460615c 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -1215,6 +1215,11 @@ UINT X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, LPPALE { UINT i; + if (!palette_size) + { + dev = GET_NEXT_PHYSDEV(dev, pGetSystemPaletteEntries); + return dev->funcs->pGetSystemPaletteEntries(dev, start, count, entries); + } if (!entries) return palette_size; if (start >= palette_size) return 0; if (start + count >= palette_size) count = palette_size - start;

1 0

Huw Davies : wineps: Let CUPS control the copy count rather than embedding it in the PostScript.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 631caae76d0225dd39ab6084cb68771784a5773e URL: http://source.winehq.org/git/wine.git/?a=commit;h=631caae76d0225dd39ab6084c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 21 09:17:49 2015 +0100 wineps: Let CUPS control the copy count rather than embedding it in the PostScript. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/ps.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 6187223..a19dda3 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -331,6 +331,7 @@ struct ticket_info static void write_cups_job_ticket( PHYSDEV dev, const struct ticket_info *info ) { + PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); char buf[256]; int len; @@ -356,6 +357,14 @@ static void write_cups_job_ticket( PHYSDEV dev, const struct ticket_info *info ) write_spool( dev, str, strlen( str ) ); } } + + if (physDev->Devmode->dmPublic.u1.s1.dmCopies > 1) + { + len = snprintf( buf, sizeof(buf), "%%cupsJobTicket: copies=%d\n", + physDev->Devmode->dmPublic.u1.s1.dmCopies ); + if (len > 0 && len < sizeof(buf)) + write_spool( dev, buf, len ); + } } INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) @@ -414,12 +423,6 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) write_spool( dev, psendprolog, strlen(psendprolog) ); write_spool( dev, psbeginsetup, strlen(psbeginsetup) ); - if(physDev->Devmode->dmPublic.u1.s1.dmCopies > 1) { - char copies_buf[100]; - sprintf(copies_buf, "mark {\n << /NumCopies %d >> setpagedevice\n} stopped cleartomark\n", physDev->Devmode->dmPublic.u1.s1.dmCopies); - write_spool(dev, copies_buf, strlen(copies_buf)); - } - if (slot && slot->InvocationString) PSDRV_WriteFeature( dev, "*InputSlot", slot->Name, slot->InvocationString );

1 0

Huw Davies : wineps: Pass the collate setting as a CUPS option.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 3f276c9be2a98cef198565f92b66163ef3ce2f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f276c9be2a98cef198565f92… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 21 09:17:50 2015 +0100 wineps: Pass the collate setting as a CUPS option. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/ps.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index a19dda3..a01346e 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -48,6 +48,8 @@ static const char *cups_duplexes[3] = cups_two_sided_long, /* DMDUP_VERTICAL */ cups_two_sided_short /* DMDUP_HORIZONTAL */ }; +static const char cups_collate_false[] = "%cupsJobTicket: collate=false\n"; +static const char cups_collate_true[] = "%cupsJobTicket: collate=true\n"; static const char psheader[] = /* title llx lly urx ury orientation */ "%%%%Creator: Wine PostScript Driver\n" @@ -364,6 +366,14 @@ static void write_cups_job_ticket( PHYSDEV dev, const struct ticket_info *info ) physDev->Devmode->dmPublic.u1.s1.dmCopies ); if (len > 0 && len < sizeof(buf)) write_spool( dev, buf, len ); + + if (physDev->Devmode->dmPublic.dmFields & DM_COLLATE) + { + if (physDev->Devmode->dmPublic.dmCollate == DMCOLLATE_FALSE) + write_spool( dev, cups_collate_false, sizeof(cups_collate_false) - 1 ); + else if (physDev->Devmode->dmPublic.dmCollate == DMCOLLATE_TRUE) + write_spool( dev, cups_collate_true, sizeof(cups_collate_true) - 1 ); + } } }

1 0

Bruno Jesus : msvfw32: Fix a copy & paste issue.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: f12a970c0970945337fda8f985b2c4b84fd1c92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12a970c0970945337fda8f98… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Oct 21 13:29:38 2015 +0800 msvfw32: Fix a copy & paste issue. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index d0ff270..db71014 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1415,8 +1415,8 @@ static void clear_compvars(PCOMPVARS pc) pc->lpbiIn = pc->lpBitsPrev = pc->lpBitsOut = pc->lpState = NULL; if (pc->dwFlags & 0x80000000) { - HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); - pc->lpBitsOut = NULL; + HeapFree(GetProcessHeap(), 0, pc->lpbiOut); + pc->lpbiOut = NULL; pc->dwFlags &= ~0x80000000; } } @@ -1461,6 +1461,8 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) pc->lpbiOut = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFO)); if (!pc->lpbiOut) goto error; + /* Flag to show that we allocated lpbiOut for proper cleanup */ + pc->dwFlags |= 0x80000000; ret = ICSendMessage(pc->hic, ICM_COMPRESS_GET_FORMAT, (DWORD_PTR)pc->lpbiIn, (DWORD_PTR)pc->lpbiOut); @@ -1479,8 +1481,6 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) pc->lpbiOut->bmiHeader.biSizeImage = max(8192, pc->lpbiIn->bmiHeader.biSizeImage); ERR("Bad codec! Invalid output frame size, guessing from input\n"); } - /* Flag to show that we allocated lpbiOutput for proper cleanup */ - pc->dwFlags |= 0x80000000; } TRACE("Input: %ux%u, fcc %s, bpp %u, size %u\n",

1 0

Bruno Jesus : msvfw32: Ask the driver about how much data is required for lpbiOut.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: bd4ead0fec36a6901df0afa15743e4806c93fe68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd4ead0fec36a6901df0afa15… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Oct 21 13:30:48 2015 +0800 msvfw32: Ask the driver about how much data is required for lpbiOut. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index db71014..717bcf9 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1458,7 +1458,13 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) if (!pc->lpbiOut) { - pc->lpbiOut = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFO)); + /* Ask compressor for needed header size */ + int size = ICSendMessage(pc->hic, ICM_COMPRESS_GET_FORMAT, + (DWORD_PTR)pc->lpbiIn, 0); + if (size <= 0) + goto error; + + pc->lpbiOut = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (!pc->lpbiOut) goto error; /* Flag to show that we allocated lpbiOut for proper cleanup */

1 0

Bruno Jesus : msvfw32/tests: Add ICSeqFrameCompress tests.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 8b054fb3076b4af63af77c41bc350c2e110ef8a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b054fb3076b4af63af77c41b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Oct 21 13:31:47 2015 +0800 msvfw32/tests: Add ICSeqFrameCompress tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/tests/msvfw.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 139c644..0b18e47 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -200,8 +200,73 @@ static void test_Locate(void) if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); } +static void test_ICSeqCompress(void) +{ + /* The purpose of this test is to validate sequential frame compressing + * functions. The MRLE codec will be used because Wine supports it and + * it is present in any Windows. + */ + HIC h; + DWORD err, vidc = mmioFOURCC('v','i','d','c'), mrle = mmioFOURCC('m', 'r', 'l', 'e'); + DWORD i; + LONG frame_len; + BOOL key_frame, ret; + char *frame; + COMPVARS pc; + struct { BITMAPINFOHEADER header; RGBQUAD map[256]; } + input_header = { {sizeof(BITMAPINFOHEADER), 32, 1, 1, 8, 0, 32*8, 0, 0, 256, 256}, + {{255,0,0}, {0,255,0}, {0,0,255}, {255,255,255}}}; + PBITMAPINFO bitmap = (PBITMAPINFO) &input_header; + static BYTE input[32] = {1,2,3,3,3,3,2,3,1}; + static const BYTE output_kf[] = {1,1,1,2,4,3,0,3,2,3,1,0,23,0,0,0,0,1}, /* key frame*/ + output_nkf[] = {0,0,0,1}; /* non key frame */ + + h = ICOpen(vidc, mrle, ICMODE_COMPRESS); + ok(h != NULL, "Expected non-NULL\n"); + + pc.cbSize = sizeof(pc); + pc.dwFlags = ICMF_COMPVARS_VALID; + pc.fccType = vidc; + pc.fccHandler = mrle; + pc.hic = h; + pc.lpbiIn = NULL; + pc.lpbiOut = NULL; + pc.lpBitsOut = pc.lpBitsPrev = pc.lpState = NULL; + pc.lQ = ICQUALITY_DEFAULT; + pc.lKey = 1; + pc.lDataRate = 300; + pc.lpState = NULL; + pc.cbState = 0; + + ret = ICSeqCompressFrameStart(&pc, bitmap); + ok(ret == TRUE, "Expected TRUE\n"); + /* Check that reserved pointers were allocated */ + ok(pc.lpbiIn != NULL, "Expected non-NULL\n"); + ok(pc.lpbiOut != NULL, "Expected non-NULL\n"); + + for(i = 0; i < 9; i++) + { + frame_len = 0; + frame = ICSeqCompressFrame(&pc, 0, input, &key_frame, &frame_len); + ok(frame != NULL, "Frame[%d]: Expected non-NULL\n", i); + if (frame_len == sizeof(output_nkf)) + ok(!memcmp(output_nkf, frame, frame_len), "Frame[%d]: Contents do not match\n", i); + else if (frame_len == sizeof(output_kf)) + ok(!memcmp(output_kf, frame, frame_len), "Frame[%d]: Contents do not match\n", i); + else + ok(0, "Unknown frame size of %d byten\n", frame_len); + } + + ICSeqCompressFrameEnd(&pc); + ICCompressorFree(&pc); + /* ICCompressorFree already closed the HIC */ + err = ICClose(h); + ok(err == ICERR_BADHANDLE, "Expected -8, got %d\n", err); +} + START_TEST(msvfw) { test_OpenCase(); test_Locate(); + test_ICSeqCompress(); }

1 0

Alex Henrie : user32: Release capture before sending WM_COMMAND.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: a3e4c694197018f5c05b815660f3cd9fcee17c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e4c694197018f5c05b81566… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 12 01:30:51 2015 -0600 user32: Release capture before sending WM_COMMAND. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index eeb3035..db479a8 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -353,9 +353,13 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, (state & BST_INDETERMINATE) ? 0 : ((state & 3) + 1), 0 ); break; } + ReleaseCapture(); BUTTON_NOTIFY_PARENT(hWnd, BN_CLICKED); } - ReleaseCapture(); + else + { + ReleaseCapture(); + } break; case WM_CAPTURECHANGED:

1 0

Nikolay Sivov : quartz: Minor cleanup of returned interface pointers.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 5fb58eae3b9c2ca89d801b9d50ef9843665ca6b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb58eae3b9c2ca89d801b9d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 14:31:49 2015 +0300 quartz: Minor cleanup of returned interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 2 +- dlls/quartz/filesource.c | 10 ++++------ dlls/quartz/mpegsplit.c | 2 +- dlls/quartz/parser.c | 10 +++++----- dlls/quartz/systemclock.c | 2 +- dlls/quartz/vmr9.c | 2 +- dlls/quartz/waveparser.c | 2 +- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index d62ec2b..74529f2 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1451,7 +1451,7 @@ HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) if (FAILED(hr)) return hr; - *ppv = This; + *ppv = &This->Parser.filter.IBaseFilter_iface; return hr; } diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 877c706..33ac442 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -810,20 +810,18 @@ static HRESULT WINAPI FileAsyncReaderPin_QueryInterface(IPin * iface, REFIID rii *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IPin)) - *ppv = This; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) + *ppv = &This->pin.pin.IPin_iface; else if (IsEqualIID(riid, &IID_IAsyncReader)) *ppv = &This->IAsyncReader_iface; if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); + IUnknown_AddRef((IUnknown *)*ppv); return S_OK; } - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IMediaSeeking)) + if (!IsEqualIID(riid, &IID_IMediaSeeking)) FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 33a93ba..60dd82c 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -797,7 +797,7 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) This->seek = TRUE; /* Note: This memory is managed by the parser filter once created */ - *ppv = This; + *ppv = &This->Parser.filter.IBaseFilter_iface; return hr; } diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index cd8d93d..fd98787 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -147,11 +147,11 @@ HRESULT WINAPI Parser_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * || IsEqualIID(riid, &IID_IPersist) || IsEqualIID(riid, &IID_IMediaFilter) || IsEqualIID(riid, &IID_IBaseFilter) ) - *ppv = This; + *ppv = &This->filter.IBaseFilter_iface; if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); + IUnknown_AddRef((IUnknown *)*ppv); return S_OK; } @@ -521,21 +521,21 @@ static HRESULT WINAPI Parser_Seeking_QueryInterface(IMediaSeeking * iface, REFII { ParserImpl *This = impl_from_IMediaSeeking(iface); - return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); + return IBaseFilter_QueryInterface(&This->filter.IBaseFilter_iface, riid, ppv); } static ULONG WINAPI Parser_Seeking_AddRef(IMediaSeeking * iface) { ParserImpl *This = impl_from_IMediaSeeking(iface); - return IUnknown_AddRef((IUnknown *)This); + return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); } static ULONG WINAPI Parser_Seeking_Release(IMediaSeeking * iface) { ParserImpl *This = impl_from_IMediaSeeking(iface); - return IUnknown_Release((IUnknown *)This); + return IBaseFilter_Release(&This->filter.IBaseFilter_iface); } static const IMediaSeekingVtbl Parser_Seeking_Vtbl = diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index cdb06f7..a3e1504 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -215,7 +215,7 @@ static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock* iface, REF if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IReferenceClock)) { SystemClockImpl_AddRef(iface); - *ppobj = This; + *ppobj = &This->IReferenceClock_iface; return S_OK; } diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index c9a330d..10b9dff 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -3111,6 +3111,6 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *paren This->SurfaceAllocatorNotify = NULL; This->reset = FALSE; - *ppv = This; + *ppv = &This->IVMRImagePresenter9_iface; return S_OK; } diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 3f3846c..6e8c664 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -440,7 +440,7 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) if (FAILED(hr)) return hr; - *ppv = This; + *ppv = &This->Parser.filter.IBaseFilter_iface; return hr; }

1 0

Nikolay Sivov : shell32/tests: Fix prototype to match implementation ( PVS-Studio).
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 2fff77a0eee097de8510ae2f229d5aa7b9551316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fff77a0eee097de8510ae2f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 14:43:30 2015 +0300 shell32/tests: Fix prototype to match implementation (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/string.c b/dlls/shell32/tests/string.c index 81f4754..6cdb386 100644 --- a/dlls/shell32/tests/string.c +++ b/dlls/shell32/tests/string.c @@ -32,7 +32,7 @@ #include "wine/test.h" static HMODULE hShell32; -static HRESULT (WINAPI *pStrRetToStrNAW)(LPVOID,DWORD,LPSTRRET,const ITEMIDLIST *); +static BOOL (WINAPI *pStrRetToStrNAW)(LPVOID,DWORD,LPSTRRET,const ITEMIDLIST *); static WCHAR *CoDupStrW(const char* src) {

1 0

Francois Gouget : testbot: Don't sleep after a revert.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: tools Branch: master Commit: 3d769372cf523ff69249892d214bde772d8448dc URL: http://source.winehq.org/git/tools.git/?a=commit;h=3d769372cf523ff69249892d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 21 14:21:21 2015 +0200 testbot: Don't sleep after a revert. It may be needed for hypervisors that start the VM before fully reloading its state but that's the exception. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index db7f18d..cb5bfe4 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -66,7 +66,7 @@ $MaxRevertingVMs = 1; $MaxRevertsWhileRunningVMs = 1; $MaxActiveVMs = 2; $MaxVMsWhenIdle = undef; -$SleepAfterRevert = 30; +$SleepAfterRevert = 0; $WaitForToolsInVM = 30; $SuiteTimeout = 30 * 60;

1 0