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

Józef Kucia : d3dx9/tests: Fix HFONT leaks.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: a0a8556fd11f779860d87878e3e2955c4c855101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0a8556fd11f779860d87878e… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Wed Aug 5 20:51:01 2015 +0200 d3dx9/tests: Fix HFONT leaks. --- dlls/d3dx9_36/tests/mesh.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 16c79ea..4186e19 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4186,6 +4186,7 @@ error: free_mesh(&mesh); if (d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); + if (font) DeleteObject(font); HeapFree(GetProcessHeap(), 0, glyphmetrics_float); if (glyphs) @@ -4295,6 +4296,7 @@ if (0) test_createtext(device, hdc, "wi ne", 1.0f, 0.0f); DeleteDC(hdc); + DeleteObject(hFont); free_test_context(test_context); }

1 0

Jacek Caban : mfplat: Added IMFPluginControl stub implementation.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: b33d7b869011b0485ce8296004feeea901391a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b33d7b869011b0485ce829600… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 7 12:31:03 2015 +0200 mfplat: Added IMFPluginControl stub implementation. --- dlls/mfplat/main.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 3376a2c..698c681 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -16,12 +16,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" + +#include "initguid.h" #include "mfapi.h" #include "mferror.h" @@ -60,3 +63,97 @@ HRESULT WINAPI MFShutdown(void) FIXME("(): stub\n"); return S_OK; } + +static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IMFPluginControl)) { + TRACE("(IID_IMFPluginControl %p)\n", ppv); + *ppv = iface; + }else { + FIXME("(%s %p)\n", debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI MFPluginControl_AddRef(IMFPluginControl *iface) +{ + TRACE("\n"); + return 2; +} + +static ULONG WINAPI MFPluginControl_Release(IMFPluginControl *iface) +{ + TRACE("\n"); + return 1; +} + +static HRESULT WINAPI MFPluginControl_GetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, + const WCHAR *selector, CLSID *clsid) +{ + FIXME("(%d %s %p)\n", plugin_type, debugstr_w(selector), clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_GetPreferredClsidByIndex(IMFPluginControl *iface, DWORD plugin_type, + DWORD index, WCHAR **selector, CLSID *clsid) +{ + FIXME("(%d %d %p %p)\n", plugin_type, index, selector, clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_SetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, + const WCHAR *selector, const CLSID *clsid) +{ + FIXME("(%d %s %s)\n", plugin_type, debugstr_w(selector), debugstr_guid(clsid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_IsDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid) +{ + FIXME("(%d %s)\n", plugin_type, debugstr_guid(clsid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_GetDisabledByIndex(IMFPluginControl *iface, DWORD plugin_type, DWORD index, CLSID *clsid) +{ + FIXME("(%d %d %p)\n", plugin_type, index, clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_SetDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid, BOOL disabled) +{ + FIXME("(%d %s %x)\n", plugin_type, debugstr_guid(clsid), disabled); + return E_NOTIMPL; +} + +static const IMFPluginControlVtbl MFPluginControlVtbl = { + MFPluginControl_QueryInterface, + MFPluginControl_AddRef, + MFPluginControl_Release, + MFPluginControl_GetPreferredClsid, + MFPluginControl_GetPreferredClsidByIndex, + MFPluginControl_SetPreferredClsid, + MFPluginControl_IsDisabled, + MFPluginControl_GetDisabledByIndex, + MFPluginControl_SetDisabled +}; + +static IMFPluginControl plugin_control = { &MFPluginControlVtbl }; + +/*********************************************************************** + * MFGetPluginControl (mfplat.@) + */ +HRESULT WINAPI MFGetPluginControl(IMFPluginControl **ret) +{ + TRACE("(%p)\n", ret); + + *ret = &plugin_control; + return S_OK; +}

1 0

Francois Gouget : vcomp/tests: Make my_for_static_init() static.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 7734de65c776a6f8f1160e60cd08c809a20364d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7734de65c776a6f8f1160e60c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 7 11:54:33 2015 +0200 vcomp/tests: Make my_for_static_init() static. --- dlls/vcomp/tests/vcomp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 26b50a7..f24c654 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -696,7 +696,7 @@ static void test_vcomp_for_static_simple_init(void) #define VCOMP_FOR_STATIC_BROKEN_LOOP 1 #define VCOMP_FOR_STATIC_BROKEN_NEXT 2 -DWORD CDECL my_for_static_init(int first, int last, int step, int chunksize, unsigned int *loops, +static DWORD CDECL my_for_static_init(int first, int last, int step, int chunksize, unsigned int *loops, int *begin, int *end, int *next, int *lastchunk) { unsigned int iterations, num_chunks, per_thread, remaining;

1 0

Jacek Caban : widl: Don't allow coclass declaration in winrt mode.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: a99bb3468a8efc853b4282a30ce2eb45462afe7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a99bb3468a8efc853b4282a30… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 7 15:41:32 2015 +0200 widl: Don't allow coclass declaration in winrt mode. --- tools/widl/parser.y | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index b9234a4..0a149b0 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2714,10 +2714,26 @@ static void check_statements(const statement_list_t *stmts, int is_inside_librar if (stmts) LIST_FOR_EACH_ENTRY(stmt, stmts, const statement_t, entry) { - if (stmt->type == STMT_LIBRARY) - check_statements(stmt->u.lib->stmts, TRUE); - else if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) - check_functions(stmt->u.type, is_inside_library); + switch(stmt->type) { + case STMT_LIBRARY: + check_statements(stmt->u.lib->stmts, TRUE); + break; + case STMT_TYPE: + switch(type_get_type(stmt->u.type)) { + case TYPE_INTERFACE: + check_functions(stmt->u.type, is_inside_library); + break; + case TYPE_COCLASS: + if(winrt_mode) + error_loc("coclass is not allowed in Windows Runtime mode\n"); + break; + default: + break; + } + break; + default: + break; + } } }

1 0

Nikolay Sivov : dwrite: Implement GetPaletteEntryCount().
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 5734c2ed9825c61d5a5299a17e7fd922ee86132a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5734c2ed9825c61d5a5299a17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 19:43:41 2015 +0300 dwrite: Implement GetPaletteEntryCount(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 4 ++-- dlls/dwrite/opentype.c | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 7668bc9..a849406 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -154,6 +154,7 @@ extern HRESULT opentype_get_font_strings_from_id(const void*,DWRITE_INFORMATIONA extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32,UINT32,UINT32*,DWRITE_FONT_FEATURE_TAG*) DECLSPEC_HIDDEN; extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; +extern UINT32 opentype_get_cpal_paletteentrycount(const void*) DECLSPEC_HIDDEN; enum gasp_flags { GASP_GRIDFIT = 0x0001, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 1ee97fa..266f7ef 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -964,8 +964,8 @@ static UINT32 WINAPI dwritefontface2_GetColorPaletteCount(IDWriteFontFace2 *ifac static UINT32 WINAPI dwritefontface2_GetPaletteEntryCount(IDWriteFontFace2 *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return opentype_get_cpal_paletteentrycount(get_fontface_cpal(This)); } static HRESULT WINAPI dwritefontface2_GetPaletteEntries(IDWriteFontFace2 *iface, UINT32 palette_index, diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 389183f..7be9df3 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1428,3 +1428,9 @@ UINT32 opentype_get_cpal_palettecount(const void *cpal) const struct CPAL_Header_0 *header = (const struct CPAL_Header_0*)cpal; return header ? GET_BE_WORD(header->numPalette) : 0; } + +UINT32 opentype_get_cpal_paletteentrycount(const void *cpal) +{ + const struct CPAL_Header_0 *header = (const struct CPAL_Header_0*)cpal; + return header ? GET_BE_WORD(header->numPaletteEntries) : 0; +}

1 0

Nikolay Sivov : dwrite: Fix IsColorFont() return type for IDWriteFont2.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: e1f353663acd5fe32b2292ae3cb3bd86a8d92f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f353663acd5fe32b2292ae3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 19:45:14 2015 +0300 dwrite: Fix IsColorFont() return type for IDWriteFont2. --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 1f4e565..93aae86 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1405,7 +1405,7 @@ static BOOL WINAPI dwritefont1_IsMonospacedFont(IDWriteFont2 *iface) return IDWriteFontFace2_IsMonospacedFont(fontface); } -static HRESULT WINAPI dwritefont2_IsColorFont(IDWriteFont2 *iface) +static BOOL WINAPI dwritefont2_IsColorFont(IDWriteFont2 *iface) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); IDWriteFontFace2 *fontface; @@ -1415,7 +1415,7 @@ static HRESULT WINAPI dwritefont2_IsColorFont(IDWriteFont2 *iface) hr = get_fontface_from_font(This, &fontface); if (FAILED(hr)) - return hr; + return FALSE; return IDWriteFontFace2_IsColorFont(fontface); }

1 0

Sebastian Lackner : vcomp: Implement _vcomp_enter_critsect and _vcomp_leave_critsect.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: b0e4fd05e57100ce8d2275560eefb9a9d83ccef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e4fd05e57100ce8d2275560… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 7 08:22:51 2015 +0200 vcomp: Implement _vcomp_enter_critsect and _vcomp_leave_critsect. --- dlls/vcomp/main.c | 34 ++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 4 ++-- dlls/vcomp100/vcomp100.spec | 4 ++-- dlls/vcomp110/vcomp110.spec | 4 ++-- dlls/vcomp90/vcomp90.spec | 4 ++-- 5 files changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 1d9765f..10ac465 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -979,6 +979,40 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) __ms_va_end(team_data.valist); } +void CDECL _vcomp_enter_critsect(CRITICAL_SECTION **critsect) +{ + TRACE("(%p)\n", critsect); + + if (!*critsect) + { + CRITICAL_SECTION *new_critsect; + if (!(new_critsect = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_critsect)))) + { + ERR("could not allocate critical section\n"); + ExitProcess(1); + } + + InitializeCriticalSection(new_critsect); + new_critsect->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": critsect"); + + if (interlocked_cmpxchg_ptr((void **)critsect, new_critsect, NULL) != NULL) + { + /* someone beat us to it */ + new_critsect->DebugInfo->Spare[0] = 0; + DeleteCriticalSection(new_critsect); + HeapFree(GetProcessHeap(), 0, new_critsect); + } + } + + EnterCriticalSection(*critsect); +} + +void CDECL _vcomp_leave_critsect(CRITICAL_SECTION *critsect) +{ + TRACE("(%p)\n", critsect); + LeaveCriticalSection(critsect); +} + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { TRACE("(%p, %d, %p)\n", instance, reason, reserved); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 3167839..55b699f 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -53,7 +53,7 @@ @ cdecl _vcomp_barrier() @ stub _vcomp_copyprivate_broadcast @ stub _vcomp_copyprivate_receive -@ stub _vcomp_enter_critsect +@ cdecl _vcomp_enter_critsect(ptr) @ stub _vcomp_flush @ cdecl _vcomp_for_dynamic_init(long long long long long) @ stub _vcomp_for_dynamic_init_i8 @@ -66,7 +66,7 @@ @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) @ stub _vcomp_get_thread_num -@ stub _vcomp_leave_critsect +@ cdecl _vcomp_leave_critsect(ptr) @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() @ cdecl _vcomp_master_end() diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 38578b9..7bf6238 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -53,7 +53,7 @@ @ cdecl _vcomp_barrier() vcomp._vcomp_barrier @ stub _vcomp_copyprivate_broadcast @ stub _vcomp_copyprivate_receive -@ stub _vcomp_enter_critsect +@ cdecl _vcomp_enter_critsect(ptr) vcomp._vcomp_enter_critsect @ stub _vcomp_flush @ cdecl _vcomp_for_dynamic_init(long long long long long) vcomp._vcomp_for_dynamic_init @ stub _vcomp_for_dynamic_init_i8 @@ -66,7 +66,7 @@ @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork @ stub _vcomp_get_thread_num -@ stub _vcomp_leave_critsect +@ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin @ cdecl _vcomp_master_end() vcomp._vcomp_master_end diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index ef8222f..c84e44c 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -54,7 +54,7 @@ @ cdecl _vcomp_barrier() vcomp._vcomp_barrier @ stub _vcomp_copyprivate_broadcast @ stub _vcomp_copyprivate_receive -@ stub _vcomp_enter_critsect +@ cdecl _vcomp_enter_critsect(ptr) vcomp._vcomp_enter_critsect @ stub _vcomp_flush @ cdecl _vcomp_for_dynamic_init(long long long long long) vcomp._vcomp_for_dynamic_init @ stub _vcomp_for_dynamic_init_i8 @@ -67,7 +67,7 @@ @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork @ stub _vcomp_get_thread_num -@ stub _vcomp_leave_critsect +@ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin @ cdecl _vcomp_master_end() vcomp._vcomp_master_end diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 38578b9..7bf6238 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -53,7 +53,7 @@ @ cdecl _vcomp_barrier() vcomp._vcomp_barrier @ stub _vcomp_copyprivate_broadcast @ stub _vcomp_copyprivate_receive -@ stub _vcomp_enter_critsect +@ cdecl _vcomp_enter_critsect(ptr) vcomp._vcomp_enter_critsect @ stub _vcomp_flush @ cdecl _vcomp_for_dynamic_init(long long long long long) vcomp._vcomp_for_dynamic_init @ stub _vcomp_for_dynamic_init_i8 @@ -66,7 +66,7 @@ @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork @ stub _vcomp_get_thread_num -@ stub _vcomp_leave_critsect +@ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin @ cdecl _vcomp_master_end() vcomp._vcomp_master_end

1 0

Sebastian Lackner : vcomp/tests: Add tests for _vcomp_single_begin and _vcomp_single_end.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 89b383740cd48ff97b25e8bb5798ad58344d4388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b383740cd48ff97b25e8bb5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 7 08:22:19 2015 +0200 vcomp/tests: Add tests for _vcomp_single_begin and _vcomp_single_end. Yes, its intentional that the call to p_vcomp_single_end() is after the if-block. Somehow MS made a difference here between the master and the single directive... --- dlls/vcomp/tests/vcomp.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 99c98ef..e5617d8 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -65,6 +65,8 @@ static void (CDECL *p_vcomp_master_end)(void); static void (CDECL *p_vcomp_sections_init)(int n); static int (CDECL *p_vcomp_sections_next)(void); static void (CDECL *p_vcomp_set_num_threads)(int num_threads); +static int (CDECL *p_vcomp_single_begin)(int flags); +static void (CDECL *p_vcomp_single_end)(void); static int (CDECL *pomp_get_max_threads)(void); static int (CDECL *pomp_get_nested)(void); static int (CDECL *pomp_get_num_threads)(void); @@ -235,6 +237,8 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_sections_init); VCOMP_GET_PROC(_vcomp_sections_next); VCOMP_GET_PROC(_vcomp_set_num_threads); + VCOMP_GET_PROC(_vcomp_single_begin); + VCOMP_GET_PROC(_vcomp_single_end); VCOMP_GET_PROC(omp_get_max_threads); VCOMP_GET_PROC(omp_get_nested); VCOMP_GET_PROC(omp_get_num_threads); @@ -1168,6 +1172,53 @@ static void test_vcomp_master_begin(void) pomp_set_num_threads(max_threads); } +static void CDECL single_cb(int flags, HANDLE semaphore) +{ + int num_threads = pomp_get_num_threads(); + + if (p_vcomp_single_begin(flags)) + { + if (num_threads >= 2) + { + DWORD result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + } + } + p_vcomp_single_end(); + + if (p_vcomp_single_begin(flags)) + { + if (num_threads >= 2) + ReleaseSemaphore(semaphore, 1, NULL); + } + p_vcomp_single_end(); +} + +static void test_vcomp_single_begin(void) +{ + int max_threads = pomp_get_max_threads(); + HANDLE semaphore; + int i; + + semaphore = CreateSemaphoreA(NULL, 0, 1, NULL); + ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + + single_cb(0, semaphore); + single_cb(1, semaphore); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + p_vcomp_fork(TRUE, 2, single_cb, 0, semaphore); + p_vcomp_fork(TRUE, 2, single_cb, 1, semaphore); + p_vcomp_fork(FALSE, 2, single_cb, 0, semaphore); + p_vcomp_fork(FALSE, 2, single_cb, 1, semaphore); + } + + CloseHandle(semaphore); + pomp_set_num_threads(max_threads); +} + static void test_atomic_integer32(void) { struct @@ -1285,6 +1336,7 @@ START_TEST(vcomp) test_vcomp_for_static_init(); test_vcomp_for_dynamic_init(); test_vcomp_master_begin(); + test_vcomp_single_begin(); test_atomic_integer32(); test_atomic_float(); test_atomic_double();

1 0

Sebastian Lackner : vcomp: Implement _vcomp_master_begin and _vcomp_master_end.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: bf4daa339563f2bce883e7210d54cea331f7867c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf4daa339563f2bce883e7210… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 7 08:20:27 2015 +0200 vcomp: Implement _vcomp_master_begin and _vcomp_master_end. --- dlls/vcomp/main.c | 12 ++++++++++++ dlls/vcomp/vcomp.spec | 4 ++-- dlls/vcomp100/vcomp100.spec | 4 ++-- dlls/vcomp110/vcomp110.spec | 4 ++-- dlls/vcomp90/vcomp90.spec | 4 ++-- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 42b116b..1e69e31 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -489,6 +489,18 @@ void CDECL _vcomp_set_num_threads(int num_threads) vcomp_init_thread_data()->fork_threads = num_threads; } +int CDECL _vcomp_master_begin(void) +{ + TRACE("()\n"); + return !vcomp_init_thread_data()->thread_num; +} + +void CDECL _vcomp_master_end(void) +{ + TRACE("()\n"); + /* nothing to do here */ +} + int CDECL _vcomp_single_begin(int flags) { TRACE("(%x): stub\n", flags); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 6e2fcec..3167839 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -68,8 +68,8 @@ @ stub _vcomp_get_thread_num @ stub _vcomp_leave_critsect @ stub _vcomp_master_barrier -@ stub _vcomp_master_begin -@ stub _vcomp_master_end +@ cdecl _vcomp_master_begin() +@ cdecl _vcomp_master_end() @ stub _vcomp_ordered_begin @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index a9a07e1..38578b9 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -68,8 +68,8 @@ @ stub _vcomp_get_thread_num @ stub _vcomp_leave_critsect @ stub _vcomp_master_barrier -@ stub _vcomp_master_begin -@ stub _vcomp_master_end +@ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin +@ cdecl _vcomp_master_end() vcomp._vcomp_master_end @ stub _vcomp_ordered_begin @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index 5373420..ef8222f 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -69,8 +69,8 @@ @ stub _vcomp_get_thread_num @ stub _vcomp_leave_critsect @ stub _vcomp_master_barrier -@ stub _vcomp_master_begin -@ stub _vcomp_master_end +@ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin +@ cdecl _vcomp_master_end() vcomp._vcomp_master_end @ stub _vcomp_ordered_begin @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index a9a07e1..38578b9 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -68,8 +68,8 @@ @ stub _vcomp_get_thread_num @ stub _vcomp_leave_critsect @ stub _vcomp_master_barrier -@ stub _vcomp_master_begin -@ stub _vcomp_master_end +@ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin +@ cdecl _vcomp_master_end() vcomp._vcomp_master_end @ stub _vcomp_ordered_begin @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end

1 0

Damjan Jovanovic : winex11: Use the correct drop effect for WM_DROPFILES.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 3f99e71fde8231524597901e512e5c1909a82e1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f99e71fde8231524597901e5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Aug 7 04:21:27 2015 +0200 winex11: Use the correct drop effect for WM_DROPFILES. Tests show that on Windows, for a window to indicate it will accept a file drop or to actually accept it, it must have WS_EX_ACCEPTFILES in its style, contain DROPEFFECT_COPY (which will be chosen if offered among several drop effects), and be offered the HDROP format. --- dlls/winex11.drv/xdnd.c | 67 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 9944dab..72758a0 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -74,7 +74,8 @@ static HWND XDNDLastDropTargetWnd; static void X11DRV_XDND_InsertXDNDData(int property, int format, HANDLE contents); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count); -static void X11DRV_XDND_SendDropFiles(HWND hwnd); +static BOOL X11DRV_XDND_HasHDROP(void); +static HRESULT X11DRV_XDND_SendDropFiles(HWND hwnd); static void X11DRV_XDND_FreeDragDropOp(void); static CRITICAL_SECTION xdnd_cs; @@ -338,8 +339,15 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) accept = 1; - if (GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) + else if (dropTarget == NULL && + (GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && + (effect & DROPEFFECT_COPY) && + X11DRV_XDND_HasHDROP()) + { accept = 1; + effect = DROPEFFECT_COPY; + XDNDDropEffect = effect; + } TRACE("action req: %ld accept(%d) at x(%d),y(%d)\n", event->data.l[4], accept, XDNDxy.x, XDNDxy.y); @@ -407,8 +415,17 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) { /* Only send WM_DROPFILES if there is no drop target. Doing both * causes winamp to duplicate the dropped files (#29081) */ - if (GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) - X11DRV_XDND_SendDropFiles( hWnd ); + if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && + (effect & DROPEFFECT_COPY) && + X11DRV_XDND_HasHDROP()) + { + HRESULT hr = X11DRV_XDND_SendDropFiles( hWnd ); + if (SUCCEEDED(hr)) + { + accept = 1; + effect = DROPEFFECT_COPY; + } + } } X11DRV_XDND_FreeDragDropOp(); @@ -552,9 +569,9 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, HANDLE contents /************************************************************************** - * X11DRV_XDND_SendDropFiles + * X11DRV_XDND_HasHDROP */ -static void X11DRV_XDND_SendDropFiles(HWND hwnd) +static BOOL X11DRV_XDND_HasHDROP(void) { LPXDNDDATA current = NULL; BOOL found = FALSE; @@ -571,10 +588,33 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) } } + LeaveCriticalSection(&xdnd_cs); + + return found; +} + +/************************************************************************** + * X11DRV_XDND_SendDropFiles + */ +static HRESULT X11DRV_XDND_SendDropFiles(HWND hwnd) +{ + HRESULT hr; + LPXDNDDATA current = NULL; + BOOL found = FALSE; + + EnterCriticalSection(&xdnd_cs); + + LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) + { + if (current->cf_win == CF_HDROP) + { + found = TRUE; + break; + } + } if (found) { HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, GlobalSize(current->contents)); - if (dropHandle) { DROPFILES *lpDrop = GlobalLock(dropHandle); @@ -587,12 +627,23 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) lpDrop->fNC, lpDrop->pt.x, lpDrop->pt.y, ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); GlobalUnlock(dropHandle); - if (!PostMessageW(hwnd, WM_DROPFILES, (WPARAM)dropHandle, 0)) + if (PostMessageW(hwnd, WM_DROPFILES, (WPARAM)dropHandle, 0)) + hr = S_OK; + else + { + hr = HRESULT_FROM_WIN32(GetLastError()); GlobalFree(dropHandle); + } } + else + hr = HRESULT_FROM_WIN32(GetLastError()); } + else + hr = E_FAIL; LeaveCriticalSection(&xdnd_cs); + + return hr; }

1 0