wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Aric Stewart : shlwapi: Account for trailing NULL in UrlFixupW.
by Alexandre Julliard 10 Feb '10

10 Feb '10

Module: wine Branch: master Commit: e0b23217fe39107b12f48c6933e2ceb9ad1546cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b23217fe39107b12f48c693… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 9 12:53:45 2010 -0600 shlwapi: Account for trailing NULL in UrlFixupW. --- dlls/shlwapi/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 19083dc..d3dea24 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -2441,7 +2441,7 @@ HRESULT WINAPI UrlFixupW(LPCWSTR url, LPWSTR translatedUrl, DWORD maxChars) if (!url) return E_FAIL; - srcLen = lstrlenW(url); + srcLen = lstrlenW(url) + 1; /* For now just copy the URL directly */ lstrcpynW(translatedUrl, url, (maxChars < srcLen) ? maxChars : srcLen);

1 0

Jacek Caban : mshtml: Added IHTMLStyle::get_borderRightColor implementation .
by Alexandre Julliard 10 Feb '10

10 Feb '10

Module: wine Branch: master Commit: 6f6f1c9338b0dd56363c7f92bc59effc84fc25a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f6f1c9338b0dd56363c7f92b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 9 19:35:41 2010 +0100 mshtml: Added IHTMLStyle::get_borderRightColor implementation. --- dlls/mshtml/htmlstyle.c | 6 ++++-- dlls/mshtml/tests/dom.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 3022e2b..f96bee2 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1547,8 +1547,10 @@ static HRESULT WINAPI HTMLStyle_put_borderRightColor(IHTMLStyle *iface, VARIANT static HRESULT WINAPI HTMLStyle_get_borderRightColor(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_RIGHT_COLOR, p, 0); } static HRESULT WINAPI HTMLStyle_put_borderBottomColor(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3a008ea..dc37a5e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4488,8 +4488,8 @@ static void test_default_style(IHTMLStyle *style) */ V_BSTR(&v) = NULL; hres = IHTMLStyle_get_borderRightColor(style, &v); - todo_wine ok(hres == S_OK, "get_borderRightColor failed: %08x\n", hres); - todo_wine ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(hres == S_OK, "get_borderRightColor failed: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_BSTR(&v) = NULL;

1 0

Jacek Caban : mshtml: Forward IHTMLCommentElement::get_text to IHTMLElement ::get_outerHTML.
by Alexandre Julliard 10 Feb '10

10 Feb '10

Module: wine Branch: master Commit: d0f7785e04ab22908472a5ec3d8ac4543eb7b05d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f7785e04ab22908472a5ec3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 9 19:35:20 2010 +0100 mshtml: Forward IHTMLCommentElement::get_text to IHTMLElement::get_outerHTML. --- dlls/mshtml/htmlcomment.c | 6 ++++-- dlls/mshtml/tests/dom.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 85fd4e1..7040d18 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -103,8 +103,10 @@ static HRESULT WINAPI HTMLCommentElement_put_text(IHTMLCommentElement *iface, BS static HRESULT WINAPI HTMLCommentElement_get_text(IHTMLCommentElement *iface, BSTR *p) { HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLElement_get_outerHTML(HTMLELEM(&This->element), p); } static HRESULT WINAPI HTMLCommentElement_put_atomic(IHTMLCommentElement *iface, LONG v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7fd9262..3a008ea 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -684,6 +684,17 @@ static IHTMLDOMTextNode *_get_text_iface(unsigned line, IUnknown *unk) return text; } +#define get_comment_iface(u) _get_comment_iface(__LINE__,u) +static IHTMLCommentElement *_get_comment_iface(unsigned line, IUnknown *unk) +{ + IHTMLCommentElement *comment; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLCommentElement, (void**)&comment); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLCommentElement: %08x\n", hres); + return comment; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -1102,6 +1113,22 @@ static void _test_option_put_value(unsigned line, IHTMLOptionElement *option, co _test_option_value(line, option, value); } +#define test_comment_text(c,t) _test_comment_text(__LINE__,c,t) +static void _test_comment_text(unsigned line, IUnknown *unk, const char *extext) +{ + IHTMLCommentElement *comment = _get_comment_iface(__LINE__,unk); + BSTR text; + HRESULT hres; + + text = a2bstr(extext); + hres = IHTMLCommentElement_get_text(comment, &text); + ok_(__FILE__,line)(hres == S_OK, "get_text failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(text, extext), "text = \"%s\", expected \"%s\"\n", wine_dbgstr_w(text), extext); + + IHTMLCommentElement_Release(comment); + SysFreeString(text); +} + #define create_option_elem(d,t,v) _create_option_elem(__LINE__,d,t,v) static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *doc, const char *txt, const char *val) @@ -1654,6 +1681,21 @@ static void _test_elem_set_outerhtml(unsigned line, IUnknown *unk, const char *o SysFreeString(html); } +#define test_elem_outerhtml(e,t) _test_elem_outerhtml(__LINE__,e,t) +static void _test_elem_outerhtml(unsigned line, IUnknown *unk, const char *outer_html) +{ + IHTMLElement *elem = _get_elem_iface(line, unk); + BSTR html; + HRESULT hres; + + hres = IHTMLElement_get_outerHTML(elem, &html); + ok_(__FILE__,line)(hres == S_OK, "get_outerHTML failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(html, outer_html), "outerHTML = '%s', expected '%s'\n", wine_dbgstr_w(html), outer_html); + + IHTMLElement_Release(elem); + SysFreeString(html); +} + #define get_first_child(n) _get_first_child(__LINE__,n) static IHTMLDOMNode *_get_first_child(unsigned line, IUnknown *unk) { @@ -5911,6 +5953,8 @@ static void test_create_elems(IHTMLDocument2 *doc) test_elem_title((IUnknown*)comment, NULL); test_elem_set_title((IUnknown*)comment, "comment title"); test_elem_title((IUnknown*)comment, "comment title"); + test_comment_text((IUnknown*)comment, ""); + test_elem_outerhtml((IUnknown*)comment, ""); IHTMLDOMNode_Release(comment); }

1 0

Nikolay Sivov : msxml3/tests: Add a trivial test for IXMLDOMDocumentFragment_get_parentNode().
by Alexandre Julliard 10 Feb '10

10 Feb '10

Module: wine Branch: master Commit: b9d07c5ae508ae7205edeb007f66e98799dea4ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9d07c5ae508ae7205edeb007… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Feb 9 21:08:36 2010 +0300 msxml3/tests: Add a trivial test for IXMLDOMDocumentFragment_get_parentNode(). --- dlls/msxml3/tests/domdoc.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0c847e5..bf2e234 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3510,7 +3510,15 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) { - IXMLDOMNode *pNextChild = (IXMLDOMNode *)0x1; + IXMLDOMNode *node; + + hr = IXMLDOMDocumentFragment_get_parentNode(pDocFrag, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + node = (IXMLDOMNode *)0x1; + hr = IXMLDOMDocumentFragment_get_parentNode(pDocFrag, &node); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok(node == NULL, "expected NULL, got %p\n", node); hr = IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pDocFrag, NULL); ok(hr == S_OK, "ret %08x\n", hr ); @@ -3533,19 +3541,19 @@ static void test_xmlTypes(void) hr = IXMLDOMDocumentFragment_get_nextSibling(pDocFrag, NULL); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); - pNextChild = (IXMLDOMNode *)0x1; - hr = IXMLDOMDocumentFragment_get_nextSibling(pDocFrag, &pNextChild); + node = (IXMLDOMNode *)0x1; + hr = IXMLDOMDocumentFragment_get_nextSibling(pDocFrag, &node); ok(hr == S_FALSE, "ret %08x\n", hr ); - ok(pNextChild == NULL, "pNextChild not NULL\n"); + ok(node == NULL, "next sibling not NULL\n"); /* test Previous Sibling*/ hr = IXMLDOMDocumentFragment_get_previousSibling(pDocFrag, NULL); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); - pNextChild = (IXMLDOMNode *)0x1; - hr = IXMLDOMDocumentFragment_get_previousSibling(pDocFrag, &pNextChild); + node = (IXMLDOMNode *)0x1; + hr = IXMLDOMDocumentFragment_get_previousSibling(pDocFrag, &node); ok(hr == S_FALSE, "ret %08x\n", hr ); - ok(pNextChild == NULL, "pNextChild not NULL\n"); + ok(node == NULL, "previous sibling not NULL\n"); /* test get_dataType */ hr = IXMLDOMDocumentFragment_get_dataType(pDocFrag, NULL);

1 0

Nikolay Sivov : msxml3: IXMLDOMAttribute shouldn't report its parent.
by Alexandre Julliard 10 Feb '10

10 Feb '10

Module: wine Branch: master Commit: f65fd26fe1727caab28b9453da32925a9d1b78b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f65fd26fe1727caab28b9453d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Feb 9 21:00:25 2010 +0300 msxml3: IXMLDOMAttribute shouldn't report its parent. --- dlls/msxml3/attribute.c | 5 ++++- dlls/msxml3/tests/domdoc.c | 13 ++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 04b8c46..22364f3 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -213,7 +213,10 @@ static HRESULT WINAPI domattr_get_parentNode( IXMLDOMNode** parent ) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(&This->node), parent ); + TRACE("(%p)->(%p)\n", This, parent); + if (!parent) return E_INVALIDARG; + *parent = NULL; + return S_FALSE; } static HRESULT WINAPI domattr_get_childNodes( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3c5c53c..0c847e5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1216,8 +1216,19 @@ static void test_domnode( void ) r = IXMLDOMElement_getAttributeNode( element, str, &attr); ok( r == S_OK, "GetAttributeNode ret %08x\n", r ); ok( attr != NULL, "getAttributeNode returned NULL\n" ); - if(attr) + if (attr) + { + r = IXMLDOMAttribute_get_parentNode( attr, NULL ); + ok( r == E_INVALIDARG, "Expected E_INVALIDARG, ret %08x\n", r ); + + /* attribute doesn't have a parent in msxml interpretation */ + node = (IXMLDOMNode*)0xdeadbeef; + r = IXMLDOMAttribute_get_parentNode( attr, &node ); + ok( r == S_FALSE, "Expected S_FALSE, ret %08x\n", r ); + ok( node == NULL, "Expected NULL, got %p\n", node ); + IXMLDOMAttribute_Release(attr); + } SysFreeString( str );

1 0

Dylan Smith : richedit: Move function ME_GetParaLineSpace to make it static .
by Alexandre Julliard 10 Feb '10

10 Feb '10

Module: wine Branch: master Commit: 535afbd3aa81949f08e735d0efd9d9dbe1f11c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=535afbd3aa81949f08e735d0e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Feb 9 12:07:22 2010 -0500 richedit: Move function ME_GetParaLineSpace to make it static. --- dlls/riched20/editor.h | 1 - dlls/riched20/paint.c | 23 ----------------------- dlls/riched20/wrap.c | 23 +++++++++++++++++++++++ 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 8a5304b..89c18b7 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -230,7 +230,6 @@ void ME_UpdateScrollBar(ME_TextEditor *editor); /* other functions in paint.c */ int ME_GetParaBorderWidth(ME_TextEditor *editor, int); -int ME_GetParaLineSpace(ME_Context *c, ME_Paragraph*); /* richole.c */ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *); diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 52127d7..b0e6c1e 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -520,29 +520,6 @@ int ME_GetParaBorderWidth(ME_TextEditor* editor, int flags) return width; } -int ME_GetParaLineSpace(ME_Context* c, ME_Paragraph* para) -{ - int sp = 0, ls = 0; - if (!(para->pFmt->dwMask & PFM_LINESPACING)) return 0; - - /* FIXME: how to compute simply the line space in ls ??? */ - /* FIXME: does line spacing include the line itself ??? */ - switch (para->pFmt->bLineSpacingRule) - { - case 0: sp = ls; break; - case 1: sp = (3 * ls) / 2; break; - case 2: sp = 2 * ls; break; - case 3: sp = ME_twips2pointsY(c, para->pFmt->dyLineSpacing); if (sp < ls) sp = ls; break; - case 4: sp = ME_twips2pointsY(c, para->pFmt->dyLineSpacing); break; - case 5: sp = para->pFmt->dyLineSpacing / 20; break; - default: FIXME("Unsupported spacing rule value %d\n", para->pFmt->bLineSpacingRule); - } - if (c->editor->nZoomNumerator == 0) - return sp; - else - return sp * c->editor->nZoomNumerator / c->editor->nZoomDenominator; -} - static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT* bounds) { int idx, border_width, top_border, bottom_border; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 75f47a2..f567d40 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -456,6 +456,29 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) return p->next; } +static int ME_GetParaLineSpace(ME_Context* c, ME_Paragraph* para) +{ + int sp = 0, ls = 0; + if (!(para->pFmt->dwMask & PFM_LINESPACING)) return 0; + + /* FIXME: how to compute simply the line space in ls ??? */ + /* FIXME: does line spacing include the line itself ??? */ + switch (para->pFmt->bLineSpacingRule) + { + case 0: sp = ls; break; + case 1: sp = (3 * ls) / 2; break; + case 2: sp = 2 * ls; break; + case 3: sp = ME_twips2pointsY(c, para->pFmt->dyLineSpacing); if (sp < ls) sp = ls; break; + case 4: sp = ME_twips2pointsY(c, para->pFmt->dyLineSpacing); break; + case 5: sp = para->pFmt->dyLineSpacing / 20; break; + default: FIXME("Unsupported spacing rule value %d\n", para->pFmt->bLineSpacingRule); + } + if (c->editor->nZoomNumerator == 0) + return sp; + else + return sp * c->editor->nZoomNumerator / c->editor->nZoomDenominator; +} + static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp); static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) {

1 0

Jacek Caban : cmd: Added cmd.exe tests.
by Alexandre Julliard 10 Feb '10

10 Feb '10

Module: wine Branch: master Commit: 28a4a7bd42064b7507cd699056311e1a05c0edad URL: http://source.winehq.org/git/wine.git/?a=commit;h=28a4a7bd42064b7507cd69905… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 9 19:11:15 2010 +0100 cmd: Added cmd.exe tests. --- configure | 21 +++ configure.ac | 1 + programs/cmd/tests/Makefile.in | 14 ++ programs/cmd/tests/batch.c | 281 ++++++++++++++++++++++++++++++++++ programs/cmd/tests/rsrc.rc | 23 +++ programs/cmd/tests/test_echo.cmd | 9 + programs/cmd/tests/test_echo.cmd.out | 21 +++ 7 files changed, 370 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28a4a7bd42064b7507cd6…

1 0

Alexandre Julliard : makefiles: Add support for having tests under the programs directory.
by Alexandre Julliard 10 Feb '10

10 Feb '10

Module: wine Branch: master Commit: 4435e99540c9554883050973b7ee6277095176c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4435e99540c9554883050973b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 10 11:24:00 2010 +0100 makefiles: Add support for having tests under the programs directory. --- .gitignore | 4 ++-- aclocal.m4 | 4 +++- tools/make_makefiles | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ec21bcf..e496cae 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ *.ok *.res *.so +*/*/tests/*crosstest.exe +*/*/tests/testlist.c /Make.rules /Maketest.rules /TAGS @@ -17,8 +19,6 @@ Makefile dlldata.c dlls/*/*.def -dlls/*/tests/*crosstest.exe -dlls/*/tests/testlist.c dlls/Makedll.rules dlls/Makeimplib.rules dlls/actxprxy/actxprxy_activscp.h diff --git a/aclocal.m4 b/aclocal.m4 index 5409ba2..ae61a38 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -223,7 +223,8 @@ dnl dnl Usage: WINE_CONFIG_TEST(dir) dnl AC_DEFUN([WINE_CONFIG_TEST], -[m4_pushdef([ac_name],m4_bpatsubst([$1],[.*/$.*$/tests$],[\1_test]))dnl +[m4_pushdef([ac_suffix],m4_if(m4_substr([$1],0,9),[programs/],[.exe_test],[_test]))dnl +m4_pushdef([ac_name],[m4_bpatsubst([$1],[.*/$.*$/tests$],[\1])]ac_suffix)dnl ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS $1: __builddeps__ $1/__crosstest__: __buildcrossdeps__" @@ -236,6 +237,7 @@ ac_name.rc: echo \"ac_name.exe TESTRES \\\"ac_name.exe\\\"\" >\$[@] || (\$(RM) \$[@] && false) ac_name.res: ac_name.rc ac_name.exe" WINE_CONFIG_MAKEFILE([$1/Makefile],[Maketest.rules],[],[ALL_TEST_DIRS],[enable_tests])dnl +m4_popdef([ac_suffix])dnl m4_popdef([ac_name])]) dnl **** Create a static lib makefile from config.status **** diff --git a/tools/make_makefiles b/tools/make_makefiles index 85e1e41..0ae3fbe 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -90,8 +90,8 @@ my @ignores = ( "Makefile", "dlldata.c", "dlls/*/*.def", - "dlls/*/tests/*crosstest.exe", - "dlls/*/tests/testlist.c", + "*/*/tests/*crosstest.exe", + "*/*/tests/testlist.c", "include/config.h", "include/stamp-h", "programs/winetest/*_test.exe",

1 0

Alexandre Julliard : makefiles: Move Maketest.rules to the top level.
by Alexandre Julliard 10 Feb '10

10 Feb '10

Module: wine Branch: master Commit: cb1fc8f4f5b5618540703ad5110670b27e4dcda9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1fc8f4f5b5618540703ad51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 10 11:18:58 2010 +0100 makefiles: Move Maketest.rules to the top level. --- .gitignore | 2 +- dlls/Maketest.rules.in => Maketest.rules.in | 0 aclocal.m4 | 2 +- configure | 230 +++++++++++++------------- configure.ac | 2 +- tools/make_makefiles | 2 +- 6 files changed, 119 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb1fc8f4f5b5618540703…

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

← Newer
1
...
39
40
41
42
43
44
45
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2010