March 2015 - Wine-Commits - list.winehq.org

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_SetTags().
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: e52cf640e67cfc9534637a3ce8a0a002129563f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e52cf640e67cfc9534637a3ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 09:07:04 2015 +0100 d2d1: Implement d2d_d3d_render_target_SetTags(). --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/render_target.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 853414f..870e521 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -66,6 +66,7 @@ struct d2d_d3d_render_target D2D1_ANTIALIAS_MODE antialias_mode; D2D1_TEXT_ANTIALIAS_MODE text_antialias_mode; + D2D1_TAG tag1, tag2; IDWriteRenderingParams *text_rendering_params; D2D1_SIZE_U pixel_size; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 0d956c4..b6e68dc 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -894,7 +894,12 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTextRenderingParams(ID2D1 static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTags(ID2D1RenderTarget *iface, D2D1_TAG tag1, D2D1_TAG tag2) { - FIXME("iface %p, tag1 %s, tag2 %s stub!\n", iface, wine_dbgstr_longlong(tag1), wine_dbgstr_longlong(tag2)); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, tag1 %s, tag2 %s.\n", iface, wine_dbgstr_longlong(tag1), wine_dbgstr_longlong(tag2)); + + render_target->tag1 = tag1; + render_target->tag2 = tag2; } static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTags(ID2D1RenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2)

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_SetTextAntialiasMode ().
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: 345dbdc77fcd541d22d29c089dc07fd9f48b798b URL: http://source.winehq.org/git/wine.git/?a=commit;h=345dbdc77fcd541d22d29c089… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 09:07:02 2015 +0100 d2d1: Implement d2d_d3d_render_target_SetTextAntialiasMode(). --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/render_target.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index e82d23c..853414f 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -65,6 +65,7 @@ struct d2d_d3d_render_target ID3D10PixelShader *rect_bitmap_ps; D2D1_ANTIALIAS_MODE antialias_mode; + D2D1_TEXT_ANTIALIAS_MODE text_antialias_mode; IDWriteRenderingParams *text_rendering_params; D2D1_SIZE_U pixel_size; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 97d5607..4b78967 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -851,7 +851,11 @@ static D2D1_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetAntialiasM static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextAntialiasMode(ID2D1RenderTarget *iface, D2D1_TEXT_ANTIALIAS_MODE antialias_mode) { - FIXME("iface %p, antialias_mode %#x stub!\n", iface, antialias_mode); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, antialias_mode %#x.\n", iface, antialias_mode); + + render_target->text_antialias_mode = antialias_mode; } static D2D1_TEXT_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetTextAntialiasMode(ID2D1RenderTarget *iface)

1 0

Alexandre Julliard : explorer: Cleanup system tray icons when their owner is destroyed instead of polling.
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: aceec41e932d92cfe5eeb6be0ee0dfabede645fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=aceec41e932d92cfe5eeb6be0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 17:13:32 2015 +0900 explorer: Cleanup system tray icons when their owner is destroyed instead of polling. --- programs/explorer/desktop.c | 4 ++++ programs/explorer/explorer_private.h | 11 ++++++----- programs/explorer/systray.c | 21 +++++++++++---------- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 474e93e..29ef8d7 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -529,6 +529,10 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR SystemParametersInfoW( SPI_SETDESKWALLPAPER, 0, NULL, FALSE ); return 0; + case WM_PARENTNOTIFY: + if (LOWORD(wp) == WM_DESTROY) cleanup_systray_window( (HWND)lp ); + return 0; + case WM_LBUTTONDBLCLK: if (!using_root) { diff --git a/programs/explorer/explorer_private.h b/programs/explorer/explorer_private.h index 49400cd..dbe50be 100644 --- a/programs/explorer/explorer_private.h +++ b/programs/explorer/explorer_private.h @@ -21,10 +21,11 @@ #ifndef __WINE_EXPLORER_PRIVATE_H #define __WINE_EXPLORER_PRIVATE_H -extern void manage_desktop( WCHAR *arg ); -extern void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL enable_shell ); -extern void initialize_appbar(void); -extern void do_startmenu( HWND owner ); -extern LRESULT menu_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); +extern void manage_desktop( WCHAR *arg ) DECLSPEC_HIDDEN; +extern void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL enable_shell ) DECLSPEC_HIDDEN; +extern void initialize_appbar(void) DECLSPEC_HIDDEN; +extern void cleanup_systray_window( HWND hwnd ) DECLSPEC_HIDDEN; +extern void do_startmenu( HWND owner ) DECLSPEC_HIDDEN; +extern LRESULT menu_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) DECLSPEC_HIDDEN; #endif /* __WINE_EXPLORER_PRIVATE_H */ diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 2a6ff14..beb0a88 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -97,11 +97,9 @@ static HWND start_button; #define MIN_DISPLAYED 8 #define ICON_BORDER 2 -#define VALID_WIN_TIMER 1 -#define BALLOON_CREATE_TIMER 2 -#define BALLOON_SHOW_TIMER 3 +#define BALLOON_CREATE_TIMER 1 +#define BALLOON_SHOW_TIMER 2 -#define VALID_WIN_TIMEOUT 2000 #define BALLOON_CREATE_TIMEOUT 2000 #define BALLOON_SHOW_MIN_TIMEOUT 10000 #define BALLOON_SHOW_MAX_TIMEOUT 30000 @@ -430,7 +428,6 @@ static BOOL add_icon(NOTIFYICONDATAW *nid) icon->owner = nid->hWnd; icon->display = -1; - if (list_empty( &icon_list )) SetTimer( tray_window, VALID_WIN_TIMER, VALID_WIN_TIMEOUT, NULL ); list_add_tail(&icon_list, &icon->entry); return modify_icon( icon, nid ); @@ -443,17 +440,22 @@ static BOOL delete_icon(struct icon *icon) list_remove(&icon->entry); DestroyIcon(icon->image); HeapFree(GetProcessHeap(), 0, icon); - if (list_empty( &icon_list )) KillTimer( tray_window, VALID_WIN_TIMER ); return TRUE; } -/* cleanup icons belonging to windows that have been destroyed */ -static void cleanup_destroyed_windows(void) +/* cleanup icons belonging to a window that has been destroyed */ +void cleanup_systray_window( HWND hwnd ) { struct icon *icon, *next; LIST_FOR_EACH_ENTRY_SAFE( icon, next, &icon_list, struct icon, entry ) - if (!IsWindow( icon->owner )) delete_icon( icon ); + if (icon->owner == hwnd) delete_icon( icon ); + + if (wine_notify_icon) + { + NOTIFYICONDATAW nid = { sizeof(nid), hwnd }; + wine_notify_icon( 0xdead, &nid ); + } } static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) @@ -561,7 +563,6 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_TIMER: switch (wparam) { - case VALID_WIN_TIMER: cleanup_destroyed_windows(); break; case BALLOON_CREATE_TIMER: balloon_create_timer(); break; case BALLOON_SHOW_TIMER: balloon_timer(); break; }

1 0

Henri Verbeet : d2d1: Use a D2D1_DRAWING_STATE_DESCRIPTION structure to store render target drawing state.
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: 70883bb0a2dbe4eaf8ff482390eda3fbcbf6bda6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70883bb0a2dbe4eaf8ff48239… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 09:07:06 2015 +0100 d2d1: Use a D2D1_DRAWING_STATE_DESCRIPTION structure to store render target drawing state. --- dlls/d2d1/d2d1_private.h | 5 +---- dlls/d2d1/render_target.c | 46 +++++++++++++++++++++++++--------------------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 870e521..0e0fa9f 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -64,13 +64,10 @@ struct d2d_d3d_render_target ID3D10PixelShader *rect_solid_ps; ID3D10PixelShader *rect_bitmap_ps; - D2D1_ANTIALIAS_MODE antialias_mode; - D2D1_TEXT_ANTIALIAS_MODE text_antialias_mode; - D2D1_TAG tag1, tag2; + D2D1_DRAWING_STATE_DESCRIPTION drawing_state; IDWriteRenderingParams *text_rendering_params; D2D1_SIZE_U pixel_size; - D2D1_MATRIX_3X2_F transform; struct d2d_clip_stack clip_stack; float dpi_x; float dpi_y; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index ae82550..c241df2 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -558,13 +558,13 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar * dpi and rendertarget transform into account. */ tmp_x = (2.0f * render_target->dpi_x) / (96.0f * render_target->pixel_size.width); tmp_y = -(2.0f * render_target->dpi_y) / (96.0f * render_target->pixel_size.height); - transform._11 = render_target->transform._11 * tmp_x; - transform._21 = render_target->transform._21 * tmp_x; - transform._31 = render_target->transform._31 * tmp_x - 1.0f; + transform._11 = render_target->drawing_state.transform._11 * tmp_x; + transform._21 = render_target->drawing_state.transform._21 * tmp_x; + transform._31 = render_target->drawing_state.transform._31 * tmp_x - 1.0f; transform.pad0 = 0.0f; - transform._12 = render_target->transform._12 * tmp_y; - transform._22 = render_target->transform._22 * tmp_y; - transform._32 = render_target->transform._32 * tmp_y + 1.0f; + transform._12 = render_target->drawing_state.transform._12 * tmp_y; + transform._22 = render_target->drawing_state.transform._22 * tmp_y; + transform._32 = render_target->drawing_state.transform._32 * tmp_y + 1.0f; transform.pad1 = 0.0f; /* Translate from world space to object space. */ @@ -816,7 +816,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTransform(ID2D1RenderTarg TRACE("iface %p, transform %p.\n", iface, transform); - render_target->transform = *transform; + render_target->drawing_state.transform = *transform; } static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTransform(ID2D1RenderTarget *iface, @@ -826,7 +826,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTransform(ID2D1RenderTarg TRACE("iface %p, transform %p.\n", iface, transform); - *transform = render_target->transform; + *transform = render_target->drawing_state.transform; } static void STDMETHODCALLTYPE d2d_d3d_render_target_SetAntialiasMode(ID2D1RenderTarget *iface, @@ -836,7 +836,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetAntialiasMode(ID2D1Render TRACE("iface %p, antialias_mode %#x stub!\n", iface, antialias_mode); - render_target->antialias_mode = antialias_mode; + render_target->drawing_state.antialiasMode = antialias_mode; } static D2D1_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetAntialiasMode(ID2D1RenderTarget *iface) @@ -845,7 +845,7 @@ static D2D1_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetAntialiasM TRACE("iface %p.\n", iface); - return render_target->antialias_mode; + return render_target->drawing_state.antialiasMode; } static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextAntialiasMode(ID2D1RenderTarget *iface, @@ -855,7 +855,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextAntialiasMode(ID2D1Re TRACE("iface %p, antialias_mode %#x.\n", iface, antialias_mode); - render_target->text_antialias_mode = antialias_mode; + render_target->drawing_state.textAntialiasMode = antialias_mode; } static D2D1_TEXT_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetTextAntialiasMode(ID2D1RenderTarget *iface) @@ -864,7 +864,7 @@ static D2D1_TEXT_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetTextA TRACE("iface %p.\n", iface); - return render_target->text_antialias_mode; + return render_target->drawing_state.textAntialiasMode; } static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextRenderingParams(ID2D1RenderTarget *iface, @@ -898,8 +898,8 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTags(ID2D1RenderTarget *i TRACE("iface %p, tag1 %s, tag2 %s.\n", iface, wine_dbgstr_longlong(tag1), wine_dbgstr_longlong(tag2)); - render_target->tag1 = tag1; - render_target->tag2 = tag2; + render_target->drawing_state.tag1 = tag1; + render_target->drawing_state.tag2 = tag2; } static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTags(ID2D1RenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) @@ -908,8 +908,8 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTags(ID2D1RenderTarget *i TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - *tag1 = render_target->tag1; - *tag2 = render_target->tag2; + *tag1 = render_target->drawing_state.tag1; + *tag2 = render_target->drawing_state.tag2; } static void STDMETHODCALLTYPE d2d_d3d_render_target_PushLayer(ID2D1RenderTarget *iface, @@ -957,13 +957,17 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_PushAxisAlignedClip(ID2D1Ren x_scale = render_target->dpi_x / 96.0f; y_scale = render_target->dpi_y / 96.0f; - d2d_point_transform(&point, &render_target->transform, clip_rect->left * x_scale, clip_rect->top * y_scale); + d2d_point_transform(&point, &render_target->drawing_state.transform, + clip_rect->left * x_scale, clip_rect->top * y_scale); d2d_rect_set(&transformed_rect, point.x, point.y, point.x, point.y); - d2d_point_transform(&point, &render_target->transform, clip_rect->left * x_scale, clip_rect->bottom * y_scale); + d2d_point_transform(&point, &render_target->drawing_state.transform, + clip_rect->left * x_scale, clip_rect->bottom * y_scale); d2d_rect_expand(&transformed_rect, &point); - d2d_point_transform(&point, &render_target->transform, clip_rect->right * x_scale, clip_rect->top * y_scale); + d2d_point_transform(&point, &render_target->drawing_state.transform, + clip_rect->right * x_scale, clip_rect->top * y_scale); d2d_rect_expand(&transformed_rect, &point); - d2d_point_transform(&point, &render_target->transform, clip_rect->right * x_scale, clip_rect->bottom * y_scale); + d2d_point_transform(&point, &render_target->drawing_state.transform, + clip_rect->right * x_scale, clip_rect->bottom * y_scale); d2d_rect_expand(&transformed_rect, &point); if (!d2d_clip_stack_push(&render_target->clip_stack, &transformed_rect)) @@ -1519,7 +1523,7 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, render_target->pixel_size.width = surface_desc.Width; render_target->pixel_size.height = surface_desc.Height; - render_target->transform = identity; + render_target->drawing_state.transform = identity; if (!d2d_clip_stack_init(&render_target->clip_stack)) {

1 0

Vincent Povirk : gdiplus: Add support for reading PNG tEXt metadata.
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: 3b51859871513262770562bfd5d5f5447b20c7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b51859871513262770562bfd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 25 16:34:35 2015 -0500 gdiplus: Add support for reading PNG tEXt metadata. --- dlls/gdiplus/image.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 77b9305..de03096 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3417,6 +3417,101 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI IWICBitmapFrameDecode_Release(frame); } +static PropertyItem* create_prop(PROPID propid, PROPVARIANT* value) +{ + PropertyItem *item = NULL; + UINT item_size = propvariant_size(value); + + if (item_size) + { + item_size += sizeof(*item); + item = GdipAlloc(item_size); + if (propvariant_to_item(value, item, item_size, propid) != Ok) + { + GdipFree(item); + item = NULL; + } + } + + return item; +} + +static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT active_frame) +{ + HRESULT hr; + IWICBitmapFrameDecode *frame; + IWICMetadataBlockReader *block_reader; + IWICMetadataReader *reader; + UINT block_count, i, j; + struct keyword_info { + const char* name; + PROPID propid; + BOOL seen; + } keywords[] = { + { "Title", PropertyTagImageTitle }, + { "Author", PropertyTagArtist }, + { "Description", PropertyTagImageDescription }, + { "Copyright", PropertyTagCopyright }, + { "Software", PropertyTagSoftwareUsed }, + { "Source", PropertyTagEquipModel }, + { "Comment", PropertyTagExifUserComment }, + }; + + hr = IWICBitmapDecoder_GetFrame(decoder, active_frame, &frame); + if (hr != S_OK) return; + + hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&block_reader); + if (hr == S_OK) + { + hr = IWICMetadataBlockReader_GetCount(block_reader, &block_count); + if (hr == S_OK) + { + for (i = 0; i < block_count; i++) + { + hr = IWICMetadataBlockReader_GetReaderByIndex(block_reader, i, &reader); + if (hr == S_OK) + { + GUID format; + + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + if (SUCCEEDED(hr) && IsEqualGUID(&GUID_MetadataFormatChunktEXt, &format)) + { + PROPVARIANT name, value; + PropertyItem* item; + + hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, &name, &value); + + if (SUCCEEDED(hr)) + { + if (name.vt == VT_LPSTR) + { + for (j=0; j<sizeof(keywords)/sizeof(keywords[0]); j++) + if (!strcmp(keywords[j].name, name.u.pszVal)) + break; + if (j < sizeof(keywords)/sizeof(keywords[0]) && !keywords[j].seen) + { + keywords[j].seen = TRUE; + item = create_prop(keywords[j].propid, &value); + if (item) + add_property(bitmap, item); + } + } + + PropVariantClear(&name); + PropVariantClear(&value); + } + } + + IWICMetadataReader_Release(reader); + } + } + } + IWICMetadataBlockReader_Release(block_reader); + } + + IWICBitmapFrameDecode_Release(frame); +} + static GpStatus initialize_decoder_wic(IStream *stream, REFGUID container, IWICBitmapDecoder **decoder) { IWICImagingFactory *factory; @@ -3805,7 +3900,7 @@ static GpStatus decode_image_jpeg(IStream* stream, GpImage **image) static GpStatus decode_image_png(IStream* stream, GpImage **image) { - return decode_image_wic(stream, &GUID_ContainerFormatPng, NULL, image); + return decode_image_wic(stream, &GUID_ContainerFormatPng, png_metadata_reader, image); } static GpStatus decode_image_gif(IStream* stream, GpImage **image)

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetTextAntialiasMode ().
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: 2f529b125546ff69fc856640598aa8d3873ba036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f529b125546ff69fc8566405… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 09:07:03 2015 +0100 d2d1: Implement d2d_d3d_render_target_GetTextAntialiasMode(). --- dlls/d2d1/render_target.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 4b78967..0d956c4 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -860,9 +860,11 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextAntialiasMode(ID2D1Re static D2D1_TEXT_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetTextAntialiasMode(ID2D1RenderTarget *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p.\n", iface); - return D2D1_TEXT_ANTIALIAS_MODE_DEFAULT; + return render_target->text_antialias_mode; } static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextRenderingParams(ID2D1RenderTarget *iface,

1 0

Alexandre Julliard : winex11: Cleanup system tray icons when their owner is destroyed instead of polling.
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: 86748a8480d846c500c42e3e6f03e628111d4da6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86748a8480d846c500c42e3e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 17:14:16 2015 +0900 winex11: Cleanup system tray icons when their owner is destroyed instead of polling. --- dlls/winex11.drv/systray.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index a694610..c7e7013 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -85,11 +85,9 @@ Atom systray_atom = 0; #define MIN_DISPLAYED 8 #define ICON_BORDER 2 -#define VALID_WIN_TIMER 1 -#define BALLOON_CREATE_TIMER 2 -#define BALLOON_SHOW_TIMER 3 +#define BALLOON_CREATE_TIMER 1 +#define BALLOON_SHOW_TIMER 2 -#define VALID_WIN_TIMEOUT 2000 #define BALLOON_CREATE_TIMEOUT 2000 #define BALLOON_SHOW_MIN_TIMEOUT 10000 #define BALLOON_SHOW_MAX_TIMEOUT 30000 @@ -453,10 +451,6 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR switch (msg) { - case WM_CREATE: - SetTimer( hwnd, VALID_WIN_TIMER, VALID_WIN_TIMEOUT, NULL ); - break; - case WM_SIZE: if (icon->window && icon->layered) repaint_tray_icon( icon ); break; @@ -507,9 +501,6 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR case WM_TIMER: switch (wparam) { - case VALID_WIN_TIMER: - if (!IsWindow( icon->owner )) delete_icon( icon ); - break; case BALLOON_CREATE_TIMER: balloon_create_timer( icon ); break; @@ -811,6 +802,15 @@ static BOOL delete_icon( struct tray_icon *icon ) return TRUE; } +/* cleanup all icons for a given window */ +static void cleanup_icons( HWND owner ) +{ + struct tray_icon *this, *next; + + LIST_FOR_EACH_ENTRY_SAFE( this, next, &icon_list, struct tray_icon, entry ) + if (this->owner == owner) delete_icon( this ); +} + /*********************************************************************** * wine_notify_icon (X11DRV.@) @@ -834,6 +834,9 @@ int CDECL wine_notify_icon( DWORD msg, NOTIFYICONDATAW *data ) case NIM_MODIFY: if ((icon = get_icon( data->hWnd, data->uID ))) ret = modify_icon( icon, data ); break; + case 0xdead: /* Wine extension: owner window has died */ + cleanup_icons( data->hWnd ); + break; default: FIXME( "unhandled tray message: %u\n", msg ); break;

1 0

Alexandre Julliard : server: Post a notification to the desktop window when a top-level window is destroyed.
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: 7c538cddebf58c91bee071e028e9f67d1355c9da URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c538cddebf58c91bee071e02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 17:12:26 2015 +0900 server: Post a notification to the desktop window when a top-level window is destroyed. --- server/window.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/window.c b/server/window.c index 9efdd69..d089149 100644 --- a/server/window.c +++ b/server/window.c @@ -1865,6 +1865,11 @@ void destroy_window( struct window *win ) if (desktop->top_window == win) desktop->top_window = NULL; else desktop->msg_window = NULL; } + else if (is_desktop_window( win->parent )) + { + post_message( win->parent->handle, WM_PARENTNOTIFY, WM_DESTROY, win->handle ); + } + detach_window_thread( win ); if (win->win_region) free_region( win->win_region ); if (win->update_region) free_region( win->update_region );

1 0

Alexandre Julliard : dsound: Fix an error return code.
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: 8427c7816dbb7495661f86a9543ca484e3923ea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8427c7816dbb7495661f86a95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 11:33:50 2015 +0900 dsound: Fix an error return code. --- dlls/dsound/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 4e84d17..d735dc3 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -850,7 +850,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetObjectInPath(IDirectSoundBuffer8 TRACE("(%p,%s,%u,%s,%p)\n",This,debugstr_guid(rguidObject),dwIndex,debugstr_guid(rguidInterface),ppObject); if (dwIndex >= This->num_filters) - return DSERR_OBJECTNOTFOUND; + return DSERR_CONTROLUNAVAIL; if (!ppObject) return E_INVALIDARG;

1 0

Francois Gouget : riched20: Mark internal symbols with hidden visibility.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: 4eedf6a4b3d1e28c4d4c8cf054acdbf8669530f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eedf6a4b3d1e28c4d4c8cf05… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 26 15:30:34 2015 +0100 riched20: Mark internal symbols with hidden visibility. --- dlls/riched20/editstr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 1b1eda6..57d7fef 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -51,7 +51,7 @@ #include "wine/list.h" #ifdef __i386__ -extern const struct ITextHostVtbl itextHostStdcallVtbl; +extern const struct ITextHostVtbl itextHostStdcallVtbl DECLSPEC_HIDDEN; #endif /* __i386__ */ typedef struct tagME_String

1 0