January 2013 - Wine-Commits

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

Jan. 22, 2013

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

Henri Verbeet : wined3d: Properly set WINED3DFMT_FLAG_SRGB_WRITE in init_format_texture_info().
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: wine Branch: master Commit: 9307327ede0107458ba030bf6d0a284ac2b637e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9307327ede0107458ba030bf6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 22 11:34:08 2013 +0100 wined3d: Properly set WINED3DFMT_FLAG_SRGB_WRITE in init_format_texture_info(). --- dlls/wined3d/directx.c | 33 ++++----------------------------- dlls/wined3d/utils.c | 21 +++++++++++++++++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 22 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 18ea67d..f763c12 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3532,31 +3532,6 @@ static BOOL CheckSrgbReadCapability(const struct wined3d_adapter *adapter, const return format->flags & WINED3DFMT_FLAG_SRGB_READ; } -static BOOL CheckSrgbWriteCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) -{ - /* Only offer SRGB writing on X8R8G8B8/A8R8G8B8 when we use ARB or GLSL shaders as we are - * doing the color fixup in shaders. - * Note Windows drivers (at least on the Geforce 8800) also offer this on R5G6B5. */ - if (format->flags & WINED3DFMT_FLAG_SRGB_WRITE) - { - struct fragment_caps fragment_caps; - struct shader_caps shader_caps; - - adapter->fragment_pipe->get_caps(&adapter->gl_info, &fragment_caps); - adapter->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); - - if ((fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_SRGB_WRITE) - && (shader_caps.wined3d_caps & WINED3D_SHADER_CAP_SRGB_WRITE)) - { - TRACE("[OK]\n"); - return TRUE; - } - } - - TRACE("[FAILED] - sRGB writes not supported by format %s.\n", debug_d3dformat(format->id)); - return FALSE; -} - /* Check if a format support blending in combination with pixel shaders */ static BOOL CheckPostPixelShaderBlendingCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) @@ -4033,7 +4008,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_SRGBWRITE) { - if (!CheckSrgbWriteCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_SRGB_WRITE)) { TRACE("[FAILED] - No sRGB write support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4199,7 +4174,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_SRGBWRITE) { - if (!CheckSrgbWriteCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_SRGB_WRITE)) { TRACE("[FAILED] - No sRGB write support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4367,7 +4342,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_SRGBWRITE) { - if (!CheckSrgbWriteCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_SRGB_WRITE)) { TRACE("[FAILED] - No sRGB write support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -5546,7 +5521,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) return FALSE; } - if (!initPixelFormats(&adapter->gl_info, adapter->driver_info.vendor)) + if (!wined3d_adapter_init_format_info(adapter)) { ERR("Failed to initialize GL format info.\n"); WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 95a826e..6caeee6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1243,10 +1243,18 @@ static void init_format_fbo_compat_info(struct wined3d_gl_info *gl_info) gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo); } -static BOOL init_format_texture_info(struct wined3d_gl_info *gl_info) +static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct wined3d_gl_info *gl_info) { + struct fragment_caps fragment_caps; + struct shader_caps shader_caps; + BOOL srgb_write; unsigned int i; + adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); + adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); + srgb_write = (fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_SRGB_WRITE) + && (shader_caps.wined3d_caps & WINED3D_SHADER_CAP_SRGB_WRITE); + for (i = 0; i < sizeof(format_texture_info) / sizeof(*format_texture_info); ++i) { int fmt_idx = getFmtIdx(format_texture_info[i].id); @@ -1293,6 +1301,9 @@ static BOOL init_format_texture_info(struct wined3d_gl_info *gl_info) } } + if ((format->flags & WINED3DFMT_FLAG_SRGB_WRITE) && !srgb_write) + format->flags &= ~WINED3DFMT_FLAG_SRGB_WRITE; + /* Texture conversion stuff */ format->convert = format_texture_info[i].convert; format->conv_byte_count = format_texture_info[i].conv_byte_count; @@ -1645,17 +1656,19 @@ BOOL initPixelFormatsNoGL(struct wined3d_gl_info *gl_info) } /* Context activation is done by the caller. */ -BOOL initPixelFormats(struct wined3d_gl_info *gl_info, enum wined3d_pci_vendor vendor) +BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter) { + struct wined3d_gl_info *gl_info = &adapter->gl_info; + if (!init_format_base_info(gl_info)) return FALSE; if (!init_format_block_info(gl_info)) goto fail; - if (!init_format_texture_info(gl_info)) goto fail; + if (!init_format_texture_info(adapter, gl_info)) goto fail; if (!init_format_vertex_info(gl_info)) goto fail; apply_format_fixups(gl_info); init_format_fbo_compat_info(gl_info); - init_format_filter_info(gl_info, vendor); + init_format_filter_info(gl_info, adapter->driver_info.vendor); return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c66374a..b6ecfa9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1592,9 +1592,9 @@ struct wined3d_adapter const struct blit_shader *blitter; }; +BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; unsigned int adapter_adjust_memory(struct wined3d_adapter *adapter, int amount) DECLSPEC_HIDDEN; -BOOL initPixelFormats(struct wined3d_gl_info *gl_info, enum wined3d_pci_vendor vendor) DECLSPEC_HIDDEN; BOOL initPixelFormatsNoGL(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; extern void add_gl_compat_wrappers(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Add sRGB writes to the shader backend and fragment pipe caps.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: wine Branch: master Commit: 5ce220eb2fdac8dccde181e8ad1b3f5983bc5f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce220eb2fdac8dccde181e8a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 22 11:34:07 2013 +0100 wined3d: Add sRGB writes to the shader backend and fragment pipe caps. --- dlls/wined3d/arb_program_shader.c | 5 +++-- dlls/wined3d/directx.c | 11 +++++++---- dlls/wined3d/glsl_shader.c | 9 +++++++-- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0d0db64..2df18cd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5062,7 +5062,7 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh caps->ps_1x_max_value = 0.0f; } - caps->wined3d_caps = 0; + caps->wined3d_caps = WINED3D_SHADER_CAP_SRGB_WRITE; if (use_nv_clip(gl_info)) caps->wined3d_caps |= WINED3D_SHADER_CAP_VS_CLIPPING; } @@ -5738,7 +5738,8 @@ static void arbfp_free(struct wined3d_device *device) static void arbfp_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) { - caps->wined3d_caps = WINED3D_FRAGMENT_CAP_PROJ_CONTROL; + caps->wined3d_caps = WINED3D_FRAGMENT_CAP_PROJ_CONTROL + | WINED3D_FRAGMENT_CAP_SRGB_WRITE; caps->PrimitiveMiscCaps = WINED3DPMISCCAPS_TSSARGTEMP; caps->TextureOpCaps = WINED3DTEXOPCAPS_DISABLE | WINED3DTEXOPCAPS_SELECTARG1 | diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e442734..18ea67d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3539,11 +3539,14 @@ static BOOL CheckSrgbWriteCapability(const struct wined3d_adapter *adapter, cons * Note Windows drivers (at least on the Geforce 8800) also offer this on R5G6B5. */ if (format->flags & WINED3DFMT_FLAG_SRGB_WRITE) { - int vs_selected_mode; - int ps_selected_mode; - select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); + struct fragment_caps fragment_caps; + struct shader_caps shader_caps; - if ((ps_selected_mode == SHADER_ARB) || (ps_selected_mode == SHADER_GLSL)) + adapter->fragment_pipe->get_caps(&adapter->gl_info, &fragment_caps); + adapter->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); + + if ((fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_SRGB_WRITE) + && (shader_caps.wined3d_caps & WINED3D_SHADER_CAP_SRGB_WRITE)) { TRACE("[OK]\n"); return TRUE; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a9ca2cd..9b000b6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6205,7 +6205,11 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s */ caps->ps_1x_max_value = 8.0; - caps->wined3d_caps = WINED3D_SHADER_CAP_VS_CLIPPING; + /* Ideally we'd only set caps like sRGB writes here if supported by both + * the shader backend and the fragment pipe, but we can get called before + * shader_glsl_alloc(). */ + caps->wined3d_caps = WINED3D_SHADER_CAP_VS_CLIPPING + | WINED3D_SHADER_CAP_SRGB_WRITE; } static BOOL shader_glsl_color_fixup_supported(struct color_fixup_desc fixup) @@ -6392,7 +6396,8 @@ static void glsl_fragment_pipe_enable(const struct wined3d_gl_info *gl_info, BOO static void glsl_fragment_pipe_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) { - caps->wined3d_caps = WINED3D_FRAGMENT_CAP_PROJ_CONTROL; + caps->wined3d_caps = WINED3D_FRAGMENT_CAP_PROJ_CONTROL + | WINED3D_FRAGMENT_CAP_SRGB_WRITE; caps->PrimitiveMiscCaps = WINED3DPMISCCAPS_TSSARGTEMP; caps->TextureOpCaps = WINED3DTEXOPCAPS_DISABLE | WINED3DTEXOPCAPS_SELECTARG1 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f59a736..c66374a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -715,6 +715,7 @@ extern const struct wined3d_shader_frontend sm4_shader_frontend DECLSPEC_HIDDEN; typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); #define WINED3D_SHADER_CAP_VS_CLIPPING 0x00000001 +#define WINED3D_SHADER_CAP_SRGB_WRITE 0x00000002 struct shader_caps { @@ -1175,6 +1176,7 @@ struct StateEntryTemplate }; #define WINED3D_FRAGMENT_CAP_PROJ_CONTROL 0x00000001 +#define WINED3D_FRAGMENT_CAP_SRGB_WRITE 0x00000002 struct fragment_caps {

1 0

Henri Verbeet : d3drm: Avoid LPDDPIXELFORMAT.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

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

Nikolay Sivov : xmllite: Implement end tag parsing.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

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

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

Jan. 22, 2013

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

Francois Gouget : testbot: Make it possible to restart a failed job.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: tools Branch: master Commit: b8fbfb378bbaa359068131d038280b5a1d05f2c7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b8fbfb378bbaa359068131d0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 22 04:15:50 2013 +0100 testbot: Make it possible to restart a failed job. Mostly this is so that jobs that failed because of a transient WineTestBot error can be restarted by the administrator. --- testbot/bin/Engine.pl | 31 +++++++++++++ testbot/lib/WineTestBot/Engine/Notify.pm | 22 ++++++++- testbot/lib/WineTestBot/Jobs.pm | 38 +++++++++++++++ testbot/web/JobDetails.pl | 73 ++++++++++++++++++++++++++++-- 4 files changed, 158 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index e233e80..3d8f159 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -171,6 +171,36 @@ sub HandleJobCancel return "1OK"; } +sub HandleJobRestart +{ + my $JobKey = $_[0]; + + my $Job = CreateJobs()->GetItem($JobKey); + if (! $Job) + { + LogMsg "JobRestart for nonexistent job $JobKey\n"; + return "0Job $JobKey not found"; + } + # We've already determined that JobKey is valid, untaint it + $JobKey =~ m/^(.*)$/; + $JobKey = $1; + + my $ErrMessage = $Job->Restart(); + if (defined($ErrMessage)) + { + LogMsg "Restart problem: $ErrMessage\n"; + return "0$ErrMessage"; + } + + $ErrMessage = ScheduleJobs(); + if (defined($ErrMessage)) + { + LogMsg "Scheduling problem in HandleJobRestart: $ErrMessage\n"; + } + + return "1OK"; +} + sub HandleTaskComplete { my $ErrMessage = ScheduleJobs(); @@ -452,6 +482,7 @@ my %Handlers=( "foundwinetestupdate" => \&HandleFoundWinetestUpdate, "getscreenshot" => \&HandleGetScreenshot, "jobcancel" => \&HandleJobCancel, + "jobrestart" => \&HandleJobRestart, "jobstatuschange" => \&HandleJobStatusChange, "jobsubmit" => \&HandleJobSubmit, "ping" => \&HandlePing, diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 6bbec87..b836751 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -33,8 +33,9 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); require Exporter; @ISA = qw(Exporter); -(a)EXPORT = qw(&PingEngine &JobSubmit &JobStatusChange &JobCancel &TaskComplete - &VMStatusChange &ExpectWinetestUpdate &FoundWinetestUpdate +(a)EXPORT = qw(&PingEngine &JobSubmit &JobStatusChange &JobCancel &JobRestart + &TaskComplete &VMStatusChange + &ExpectWinetestUpdate &FoundWinetestUpdate &WinePatchMLSubmission &WinePatchWebNotification &WinePatchWebSubmission &GetScreenshot); @EXPORT_OK = qw($RunningInEngine); @@ -132,6 +133,23 @@ sub JobCancel return substr($Reply, 1); } +sub JobRestart +{ + my $JobKey = $_[0]; + + my $Reply = SendCmdReceiveReply("jobrestart $JobKey\n"); + if (length($Reply) < 1) + { + return "Unrecognized reply received from engine"; + } + if (substr($Reply, 0, 1) eq "1") + { + return undef; + } + + return substr($Reply, 1); +} + sub TaskComplete { my ($JobKey, $StepKey, $TaskKey) = @_; diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 269643d..66f87ba 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -50,6 +50,7 @@ A Job is composed of multiple WineTestBot::Step objects. =cut +use WineTestBot::Config; use WineTestBot::Branches; use WineTestBot::Engine::Notify; use WineTestBot::WineTestBotObjects; @@ -205,6 +206,43 @@ sub Cancel return undef; } +sub Restart +{ + my $self = shift; + + if ($self->Status ne "failed" && $self->Status ne "completed") + { + return "Only completed/failed jobs can be restarted"; + } + + my $JobDir = "$DataDir/jobs/" . $self->Id; + my $FirstStep = 1; + my $Steps = $self->Steps; + my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()}; + foreach my $Step (@SortedSteps) + { + my $Tasks = $Step->Tasks; + foreach my $Task (@{$Tasks->GetItems()}) + { + if ($FirstStep) + { + # The first step contains the patch or test executable + # so only delete its task folders + system("rm", "-rf", "$JobDir/" . $Step->No . "/" . $Task->No); + } + $Task->Status("queued"); + } + # Subsequent steps only contain files generated by the previous steps + system("rm", "-rf", "$JobDir/" . $Step->No) if (!$FirstStep); + $FirstStep = undef; + $Step->Status("queued"); + } + $self->Status("queued"); + $self->Save(); # Save it all + + return undef; +} + sub GetEMailRecipient { my $self = shift; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 2ca81b8..b191327 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -27,6 +27,7 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::StepsTasks; use WineTestBot::Engine::Notify; +use WineTestBot::Log; @JobDetailsPage::ISA = qw(ObjectModel::CGI::CollectionPage); @@ -112,13 +113,40 @@ sub CanCancel return undef; } -sub GetActions +sub CanRestart { my $self = shift; - my $ErrMessage = $self->CanCancel(); + my $Job = CreateJobs()->GetItem($self->{JobId}); + my $Status = $Job->Status; + if ($Status ne "failed") + { + return "Job did not fail"; + } - return defined($ErrMessage) ? [] : ["Cancel job"]; + my $Session = $self->GetCurrentSession(); + if (! defined($Session)) + { + return "You are not authorized to restart this job"; + } + my $CurrentUser = $Session->User; + if (! $CurrentUser->HasRole("admin") && + $Job->User->GetKey() ne $CurrentUser->GetKey()) # FIXME: Admin only? + { + return "You are not authorized to restart this job"; + } + + return undef; +} + +sub GetActions +{ + my $self = shift; + + # These are mutually exclusive + return ["Cancel job"] if (!defined $self->CanCancel()); + return ["Restart job"] if (!defined $self->CanRestart()); + return []; } sub OnCancel @@ -142,6 +170,27 @@ sub OnCancel return 1; } +sub OnRestart +{ + my $self = shift; + + my $ErrMessage = $self->CanRestart(); + if (defined($ErrMessage)) + { + $self->{ErrMessage} = $ErrMessage; + return !1; + } + + $ErrMessage = JobRestart($self->{JobId}); + if (defined($ErrMessage)) + { + $self->{ErrMessage} = $ErrMessage; + return !1; + } + + return 1; +} + sub OnAction { my $self = shift; @@ -151,6 +200,10 @@ sub OnAction { return $self->OnCancel(); } + elsif ($Action eq "Restart job") + { + return $self->OnRestart(); + } return $self->SUPER::OnAction(@_); } @@ -189,7 +242,19 @@ sub GenerateBody { print "<h1>" . $self->GetTitle() . "</h1>\n"; print "<div class='Content'>\n"; - print "Job will be cancelled.\n"; + my $Action = $self->GetParam("Action"); + if ($Action eq "Cancel job") + { + print "Job will be cancelled.\n"; + } + elsif ($Action eq "Restart job") + { + print "Job will be restarted.\n"; + } + else + { + print "Unknown action $Action.\n"; + } print "</div>\n"; return; }

1 0

Francois Gouget : testbot/lib: Simplify Jobs::ScheduleOnHost() a bit.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: tools Branch: master Commit: e9d494a87824255b00ecdc923838ad80eb3410cd URL: http://source.winehq.org/git/tools.git/?a=commit;h=e9d494a87824255b00ecdc92… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 22 04:10:41 2013 +0100 testbot/lib: Simplify Jobs::ScheduleOnHost() a bit. --- testbot/lib/WineTestBot/Jobs.pm | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index c15c7af..269643d 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -388,16 +388,16 @@ sub ScheduleOnHost($$) my @SortedTasks = sort CompareTaskStatus @{$Tasks->GetItems()}; foreach my $Task (@SortedTasks) { - if ($Task->Status eq "queued" && - $HostVMs->ItemExists($Task->VM->GetKey())) + my $VM = $Task->VM; + my $VMKey = $VM->GetKey(); + if ($Task->Status eq "queued" && $HostVMs->ItemExists($VMKey)) { - my $VM = $HostVMs->GetItem($Task->VM->GetKey()); if ($VM->Status eq "idle" && $RunningVMs < $MaxRunningVMs && $RevertingVMs == 0) { $VM->Status("running"); - my ($ErrProperty, $ErrMessage) = $HostVMs->Save(); + my ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) { return $ErrMessage; @@ -407,12 +407,11 @@ sub ScheduleOnHost($$) { return $ErrMessage; } - $Job->UpdateStatus; + $Job->UpdateStatus(); $RunningVMs++; } elsif ($VM->Status eq "dirty") { - my $VMKey = $VM->GetKey(); if (! defined($DirtyVMsBlockingJobs{$VMKey}) || $Job->Priority < $DirtyVMsBlockingJobs{$VMKey}) {

1 0

Francois Gouget : testbot/web: Improve the job status reporting on the home page.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: tools Branch: master Commit: 9250db91d194c341aac98a676df235e2c3533443 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9250db91d194c341aac98a67… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 22 04:11:34 2013 +0100 testbot/web: Improve the job status reporting on the home page. It is interesting to know if there were test failures even if a VM misbehaved. So report test failures even if some of the job's tasks failed. Conversely, don't claim that jobs like the 'Wine update' have 0 test failures. Colorize the status to make errors and test failures easier to spot. Also link to the job details page from the status field. --- testbot/web/WineTestBot.css | 6 ++++ testbot/web/index.pl | 64 +++++++++++++++++++++++++++++++++++------- 2 files changed, 59 insertions(+), 11 deletions(-) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 29902ff..b7e7248 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -320,3 +320,9 @@ pre margin-bottom: 2em; background-color: red; } + +.queued { color: black; } +.running { color: blue; } +.success { color: green; } +.testfail { color: red; } +.botfail { color: #e55600; } diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 20ac591..6d88106 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -20,6 +20,7 @@ use strict; package JobStatusBlock; +use URI::Escape; use ObjectModel::CGI::CollectionBlock; use WineTestBot::Branches; @@ -76,23 +77,64 @@ sub GetDisplayValue return $Item->Patch->FromName; } - if ($PropertyDescriptor->GetName() eq "Status" && - $Item->Status eq "completed") + return $self->SUPER::GetDisplayValue(@_); +} + +sub GenerateDataCell +{ + my $self = shift; + my ($Item, $PropertyDescriptor, $DetailsPage) = @_; + + my $PropertyName = $PropertyDescriptor->GetName(); + if ($PropertyName eq "Status") { - my $Failures = 0; - my $Steps = $Item->Steps; - foreach my $StepKey (@{$Steps->GetKeys()}) + print "<td><a href='/JobDetails.pl?Key=", uri_escape($Item->GetKey()), "'>"; + + my %HTMLChunks = ("queued" => "queued", + "running" => "running", + "completed" => "completed", + "failed" => "failed"); + my $Status = $Item->Status; + my $HTMLStatus = $HTMLChunks{$Status} || $Status; + if ($Status eq "completed" || $Status eq "failed") { - my $Tasks = $Steps->GetItem($StepKey)->Tasks; - foreach my $TaskKey (@{$Tasks->GetKeys()}) + my $Failures = 0; + my $HasTestResult; + my $Steps = $Item->Steps; + foreach my $StepKey (@{$Steps->GetKeys()}) + { + my $Tasks = $Steps->GetItem($StepKey)->Tasks; + foreach my $TaskKey (@{$Tasks->GetKeys()}) + { + my $TaskFailures = $Tasks->GetItem($TaskKey)->TestFailures; + if ($TaskFailures ne "") + { + $HasTestResult = 1; + $Failures += $TaskFailures; + } + } + } + if (!$HasTestResult) { - $Failures += $Tasks->GetItem($TaskKey)->TestFailures; + print $HTMLStatus; + } + else + { + $HTMLStatus = $Item->Status eq "completed" ? "" : "$HTMLStatus - "; + my $class = $Failures ? "testfail" : "success"; + print "$HTMLStatus$Failures test failures"; } } - return $Item->Status . " - " . $Failures . " failures"; + else + { + print $HTMLStatus; + } + print "</a></td>\n"; + } + else + { + $self->SUPER::GenerateDataCell(@_); } - - return $self->SUPER::GetDisplayValue(@_); } package VMStatusBlock;

1 0

Francois Gouget : testbot: Directly use TestAgent for the file transfers and to run scripts instead of going through the VMs module .
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: tools Branch: master Commit: 378581759ba311ddf40c24839e9db7aa3ed30c41 URL: http://source.winehq.org/git/tools.git/?a=commit;h=378581759ba311ddf40c2483… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 22 04:08:20 2013 +0100 testbot: Directly use TestAgent for the file transfers and to run scripts instead of going through the VMs module. --- testbot/bin/RevertVM.pl | 11 ++++-- testbot/bin/WineRunBuild.pl | 34 ++++++++++++------ testbot/bin/WineRunReconfig.pl | 25 ++++++++++--- testbot/bin/WineRunTask.pl | 76 ++++++++++++++++++++++------------------ testbot/lib/WineTestBot/VMs.pm | 63 ++++----------------------------- 5 files changed, 100 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=378581759ba311ddf40c…

1 0