January 2013 - Wine-commits

Francois Gouget : winmm/tests: Allow more margin in the test_asyncWAVE() playback check.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: 6ad54620f06eb757b6ffd22dc6a4e8ea680b09ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad54620f06eb757b6ffd22dc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 22 17:37:18 2013 +0100 winmm/tests: Allow more margin in the test_asyncWAVE() playback check. --- dlls/winmm/tests/mci.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index ce06d07..ffde6b9 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -964,10 +964,7 @@ static void test_asyncWAVE(HWND hwnd) err = mciSendString("play mysound notify", NULL, 0, hwnd); ok(!err,"mci play returned %s\n", dbg_mcierr(err)); - /* Give Wine's asynchronous thread time to start up. Furthermore, - * it uses 3 buffers per second, so that the positions reported - * will be 333ms, 667ms etc. at best. */ - Sleep(100); /* milliseconds */ + Sleep(500); /* milliseconds */ /* Do not query time format as string because result depends on locale! */ parm.status.dwItem = MCI_STATUS_TIME_FORMAT; @@ -981,11 +978,19 @@ static void test_asyncWAVE(HWND hwnd) err = mciSendString("status mysound position", buf, sizeof(buf), hwnd); ok(!err,"mci status position returned %s\n", dbg_mcierr(err)); - ok(strcmp(buf,"2000"), "mci status position: %s, expected 2000\n", buf); - trace("position after Sleep: %sms\n",buf); + trace("position after Sleep: %sms\n", buf); p2 = atoi(buf); - /* Some machines reach 79ms only during the 100ms sleep. */ - ok(p2>=67,"not enough time elapsed %ums\n",p2); + /* Check that the 2s sound plays at a normal pace, giving a wide margin to + * account for timing granularity and small delays. + */ + todo_wine ok(400 <= p2 && p2 <= 600, "%ums is not in the expected 400-600ms range\n", p2); + /* Wine's asynchronous thread needs some time to start up. Furthermore, it + * uses 3 buffers per second, so that the positions reported will be 333ms, + * 667ms etc. at best, which is why it fails the above test. So add a + * second test specifically to prevent Wine from getting even worse. + * FIXME: To be removed when Wine is fixed and passes the above test. + */ + ok(400 <= p2 && p2 <= 1000, "%ums is not even in the expected 400-1000ms range\n", p2); test_notification(hwnd,"play (nowait)",0); err = mciSendString("pause mysound wait", NULL, 0, hwnd);

1 0

Sergey Guralnik : user32/tests: Test standard scrollbar initialization.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: 77337d75f2902486712b0a822853453ac118085f URL: http://source.winehq.org/git/wine.git/?a=commit;h=77337d75f2902486712b0a822… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Tue Jan 15 11:15:56 2013 +0200 user32/tests: Test standard scrollbar initialization. --- dlls/user32/tests/scroll.c | 97 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 1d7e75e..49f42bb 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -396,6 +396,101 @@ todo_wine DestroyWindow( hwnd); } +static LRESULT CALLBACK scroll_init_proc(HWND hwnd, UINT msg, + WPARAM wparam, LPARAM lparam) +{ + SCROLLINFO horz, vert; + CREATESTRUCTA *cs = (CREATESTRUCTA *)lparam; + BOOL h_ret, v_ret; + + switch(msg) + { + case WM_NCCREATE: + return cs->lpCreateParams ? DefWindowProcA(hwnd, msg, wparam, lparam) : + TRUE; + + case WM_CREATE: + horz.cbSize = sizeof horz; + horz.fMask = SIF_ALL; + horz.nMin = 0xdeadbeaf; + horz.nMax = 0xbaadc0de; + vert = horz; + h_ret = GetScrollInfo(hwnd, SB_HORZ, &horz); + v_ret = GetScrollInfo(hwnd, SB_VERT, &vert); + + if(cs->lpCreateParams) + { + /* WM_NCCREATE was passed to DefWindowProc */ + if(cs->style & (WS_VSCROLL | WS_HSCROLL)) + { + todo_wine + ok(h_ret && v_ret, "GetScrollInfo() should return NON-zero " + "but got h_ret=%d v_ret=%d\n", h_ret, v_ret); + todo_wine + ok(vert.nMin == 0 && vert.nMax == 100, + "unexpected init values(SB_VERT): min=%d max=%d\n", + vert.nMin, vert.nMax); + todo_wine + ok(horz.nMin == 0 && horz.nMax == 100, + "unexpected init values(SB_HORZ): min=%d max=%d\n", + horz.nMin, horz.nMax); + } + else + { + ok(!h_ret && !v_ret, "GetScrollInfo() should return zeru, " + "but got h_ret=%d v_ret=%d\n", h_ret, v_ret); + ok(vert.nMin == 0xdeadbeaf && vert.nMax == 0xbaadc0de, + "unexpected initialization(SB_VERT): min=%d max=%d\n", + vert.nMin, vert.nMax); + ok(horz.nMin == 0xdeadbeaf && horz.nMax == 0xbaadc0de, + "unexpected initialization(SB_HORZ): min=%d max=%d\n", + horz.nMin, horz.nMax); + } + } + else + { + ok(!h_ret && !v_ret, "GetScrollInfo() should return zeru, " + "but got h_ret=%d v_ret=%d\n", h_ret, v_ret); + ok(horz.nMin == 0xdeadbeaf && horz.nMax == 0xbaadc0de && + vert.nMin == 0xdeadbeaf && vert.nMax == 0xbaadc0de, + "unexpected initialization\n"); + } + return FALSE; /* abort creation */ + + default: + /* need for WM_GETMINMAXINFO, which precedes WM_NCCREATE */ + return 0; + } +} + +static void scrollbar_test_init(void) +{ + WNDCLASSEXA wc; + CHAR cls_name[] = "scroll_test_class"; + LONG style[] = {WS_VSCROLL, WS_HSCROLL, WS_VSCROLL | WS_HSCROLL, 0}; + int i; + + memset( &wc, 0, sizeof wc ); + wc.cbSize = sizeof wc; + wc.style = CS_VREDRAW | CS_HREDRAW; + wc.hInstance = GetModuleHandleA(0); + wc.hCursor = LoadCursorA(NULL, IDC_ARROW); + wc.hbrBackground = GetStockObject(WHITE_BRUSH); + wc.lpszClassName = cls_name; + wc.lpfnWndProc = scroll_init_proc; + RegisterClassExA(&wc); + + for(i = 0; i < sizeof style / sizeof style[0]; i++) + { + /* need not to destroy these windows due creation abort */ + CreateWindowExA(0, cls_name, NULL, style[i], + 100, 100, 100, 100, NULL, NULL, wc.hInstance, (LPVOID)TRUE); + CreateWindowExA(0, cls_name, NULL, style[i], + 100, 100, 100, 100, NULL, NULL, wc.hInstance, (LPVOID)FALSE); + } + UnregisterClassA(cls_name, wc.hInstance); +} + START_TEST ( scroll ) { WNDCLASSA wc; @@ -444,6 +539,8 @@ START_TEST ( scroll ) scrollbar_test_default( WS_VSCROLL); scrollbar_test_default( WS_HSCROLL | WS_VSCROLL); + scrollbar_test_init(); + DestroyWindow(hScroll); DestroyWindow(hMainWnd); }

1 0

Stefan Leichter : gdi32: Add stub for GetFontResourceInfoW.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: 83846cd131aac33228bf08aefae0bf0ea93d4273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83846cd131aac33228bf08aef… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Jan 21 22:44:52 2013 +0100 gdi32: Add stub for GetFontResourceInfoW. --- dlls/gdi32/font.c | 9 +++++++++ dlls/gdi32/gdi32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a24acd4..b274b83 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3602,6 +3602,15 @@ BOOL WINAPI RemoveFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv ) } /*********************************************************************** + * GetFontResourceInfoW (GDI32.@) + */ +BOOL WINAPI GetFontResourceInfoW( LPCWSTR str, LPDWORD size, PVOID buffer, DWORD type ) +{ + FIXME("%s %p(%d) %p %d\n", debugstr_w(str), size, size ? *size : 0, buffer, type); + return FALSE; +} + +/*********************************************************************** * GetTextCharset (GDI32.@) */ UINT WINAPI GetTextCharset(HDC hdc) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 80b1b68..65f1d0c 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -279,7 +279,7 @@ @ stdcall GetFontData(long long long ptr long) @ stdcall GetFontLanguageInfo(long) @ stub GetFontResourceInfo -@ stub GetFontResourceInfoW +@ stdcall GetFontResourceInfoW(wstr ptr ptr long) @ stdcall GetFontUnicodeRanges(ptr ptr) @ stdcall GetGlyphIndicesA(long ptr long ptr long) @ stdcall GetGlyphIndicesW(long ptr long ptr long)

1 0

André Hentschel : netstat: Implement the TCP stats output.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: 709b9ee819557d447055f645469728f6a1284cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=709b9ee819557d447055f6454… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 21 21:12:36 2013 +0100 netstat: Implement the TCP stats output. --- po/ar.po | 40 +++++++++++++++++++++++++++++++++++ po/bg.po | 44 +++++++++++++++++++++++++++++++++++++++ po/ca.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/cs.po | 40 +++++++++++++++++++++++++++++++++++ po/da.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/de.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/el.po | 40 +++++++++++++++++++++++++++++++++++ po/en.po | 36 ++++++++++++++++++++++++++++++++ po/en_US.po | 36 ++++++++++++++++++++++++++++++++ po/eo.po | 44 +++++++++++++++++++++++++++++++++++++++ po/es.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/fa.po | 40 +++++++++++++++++++++++++++++++++++ po/fi.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/fr.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/he.po | 44 +++++++++++++++++++++++++++++++++++++++ po/hi.po | 36 ++++++++++++++++++++++++++++++++ po/hu.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/it.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/ja.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/ko.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/lt.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/ml.po | 36 ++++++++++++++++++++++++++++++++ po/nb_NO.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/nl.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/or.po | 36 ++++++++++++++++++++++++++++++++ po/pa.po | 36 ++++++++++++++++++++++++++++++++ po/pl.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/pt_BR.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/pt_PT.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/rm.po | 36 ++++++++++++++++++++++++++++++++ po/ro.po | 44 +++++++++++++++++++++++++++++++++++++++ po/ru.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/sk.po | 44 +++++++++++++++++++++++++++++++++++++++ po/sl.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 44 +++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 44 +++++++++++++++++++++++++++++++++++++++ po/sv.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/te.po | 36 ++++++++++++++++++++++++++++++++ po/th.po | 40 +++++++++++++++++++++++++++++++++++ po/tr.po | 44 +++++++++++++++++++++++++++++++++++++++ po/uk.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/wa.po | 36 ++++++++++++++++++++++++++++++++ po/wine.pot | 36 ++++++++++++++++++++++++++++++++ po/zh_CN.po | 44 +++++++++++++++++++++++++++++++++++++++ po/zh_TW.po | 48 +++++++++++++++++++++++++++++++++++++++++++ programs/netstat/netstat.c | 33 +++++++++++++++++++++++++++++ programs/netstat/netstat.h | 9 ++++++++ programs/netstat/netstat.rc | 9 ++++++++ 48 files changed, 2015 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=709b9ee819557d447055f…

1 0

Alexandre Julliard : ntdll: Use the __NR_ names for Linux system calls.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: 606c88a348fa240359a25aa5a3659a0b41ee0cb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=606c88a348fa240359a25aa5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 21 21:37:02 2013 +0100 ntdll: Use the __NR_ names for Linux system calls. --- dlls/ntdll/critsection.c | 4 ++-- dlls/ntdll/directory.c | 4 ++-- dlls/ntdll/server.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index fb69b31..dcc66e0 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -66,12 +66,12 @@ static int wake_op = 129; /*FUTEX_WAKE|FUTEX_PRIVATE_FLAG*/ static inline int futex_wait( int *addr, int val, struct timespec *timeout ) { - return syscall( SYS_futex, addr, wait_op, val, timeout, 0, 0 ); + return syscall( __NR_futex, addr, wait_op, val, timeout, 0, 0 ); } static inline int futex_wake( int *addr, int val ) { - return syscall( SYS_futex, addr, wake_op, val, NULL, 0, 0 ); + return syscall( __NR_futex, addr, wake_op, val, NULL, 0, 0 ); } static inline int use_futexes(void) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index cc075b7..863a320 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -109,7 +109,7 @@ typedef struct # define O_DIRECTORY 0200000 /* must be directory */ #endif -#ifdef SYS_getdents64 +#ifdef __NR_getdents64 typedef struct { ULONG64 d_ino; @@ -121,7 +121,7 @@ typedef struct static inline int getdents64( int fd, char *de, unsigned int size ) { - return syscall( SYS_getdents64, fd, de, size ); + return syscall( __NR_getdents64, fd, de, size ); } #define USE_GETDENTS #endif diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index af2ce06..dd0d83e 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -962,7 +962,7 @@ static int get_unix_tid(void) #ifdef HAVE_PTHREAD_GETTHREADID_NP ret = pthread_getthreadid_np(); #elif defined(linux) - ret = syscall( SYS_gettid ); + ret = syscall( __NR_gettid ); #elif defined(__sun) ret = pthread_self(); #elif defined(__APPLE__)

1 0

Alexandre Julliard : server: Use the __NR_ names for Linux system calls.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: 2b95df8fbdcf7069ddea0db5490c8c4e005d6e15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b95df8fbdcf7069ddea0db54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 21 21:37:10 2013 +0100 server: Use the __NR_ names for Linux system calls. --- server/ptrace.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 19ec7da..db2804a 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -203,8 +203,8 @@ static int waitpid_thread( struct thread *thread, int signal ) static inline int tkill( int tgid, int pid, int sig ) { #ifdef __linux__ - int ret = syscall( SYS_tgkill, tgid, pid, sig ); - if (ret < 0 && errno == ENOSYS) ret = syscall( SYS_tkill, pid, sig ); + int ret = syscall( __NR_tgkill, tgid, pid, sig ); + if (ret < 0 && errno == ENOSYS) ret = syscall( __NR_tkill, pid, sig ); return ret; #elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__)) && defined(HAVE_THR_KILL2) return thr_kill2( tgid, pid, sig );

1 0

Alexandre Julliard : gdi32: Fix copy/ paste typo in get_char_positions_indices.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: f496a5a0e69ac21a45c9048131ef59469c45f8d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f496a5a0e69ac21a45c904813… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 22 12:13:19 2013 +0100 gdi32: Fix copy/paste typo in get_char_positions_indices. --- dlls/gdi32/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 68559f1..a24acd4 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -358,7 +358,7 @@ static BOOL get_char_positions_indices( DC *dc, const WORD *indices, INT count, dev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); dev->funcs->pGetTextMetrics( dev, &tm ); - dev = GET_DC_PHYSDEV( dc, pGetTextExtentExPoint ); + dev = GET_DC_PHYSDEV( dc, pGetTextExtentExPointI ); if (!dev->funcs->pGetTextExtentExPointI( dev, indices, count, dx )) return FALSE; if (dc->breakExtra || dc->breakRem)

1 0

Nikolay Sivov : xmllite: Implement end tag parsing.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: fad7e7a011c187ee48f59372bdc4e6475c60531b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad7e7a011c187ee48f59372b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 22 13:11:51 2013 +0400 xmllite: Implement end tag parsing. --- dlls/xmllite/reader.c | 60 ++++++++++++++++++++++++++++++++++++++++--- dlls/xmllite/tests/reader.c | 52 +++++++++++++++++++++++++++++++++++- 2 files changed, 106 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index e0e6542..647af24 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -69,6 +69,7 @@ static const WCHAR utf8W[] = {'U','T','F','-','8',0}; static const WCHAR dblquoteW[] = {'\"',0}; static const WCHAR quoteW[] = {'\'',0}; +static const WCHAR gtW[] = {'>',0}; struct xml_encoding_data { @@ -299,6 +300,14 @@ static void reader_free_strvalues(xmlreader *reader) reader_free_strvalue(reader, type); } +/* This helper should only be used to test if strings are the same, + it doesn't try to sort. */ +static inline int strval_eq(const strval *str1, const strval *str2) +{ + if (str1->len != str2->len) return 0; + return !memcmp(str1->str, str2->str, str1->len*sizeof(WCHAR)); +} + static void reader_clear_elements(xmlreader *reader) { struct element *elem, *elem2; @@ -338,6 +347,18 @@ static HRESULT reader_push_element(xmlreader *reader, strval *qname) return hr; } +static void reader_pop_element(xmlreader *reader) +{ + struct element *elem = LIST_ENTRY(list_head(&reader->elements), struct element, entry); + + if (elem) + { + list_remove(&elem->entry); + reader_free_strvalued(reader, &elem->qname); + reader_free(reader, elem); + } +} + /* always make a copy, cause strings are supposed to be null terminated */ static void reader_set_strvalue(xmlreader *reader, XmlReaderStringValue type, const strval *value) { @@ -1465,7 +1486,6 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *local, strval *qname, int *empty) { static const WCHAR endW[] = {'/','>',0}; - static const WCHAR gtW[] = {'>',0}; HRESULT hr; /* skip '<' */ @@ -1477,7 +1497,12 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca reader_skipspaces(reader); /* empty element */ - if ((*empty = !reader_cmp(reader, endW))) return S_OK; + if ((*empty = !reader_cmp(reader, endW))) + { + /* skip '/>' */ + reader_skipn(reader, 2); + return S_OK; + } /* got a start tag */ if (!reader_cmp(reader, gtW)) @@ -1528,8 +1553,35 @@ static HRESULT reader_parse_element(xmlreader *reader) /* [13 NS] ETag ::= '</' QName S? '>' */ static HRESULT reader_parse_endtag(xmlreader *reader) { - FIXME("ETag parsing not implemented\n"); - return E_NOTIMPL; + strval prefix, local, qname; + struct element *elem; + HRESULT hr; + + /* skip '</' */ + reader_skipn(reader, 2); + + hr = reader_parse_qname(reader, &prefix, &local, &qname); + if (FAILED(hr)) return hr; + + reader_skipspaces(reader); + + if (reader_cmp(reader, gtW)) return WC_E_GREATERTHAN; + + /* skip '>' */ + reader_skipn(reader, 1); + + /* Element stack should never be empty at this point, cause we shouldn't get to + content parsing if it's empty. */ + elem = LIST_ENTRY(list_head(&reader->elements), struct element, entry); + if (!strval_eq(&elem->qname, &qname)) return WC_E_ELEMENTMATCH; + + reader_pop_element(reader); + + reader->nodetype = XmlNodeType_EndElement; + reader_set_strvalue(reader, StringValue_LocalName, &local); + reader_set_strvalue(reader, StringValue_QualifiedName, &qname); + + return S_OK; } /* [43] content ::= CharData? ((element | Reference | CDSect | PI | Comment) CharData?)* */ diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 8a1f3f7..babb1c9 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -888,6 +888,8 @@ static const char misc_test_xml[] = " \t \r \n" "" "<a>" + "" + "</a>" ; static struct nodes_test misc_test = { @@ -900,6 +902,8 @@ static struct nodes_test misc_test = { XmlNodeType_Whitespace, XmlNodeType_Comment, XmlNodeType_Element, + XmlNodeType_Element, + XmlNodeType_EndElement, XmlNodeType_None } }; @@ -1032,13 +1036,15 @@ static struct test_entry element_tests[] = { { "<a>", "a", "", S_OK }, { "<a >", "a", "", S_OK }, { "<a \r \t\n>", "a", "", S_OK }, + { "</a>", NULL, NULL, NC_E_QNAMECHARACTER }, { NULL } }; static void test_read_element(void) { struct test_entry *test = element_tests; - static const char stag[] = "<a>"; + static const char stag[] = "<a></a>"; + static const char mismatch[] = "<a>"; IXmlReader *reader; XmlNodeType type; IStream *stream; @@ -1090,7 +1096,8 @@ static void test_read_element(void) test++; } - stream = create_stream_on_data(stag, strlen(stag)+1); + /* test reader depth increment */ + stream = create_stream_on_data(stag, sizeof(stag)); hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "got %08x\n", hr); @@ -1115,6 +1122,47 @@ static void test_read_element(void) ok(hr == S_OK, "got %08x\n", hr); ok(depth == 1, "got %d\n", depth); + /* read end tag for inner element */ + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_EndElement, "got %d\n", type); + + depth = 0; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); +todo_wine + ok(depth == 2, "got %d\n", depth); + + /* read end tag for container element */ + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_EndElement, "got %d\n", type); + + depth = 0; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); + ok(depth == 1, "got %d\n", depth); + + IStream_Release(stream); + + /* start/end tag mismatch */ + stream = create_stream_on_data(mismatch, sizeof(mismatch)); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Element, "got %d\n", type); + + type = XmlNodeType_Element; + hr = IXmlReader_Read(reader, &type); + ok(hr == WC_E_ELEMENTMATCH, "got %08x\n", hr); +todo_wine + ok(type == XmlNodeType_None, "got %d\n", type); + IStream_Release(stream); IXmlReader_Release(reader);

1 0

Henri Verbeet : d3drm: Avoid LPD3DRECT.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: c309046cb1b9b29526db5314a7e00880001d9d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c309046cb1b9b29526db5314a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 22 11:34:05 2013 +0100 d3drm: Avoid LPD3DRECT. --- include/d3drmobj.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 5e50abe..11922c5 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -157,8 +157,9 @@ typedef struct IDirect3DRMClippedVisual *LPDIRECT3DRMCLIPPEDVISUAL, **LPLPDIRE typedef void (__cdecl *D3DRMOBJECTCALLBACK)(LPDIRECT3DRMOBJECT obj, LPVOID arg); typedef void (__cdecl *D3DRMFRAMEMOVECALLBACK)(LPDIRECT3DRMFRAME obj, LPVOID arg, D3DVALUE delta); typedef void (__cdecl *D3DRMFRAME3MOVECALLBACK)(LPDIRECT3DRMFRAME3 obj, LPVOID arg, D3DVALUE delta); -typedef void (__cdecl *D3DRMUPDATECALLBACK)(LPDIRECT3DRMDEVICE obj, LPVOID arg, int, LPD3DRECT); -typedef void (__cdecl *D3DRMDEVICE3UPDATECALLBACK)(LPDIRECT3DRMDEVICE3 obj, LPVOID arg, int, LPD3DRECT); +typedef void (__cdecl *D3DRMUPDATECALLBACK)(struct IDirect3DRMDevice *device, void *ctx, int count, D3DRECT *rects); +typedef void (__cdecl *D3DRMDEVICE3UPDATECALLBACK)(struct IDirect3DRMDevice3 *device, void *ctx, + int count, D3DRECT *rects); typedef int (__cdecl *D3DRMUSERVISUALCALLBACK)(LPDIRECT3DRMUSERVISUAL obj, LPVOID arg, D3DRMUSERVISUALREASON reason, LPDIRECT3DRMDEVICE dev, LPDIRECT3DRMVIEWPORT view); typedef HRESULT (__cdecl *D3DRMLOADTEXTURECALLBACK)(char *tex_name, void *arg, LPDIRECT3DRMTEXTURE *);

1 0

Henri Verbeet : d3drm: Avoid LPDDPIXELFORMAT.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: bb163ef0b95b4946da44a563138e4745b702808d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb163ef0b95b4946da44a5631… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 22 11:34:06 2013 +0100 d3drm: Avoid LPDDPIXELFORMAT. --- dlls/d3drm/device.c | 6 ++---- include/d3drmobj.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index ed6055b..6d72d92 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -904,10 +904,8 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice2(IDirect3DRMDevic } /*** IDirect3DRMDevice3 methods ***/ -static HRESULT WINAPI IDirect3DRMDevice3Impl_FindPreferredTextureFormat(IDirect3DRMDevice3* iface, - DWORD bitdepths, - DWORD flags, - LPDDPIXELFORMAT lpDDPF) +static HRESULT WINAPI IDirect3DRMDevice3Impl_FindPreferredTextureFormat(IDirect3DRMDevice3 *iface, + DWORD bitdepths, DWORD flags, DDPIXELFORMAT *lpDDPF) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 11922c5..69ab35d 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -678,7 +678,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD_(DWORD, GetRenderMode)(THIS) PURE; STDMETHOD(GetDirect3DDevice2)(THIS_ IDirect3DDevice2 **device) PURE; /*** IDirect3DRMDevice3 methods ***/ - STDMETHOD(FindPreferredTextureFormat)(THIS_ DWORD BitDepths, DWORD flags, LPDDPIXELFORMAT pDDPF) PURE; + STDMETHOD(FindPreferredTextureFormat)(THIS_ DWORD BitDepths, DWORD flags, DDPIXELFORMAT *format) PURE; STDMETHOD(RenderStateChange)(THIS_ D3DRENDERSTATETYPE drsType, DWORD val, DWORD flags) PURE; STDMETHOD(LightStateChange)(THIS_ D3DLIGHTSTATETYPE drsType, DWORD val, DWORD flags) PURE; STDMETHOD(GetStateChangeOptions)(THIS_ DWORD StateClass, DWORD StateNum, LPDWORD pFlags) PURE;

1 0