January 2012 - Wine-Commits

Michael Stefaniuc : shell32: COM cleanup for IPersistFile.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: b12a950c84ee304bdf06b540daa9a143ecb1247b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b12a950c84ee304bdf06b540d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 27 14:36:58 2012 +0100 shell32: COM cleanup for IPersistFile. --- dlls/shell32/folders.c | 63 ++++++++++++++++++++++-------------------------- 1 files changed, 29 insertions(+), 34 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 01fc1a4..bab2b1c 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -50,8 +50,8 @@ typedef struct { IExtractIconW IExtractIconW_iface; IExtractIconA IExtractIconA_iface; + IPersistFile IPersistFile_iface; LONG ref; - const IPersistFileVtbl *lpvtblPersistFile; LPITEMIDLIST pidl; } IExtractIconWImpl; @@ -65,15 +65,15 @@ static inline IExtractIconWImpl *impl_from_IExtractIconA(IExtractIconA *iface) return CONTAINING_RECORD(iface, IExtractIconWImpl, IExtractIconA_iface); } +static inline IExtractIconWImpl *impl_from_IPersistFile(IPersistFile *iface) +{ + return CONTAINING_RECORD(iface, IExtractIconWImpl, IPersistFile_iface); +} + static const IExtractIconAVtbl eiavt; static const IExtractIconWVtbl eivt; static const IPersistFileVtbl pfvt; -static inline IExtractIconW *impl_from_IPersistFile( IPersistFile *iface ) -{ - return (IExtractIconW *)((char*)iface - FIELD_OFFSET(IExtractIconWImpl, lpvtblPersistFile)); -} - /************************************************************************** * IExtractIconW_Constructor @@ -87,8 +87,8 @@ IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl) ei = HeapAlloc(GetProcessHeap(),0,sizeof(IExtractIconWImpl)); ei->ref=1; ei->IExtractIconW_iface.lpVtbl = &eivt; - ei->lpvtblPersistFile = &pfvt; ei->IExtractIconA_iface.lpVtbl = &eiavt; + ei->IPersistFile_iface.lpVtbl = &pfvt; ei->pidl=ILClone(pidl); pdump(pidl); @@ -110,7 +110,7 @@ static HRESULT WINAPI IExtractIconW_fnQueryInterface(IExtractIconW *iface, REFII if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IExtractIconW)) *ppv = iface; else if (IsEqualIID(riid, &IID_IPersistFile)) - *ppv = &This->lpvtblPersistFile; + *ppv = &This->IPersistFile_iface; else if (IsEqualIID(riid, &IID_IExtractIconA)) *ppv = &This->IExtractIconA_iface; @@ -495,46 +495,40 @@ static const IExtractIconAVtbl eiavt = }; /************************************************************************ - * IEIPersistFile_QueryInterface (IUnknown) + * IEIPersistFile::QueryInterface */ -static HRESULT WINAPI IEIPersistFile_fnQueryInterface( - IPersistFile *iface, - REFIID iid, - LPVOID *ppvObj) +static HRESULT WINAPI IEIPersistFile_fnQueryInterface(IPersistFile *iface, REFIID iid, + void **ppv) { - IExtractIconW *This = impl_from_IPersistFile(iface); + IExtractIconWImpl *This = impl_from_IPersistFile(iface); - return IExtractIconW_QueryInterface(This, iid, ppvObj); + return IExtractIconW_QueryInterface(&This->IExtractIconW_iface, iid, ppv); } /************************************************************************ - * IEIPersistFile_AddRef (IUnknown) + * IEIPersistFile::AddRef */ -static ULONG WINAPI IEIPersistFile_fnAddRef( - IPersistFile *iface) +static ULONG WINAPI IEIPersistFile_fnAddRef(IPersistFile *iface) { - IExtractIconW *This = impl_from_IPersistFile(iface); + IExtractIconWImpl *This = impl_from_IPersistFile(iface); - return IExtractIconW_AddRef(This); + return IExtractIconW_AddRef(&This->IExtractIconW_iface); } /************************************************************************ - * IEIPersistFile_Release (IUnknown) + * IEIPersistFile::Release */ -static ULONG WINAPI IEIPersistFile_fnRelease( - IPersistFile *iface) +static ULONG WINAPI IEIPersistFile_fnRelease(IPersistFile *iface) { - IExtractIconW *This = impl_from_IPersistFile(iface); + IExtractIconWImpl *This = impl_from_IPersistFile(iface); - return IExtractIconW_Release(This); + return IExtractIconW_Release(&This->IExtractIconW_iface); } /************************************************************************ - * IEIPersistFile_GetClassID (IPersist) + * IEIPersistFile::GetClassID */ -static HRESULT WINAPI IEIPersistFile_fnGetClassID( - IPersistFile *iface, - LPCLSID lpClassId) +static HRESULT WINAPI IEIPersistFile_fnGetClassID(IPersistFile *iface, LPCLSID lpClassId) { CLSID StdFolderID = { 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }; @@ -547,14 +541,15 @@ static HRESULT WINAPI IEIPersistFile_fnGetClassID( } /************************************************************************ - * IEIPersistFile_Load (IPersistFile) + * IEIPersistFile_Load */ -static HRESULT WINAPI IEIPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFileName, DWORD dwMode) +static HRESULT WINAPI IEIPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFileName, + DWORD dwMode) { - IExtractIconW *This = impl_from_IPersistFile(iface); - FIXME("%p\n", This); - return E_NOTIMPL; + IExtractIconWImpl *This = impl_from_IPersistFile(iface); + FIXME("%p\n", This); + return E_NOTIMPL; } static const IPersistFileVtbl pfvt =

1 0

Jörg Höhle : winealsa: Fix -errno typo.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 594002d0116087a8454f11f09c34e744dbcdc4eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=594002d0116087a8454f11f09… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Jan 27 10:03:01 2012 +0100 winealsa: Fix -errno typo. --- dlls/winealsa.drv/mmdevdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index fdb069a..ba29fde 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -582,7 +582,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(const char *key, IMMDevice *dev, HeapFree(GetProcessHeap(), 0, This); WARN("Unable to open PCM \"%s\": %d (%s)\n", key, err, snd_strerror(err)); switch(err){ - case EBUSY: + case -EBUSY: return AUDCLNT_E_DEVICE_IN_USE; default: return AUDCLNT_E_ENDPOINT_CREATE_FAILED;

1 0

Jacek Caban : mshtml: Fallback to text/ html mime type for document channel in nsIChannel::GetContentType.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 7ab1259a72030d0b469463fa2a2ac9a950ae26ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab1259a72030d0b469463fa2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 15:56:32 2012 +0100 mshtml: Fallback to text/html mime type for document channel in nsIChannel::GetContentType. --- dlls/mshtml/nsio.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 8e7bdec..744e914 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -787,6 +787,12 @@ static nsresult NSAPI nsChannel_GetContentType(nsIHttpChannel *iface, nsACString return S_OK; } + if(This->uri->is_doc_uri) { + WARN("Document channel with no MIME set. Assuming text/html\n"); + nsACString_SetData(aContentType, "text/html"); + return S_OK; + } + WARN("unknown type\n"); return NS_ERROR_FAILURE; }

1 0

Nikolay Sivov : msxml3: Support startDTD()/endDTD() in MXWriter.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 6106afe359f0ab904f9b7e4e9867a0cd5bb0cea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6106afe359f0ab904f9b7e4e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 16:09:42 2012 +0300 msxml3: Support startDTD()/endDTD() in MXWriter. --- dlls/msxml3/mxwriter.c | 80 ++++++++++++++++++++++++++++++++------ dlls/msxml3/tests/saxreader.c | 86 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 153 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 3e08840..c94faaa 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -41,6 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; static const WCHAR emptyW[] = {0}; +static const WCHAR spaceW[] = {' '}; +static const WCHAR quotW[] = {'\"'}; typedef enum { @@ -266,10 +268,10 @@ static void close_output_buffer(mxwriter *This) */ static WCHAR *get_escaped_string(const WCHAR *str, int *len) { - static const WCHAR ltW[] = {'&','l','t',';'}; - static const WCHAR ampW[] = {'&','a','m','p',';'}; - static const WCHAR quotW[] = {'&','q','u','o','t',';'}; - static const WCHAR gtW[] = {'&','g','t',';'}; + static const WCHAR ltW[] = {'&','l','t',';'}; + static const WCHAR ampW[] = {'&','a','m','p',';'}; + static const WCHAR equotW[] = {'&','q','u','o','t',';'}; + static const WCHAR gtW[] = {'&','g','t',';'}; const int default_alloc = 100; const int grow_thresh = 10; @@ -301,8 +303,8 @@ static WCHAR *get_escaped_string(const WCHAR *str, int *len) ptr += sizeof(ampW)/sizeof(WCHAR); break; case '"': - memcpy(ptr, quotW, sizeof(quotW)); - ptr += sizeof(quotW)/sizeof(WCHAR); + memcpy(ptr, equotW, sizeof(equotW)); + ptr += sizeof(equotW)/sizeof(WCHAR); break; case '>': memcpy(ptr, gtW, sizeof(gtW)); @@ -330,7 +332,6 @@ static void write_prolog_buffer(const mxwriter *This) static const WCHAR standaloneW[] = {' ','s','t','a','n','d','a','l','o','n','e','=','\"'}; static const WCHAR yesW[] = {'y','e','s','\"','?','>'}; static const WCHAR noW[] = {'n','o','\"','?','>'}; - static const WCHAR quotW[] = {'\"'}; static const WCHAR crlfW[] = {'\r','\n'}; /* version */ @@ -951,9 +952,7 @@ static HRESULT WINAPI SAXContentHandler_startElement( for (i = 0; i < length; i++) { - static const WCHAR spaceW[] = {' '}; static const WCHAR eqqW[] = {'=','\"'}; - static const WCHAR quotW[] = {'\"'}; const WCHAR *str; WCHAR *escaped; INT len = 0; @@ -1114,17 +1113,72 @@ static HRESULT WINAPI SAXLexicalHandler_startDTD(ISAXLexicalHandler *iface, const WCHAR *name, int name_len, const WCHAR *publicId, int publicId_len, const WCHAR *systemId, int systemId_len) { + static const WCHAR doctypeW[] = {'<','!','D','O','C','T','Y','P','E',' '}; + static const WCHAR openintW[] = {'[','\r','\n'}; + mxwriter *This = impl_from_ISAXLexicalHandler( iface ); - FIXME("(%p)->(%s %s %s): stub\n", This, debugstr_wn(name, name_len), debugstr_wn(publicId, publicId_len), + + TRACE("(%p)->(%s %s %s)\n", This, debugstr_wn(name, name_len), debugstr_wn(publicId, publicId_len), debugstr_wn(systemId, systemId_len)); - return E_NOTIMPL; + + if (!name) return E_INVALIDARG; + + write_output_buffer(This->buffer, doctypeW, sizeof(doctypeW)/sizeof(WCHAR)); + + if (*name) + { + write_output_buffer(This->buffer, name, name_len); + write_output_buffer(This->buffer, spaceW, 1); + } + + if (publicId) + { + static const WCHAR publicW[] = {'P','U','B','L','I','C',' '}; + + write_output_buffer(This->buffer, publicW, sizeof(publicW)/sizeof(WCHAR)); + write_output_buffer(This->buffer, quotW, 1); + write_output_buffer(This->buffer, publicId, publicId_len); + write_output_buffer(This->buffer, quotW, 1); + + if (!systemId) return E_INVALIDARG; + + if (*publicId) + write_output_buffer(This->buffer, spaceW, 1); + + write_output_buffer(This->buffer, quotW, 1); + write_output_buffer(This->buffer, systemId, systemId_len); + write_output_buffer(This->buffer, quotW, 1); + + if (*systemId) + write_output_buffer(This->buffer, spaceW, 1); + } + else if (systemId) + { + static const WCHAR systemW[] = {'S','Y','S','T','E','M',' '}; + + write_output_buffer(This->buffer, systemW, sizeof(systemW)/sizeof(WCHAR)); + write_output_buffer(This->buffer, quotW, 1); + write_output_buffer(This->buffer, systemId, systemId_len); + write_output_buffer(This->buffer, quotW, 1); + if (*systemId) + write_output_buffer(This->buffer, spaceW, 1); + } + + write_output_buffer(This->buffer, openintW, sizeof(openintW)/sizeof(WCHAR)); + + return S_OK; } static HRESULT WINAPI SAXLexicalHandler_endDTD(ISAXLexicalHandler *iface) { mxwriter *This = impl_from_ISAXLexicalHandler( iface ); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + static const WCHAR closedtdW[] = {']','>','\r','\n'}; + + TRACE("(%p)\n", This); + + write_output_buffer(This->buffer, closedtdW, sizeof(closedtdW)/sizeof(WCHAR)); + + return S_OK; } static HRESULT WINAPI SAXLexicalHandler_startEntity(ISAXLexicalHandler *iface, const WCHAR *name, int len) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 30ac57e..1f47062 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2956,7 +2956,92 @@ static void test_mxwriter_cdata(void) ISAXLexicalHandler_Release(lexical); IMXWriter_Release(writer); free_bstrs(); +} +static void test_mxwriter_dtd(void) +{ + static const WCHAR nameW[] = {'n','a','m','e'}; + static const WCHAR pubW[] = {'p','u','b'}; + static const WCHAR sysW[] = {'s','y','s'}; + ISAXContentHandler *content; + ISAXLexicalHandler *lexical; + IMXWriter *writer; + VARIANT dest; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXLexicalHandler, (void**)&lexical); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, NULL, 0, NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, pubW, sizeof(pubW)/sizeof(WCHAR), NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, NULL, 0, sysW, sizeof(sysW)/sizeof(WCHAR)); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, pubW, sizeof(pubW)/sizeof(WCHAR), sysW, sizeof(sysW)/sizeof(WCHAR)); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXLexicalHandler_startDTD(lexical, nameW, sizeof(nameW)/sizeof(WCHAR), NULL, 0, NULL, 0); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<!DOCTYPE name [\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + /* system id is required if public is present */ + hr = ISAXLexicalHandler_startDTD(lexical, nameW, sizeof(nameW)/sizeof(WCHAR), pubW, sizeof(pubW)/sizeof(WCHAR), NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXLexicalHandler_startDTD(lexical, nameW, sizeof(nameW)/sizeof(WCHAR), + pubW, sizeof(pubW)/sizeof(WCHAR), sysW, sizeof(sysW)/sizeof(WCHAR)); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<!DOCTYPE name [\r\n<!DOCTYPE name PUBLIC \"pub\"" + "<!DOCTYPE name PUBLIC \"pub\" \"sys\" [\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = ISAXLexicalHandler_endDTD(lexical); + EXPECT_HR(hr, S_OK); + + hr = ISAXLexicalHandler_endDTD(lexical); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<!DOCTYPE name [\r\n<!DOCTYPE name PUBLIC \"pub\"" + "<!DOCTYPE name PUBLIC \"pub\" \"sys\" [\r\n]>\r\n]>\r\n"), + V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + ISAXContentHandler_Release(content); + ISAXLexicalHandler_Release(lexical); + IMXWriter_Release(writer); + free_bstrs(); } START_TEST(saxreader) @@ -2996,6 +3081,7 @@ START_TEST(saxreader) test_mxwriter_characters(); test_mxwriter_comment(); test_mxwriter_cdata(); + test_mxwriter_dtd(); test_mxwriter_properties(); test_mxwriter_flush(); test_mxwriter_stream();

1 0

Nikolay Sivov : msxml3: Add a helper to output quoted strings.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 2f18cfd85e6e766d762afdba16229153c7291769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f18cfd85e6e766d762afdba1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 16:23:56 2012 +0300 msxml3: Add a helper to output quoted strings. --- dlls/msxml3/mxwriter.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index c94faaa..cb1a67f 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -250,6 +250,15 @@ static HRESULT write_output_buffer(output_buffer *buffer, const WCHAR *data, int return write_output_buffer_mode(buffer, OutputBuffer_Both, data, len); } +static HRESULT write_output_buffer_quoted(output_buffer *buffer, const WCHAR *data, int len) +{ + write_output_buffer(buffer, quotW, 1); + write_output_buffer(buffer, data, len); + write_output_buffer(buffer, quotW, 1); + + return S_OK; +} + /* frees buffer data, reallocates with a default lengths */ static void close_output_buffer(mxwriter *This) { @@ -327,7 +336,7 @@ static WCHAR *get_escaped_string(const WCHAR *str, int *len) static void write_prolog_buffer(const mxwriter *This) { - static const WCHAR versionW[] = {'<','?','x','m','l',' ','v','e','r','s','i','o','n','=','\"'}; + static const WCHAR versionW[] = {'<','?','x','m','l',' ','v','e','r','s','i','o','n','='}; static const WCHAR encodingW[] = {' ','e','n','c','o','d','i','n','g','=','\"'}; static const WCHAR standaloneW[] = {' ','s','t','a','n','d','a','l','o','n','e','=','\"'}; static const WCHAR yesW[] = {'y','e','s','\"','?','>'}; @@ -336,8 +345,7 @@ static void write_prolog_buffer(const mxwriter *This) /* version */ write_output_buffer(This->buffer, versionW, sizeof(versionW)/sizeof(WCHAR)); - write_output_buffer(This->buffer, This->version, -1); - write_output_buffer(This->buffer, quotW, 1); + write_output_buffer_quoted(This->buffer, This->version, -1); /* encoding */ write_output_buffer(This->buffer, encodingW, sizeof(encodingW)/sizeof(WCHAR)); @@ -952,7 +960,7 @@ static HRESULT WINAPI SAXContentHandler_startElement( for (i = 0; i < length; i++) { - static const WCHAR eqqW[] = {'=','\"'}; + static const WCHAR eqW[] = {'='}; const WCHAR *str; WCHAR *escaped; INT len = 0; @@ -964,17 +972,15 @@ static HRESULT WINAPI SAXContentHandler_startElement( write_output_buffer(This->buffer, spaceW, 1); write_output_buffer(This->buffer, str, len); - write_output_buffer(This->buffer, eqqW, 2); + write_output_buffer(This->buffer, eqW, 1); len = 0; hr = ISAXAttributes_getValue(attr, i, &str, &len); if (FAILED(hr)) return hr; escaped = get_escaped_string(str, &len); - write_output_buffer(This->buffer, escaped, len); + write_output_buffer_quoted(This->buffer, escaped, len); heap_free(escaped); - - write_output_buffer(This->buffer, quotW, 1); } } @@ -1136,18 +1142,14 @@ static HRESULT WINAPI SAXLexicalHandler_startDTD(ISAXLexicalHandler *iface, static const WCHAR publicW[] = {'P','U','B','L','I','C',' '}; write_output_buffer(This->buffer, publicW, sizeof(publicW)/sizeof(WCHAR)); - write_output_buffer(This->buffer, quotW, 1); - write_output_buffer(This->buffer, publicId, publicId_len); - write_output_buffer(This->buffer, quotW, 1); + write_output_buffer_quoted(This->buffer, publicId, publicId_len); if (!systemId) return E_INVALIDARG; if (*publicId) write_output_buffer(This->buffer, spaceW, 1); - write_output_buffer(This->buffer, quotW, 1); - write_output_buffer(This->buffer, systemId, systemId_len); - write_output_buffer(This->buffer, quotW, 1); + write_output_buffer_quoted(This->buffer, systemId, systemId_len); if (*systemId) write_output_buffer(This->buffer, spaceW, 1); @@ -1157,9 +1159,7 @@ static HRESULT WINAPI SAXLexicalHandler_startDTD(ISAXLexicalHandler *iface, static const WCHAR systemW[] = {'S','Y','S','T','E','M',' '}; write_output_buffer(This->buffer, systemW, sizeof(systemW)/sizeof(WCHAR)); - write_output_buffer(This->buffer, quotW, 1); - write_output_buffer(This->buffer, systemId, systemId_len); - write_output_buffer(This->buffer, quotW, 1); + write_output_buffer_quoted(This->buffer, systemId, systemId_len); if (*systemId) write_output_buffer(This->buffer, spaceW, 1); }

1 0

Francois Gouget : wrc: Add a trailing '\n' to the error() calls.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 1a512846e250af51048d9c38609f19dbf39cc7f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a512846e250af51048d9c386… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 27 14:08:22 2012 +0100 wrc: Add a trailing '\n' to the error() calls. --- tools/wrc/genres.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index d6e641f..edf4823 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -287,13 +287,13 @@ static int parse_accel_string( const string_t *key, int flags ) (key->str.cstr[0] >= '0' && key->str.cstr[0] <= '9'))) { print_location( &key->loc ); - error("VIRTKEY code is not equal to ascii value"); + error("VIRTKEY code is not equal to ascii value\n"); } if(key->str.cstr[0] == '^' && (flags & WRC_AF_CONTROL) != 0) { print_location( &key->loc ); - error("Cannot use both '^' and CONTROL modifier"); + error("Cannot use both '^' and CONTROL modifier\n"); } else if(key->str.cstr[0] == '^') { @@ -301,7 +301,7 @@ static int parse_accel_string( const string_t *key, int flags ) if(keycode >= ' ') { print_location( &key->loc ); - error("Control-code out of range"); + error("Control-code out of range\n"); } } else @@ -314,12 +314,12 @@ static int parse_accel_string( const string_t *key, int flags ) (key->str.wstr[0] >= '0' && key->str.wstr[0] <= '9'))) { print_location( &key->loc ); - error("VIRTKEY code is not equal to ascii value"); + error("VIRTKEY code is not equal to ascii value\n"); } if(key->str.wstr[0] == '^' && (flags & WRC_AF_CONTROL) != 0) { print_location( &key->loc ); - error("Cannot use both '^' and CONTROL modifier"); + error("Cannot use both '^' and CONTROL modifier\n"); } else if(key->str.wstr[0] == '^') { @@ -327,7 +327,7 @@ static int parse_accel_string( const string_t *key, int flags ) if(keycode >= ' ') { print_location( &key->loc ); - error("Control-code out of range"); + error("Control-code out of range\n"); } } else

1 0

Andrew Eikum : winealsa: Avoid underrun by adding a lead-in when starting with few samples.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 7c52a257fb74c21e59318becf70dacffa5f9d720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c52a257fb74c21e59318becf… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 23 11:00:14 2012 -0600 winealsa: Avoid underrun by adding a lead-in when starting with few samples. --- dlls/winealsa.drv/mmdevdrv.c | 63 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 51 insertions(+), 12 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index fedd040..fdb069a 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -52,6 +52,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static const REFERENCE_TIME DefaultPeriod = 100000; static const REFERENCE_TIME MinimumPeriod = 50000; +#define EXTRA_SAFE_RT 40000 struct ACImpl; typedef struct ACImpl ACImpl; @@ -112,6 +113,7 @@ struct ACImpl { UINT64 written_frames, last_pos_frames; UINT32 bufsize_frames, held_frames, tmp_buffer_frames, mmdev_period_frames; UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ + UINT32 hidden_frames; /* ALSA reserve to ensure continuous rendering */ HANDLE timer; BYTE *local_buffer, *tmp_buffer; @@ -961,8 +963,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->mmdev_period_frames = MulDiv(fmt->nSamplesPerSec, This->mmdev_period_rt, 10000000); - This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); - /* Buffer 4 ALSA periods if large enough, else 4 mmdevapi periods */ This->alsa_bufsize_frames = This->mmdev_period_frames * 4; if(err < 0 || alsa_period_us < period / 10) @@ -1034,6 +1034,15 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, goto exit; } + /* Bear in mind weird situations where + * ALSA period (50ms) > mmdevapi buffer (3x10ms) + * or surprising rounding as seen with 22050x8x1 with Pulse: + * ALSA period 220 vs. 221 frames in mmdevapi and + * buffer 883 vs. 2205 frames in mmdevapi! */ + This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); + This->hidden_frames = This->alsa_period_frames + This->mmdev_period_frames + + MulDiv(fmt->nSamplesPerSec, EXTRA_SAFE_RT, 10000000); + /* Check if the ALSA buffer is so small that it will run out before * the next MMDevAPI period tick occurs. Allow a little wiggle room * with 120% of the period time. */ @@ -1147,11 +1156,18 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, return AUDCLNT_E_NOT_INITIALIZED; } - LeaveCriticalSection(&This->lock); + /* Hide some frames in the ALSA buffer. Allows to return GetCurrentPadding=0 + * yet have enough data left to play (as if it were in native's mixer). Add: + * + mmdevapi_period such that at the end of it, ALSA still has data; + * + EXTRA_SAFE (~4ms) to allow for late callback invocation / fluctuation; + * + alsa_period such that ALSA always has at least one period to play. */ + if(This->dataflow == eRender) + *latency = MulDiv(This->hidden_frames, 10000000, This->fmt->nSamplesPerSec); + else + *latency = MulDiv(This->alsa_period_frames, 10000000, This->fmt->nSamplesPerSec) + + This->mmdev_period_rt; - /* one mmdevapi period plus one period we hide in the ALSA buffer */ - *latency = MulDiv(This->alsa_period_frames, 10000000, This->fmt->nSamplesPerSec) - + This->mmdev_period_rt; + LeaveCriticalSection(&This->lock); return S_OK; } @@ -1473,11 +1489,11 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, } static snd_pcm_sframes_t alsa_write_best_effort(snd_pcm_t *handle, BYTE *buf, - snd_pcm_uframes_t frames, ACImpl *This) + snd_pcm_uframes_t frames, ACImpl *This, BOOL mute) { snd_pcm_sframes_t written; - if(This->session->mute){ + if(mute){ int err; if((err = snd_pcm_format_set_silence(This->alsa_format, buf, frames * This->fmt->nChannels)) < 0) @@ -1510,8 +1526,8 @@ static snd_pcm_sframes_t alsa_write_best_effort(snd_pcm_t *handle, BYTE *buf, static void alsa_write_data(ACImpl *This) { - snd_pcm_sframes_t written; - snd_pcm_uframes_t to_write, avail, write_limit, max_period, in_alsa; + snd_pcm_sframes_t written, in_alsa; + snd_pcm_uframes_t to_write, avail, write_limit, max_period; int err; BYTE *buf = This->local_buffer + (This->lcl_offs_frames * This->fmt->nBlockAlign); @@ -1557,7 +1573,29 @@ static void alsa_write_data(ACImpl *This) to_write = min(to_write, write_limit); - written = alsa_write_best_effort(This->pcm_handle, buf, to_write, This); + /* Add a lead-in when starting with too few frames to ensure + * continuous rendering. Additional benefit: Force ALSA to start. + * GetPosition continues to reflect the speaker position because + * snd_pcm_delay includes buffered frames in its total delay + * and last_pos_frames prevents moving backwards. */ + if(!in_alsa && This->held_frames < This->hidden_frames){ + UINT32 s_frames = This->hidden_frames - This->held_frames; + BYTE *silence = HeapAlloc(GetProcessHeap(), 0, + s_frames * This->fmt->nBlockAlign); + + if(silence){ + in_alsa = alsa_write_best_effort(This->pcm_handle, + silence, s_frames, This, TRUE); + TRACE("lead-in %ld\n", in_alsa); + HeapFree(GetProcessHeap(), 0, silence); + if(in_alsa <= 0) + return; + }else + WARN("Couldn't allocate lead-in, expect underrun\n"); + } + + written = alsa_write_best_effort(This->pcm_handle, buf, to_write, This, + This->session->mute); if(written < 0){ WARN("Couldn't write: %ld (%s)\n", written, snd_strerror(written)); return; @@ -1575,7 +1613,8 @@ static void alsa_write_data(ACImpl *This) if(This->held_frames && (written < write_limit)){ /* wrapped and have some data back at the start to write */ written = alsa_write_best_effort(This->pcm_handle, This->local_buffer, - min(This->held_frames, write_limit - written), This); + min(This->held_frames, write_limit - written), This, + This->session->mute); if(written < 0){ WARN("Couldn't write: %ld (%s)\n", written, snd_strerror(written)); return;

1 0

Michael Stefaniuc : shell32: COM cleanup for IExtractIconW.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 5718c0bc2291d7f60154477c64370b5e6e78214e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5718c0bc2291d7f60154477c6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 27 14:21:17 2012 +0100 shell32: COM cleanup for IExtractIconW. --- dlls/shell32/folders.c | 90 +++++++++++++++++++++-------------------------- 1 files changed, 40 insertions(+), 50 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 0143315..bf4c255 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -48,13 +48,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); */ typedef struct { - const IExtractIconWVtbl *lpVtbl; + IExtractIconW IExtractIconW_iface; LONG ref; const IPersistFileVtbl *lpvtblPersistFile; const IExtractIconAVtbl *lpvtblExtractIconA; LPITEMIDLIST pidl; } IExtractIconWImpl; +static inline IExtractIconWImpl *impl_from_IExtractIconW(IExtractIconW *iface) +{ + return CONTAINING_RECORD(iface, IExtractIconWImpl, IExtractIconW_iface); +} + static const IExtractIconAVtbl eiavt; static const IExtractIconWVtbl eivt; static const IPersistFileVtbl pfvt; @@ -81,7 +86,7 @@ IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl) ei = HeapAlloc(GetProcessHeap(),0,sizeof(IExtractIconWImpl)); ei->ref=1; - ei->lpVtbl = &eivt; + ei->IExtractIconW_iface.lpVtbl = &eivt; ei->lpvtblPersistFile = &pfvt; ei->lpvtblExtractIconA = &eiavt; ei->pidl=ILClone(pidl); @@ -89,52 +94,42 @@ IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl) pdump(pidl); TRACE("(%p)\n", ei); - return (IExtractIconW *)ei; + return &ei->IExtractIconW_iface; } /************************************************************************** - * IExtractIconW_QueryInterface + * IExtractIconW::QueryInterface */ -static HRESULT WINAPI IExtractIconW_fnQueryInterface(IExtractIconW *iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI IExtractIconW_fnQueryInterface(IExtractIconW *iface, REFIID riid, + void **ppv) { - IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + IExtractIconWImpl *This = impl_from_IExtractIconW(iface); - TRACE("(%p)->(\n\tIID:\t%s,%p)\n", This, debugstr_guid(riid), ppvObj); + TRACE("(%p)->(\n\tIID:\t%s,%p)\n", This, debugstr_guid(riid), ppv); - *ppvObj = NULL; + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IExtractIconW)) + *ppv = iface; + else if (IsEqualIID(riid, &IID_IPersistFile)) + *ppv = &This->lpvtblPersistFile; + else if (IsEqualIID(riid, &IID_IExtractIconA)) + *ppv = &This->lpvtblExtractIconA; - if (IsEqualIID(riid, &IID_IUnknown)) /*IUnknown*/ - { - *ppvObj = This; - } - else if (IsEqualIID(riid, &IID_IPersistFile)) /*IExtractIcon*/ - { - *ppvObj = &This->lpvtblPersistFile; - } - else if (IsEqualIID(riid, &IID_IExtractIconA)) /*IExtractIcon*/ - { - *ppvObj = &This->lpvtblExtractIconA; - } - else if (IsEqualIID(riid, &IID_IExtractIconW)) /*IExtractIcon*/ - { - *ppvObj = This; - } - - if(*ppvObj) - { - IExtractIconW_AddRef((IExtractIconW*) *ppvObj); - TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj); - return S_OK; - } - TRACE("-- Interface: E_NOINTERFACE\n"); - return E_NOINTERFACE; + if(*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + TRACE("-- Interface: (%p)->(%p)\n", ppv, *ppv); + return S_OK; + } + TRACE("-- Interface: E_NOINTERFACE\n"); + return E_NOINTERFACE; } /************************************************************************** -* IExtractIconW_AddRef +* IExtractIconW::AddRef */ static ULONG WINAPI IExtractIconW_fnAddRef(IExtractIconW * iface) { - IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + IExtractIconWImpl *This = impl_from_IExtractIconW(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount - 1); @@ -142,11 +137,11 @@ static ULONG WINAPI IExtractIconW_fnAddRef(IExtractIconW * iface) return refCount; } /************************************************************************** -* IExtractIconW_Release +* IExtractIconW::Release */ static ULONG WINAPI IExtractIconW_fnRelease(IExtractIconW * iface) { - IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + IExtractIconWImpl *This = impl_from_IExtractIconW(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount + 1); @@ -215,20 +210,14 @@ static HRESULT getIconLocationForFolder(IExtractIconWImpl *This, UINT uFlags, LP WCHAR swShell32Name[MAX_PATH]; /************************************************************************** -* IExtractIconW_GetIconLocation +* IExtractIconW::GetIconLocation * * mapping filetype to icon */ -static HRESULT WINAPI IExtractIconW_fnGetIconLocation( - IExtractIconW * iface, - UINT uFlags, /* GIL_ flags */ - LPWSTR szIconFile, - UINT cchMax, - int * piIndex, - UINT * pwFlags) /* returned GIL_ flags */ +static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UINT uFlags, + LPWSTR szIconFile, UINT cchMax, int * piIndex, UINT * pwFlags) { - IExtractIconWImpl *This = (IExtractIconWImpl *)iface; - + IExtractIconWImpl *This = impl_from_IExtractIconW(iface); char sTemp[MAX_PATH]; int icon_idx; GUID const * riid; @@ -383,11 +372,12 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation( } /************************************************************************** -* IExtractIconW_Extract +* IExtractIconW::Extract */ -static HRESULT WINAPI IExtractIconW_fnExtract(IExtractIconW * iface, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) +static HRESULT WINAPI IExtractIconW_fnExtract(IExtractIconW * iface, LPCWSTR pszFile, + UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) { - IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + IExtractIconWImpl *This = impl_from_IExtractIconW(iface); int index; FIXME("(%p) (file=%p index=%d %p %p size=%08x) semi-stub\n", This, debugstr_w(pszFile), (signed)nIconIndex,

1 0

Michael Stefaniuc : shell32: COM cleanup for IExtractIconA.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: f4f9be6eb0f66279706deeea03b4714e333f3257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f9be6eb0f66279706deeea0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 27 14:34:47 2012 +0100 shell32: COM cleanup for IExtractIconA. --- dlls/shell32/folders.c | 67 +++++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 34 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index c829c3a..01fc1a4 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -49,9 +49,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct { IExtractIconW IExtractIconW_iface; + IExtractIconA IExtractIconA_iface; LONG ref; const IPersistFileVtbl *lpvtblPersistFile; - const IExtractIconAVtbl *lpvtblExtractIconA; LPITEMIDLIST pidl; } IExtractIconWImpl; @@ -60,6 +60,11 @@ static inline IExtractIconWImpl *impl_from_IExtractIconW(IExtractIconW *iface) return CONTAINING_RECORD(iface, IExtractIconWImpl, IExtractIconW_iface); } +static inline IExtractIconWImpl *impl_from_IExtractIconA(IExtractIconA *iface) +{ + return CONTAINING_RECORD(iface, IExtractIconWImpl, IExtractIconA_iface); +} + static const IExtractIconAVtbl eiavt; static const IExtractIconWVtbl eivt; static const IPersistFileVtbl pfvt; @@ -69,11 +74,6 @@ static inline IExtractIconW *impl_from_IPersistFile( IPersistFile *iface ) return (IExtractIconW *)((char*)iface - FIELD_OFFSET(IExtractIconWImpl, lpvtblPersistFile)); } -static inline IExtractIconW *impl_from_IExtractIconA( IExtractIconA *iface ) -{ - return (IExtractIconW *)((char*)iface - FIELD_OFFSET(IExtractIconWImpl, lpvtblExtractIconA)); -} - /************************************************************************** * IExtractIconW_Constructor @@ -88,7 +88,7 @@ IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl) ei->ref=1; ei->IExtractIconW_iface.lpVtbl = &eivt; ei->lpvtblPersistFile = &pfvt; - ei->lpvtblExtractIconA = &eiavt; + ei->IExtractIconA_iface.lpVtbl = &eiavt; ei->pidl=ILClone(pidl); pdump(pidl); @@ -112,7 +112,7 @@ static HRESULT WINAPI IExtractIconW_fnQueryInterface(IExtractIconW *iface, REFII else if (IsEqualIID(riid, &IID_IPersistFile)) *ppv = &This->lpvtblPersistFile; else if (IsEqualIID(riid, &IID_IExtractIconA)) - *ppv = &This->lpvtblExtractIconA; + *ppv = &This->IExtractIconA_iface; if(*ppv) { @@ -409,59 +409,56 @@ static const IExtractIconWVtbl eivt = IExtractIconA* IExtractIconA_Constructor(LPCITEMIDLIST pidl) { IExtractIconWImpl *This = (IExtractIconWImpl *)IExtractIconW_Constructor(pidl); - IExtractIconA *eia = (IExtractIconA *)&This->lpvtblExtractIconA; + IExtractIconA *eia = &This->IExtractIconA_iface; TRACE("(%p)->(%p)\n", This, eia); return eia; } /************************************************************************** - * IExtractIconA_QueryInterface + * IExtractIconA::QueryInterface */ -static HRESULT WINAPI IExtractIconA_fnQueryInterface(IExtractIconA * iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI IExtractIconA_fnQueryInterface(IExtractIconA * iface, REFIID riid, + void **ppv) { - IExtractIconW *This = impl_from_IExtractIconA(iface); + IExtractIconWImpl *This = impl_from_IExtractIconA(iface); - return IExtractIconW_QueryInterface(This, riid, ppvObj); + return IExtractIconW_QueryInterface(&This->IExtractIconW_iface, riid, ppv); } /************************************************************************** -* IExtractIconA_AddRef +* IExtractIconA::AddRef */ static ULONG WINAPI IExtractIconA_fnAddRef(IExtractIconA * iface) { - IExtractIconW *This = impl_from_IExtractIconA(iface); + IExtractIconWImpl *This = impl_from_IExtractIconA(iface); - return IExtractIconW_AddRef(This); + return IExtractIconW_AddRef(&This->IExtractIconW_iface); } /************************************************************************** -* IExtractIconA_Release +* IExtractIconA::Release */ static ULONG WINAPI IExtractIconA_fnRelease(IExtractIconA * iface) { - IExtractIconW *This = impl_from_IExtractIconA(iface); + IExtractIconWImpl *This = impl_from_IExtractIconA(iface); - return IExtractIconW_Release(This); + return IExtractIconW_Release(&This->IExtractIconW_iface); } /************************************************************************** -* IExtractIconA_GetIconLocation +* IExtractIconA::GetIconLocation * * mapping filetype to icon */ -static HRESULT WINAPI IExtractIconA_fnGetIconLocation( - IExtractIconA * iface, - UINT uFlags, - LPSTR szIconFile, - UINT cchMax, - int * piIndex, - UINT * pwFlags) +static HRESULT WINAPI IExtractIconA_fnGetIconLocation(IExtractIconA * iface, UINT uFlags, + LPSTR szIconFile, UINT cchMax, int * piIndex, UINT * pwFlags) { + IExtractIconWImpl *This = impl_from_IExtractIconA(iface); HRESULT ret; LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, cchMax * sizeof(WCHAR)); - IExtractIconW *This = impl_from_IExtractIconA(iface); - + TRACE("(%p) (flags=%u %p %u %p %p)\n", This, uFlags, szIconFile, cchMax, piIndex, pwFlags); - ret = IExtractIconW_GetIconLocation(This, uFlags, lpwstrFile, cchMax, piIndex, pwFlags); + ret = IExtractIconW_GetIconLocation(&This->IExtractIconW_iface, uFlags, lpwstrFile, cchMax, + piIndex, pwFlags); WideCharToMultiByte(CP_ACP, 0, lpwstrFile, -1, szIconFile, cchMax, NULL, NULL); HeapFree(GetProcessHeap(), 0, lpwstrFile); @@ -469,19 +466,21 @@ static HRESULT WINAPI IExtractIconA_fnGetIconLocation( return ret; } /************************************************************************** -* IExtractIconA_Extract +* IExtractIconA::Extract */ -static HRESULT WINAPI IExtractIconA_fnExtract(IExtractIconA * iface, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) +static HRESULT WINAPI IExtractIconA_fnExtract(IExtractIconA * iface, LPCSTR pszFile, + UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) { + IExtractIconWImpl *This = impl_from_IExtractIconA(iface); HRESULT ret; INT len = MultiByteToWideChar(CP_ACP, 0, pszFile, -1, NULL, 0); LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - IExtractIconW *This = impl_from_IExtractIconA(iface); TRACE("(%p) (file=%p index=%u %p %p size=%u)\n", This, pszFile, nIconIndex, phiconLarge, phiconSmall, nIconSize); MultiByteToWideChar(CP_ACP, 0, pszFile, -1, lpwstrFile, len); - ret = IExtractIconW_Extract(This, lpwstrFile, nIconIndex, phiconLarge, phiconSmall, nIconSize); + ret = IExtractIconW_Extract(&This->IExtractIconW_iface, lpwstrFile, nIconIndex, phiconLarge, + phiconSmall, nIconSize); HeapFree(GetProcessHeap(), 0, lpwstrFile); return ret; }

1 0

Jacek Caban : mshtml: Follow anchors only on left button click.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 0b55645820cd1619965f0ffce4750a658a4dab90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b55645820cd1619965f0ffce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 15:55:33 2012 +0100 mshtml: Follow anchors only on left button click. --- dlls/mshtml/htmlanchor.c | 26 +++++++++++++++++++++++--- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 13bd2a4..1424f1e 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -18,6 +18,7 @@ #include <stdarg.h> #include <stdio.h> +#include <assert.h> #define COBJMACROS @@ -583,14 +584,33 @@ static void HTMLAnchorElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } -static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, BOOL *prevent_default) +static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface); if(eid == EVENTID_CLICK) { + nsIDOMMouseEvent *mouse_event; + PRUint16 button; + nsresult nsres; + TRACE("CLICK\n"); - *prevent_default = TRUE; - return navigate_anchor(This); + + nsres = nsIDOMEvent_QueryInterface(event, &IID_nsIDOMMouseEvent, (void**)&mouse_event); + assert(nsres == NS_OK); + + nsres = nsIDOMMouseEvent_GetButton(mouse_event, &button); + assert(nsres == NS_OK); + + nsIDOMMouseEvent_Release(mouse_event); + + switch(button) { + case 0: + *prevent_default = TRUE; + return navigate_anchor(This); + default: + *prevent_default = FALSE; + return S_OK; + } } return S_OK; diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 74e8069..b2efeed 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1065,7 +1065,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode break; if(node && node->vtbl->handle_event) { - hres = node->vtbl->handle_event(node, eid, &prevent_default); + hres = node->vtbl->handle_event(node, eid, nsevent, &prevent_default); if(FAILED(hres) || prevent_default) break; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7373e15..20923e9 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -518,7 +518,7 @@ typedef struct { HRESULT (*get_attr_col)(HTMLDOMNode*,HTMLAttributeCollection**); event_target_t **(*get_event_target)(HTMLDOMNode*); HRESULT (*fire_event)(HTMLDOMNode*,DWORD,BOOL*); - HRESULT (*handle_event)(HTMLDOMNode*,DWORD,BOOL*); + HRESULT (*handle_event)(HTMLDOMNode*,DWORD,nsIDOMEvent*,BOOL*); HRESULT (*put_disabled)(HTMLDOMNode*,VARIANT_BOOL); HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*); HRESULT (*get_document)(HTMLDOMNode*,IDispatch**);

1 0