February 2010 - Wine-commits

Alexandre Julliard : makefiles: Build the import libraries directly from the top-level makefile.
by Alexandre Julliard 10 Feb '10

10 Feb '10

Module: wine Branch: master Commit: 86ab297bea926651be324cccaf223226350a32a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ab297bea926651be324ccca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 10 10:57:57 2010 +0100 makefiles: Build the import libraries directly from the top-level makefile. --- Makefile.in | 9 +- aclocal.m4 | 29 +- configure | 1327 ++++++++++++++++++++++++++++++------------------------ configure.ac | 1 - dlls/Makefile.in | 17 - 5 files changed, 752 insertions(+), 631 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=86ab297bea926651be324…

1 0

Alexandre Julliard : makefiles: Build the tests directly from the top-level makefile.
by Alexandre Julliard 10 Feb '10

10 Feb '10

Module: wine Branch: master Commit: ea9a113a811ec1da981296452676976170208f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9a113a811ec1da981296452… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 10 11:03:16 2010 +0100 makefiles: Build the tests directly from the top-level makefile. --- Makefile.in | 27 ++- aclocal.m4 | 5 +- configure | 636 +++++++++++++++++++++++++++++++++++++++++++++--------- dlls/Makefile.in | 5 +- 4 files changed, 553 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea9a113a811ec1da98129…

1 0

Alexandre Julliard : makefiles: Disable winetest when tests are disabled.
by Alexandre Julliard 10 Feb '10

10 Feb '10

Module: wine Branch: master Commit: 95081550fd5b8808204748b53682259fbd7d0b7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=95081550fd5b8808204748b53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 19:08:17 2010 +0100 makefiles: Disable winetest when tests are disabled. --- configure | 2 ++ configure.ac | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/configure b/configure index bc61d07..0d59588 100755 --- a/configure +++ b/configure @@ -4111,6 +4111,8 @@ esac enable_win16=${enable_win16:-no} +enable_winetest=${enable_winetest:-$enable_tests} + if test -n "$with_wine64" then if test "x$enable_win64" = "xyes" diff --git a/configure.ac b/configure.ac index b0e6a48..6276241 100644 --- a/configure.ac +++ b/configure.ac @@ -170,6 +170,9 @@ esac dnl enable_win16 defaults to yes on x86, to no on other CPUs enable_win16=${enable_win16:-no} +dnl Disable winetest too if tests are disabled +enable_winetest=${enable_winetest:-$enable_tests} + dnl Some special cases for the wow64 build if test -n "$with_wine64" then

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.38
by Jeremy Newman 10 Feb '10

10 Feb '10

Module: website Branch: master Commit: 25a06f9b315762f468d00765416304bfe2f59dca URL: http://source.winehq.org/git/website.git/?a=commit;h=25a06f9b315762f468d007… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Feb 9 19:45:17 2010 +0100 Polish translation for release 1.1.38 --- news/pl/2010020501.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pl/2010020501.xml b/news/pl/2010020501.xml new file mode 100644 index 0000000..f0f5ec0 --- /dev/null +++ b/news/pl/2010020501.xml @@ -0,0 +1,18 @@ +<news> +<date>Luty 5, 2010</date> +<title>Wydano Wine 1.1.38</title> +<body> + Wydanie rozwojowe Wine 1.1.38 jest już dostępne. + <a href="{$root}/announce/1.1.38">Co nowego</a> w tym wydaniu: +<ul> + <li>Lepsze wsparcie w debugowaniu alokowania pamięci.</li> + <li>Ulepszone wsparcie MIDI.</li> + <li>Szeroka gama poprawek w Direct3D.</li> + <li>poprawki OLEDB (powinny naprawić Cliparty w pakiecie Office).</li> + <li>Ulepszone wsparcie debugera na x86-64.</li> + <li>Wiele poprawek w MSI.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.38.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Nikolay Sivov : msxml3: Support comment node type in IXMLDOMNode_get_baseName.
by Alexandre Julliard 09 Feb '10

09 Feb '10

Module: wine Branch: master Commit: a9fc71b48eb6fdffacba5a36dbc5d3f51e0a94ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9fc71b48eb6fdffacba5a36d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Feb 9 18:07:54 2010 +0300 msxml3: Support comment node type in IXMLDOMNode_get_baseName. --- dlls/msxml3/node.c | 1 + dlls/msxml3/tests/domdoc.c | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index ebf865e..d486bd9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1626,6 +1626,7 @@ static HRESULT WINAPI xmlnode_get_baseName( r = S_OK; break; case XML_TEXT_NODE: + case XML_COMMENT_NODE: break; default: ERR("Unhandled type %d\n", This->node->type ); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index bc052be..3c5c53c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -982,6 +982,12 @@ static void test_domdoc( void ) ok(r == S_FALSE, "ret %08x\n", r ); ok(nodeChild == NULL, "pLastChild not NULL\n"); + /* baseName */ + str = (BSTR)0xdeadbeef; + IXMLDOMComment_get_baseName(node_comment, &str); + ok(r == S_FALSE, "ret %08x\n", r ); + ok(str == NULL, "Expected NULL\n"); + IXMLDOMComment_Release( node_comment ); }

1 0

Andrew Nguyen : mshtml: Accept NULL SAFEARRAY pointers in IHTMLDocument2:: write(ln).
by Alexandre Julliard 09 Feb '10

09 Feb '10

Module: wine Branch: master Commit: b3b81abba3b4eb6ed84049a8720517b926369e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b81abba3b4eb6ed84049a87… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue Feb 9 09:54:03 2010 -0600 mshtml: Accept NULL SAFEARRAY pointers in IHTMLDocument2::write(ln). --- dlls/mshtml/htmldoc.c | 3 +++ dlls/mshtml/tests/dom.c | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 538a02f..f99ab29 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -776,6 +776,9 @@ static HRESULT document_write(HTMLDocument *This, SAFEARRAY *psarray, BOOL ln) return E_UNEXPECTED; } + if (!psarray) + return S_OK; + if(psarray->cDims != 1) { FIXME("cDims=%d\n", psarray->cDims); return E_INVALIDARG; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c0128a6..7fd9262 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5921,6 +5921,22 @@ static void test_create_elems(IHTMLDocument2 *doc) IHTMLElement_Release(body); } +static void test_null_write(IHTMLDocument2 *doc) +{ + HRESULT hres; + + doc_write(doc, FALSE, NULL); + doc_write(doc, TRUE, NULL); + + hres = IHTMLDocument2_write(doc, NULL); + ok(hres == S_OK, + "Expected IHTMLDocument2::write to return S_OK, got 0x%08x\n", hres); + + hres = IHTMLDocument2_writeln(doc, NULL); + ok(hres == S_OK, + "Expected IHTMLDocument2::writeln to return S_OK, got 0x%08x\n", hres); +} + static void test_exec(IUnknown *unk, const GUID *grpid, DWORD cmdid, VARIANT *in, VARIANT *out) { IOleCommandTarget *cmdtrg; @@ -6395,6 +6411,7 @@ START_TEST(dom) run_domtest(elem_test2_str, test_elems2); run_domtest(doc_blank, test_create_elems); run_domtest(doc_blank, test_defaults); + run_domtest(doc_blank, test_null_write); run_domtest(indent_test_str, test_indent); run_domtest(cond_comment_str, test_cond_comment); run_domtest(frameset_str, test_frameset);

1 0

Nikolay Sivov : msxml3: Create entity reference node properly.
by Alexandre Julliard 09 Feb '10

09 Feb '10

Module: wine Branch: master Commit: 970ec3d6991724803762d7bb0fa45f6d3ef58ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=970ec3d6991724803762d7bb0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Feb 9 03:43:38 2010 +0300 msxml3: Create entity reference node properly. --- dlls/msxml3/node.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 2487fa8..ebf865e 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1738,6 +1738,9 @@ IXMLDOMNode *create_node( xmlNodePtr node ) case XML_CDATA_SECTION_NODE: pUnk = create_cdata( node ); break; + case XML_ENTITY_REF_NODE: + pUnk = create_doc_entity_ref( node ); + break; case XML_PI_NODE: pUnk = create_pi( node ); break;

1 0

Alistair Leslie-Hughes : dbghelp: Add stubs for SymGetLineFromName, SymGetLineFromName64, SymGetLineFromNameW64.
by Alexandre Julliard 09 Feb '10

09 Feb '10

Module: wine Branch: master Commit: a204f099c6ab14544bf50e8e4019245fa393e004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a204f099c6ab14544bf50e8e4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 9 19:45:22 2010 +1100 dbghelp: Add stubs for SymGetLineFromName, SymGetLineFromName64, SymGetLineFromNameW64. --- dlls/dbghelp/dbghelp.spec | 6 +++--- dlls/dbghelp/symbol.c | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 825493a..5ab6fb2 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -86,9 +86,9 @@ @ stdcall SymGetLineFromAddr(long long ptr ptr) @ stdcall SymGetLineFromAddr64(long double ptr ptr) @ stdcall SymGetLineFromAddrW64(long double ptr ptr) -@ stub SymGetLineFromName -@ stub SymGetLineFromName64 -@ stub SymGetLineFromNameW64 +@ stdcall SymGetLineFromName(long str str long ptr ptr) +@ stdcall SymGetLineFromName64(long str str long ptr ptr) +@ stdcall SymGetLineFromNameW64(long wstr wstr long ptr ptr) @ stdcall SymGetLineNext(long ptr) @ stdcall SymGetLineNext64(long ptr) @ stub SymGetLineNextW64 diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 0b66cdb..07ba9a3 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -2037,3 +2037,27 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, regfree(&re); return TRUE; } + +BOOL WINAPI SymGetLineFromName(HANDLE hProcess, PCSTR ModuleName, PCSTR FileName, + DWORD dwLineNumber, PLONG plDisplacement, PIMAGEHLP_LINE Line) +{ + FIXME("(%p) (%s, %s, %d %p %p): stub\n", hProcess, ModuleName, FileName, + dwLineNumber, plDisplacement, Line); + return FALSE; +} + +BOOL WINAPI SymGetLineFromName64(HANDLE hProcess, PCSTR ModuleName, PCSTR FileName, + DWORD dwLineNumber, PLONG lpDisplacement, PIMAGEHLP_LINE64 Line) +{ + FIXME("(%p) (%s, %s, %d %p %p): stub\n", hProcess, ModuleName, FileName, + dwLineNumber, lpDisplacement, Line); + return FALSE; +} + +BOOL WINAPI SymGetLineFromNameW64(HANDLE hProcess, PCWSTR ModuleName, PCWSTR FileName, + DWORD dwLineNumber, PLONG plDisplacement, PIMAGEHLP_LINEW64 Line) +{ + FIXME("(%p) (%s, %s, %d %p %p): stub\n", hProcess, debugstr_w(ModuleName), debugstr_w(FileName), + dwLineNumber, plDisplacement, Line); + return FALSE; +}

1 0

Dmitry Timoshkov : user32: In a DLGTEMPLATEEX resource dialog version goes before signature.
by Alexandre Julliard 09 Feb '10

09 Feb '10

Module: wine Branch: master Commit: 9e93906658f18d4d0bb5ef65936bea38c83360bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e93906658f18d4d0bb5ef659… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 9 19:06:21 2010 +0800 user32: In a DLGTEMPLATEEX resource dialog version goes before signature. --- dlls/user32/dialog.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 13aebe0..d95746b 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -349,10 +349,10 @@ static LPCSTR DIALOG_ParseTemplate32( LPCSTR template, DLG_TEMPLATE * result ) WORD signature; WORD dlgver; - signature = GET_WORD(p); p++; dlgver = GET_WORD(p); p++; + signature = GET_WORD(p); p++; - if (signature == 1 && dlgver == 0xffff) /* DIALOGEX resource */ + if (dlgver == 1 && signature == 0xffff) /* DIALOGEX resource */ { result->dialogEx = TRUE; result->helpId = GET_DWORD(p); p += 2;

1 0

Alexandre Julliard : msxml3: Fix building with older libxml versions.
by Alexandre Julliard 09 Feb '10

09 Feb '10

Module: wine Branch: master Commit: 627c58dcb54a491a03e3e06445e72be84a2a2f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=627c58dcb54a491a03e3e0644… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 15:53:28 2010 +0100 msxml3: Fix building with older libxml versions. --- dlls/msxml3/domdoc.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index a7c1680..77d1d2e 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -49,6 +49,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #include <libxml/xmlsave.h> +/* not defined in older versions */ +#define XML_SAVE_FORMAT 1 +#define XML_SAVE_NO_DECL 2 +#define XML_SAVE_NO_EMPTY 4 +#define XML_SAVE_NO_XHTML 8 +#define XML_SAVE_XHTML 16 +#define XML_SAVE_AS_XML 32 +#define XML_SAVE_AS_HTML 64 + static const WCHAR SZ_PROPERTY_SELECTION_LANGUAGE[] = {'S','e','l','e','c','t','i','o','n','L','a','n','g','u','a','g','e',0}; static const WCHAR SZ_VALUE_XPATH[] = {'X','P','a','t','h',0}; static const WCHAR SZ_VALUE_XSLPATTERN[] = {'X','S','L','P','a','t','t','e','r','n',0};

1 0