March 2012 - Wine-commits - list.winehq.org

Nikolay Sivov : msxml3: Accept names in predicate expressions for XSLPattern queries.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 9e950b6509934756fbfc7b24cb466f48594535e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e950b6509934756fbfc7b24c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 9 17:37:14 2012 +0300 msxml3: Accept names in predicate expressions for XSLPattern queries. --- dlls/msxml3/tests/domdoc.c | 49 ++++++++++++++++++++++++++++++++++++------- dlls/msxml3/xslpattern.y | 1 + 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4f25961..258cca3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1403,6 +1403,7 @@ static const char szExampleXML[] = " <a>A1 field</a>\n" " B1 field\n" " <c>C1 field</c>\n" +" <d>D1 field</d>\n" " <description xmlns:foo='http://www.winehq.org' xmlns:bar='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" " <html xmlns='http://www.w3.org/1999/xhtml'>\n" " This is a description. <bar:x/>\n" @@ -1417,6 +1418,7 @@ static const char szExampleXML[] = " <a>A2 field</a>\n" " B2 field\n" " <c type=\"old\">C2 field</c>\n" +" <d>D2 field</d>\n" " </elem>\n" "\n" " <elem xmlns='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" @@ -1429,6 +1431,7 @@ static const char szExampleXML[] = " <a>A4 field</a>\n" " B4 field\n" " <foo:c>C4 field</foo:c>\n" +" <d>D4 field</d>\n" " </elem>\n" "</root>\n"; @@ -5359,10 +5362,10 @@ static inline void _check_ws_ignored(int line, IXMLDOMDocument2* doc, char const helper_ole_check(IXMLDOMNodeList_get_item(list, 0, &node1)); helper_ole_check(IXMLDOMNodeList_get_item(list, 1, &node2)); helper_ole_check(IXMLDOMNodeList_reset(list)); - helper_expect_list_and_release(list, "E1.E4.E1.E2.D1 E2.E4.E1.E2.D1"); + helper_expect_list_and_release(list, "E1.E5.E1.E2.D1 E2.E5.E1.E2.D1"); helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list)); - helper_expect_list_and_release(list, "T1.E1.E4.E1.E2.D1 E2.E1.E4.E1.E2.D1 E3.E1.E4.E1.E2.D1 T4.E1.E4.E1.E2.D1 E5.E1.E4.E1.E2.D1"); + helper_expect_list_and_release(list, "T1.E1.E5.E1.E2.D1 E2.E1.E5.E1.E2.D1 E3.E1.E5.E1.E2.D1 T4.E1.E5.E1.E2.D1 E5.E1.E5.E1.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { @@ -5375,7 +5378,7 @@ static inline void _check_ws_ignored(int line, IXMLDOMDocument2* doc, char const IXMLDOMNode_Release(node1); helper_ole_check(IXMLDOMNode_get_childNodes(node2, &list)); - helper_expect_list_and_release(list, "T1.E2.E4.E1.E2.D1 E2.E2.E4.E1.E2.D1 T3.E2.E4.E1.E2.D1 E4.E2.E4.E1.E2.D1 T5.E2.E4.E1.E2.D1 E6.E2.E4.E1.E2.D1 T7.E2.E4.E1.E2.D1"); + helper_expect_list_and_release(list, "T1.E2.E5.E1.E2.D1 E2.E2.E5.E1.E2.D1 T3.E2.E5.E1.E2.D1 E4.E2.E5.E1.E2.D1 T5.E2.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1 T7.E2.E5.E1.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node2, &bstr)); helper_expect_bstr_and_release(bstr, "\n This is a description with preserved whitespace. \n "); IXMLDOMNode_Release(node2); @@ -5392,10 +5395,10 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con helper_ole_check(IXMLDOMNodeList_get_item(list, 0, &node1)); helper_ole_check(IXMLDOMNodeList_get_item(list, 1, &node2)); helper_ole_check(IXMLDOMNodeList_reset(list)); - helper_expect_list_and_release(list, "E2.E8.E2.E2.D1 E4.E8.E2.E2.D1"); + helper_expect_list_and_release(list, "E2.E10.E2.E2.D1 E4.E10.E2.E2.D1"); helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list)); - helper_expect_list_and_release(list, "T1.E2.E8.E2.E2.D1 E2.E2.E8.E2.E2.D1 T3.E2.E8.E2.E2.D1 E4.E2.E8.E2.E2.D1 T5.E2.E8.E2.E2.D1 E6.E2.E8.E2.E2.D1 T7.E2.E8.E2.E2.D1"); + helper_expect_list_and_release(list, "T1.E2.E10.E2.E2.D1 E2.E2.E10.E2.E2.D1 T3.E2.E10.E2.E2.D1 E4.E2.E10.E2.E2.D1 T5.E2.E10.E2.E2.D1 E6.E2.E10.E2.E2.D1 T7.E2.E10.E2.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { @@ -5408,7 +5411,7 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con IXMLDOMNode_Release(node1); helper_ole_check(IXMLDOMNode_get_childNodes(node2, &list)); - helper_expect_list_and_release(list, "T1.E4.E8.E2.E2.D1 E2.E4.E8.E2.E2.D1 T3.E4.E8.E2.E2.D1 E4.E4.E8.E2.E2.D1 T5.E4.E8.E2.E2.D1 E6.E4.E8.E2.E2.D1 T7.E4.E8.E2.E2.D1"); + helper_expect_list_and_release(list, "T1.E4.E10.E2.E2.D1 E2.E4.E10.E2.E2.D1 T3.E4.E10.E2.E2.D1 E4.E4.E10.E2.E2.D1 T5.E4.E10.E2.E2.D1 E6.E4.E10.E2.E2.D1 T7.E4.E10.E2.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node2, &bstr)); helper_expect_bstr_and_release(bstr, "\n This is a description with preserved whitespace. \n "); IXMLDOMNode_Release(node2); @@ -5658,7 +5661,7 @@ if (0) ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_("//test:c"), &list)); expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_(".//test:x"), &list)); - expect_list_and_release(list, "E5.E1.E4.E1.E2.D1 E6.E2.E4.E1.E2.D1"); + expect_list_and_release(list, "E5.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1"); /* SelectionNamespaces syntax error - the namespaces doesn't work anymore but the value is stored */ ole_expect(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), @@ -7872,12 +7875,42 @@ static const xslpattern_test_t xslpattern_test[] = { { "root//elem[index()>0 and $not$ end()]", "E2.E2.D1 E3.E2.D1" }, { "root//elem[index()>0 $and$ $not$ end()]", "E2.E2.D1 E3.E2.D1" }, { "root//elem[index()>0 && $not$ end()]", "E2.E2.D1 E3.E2.D1" }, + { "root/elem[0]", "E1.E2.D1" }, + { "root/elem[index()=1]", "E2.E2.D1" }, + { "root/elem[index() $eq$ 1]", "E2.E2.D1" }, + { "root/elem[end()]", "E4.E2.D1" }, + { "root/elem[$not$ end()]", "E1.E2.D1 E2.E2.D1 E3.E2.D1" }, + { "root/elem[index() != 0]", "E2.E2.D1 E3.E2.D1 E4.E2.D1" }, + { "root/elem[index() $ne$ 0]", "E2.E2.D1 E3.E2.D1 E4.E2.D1" }, + { "root/elem[index() < 2]", "E1.E2.D1 E2.E2.D1" }, + { "root/elem[index() $lt$ 2]", "E1.E2.D1 E2.E2.D1" }, + { "root/elem[index() <= 1]", "E1.E2.D1 E2.E2.D1" }, + { "root/elem[index() $le$ 1]", "E1.E2.D1 E2.E2.D1" }, + { "root/elem[index() > 1]", "E3.E2.D1 E4.E2.D1" }, + { "root/elem[index() $gt$ 1]", "E3.E2.D1 E4.E2.D1" }, + { "root/elem[index() >= 2]", "E3.E2.D1 E4.E2.D1" }, + { "root/elem[index() $ge$ 2]", "E3.E2.D1 E4.E2.D1" }, + { "root/elem[a $ieq$ 'a2 field']", "E2.E2.D1" }, + { "root/elem[a $ine$ 'a2 field']", "E1.E2.D1 E3.E2.D1 E4.E2.D1" }, + { "root/elem[a $ilt$ 'a3 field']", "E1.E2.D1 E2.E2.D1" }, + { "root/elem[a $ile$ 'a2 field']", "E1.E2.D1 E2.E2.D1" }, + { "root/elem[a $igt$ 'a2 field']", "E3.E2.D1 E4.E2.D1" }, + { "root/elem[a $ige$ 'a3 field']", "E3.E2.D1 E4.E2.D1" }, + { "root/elem[$any$ *='B2 field']", "E2.E2.D1" }, + { "root/elem[$all$ *!='B2 field']", "E1.E2.D1 E3.E2.D1 E4.E2.D1" }, + { "root/elem[index()=0 or end()]", "E1.E2.D1 E4.E2.D1" }, + { "root/elem[index()=0 $or$ end()]", "E1.E2.D1 E4.E2.D1" }, + { "root/elem[index()=0 || end()]", "E1.E2.D1 E4.E2.D1" }, + { "root/elem[index()>0 and $not$ end()]", "E2.E2.D1 E3.E2.D1" }, + { "root/elem[index()>0 $and$ $not$ end()]", "E2.E2.D1 E3.E2.D1" }, + { "root/elem[index()>0 && $not$ end()]", "E2.E2.D1 E3.E2.D1" }, + { "root/elem[d]", "E1.E2.D1 E2.E2.D1 E4.E2.D1" }, { NULL } }; static const xslpattern_test_t xslpattern_test_no_ns[] = { /* prefixes don't need to be registered, you may use them as they are in the doc */ - { "//bar:x", "E5.E1.E4.E1.E2.D1 E6.E2.E4.E1.E2.D1" }, + { "//bar:x", "E5.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1" }, /* prefixes must be explicitly specified in the name */ { "//foo:elem", "" }, { "//foo:c", "E3.E4.E2.D1" }, diff --git a/dlls/msxml3/xslpattern.y b/dlls/msxml3/xslpattern.y index 2fe3627..4e3b699 100644 --- a/dlls/msxml3/xslpattern.y +++ b/dlls/msxml3/xslpattern.y @@ -255,6 +255,7 @@ static void xslpattern_error(parser_param* param, void const* scanner, char cons } | BoolExpr | Attribute + | TOK_NCName ; /* [2.5] Abbreviated Syntax */ AbbreviatedAbsoluteLocationPath : TOK_DblFSlash RelativeLocationPath

1 0

Michael Stefaniuc : riched20: Drop the WINE_ prefix from a FIXME.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 51998b929a31d30c106ecfca2864208c1d305061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51998b929a31d30c106ecfca2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 9 16:17:32 2012 +0100 riched20: Drop the WINE_ prefix from a FIXME. --- dlls/riched20/paint.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 6b13fb5..e1f838e 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -316,7 +316,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, hPen = CreatePen(PS_DOT, 1, rgb); break; default: - WINE_FIXME("Unknown underline type (%u)\n", s->fmt.bUnderlineType); + FIXME("Unknown underline type (%u)\n", s->fmt.bUnderlineType); /* fall through */ case CFU_CF1UNDERLINE: /* this type is supported in the font, do nothing */ case CFU_UNDERLINENONE:

1 0

Michael Stefaniuc : mmsystem.dll16: Drop the WINE_ prefix from a FIXME.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 4430decf74070339c188073c341d95ad6fcc58b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4430decf74070339c188073c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 9 16:18:15 2012 +0100 mmsystem.dll16: Drop the WINE_ prefix from a FIXME. --- dlls/mmsystem.dll16/mmio16.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mmsystem.dll16/mmio16.c b/dlls/mmsystem.dll16/mmio16.c index ff55ce9..1db82c2 100644 --- a/dlls/mmsystem.dll16/mmio16.c +++ b/dlls/mmsystem.dll16/mmio16.c @@ -554,7 +554,7 @@ LPMMIOPROC16 WINAPI mmioInstallIOProc16(FOURCC fccIOProc, LPMMIOPROC16 pIOProc, } break; default: - WINE_FIXME("Unsupported flags %08x\n", dwFlags); + FIXME("Unsupported flags %08x\n", dwFlags); pIOProc = NULL; } LeaveCriticalSection(&mmio_cs);

1 0

Nikolay Sivov : comctl32: Update thumb position on WM_MOUSEMOVE instead of deferring it.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 3d4a4dae700698bcd68631d6dd38ddb0a4e3f60f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d4a4dae700698bcd68631d6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 9 19:09:35 2012 +0300 comctl32: Update thumb position on WM_MOUSEMOVE instead of deferring it. --- dlls/comctl32/tests/trackbar.c | 20 ++++++++------------ dlls/comctl32/trackbar.c | 3 +-- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 687ed07..7a0e398 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -33,11 +33,7 @@ static HWND hWndParent; static struct msg_sequence *sequences[NUM_MSG_SEQUENCE]; -static const struct message create_trackbar_wnd_seq[] = { - {0} -}; - -static const struct message parent_empty_test_seq[] = { +static const struct message empty_seq[] = { {0} }; @@ -545,7 +541,7 @@ static void test_line_size(HWND hWndTrackbar){ expect(4, r); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, line_size_test_seq, "linesize test sequence", FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_empty_test_seq, "parent line test sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent line test sequence", FALSE); } @@ -565,7 +561,7 @@ static void test_page_size(HWND hWndTrackbar){ expect(20, r); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, page_size_test_seq, "page size test sequence", FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_empty_test_seq, "parent page size test sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent page size test sequence", FALSE); /* check for zero page size */ r = SendMessage(hWndTrackbar, TBM_SETPAGESIZE, 0, 0); @@ -861,7 +857,7 @@ static void test_tic_placement(HWND hWndTrackbar){ ok(r > 0, "Expected r > 0, got %d\n", r); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, tic_placement_test_seq, "get tic placement test sequence", FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_empty_test_seq, "parent get tic placement test sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent get tic placement test sequence", FALSE); } @@ -905,7 +901,7 @@ static void test_tool_tips(HWND hWndTrackbar){ ok(rTest == hWndTooltip, "Expected hWndTooltip\n"); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, tool_tips_test_seq, "tool tips test sequence", FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_empty_test_seq, "parent tool tips test sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent tool tips test sequence", FALSE); } @@ -924,7 +920,7 @@ static void test_unicode(HWND hWndTrackbar){ ok(r == FALSE, "Expected FALSE, got %d\n",r); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, unicode_test_seq, "unicode test sequence", FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_empty_test_seq, "parent unicode test sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent unicode test sequence", FALSE); } static void test_ignore_selection(HWND hWndTrackbar){ @@ -966,7 +962,7 @@ static void test_ignore_selection(HWND hWndTrackbar){ expect(0, r); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, ignore_selection_test_seq, "ignore selection setting test sequence", FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_empty_test_seq, "parent ignore selection setting test sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent ignore selection setting test sequence", FALSE); } static void test_initial_state(void) @@ -1075,7 +1071,7 @@ START_TEST(trackbar) return; } - ok_sequence(sequences, TRACKBAR_SEQ_INDEX, create_trackbar_wnd_seq, "create Trackbar Window", FALSE); + ok_sequence(sequences, TRACKBAR_SEQ_INDEX, empty_seq, "create Trackbar Window", FALSE); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_create_trackbar_wnd_seq, "parent trackbar window", TRUE); flush_sequences(sequences, NUM_MSG_SEQUENCE); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 299c44c..22d5945 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1664,11 +1664,10 @@ TRACKBAR_MouseMove (TRACKBAR_INFO *infoPtr, INT x, INT y) if (dragPos == oldPos) return TRUE; infoPtr->lPos = dragPos; + TRACKBAR_UpdateThumb (infoPtr); - infoPtr->flags |= TB_THUMBPOSCHANGED; notify_with_scroll (infoPtr, TB_THUMBTRACK | (infoPtr->lPos<<16)); - TRACKBAR_InvalidateThumbMove(infoPtr, oldPos, dragPos); UpdateWindow (infoPtr->hwndSelf);

1 0

Alistair Leslie-Hughes : advapi32: Correct tests under WOW64.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 02b3700779ca2ea5eed43986ca762ee2784e9d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b3700779ca2ea5eed43986c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 12 11:22:03 2012 +1100 advapi32: Correct tests under WOW64. --- dlls/advapi32/tests/security.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4cc1402..c8db437 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1455,9 +1455,11 @@ static void test_token_attr(void) Size = 0; ret = GetTokenInformation(Token, TokenGroups, Groups, Size2, &Size); ok(Size > 1, "got %d\n", Size); - ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + ok((!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) || broken(ret) /* wow64 */, "%d with error %d\n", ret, GetLastError()); - ok(*((BYTE*)Groups) == 0xcc, "buffer altered\n"); + if(!ret) + ok(*((BYTE*)Groups) == 0xcc, "buffer altered\n"); + HeapFree(GetProcessHeap(), 0, Groups); SetLastError(0xdeadbeef);

1 0

André Hentschel : winemaker: Fix conversion of C++ filenames into object names.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: c6008a06ac46b94cb0ad90f9957e5283ae987702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6008a06ac46b94cb0ad90f99… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 10 17:46:35 2012 +0100 winemaker: Fix conversion of C++ filenames into object names. --- tools/winemaker | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 80305d1..91032f0 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -20,7 +20,7 @@ use strict; # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # -my $version="0.8.1"; +my $version="0.8.2"; use Cwd; use File::Basename; @@ -278,6 +278,10 @@ my $TF_NOMSVCRT=32; my $TF_HASDEF=64; ## +# This target has C++ files named *.cxx (instead of *.cpp) +my $TF_HASCXX=128; + +## # Initialize a target: # - set the target type to TT_SETTINGS, i.e. no real target will # be generated. @@ -805,13 +809,16 @@ sub source_scan_project_file($$$) if (!defined $sfilet) { next; } if ($sfilet =~ /\.c$/i and $sfilet !~ /\.(dbg|spec)\.c$/) { push @sources_c,$sfilet; - } elsif ($sfilet =~ /\.(cpp|cxx)$/i) { + } elsif ($sfilet =~ /\.cpp$/i) { if ($sfilet =~ /^stdafx.cpp$/i && !(@$project_settings[$T_FLAGS] & $TF_NOMFC)) { push @sources_misc,$sfilet; @$project_settings[$T_FLAGS]|=$TF_MFC; } else { push @sources_cxx,$sfilet; } + } elsif ($sfilet =~ /\.cxx$/i) { + @$project_settings[$T_FLAGS]|=$TF_HASCXX; + push @sources_cxx,$sfilet; } elsif ($sfilet =~ /\.rc$/i) { push @sources_rc,$sfilet; } elsif ($sfilet =~ /\.def$/i) { @@ -896,13 +903,16 @@ sub source_scan_project_file($$$) $sfilet=~s/\\/\//g; #make slashes out of backslashes if ($sfilet =~ /\.c$/i and $sfilet !~ /\.(dbg|spec)\.c$/) { push @sources_c,$sfilet; - } elsif ($sfilet =~ /\.(cpp|cxx)$/i) { + } elsif ($sfilet =~ /\.cpp$/i) { if ($sfilet =~ /^stdafx.cpp$/i && !(@$project_settings[$T_FLAGS] & $TF_NOMFC)) { push @sources_misc,$sfilet; @$project_settings[$T_FLAGS]|=$TF_MFC; } else { push @sources_cxx,$sfilet; } + } elsif ($sfilet =~ /\.cxx$/i) { + @$project_settings[$T_FLAGS]|=$TF_HASCXX; + push @sources_cxx,$sfilet; } elsif ($sfilet =~ /\.rc$/i) { push @sources_rc,$sfilet; } elsif ($sfilet =~ /\.def$/i) { @@ -1318,13 +1328,16 @@ sub source_scan_directory($$$$) $targets{$dentry}=1; } elsif ($dentry =~ /\.c$/i and $dentry !~ /\.(dbg|spec)\.c$/) { push @sources_c,"$dentry"; - } elsif ($dentry =~ /\.(cpp|cxx)$/i) { + } elsif ($dentry =~ /\.cpp$/i) { if ($dentry =~ /^stdafx.cpp$/i && !(@$project_settings[$T_FLAGS] & $TF_NOMFC)) { push @sources_misc,"$dentry"; @$project_settings[$T_FLAGS]|=$TF_MFC; } else { push @sources_cxx,"$dentry"; } + } elsif ($dentry =~ /\.cxx$/i) { + @$project_settings[$T_FLAGS]|=$TF_HASCXX; + push @sources_cxx,"$dentry"; } elsif ($dentry =~ /\.rc$/i) { push @sources_rc,"$dentry"; } elsif ($dentry =~ /\.def$/i) { @@ -2378,6 +2391,13 @@ sub generate_project_files($) return; } + my $cpp_to_object; + if (@$project_settings[$T_FLAGS] & $TF_HASCXX) { + $cpp_to_object=".cxx=.o"; + } else { + $cpp_to_object=".cpp=.o"; + } + print FILEO "### Generated by Winemaker $version\n"; print FILEO "###\n"; print FILEO "### Invocation command line was\n"; @@ -2439,7 +2459,7 @@ sub generate_project_files($) generate_list("EXTRA_CXX_SRCS",1,@$project_settings[$T_SOURCES_CXX]); generate_list("EXTRA_RC_SRCS",1,@$project_settings[$T_SOURCES_RC]); print FILEO "\n"; - generate_list("EXTRA_OBJS",1,["\$(EXTRA_C_SRCS:.c=.o)","\$(EXTRA_CXX_SRCS:.cpp=.o)"]); + generate_list("EXTRA_OBJS",1,["\$(EXTRA_C_SRCS:.c=.o)","\$(EXTRA_CXX_SRCS:$cpp_to_object)"]); print FILEO "\n\n\n"; } @@ -2460,7 +2480,7 @@ sub generate_project_files($) generate_list("${canon}_LIBRARY_PATH",1,@$target[$T_LIBRARY_PATH]); generate_list("${canon}_LIBRARIES",1,@$target[$T_LIBRARIES]); print FILEO "\n"; - generate_list("${canon}_OBJS",1,["\$(${canon}_C_SRCS:.c=.o)","\$(${canon}_CXX_SRCS:.cpp=.o)","\$(${canon}_RC_SRCS:.rc=.res)"]); + generate_list("${canon}_OBJS",1,["\$(${canon}_C_SRCS:.c=.o)","\$(${canon}_CXX_SRCS:$cpp_to_object)","\$(${canon}_RC_SRCS:.rc=.res)"]); print FILEO "\n\n\n"; } print FILEO "### Global source lists\n\n"; @@ -2518,7 +2538,7 @@ sub generate_project_files($) print FILEO "\n"; print FILEO "# Implicit rules\n"; print FILEO "\n"; - print FILEO ".SUFFIXES: .cpp .rc .res\n"; + print FILEO ".SUFFIXES: .cpp .cxx .rc .res\n"; print FILEO "DEFINCL = \$(INCLUDE_PATH) \$(DEFINES) \$(OPTIONS)\n"; print FILEO "\n"; print FILEO ".c.o:\n"; @@ -2539,7 +2559,7 @@ sub generate_project_files($) print FILEO " \\\\\\#*\\\\\\# *~ *% .\\\\\\#*\n"; print FILEO "\n"; print FILEO "clean:: \$(SUBDIRS:%=%/__clean__) \$(EXTRASUBDIRS:%=%/__clean__)\n"; - print FILEO "\t\$(RM) \$(CLEAN_FILES) \$(RC_SRCS:.rc=.res) \$(C_SRCS:.c=.o) \$(CXX_SRCS:.cpp=.o)\n"; + print FILEO "\t\$(RM) \$(CLEAN_FILES) \$(RC_SRCS:.rc=.res) \$(C_SRCS:.c=.o) \$(CXX_SRCS:$cpp_to_object)\n"; print FILEO "\t\$(RM) \$(DLLS:%=%.so) \$(LIBS) \$(EXES) \$(EXES:%=%.so)\n"; print FILEO "\n"; print FILEO "\$(SUBDIRS:%=%/__clean__): dummy\n";

1 0

André Hentschel : winedbg: Respect Thumb mode when adjusting PC on ARM.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 2c5a7743be823caefde72a14ef85221b1d521497 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5a7743be823caefde72a14e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 10 18:26:05 2012 +0100 winedbg: Respect Thumb mode when adjusting PC on ARM. --- programs/winedbg/be_arm.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index c39043c..6c1cc05 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -205,13 +205,15 @@ static void be_arm_clear_watchpoint(CONTEXT* ctx, unsigned idx) static int be_arm_adjust_pc_for_break(CONTEXT* ctx, BOOL way) { + INT step = (ctx->Cpsr & 0x20) ? 2 : 4; + if (way) { - ctx->Pc-=4; - return -4; + ctx->Pc -= step; + return -step; } - ctx->Pc+=4; - return 4; + ctx->Pc += step; + return step; } static int be_arm_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size,

1 0

Józef Kucia : wpp: Reset lexer state after unexpected end of file.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 1d9bb50230edd3c8cfdeb6c763aaaf5655d24aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9bb50230edd3c8cfdeb6c76… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sat Mar 10 19:58:43 2012 +0100 wpp: Reset lexer state after unexpected end of file. --- libs/wpp/ppl.l | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 2718fd0..8d979dc 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -774,7 +774,10 @@ void pp_writestring(const char *format, ...) if(!bep) { if(YY_START != INITIAL) + { ppy_error("Unexpected end of file during preprocessing"); + BEGIN(INITIAL); + } yyterminate(); } else if(bep->should_pop == 2)

1 0

Józef Kucia : d3dcompiler/tests: Add test for comments containing quotation marks.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 8e3b050f44e94c820962e1ec15e725d817eeb07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e3b050f44e94c820962e1ec1… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sat Mar 10 19:58:44 2012 +0100 d3dcompiler/tests: Add test for comments containing quotation marks. --- dlls/d3dcompiler_43/tests/asm.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 18bdd16..1e986df 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1574,6 +1574,13 @@ static void d3dpreprocess_test(void) "vs.1.1\n" "mov DEF2, v0\n" }; + const char quotation_marks_test[] = + { + "vs.1.1\n" + "; ' comment\n" + "; \" comment\n" + "mov 0, v0\n" + }; const char testshader[] = { "#include \"incl.vsh\"\n" @@ -1631,6 +1638,19 @@ static void d3dpreprocess_test(void) ID3D10Blob_Release(messages); } + /* quotation marks test */ + shader = NULL; + messages = NULL; + hr = D3DPreprocess(quotation_marks_test, strlen(quotation_marks_test), NULL, + NULL, NULL, &shader, &messages); + todo_wine ok(hr == S_OK, "quotation marks test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + if (messages) + { + trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); + ID3D10Blob_Release(messages); + } + if (shader) ID3D10Blob_Release(shader); + /* pInclude test */ shader = NULL; messages = NULL;

1 0

Dmitry Timoshkov : kernel32: Make CreateFile called with creation == 0 work when opening a vxd in win9x mode.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 495a0cba3da1986c52e026f1843fc5f559de3984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=495a0cba3da1986c52e026f18… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Mar 11 13:41:31 2012 +0800 kernel32: Make CreateFile called with creation == 0 work when opening a vxd in win9x mode. --- dlls/kernel32/file.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index a3b4411..089f693 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1310,6 +1310,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, else if (GetVersion() & 0x80000000) { vxd_name = filename + 4; + if (!creation) creation = OPEN_EXISTING; } } else dosdev = RtlIsDosDeviceName_U( filename );

1 0