April 2016 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: No longer make sub-resources full resources.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: 17768e567bdb03c676bc62c3b40739c4536c43a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17768e567bdb03c676bc62c3b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 21 17:05:04 2016 +0200 wined3d: No longer make sub-resources full resources. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 13 ----- dlls/wined3d/directx.c | 6 --- dlls/wined3d/surface.c | 116 ----------------------------------------- dlls/wined3d/texture.c | 92 ++++++++++++++++---------------- dlls/wined3d/utils.c | 2 - dlls/wined3d/volume.c | 72 ------------------------- dlls/wined3d/wined3d_private.h | 21 -------- include/wine/wined3d.h | 8 ++- 8 files changed, 47 insertions(+), 283 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17768e567bdb03c676bc6…

1 0

Henri Verbeet : wined3d: Try harder to print something reasonable in wined3d_debug_location().
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: 19bb2b1b7e350dc0180ddff4efbfea2b1fdd63de URL: http://source.winehq.org/git/wine.git/?a=commit;h=19bb2b1b7e350dc0180ddff4e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 21 17:05:03 2016 +0200 wined3d: Try harder to print something reasonable in wined3d_debug_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c0688b5..2eca094 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5456,8 +5456,17 @@ void wined3d_get_draw_rect(const struct wined3d_state *state, RECT *rect) const char *wined3d_debug_location(DWORD location) { + const char *prefix = ""; + const char *suffix = ""; char buf[294]; + if (wined3d_popcount(location) > 16) + { + prefix = "~("; + location = ~location; + suffix = ")"; + } + buf[0] = '\0'; #define LOCATION_TO_STR(u) if (location & u) { strcat(buf, " | "#u); location &= ~u; } LOCATION_TO_STR(WINED3D_LOCATION_DISCARDED); @@ -5472,7 +5481,7 @@ const char *wined3d_debug_location(DWORD location) #undef LOCATION_TO_STR if (location) FIXME("Unrecognized location flag(s) %#x.\n", location); - return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; + return wine_dbg_sprintf("%s%s%s", prefix, buf[0] ? &buf[3] : "0", suffix); } /* Print a floating point value with the %.8e format specifier, always using

1 0

Caron Wills : wined3d: Add Nvidia GeForce GTX 880M.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: f52accf86de3f3be387090cf5f1516a693213331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52accf86de3f3be387090cf5… Author: Caron Wills <caron(a)codeweavers.com> Date: Thu Apr 21 18:06:05 2016 +0000 wined3d: Add Nvidia GeForce GTX 880M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1ff8d43..761ee07 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1294,6 +1294,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX850M, "NVIDIA GeForce GTX 850M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX870M, "NVIDIA GeForce GTX 870M", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX880M, "NVIDIA GeForce GTX 880M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1756,6 +1757,7 @@ cards_nvidia_binary[] = {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ + {"GTX 880M", CARD_NVIDIA_GEFORCE_GTX880M}, /* GeForce 800 - mobile */ {"GTX 870M", CARD_NVIDIA_GEFORCE_GTX870M}, /* GeForce 800 - mobile */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ {"GTX 850M", CARD_NVIDIA_GEFORCE_GTX850M}, /* GeForce 800 - mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 099d1ee..bfc8f26 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1802,6 +1802,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX850M = 0x1391, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX870M = 0x1199, + CARD_NVIDIA_GEFORCE_GTX880M = 0x1198, CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, CARD_NVIDIA_GEFORCE_GTX960 = 0x1401,

1 0

Piotr Caban : gdi32/enhmfdrv: Don't drop viewport/ window transformation in StretchBlt.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: d9e7c4d820a104a7a675baa1b2e0261e685deb39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e7c4d820a104a7a675baa1b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 21 17:41:21 2016 +0200 gdi32/enhmfdrv: Don't drop viewport/window transformation in StretchBlt. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/bitblt.c | 2 +- dlls/gdi32/tests/metafile.c | 60 ++++++++++++++++++++++++++++++++++++-------- 2 files changed, 51 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index d6d0fe7..ed03c1f 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -122,7 +122,7 @@ BOOL EMFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, pEMR->dwRop = rop; pEMR->xSrc = src->log_x; pEMR->ySrc = src->log_y; - GetWorldTransform(devSrc->hdc, &pEMR->xformSrc); + GetTransform(devSrc->hdc, 0x204, &pEMR->xformSrc); pEMR->crBkColorSrc = GetBkColor(devSrc->hdc); pEMR->iUsageSrc = DIB_RGB_COLORS; pEMR->offBmiSrc = emrSize; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index b9e7522..c77112d 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -989,7 +989,7 @@ static void test_mf_SaveDC(void) /* with the nominal results. */ /* Maximum size of sample metafiles in bytes. */ -#define MF_BUFSIZE 512 +#define MF_BUFSIZE 1024 /* 8x8 bitmap data for a pattern brush */ static const unsigned char SAMPLE_PATTERN_BRUSH[] = { @@ -1231,16 +1231,16 @@ static const unsigned char EMF_BITBLT[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x6a, 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0xa0, 0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x64, 0x02, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x23, 0x04, 0x00, 0x00, 0x3b, 0x02, 0x00, 0x00, - 0x75, 0x01, 0x00, 0x00, 0xc9, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xb0, 0x04, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x3e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x08, 0xb1, 0x05, 0x00, - 0x28, 0x11, 0x03, 0x00, 0x4c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0x30, 0xda, 0x04, 0x00, 0x4c, 0x00, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1276,9 +1276,34 @@ static const unsigned char EMF_BITBLT[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + 0x00, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x00, + 0xc4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0a, 0xd7, 0xa3, 0x3b, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0a, 0xd7, 0x23, 0x3c, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, + 0x94, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x90, 0x01, 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 }; static const unsigned char EMF_DCBRUSH_BITS[] = @@ -1858,6 +1883,7 @@ static void test_emf_BitBlt(void) 0, /* biClrImportant */ }; void *bits; + XFORM xform; BOOL ret; hdcDisplay = CreateDCA("DISPLAY", NULL, NULL, NULL); @@ -1865,6 +1891,7 @@ static void test_emf_BitBlt(void) hdcBitmap = CreateCompatibleDC(hdcDisplay); ok( hdcBitmap != 0, "CreateCompatibleDC failed\n" ); + ok(SetGraphicsMode(hdcBitmap, GM_ADVANCED), "SetGraphicsMode failed\n"); bmih.biXPelsPerMeter = MulDiv(GetDeviceCaps(hdcDisplay, LOGPIXELSX), 100, 3937); bmih.biYPelsPerMeter = MulDiv(GetDeviceCaps(hdcDisplay, LOGPIXELSY), 100, 3937); hBitmap = CreateDIBSection(hdcDisplay, (const BITMAPINFO *)&bmih, @@ -1883,6 +1910,19 @@ static void test_emf_BitBlt(void) ret = BitBlt(hdcMetafile, 0, 0, BMP_DIM, BMP_DIM, 0, 0, 0, WHITENESS); ok( ret, "BitBlt(WHITENESS) failed\n" ); + ok(SetMapMode(hdcBitmap, MM_ANISOTROPIC), "SetMapMode failed\n"); + ok(SetWindowOrgEx(hdcBitmap, 0, 0, NULL), "SetWindowOrgEx failed\n"); + ok(SetWindowExtEx(hdcBitmap, 400, 400, NULL), "SetWindowExtEx failed\n"); + ok(SetViewportOrgEx(hdcBitmap, 0, 0, NULL), "SetViewportOrgEx failed\n"); + ok(SetViewportExtEx(hdcBitmap, BMP_DIM, BMP_DIM, NULL), "SetViewportExtEx failed\n"); + memset(&xform, 0, sizeof(xform)); + xform.eM11 = 0.5; + xform.eM22 = 1.0; + ok(SetWorldTransform(hdcBitmap, &xform), "SetWorldTransform failed\n"); + + ret = StretchBlt(hdcMetafile, 0, 0, BMP_DIM, BMP_DIM, hdcBitmap, 0, 0, 400, 400, SRCCOPY); + ok( ret, "StretchBlt(SRCCOPY) failed\n" ); + hMetafile = CloseEnhMetaFile(hdcMetafile); ok( hMetafile != 0, "CloseEnhMetaFile failed\n" );

1 0

Francois Gouget : shell32/tests: A spelling fix for an shlfolder ok() message.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: 9638ddd62c2298a2db71b24841f65f86e65218ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9638ddd62c2298a2db71b2484… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 22 00:38:28 2016 +0200 shell32/tests: A spelling fix for an shlfolder ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index da903b0..e80e8a4 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1142,7 +1142,7 @@ static void test_GetAttributesOf(void) todo_wine ok (hr == E_INVALIDARG || broken(hr == S_OK), /* W2K and earlier */ - "MyComputer->GetAttributesOf(emtpy pidl) should fail! hr = %08x\n", hr); + "MyComputer->GetAttributesOf(empty pidl) should fail! hr = %08x\n", hr); dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfMyComputer, 0, NULL, &dwFlags);

1 0

Michael Stefaniuc : riched20: Use wine_dbgstr_rect() to trace a RECT.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 9b4b75312aaa323e22d2f054388591907c42245a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b4b75312aaa323e22d2f0543… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 21 10:54:11 2016 +0200 riched20: Use wine_dbgstr_rect() to trace a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index f893061..8580539 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -956,7 +956,7 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) rc.right = rc.left + run->nWidth; rc.top = c->pt.y + para->pt.y + run->pt.y; rc.bottom = rc.top + height; - TRACE("rc = (%d, %d, %d, %d)\n", rc.left, rc.top, rc.right, rc.bottom); + TRACE("rc = %s\n", wine_dbgstr_rect(&rc)); FrameRect(c->hDC, &rc, GetSysColorBrush(COLOR_GRAYTEXT)); } if (visible)

1 0

Piotr Caban : gdi32: Use advanced graphics mode when setting world transform in PlayEnhMetaFileRecord.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 69e37ff05e99873d0d55e0b64e66c524a5d23f57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69e37ff05e99873d0d55e0b64… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 20 18:35:10 2016 +0200 gdi32: Use advanced graphics mode when setting world transform in PlayEnhMetaFileRecord. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 995997c..32d5e10 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1820,6 +1820,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( HBITMAP hBmp = 0, hBmpOld = 0; const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pBitBlt->offBmiSrc); + SetGraphicsMode(hdcSrc, GM_ADVANCED); SetWorldTransform(hdcSrc, &pBitBlt->xformSrc); hBrush = CreateSolidBrush(pBitBlt->crBkColorSrc); @@ -1862,6 +1863,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( HBITMAP hBmp = 0, hBmpOld = 0; const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pStretchBlt->offBmiSrc); + SetGraphicsMode(hdcSrc, GM_ADVANCED); SetWorldTransform(hdcSrc, &pStretchBlt->xformSrc); hBrush = CreateSolidBrush(pStretchBlt->crBkColorSrc); @@ -1904,6 +1906,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pAlphaBlend->offBmiSrc); void *bits; + SetGraphicsMode(hdcSrc, GM_ADVANCED); SetWorldTransform(hdcSrc, &pAlphaBlend->xformSrc); hBmp = CreateDIBSection(hdc, pbi, pAlphaBlend->iUsageSrc, &bits, NULL, 0); @@ -1929,6 +1932,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( HBITMAP hBmp, hBmpOld, hBmpMask; const BITMAPINFO *pbi; + SetGraphicsMode(hdcSrc, GM_ADVANCED); SetWorldTransform(hdcSrc, &pMaskBlt->xformSrc); hBrush = CreateSolidBrush(pMaskBlt->crBkColorSrc); @@ -1977,6 +1981,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( const BITMAPINFO *pbi; POINT pts[3]; + SetGraphicsMode(hdcSrc, GM_ADVANCED); SetWorldTransform(hdcSrc, &pPlgBlt->xformSrc); pts[0].x = pPlgBlt->aptlDest[0].x; pts[0].y = pPlgBlt->aptlDest[0].y;

1 0

Alexandre Julliard : ole32: Fix a couple of reference leaks.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 4f2db2ae0c155600f468f44732179065bf0ef883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2db2ae0c155600f468f4473… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 21 17:00:24 2016 +0900 ole32: Fix a couple of reference leaks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 04e0244..8e1aaef 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2063,12 +2063,12 @@ static HRESULT PropertyStorage_BaseConstruct(IStream *stm, hr = PropertyStorage_CreateDictionaries(*pps); if (FAILED(hr)) { - IStream_Release(stm); (*pps)->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&(*pps)->cs); HeapFree(GetProcessHeap(), 0, *pps); *pps = NULL; } + else IStream_AddRef( stm ); return hr; } @@ -2090,11 +2090,7 @@ static HRESULT PropertyStorage_ConstructFromStream(IStream *stm, TRACE("PropertyStorage %p constructed\n", ps); hr = S_OK; } - else - { - PropertyStorage_DestroyDictionaries(ps); - HeapFree(GetProcessHeap(), 0, ps); - } + else IPropertyStorage_Release( &ps->IPropertyStorage_iface ); } return hr; } @@ -2222,6 +2218,8 @@ static HRESULT WINAPI IPropertySetStorage_fnCreate( r = PropertyStorage_ConstructEmpty(stm, rfmtid, grfFlags, grfMode, ppprstg); + IStream_Release( stm ); + end: TRACE("returning 0x%08x\n", r); return r; @@ -2267,6 +2265,8 @@ static HRESULT WINAPI IPropertySetStorage_fnOpen( r = PropertyStorage_ConstructFromStream(stm, rfmtid, grfMode, ppprstg); + IStream_Release( stm ); + end: TRACE("returning 0x%08x\n", r); return r; @@ -2804,6 +2804,8 @@ HRESULT WINAPI StgCreatePropStg(IUnknown *unk, REFFMTID fmt, const CLSID *clsid, r = PropertyStorage_ConstructEmpty(stm, fmt, flags, STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, prop_stg); + + IStream_Release( stm ); } end: @@ -2847,6 +2849,8 @@ HRESULT WINAPI StgOpenPropStg(IUnknown *unk, REFFMTID fmt, DWORD flags, r = PropertyStorage_ConstructFromStream(stm, fmt, STGM_READWRITE|STGM_SHARE_EXCLUSIVE, prop_stg); + + IStream_Release( stm ); } end:

1 0

Sebastian Lackner : services: Track services and processes separately.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 37097ce95c449d90f2fc6cce7cbc4f0d0e65ead9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37097ce95c449d90f2fc6cce7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 20 14:51:30 2016 +0200 services: Track services and processes separately. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 37 ++++---- programs/services/services.c | 207 ++++++++++++++++++++++++++----------------- programs/services/services.h | 4 + 3 files changed, 151 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37097ce95c449d90f2fc6…

1 0

Francois Gouget : msi/tests: Spelling fixes for some action and package ok () messages.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 50ab36ac9725920bb7d767ff7048d17e9349bfb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50ab36ac9725920bb7d767ff7… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 08:55:43 2016 +0200 msi/tests: Spelling fixes for some action and package ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 4 ++-- dlls/msi/tests/package.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 662ed4b..243e61b 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -5886,7 +5886,7 @@ static void test_publish_components(void) size = 0; r = MsiProvideQualifiedComponentA("{92AFCBC0-9CA6-4270-8454-47C5EE2B8FAA}", "english.txt", INSTALLMODE_DEFAULT, NULL, &size); - ok(r == ERROR_SUCCESS, "MsiProvideQualifiedCompontent returned %d\n", r); + ok(r == ERROR_SUCCESS, "MsiProvideQualifiedComponent returned %d\n", r); res = RegOpenKeyA(HKEY_CURRENT_USER, keypath, &key); ok(res == ERROR_SUCCESS, "components key not created %d\n", res); @@ -5912,7 +5912,7 @@ static void test_publish_components(void) size = 0; r = MsiProvideQualifiedComponentA("{92AFCBC0-9CA6-4270-8454-47C5EE2B8FAA}", "english.txt", INSTALLMODE_DEFAULT, NULL, &size); - ok(r == ERROR_SUCCESS, "MsiProvideQualifiedCompontent returned %d\n", r); + ok(r == ERROR_SUCCESS, "MsiProvideQualifiedComponent returned %d\n", r); if (pRegDeleteKeyExA) res = pRegDeleteKeyExA(HKEY_LOCAL_MACHINE, keypath2, KEY_WOW64_64KEY, 0); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 60a08ac..6bdacd7 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2482,7 +2482,7 @@ static void test_msipackage(void) r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_CREATE, &hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - /* database exists, but is emtpy */ + /* database exists, but is empty */ sprintf(name, "#%d", hdb); r = MsiOpenPackageA(name, &hpack); ok(r == ERROR_INSTALL_PACKAGE_INVALID,

1 0