July 2016 - Wine-commits - list.winehq.org

Michael Stefaniuc : shell32/tests: Remove redundant NULL checks before CoTaskMemFree().
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: afe0ba175cc0507290a82cd97da5e0a141932533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe0ba175cc0507290a82cd97… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:10:33 2016 +0200 shell32/tests: Remove redundant NULL checks before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/brsfolder.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index 0ef5bb1..bf29d11 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -248,10 +248,8 @@ static void test_click_make_new_folder_button(void) shfileop.fFlags = FOF_NOCONFIRMATION|FOF_NOERRORUI|FOF_SILENT; SHFileOperationA(&shfileop); - if (pidl) - CoTaskMemFree(pidl); - if (test_folder_pidl) - CoTaskMemFree(test_folder_pidl); + CoTaskMemFree(pidl); + CoTaskMemFree(test_folder_pidl); test_folder_object->lpVtbl->Release(test_folder_object); CoUninitialize(); @@ -346,16 +344,12 @@ static void test_selection(void) /* test without flags */ bi.ulFlags = 0; pidl = SHBrowseForFolderA(&bi); - - if (pidl) - CoTaskMemFree(pidl); + CoTaskMemFree(pidl); /* test with flag */ bi.ulFlags = BIF_NEWDIALOGSTYLE; pidl = SHBrowseForFolderA(&bi); - - if (pidl) - CoTaskMemFree(pidl); + CoTaskMemFree(pidl); IShellFolder_Release(desktop_object);

1 0

Michael Stefaniuc : devenum: Remove redundant NULL checks before CoTaskMemFree().
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: cf3d95795032c7b906fbb62fee5312820595e7e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf3d95795032c7b906fbb62fe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:10:57 2016 +0200 devenum: Remove redundant NULL checks before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 828d661..17d9850 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -262,8 +262,8 @@ static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS *rgPin) error_cleanup_types: - if (clsMajorType) CoTaskMemFree(clsMajorType); - if (clsMinorType) CoTaskMemFree(clsMinorType); + CoTaskMemFree(clsMajorType); + CoTaskMemFree(clsMinorType); } RegCloseKey(hkeyMajorType); @@ -358,7 +358,7 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2) error_cleanup: RegCloseKey(hkeyPinKey); - if (rgPin->strName) CoTaskMemFree(rgPin->strName); + CoTaskMemFree(rgPin->strName); } RegCloseKey(hkeyPins);

1 0

Sebastian Lackner : wininet: Use list_head get first entry of list.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 1eb2c5520c4b1d0813f8c020c741c1cc2b5152c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb2c5520c4b1d0813f8c020c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 7 05:39:46 2016 +0200 wininet: Use list_head get first entry of list. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 5421fe1..5da9710 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -690,15 +690,15 @@ static void free_cookie_domain_list(struct list *list) cookie_domain_t *domain; while(!list_empty(list)) { - domain = LIST_ENTRY(list_next(list, list), cookie_domain_t, entry); + domain = LIST_ENTRY(list_head(list), cookie_domain_t, entry); free_cookie_domain_list(&domain->subdomain_list); while(!list_empty(&domain->path_list)) { - container = LIST_ENTRY(list_next(&domain->path_list, &domain->path_list), cookie_container_t, entry); + container = LIST_ENTRY(list_head(&domain->path_list), cookie_container_t, entry); while(!list_empty(&container->cookie_list)) - delete_cookie(LIST_ENTRY(list_next(&container->cookie_list, &container->cookie_list), cookie_t, entry)); + delete_cookie(LIST_ENTRY(list_head(&container->cookie_list), cookie_t, entry)); heap_free(container->cookie_url); list_remove(&container->entry);

1 0

Sebastian Lackner : jscript: Use list_head get first entry of list.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: b2e58b4c7c15815840b563df7b2d0ca8bdd7017e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e58b4c7c15815840b563df7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 7 05:40:55 2016 +0200 jscript: Use list_head get first entry of list. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 59dbc65..447b7c6 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -148,7 +148,7 @@ void heap_pool_clear(heap_pool_t *heap) if(!heap) return; - while((tmp = list_next(&heap->custom_blocks, &heap->custom_blocks))) { + while((tmp = list_head(&heap->custom_blocks))) { list_remove(tmp); heap_free(tmp); }

1 0

Michael Müller : wininet/tests: Fix some typos in ok( ) messages.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 9e4df5ef79dbd352d6c5381da305f91f04b092bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e4df5ef79dbd352d6c5381da… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jul 7 06:55:53 2016 +0200 wininet/tests: Fix some typos in ok() messages. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/url.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 1deae67..00a457a 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -246,9 +246,9 @@ static void test_crack_url(const crack_url_test_t *test) test->url, url.dwPasswordLength, test->pass_len); if(test->path_off == -1) - ok(!url.lpszUrlPath, "[%s] url.lpszPath = %p, expected NULL\n", test->url, url.lpszUrlPath); + ok(!url.lpszUrlPath, "[%s] url.lpszUrlPath = %p, expected NULL\n", test->url, url.lpszUrlPath); else - ok(url.lpszUrlPath == test->url+test->path_off, "[%s] url.lpszPath = %p, expected %p\n", + ok(url.lpszUrlPath == test->url+test->path_off, "[%s] url.lpszUrlPath = %p, expected %p\n", test->url, url.lpszUrlPath, test->url+test->path_off); ok(url.dwUrlPathLength == test->path_len, "[%s] url.lpszUrlPathLength = %d, expected %d\n", test->url, url.dwUrlPathLength, test->path_len); @@ -326,9 +326,9 @@ static void test_crack_url(const crack_url_test_t *test) } if(test->path_off == -1) - ok(!urlw.lpszUrlPath, "[%s] urlw.lpszPath = %p, expected NULL\n", test->url, urlw.lpszUrlPath); + ok(!urlw.lpszUrlPath, "[%s] urlw.lpszUrlPath = %p, expected NULL\n", test->url, urlw.lpszUrlPath); else - ok(urlw.lpszUrlPath == buf+test->path_off, "[%s] urlw.lpszPath = %p, expected %p\n", + ok(urlw.lpszUrlPath == buf+test->path_off, "[%s] urlw.lpszUrlPath = %p, expected %p\n", test->url, urlw.lpszUrlPath, buf+test->path_off); ok(urlw.dwUrlPathLength == test->path_len, "[%s] urlw.lpszUrlPathLength = %d, expected %d\n", test->url, urlw.dwUrlPathLength, test->path_len);

1 0

Jacek Caban : mshtml: Added support for exposing different sets of properties from DispatchEx depending on compatibility mode.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 91e7a0284561ab74fc6fdded108b5be946d96005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e7a0284561ab74fc6fdded1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 7 12:49:45 2016 +0200 mshtml: Added support for exposing different sets of properties from DispatchEx depending on compatibility mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 16 +++++++++------- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 11 ++++++++--- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 791f361..d934f56 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -362,7 +362,7 @@ static int func_name_cmp(const void *p1, const void *p2) return strcmpiW((*(func_info_t* const*)p1)->name, (*(func_info_t* const*)p2)->name); } -static dispex_data_t *preprocess_dispex_data(const dispex_static_data_t *desc) +static dispex_data_t *preprocess_dispex_data(const dispex_static_data_t *desc, compat_mode_t compat_mode) { const tid_t *tid; dispex_data_t *data; @@ -396,7 +396,7 @@ static dispex_data_t *preprocess_dispex_data(const dispex_static_data_t *desc) list_add_tail(&dispex_data_list, &data->entry); if(desc->init_info) - desc->init_info(data); + desc->init_info(data, compat_mode); for(tid = desc->iface_tids; *tid; tid++) { hres = process_interface(data, *tid, dti); @@ -1745,17 +1745,19 @@ void release_dispex(DispatchEx *This) heap_free(This->dynamic_data); } -void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *data) +void init_dispex_with_compat_mode(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *data, compat_mode_t compat_mode) { - if(!data->data) { + assert(compat_mode < COMPAT_MODE_CNT); + + if(!data->info_cache[compat_mode]) { EnterCriticalSection(&cs_dispex_static_data); - if(!data->data) - data->data = preprocess_dispex_data(data); + if(!data->info_cache[compat_mode]) + data->info_cache[compat_mode] = preprocess_dispex_data(data, compat_mode); LeaveCriticalSection(&cs_dispex_static_data); } dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; dispex->outer = outer; - dispex->info = data->data; + dispex->info = data->info_cache[compat_mode]; dispex->dynamic_data = NULL; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 54cd078..2b79226 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2936,7 +2936,7 @@ static void HTMLWindow_bind_event(DispatchEx *dispex, int eid) dispex_get_vtbl(&This->doc->node.event_target.dispex)->bind_event(&This->doc->node.event_target.dispex, eid); } -static void HTMLWindow_init_dispex_info(dispex_data_t *info) +static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) { dispex_info_add_interface(info, IHTMLWindow5_tid); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 412db24..d34f9cb 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -265,8 +265,8 @@ typedef struct { const dispex_static_data_vtbl_t *vtbl; const tid_t disp_tid; const tid_t* const iface_tids; - void (*init_info)(dispex_data_t*); - dispex_data_t *data; + void (*init_info)(dispex_data_t*,compat_mode_t); + dispex_data_t *info_cache[COMPAT_MODE_CNT]; } dispex_static_data_t; struct DispatchEx { @@ -305,7 +305,7 @@ void (__cdecl *ccp_init)(ExternalCycleCollectionParticipant*,const CCObjCallback void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,const char*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; -void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*) DECLSPEC_HIDDEN; +void init_dispex_with_compat_mode(DispatchEx*,IUnknown*,dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; BOOL dispex_query_interface(DispatchEx*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**) DECLSPEC_HIDDEN; @@ -319,6 +319,11 @@ HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) DECLSPEC_HIDDEN; const dispex_static_data_vtbl_t *dispex_get_vtbl(DispatchEx*) DECLSPEC_HIDDEN; void dispex_info_add_interface(dispex_data_t*,tid_t) DECLSPEC_HIDDEN; +static inline void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *desc) +{ + init_dispex_with_compat_mode(dispex, outer, desc, COMPAT_MODE_NONE); +} + typedef enum { DISPEXPROP_CUSTOM, DISPEXPROP_DYNAMIC,

1 0

Jacek Caban : mshtml: Properly handle duplicated names with different DISPIDs in add_func_info.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: c20c47b85ebb59f01e6ddb6a8da264ff465ebf8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20c47b85ebb59f01e6ddb6a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 7 12:50:03 2016 +0200 mshtml: Properly handle duplicated names with different DISPIDs in add_func_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index d934f56..2013cee 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -231,12 +231,19 @@ static BOOL is_arg_type_supported(VARTYPE vt) static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, ITypeInfo *dti) { func_info_t *info; + BSTR name; HRESULT hres; + hres = ITypeInfo_GetDocumentation(dti, desc->memid, &name, NULL, NULL, NULL); + if(FAILED(hres)) + return; + for(info = data->funcs; info < data->funcs+data->func_cnt; info++) { - if(info->id == desc->memid) { - if(info->tid != tid) + if(info->id == desc->memid || !strcmpW(info->name, name)) { + if(info->tid != tid) { + SysFreeString(name); return; /* Duplicated in other interface */ + } break; } } @@ -246,16 +253,15 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, data->funcs = heap_realloc_zero(data->funcs, (data->func_size <<= 1)*sizeof(func_info_t)); info = data->funcs+data->func_cnt; - hres = ITypeInfo_GetDocumentation(dti, desc->memid, &info->name, NULL, NULL, NULL); - if(FAILED(hres)) - return; - data->func_cnt++; info->id = desc->memid; + info->name = name; info->tid = tid; info->func_disp_idx = -1; info->prop_vt = VT_EMPTY; + }else { + SysFreeString(name); } if(desc->invkind & DISPATCH_METHOD) {

1 0

Jacek Caban : mshtml: Export IElementSelector for all elements in compatibility mode >= IE8.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: d72d640308ce015b50a8b26c6bf6baeb560d9527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72d640308ce015b50a8b26c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 7 12:50:18 2016 +0200 mshtml: Export IElementSelector for all elements in compatibility mode >= IE8. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 3 ++- dlls/mshtml/htmlarea.c | 3 ++- dlls/mshtml/htmlbody.c | 3 ++- dlls/mshtml/htmlcomment.c | 3 ++- dlls/mshtml/htmlelem.c | 13 ++++++++++--- dlls/mshtml/htmlembed.c | 3 ++- dlls/mshtml/htmlform.c | 3 ++- dlls/mshtml/htmlframe.c | 3 ++- dlls/mshtml/htmlgeneric.c | 3 ++- dlls/mshtml/htmlhead.c | 9 ++++++--- dlls/mshtml/htmliframe.c | 3 ++- dlls/mshtml/htmlimg.c | 3 ++- dlls/mshtml/htmlinput.c | 9 ++++++--- dlls/mshtml/htmllink.c | 3 ++- dlls/mshtml/htmlmeta.c | 3 ++- dlls/mshtml/htmlobject.c | 3 ++- dlls/mshtml/htmloption.c | 6 ++++-- dlls/mshtml/htmlscript.c | 3 ++- dlls/mshtml/htmlselect.c | 3 ++- dlls/mshtml/htmlstyleelem.c | 3 ++- dlls/mshtml/htmltable.c | 3 ++- dlls/mshtml/htmltablecell.c | 3 ++- dlls/mshtml/htmltablerow.c | 3 ++- dlls/mshtml/htmltextarea.c | 3 ++- dlls/mshtml/mshtml_private.h | 4 ++-- dlls/mshtml/tests/documentmode.js | 20 +++++++++++++++++++- 26 files changed, 87 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d72d640308ce015b50a8b…

1 0

Andrew Eikum : xaudio2: Always set current OpenAL context before making AL calls.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 49078e00a51876df38d0c572193195be6700bad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49078e00a51876df38d0c5721… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 6 14:48:18 2016 -0500 xaudio2: Always set current OpenAL context before making AL calls. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index e83bc22..b2a5e3b 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -36,6 +36,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static ALCdevice *(ALC_APIENTRY *palcLoopbackOpenDeviceSOFT)(const ALCchar*); static void (ALC_APIENTRY *palcRenderSamplesSOFT)(ALCdevice*, ALCvoid*, ALCsizei); +static ALCboolean (ALC_APIENTRY *palcSetThreadContext)(ALCcontext*); static HINSTANCE instance; @@ -101,6 +102,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) return FALSE; } + if(!alcIsExtensionPresent(NULL, "ALC_EXT_thread_local_context") || + !(palcSetThreadContext = alcGetProcAddress(NULL, "alcSetThreadContext"))){ + ERR("XAudio2 requires the ALC_EXT_thread_local_context extension (OpenAL-Soft >= 1.12)\n"); + return FALSE; + } + break; } return TRUE; @@ -313,6 +320,8 @@ static HRESULT WINAPI XA2SRC_SetVolume(IXAudio2SourceVoice *iface, float Volume, al_gain = Volume; + palcSetThreadContext(This->xa2->al_ctx); + alSourcef(This->al_src, AL_GAIN, al_gain); return S_OK; @@ -366,6 +375,8 @@ static void WINAPI XA2SRC_DestroyVoice(IXAudio2SourceVoice *iface) TRACE("%p\n", This); + palcSetThreadContext(This->xa2->al_ctx); + EnterCriticalSection(&This->lock); if(!This->in_use){ @@ -728,6 +739,8 @@ static HRESULT WINAPI XA2SRC_SetFrequencyRatio(IXAudio2SourceVoice *iface, else r = Ratio; + palcSetThreadContext(This->xa2->al_ctx); + alSourcef(This->al_src, AL_PITCH, r); return S_OK; @@ -740,6 +753,8 @@ static void WINAPI XA2SRC_GetFrequencyRatio(IXAudio2SourceVoice *iface, float *p TRACE("%p, %p\n", This, pRatio); + palcSetThreadContext(This->xa2->al_ctx); + alGetSourcef(This->al_src, AL_PITCH, &ratio); *pRatio = ratio; @@ -1377,6 +1392,8 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, dump_fmt(pSourceFormat); + palcSetThreadContext(This->al_ctx); + EnterCriticalSection(&This->lock); LIST_FOR_EACH_ENTRY(src, &This->source_voices, XA2SourceImpl, entry){ @@ -1752,12 +1769,6 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, goto exit; } - if(alcMakeContextCurrent(This->al_ctx) == ALC_FALSE){ - WARN("alcMakeContextCurrent failed\n"); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - hr = IAudioClient_Start(This->aclient); if (FAILED(hr)) { @@ -2415,6 +2426,8 @@ static DWORD WINAPI engine_threadproc(void *arg) continue; } + palcSetThreadContext(This->al_ctx); + do_engine_tick(This); LeaveCriticalSection(&This->lock);

1 0

Huw Davies : gdi32: Use a binary search to generate the clipped rects.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 7fd44a511f1093c79361485ba80e803b272bbb26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd44a511f1093c79361485ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 6 11:09:12 2016 +0100 gdi32: Use a binary search to generate the clipped rects. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/gdi_private.h | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 314c651..9bd263c 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -280,7 +280,7 @@ int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct cl if (!(region = get_wine_region( clip ))) return 0; - for (i = 0; i < region->numRects; i++) + for (i = region_find_pt( region, rect.left, rect.top, NULL ); i < region->numRects; i++) { if (region->rects[i].top >= rect.bottom) break; if (!intersect_rect( out, &rect, &region->rects[i] )) continue; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 15e50e1..9c58747 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -370,6 +370,39 @@ static inline void release_wine_region(HRGN rgn) GDI_ReleaseObj(rgn); } +/********************************************************** + * region_find_pt + * + * Return either the index of the rectangle that contains (x,y) or the first + * rectangle after it. Sets *hit to TRUE if the region contains (x,y). + * Note if (x,y) follows all rectangles, then the return value will be rgn->numRects. + */ +static inline int region_find_pt( const WINEREGION *rgn, int x, int y, BOOL *hit ) +{ + int i, start = 0, end = rgn->numRects - 1; + BOOL h = FALSE; + + while (start <= end) + { + i = (start + end) / 2; + + if (rgn->rects[i].bottom <= y || + (rgn->rects[i].top <= y && rgn->rects[i].right <= x)) + start = i + 1; + else if (rgn->rects[i].top > y || + (rgn->rects[i].bottom > y && rgn->rects[i].left > x)) + end = i - 1; + else + { + h = TRUE; + break; + } + } + + if (hit) *hit = h; + return h ? i : start; +} + /* null driver entry points */ extern BOOL nulldrv_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst,

1 0