December 2010 - Wine-Commits

Maarten Lankhorst : Revert "quartz: Fill up sound buffer while in paused state.".
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: master Commit: 97215773d171b08f7b2a21d22945a6c9c8b6e7f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97215773d171b08f7b2a21d22… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 1 23:17:28 2010 +0100 Revert "quartz: Fill up sound buffer while in paused state.". This reverts commit e591700177ce80b0a0598a9a756111c5342ae554. It's not fixing the real issue, filling up buffer while paused is actually capable of producing quite a few headaches to get it working right. --- dlls/quartz/dsoundrender.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index a26bd12..c0591ba 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -146,9 +146,7 @@ static HRESULT DSoundRender_GetWritePos(DSoundRenderImpl *This, DWORD *ret_write DSoundRender_UpdatePositions(This, &writepos, &min_writepos); playpos = This->last_playpos; - if (This->filter.state == State_Paused) { - write_at = cur = -1; - } else if (This->filter.pClock == (IReferenceClock*)&This->IReferenceClock_vtbl) { + if (This->filter.pClock == (IReferenceClock*)&This->IReferenceClock_vtbl) { max_lag = min_lag; cur = This->play_time + time_from_pos(This, playpos); cur -= This->filter.rtStreamStart; @@ -228,10 +226,12 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, REFERENCE_TIM DWORD writepos, skip = 0, free, size1, size2, ret; BYTE *buf1, *buf2; - hr = DSoundRender_GetWritePos(This, &writepos, tStart, &free, &skip); + if (This->filter.state == State_Running) + hr = DSoundRender_GetWritePos(This, &writepos, tStart, &free, &skip); + else + hr = S_FALSE; if (hr != S_OK) { - SetEvent(This->state_change); This->in_loop = 1; LeaveCriticalSection(&This->filter.csFilter); ret = WaitForSingleObject(This->blocked, 10); @@ -251,7 +251,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, REFERENCE_TIM if (skip) FIXME("Sample dropped %u of %u bytes\n", skip, size); if (skip >= size) - break; + return S_OK; data += skip; size -= skip; @@ -362,6 +362,7 @@ static HRESULT WINAPI DSoundRender_Receive(BaseInputPin *pin, IMediaSample * pSa cbSrcStream = IMediaSample_GetActualDataLength(pSample); TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream); + SetEvent(This->state_change); hr = DSoundRender_SendSampleData(This, tStart, tStop, pbSrcStream, cbSrcStream); LeaveCriticalSection(&This->filter.csFilter); return hr;

1 0

Maarten Lankhorst : quartz: Allow stream time to go negative in sound renderer.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: master Commit: 072714f91019725bb3d20a2307cdd33947c25c48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=072714f91019725bb3d20a230… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 1 23:17:29 2010 +0100 quartz: Allow stream time to go negative in sound renderer. --- dlls/quartz/dsoundrender.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index c0591ba..903d181 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -154,13 +154,13 @@ static HRESULT DSoundRender_GetWritePos(DSoundRenderImpl *This, DWORD *ret_write IReferenceClock_GetTime(This->filter.pClock, &cur); cur -= This->filter.rtStreamStart; } else - cur = -1; + write_at = -1; if (writepos == min_writepos) max_lag = 0; *skip = 0; - if (cur < 0 || write_at < 0) { + if (write_at < 0) { *ret_writepos = writepos; goto end; }

1 0

Jacek Caban : mshtml: Improved error handling in HTMLElement_Create calls.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: master Commit: a8b94a0377fb56da55b83d0fd2a2a0e988ca454e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b94a0377fb56da55b83d0fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 1 22:42:51 2010 +0100 mshtml: Improved error handling in HTMLElement_Create calls. --- dlls/mshtml/htmldoc.c | 4 +++- dlls/mshtml/htmlelem.c | 38 +++++++++++++++++++++++++------------- dlls/mshtml/htmlgeneric.c | 7 +++++-- dlls/mshtml/htmlimg.c | 9 ++++----- dlls/mshtml/htmlnode.c | 9 +++++++-- dlls/mshtml/mshtml_private.h | 4 ++-- 6 files changed, 46 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 6243ece..e9a0cd6 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -996,8 +996,10 @@ static HRESULT WINAPI HTMLDocument_createElement(IHTMLDocument2 *iface, BSTR eTa if(FAILED(hres)) return hres; - elem = HTMLElement_Create(This->doc_node, (nsIDOMNode*)nselem, TRUE); + hres = HTMLElement_Create(This->doc_node, (nsIDOMNode*)nselem, TRUE, &elem); nsIDOMHTMLElement_Release(nselem); + if(FAILED(hres)) + return hres; *newElem = HTMLELEM(elem); IHTMLElement_AddRef(HTMLELEM(elem)); diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index a1d774d..af60a2b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1666,10 +1666,13 @@ HRESULT HTMLElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode ** { HTMLElement *This = HTMLELEM_NODE_THIS(iface); HTMLElement *new_elem; + HRESULT hres; - new_elem = HTMLElement_Create(This->node.doc, nsnode, FALSE); - IHTMLElement_AddRef(HTMLELEM(new_elem)); + hres = HTMLElement_Create(This->node.doc, nsnode, FALSE, &new_elem); + if(FAILED(hres)) + return hres; + IHTMLElement_AddRef(HTMLELEM(new_elem)); *ret = &new_elem->node; return S_OK; } @@ -1718,19 +1721,19 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMHTMLElemen ConnectionPointContainer_Init(&This->cp_container, (IUnknown*)HTMLELEM(This)); } -HTMLElement *HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_generic) +HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_generic, HTMLElement **ret) { nsIDOMHTMLElement *nselem; - HTMLElement *ret = NULL; nsAString class_name_str; const PRUnichar *class_name; const tag_desc_t *tag; + HTMLElement *elem; nsresult nsres; - + HRESULT hres; nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMHTMLElement, (void**)&nselem); if(NS_FAILED(nsres)) - return NULL; + return E_FAIL; nsAString_Init(&class_name_str, NULL); nsIDOMHTMLElement_GetTagName(nselem, &class_name_str); @@ -1739,21 +1742,30 @@ HTMLElement *HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL tag = get_tag_desc(class_name); if(tag) { - ret = tag->constructor(doc, nselem); + elem = tag->constructor(doc, nselem); + hres = elem ? S_OK : E_OUTOFMEMORY; }else if(use_generic) { - ret = HTMLGenericElement_Create(doc, nselem); + hres = HTMLGenericElement_Create(doc, nselem, &elem); }else { - ret = heap_alloc_zero(sizeof(HTMLElement)); - HTMLElement_Init(ret, doc, nselem, &HTMLElement_dispex); - ret->node.vtbl = &HTMLElementImplVtbl; + elem = heap_alloc_zero(sizeof(HTMLElement)); + if(elem) { + HTMLElement_Init(elem, doc, nselem, &HTMLElement_dispex); + elem->node.vtbl = &HTMLElementImplVtbl; + hres = S_OK; + }else { + hres = E_OUTOFMEMORY; + } } - TRACE("%s ret %p\n", debugstr_w(class_name), ret); + TRACE("%s ret %p\n", debugstr_w(class_name), elem); nsIDOMElement_Release(nselem); nsAString_Finish(&class_name_str); + if(FAILED(hres)) + return hres; - return ret; + *ret = elem; + return S_OK; } /* interface IHTMLFiltersCollection */ diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index 1580929..119f366 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -166,16 +166,19 @@ static dispex_static_data_t HTMLGenericElement_dispex = { HTMLGenericElement_iface_tids }; -HTMLElement *HTMLGenericElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) +HRESULT HTMLGenericElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement **elem) { HTMLGenericElement *ret; ret = heap_alloc_zero(sizeof(HTMLGenericElement)); + if(!ret) + return E_OUTOFMEMORY; ret->lpHTMLGenericElementVtbl = &HTMLGenericElementVtbl; ret->element.node.vtbl = &HTMLGenericElementImplVtbl; HTMLElement_Init(&ret->element, doc, nselem, &HTMLGenericElement_dispex); - return &ret->element; + *elem = &ret->element; + return S_OK; } diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index b0ec04e..5cc02ea 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -820,10 +820,11 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i if(FAILED(hres)) return hres; - elem = HTMLElement_Create(This->window->doc, (nsIDOMNode*)nselem, FALSE); - if(!elem) { + hres = HTMLElement_Create(This->window->doc, (nsIDOMNode*)nselem, FALSE, &elem); + nsIDOMHTMLElement_Release(nselem); + if(FAILED(hres)) { ERR("HTMLElement_Create failed\n"); - return E_FAIL; + return hres; } hres = IHTMLElement_QueryInterface(HTMLELEM(elem), &IID_IHTMLImgElement, (void**)&img); @@ -832,8 +833,6 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i return hres; } - nsIDOMHTMLElement_Release(nselem); - l = var_to_size(&width); if(l) IHTMLImgElement_put_width(img, l); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index aa1f55d..fd496b9 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1001,9 +1001,14 @@ static HRESULT create_node(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDOMNod nsIDOMNode_GetNodeType(nsnode, &node_type); switch(node_type) { - case ELEMENT_NODE: - *ret = &HTMLElement_Create(doc, nsnode, FALSE)->node; + case ELEMENT_NODE: { + HTMLElement *elem; + hres = HTMLElement_Create(doc, nsnode, FALSE, &elem); + if(FAILED(hres)) + return hres; + *ret = &elem->node; break; + } case TEXT_NODE: hres = HTMLDOMTextNode_Create(doc, nsnode, ret); if(FAILED(hres)) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b8ffffe..53f2e87 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -820,7 +820,7 @@ HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**); HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**); -HTMLElement *HTMLElement_Create(HTMLDocumentNode*,nsIDOMNode*,BOOL); +HRESULT HTMLElement_Create(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLElement**); HRESULT HTMLCommentElement_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLElement**); HTMLElement *HTMLAnchorElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLBodyElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); @@ -838,7 +838,7 @@ HTMLElement *HTMLSelectElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLTable_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLTableRow_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLTextAreaElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); -HTMLElement *HTMLGenericElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); +HRESULT HTMLGenericElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**); void HTMLDOMNode_Init(HTMLDocumentNode*,HTMLDOMNode*,nsIDOMNode*); void HTMLElement_Init(HTMLElement*,HTMLDocumentNode*,nsIDOMHTMLElement*,dispex_static_data_t*);

1 0

Henri Verbeet : wined3d: Remove a redundant parameter to enable_extension() .
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: master Commit: 00550613e7fecfa9058a3ca816bdb1867f2da1ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=00550613e7fecfa9058a3ca81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 1 20:50:45 2010 +0100 wined3d: Remove a redundant parameter to enable_extension(). --- dlls/wined3d/arb_program_shader.c | 3 ++- dlls/wined3d/ati_fragment_shader.c | 3 ++- dlls/wined3d/context.c | 11 +++++------ dlls/wined3d/nvidia_texture_shader.c | 5 +++-- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bdc4023..efc0ab0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5447,7 +5447,8 @@ struct arbfp_ffp_desc }; /* Context activation is done by the caller. */ -static void arbfp_enable(IWineD3DDevice *iface, BOOL enable) { +static void arbfp_enable(BOOL enable) +{ ENTER_GL(); if(enable) { glEnable(GL_FRAGMENT_PROGRAM_ARB); diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 35838e1..8ea0cd5 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1054,7 +1054,8 @@ static const struct StateEntryTemplate atifs_fragmentstate_template[] = { }; /* Context activation is done by the caller. */ -static void atifs_enable(IWineD3DDevice *iface, BOOL enable) { +static void atifs_enable(BOOL enable) +{ ENTER_GL(); if(enable) { glEnable(GL_FRAGMENT_SHADER_ATI); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f8f5b17..d8988f8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1572,7 +1572,7 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, LEAVE_GL(); - device->frag_pipe->enable_extension((IWineD3DDevice *)device, TRUE); + device->frag_pipe->enable_extension(TRUE); TRACE("Created context %p.\n", ret); @@ -1840,8 +1840,7 @@ static void SetupForBlit(IWineD3DDeviceImpl *This, struct wined3d_context *conte Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable); - - This->frag_pipe->enable_extension((IWineD3DDevice *) This, FALSE); + This->frag_pipe->enable_extension(FALSE); } /***************************************************************************** @@ -2130,7 +2129,7 @@ void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceIm if (context->last_was_blit) { - device->frag_pipe->enable_extension((IWineD3DDevice *)device, TRUE); + device->frag_pipe->enable_extension(TRUE); } /* Blending and clearing should be orthogonal, but tests on the nvidia @@ -2189,7 +2188,7 @@ void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp if (context->last_was_blit) { - device->frag_pipe->enable_extension((IWineD3DDevice *)device, TRUE); + device->frag_pipe->enable_extension(TRUE); } ENTER_GL(); @@ -2287,7 +2286,7 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *device, IWineD3DSurf if (context != current_context) { if (!context_set_current(context)) ERR("Failed to activate the new context.\n"); - else device->frag_pipe->enable_extension((IWineD3DDevice *)device, !context->last_was_blit); + else device->frag_pipe->enable_extension(!context->last_was_blit); if (context->vshader_const_dirty) { diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 00a51f8..dcf7816 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -621,10 +621,11 @@ static void nvrc_texfactor(DWORD state, IWineD3DStateBlockImpl *stateblock, stru } /* Context activation is done by the caller. */ -static void nvrc_enable(IWineD3DDevice *iface, BOOL enable) { } +static void nvrc_enable(BOOL enable) {} /* Context activation is done by the caller. */ -static void nvts_enable(IWineD3DDevice *iface, BOOL enable) { +static void nvts_enable(BOOL enable) +{ ENTER_GL(); if(enable) { glEnable(GL_TEXTURE_SHADER_NV); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e36bf9a..8c5db84 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -8,7 +8,7 @@ * Copyright 2005 Oliver Stieber * Copyright 2006 Henri Verbeet * Copyright 2006-2008 Stefan Dösinger for CodeWeavers - * Copyright 2009 Henri Verbeet for CodeWeavers + * Copyright 2009-2010 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -5654,7 +5654,7 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = { }; /* Context activation is done by the caller. */ -static void ffp_enable(IWineD3DDevice *iface, BOOL enable) { } +static void ffp_enable(BOOL enable) {} static void ffp_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *pCaps) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b719aa4..e04c71e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1143,7 +1143,7 @@ struct fragment_caps struct fragment_pipeline { - void (*enable_extension)(IWineD3DDevice *iface, BOOL enable); + void (*enable_extension)(BOOL enable); void (*get_caps)(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps); HRESULT (*alloc_private)(IWineD3DDevice *iface); void (*free_private)(IWineD3DDevice *iface);

1 0

Henri Verbeet : wined3d: Remove a unused parameter to shader_dirtifyable_constants().
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: master Commit: f92a0667d796f787d45fbde4fc322f5be2e3eaa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92a0667d796f787d45fbde4f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 1 20:50:44 2010 +0100 wined3d: Remove a unused parameter to shader_dirtifyable_constants(). --- dlls/wined3d/arb_program_shader.c | 3 ++- dlls/wined3d/context.c | 2 +- dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ac2b0c9..bdc4023 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4797,7 +4797,8 @@ static void shader_arb_free(IWineD3DDeviceImpl *device) HeapFree(GetProcessHeap(), 0, device->shader_priv); } -static BOOL shader_arb_dirty_const(IWineD3DDevice *iface) { +static BOOL shader_arb_dirty_const(void) +{ return TRUE; } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index beb57d2..f8f5b17 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1410,7 +1410,7 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, ret->hdc = hdc; ret->pixel_format = pixel_format; - if (device->shader_backend->shader_dirtifyable_constants((IWineD3DDevice *)device)) + if (device->shader_backend->shader_dirtifyable_constants()) { /* Create the dirty constants array and initialize them to dirty */ ret->vshader_const_dirty = HeapAlloc(GetProcessHeap(), 0, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 58bb1b0..8b55eb8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4901,7 +4901,8 @@ static void shader_glsl_free(IWineD3DDeviceImpl *device) device->shader_priv = NULL; } -static BOOL shader_glsl_dirty_const(IWineD3DDevice *iface) { +static BOOL shader_glsl_dirty_const(void) +{ /* TODO: GL_EXT_bindable_uniform can be used to share constants across shaders */ return FALSE; } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1804f58..9eaf89c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1521,7 +1521,7 @@ static void shader_none_load_np2fixup_constants(void *shader_priv, static void shader_none_destroy(IWineD3DBaseShader *iface) {} static HRESULT shader_none_alloc(IWineD3DDeviceImpl *device) {return WINED3D_OK;} static void shader_none_free(IWineD3DDeviceImpl *device) {} -static BOOL shader_none_dirty_const(IWineD3DDevice *iface) {return FALSE;} +static BOOL shader_none_dirty_const(void) {return FALSE;} static void shader_none_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8da99db..b719aa4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -761,7 +761,7 @@ typedef struct { void (*shader_destroy)(IWineD3DBaseShader *iface); HRESULT (*shader_alloc_private)(IWineD3DDeviceImpl *device); void (*shader_free_private)(IWineD3DDeviceImpl *device); - BOOL (*shader_dirtifyable_constants)(IWineD3DDevice *iface); + BOOL (*shader_dirtifyable_constants)(void); void (*shader_get_caps)(const struct wined3d_gl_info *gl_info, struct shader_caps *caps); BOOL (*shader_color_fixup_supported)(struct color_fixup_desc fixup); void (*shader_add_instruction_modifiers)(const struct wined3d_shader_instruction *ins);

1 0

Maarten Lankhorst : quartz: Implement AsyncReader_FindPin.
by Alexandre Julliard Dec. 1, 2010

Dec. 1, 2010

Module: wine Branch: master Commit: 945793722d083185d15101f6b87d466575e3ac8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=945793722d083185d15101f6b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 1 13:14:57 2010 +0100 quartz: Implement AsyncReader_FindPin. --- dlls/quartz/filesource.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 6a59857..d458144 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -489,9 +489,21 @@ static HRESULT WINAPI AsyncReader_Run(IBaseFilter * iface, REFERENCE_TIME tStart static HRESULT WINAPI AsyncReader_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) { - FIXME("(%s, %p)\n", debugstr_w(Id), ppPin); + AsyncReader *This = (AsyncReader *)iface; + TRACE("(%s, %p)\n", debugstr_w(Id), ppPin); + + if (!Id || !ppPin) + return E_POINTER; - return E_NOTIMPL; + if (strcmpW(Id, wszOutputPinName)) + { + *ppPin = NULL; + return VFW_E_NOT_FOUND; + } + + *ppPin = (IPin*)This->pOutputPin; + IUnknown_AddRef(*ppPin); + return S_OK; } static const IBaseFilterVtbl AsyncReader_Vtbl =

1 0

André Hentschel : user32/tests: Skip DDE tests on win9x.
by Alexandre Julliard Dec. 1, 2010

Dec. 1, 2010

Module: wine Branch: master Commit: 7e5da86076cb8b184e100949e427ddef30c5cdfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e5da86076cb8b184e100949e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 30 18:51:57 2010 +0100 user32/tests: Skip DDE tests on win9x. --- dlls/user32/tests/dde.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 529c527..b382240 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2043,12 +2043,6 @@ static void test_DdeCreateStringHandle(void) dde_inst = 0xdeadbeef; SetLastError(0xdeadbeef); ret = DdeInitializeW(&dde_inst, client_ddeml_callback, APPCMD_CLIENTONLY, 0); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("DdeInitializeW is unimplemented\n"); - return; - } - ok(ret == DMLERR_INVALIDPARAMETER, "DdeInitializeW should fail, but got %04x instead\n", ret); ok(DdeGetLastError(dde_inst) == DMLERR_INVALIDPARAMETER, "expected DMLERR_INVALIDPARAMETER\n"); @@ -2696,6 +2690,7 @@ START_TEST(dde) char buffer[MAX_PATH]; STARTUPINFO startup; PROCESS_INFORMATION proc; + DWORD dde_inst = 0xdeadbeef; argc = winetest_get_mainargs(&argv); if (argc == 3) @@ -2714,6 +2709,14 @@ START_TEST(dde) test_initialisation(); + SetLastError(0xdeadbeef); + DdeInitializeW(&dde_inst, client_ddeml_callback, APPCMD_CLIENTONLY, 0); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("Skipping tests on win9x because of brokenness\n"); + return; + } + ZeroMemory(&startup, sizeof(STARTUPINFO)); sprintf(buffer, "%s dde ddeml", argv[0]); startup.cb = sizeof(startup);

1 0

Alexandre Julliard : msxml3: Avoid some uninitialized variable warnings on old gcc.
by Alexandre Julliard Dec. 1, 2010

Dec. 1, 2010

Module: wine Branch: master Commit: 9d9ce2982308977374a4a37101d95bfcc7cef1cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9ce2982308977374a4a3710… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 1 19:45:34 2010 +0100 msxml3: Avoid some uninitialized variable warnings on old gcc. --- dlls/msxml3/msxml_private.h | 42 ++++++++++++------------------------------ 1 files changed, 12 insertions(+), 30 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index ddb3f1c..6dc6cde 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -384,46 +384,28 @@ extern HRESULT XMLDocument_create( IUnknown *pUnkOuter, void **pObj ); extern HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, void **pObj ); extern HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, void **pObj); -static inline const CLSID* DOMDocument_version(const MSXML_VERSION v) +static inline const CLSID* DOMDocument_version(MSXML_VERSION v) { - CLSID const* clsid; switch (v) { - case MSXML_DEFAULT: - clsid = &CLSID_DOMDocument; - break; - case MSXML3: - clsid = &CLSID_DOMDocument30; - break; - case MSXML4: - clsid = &CLSID_DOMDocument40; - break; - case MSXML6: - clsid = &CLSID_DOMDocument60; - break; + default: + case MSXML_DEFAULT: return &CLSID_DOMDocument; + case MSXML3: return &CLSID_DOMDocument30; + case MSXML4: return &CLSID_DOMDocument40; + case MSXML6: return &CLSID_DOMDocument60; } - return clsid; } -static inline const CLSID* SchemaCache_version(const MSXML_VERSION v) +static inline const CLSID* SchemaCache_version(MSXML_VERSION v) { - CLSID const* clsid; switch (v) { - case MSXML_DEFAULT: - clsid = &CLSID_XMLSchemaCache; - break; - case MSXML3: - clsid = &CLSID_XMLSchemaCache30; - break; - case MSXML4: - clsid = &CLSID_XMLSchemaCache40; - break; - case MSXML6: - clsid = &CLSID_XMLSchemaCache60; - break; + default: + case MSXML_DEFAULT: return &CLSID_XMLSchemaCache; + case MSXML3: return &CLSID_XMLSchemaCache30; + case MSXML4: return &CLSID_XMLSchemaCache40; + case MSXML6: return &CLSID_XMLSchemaCache60; } - return clsid; } typedef struct bsc_t bsc_t;

1 0

Maarten Lankhorst : quartz: Increase min_lag.
by Alexandre Julliard Dec. 1, 2010

Dec. 1, 2010

Module: wine Branch: master Commit: 6e69cd4df4e8bc3794271ad5004a59c2c1158f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e69cd4df4e8bc3794271ad50… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 1 13:14:58 2010 +0100 quartz: Increase min_lag. The max_lag variable determines how much fuzz is allowed between the sound cursor and the scheduled times, some filters are inaccurate wrt time and would skip and overwrite data otherwise. --- dlls/quartz/dsoundrender.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index fcc25e7..c0591ba 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -141,7 +141,7 @@ static HRESULT DSoundRender_GetWritePos(DSoundRenderImpl *This, DWORD *ret_write WAVEFORMATEX *wfx = (WAVEFORMATEX*)This->pInputPin->pin.mtCurrent.pbFormat; DWORD writepos, min_writepos, playpos; REFERENCE_TIME max_lag = 50 * 10000; - REFERENCE_TIME min_lag = 1 * 10000; + REFERENCE_TIME min_lag = 25 * 10000; REFERENCE_TIME cur, writepos_t, delta_t; DSoundRender_UpdatePositions(This, &writepos, &min_writepos); @@ -157,7 +157,7 @@ static HRESULT DSoundRender_GetWritePos(DSoundRenderImpl *This, DWORD *ret_write cur = -1; if (writepos == min_writepos) - max_lag = min_lag; + max_lag = 0; *skip = 0; if (cur < 0 || write_at < 0) {

1 0

Maarten Lankhorst : quartz: Fill up sound buffer while in paused state.
by Alexandre Julliard Dec. 1, 2010

Dec. 1, 2010

Module: wine Branch: master Commit: e591700177ce80b0a0598a9a756111c5342ae554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e591700177ce80b0a0598a9a7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 1 13:14:59 2010 +0100 quartz: Fill up sound buffer while in paused state. --- dlls/quartz/dsoundrender.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index c0591ba..a26bd12 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -146,7 +146,9 @@ static HRESULT DSoundRender_GetWritePos(DSoundRenderImpl *This, DWORD *ret_write DSoundRender_UpdatePositions(This, &writepos, &min_writepos); playpos = This->last_playpos; - if (This->filter.pClock == (IReferenceClock*)&This->IReferenceClock_vtbl) { + if (This->filter.state == State_Paused) { + write_at = cur = -1; + } else if (This->filter.pClock == (IReferenceClock*)&This->IReferenceClock_vtbl) { max_lag = min_lag; cur = This->play_time + time_from_pos(This, playpos); cur -= This->filter.rtStreamStart; @@ -226,12 +228,10 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, REFERENCE_TIM DWORD writepos, skip = 0, free, size1, size2, ret; BYTE *buf1, *buf2; - if (This->filter.state == State_Running) - hr = DSoundRender_GetWritePos(This, &writepos, tStart, &free, &skip); - else - hr = S_FALSE; + hr = DSoundRender_GetWritePos(This, &writepos, tStart, &free, &skip); if (hr != S_OK) { + SetEvent(This->state_change); This->in_loop = 1; LeaveCriticalSection(&This->filter.csFilter); ret = WaitForSingleObject(This->blocked, 10); @@ -251,7 +251,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, REFERENCE_TIM if (skip) FIXME("Sample dropped %u of %u bytes\n", skip, size); if (skip >= size) - return S_OK; + break; data += skip; size -= skip; @@ -362,7 +362,6 @@ static HRESULT WINAPI DSoundRender_Receive(BaseInputPin *pin, IMediaSample * pSa cbSrcStream = IMediaSample_GetActualDataLength(pSample); TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream); - SetEvent(This->state_change); hr = DSoundRender_SendSampleData(This, tStart, tStop, pbSrcStream, cbSrcStream); LeaveCriticalSection(&This->filter.csFilter); return hr;

1 0