March 2019 - Wine-Commits - list.winehq.org

Matteo Bruni : d3d9/tests: Fix a CheckDeviceFormat() call.
by Alexandre Julliard March 9, 2019

March 9, 2019

Module: wine Branch: master Commit: c71469be758b6169cd05688126ae4f722e948bc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c71469be758b6169cd056881… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 7 21:15:01 2019 +0100 d3d9/tests: Fix a CheckDeviceFormat() call. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 61a6794..9318610 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1383,7 +1383,7 @@ static void test_clear_different_size_surfaces(void) ok(hr == D3D_OK, "Failed to create render target surface, hr %#x.\n", hr); if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - D3DFMT_A8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_SURFACE, D3DFMT_D16_LOCKABLE))) + D3DFMT_X8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_SURFACE, D3DFMT_D16_LOCKABLE))) { ds_format = D3DFMT_D16_LOCKABLE; }

1 0

Jacek Caban : mshtml: Move TranslateUrl call to before_async_open.
by Alexandre Julliard March 9, 2019

March 9, 2019

Module: wine Branch: master Commit: 24603b011a893d27ca6969e98f5eccfa3f2248e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24603b011a893d27ca6969e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 13:48:53 2019 +0100 mshtml: Move TranslateUrl call to before_async_open. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 49 +++++++++++++++---------------------------------- 1 file changed, 15 insertions(+), 34 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 0384717..9bb1892 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -252,6 +252,20 @@ static nsresult before_async_open(nsChannel *channel, NSContainer *container, BO if(FAILED(hres)) return NS_ERROR_FAILURE; + if(doc->hostui) { + OLECHAR *new_url; + hres = IDocHostUIHandler_TranslateUrl(doc->hostui, 0, display_uri, &new_url); + if(hres == S_OK && new_url) { + if(strcmpW(display_uri, new_url)) { + FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(display_uri), debugstr_w(new_url)); + CoTaskMemFree(new_url); + *cancel = TRUE; + return NS_OK; + } + CoTaskMemFree(new_url); + } + } + if(!exec_shldocvw_67(doc, display_uri)) { SysFreeString(display_uri); *cancel = FALSE; @@ -3859,33 +3873,6 @@ static const nsIIOServiceHookVtbl nsIOServiceHookVtbl = { static nsIIOServiceHook nsIOServiceHook = { &nsIOServiceHookVtbl }; -static BOOL translate_url(HTMLDocumentObj *doc, nsWineURI *uri) -{ - OLECHAR *new_url = NULL; - WCHAR *url; - BOOL ret = FALSE; - HRESULT hres; - - if(!doc->hostui || !ensure_uri(uri)) - return FALSE; - - hres = IUri_GetDisplayUri(uri->uri, &url); - if(FAILED(hres)) - return FALSE; - - hres = IDocHostUIHandler_TranslateUrl(doc->hostui, 0, url, &new_url); - if(hres == S_OK && new_url) { - if(strcmpW(url, new_url)) { - FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(url), debugstr_w(new_url)); - ret = TRUE; - } - CoTaskMemFree(new_url); - } - - SysFreeString(url); - return ret; -} - nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, cpp_bool *_retval) { nsWineURI *wine_uri; @@ -3899,13 +3886,7 @@ nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, cpp_bool *_ret return NS_ERROR_NOT_IMPLEMENTED; } - if(!wine_uri->is_doc_uri) { - wine_uri->is_doc_uri = TRUE; - - if(nscontainer->doc) - *_retval = translate_url(nscontainer->doc, wine_uri); - } - + wine_uri->is_doc_uri = TRUE; nsIFileURL_Release(&wine_uri->nsIFileURL_iface); return NS_OK; }

1 0

Michael Stefaniuc : shell32: Remove redundant not-NULL check (coccinellery ).
by Alexandre Julliard March 9, 2019

March 9, 2019

Module: wine Branch: master Commit: 390814202852bc6c6db0e39c42ee6abd3121805a URL: https://source.winehq.org/git/wine.git/?a=commit;h=390814202852bc6c6db0e39c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 8 21:16:52 2019 +0100 shell32: Remove redundant not-NULL check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/recyclebin.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 0d80e63..49e7f5d 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -431,8 +431,7 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH return S_OK; failed: - if (list) - IEnumIDList_Release(&list->IEnumIDList_iface); + IEnumIDList_Release(&list->IEnumIDList_iface); for (; i<pidls_count; i++) ILFree(pidls[i]); SHFree(pidls);

1 0

Jacek Caban : mshtml: Simplify handling origin URI charset.
by Alexandre Julliard March 9, 2019

March 9, 2019

Module: wine Branch: master Commit: e50ab8d6f4ac03a09d7f5765c4f6d1fc2528fb6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e50ab8d6f4ac03a09d7f5765… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 13:49:41 2019 +0100 mshtml: Simplify handling origin URI charset. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 436f9bf..4aee21a 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -60,7 +60,6 @@ struct nsWineURI { nsChannelBSC *channel_bsc; IUri *uri; IUriBuilder *uri_builder; - char *origin_charset; BOOL is_mutable; DWORD scheme; }; @@ -154,7 +153,7 @@ static HRESULT combine_url(IUri *base_uri, const WCHAR *rel_url, IUri **ret) return hres; } -static nsresult create_nsuri(IUri*,const char*,nsWineURI**); +static nsresult create_nsuri(IUri*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) { @@ -316,7 +315,7 @@ HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post if(window->uri_nofrag) { nsWineURI *referrer_uri; - nsres = create_nsuri(window->uri_nofrag, NULL, &referrer_uri); + nsres = create_nsuri(window->uri_nofrag, &referrer_uri); if(NS_SUCCEEDED(nsres)) { nsres = nsIDocShellLoadInfo_SetReferrer(load_info, (nsIURI*)&referrer_uri->nsIFileURL_iface); assert(nsres == NS_OK); @@ -2265,7 +2264,6 @@ static nsrefcnt NSAPI nsURI_Release(nsIFileURL *iface) IUri_Release(This->uri); if(This->uri_builder) IUriBuilder_Release(This->uri_builder); - heap_free(This->origin_charset); heap_free(This); } @@ -2762,7 +2760,7 @@ static nsresult NSAPI nsURI_Clone(nsIFileURL *iface, nsIURI **_retval) if(!ensure_uri(This)) return NS_ERROR_UNEXPECTED; - nsres = create_nsuri(This->uri, This->origin_charset, &wine_uri); + nsres = create_nsuri(This->uri, &wine_uri); if(NS_FAILED(nsres)) { WARN("create_nsuri failed: %08x\n", nsres); return nsres; @@ -2847,7 +2845,7 @@ static nsresult NSAPI nsURI_GetOriginCharset(nsIFileURL *iface, nsACString *aOri TRACE("(%p)->(%p)\n", This, aOriginCharset); - nsACString_SetData(aOriginCharset, This->origin_charset); + nsACString_SetData(aOriginCharset, NULL); /* assume utf-8, we store URI as utf-16 anyway */ return NS_OK; } @@ -2944,7 +2942,7 @@ static nsresult NSAPI nsURI_CloneIgnoreRef(nsIFileURL *iface, nsIURI **_retval) if(!uri) return NS_ERROR_FAILURE; - nsres = create_nsuri(uri, This->origin_charset, &wine_uri); + nsres = create_nsuri(uri, &wine_uri); IUri_Release(uri); if(NS_FAILED(nsres)) { WARN("create_nsuri failed: %08x\n", nsres); @@ -3339,7 +3337,7 @@ static const nsIStandardURLVtbl nsStandardURLVtbl = { nsStandardURL_SetDefaultPort }; -static nsresult create_nsuri(IUri *iuri, const char *origin_charset, nsWineURI **_retval) +static nsresult create_nsuri(IUri *iuri, nsWineURI **_retval) { nsWineURI *ret; HRESULT hres; @@ -3360,14 +3358,6 @@ static nsresult create_nsuri(IUri *iuri, const char *origin_charset, nsWineURI * if(FAILED(hres)) ret->scheme = URL_SCHEME_UNKNOWN; - if(origin_charset && *origin_charset && strcmp(origin_charset, "UTF-8")) { - ret->origin_charset = heap_strdupA(origin_charset); - if(!ret->origin_charset) { - nsIFileURL_Release(&ret->nsIFileURL_iface); - return NS_ERROR_OUT_OF_MEMORY; - } - } - TRACE("retval=%p\n", ret); *_retval = ret; return NS_OK; @@ -3375,7 +3365,9 @@ static nsresult create_nsuri(IUri *iuri, const char *origin_charset, nsWineURI * HRESULT create_doc_uri(IUri *iuri, nsWineURI **ret) { - return create_nsuri(iuri, NULL, ret); + nsresult nsres; + nsres = create_nsuri(iuri, ret); + return NS_SUCCEEDED(nsres) ? S_OK : E_OUTOFMEMORY; } static nsresult create_nschannel(nsWineURI *uri, nsChannel **ret) @@ -3416,7 +3408,7 @@ HRESULT create_redirect_nschannel(const WCHAR *url, nsChannel *orig_channel, nsC if(FAILED(hres)) return hres; - nsres = create_nsuri(iuri, NULL, &uri); + nsres = create_nsuri(iuri, &uri); IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; @@ -3789,7 +3781,7 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC if(FAILED(hres)) return NS_SUCCESS_DEFAULT_ACTION; - nsres = create_nsuri(urlmon_uri, NULL, &wine_uri); + nsres = create_nsuri(urlmon_uri, &wine_uri); IUri_Release(urlmon_uri); if(base_wine_uri) nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface);

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_SetBoolArray() helper.
by Alexandre Julliard March 9, 2019

March 9, 2019

Module: wine Branch: master Commit: e435a1442d6499f358168d8a0ca974b43ccd9140 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e435a1442d6499f358168d8a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 8 00:13:51 2019 +0100 d3dx9: Merge the d3dx_effect_SetBoolArray() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 73 +++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 40 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index abf0bd9..14caada 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1345,45 +1345,6 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const BOOL *b, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param) - { - UINT i, size = min(count, param->bytes / sizeof(DWORD)); - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_MATRIX_ROWS: - for (i = 0; i < size; ++i) - { - /* don't crop the input, use D3DXPT_INT instead of D3DXPT_BOOL */ - set_number((DWORD *)param->data + i, param->type, &b[i], D3DXPT_INT); - } - set_dirty(param); - return D3D_OK; - - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHANDLE parameter, INT n) { struct d3dx_parameter *param = get_valid_parameter(base, parameter); @@ -3483,10 +3444,42 @@ static HRESULT WINAPI d3dx_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE paramet static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, const BOOL *b, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count); - return d3dx9_base_effect_set_bool_array(&effect->base_effect, parameter, b, count); + if (param) + { + unsigned int i, size = min(count, param->bytes / sizeof(DWORD)); + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < size; ++i) + { + /* don't crop the input, use D3DXPT_INT instead of D3DXPT_BOOL */ + set_number((DWORD *)param->data + i, param->type, &b[i], D3DXPT_INT); + } + set_dirty(param); + return D3D_OK; + + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b, UINT count)

1 0

Nikolay Sivov : winex11: Fix typo in comments.
by Alexandre Julliard March 9, 2019

March 9, 2019

Module: wine Branch: master Commit: e03114c75b1c072204b95db3b727ed160c3559b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e03114c75b1c072204b95db3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 8 16:18:18 2019 +0300 winex11: Fix typo in comments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/ime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 2f90f853..dfeed2c 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -183,8 +183,8 @@ static int updateField(DWORD origLen, DWORD origOffset, DWORD currentOffset, static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len) { - /* we need to make sure the CompStr, CompClaus and CompAttr fields are all - * set and correct */ + /* We need to make sure the CompStr, CompClause and CompAttr fields are all + * set and correct. */ int needed_size; HIMCC rc; LPBYTE newdata = NULL;

1 0

Jacek Caban : mshtml: Use channel_bsc from URI for child documents as well.
by Alexandre Julliard March 9, 2019

March 9, 2019

Module: wine Branch: master Commit: 73cca44bf4fdbe2ed00303b414462052c117118a URL: https://source.winehq.org/git/wine.git/?a=commit;h=73cca44bf4fdbe2ed00303b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 13:48:25 2019 +0100 mshtml: Use channel_bsc from URI for child documents as well. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 22e9086..0384717 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1045,22 +1045,24 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen is_document_channel = !!(This->load_flags & LOAD_DOCUMENT_URI); - if(is_document_channel && window == window->doc_obj->basedoc.window) { + if(is_document_channel) { if(This->uri->channel_bsc) { channelbsc_set_channel(This->uri->channel_bsc, This, aListener, aContext); + cancel = TRUE; + } - if(window->doc_obj->mime) { + if(window == window->doc_obj->basedoc.window) { + if(!This->uri->channel_bsc) { + /* top window navigation initiated by Gecko */ + nsres = before_async_open(This, window->doc_obj->nscontainer, &cancel); + if(NS_SUCCEEDED(nsres) && cancel) { + TRACE("canceled\n"); + nsres = NS_BINDING_ABORTED; + } + }else if(window->doc_obj->mime) { heap_free(This->content_type); This->content_type = heap_strdupWtoA(window->doc_obj->mime); } - - cancel = TRUE; - }else { - nsres = before_async_open(This, window->doc_obj->nscontainer, &cancel); - if(NS_SUCCEEDED(nsres) && cancel) { - TRACE("canceled\n"); - nsres = NS_BINDING_ABORTED; - } } }

1 0

Jacek Caban : mshtml: Use load_flags instead of is_doc_uri in nsChannel implementation.
by Alexandre Julliard March 9, 2019

March 9, 2019

Module: wine Branch: master Commit: 2678126f95e4d5d1bb9803b701e205cf48d8ee65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2678126f95e4d5d1bb9803b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 13:46:52 2019 +0100 mshtml: Use load_flags instead of is_doc_uri in nsChannel implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d818889..ca63a98 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -806,7 +806,7 @@ static nsresult NSAPI nsChannel_GetContentType(nsIHttpChannel *iface, nsACString return S_OK; } - if(This->uri->is_doc_uri) { + if(This->load_flags & LOAD_DOCUMENT_URI) { WARN("Document channel with no MIME set. Assuming text/html\n"); nsACString_SetData(aContentType, "text/html"); return S_OK; @@ -1074,6 +1074,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen { nsChannel *This = impl_from_nsIHttpChannel(iface); HTMLOuterWindow *window = NULL; + BOOL is_document_channel; BOOL cancel = FALSE; nsresult nsres = NS_OK; @@ -1095,7 +1096,8 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen } } - if(This->uri->is_doc_uri) { + is_document_channel = !!(This->load_flags & LOAD_DOCUMENT_URI); + if(is_document_channel) { window = get_channel_window(This); if(window) set_uri_window(This->uri, window); @@ -1121,7 +1123,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen return NS_ERROR_UNEXPECTED; } - if(This->uri->is_doc_uri && window == window->doc_obj->basedoc.window) { + if(is_document_channel && window == window->doc_obj->basedoc.window) { if(This->uri->channel_bsc) { channelbsc_set_channel(This->uri->channel_bsc, This, aListener, aContext); @@ -1141,7 +1143,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen } if(!cancel) - nsres = async_open(This, window, This->uri->is_doc_uri, aListener, aContext); + nsres = async_open(This, window, is_document_channel, aListener, aContext); if(NS_SUCCEEDED(nsres) && This->load_group) { nsres = nsILoadGroup_AddRequest(This->load_group, (nsIRequest*)&This->nsIHttpChannel_iface,

1 0

Jactry Zeng : mfplat: Unlock section after finishing.
by Alexandre Julliard March 9, 2019

March 9, 2019

Module: wine Branch: master Commit: a1e117b79e289a83374545fd399682afe7d20ae1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1e117b79e289a83374545fd… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Mar 8 09:57:46 2019 +0300 mfplat: Unlock section after finishing. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 164f8f7..f6eecb6 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -525,7 +525,7 @@ static HRESULT WINAPI sample_GetBufferCount(IMFSample *iface, DWORD *count) EnterCriticalSection(&sample->cs); *count = sample->buffer_count; - EnterCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->cs); return S_OK; }

1 0

Nikolay Sivov : mfplat: Forward CopyAllItems() for media type as well.
by Alexandre Julliard March 9, 2019

March 9, 2019

Module: wine Branch: master Commit: 0b2db93910da952c9084a559366f3f1cfad3c173 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b2db93910da952c9084a559… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 8 09:57:43 2019 +0300 mfplat: Forward CopyAllItems() for media type as well. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 7470d40..974ab3a 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -302,9 +302,8 @@ static HRESULT WINAPI mediatype_GetItemByIndex(IMFMediaType *iface, UINT32 index static HRESULT WINAPI mediatype_CopyAllItems(IMFMediaType *iface, IMFAttributes *dest) { - FIXME("%p, %p.\n", iface, dest); - - return E_NOTIMPL; + struct media_type *media_type = impl_from_IMFMediaType(iface); + return IMFAttributes_CopyAllItems(&media_type->attributes.IMFAttributes_iface, dest); } static HRESULT WINAPI mediatype_GetMajorType(IMFMediaType *iface, GUID *guid)

1 0