January 2012 - Wine-Commits

Alistair Leslie-Hughes : jscript: ActiveX objects might not support IServiceProvider Interface.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: ae46ad83a5d69101f9f8ab2db5f78a0f742e684f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae46ad83a5d69101f9f8ab2db… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 23 12:21:23 2012 +1100 jscript: ActiveX objects might not support IServiceProvider Interface. --- dlls/jscript/jscript.c | 13 ++++++++++--- dlls/jscript/tests/activex.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index be225b7..68ace36 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -287,7 +287,12 @@ static ULONG WINAPI AXSite_Release(IServiceProvider *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) + { + if(This->sp) + IServiceProvider_Release(This->sp); + heap_free(This); + } return ref; } @@ -299,6 +304,9 @@ static HRESULT WINAPI AXSite_QueryService(IServiceProvider *iface, TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + if(!This->sp) + return E_NOINTERFACE; + return IServiceProvider_QueryService(This->sp, guidService, riid, ppv); } @@ -311,14 +319,13 @@ static IServiceProviderVtbl AXSiteVtbl = { IUnknown *create_ax_site(script_ctx_t *ctx) { - IServiceProvider *sp; + IServiceProvider *sp = NULL; AXSite *ret; HRESULT hres; hres = IActiveScriptSite_QueryInterface(ctx->site, &IID_IServiceProvider, (void**)&sp); if(FAILED(hres)) { - ERR("Could not get IServiceProvider iface: %08x\n", hres); - return NULL; + TRACE("Could not get IServiceProvider iface: %08x\n", hres); } ret = heap_alloc(sizeof(AXSite)); diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c index 4e0fcf5..1508ca0 100644 --- a/dlls/jscript/tests/activex.c +++ b/dlls/jscript/tests/activex.c @@ -80,6 +80,7 @@ static DWORD QueryCustomPolicy_psize; static DWORD QueryCustomPolicy_policy; static HRESULT QI_IDispatch_hres; static HRESULT SetSite_hres; +static BOOL AllowIServiceProvider; #define TESTOBJ_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80646}" @@ -575,7 +576,7 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, *ppv = iface; }else if(IsEqualGUID(&IID_IActiveScriptSite, riid)) { *ppv = iface; - }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { + }else if(IsEqualGUID(&IID_IServiceProvider, riid) && AllowIServiceProvider) { *ppv = &ServiceProvider; }else { *ppv = NULL; @@ -718,6 +719,7 @@ static IActiveScriptParse *create_script(BOOL skip_tests, BOOL use_sec_mgr) QueryCustomPolicy_policy = URLPOLICY_ALLOW; QI_IDispatch_hres = S_OK; SetSite_hres = S_OK; + AllowIServiceProvider = TRUE; hres = CoCreateInstance(&CLSID_JScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IActiveScript, (void**)&script); @@ -1032,6 +1034,31 @@ static void test_ActiveXObject(void) CHECK_CALLED(SetSite); IUnknown_Release(parser); + + /* No IServiceProvider Interface */ + parser = create_script(FALSE, FALSE); + object_with_site = &ObjectWithSite; + AllowIServiceProvider = FALSE; + + SET_EXPECT(CreateInstance); + SET_EXPECT(QI_IObjectWithSite); + SET_EXPECT(reportSuccess); + SET_EXPECT(SetSite); + parse_script_a(parser, "(new ActiveXObject('Wine.Test')).reportSuccess();"); + CHECK_CALLED(CreateInstance); + CHECK_CALLED(QI_IObjectWithSite); + CHECK_CALLED(reportSuccess); + CHECK_CALLED(SetSite); + + IUnknown_Release(parser); + + parser = create_script(FALSE, TRUE); + object_with_site = &ObjectWithSite; + AllowIServiceProvider = FALSE; + + parse_script_a(parser, "testException(function() { new ActiveXObject('Wine.Test'); }, 'Error', -2146827859);"); + + IUnknown_Release(parser); } static BOOL init_key(const char *key_name, const char *def_value, BOOL init)

1 0

Alexandre Julliard : ddraw: AddRef the correct interface pointer in AddAttachedSurface.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: 5f42f7d4fa5999add7f225c46580ba7335f9f26d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f42f7d4fa5999add7f225c46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 21:38:24 2012 +0100 ddraw: AddRef the correct interface pointer in AddAttachedSurface. --- dlls/ddraw/surface.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 46c28be..f4a4d56 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1605,7 +1605,7 @@ static HRESULT WINAPI ddraw_surface7_AddAttachedSurface(IDirectDrawSurface7 *ifa { return hr; } - ddraw_surface7_AddRef(attachment); + ddraw_surface7_AddRef(&attachment_impl->IDirectDrawSurface7_iface); attachment_impl->attached_iface = (IUnknown *)attachment; return hr; } @@ -1624,7 +1624,7 @@ static HRESULT WINAPI ddraw_surface4_AddAttachedSurface(IDirectDrawSurface4 *ifa { return hr; } - ddraw_surface4_AddRef(attachment); + ddraw_surface4_AddRef(&attachment_impl->IDirectDrawSurface4_iface); ddraw_surface7_Release(&attachment_impl->IDirectDrawSurface7_iface); attachment_impl->attached_iface = (IUnknown *)attachment; return hr; @@ -1670,7 +1670,7 @@ static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *ifa { return hr; } - ddraw_surface3_AddRef(attachment); + ddraw_surface3_AddRef(&attachment_impl->IDirectDrawSurface3_iface); attachment_impl->attached_iface = (IUnknown *)attachment; return hr; } @@ -1689,7 +1689,7 @@ static HRESULT WINAPI ddraw_surface2_AddAttachedSurface(IDirectDrawSurface2 *ifa { return hr; } - ddraw_surface2_AddRef(attachment); + ddraw_surface2_AddRef(&attachment_impl->IDirectDrawSurface2_iface); ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); attachment_impl->attached_iface = (IUnknown *)attachment; return hr; @@ -1709,7 +1709,7 @@ static HRESULT WINAPI ddraw_surface1_AddAttachedSurface(IDirectDrawSurface *ifac { return hr; } - ddraw_surface1_AddRef(attachment); + ddraw_surface1_AddRef(&attachment_impl->IDirectDrawSurface_iface); ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); attachment_impl->attached_iface = (IUnknown *)attachment; return hr;

1 0

Alexandre Julliard : tools: Assume that FreeType supports FT_Load_Sfnt_Table.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: 67771c59213bb105d2174d03ce6ec9551b860611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67771c59213bb105d2174d03c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 13:53:40 2012 +0100 tools: Assume that FreeType supports FT_Load_Sfnt_Table. --- tools/sfnt2fnt.c | 36 ++---------------------------------- 1 files changed, 2 insertions(+), 34 deletions(-) diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index d83d2be..df43ec0 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -40,9 +40,6 @@ #include FT_SFNT_NAMES_H #include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TAGS_H -#ifdef HAVE_FREETYPE_INTERNAL_SFNT_H -#include <freetype/internal/sfnt.h> -#endif #include "wine/unicode.h" #include "wingdi.h" @@ -332,35 +329,6 @@ static int get_char(const union cptable *cptable, int enc, int index) return cptable->sbcs.cp2uni[index]; } -/* from gdi32/freetype.c */ -static FT_Error load_sfnt_table(FT_Face ft_face, FT_ULong table, FT_Long offset, FT_Byte *buf, FT_ULong *len) -{ - - FT_Error err; - - /* If the FT_Load_Sfnt_Table function is there we'll use it */ -#ifdef HAVE_FT_LOAD_SFNT_TABLE - err = FT_Load_Sfnt_Table(ft_face, table, offset, buf, len); -#elif defined(HAVE_FREETYPE_INTERNAL_SFNT_H) - TT_Face tt_face = (TT_Face) ft_face; - SFNT_Interface *sfnt; - if (FT_Version.major==2 && FT_Version.minor==0) - { - /* 2.0.x */ - sfnt = *(SFNT_Interface**)((char*)tt_face + 528); - } - else - { - /* A field was added in the middle of the structure in 2.1.x */ - sfnt = *(SFNT_Interface**)((char*)tt_face + 532); - } - err = sfnt->load_any(tt_face, table, offset, buf, len); -#else - err = FT_Err_Unimplemented_Feature; -#endif - return err; -} - static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, int dpi, unsigned char def_char, int avg_width ) { @@ -398,12 +366,12 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, assert( face->size->metrics.y_ppem == ppem ); needed = 0; - if (load_sfnt_table(face, TTAG_EBLC, 0, NULL, &needed)) + if (FT_Load_Sfnt_Table(face, TTAG_EBLC, 0, NULL, &needed)) fprintf(stderr,"Can't find EBLC table\n"); else { eblc = malloc(needed); - load_sfnt_table(face, TTAG_EBLC, 0, (FT_Byte *)eblc, &needed); + FT_Load_Sfnt_Table(face, TTAG_EBLC, 0, (FT_Byte *)eblc, &needed); num_sizes = GET_BE_DWORD(&eblc->numSizes);

1 0

Christian Costa : d3dxof: Fix object leak in error path by calling Release method which does all the work and simplify some inits for better readability .
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: 096e3063000609fbe8aa9f7a6afd088bc0bee009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=096e3063000609fbe8aa9f7a6… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jan 23 21:37:32 2012 +0100 d3dxof: Fix object leak in error path by calling Release method which does all the work and simplify some inits for better readability. --- dlls/d3dxof/d3dxof.c | 47 +++++++++++++++++++++-------------------------- 1 files changed, 21 insertions(+), 26 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 3a6ce20..38882a8 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -940,7 +940,6 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE IDirectXFileEnumObjectImpl *This = impl_from_IDirectXFileEnumObject(iface); IDirectXFileDataImpl* object; HRESULT hr; - LPBYTE pstrings = NULL; TRACE("(%p/%p)->(%p)\n", This, iface, ppDataObj); @@ -963,33 +962,36 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE if (FAILED(hr)) return hr; - This->buf.pxo_globals = This->xobjects; - This->buf.nb_pxo_globals = This->nb_xobjects; - This->buf.level = 0; - This->buf.pdata = NULL; - This->buf.capacity = 0; - This->buf.cur_pos_data = 0; - - This->buf.pxo_tab = HeapAlloc(GetProcessHeap(), 0, sizeof(xobject)*MAX_SUBOBJECTS); - if (!This->buf.pxo_tab) + object->pobj = HeapAlloc(GetProcessHeap(), 0, sizeof(xobject)*MAX_SUBOBJECTS); + if (!object->pobj) { ERR("Out of memory\n"); hr = DXFILEERR_BADALLOC; goto error; } - This->buf.pxo = This->xobjects[This->nb_xobjects] = This->buf.pxo_tab; - This->buf.pxo->pdata = NULL; - This->buf.pxo->nb_subobjects = 1; - - pstrings = HeapAlloc(GetProcessHeap(), 0, MAX_STRINGS_BUFFER); - if (!pstrings) + object->pstrings = HeapAlloc(GetProcessHeap(), 0, MAX_STRINGS_BUFFER); + if (!object->pstrings) { ERR("Out of memory\n"); hr = DXFILEERR_BADALLOC; goto error; } - This->buf.cur_pstrings = This->buf.pstrings = object->pstrings = pstrings; + + object->cur_enum_object = 0; + object->level = 0; + object->from_ref = FALSE; + + This->buf.pxo_globals = This->xobjects; + This->buf.nb_pxo_globals = This->nb_xobjects; + This->buf.level = 0; + This->buf.pdata = NULL; + This->buf.capacity = 0; + This->buf.cur_pos_data = 0; + This->buf.cur_pstrings = This->buf.pstrings = object->pstrings; + This->buf.pxo = This->xobjects[This->nb_xobjects] = This->buf.pxo_tab = object->pobj; + This->buf.pxo->pdata = NULL; + This->buf.pxo->nb_subobjects = 1; if (!parse_object(&This->buf)) { @@ -998,12 +1000,6 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE goto error; } - object->pstrings = pstrings; - object->pobj = This->buf.pxo; - object->cur_enum_object = 0; - object->level = 0; - object->from_ref = FALSE; - *ppDataObj = (LPDIRECTXFILEDATA)object; /* Get a reference to created object */ @@ -1016,9 +1012,8 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE error: - HeapFree(GetProcessHeap(), 0, This->buf.pxo_tab); - HeapFree(GetProcessHeap(), 0, This->buf.pdata); - HeapFree(GetProcessHeap(), 0, pstrings); + IDirectXFileData_Release(&object->IDirectXFileData_iface); + *ppDataObj = NULL; return hr; }

1 0

Jacek Caban : ieframe: Fixed a typo in IDocObjectService:: FireNavigateComplete2.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: 1f03cbf2817dd48981f540b5b83cac0c4dea3bd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f03cbf2817dd48981f540b5b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 25 13:59:06 2012 +0100 ieframe: Fixed a typo in IDocObjectService::FireNavigateComplete2. --- dlls/ieframe/shellbrowser.c | 2 +- dlls/ieframe/tests/webbrowser.c | 24 +++++++++++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 86bba68..f9bbc29 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -748,7 +748,7 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( set_dochost_url(This->doc_host, url); V_VT(params) = (VT_BYREF|VT_VARIANT); - V_BYREF(params) = &url; + V_VARIANTREF(params) = &url_var; V_VT(params+1) = VT_DISPATCH; V_DISPATCH(params+1) = (IDispatch*)This->doc_host->wb; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 3b3d133..443834c 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -768,6 +768,26 @@ static void test_OnBeforeNavigate(const VARIANT *disp, const VARIANT *url, const *V_BOOLREF(cancel)); } +static void test_navigatecomplete2(DISPPARAMS *dp) +{ + VARIANT *v; + + CHECK_EXPECT(Invoke_NAVIGATECOMPLETE2); + + ok(dp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(dp->cArgs == 2, "cArgs=%d, expected 2\n", dp->cArgs); + + ok(V_VT(dp->rgvarg) == (VT_BYREF|VT_VARIANT), "V_VT(dp->rgvarg) = %d\n", V_VT(dp->rgvarg)); + v = V_VARIANTREF(dp->rgvarg); + ok(V_VT(v) == VT_BSTR, "V_VT(url) = %d\n", V_VT(v)); + ok(!strcmp_wa(V_BSTR(v), current_url), "url=%s, expected %s\n", wine_dbgstr_w(V_BSTR(v)), current_url); + + ok(V_VT(dp->rgvarg+1) == VT_DISPATCH, "V_VT(dp->rgvarg+1) = %d\n", V_VT(dp->rgvarg+1)); + ok(V_DISPATCH(dp->rgvarg+1) == (IDispatch*)wb, "V_DISPATCH=%p, wb=%p\n", V_DISPATCH(dp->rgvarg+1), wb); + + test_ready_state((dwl_flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); +} + static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) @@ -896,9 +916,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe break; case DISPID_NAVIGATECOMPLETE2: - CHECK_EXPECT(Invoke_NAVIGATECOMPLETE2); - /* FIXME */ - test_ready_state((dwl_flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); + test_navigatecomplete2(pDispParams); break; case DISPID_PROGRESSCHANGE:

1 0

Jacek Caban : ieframe: Fixed a typo in IDocObjectService:: FireDocumentComplete.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: a031473b1f87b67fbe94d751a610e85e2badaae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a031473b1f87b67fbe94d751a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 25 16:56:31 2012 +0100 ieframe: Fixed a typo in IDocObjectService::FireDocumentComplete. --- dlls/ieframe/shellbrowser.c | 2 +- dlls/ieframe/tests/webbrowser.c | 24 +++++++++++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index f9bbc29..91a3bf6 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -809,7 +809,7 @@ static HRESULT WINAPI DocObjectService_FireDocumentComplete( TRACE("got URL %s\n", debugstr_w(url)); V_VT(params) = (VT_BYREF|VT_VARIANT); - V_BYREF(params) = &url; + V_VARIANTREF(params) = &url_var; V_VT(params+1) = VT_DISPATCH; V_DISPATCH(params+1) = (IDispatch*)This->doc_host->wb; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 443834c..e97cf3f 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -788,6 +788,26 @@ static void test_navigatecomplete2(DISPPARAMS *dp) test_ready_state((dwl_flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); } +static void test_documentcomplete(DISPPARAMS *dp) +{ + VARIANT *v; + + CHECK_EXPECT(Invoke_DOCUMENTCOMPLETE); + + ok(dp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(dp->cArgs == 2, "cArgs=%d, expected 2\n", dp->cArgs); + + ok(V_VT(dp->rgvarg) == (VT_BYREF|VT_VARIANT), "V_VT(dp->rgvarg) = %d\n", V_VT(dp->rgvarg)); + v = V_VARIANTREF(dp->rgvarg); + ok(V_VT(v) == VT_BSTR, "V_VT(url) = %d\n", V_VT(v)); + ok(!strcmp_wa(V_BSTR(v), current_url), "url=%s, expected %s\n", wine_dbgstr_w(V_BSTR(v)), current_url); + + ok(V_VT(dp->rgvarg+1) == VT_DISPATCH, "V_VT(dp->rgvarg+1) = %d\n", V_VT(dp->rgvarg+1)); + ok(V_DISPATCH(dp->rgvarg+1) == (IDispatch*)wb, "V_DISPATCH=%p, wb=%p\n", V_DISPATCH(dp->rgvarg+1), wb); + + test_ready_state(READYSTATE_COMPLETE); +} + static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) @@ -925,9 +945,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe break; case DISPID_DOCUMENTCOMPLETE: - CHECK_EXPECT(Invoke_DOCUMENTCOMPLETE); - /* FIXME */ - test_ready_state(READYSTATE_COMPLETE); + test_documentcomplete(pDispParams); break; case 282: /* FIXME */

1 0

Andrew Eikum : wineoss.drv: Use GETODELAY instead of GETOSPACE to determine device position.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: 2c628af7b2559d6dbe592c1ed3403eb267f85a04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c628af7b2559d6dbe592c1ed… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jan 25 11:14:13 2012 -0600 wineoss.drv: Use GETODELAY instead of GETOSPACE to determine device position. --- dlls/wineoss.drv/mmdevdrv.c | 43 ++++++++++++++++++++++++++++++++----------- 1 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 971c96e..0900231 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -115,7 +115,7 @@ struct ACImpl { char devnode[OSS_DEVNODE_SIZE]; BOOL initted, playing; - UINT64 written_frames; + UINT64 written_frames, last_pos_frames; UINT32 period_us, period_frames, bufsize_frames, held_frames, tmp_buffer_frames; UINT32 oss_bufsize_bytes, lcl_offs_frames; /* offs into local_buffer where valid data starts */ @@ -1454,6 +1454,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) } This->lcl_offs_frames = 0; This->held_frames = 0; + This->last_pos_frames = 0; LeaveCriticalSection(&This->lock); @@ -1953,8 +1954,7 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, UINT64 *qpctime) { ACImpl *This = impl_from_IAudioClock(iface); - UINT32 pad; - HRESULT hr; + int delay; TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); @@ -1963,16 +1963,37 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, EnterCriticalSection(&This->lock); - hr = IAudioClient_GetCurrentPadding(&This->IAudioClient_iface, &pad); - if(FAILED(hr)){ - LeaveCriticalSection(&This->lock); - return hr; + if(This->dataflow == eRender){ + if(!This->playing || !This->held_frames || + ioctl(This->fd, SNDCTL_DSP_GETODELAY, &delay) < 0) + delay = 0; + else + delay /= This->fmt->nBlockAlign; + if(This->held_frames + delay >= This->written_frames) + *pos = This->last_pos_frames; + else{ + *pos = This->written_frames - This->held_frames - delay; + if(*pos < This->last_pos_frames) + *pos = This->last_pos_frames; + } + }else if(This->dataflow == eCapture){ + audio_buf_info bi; + UINT32 held; + + if(ioctl(This->fd, SNDCTL_DSP_GETISPACE, &bi) < 0){ + TRACE("GETISPACE failed: %d (%s)\n", errno, strerror(errno)); + held = 0; + }else{ + if(bi.bytes <= bi.fragsize) + held = 0; + else + held = bi.bytes / This->fmt->nBlockAlign; + } + + *pos = This->written_frames + held; } - if(This->dataflow == eRender) - *pos = This->written_frames - pad; - else if(This->dataflow == eCapture) - *pos = This->written_frames + pad; + This->last_pos_frames = *pos; LeaveCriticalSection(&This->lock);

1 0

Andrew Eikum : wineoss.drv: Fix buffer offset calculation.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: 6d3e784d5711ba705c5b2cd165097d64761291cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3e784d5711ba705c5b2cd16… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jan 25 11:14:36 2012 -0600 wineoss.drv: Fix buffer offset calculation. --- dlls/wineoss.drv/mmdevdrv.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 0900231..650c46d 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1825,7 +1825,6 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, if(This->lcl_offs_frames + *frames > This->bufsize_frames){ UINT32 chunk_bytes, offs_bytes, frames_bytes; if(This->tmp_buffer_frames < *frames){ - if(This->tmp_buffer) HeapFree(GetProcessHeap(), 0, This->tmp_buffer); This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, *frames * This->fmt->nBlockAlign); @@ -1842,7 +1841,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, offs_bytes = This->lcl_offs_frames * This->fmt->nBlockAlign; frames_bytes = *frames * This->fmt->nBlockAlign; memcpy(This->tmp_buffer, This->local_buffer + offs_bytes, chunk_bytes); - memcpy(This->tmp_buffer, This->local_buffer, + memcpy(This->tmp_buffer + chunk_bytes, This->local_buffer, frames_bytes - chunk_bytes); }else *data = This->local_buffer +

1 0

Francois Gouget : programs: Standardize references to the <Enter> key.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

1 0

Alex Henrie : comdlg32: Correctly handle filters with invalid extensions in Save As dialogs.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: f0b274bada9c4602e90b41c389067c9bd44bceea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b274bada9c4602e90b41c38… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 24 14:34:43 2012 -0700 comdlg32: Correctly handle filters with invalid extensions in Save As dialogs. --- dlls/comdlg32/filedlg.c | 25 ++++++++++++++----------- dlls/comdlg32/tests/filedlg.c | 1 + 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index c31641b..0fd9644 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2549,24 +2549,27 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) if (lpstrFilter != (LPWSTR)CB_ERR) /* control is not empty */ { - WCHAR* filterAtSemicolon; - filterExt = HeapAlloc(GetProcessHeap(), 0, lstrlenW(lpstrFilter) * sizeof(WCHAR) + sizeof(WCHAR)); + WCHAR* filterSearchIndex; + filterExt = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(lpstrFilter) + 1) * sizeof(WCHAR)); strcpyW(filterExt, lpstrFilter); /* if a semicolon-separated list of file extensions was given, do not include the semicolon or anything after it in the extension. example: if filterExt was "*.abc;*.def", it will become "*.abc" */ - filterAtSemicolon = strchrW(filterExt, ';'); - if (filterAtSemicolon) + filterSearchIndex = strchrW(filterExt, ';'); + if (filterSearchIndex) { - filterAtSemicolon[0] = '\0'; + filterSearchIndex[0] = '\0'; } /* strip the * or anything else from the extension, "*.abc" becomes "abc" */ - strcpyW(filterExt, PathFindExtensionW(filterExt) + 1); - - /* if the extension contains a glob, ignore it */ - if (strchrW(filterExt, '*') || strchrW(filterExt, '?')) + /* if the extension is invalid or contains a glob, ignore it */ + filterSearchIndex = PathFindExtensionW(filterExt); + if (*filterSearchIndex++ && !strchrW(filterSearchIndex, '*') && !strchrW(filterSearchIndex, '?')) + { + strcpyW(filterExt, filterSearchIndex); + } + else { HeapFree(GetProcessHeap(), 0, filterExt); filterExt = NULL; @@ -2576,7 +2579,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) if (!filterExt) { /* use the default file extension */ - filterExt = HeapAlloc(GetProcessHeap(), 0, lstrlenW(fodInfos->defext) * sizeof(WCHAR) + sizeof(WCHAR)); + filterExt = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(fodInfos->defext) + 1) * sizeof(WCHAR)); strcpyW(filterExt, fodInfos->defext); } @@ -2585,7 +2588,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) /* Attach the dot*/ lstrcatW(lpstrPathAndFile, szwDot); /* Attach the extension */ - lstrcatW(lpstrPathAndFile, filterExt ); + lstrcatW(lpstrPathAndFile, filterExt); } HeapFree(GetProcessHeap(), 0, filterExt); diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 0d1112f..b1c1e76 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1086,6 +1086,7 @@ static void test_extension(void) "TestFilter (*.pt*;*.abc)\0*.pt*;*.abc\0", "TestFilter (*.ab?)\0*.ab?\0", "TestFilter (*.*)\0*.*\0", + "TestFilter (*sav)\0*sav\0", NULL /* is a test, not an endmark! */ };

1 0