July 2008 - Wine-Commits - list.winehq.org

Alexandre Julliard : gdiplus/tests: Don' t test returned value if the call failed.
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: 8fd6f0e26ae28f2ba4938e2fbcc4851f47baa53c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd6f0e26ae28f2ba4938e2fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 10 20:39:45 2008 +0200 gdiplus/tests: Don't test returned value if the call failed. --- dlls/gdiplus/tests/stringformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/stringformat.c b/dlls/gdiplus/tests/stringformat.c index 919e1f7..3f112e0 100644 --- a/dlls/gdiplus/tests/stringformat.c +++ b/dlls/gdiplus/tests/stringformat.c @@ -64,7 +64,7 @@ todo_wine expect(Ok, stat); stat = GdipGetStringFormatMeasurableCharacterRangeCount(format, &count); expect(Ok, stat); - expect(3, count); + if (stat == Ok) expect(3, count); } stat= GdipDeleteStringFormat(format); expect(Ok, stat);

1 0

H. Verbeet : wined3d: Don't call shader_select() in depth_blt().
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: b37cc08721bb4c60b7842a0d5b1af81fe8820477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b37cc08721bb4c60b7842a0d5… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jul 10 17:57:35 2008 +0200 wined3d: Don't call shader_select() in depth_blt(). Calling shader_select() from inside depth_blt() isn't necessarily safe. shader_select() assumes CompileShader() has been called for the current shaders, but that depends on STATE_VSHADER / STATE_PIXELSHADER being applied. That isn't always true when depth_blt() gets called, with the result that sometimes GLSL programs could be created with no shader objects attached. --- dlls/wined3d/arb_program_shader.c | 52 ++++++++++++++++++++++++++++++----- dlls/wined3d/ati_fragment_shader.c | 5 +++ dlls/wined3d/baseshader.c | 2 + dlls/wined3d/drawprim.c | 6 +--- dlls/wined3d/glsl_shader.c | 14 +++++++++ dlls/wined3d/wined3d_private.h | 3 ++ 6 files changed, 69 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b37cc08721bb4c60b7842…

1 0

Alistair Leslie-Hughes : shlwapi: Fix tests under w2k8.
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: d2cce3284af1b6a22b8a09751d10c16fdaae97b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2cce3284af1b6a22b8a09751… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 9 19:37:05 2008 +1000 shlwapi: Fix tests under w2k8. --- dlls/shlwapi/tests/ordinal.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index f5286f0..df90bf7 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -64,22 +64,26 @@ static void test_GetAcceptLanguagesA(void) SetLastError(ERROR_SUCCESS); retval = pGetAcceptLanguagesA( NULL, NULL); - ok(retval == E_FAIL, + ok(retval == E_FAIL || + retval == E_INVALIDARG, /* w2k8 */ "function result wrong: got %08x; expected E_FAIL\n", retval); ok(ERROR_SUCCESS == GetLastError(), "last error set to %u\n", GetLastError()); buffersize = sizeof(buffer); SetLastError(ERROR_SUCCESS); retval = pGetAcceptLanguagesA( NULL, &buffersize); - ok(retval == E_FAIL, + ok(retval == E_FAIL || + retval == E_INVALIDARG, /* w2k8 */ "function result wrong: got %08x; expected E_FAIL\n", retval); - ok(buffersize == sizeof(buffer), - "buffersize was changed (2nd parameter; not on Win2k)\n"); + ok(buffersize == sizeof(buffer) || + buffersize == 0, /* w2k8*/ + "buffersize was changed and is not 0; size (%d))\n", buffersize); ok(ERROR_SUCCESS == GetLastError(), "last error set to %u\n", GetLastError()); SetLastError(ERROR_SUCCESS); retval = pGetAcceptLanguagesA( buffer, NULL); - ok(retval == E_FAIL, + ok(retval == E_FAIL || + retval == E_INVALIDARG, /* w2k8 */ "function result wrong: got %08x; expected E_FAIL\n", retval); ok(ERROR_SUCCESS == GetLastError(), "last error set to %u\n", GetLastError()); @@ -87,7 +91,8 @@ static void test_GetAcceptLanguagesA(void) memset(buffer, 0, sizeof(buffer)); SetLastError(ERROR_SUCCESS); retval = pGetAcceptLanguagesA( buffer, &buffersize); - ok(retval == E_FAIL, + ok(retval == E_FAIL || + retval == E_INVALIDARG, /* w2k8 */ "function result wrong: got %08x; expected E_FAIL\n", retval); ok(buffersize == 0, "buffersize wrong(changed) got %08x; expected 0 (2nd parameter; not on Win2k)\n", buffersize); @@ -363,6 +368,12 @@ static void test_GetShellSecurityDescriptor(void) pGetShellSecurityDescriptor=(void*)GetProcAddress(hShlwapi,(char*)475); + if(!pGetShellSecurityDescriptor) + { + skip("GetShellSecurityDescriptor not available\n"); + return; + } + psd = pGetShellSecurityDescriptor(NULL, 2); ok(psd==NULL, "GetShellSecurityDescriptor should fail\n"); psd = pGetShellSecurityDescriptor(rgsup, 0);

1 0

Alexandre Julliard : server: Better handling of errors when accessing the / proc control files on Solaris.
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: 44043a7dd0b718bbe25c6f6cb6a61625f1fb9f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=44043a7dd0b718bbe25c6f6cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 10 20:15:15 2008 +0200 server: Better handling of errors when accessing the /proc control files on Solaris. --- server/procfs.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/server/procfs.c b/server/procfs.c index b15bfcd..da22af3 100644 --- a/server/procfs.c +++ b/server/procfs.c @@ -46,8 +46,22 @@ static int open_proc_as( struct process *process, int flags ) char buffer[32]; int fd; + if (process->unix_pid == -1) + { + set_error( STATUS_ACCESS_DENIED ); + return -1; + } + sprintf( buffer, "/proc/%u/as", process->unix_pid ); - if ((fd = open( buffer, flags )) == -1) file_set_error(); + if ((fd = open( buffer, flags )) == -1) + { + if (errno == ENOENT) /* probably got killed */ + { + process->unix_pid = -1; + set_error( STATUS_ACCESS_DENIED ); + } + else file_set_error(); + } return fd; } @@ -56,8 +70,16 @@ static int open_proc_lwpctl( struct thread *thread ) char buffer[48]; int fd; + if (thread->unix_pid == -1) return -1; + sprintf( buffer, "/proc/%u/lwp/%u/lwpctl", thread->unix_pid, thread->unix_tid ); - if ((fd = open( buffer, O_WRONLY )) == -1) file_set_error(); + if ((fd = open( buffer, O_WRONLY )) == -1) + { + if (errno == ENOENT) /* probably got killed */ + thread->unix_pid = thread->unix_tid = -1; + else + file_set_error(); + } return fd; }

1 0

Alexandre Julliard : ntdll: Add some workarounds for Solaris signal handling breakages.
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: e5566691e214527cb6f9f35b0efd38dc7357e17c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5566691e214527cb6f9f35b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 10 18:18:16 2008 +0200 ntdll: Add some workarounds for Solaris signal handling breakages. --- dlls/ntdll/signal_i386.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 4e0c5fa..92e3819 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -575,6 +575,58 @@ static void merge_vm86_pending_flags( EXCEPTION_RECORD *rec ) #endif /* __HAVE_VM86 */ +#ifdef __sun + +/* We have to workaround two Solaris breakages: + * - Solaris doesn't restore %ds and %es before calling the signal handler so exceptions in 16-bit + * code crash badly. + * - Solaris inserts a libc trampoline to call our handler, but the trampoline expects that registers + * are setup correctly. So we need to insert our own trampoline below the libc trampoline to set %gs. + */ + +extern int sigaction_syscall( int sig, const struct sigaction *new, struct sigaction *old ); +__ASM_GLOBAL_FUNC( sigaction_syscall, + "call 1f\n" + "1:\tpopl %edx\n\t" + "movl $0x62,%eax\n\t" + "add $[2f-1b],%edx\n\t" + "movl %esp,%ecx\n\t" + "sysenter\n" + "2:\tret" ) + +/* assume the same libc handler is used for all signals */ +static void (*libc_sigacthandler)( int signal, siginfo_t *siginfo, void *context ); + +static void wine_sigacthandler( int signal, siginfo_t *siginfo, void *sigcontext ) +{ + struct ntdll_thread_data *thread_data; + + __asm__ __volatile__("mov %ss,%ax; mov %ax,%ds; mov %ax,%es"); + + thread_data = (struct ntdll_thread_data *)get_current_teb()->SystemReserved2; + wine_set_fs( thread_data->fs ); + wine_set_gs( thread_data->gs ); + + libc_sigacthandler( signal, siginfo, sigcontext ); +} + +static int solaris_sigaction( int sig, const struct sigaction *new, struct sigaction *old ) +{ + struct sigaction real_act; + + if (sigaction( sig, new, old ) == -1) return -1; + + /* retrieve the real handler and flags with a direct syscall */ + sigaction_syscall( sig, NULL, &real_act ); + libc_sigacthandler = real_act.sa_sigaction; + real_act.sa_sigaction = wine_sigacthandler; + sigaction_syscall( sig, &real_act, NULL ); + return 0; +} +#define sigaction(sig,new,old) solaris_sigaction(sig,new,old) + +#endif + typedef void (WINAPI *raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); @@ -601,8 +653,10 @@ static inline void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD * *gs = wine_get_gs(); #endif +#ifndef __sun /* see above for Solaris handling */ wine_set_fs( thread_data->fs ); wine_set_gs( thread_data->gs ); +#endif if (!wine_ldt_is_system(CS_sig(sigcontext)) || !wine_ldt_is_system(SS_sig(sigcontext))) /* 16-bit mode */

1 0

Dylan Smith : richedit: Handle overflow of only spaces on first line of paragraph.
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: db3991257fdb7137f9b0fab5e2a52a183828ff84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db3991257fdb7137f9b0fab5e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 10 10:17:43 2008 -0400 richedit: Handle overflow of only spaces on first line of paragraph. The uncommon case that this patch handles is enough whitespace being on the first line of a paragraph to cause it to wrap. In this case the first non-space character will be wrapped onto the next line. --- dlls/riched20/wrap.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 614c6ac..90dca83 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -358,8 +358,19 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) pp = ME_SplitByBacktracking(wc, p, loc); if (pp == wc->pRowStart) { - /* we have a row that starts with spaces, or a single large character - * which we cannot split. */ + if (run->nFlags & MERF_STARTWHITE) + { + /* we had only spaces so far, so we must be on the first line of the + * paragraph, since no other lines of the paragraph start with spaces. */ + assert(!wc->nRow); + /* The lines will only contain spaces, and the rest of the run will + * overflow onto the next line. */ + wc->bOverflown = TRUE; + return p; + } + /* Couldn't split the first run, possible because we have a large font + * with a single character that caused an overflow. + */ wc->pt.x += run->nWidth; return p->next; }

1 0

Dylan Smith : richedit: Fixed position of runs in some situations during wrapping.
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: feda29bb0c03f3471ba2ea089d7a1b422ca5e334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feda29bb0c03f3471ba2ea089… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 10 10:17:39 2008 -0400 richedit: Fixed position of runs in some situations during wrapping. Runs that are skipped over still need to affect the wrapping position, otherwise they won't affect further run positions. --- dlls/riched20/wrap.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 34fbf09..614c6ac 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -296,7 +296,7 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) if (run->nFlags & MERF_WHITESPACE) { p->member.run.nFlags |= MERF_SKIPPED; - /* wc->pt.x += run->nWidth; */ + wc->pt.x += run->nWidth; /* skip runs consisting of only whitespaces */ return p->next; } @@ -358,8 +358,9 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) pp = ME_SplitByBacktracking(wc, p, loc); if (pp == wc->pRowStart) { - /* we had only spaces so far, entire content can be omitted */ - wc->pt.x = 0; + /* we have a row that starts with spaces, or a single large character + * which we cannot split. */ + wc->pt.x += run->nWidth; return p->next; } if (p != pp) /* found a suitable split point */

1 0

Dylan Smith : richedit: Removed redundant wrapping code.
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: e4007e9f97eb5742b282b93d5eef88ee68dddea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4007e9f97eb5742b282b93d5… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 10 10:17:23 2008 -0400 richedit: Removed redundant wrapping code. Lines in ME_WrapHandleRun were removed because ME_CalcRunExtent is already called unconditionally just before it in the call to ME_WrapSizeRun. --- dlls/riched20/wrap.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index adabea1..82c2698 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -320,12 +320,6 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) ME_InsertRowStart(wc, p); return p; } - /* we're not at the end of the row */ - if (run->nFlags & MERF_TAB) { - /* force recomputation of tabs' size as it depends on position */ - ME_CalcRunExtent(wc->context, &ME_GetParagraph(p)->member.para, - wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run); - } /* will current run fit? */ if (wc->pt.x + run->nWidth > wc->nAvailWidth) @@ -423,12 +417,6 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp, DWORD begino wc.pt.y += border; } - if (c->editor->bWordWrap) - wc.nAvailWidth = c->rcView.right - c->rcView.left - wc.nFirstMargin - wc.nRightMargin; - else - wc.nAvailWidth = ~0u >> 1; - wc.pRowStart = NULL; - linespace = ME_GetParaLineSpace(c, &tp->member.para); ME_BeginRow(&wc);

1 0

Dylan Smith : richedit: Tabs cause lines to wrap but not end of paragraph run.
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: 49468e1824cac4df5d09614884100f79b33b50cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=49468e1824cac4df5d0961488… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 10 10:17:30 2008 -0400 richedit: Tabs cause lines to wrap but not end of paragraph run. --- dlls/riched20/wrap.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 82c2698..34fbf09 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -290,7 +290,11 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) if (wc->bOverflown) /* just skipping final whitespaces */ { - if (run->nFlags & (MERF_WHITESPACE|MERF_TAB)) { + /* End paragraph run can't overflow to the next line by itself. */ + if (run->nFlags & MERF_ENDPARA) + return p->next; + + if (run->nFlags & MERF_WHITESPACE) { p->member.run.nFlags |= MERF_SKIPPED; /* wc->pt.x += run->nWidth; */ /* skip runs consisting of only whitespaces */

1 0

Piotr Caban : msxml3: oldChild in xmlnode_removeChild may be NULL.
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: 93e76ece37b1fa1330d83f446a3aebfb5198b744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93e76ece37b1fa1330d83f446… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 10 15:22:21 2008 +0200 msxml3: oldChild in xmlnode_removeChild may be NULL. --- dlls/msxml3/node.c | 7 +++++-- dlls/msxml3/tests/domdoc.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index bdc9ac9..a33777f 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -625,7 +625,8 @@ static HRESULT WINAPI xmlnode_removeChild( TRACE("%p->(%p, %p)\n", This, childNode, oldChild); - *oldChild = NULL; + if(oldChild) + *oldChild = NULL; if(!childNode) return E_INVALIDARG; @@ -651,7 +652,9 @@ static HRESULT WINAPI xmlnode_removeChild( IXMLDOMNode_Release(child); IXMLDOMNode_AddRef(childNode); - *oldChild = childNode; + + if(oldChild) + *oldChild = childNode; return S_OK; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3745fca..19a9a2f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1769,6 +1769,18 @@ static void test_removeChild(void) IXMLDOMNode_Release( node2 ); IXMLDOMNode_Release( node4 ); + + r = IXMLDOMNodeList_get_item( node_list, 0, &node4 ); + ok( r == S_OK, "ret %08x\n", r); + + r = IXMLDOMElement_removeChild( element, node4, NULL ); + ok( r == S_OK, "ret %08x\n", r); + + r = IXMLDOMNode_get_parentNode( node4, &node3 ); + ok( r == S_FALSE, "ret %08x\n", r); + ok( node3 == NULL, "%p\n", node3 ); + + IXMLDOMNode_Release( node4 ); IXMLDOMNodeList_Release( node_list2 ); IXMLDOMNode_Release( node ); IXMLDOMNodeList_Release( node_list );

1 0