February 2016 - Wine-commits

Christopher Thielen : user32: Ensure that button responds only to changes in WM_CAPTURECHANGED handler.
by Alexandre Julliard 02 Feb '16

02 Feb '16

Module: wine Branch: master Commit: 85faafc0e3f3861e7c03d4f7dc842bd7d4cf6ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85faafc0e3f3861e7c03d4f7d… Author: Christopher Thielen <cthielen(a)gmail.com> Date: Sun Jan 31 20:31:02 2016 -0800 user32: Ensure that button responds only to changes in WM_CAPTURECHANGED handler. Signed-off-by: Christopher Thielen <cthielen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 890d154..9c52147 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -364,6 +364,7 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, case WM_CAPTURECHANGED: TRACE("WM_CAPTURECHANGED %p\n", hWnd); + if (hWnd == (HWND)lParam) break; state = get_button_state( hWnd ); if (state & BUTTON_BTNPRESSED) {

1 0

Henri Verbeet : ddraw: Use wined3d_texture_get_dc() in ddraw_surface_update_frontbuffer().
by Alexandre Julliard 02 Feb '16

02 Feb '16

Module: wine Branch: master Commit: 88c9ade49c5f6a1a891df1212d7f9c7185c0f680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88c9ade49c5f6a1a891df1212… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 1 18:42:08 2016 +0100 ddraw: Use wined3d_texture_get_dc() in ddraw_surface_update_frontbuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c9ac73c..bc304ca 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -73,7 +73,7 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RE surface->wined3d_texture, surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT); } - if (FAILED(hr = wined3d_surface_getdc(surface->wined3d_surface, &surface_dc))) + if (FAILED(hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, &surface_dc))) { ERR("Failed to get surface DC, hr %#x.\n", hr); return hr; @@ -83,7 +83,7 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RE if (!(screen_dc = GetDC(NULL))) { - wined3d_surface_releasedc(surface->wined3d_surface, surface_dc); + wined3d_texture_release_dc(surface->wined3d_texture, surface->sub_resource_idx, surface_dc); ERR("Failed to get screen DC.\n"); return E_FAIL; } @@ -96,7 +96,7 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RE surface_dc, x, y, SRCCOPY); ReleaseDC(NULL, screen_dc); - wined3d_surface_releasedc(surface->wined3d_surface, surface_dc); + wined3d_texture_release_dc(surface->wined3d_texture, surface->sub_resource_idx, surface_dc); if (!ret) {

1 0

Henri Verbeet : ddraw: Use wined3d_texture_get_dc() in ddraw_surface7_GetDC().
by Alexandre Julliard 02 Feb '16

02 Feb '16

Module: wine Branch: master Commit: 83a147d98a9c944dae63de251efda9744a539f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=83a147d98a9c944dae63de251… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 1 18:42:09 2016 +0100 ddraw: Use wined3d_texture_get_dc() in ddraw_surface7_GetDC(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 - 5 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index bc304ca..7b4f1ab 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2123,7 +2123,7 @@ static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *hdc) if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) hr = ddraw_surface_update_frontbuffer(surface, NULL, TRUE); if (SUCCEEDED(hr)) - hr = wined3d_surface_getdc(surface->wined3d_surface, hdc); + hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, hdc); if (SUCCEEDED(hr) && format_is_paletteindexed(&surface->surface_desc.u4.ddpfPixelFormat)) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 245cf27..6fad052 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2580,7 +2580,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, return WINED3D_OK; } -HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) +HRESULT wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) { HRESULT hr; struct wined3d_device *device = surface->resource.device; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 65220c6..22f8f56 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -226,7 +226,6 @@ @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) @ cdecl wined3d_surface_get_resource(ptr) -@ cdecl wined3d_surface_getdc(ptr ptr) @ cdecl wined3d_surface_map(ptr ptr ptr long) @ cdecl wined3d_surface_releasedc(ptr ptr) @ cdecl wined3d_surface_set_overlay_position(ptr long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1b25704..81e808e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2507,6 +2507,7 @@ void surface_set_dirty(struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; +HRESULT wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) DECLSPEC_HIDDEN; void surface_get_drawable_size(const struct wined3d_surface *surface, const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 24e4063..e589037 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2476,7 +2476,6 @@ HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surfac void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_surface *surface); -HRESULT __cdecl wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc); HRESULT __cdecl wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); HRESULT __cdecl wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc);

1 0

Henri Verbeet : ddraw: Use wined3d_texture_release_dc() in ddraw_surface7_ReleaseDC().
by Alexandre Julliard 02 Feb '16

02 Feb '16

Module: wine Branch: master Commit: 7e57924d322e6c15bbfc8c505c2a0817d9e5ad2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e57924d322e6c15bbfc8c505… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 1 18:42:10 2016 +0100 ddraw: Use wined3d_texture_release_dc() in ddraw_surface7_ReleaseDC(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 - 5 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 7b4f1ab..25aa9b8 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2211,7 +2211,7 @@ static HRESULT WINAPI ddraw_surface7_ReleaseDC(IDirectDrawSurface7 *iface, HDC h TRACE("iface %p, dc %p.\n", iface, hdc); wined3d_mutex_lock(); - hr = wined3d_surface_releasedc(surface->wined3d_surface, hdc); + hr = wined3d_texture_release_dc(surface->wined3d_texture, surface->sub_resource_idx, hdc); if (SUCCEEDED(hr) && (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) hr = ddraw_surface_update_frontbuffer(surface, NULL, FALSE); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6fad052..57ab90c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2629,7 +2629,7 @@ HRESULT wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) return WINED3D_OK; } -HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) +HRESULT wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) { TRACE("surface %p, dc %p.\n", surface, dc); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 22f8f56..2698d17 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -227,7 +227,6 @@ @ cdecl wined3d_surface_get_pitch(ptr) @ cdecl wined3d_surface_get_resource(ptr) @ cdecl wined3d_surface_map(ptr ptr ptr long) -@ cdecl wined3d_surface_releasedc(ptr ptr) @ cdecl wined3d_surface_set_overlay_position(ptr long long) @ cdecl wined3d_surface_unmap(ptr) @ cdecl wined3d_surface_update_overlay(ptr ptr ptr ptr long ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 81e808e..5474c7f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2521,6 +2521,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; void wined3d_surface_prepare(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; +HRESULT wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) DECLSPEC_HIDDEN; void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, GLint level) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e589037..0b134cd 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2478,7 +2478,6 @@ DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); -HRESULT __cdecl wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc); HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); HRESULT __cdecl wined3d_surface_unmap(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_update_overlay(struct wined3d_surface *surface, const RECT *src_rect,

1 0

Jactry Zeng : zh-cn: Switch wiki logo to mediawiki.
by Jeremy Newman 01 Feb '16

01 Feb '16

Module: website Branch: master Commit: 2202e02a48c0d5e48bf47571e4af6802edec6966 URL: http://source.winehq.org/git/website.git/?a=commit;h=2202e02a48c0d5e48bf475… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Feb 2 00:51:22 2016 +0800 zh-cn: Switch wiki logo to mediawiki. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/zh-cn/help.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/zh-cn/help.template b/templates/zh-cn/help.template index 73535d0..31446c0 100644 --- a/templates/zh-cn/help.template +++ b/templates/zh-cn/help.template @@ -44,7 +44,7 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </td> <td valign="top"> 你也可以阅读我们的 <a href="https://wiki.winehq.org/">Wiki</a>，看看能不能找到你问题的答案。

1 0

Jactry Zeng : Update Simplified Chinese translation for download page.
by Jeremy Newman 01 Feb '16

01 Feb '16

Module: website Branch: master Commit: 8e4f9f27497ed78ab99b729f70f301d3bc08145e URL: http://source.winehq.org/git/website.git/?a=commit;h=8e4f9f27497ed78ab99b72… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sun Jan 31 00:53:30 2016 +0800 Update Simplified Chinese translation for download page. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/zh-cn/download.template | 312 +++++++++++++++++++------------------- 1 file changed, 159 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=8e4f9f27497ed78ab9…

1 0

Frédéric Delanoy : Ensure wiki French homepage is accessible from main page, when French language is set
by Jeremy Newman 01 Feb '16

01 Feb '16

Module: website Branch: master Commit: 8d8cf333fa8a91930f8361b9d9de116ec83d82eb URL: http://source.winehq.org/git/website.git/?a=commit;h=8d8cf333fa8a91930f8361… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 30 16:34:25 2016 +0100 Ensure wiki French homepage is accessible from main page, when French language is set Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/fr/global/layout/content.template | 83 +++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/templates/fr/global/layout/content.template b/templates/fr/global/layout/content.template new file mode 100644 index 0000000..fa3ccfd --- /dev/null +++ b/templates/fr/global/layout/content.template @@ -0,0 +1,83 @@ +<!doctype html> +<html lang="{$html_lang}"> + +<head> + <title>{$page_title}</title> + <meta charset="utf-8"> + <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1"> + <meta name="SearchTitle" content="{$page_title}"> + <meta name="copyright" content="Copyright {$curtime_year}. WineHQ.org Tous droits réservés"> + + {$meta_keywords} + {$meta_description} + {$meta_og} + {$rel_canonical} + + <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet" integrity="sha256-MfvZlkHCEqatNoGiOXveE8FIwMzZg4W85qfrfIFBfYc= sha512-dTfge/zgoMYpP7QbHy4gWMEGsbsdZeCXz7irItjcC3sPUFtf0kuFbDz/ixG7ArTxmDjLXDmezHubeNikyKGVyQ==" crossorigin="anonymous"> + {$css_links} + + <script src="https://code.jquery.com/jquery-2.1.3.min.js" type="text/javascript"></script> + <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js" integrity="sha256-Sk3nkD6mLTMOF0EOpNtsIry+s1CsaqQC1rVLTAy+0yc= sha512-K1qjQ+NcF2TYO/eI3M6v8EiNYZfA95pQumfvcVrTHtwQVDG+aHRqLi/ETn2uB+1JqwYqVG3LIvdm9lj6imS/pQ==" crossorigin="anonymous"></script> + {$js_links} + + + + <link rel="shortcut icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> + {$rss_link} +</head> +<body class="page-{$page_name}{$page_body_class}"> + +<div id="whq-tabs"> + <div class="whq-tabs-menu">☰</div> + <ul> + <li class="s"><a href="{$base_url}">{trans($tab_winehq)}</a></li> + <li><a href="https://wiki.winehq.org/Accueil">{trans($tab_wiki)}</a></li> + <li><a href="//appdb.winehq.org/">{trans($tab_appdb)}</a></li> + <li><a href="//bugs.winehq.org/">{trans($tab_bugs)}</a></li> + <li><a href="//forums.winehq.org/">{trans($tab_forums)}</a></li> + </ul> +</div> +<div class="clear"></div> + +<div id="whq-logo-glass"><a href="{$root}/"><img src="{$root}/images/winehq_logo_glass.png" alt=""></a></div> +<div id="whq-logo-text"><a href="{$root}/"><img src="{$root}/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> + +<div id="whq-search-box"> + <form action="{$root}/search" id="cse-search-box"> + <div class="input-group input-group-sm"> + <span class="input-group-addon"><span class="glyphicon glyphicon-search"></span></span> + <input type="text" name="q" value="" class="form-control" placeholder="{trans($search_placeholder)}"> + </div> + </form> +</div> + +<div id="whq-page-body" class="container-fluid"> + {$page_body} +</div> + +<div id="whq-footer" class="container-fluid"> + <div class="row"> + <div class="col-xs-6"> + <span class="glyphicon glyphicon-globe large"></span> {$langCur} (<a href="{$root}/lang">{$langChange}</a>) + </div> + <div class="col-xs-6 text-right"> + {trans($hosted_by)} + <a href="https://www.codeweavers.com/"><img src="{$root}/images/cw_logo_sm.png" alt="CodeWeavers" + title="{trans($hosted_by_alt)}"></a> + </div> + </div> +</div> + + +{$debug_log} + + +</body> +</html>

1 0

Frédéric Delanoy : Update French homepage
by Jeremy Newman 01 Feb '16

01 Feb '16

Module: website Branch: master Commit: d3535e5a5878834107d017c5a8547091fe7dfa17 URL: http://source.winehq.org/git/website.git/?a=commit;h=d3535e5a5878834107d017… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 30 16:21:32 2016 +0100 Update French homepage Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/fr/home.template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/templates/fr/home.template b/templates/fr/home.template index a4f8e22..87b5577 100644 --- a/templates/fr/home.template +++ b/templates/fr/home.template @@ -1,7 +1,7 @@    - +  <div class="row"> @@ -40,9 +40,7 @@ <div class="clear"></div> </div> - <p>Wine vous permet d'exécuter des logiciels Windows sous d'autres systèmes - d'exploitation. Avec Wine, vous pouvez installer et exécuter ces applications, - exactement comme vous le feriez sous Windows.</p> + <p>Wine (à l'origine un acronyme pour « Wine Is Not an Emulator » est une couche de compatibilité capable d'exécuter des applications Windows sur divers systèmes d'exploitation conformes à POSIX comme Linux, Mac OS X et BSD. Plutôt que de simuler la logique interne de Windows comme une machine virtuelle ou un émulateur, Wine traduit les appels de l'API Windows en appels POSIX à la volée, éliminant les pénalités mémoire et de performance d'autre méthodes et vous permettant d'intégrer proprement les applications Windows à votre bureau.</p> </div> @@ -86,7 +84,7 @@ <div class="whq-page-container margin-top-md"> - <h1 class="title"><a href="{$root}/news">Nouvelles</a></h1> + <h1 class="title"><a href="{$root}/news">Nouvelles et mises à jour</a></h1>

1 0

Nikolay Sivov : dwrite: Remove some redundant includes.
by Alexandre Julliard 01 Feb '16

01 Feb '16

Module: wine Branch: master Commit: 567f83a3172ca8fef877bc2f60694f8f83ec5231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=567f83a3172ca8fef877bc2f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 1 14:59:14 2016 +0300 dwrite: Remove some redundant includes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 1 - dlls/dwrite/tests/analyzer.c | 1 - dlls/dwrite/tests/layout.c | 1 - 3 files changed, 3 deletions(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index ba946a8..18b720a 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -32,7 +32,6 @@ #endif /* HAVE_FT2BUILD_H */ #include "windef.h" -#include "dwrite_2.h" #include "wine/library.h" #include "wine/debug.h" diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index fa0d7eb..d60b977 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -27,7 +27,6 @@ #include "initguid.h" #include "windows.h" -#include "dwrite.h" #include "dwrite_2.h" #include "wine/test.h" diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a8203f9..b2cdfc3 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -25,7 +25,6 @@ #include <limits.h> #include "windows.h" -#include "dwrite.h" #include "dwrite_2.h" #include "wine/test.h"

1 0

Paul Gofman : msvcrt: Handle of thread created by _beginthread should not be closed on thread detach.
by Alexandre Julliard 01 Feb '16

01 Feb '16

Module: wine Branch: master Commit: faf59e5f06a9ccf1bb6ae83716e68f63b883c001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faf59e5f06a9ccf1bb6ae8371… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Feb 1 15:16:01 2016 +0300 msvcrt: Handle of thread created by _beginthread should not be closed on thread detach. Handle should be closed if _endthread is called or thread function exits. If thread is terminated by ExitThread or _endthreadex, thread handle remains valid. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/main.c | 1 - dlls/msvcrt/tests/misc.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/thread.c | 56 +++++++++++++++++++++++++------------------ 3 files changed, 95 insertions(+), 24 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 6973dca..a930a32 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -67,7 +67,6 @@ static inline void msvcrt_free_tls_mem(void) if (tls) { - CloseHandle(tls->handle); MSVCRT_free(tls->efcvt_buffer); MSVCRT_free(tls->asctime_buffer); MSVCRT_free(tls->wasctime_buffer); diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index c568361..4968cbb 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <math.h> #include "msvcrt.h" +#include <process.h> static inline float __port_infinity(void) { @@ -540,6 +541,66 @@ static void test_math_functions(void) ok(errno == 0xdeadbeef, "errno = %d\n", errno); } +static void __cdecl test_thread_func(void *end_thread_type) +{ + if (end_thread_type == (void*)1) + _endthread(); + else if (end_thread_type == (void*)2) + ExitThread(0); + else if (end_thread_type == (void*)3) + _endthreadex(0); +} + +static unsigned __stdcall test_thread_func_ex(void *arg) +{ + _endthread(); + return 0; +} + +static void test_thread_handle_close(void) +{ + HANDLE hThread; + DWORD ret; + + /* _beginthread: handle is not closed on ExitThread and _endthreadex */ + hThread = (HANDLE)_beginthread(test_thread_func, 0, (void*)0); + ok(hThread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); + WaitForSingleObject(hThread, INFINITE); + ret = CloseHandle(hThread); + ok(!ret, "ret = %d\n", ret); + + hThread = (HANDLE)_beginthread(test_thread_func, 0, (void*)1); + ok(hThread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); + WaitForSingleObject(hThread, INFINITE); + ret = CloseHandle(hThread); + ok(!ret, "ret = %d\n", ret); + + hThread = (HANDLE)_beginthread(test_thread_func, 0, (void*)2); + ok(hThread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); + Sleep(150); + ret = WaitForSingleObject(hThread, INFINITE); + ok(ret == WAIT_OBJECT_0, "ret = %d\n", ret); + ret = CloseHandle(hThread); + ok(ret, "ret = %d\n", ret); + + hThread = (HANDLE)_beginthread(test_thread_func, 0, (void*)3); + ok(hThread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); + Sleep(150); + ret = WaitForSingleObject(hThread, INFINITE); + ok(ret == WAIT_OBJECT_0, "ret = %d\n", ret); + ret = CloseHandle(hThread); + ok(ret, "ret = %d\n", ret); + + /* _beginthreadex: handle is not closed on _endthread */ + hThread = (HANDLE)_beginthreadex(NULL,0, test_thread_func_ex, NULL, 0, NULL); + ok(hThread != NULL, "_beginthreadex failed (%d)\n", errno); + Sleep(150); + ret = WaitForSingleObject(hThread, INFINITE); + ok(ret == WAIT_OBJECT_0, "ret = %d\n", ret); + ret = CloseHandle(hThread); + ok(ret, "ret = %d\n", ret); +} + START_TEST(misc) { int arg_c; @@ -568,4 +629,5 @@ START_TEST(misc) test__invalid_parameter(); test_qsort_s(); test_math_functions(); + test_thread_handle_close(); } diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index 5e62354..da1f8bf 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -55,6 +55,38 @@ thread_data_t *msvcrt_get_thread_data(void) return ptr; } +/********************************************************************* + * _endthread (MSVCRT.@) + */ +void CDECL _endthread(void) +{ + thread_data_t *tls; + + TRACE("(void)\n"); + + tls = TlsGetValue(msvcrt_tls_index); + if (tls && tls->handle != INVALID_HANDLE_VALUE) + { + CloseHandle(tls->handle); + tls->handle = INVALID_HANDLE_VALUE; + } else + WARN("tls=%p tls->handle=%p\n", tls, tls ? tls->handle : INVALID_HANDLE_VALUE); + + /* FIXME */ + ExitThread(0); +} + +/********************************************************************* + * _endthreadex (MSVCRT.@) + */ +void CDECL _endthreadex( + unsigned int retval) /* [in] Thread exit code */ +{ + TRACE("(%d)\n", retval); + + /* FIXME */ + ExitThread(retval); +} /********************************************************************* * _beginthread_trampoline @@ -69,6 +101,7 @@ static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) MSVCRT_free(arg); local_trampoline.start_address(local_trampoline.arglist); + _endthread(); return 0; } @@ -132,29 +165,6 @@ MSVCRT_uintptr_t CDECL _beginthreadex( } /********************************************************************* - * _endthread (MSVCRT.@) - */ -void CDECL _endthread(void) -{ - TRACE("(void)\n"); - - /* FIXME */ - ExitThread(0); -} - -/********************************************************************* - * _endthreadex (MSVCRT.@) - */ -void CDECL _endthreadex( - unsigned int retval) /* [in] Thread exit code */ -{ - TRACE("(%d)\n", retval); - - /* FIXME */ - ExitThread(retval); -} - -/********************************************************************* * _getptd (MSVCR80.@) */ thread_data_t* CDECL _getptd(void)

1 0