June 2012 - Wine-Commits - list.winehq.org

Roderick Colenbrander : opengl32: Check for valid context in wglGetProcAddress.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: c9962bbb581057b0f06473d3360631ed130b4bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9962bbb581057b0f06473d33… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jun 24 22:42:11 2012 -0700 opengl32: Check for valid context in wglGetProcAddress. --- dlls/opengl32/tests/opengl.c | 2 +- dlls/opengl32/wgl.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index ffc676e..c18b0ad 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -797,7 +797,7 @@ static void test_getprocaddress(HDC hdc) /* Temporarily disable the context, so we can see that we can't retrieve functions now. */ wglMakeCurrent(hdc, NULL); func = wglGetProcAddress("glActiveTextureARB"); - todo_wine ok(func == NULL, "Function lookup without a context passed, expected a failure; last error %#x\n", GetLastError()); + ok(func == NULL, "Function lookup without a context passed, expected a failure; last error %#x\n", GetLastError()); wglMakeCurrent(hdc, ctx); } diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 98b04d4..9200dd6 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -300,9 +300,18 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { TRACE("(%s)\n", lpszProc); - if(lpszProc == NULL) + if (lpszProc == NULL) return NULL; + /* Without an active context opengl32 doesn't know to what + * driver it has to dispatch wglGetProcAddress. + */ + if (wglGetCurrentContext() == NULL) + { + WARN("No active WGL context found\n"); + return NULL; + } + /* First, look if it's not already defined in the 'standard' OpenGL functions */ if ((local_func = GetProcAddress(opengl32_handle, lpszProc)) != NULL) { TRACE(" found function in 'standard' OpenGL functions (%p)\n", local_func);

1 0

Nikolay Sivov : msxml3: Initial implementation of attributeDecl() in writer .
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: d20e487717cb9e6b47629932f44d9b7c9212df2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20e487717cb9e6b47629932f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 23 13:38:03 2012 +0400 msxml3: Initial implementation of attributeDecl() in writer. --- dlls/msxml3/mxwriter.c | 34 ++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/saxreader.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index daa6db8..b9989b2 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1481,10 +1481,40 @@ static HRESULT WINAPI SAXDeclHandler_attributeDecl(ISAXDeclHandler *iface, const WCHAR *value, int n_value) { mxwriter *This = impl_from_ISAXDeclHandler( iface ); - FIXME("(%p)->(%s:%d %s:%d %s:%d %s:%d %s:%d): stub\n", This, debugstr_wn(element, n_element), n_element, + static const WCHAR attlistW[] = {'<','!','A','T','T','L','I','S','T',' '}; + static const WCHAR closeelementW[] = {'>','\r','\n'}; + + TRACE("(%p)->(%s:%d %s:%d %s:%d %s:%d %s:%d)\n", This, debugstr_wn(element, n_element), n_element, debugstr_wn(attr, n_attr), n_attr, debugstr_wn(type, n_type), n_type, debugstr_wn(Default, n_default), n_default, debugstr_wn(value, n_value), n_value); - return E_NOTIMPL; + + write_output_buffer(This->buffer, attlistW, sizeof(attlistW)/sizeof(WCHAR)); + if (n_element) { + write_output_buffer(This->buffer, element, n_element); + write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + } + + if (n_attr) { + write_output_buffer(This->buffer, attr, n_attr); + write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + } + + if (n_type) { + write_output_buffer(This->buffer, type, n_type); + write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + } + + if (n_default) { + write_output_buffer(This->buffer, Default, n_default); + write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + } + + if (n_value) + write_output_buffer_quoted(This->buffer, value, n_value); + + write_output_buffer(This->buffer, closeelementW, sizeof(closeelementW)/sizeof(WCHAR)); + + return S_OK; } static HRESULT WINAPI SAXDeclHandler_internalEntityDecl(ISAXDeclHandler *iface, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index be96716..5efe44e 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4450,6 +4450,44 @@ static void test_mxwriter_dtd(void) V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); + /* attribute declaration */ + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + EXPECT_HR(hr, S_OK); + + hr = ISAXDeclHandler_attributeDecl(decl, _bstr_("element"), strlen("element"), + _bstr_("attribute"), strlen("attribute"), _bstr_("CDATA"), strlen("CDATA"), + _bstr_("#REQUIRED"), strlen("#REQUIRED"), _bstr_("value"), strlen("value")); + 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_("<!ATTLIST element attribute CDATA #REQUIRED \"value\">\r\n"), + V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = ISAXDeclHandler_attributeDecl(decl, _bstr_("element"), strlen("element"), + _bstr_("attribute2"), strlen("attribute2"), _bstr_("CDATA"), strlen("CDATA"), + _bstr_("#REQUIRED"), strlen("#REQUIRED"), _bstr_("value2"), strlen("value2")); + EXPECT_HR(hr, S_OK); + + hr = ISAXDeclHandler_attributeDecl(decl, _bstr_("element2"), strlen("element2"), + _bstr_("attribute3"), strlen("attribute3"), _bstr_("CDATA"), strlen("CDATA"), + _bstr_("#REQUIRED"), strlen("#REQUIRED"), _bstr_("value3"), strlen("value3")); + 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_("<!ATTLIST element attribute CDATA #REQUIRED \"value\">\r\n" + "<!ATTLIST element attribute2 CDATA #REQUIRED \"value2\">\r\n" + "<!ATTLIST element2 attribute3 CDATA #REQUIRED \"value3\">\r\n"), + V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + ISAXContentHandler_Release(content); ISAXLexicalHandler_Release(lexical); ISAXDeclHandler_Release(decl);

1 0

Austin English : kernel32: Add more tracing to GetDiskFreeSpaceW.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: 729afb18fe200a296498ec7fe15cc221e3494f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=729afb18fe200a296498ec7fe… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jun 25 01:03:37 2012 -0500 kernel32: Add more tracing to GetDiskFreeSpaceW. --- dlls/kernel32/volume.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 23bcca1..8377e41 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1687,6 +1687,8 @@ BOOL WINAPI GetDiskFreeSpaceW( LPCWSTR root, LPDWORD cluster_sectors, if (sector_bytes) *sector_bytes = info.BytesPerSector; if (free_clusters) *free_clusters = info.AvailableAllocationUnits.u.LowPart; if (total_clusters) *total_clusters = info.TotalAllocationUnits.u.LowPart; + TRACE("%#08x, %#08x, %#08x, %#08x\n", info.SectorsPerAllocationUnit, info.BytesPerSector, + info.AvailableAllocationUnits.u.LowPart, info.TotalAllocationUnits.u.LowPart); return TRUE; }

1 0

Nikolay Sivov : msxml3: Fix closing of open element.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: 7c9a1b52e3ba49ee77a6125ccbd8b0e4ff8d2d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c9a1b52e3ba49ee77a6125cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 23 12:29:14 2012 +0400 msxml3: Fix closing of open element. --- dlls/msxml3/mxwriter.c | 9 ++-- dlls/msxml3/tests/saxreader.c | 91 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 0455dc4..daa6db8 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1071,7 +1071,8 @@ static HRESULT WINAPI SAXContentHandler_startElement( TRACE("(%p)->(%s %s %s %p)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), debugstr_wn(local_name, nlocal_name), debugstr_wn(QName, nQName), attr); - if ((!namespaceUri || !local_name || !QName) && This->class_version != MSXML6) + if (((!namespaceUri || !local_name || !QName) && This->class_version != MSXML6) || + (nQName == -1 && This->class_version == MSXML6)) return E_INVALIDARG; close_element_starttag(This); @@ -1139,13 +1140,13 @@ static HRESULT WINAPI SAXContentHandler_endElement( TRACE("(%p)->(%s:%d %s:%d %s:%d)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), nnamespaceUri, debugstr_wn(local_name, nlocal_name), nlocal_name, debugstr_wn(QName, nQName), nQName); - if ((!namespaceUri || !local_name || !QName) && This->class_version != MSXML6) + if (((!namespaceUri || !local_name || !QName) && This->class_version != MSXML6) || + (nQName == -1 && This->class_version == MSXML6)) return E_INVALIDARG; - if (This->element && QName && !strncmpW(This->element, QName, nQName)) + if (This->element) { static const WCHAR closeW[] = {'/','>'}; - write_output_buffer(This->buffer, closeW, 2); } else diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 267aea3..be96716 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3304,6 +3304,94 @@ static void test_mxwriter_startendelement_batch(const struct writer_startendelem free_bstrs(); } +/* point of these test is to start/end element with different names and name lengths */ +struct writer_startendelement2_t { + const GUID *clsid; + const char *qnamestart; + int qnamestart_len; + const char *qnameend; + int qnameend_len; + const char *output; + HRESULT hr; +}; + +static const struct writer_startendelement2_t writer_startendelement2[] = { + { &CLSID_MXXMLWriter, "a", -1, "b", -1, "<a/>", S_OK }, + { &CLSID_MXXMLWriter30, "a", -1, "b", -1, "<a/>", S_OK }, + { &CLSID_MXXMLWriter40, "a", -1, "b", -1, "<a/>", S_OK }, + /* -1 length is not allowed for version 6 */ + { &CLSID_MXXMLWriter60, "a", -1, "b", -1, "<a/>", E_INVALIDARG }, + + { &CLSID_MXXMLWriter, "a", 1, "b", 1, "<a/>", S_OK }, + { &CLSID_MXXMLWriter30, "a", 1, "b", 1, "<a/>", S_OK }, + { &CLSID_MXXMLWriter40, "a", 1, "b", 1, "<a/>", S_OK }, + { &CLSID_MXXMLWriter60, "a", 1, "b", 1, "<a/>", S_OK }, + { NULL } +}; + +static void test_mxwriter_startendelement_batch2(const struct writer_startendelement2_t *table) +{ + int i = 0; + + while (table->clsid) + { + ISAXContentHandler *content; + IMXWriter *writer; + HRESULT hr; + + if (!is_clsid_supported(table->clsid, mxwriter_support_data)) + { + table++; + i++; + continue; + } + + hr = CoCreateInstance(table->clsid, 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_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_(""), 0, + _bstr_(table->qnamestart), table->qnamestart_len, NULL); + ok(hr == table->hr, "test %d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); + + hr = ISAXContentHandler_endElement(content, _bstr_(""), 0, _bstr_(""), 0, + _bstr_(table->qnameend), table->qnameend_len); + ok(hr == table->hr, "test %d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); + + /* test output */ + if (hr == S_OK) + { + VARIANT dest; + + 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_(table->output), V_BSTR(&dest)), + "test %d: got wrong content %s, expected %s\n", i, wine_dbgstr_w(V_BSTR(&dest)), table->output); + VariantClear(&dest); + } + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + table++; + i++; + + free_bstrs(); + } +} + + static void test_mxwriter_startendelement(void) { ISAXContentHandler *content; @@ -3312,6 +3400,7 @@ static void test_mxwriter_startendelement(void) HRESULT hr; test_mxwriter_startendelement_batch(writer_startendelement); + test_mxwriter_startendelement_batch2(writer_startendelement2); hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); @@ -3410,6 +3499,7 @@ static void test_mxwriter_startendelement(void) hr = IMXWriter_put_output(writer, dest); EXPECT_HR(hr, S_OK); + /* length -1 */ hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("a"), -1, NULL); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; @@ -3417,6 +3507,7 @@ static void test_mxwriter_startendelement(void) EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); ok(!lstrcmpW(_bstr_("<a>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); ISAXContentHandler_Release(content); IMXWriter_Release(writer);

1 0

Nikolay Sivov : msxml3: Return stream reference from get_output() if stream is set.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: 6ab3f1ae9940351f0a26d09516f185f452e9a8b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab3f1ae9940351f0a26d0951… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 22 22:36:04 2012 +0400 msxml3: Return stream reference from get_output() if stream is set. --- dlls/msxml3/mxwriter.c | 11 ++++++++--- dlls/msxml3/tests/saxreader.c | 13 +++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 81d498e..0382690 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -755,6 +755,8 @@ static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest) TRACE("(%p)->(%p)\n", This, dest); + if (!dest) return E_POINTER; + if (!This->dest) { HRESULT hr = flush_output_buffer(This); @@ -766,10 +768,13 @@ static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest) return S_OK; } - else - FIXME("not implemented when stream is set up\n"); - return E_NOTIMPL; + /* we only support IStream output so far */ + V_VT(dest) = VT_UNKNOWN; + V_UNKNOWN(dest) = (IUnknown*)This->dest; + IStream_AddRef(This->dest); + + return S_OK; } static HRESULT WINAPI mxwriter_put_encoding(IMXWriter *iface, BSTR encoding) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index c9480a9..e7e3172 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2821,6 +2821,7 @@ static void test_mxwriter_flush(void) VARIANT dest; HRESULT hr; char *buff; + LONG ref; hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); @@ -2930,6 +2931,18 @@ static void test_mxwriter_flush(void) todo_wine ok(pos2.QuadPart != 0, "unexpected stream beginning\n"); + hr = IMXWriter_get_output(writer, NULL); + EXPECT_HR(hr, E_POINTER); + + ref = get_refcount(stream); + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_UNKNOWN, "got vt type %d\n", V_VT(&dest)); + ok(V_UNKNOWN(&dest) == (IUnknown*)stream, "got pointer %p\n", V_UNKNOWN(&dest)); + ok(ref+1 == get_refcount(stream), "expected increased refcount\n"); + VariantClear(&dest); + hr = ISAXContentHandler_endDocument(content); EXPECT_HR(hr, S_OK);

1 0

Julian Rüger : localui/tests: Fix typos/grammar.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: f1709a9936eb5b798b03015fe1e5f9ac2c268962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1709a9936eb5b798b03015fe… Author: Julian Rüger <jr98(a)gmx.net> Date: Sun Jun 24 17:45:47 2012 +0200 localui/tests: Fix typos/grammar. --- dlls/localui/tests/localui.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index b3422aa..e32a376 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -72,7 +72,7 @@ static PORT_INFO_2W * find_portinfo2(LPWSTR pPort) if (!pi_buffer) { res = EnumPortsW(NULL, 2, NULL, 0, &pi_needed, &pi_numports); if (!res && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { - win_skip("The Service 'Spooler' is required for many test\n"); + win_skip("The service 'Spooler' is required for many tests\n"); return NULL; } ok(!res, "EnumPorts succeeded: got %d\n", res); @@ -165,12 +165,12 @@ static void test_AddPortUI(void) SetLastError(0xdeadbeef); new_portname = NULL; /* - * - On MSDN, you can read, that no dialogs should be displayed, when hWnd + * - On MSDN, you can read that no dialog should be displayed when hWnd * is NULL, but native localui does not care - * - when the new port already exist, + * - When the new port already exists, * TRUE is returned, but new_portname is NULL - * - when the new port starts with "COM" or "LPT", - * FALSE is returned with ERROR_NOT_SUPPORTED in windows + * - When the new port starts with "COM" or "LPT", + * FALSE is returned with ERROR_NOT_SUPPORTED on windows */ res = pAddPortUI(NULL, NULL, localportW, &new_portname); ok( res || @@ -297,7 +297,7 @@ START_TEST(localui) } } - /* find installed Ports */ + /* find installed ports */ /* "FILE:" */ file_present = find_portinfo2(portname_fileW);

1 0

Lauri Kenttä : po: Add missing =' s in the Catalan translation.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: e637bd910ab949188f37636566ed0081fd3ace34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e637bd910ab949188f3763656… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Jun 23 13:47:09 2012 +0300 po: Add missing ='s in the Catalan translation. --- po/ca.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ca.po b/po/ca.po index 616149a..2205637 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1850,7 +1850,7 @@ msgstr "Ús de Clau Desconegut" #: crypt32.rc:191 msgid "Subject Type=" -msgstr "Tipus d'Entitat" +msgstr "Tipus d'Entitat=" #: crypt32.rc:192 msgctxt "Certificate Authority" @@ -1863,7 +1863,7 @@ msgstr "Entitat Final" #: crypt32.rc:194 msgid "Path Length Constraint=" -msgstr "Restricció de Longitud de Ruta" +msgstr "Restricció de Longitud de Ruta=" #: crypt32.rc:195 msgctxt "path length"

1 0

Eric Pouech : winedbg: In 'info locals' command, show the full register/ stack layout for parameters & locals.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: 244099689cbda165b0eaded0c7aeed05e26feec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=244099689cbda165b0eaded0c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 24 13:03:09 2012 +0200 winedbg: In 'info locals' command, show the full register/stack layout for parameters & locals. --- programs/winedbg/symbol.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 8d7af5d..99b382d 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -81,11 +81,20 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG_PTR base, else if (sym->Flags & SYMFLAG_REGREL) { DWORD_PTR* pval; + size_t l; + *buffer++ = '['; sz--; if (!memory_get_register(sym->Register, &pval, buffer, sz)) return FALSE; + l = strlen(buffer); + sz -= l; + buffer += l; lvalue->cookie = DLV_TARGET; lvalue->addr.Offset = (ULONG64)*pval + sym->Address; + if ((LONG_PTR)sym->Address >= 0) + snprintf(buffer, sz, "+%ld]", (ULONG_PTR)sym->Address); + else + snprintf(buffer, sz, "-%ld]", -(LONG_PTR)sym->Address); } else if (sym->Flags & SYMFLAG_VALUEPRESENT) { @@ -711,7 +720,7 @@ void symbol_print_local(const SYMBOL_INFO* sym, DWORD_PTR base, BOOL detailed) { print_value(&lvalue, 0, 1); if (detailed) - dbg_printf(" (%s%s)", + dbg_printf(" (%s %s)", (sym->Flags & SYMFLAG_PARAMETER) ? "parameter" : "local", buffer); }

1 0

Chris Robinson : quartz: Fix frame length calculation for MPEG audio.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: 037cefc43b228b60d3fc287dfb38427e2aea2086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=037cefc43b228b60d3fc287df… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Jun 23 08:35:16 2012 -0700 quartz: Fix frame length calculation for MPEG audio. --- dlls/quartz/mpegsplit.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 585851b..a45f401 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -154,11 +154,17 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) return E_INVALIDARG; } - - if (layer == 3 || layer == 2) + if (layer == 1) + length = 4 * (12 * bitrate / freqs[freq_index] + padding); + else if (layer == 2) length = 144 * bitrate / freqs[freq_index] + padding; + else if (layer == 3) + length = 144 * bitrate / (freqs[freq_index]<<lsf) + padding; else - length = 4 * (12 * bitrate / freqs[freq_index] + padding); + { + ERR("Impossible layer %d\n", layer); + return E_INVALIDARG; + } duration = (ULONGLONG)10000000 * (ULONGLONG)(length) / (ULONGLONG)(bitrate/8); *plen = length;

1 0

Francois Gouget : d3dx9_36/tests: Simplify test_D3DXSHMultiply3().
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: b2e3e2e9439ca0e7c106209a59e41d5beed54445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e3e2e9439ca0e7c106209a5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 23 17:11:25 2012 +0200 d3dx9_36/tests: Simplify test_D3DXSHMultiply3(). --- dlls/d3dx9_36/tests/math.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index c2a652c..70290bf 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2403,10 +2403,11 @@ static void test_D3DXSHMultiply3(void) { unsigned int i; FLOAT a[20], b[20], c[20]; - const FLOAT expected[] = - { 7.813913f, 2.256058f, 5.9484005f, 4.970894f, 2.899858f, 3.598946f, 1.726572f, 5.573538f, - 0.622063f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, 16.0f, 17.0f, 18.0f, 19.0f, }; - + /* D3DXSHMultiply only modifies the first 9 elements of the array */ + const FLOAT expected[20] = + { 7.813913f, 2.256058f, 5.9484005f, 4.970894f, 2.899858f, 3.598946f, + 1.726572f, 5.573538f, 0.622063f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, + 14.0f, 15.0f, 16.0f, 17.0f, 18.0f, 19.0f }; for (i = 0; i < 20; i++) { @@ -2416,14 +2417,8 @@ static void test_D3DXSHMultiply3(void) } D3DXSHMultiply3(c, a, b); - for (i = 0; i < 9; i++) - ok(relative_error(c[i], expected[i]) < admitted_error, "Expected[%d] = %f, received = %f\n", i, expected[i], c[i]); - -/* D3DXSHMultiply does not modify the elements of the array after the nineth element */ - for (i = 8; i < 19; i++) + for (i = 0; i < 20; i++) ok(relative_error(c[i], expected[i]) < admitted_error, "Expected[%d] = %f, received = %f\n", i, expected[i], c[i]); - - return; } START_TEST(math)

1 0