October 2014 - Wine-commits

Nikolay Sivov : gameux: Use CLSIDFromString() instead of shell32 equivalent.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: febb3974b51188ce03a129ada12c6a9dd934da8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=febb3974b51188ce03a129ada… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 14 22:53:29 2014 +0400 gameux: Use CLSIDFromString() instead of shell32 equivalent. --- dlls/gameux/gameexplorer.c | 5 +---- dlls/gameux/tests/gameexplorer.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 1690bd7..6bdb2e4 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -35,9 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gameux); -/* function from Shell32, not defined in header */ -extern BOOL WINAPI GUIDFromStringW(LPCWSTR psz, LPGUID pguid); - /******************************************************************************* * GameUX helper functions */ @@ -780,7 +777,7 @@ HRESULT GAMEUX_FindGameInstanceId( if(lstrcmpW(lpValue, sGDFBinaryPath)==0) { /* key found, let's copy instance id and exit */ - hr = (GUIDFromStringW(lpName, pInstanceId) ? S_OK : E_FAIL); + hr = CLSIDFromString(lpName, pInstanceId); found = TRUE; } HeapFree(GetProcessHeap(), 0, lpValue); diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 5ed780c..1f25f71 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -33,9 +33,6 @@ #include "wine/test.h" -/* function from Shell32, not defined in header */ -extern BOOL WINAPI GUIDFromStringW(LPCWSTR psz, LPGUID pguid); - /******************************************************************************* * Pointers used instead of direct calls. These procedures are not available on * older system, which causes problem while loading test binary. @@ -476,7 +473,7 @@ static void _findGameInstanceId(int line, if(lstrcmpW(lpValue, sGDFBinaryPath)==0) { /* key found, let's copy instance id and exit */ - hr = (GUIDFromStringW(lpName, pInstanceId) ? S_OK : E_FAIL); + hr = CLSIDFromString(lpName, pInstanceId); ok(SUCCEEDED(hr), "cannot convert subkey to guid: %s\n", wine_dbgstr_w(lpName));

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_DrawTextLayout().
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: 0d962da9d3c7a5b3b6509da66c1a05926c7554b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d962da9d3c7a5b3b6509da66… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 6 08:24:17 2014 +0200 d2d1: Implement d2d_d3d_render_target_DrawTextLayout(). --- dlls/d2d1/d2d1_private.h | 5 ++ dlls/d2d1/factory.c | 1 + dlls/d2d1/render_target.c | 138 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 143 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 7c7956b..2d1fea2 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -24,6 +24,10 @@ #include <limits.h> #define COBJMACROS #include "d2d1.h" +#ifdef D2D1_INIT_GUID +#include "initguid.h" +#endif +#include "dwrite.h" struct d2d_clip_stack { @@ -35,6 +39,7 @@ struct d2d_clip_stack struct d2d_d3d_render_target { ID2D1RenderTarget ID2D1RenderTarget_iface; + IDWriteTextRenderer IDWriteTextRenderer_iface; LONG refcount; ID3D10Device *device; diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 7919210..27370c1 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -19,6 +19,7 @@ #include "config.h" #include "wine/port.h" +#define D2D1_INIT_GUID #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 4a69fce..f730e64 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -26,6 +26,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); #define INITIAL_CLIP_STACK_SIZE 4 +struct d2d_draw_text_layout_ctx +{ + ID2D1Brush *brush; + D2D1_DRAW_TEXT_OPTIONS options; +}; + static void d2d_point_transform(D2D1_POINT_2F *dst, const D2D1_MATRIX_3X2_F *matrix, float x, float y) { dst->x = x * matrix->_11 + y * matrix->_21 + matrix->_31; @@ -503,8 +509,19 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawText(ID2D1RenderTarget * static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawTextLayout(ID2D1RenderTarget *iface, D2D1_POINT_2F origin, IDWriteTextLayout *layout, ID2D1Brush *brush, D2D1_DRAW_TEXT_OPTIONS options) { - FIXME("iface %p, origin {%.8e, %.8e}, layout %p, brush %p, options %#x stub!\n", + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_draw_text_layout_ctx ctx; + HRESULT hr; + + TRACE("iface %p, origin {%.8e, %.8e}, layout %p, brush %p, options %#x.\n", iface, origin.x, origin.y, layout, brush, options); + + ctx.brush = brush; + ctx.options = options; + + if (FAILED(hr = IDWriteTextLayout_Draw(layout, + &ctx, &render_target->IDWriteTextRenderer_iface, origin.x, origin.y))) + FIXME("Failed to draw text layout, hr %#x.\n", hr); } static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarget *iface, @@ -883,6 +900,124 @@ static const struct ID2D1RenderTargetVtbl d2d_d3d_render_target_vtbl = d2d_d3d_render_target_IsSupported, }; +static inline struct d2d_d3d_render_target *impl_from_IDWriteTextRenderer(IDWriteTextRenderer *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_d3d_render_target, IDWriteTextRenderer_iface); +} + +HRESULT STDMETHODCALLTYPE d2d_text_renderer_QueryInterface(IDWriteTextRenderer *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IDWriteTextRenderer) + || IsEqualGUID(iid, &IID_IDWritePixelSnapping) + || IsEqualGUID(iid, &IID_IUnknown)) + { + IDWriteTextRenderer_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +ULONG STDMETHODCALLTYPE d2d_text_renderer_AddRef(IDWriteTextRenderer *iface) +{ + struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + + TRACE("iface %p.\n", iface); + + return d2d_d3d_render_target_AddRef(&render_target->ID2D1RenderTarget_iface); +} + +ULONG STDMETHODCALLTYPE d2d_text_renderer_Release(IDWriteTextRenderer *iface) +{ + struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + + TRACE("iface %p.\n", iface); + + return d2d_d3d_render_target_Release(&render_target->ID2D1RenderTarget_iface); +} + +HRESULT STDMETHODCALLTYPE d2d_text_renderer_IsPixelSnappingDisabled(IDWriteTextRenderer *iface, + void *ctx, BOOL *disabled) +{ + FIXME("iface %p, ctx %p, disabled %p stub!\n", iface, ctx, disabled); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetCurrentTransform(IDWriteTextRenderer *iface, + void *ctx, DWRITE_MATRIX *transform) +{ + FIXME("iface %p, ctx %p, transform %p stub!\n", iface, ctx, transform); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetPixelsPerDip(IDWriteTextRenderer *iface, void *ctx, float *ppd) +{ + FIXME("iface %p, ctx %p, ppd %p stub!\n", iface, ctx, ppd); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRenderer *iface, void *ctx, + float baseline_origin_x, float baseline_origin_y, DWRITE_MEASURING_MODE measuring_mode, + const DWRITE_GLYPH_RUN *glyph_run, const DWRITE_GLYPH_RUN_DESCRIPTION *desc, IUnknown *effect) +{ + FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, " + "measuring_mode %#x, glyph_run %p, desc %p, effect %p stub!\n", + iface, ctx, baseline_origin_x, baseline_origin_y, + measuring_mode, glyph_run, desc, effect); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRenderer *iface, void *ctx, + float baseline_origin_x, float baseline_origin_y, const DWRITE_UNDERLINE *underline, IUnknown *effect) +{ + FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, underline %p, effect %p stub!\n", + iface, ctx, baseline_origin_x, baseline_origin_y, underline, effect); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteTextRenderer *iface, void *ctx, + float baseline_origin_x, float baseline_origin_y, const DWRITE_STRIKETHROUGH *strikethrough, IUnknown *effect) +{ + FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, strikethrough %p, effect %p stub!\n", + iface, ctx, baseline_origin_x, baseline_origin_y, strikethrough, effect); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawInlineObject(IDWriteTextRenderer *iface, void *ctx, + float origin_x, float origin_y, IDWriteInlineObject *object, BOOL is_sideways, BOOL is_rtl, IUnknown *effect) +{ + FIXME("iface %p, ctx %p, origin_x %.8e, origin_y %.8e, object %p, is_sideways %#x, is_rtl %#x, effect %p stub!\n", + iface, ctx, origin_x, origin_y, object, is_sideways, is_rtl, effect); + + return E_NOTIMPL; +} + +static const struct IDWriteTextRendererVtbl d2d_text_renderer_vtbl = +{ + d2d_text_renderer_QueryInterface, + d2d_text_renderer_AddRef, + d2d_text_renderer_Release, + d2d_text_renderer_IsPixelSnappingDisabled, + d2d_text_renderer_GetCurrentTransform, + d2d_text_renderer_GetPixelsPerDip, + d2d_text_renderer_DrawGlyphRun, + d2d_text_renderer_DrawUnderline, + d2d_text_renderer_DrawStrikethrough, + d2d_text_renderer_DrawInlineObject, +}; + HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) { @@ -967,6 +1102,7 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, FIXME("Ignoring render target properties.\n"); render_target->ID2D1RenderTarget_iface.lpVtbl = &d2d_d3d_render_target_vtbl; + render_target->IDWriteTextRenderer_iface.lpVtbl = &d2d_text_renderer_vtbl; render_target->refcount = 1; if (FAILED(hr = IDXGISurface_GetDevice(surface, &IID_ID3D10Device, (void **)&render_target->device)))

1 0

Julian Rüger : German translation for release 1.7.28
by Jeremy Newman 06 Oct '14

06 Oct '14

Module: website Branch: master Commit: 69378f1d7212a97815b05997dd033d0f92f966e0 URL: http://source.winehq.org/git/website.git/?a=commit;h=69378f1d7212a97815b059… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 6 14:39:48 2014 +0200 German translation for release 1.7.28 --- news/de/2014100301.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2014100301.xml b/news/de/2014100301.xml new file mode 100644 index 0000000..8ce8662 --- /dev/null +++ b/news/de/2014100301.xml @@ -0,0 +1,15 @@ +<news> +<date>3. Oktober 2014</date> +<title>Wine 1.7.28 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.28 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.28">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für bedingte Kompilierung von JavaScript.</li> + <li>Unterstützung von bidirektionellem Text in DirectWrite.</li> + <li>Stubs für DirectPlay-Voice-Unterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.28.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.28
by Jeremy Newman 06 Oct '14

06 Oct '14

Module: website Branch: master Commit: 4f7e307a341f16f36bfd6d9b28f97782af62bbf8 URL: http://source.winehq.org/git/website.git/?a=commit;h=4f7e307a341f16f36bfd6d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Oct 5 08:31:20 2014 +0200 French translation for release 1.7.28 --- news/fr/2014100301.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2014100301.xml b/news/fr/2014100301.xml new file mode 100644 index 0000000..89fcd27 --- /dev/null +++ b/news/fr/2014100301.xml @@ -0,0 +1,14 @@ +<news> +<date>3 octobre 2014</date> +<title>Sortie de Wine 1.7.28</title> +<body> + La version de développement 1.7.28 de Wine est disponible. + <a href="{$root}/announce/1.7.28">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge de la compilation conditionnelle dans JavaScript.</li> + <li>Prise en charge du texte bidirectionnel dans DirectWrite.</li> + <li>Squelettes de fonctions pour la prise en charge de DirectPlay Voice.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.28.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.28
by Jeremy Newman 06 Oct '14

06 Oct '14

Module: website Branch: master Commit: 961748b546c93956be19494a8c34bf4af30d671c URL: http://source.winehq.org/git/website.git/?a=commit;h=961748b546c93956be1949… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Oct 3 19:10:26 2014 +0200 Polish translation for release 1.7.28 --- news/pl/2014100301.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2014100301.xml b/news/pl/2014100301.xml new file mode 100644 index 0000000..334c926 --- /dev/null +++ b/news/pl/2014100301.xml @@ -0,0 +1,15 @@ +<news> +<date>Październik 3, 2014</date> +<title>Wydano Wine 1.7.28</title> +<body> + Wydanie rozwojowe Wine 1.7.28 jest już dostępne. + <a href="{$root}/announce/1.7.28">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla warunkowej kompilacji w JavaScript.</li> + <li>Wsparcie dla dwukierunkowego tekstu w DirectWrite.</li> + <li>Zalążki wsparcia dla głosu DirectPlay.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.28.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.28
by Alexandre Julliard 03 Oct '14

03 Oct '14

Module: website Branch: master Commit: 1e07fbe25aad94a2ca4e6bcd2aaa90d33db3eadf URL: http://source.winehq.org/git/website.git/?a=commit;h=1e07fbe25aad94a2ca4e6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 3 10:04:22 2014 +0200 Wine release 1.7.28 --- news/en/2014100301.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2014100301.xml b/news/en/2014100301.xml new file mode 100644 index 0000000..bfc0422 --- /dev/null +++ b/news/en/2014100301.xml @@ -0,0 +1,15 @@ +<news> +<date>October 3, 2014</date> +<title>Wine 1.7.28 Released</title> +<body> + The Wine development release 1.7.28 is now available. + <a href="{$root}/announce/1.7.28">What's new</a> in this release: +<ul> + <li>Support for conditional compilation in JavaScript.</li> + <li>Bidirectional text support in DirectWrite.</li> + <li>Stubs for DirectPlay Voice support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.28.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Ken Thomases : winemac: Don' t invalidate the window shadow on every draw if it' s merely shaped and not color-keyed or using per-pixel alpha.
by Alexandre Julliard 03 Oct '14

03 Oct '14

Module: wine Branch: master Commit: 170d80dc90fc3fb23d64f2a05f081747dd5a26c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=170d80dc90fc3fb23d64f2a05… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 2 17:06:14 2014 -0500 winemac: Don't invalidate the window shadow on every draw if it's merely shaped and not color-keyed or using per-pixel alpha. This avoids flickering and tearing on some versions of OS X during frequent redrawing in a shaped window, such as when scrolling a document in Word 2007. Since we aren't guaranteed that the window surface has updated bits for us to draw, we mark the whole content view as needing redisplay and draw the window's shape in the background color on the first -drawRect: after the shape change. --- dlls/winemac.drv/cocoa_window.m | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index ba1b914..d9a421e 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -236,6 +236,17 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if ([window contentView] != self) return; + if (window.shapeChangedSinceLastDraw && window.shape && !window.colorKeyed && !window.usePerPixelAlpha) + { + [[NSColor clearColor] setFill]; + NSRectFill(rect); + + [window.shape addClip]; + + [[NSColor windowBackgroundColor] setFill]; + NSRectFill(rect); + } + if (window.surface && window.surface_mutex && !pthread_mutex_lock(window.surface_mutex)) { @@ -289,7 +300,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif // If the window may be transparent, then we have to invalidate the // shadow every time we draw. Also, if this is the first time we've // drawn since changing from transparent to opaque. - if (![window isOpaque] || window.shapeChangedSinceLastDraw) + if (window.colorKeyed || window.usePerPixelAlpha || window.shapeChangedSinceLastDraw) { window.shapeChangedSinceLastDraw = FALSE; [window invalidateShadow]; @@ -1373,11 +1384,15 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif { if (![self isOpaque] && !self.needsTransparency) { + self.shapeChangedSinceLastDraw = TRUE; + [[self contentView] setNeedsDisplay:YES]; [self setBackgroundColor:[NSColor windowBackgroundColor]]; [self setOpaque:YES]; } else if ([self isOpaque] && self.needsTransparency) { + self.shapeChangedSinceLastDraw = TRUE; + [[self contentView] setNeedsDisplay:YES]; [self setBackgroundColor:[NSColor clearColor]]; [self setOpaque:NO]; }

1 0

Ken Thomases : winemac: Properly ignore attempts to set a window' s shape to its current shape.
by Alexandre Julliard 03 Oct '14

03 Oct '14

Module: wine Branch: master Commit: 31d7f61cc3525d32c0624564f9ac9033010fb968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d7f61cc3525d32c0624564f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 2 17:06:19 2014 -0500 winemac: Properly ignore attempts to set a window's shape to its current shape. NSBezierPath doesn't override the -isEqual: method to actually compare paths, so it just falls back to object identity which, in our case, makes paths seem like they're never equal. Also, memcmp()-ing the rectangle array is almost certainly faster than any general test for equality between two paths. --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 88ef23d..574ff75 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -44,6 +44,7 @@ pthread_mutex_t* surface_mutex; NSBezierPath* shape; + NSData* shapeData; BOOL shapeChangedSinceLastDraw; BOOL colorKeyed; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d9a421e..35222c1 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -182,6 +182,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif @property (nonatomic) pthread_mutex_t* surface_mutex; @property (copy, nonatomic) NSBezierPath* shape; +(a)property (copy, nonatomic) NSData* shapeData; @property (nonatomic) BOOL shapeChangedSinceLastDraw; @property (readonly, nonatomic) BOOL needsTransparency; @@ -540,7 +541,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif @synthesize disabled, noActivate, floating, fullscreen, fakingClose, latentParentWindow, hwnd, queue; @synthesize surface, surface_mutex; - @synthesize shape, shapeChangedSinceLastDraw; + @synthesize shape, shapeData, shapeChangedSinceLastDraw; @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue; @synthesize usePerPixelAlpha; @synthesize imeData, commandDone; @@ -634,6 +635,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [latentChildWindows release]; [latentParentWindow release]; [shape release]; + [shapeData release]; [super dealloc]; } @@ -1401,7 +1403,6 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (void) setShape:(NSBezierPath*)newShape { if (shape == newShape) return; - if (shape && newShape && [shape isEqual:newShape]) return; if (shape) { @@ -2379,16 +2380,24 @@ void macdrv_set_window_shape(macdrv_window w, const CGRect *rects, int count) OnMainThread(^{ if (!rects || !count) + { window.shape = nil; + window.shapeData = nil; + } else { - NSBezierPath* path; - unsigned int i; + size_t length = sizeof(*rects) * count; + if (window.shapeData.length != length || memcmp(window.shapeData.bytes, rects, length)) + { + NSBezierPath* path; + unsigned int i; - path = [NSBezierPath bezierPath]; - for (i = 0; i < count; i++) - [path appendBezierPathWithRect:NSRectFromCGRect(rects[i])]; - window.shape = path; + path = [NSBezierPath bezierPath]; + for (i = 0; i < count; i++) + [path appendBezierPathWithRect:NSRectFromCGRect(rects[i])]; + window.shape = path; + window.shapeData = [NSData dataWithBytes:rects length:length]; + } } });

1 0

Henri Verbeet : wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8.
by Alexandre Julliard 03 Oct '14

03 Oct '14

Module: wine Branch: master Commit: 548978dec49761ea6c12e8e117b1a0322b8a81b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=548978dec49761ea6c12e8e11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 3 09:19:18 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8. --- dlls/wined3d/surface.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 86aa235..7dde5e4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3238,6 +3238,27 @@ static void convert_b5g5r5x1_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, uns } } +static void convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch, + BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, + const struct wined3d_color_key *color_key) +{ + const BYTE *src_row; + unsigned int x, y; + DWORD *dst_row; + + for (y = 0; y < height; ++y) + { + src_row = &src[src_pitch * y]; + dst_row = (DWORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + DWORD src_color = (src_row[x * 3 + 2] << 16) | (src_row[x * 3 + 1] << 8) | src_row[x * 3]; + if (!color_in_range(color_key, src_color)) + dst_row[x] = src_color | 0xff000000; + } + } +} + static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { @@ -3271,20 +3292,8 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8: - for (y = 0; y < height; ++y) - { - source = src + pitch * y; - dest = dst + outpitch * y; - for (x = 0; x < width; ++x) - { - DWORD color = ((DWORD)source[2] << 16) | ((DWORD)source[1] << 8) | (DWORD)source[0]; - if (!color_in_range(&texture->src_blt_color_key, color)) - color |= 0xff000000; - *(DWORD *)dest = color; - source += 3; - dest += 4; - } - } + convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key(src, pitch, dst, outpitch, + width, height, &texture->src_blt_color_key); break; case WINED3D_CT_CK_B8G8R8X8:

1 0

Henri Verbeet : wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8X8.
by Alexandre Julliard 03 Oct '14

03 Oct '14

Module: wine Branch: master Commit: dabe5b4479521e16a040849b34dea247dd520dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dabe5b4479521e16a040849b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 3 09:19:19 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8X8. --- dlls/wined3d/surface.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7dde5e4..e5f34f0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3259,6 +3259,29 @@ static void convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsig } } +static void convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch, + BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, + const struct wined3d_color_key *color_key) +{ + const DWORD *src_row; + unsigned int x, y; + DWORD *dst_row; + + for (y = 0; y < height; ++y) + { + src_row = (DWORD *)&src[src_pitch * y]; + dst_row = (DWORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + DWORD src_color = src_row[x]; + if (color_in_range(color_key, src_color)) + dst_row[x] = src_color & ~0xff000000; + else + dst_row[x] = src_color | 0xff000000; + } + } +} + static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { @@ -3297,21 +3320,8 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8X8: - for (y = 0; y < height; ++y) - { - source = src + pitch * y; - dest = dst + outpitch * y; - for (x = 0; x < width; ++x) - { - DWORD color = *(const DWORD *)source; - if (color_in_range(&texture->src_blt_color_key, color)) - *(DWORD *)dest = color & ~0xff000000; - else - *(DWORD *)dest = color | 0xff000000; - source += 4; - dest += 4; - } - } + convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key(src, pitch, dst, outpitch, + width, height, &texture->src_blt_color_key); break; case WINED3D_CT_CK_B8G8R8A8:

1 0