January 2013 - Wine-commits

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

22 Jan '13

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 : wined3d: Properly set WINED3DFMT_FLAG_SRGB_WRITE in init_format_texture_info().
by Alexandre Julliard 22 Jan '13

22 Jan '13

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: Get rid of CheckSrgbReadCapability().
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: c90a1e5e218705c225e91f7d0f0df3fbc44e2334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c90a1e5e218705c225e91f7d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 22 11:34:09 2013 +0100 wined3d: Get rid of CheckSrgbReadCapability(). --- dlls/wined3d/directx.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f763c12..aa11116 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3527,11 +3527,6 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, return FALSE; } -static BOOL CheckSrgbReadCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) -{ - return format->flags & WINED3DFMT_FLAG_SRGB_READ; -} - /* Check if a format support blending in combination with pixel shaders */ static BOOL CheckPostPixelShaderBlendingCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) @@ -3998,7 +3993,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_SRGBREAD) { - if (!CheckSrgbReadCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_SRGB_READ)) { TRACE("[FAILED] - No sRGB read support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4164,7 +4159,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_SRGBREAD) { - if (!CheckSrgbReadCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_SRGB_READ)) { TRACE("[FAILED] - No sRGB read support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4332,7 +4327,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_SRGBREAD) { - if (!CheckSrgbReadCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_SRGB_READ)) { TRACE("[FAILED] - No sRGB read support.\n"); return WINED3DERR_NOTAVAILABLE;

1 0

Christian Costa : dmusic: Add support for loading articulations.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: 2562969804782c043f6e676339c742cac5a11a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2562969804782c043f6e67633… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jan 22 08:35:56 2013 +0100 dmusic: Add support for loading articulations. --- dlls/dmusic/dmusic_private.h | 7 ++++ dlls/dmusic/instrument.c | 69 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index ff16833..badc2df 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -85,6 +85,11 @@ typedef struct instrument_region { BOOL loop_present; } instrument_region; +typedef struct instrument_articulation { + CONNECTIONLIST connections_list; + CONNECTION *connections; +} instrument_articulation; + /***************************************************************************** * ClassFactory */ @@ -245,6 +250,8 @@ struct IDirectMusicInstrumentImpl { /* instrument data */ BOOL loaded; instrument_region *regions; + ULONG nb_articulations; + instrument_articulation *articulations; }; static inline IDirectMusicInstrumentImpl *impl_from_IDirectMusicInstrument(IDirectMusicInstrument *iface) diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index d6de0db..9df3e0c 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -76,7 +76,12 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_Release(LPDIRECTMUSICINSTRUMENT i if (!ref) { + ULONG i; + HeapFree(GetProcessHeap(), 0, This->regions); + for (i = 0; i < This->nb_articulations; i++) + HeapFree(GetProcessHeap(), 0, This->articulations->connections); + HeapFree(GetProcessHeap(), 0, This->articulations); HeapFree(GetProcessHeap(), 0, This); } @@ -243,6 +248,42 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in return S_OK; } +static HRESULT load_articulation(IDirectMusicInstrumentImpl *This, IStream *stream, ULONG length) +{ + HRESULT ret; + instrument_articulation *articulation; + + if (!This->articulations) + This->articulations = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->articulations)); + else + This->articulations = HeapReAlloc(GetProcessHeap(), 0, This->articulations, sizeof(*This->articulations) * (This->nb_articulations + 1)); + if (!This->articulations) + return E_OUTOFMEMORY; + + articulation = &This->articulations[This->nb_articulations]; + + ret = read_from_stream(stream, &articulation->connections_list, sizeof(CONNECTIONLIST)); + if (FAILED(ret)) + return ret; + + articulation->connections = HeapAlloc(GetProcessHeap(), 0, sizeof(CONNECTION) * articulation->connections_list.cConnections); + if (!articulation->connections) + return E_OUTOFMEMORY; + + ret = read_from_stream(stream, articulation->connections, sizeof(CONNECTION) * articulation->connections_list.cConnections); + if (FAILED(ret)) + { + HeapFree(GetProcessHeap(), 0, articulation->connections); + return ret; + } + + subtract_bytes(length, sizeof(CONNECTIONLIST) + sizeof(CONNECTION) * articulation->connections_list.cConnections); + + This->nb_articulations++; + + return S_OK; +} + /* Function that loads all instrument data and which is called from IDirectMusicCollection_GetInstrument as in native */ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, IStream *stream) { @@ -323,7 +364,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt if (chunk.fccID == FOURCC_RGN) { - TRACE("RGN chunk (region list): %u bytes\n", chunk.dwSize); + TRACE("RGN chunk (region): %u bytes\n", chunk.dwSize); hr = load_region(This, stream, &This->regions[i++], chunk.dwSize - sizeof(chunk.fccID)); } else @@ -338,6 +379,32 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt } break; + case FOURCC_LART: + TRACE("LART chunk (articulations list): %u bytes\n", size); + + while (size) + { + hr = read_from_stream(stream, &chunk, sizeof(chunk)); + if (FAILED(hr)) + goto error; + + if (chunk.fccID == FOURCC_ART1) + { + TRACE("ART1 chunk (level 1 articulation): %u bytes\n", chunk.dwSize); + hr = load_articulation(This, stream, chunk.dwSize); + } + else + { + TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + hr = advance_stream(stream, chunk.dwSize); + } + if (FAILED(hr)) + goto error; + + size = subtract_bytes(size, chunk.dwSize + sizeof(chunk)); + } + break; + default: TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize);

1 0

Christian Costa : d3dx9_36: Implement ID3DXFileData_GetChildren and ID3DXFileData_GetChild.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: 5db342168d7e362af544e57792b31cfd0cf78a9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db342168d7e362af544e5779… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jan 22 08:36:19 2013 +0100 d3dx9_36: Implement ID3DXFileData_GetChildren and ID3DXFileData_GetChild. --- dlls/d3dx9_36/xfile.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 8020467..82c7495 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -243,17 +243,32 @@ static BOOL WINAPI ID3DXFileDataImpl_IsReference(ID3DXFileData *iface) static HRESULT WINAPI ID3DXFileDataImpl_GetChildren(ID3DXFileData *iface, SIZE_T *children) { - TRACE("(%p)->(%p): stub\n", iface, children); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, children); + + if (!children) + return E_POINTER; + + *children = This->nb_children; + + return S_OK; } static HRESULT WINAPI ID3DXFileDataImpl_GetChild(ID3DXFileData *iface, SIZE_T id, ID3DXFileData **object) { - TRACE("(%p)->(%lu, %p): stub\n", iface, id, object); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); - return E_NOTIMPL; + TRACE("(%p)->(%lu, %p)\n", iface, id, object); + + if (!object) + return E_POINTER; + + *object = This->children[id]; + (*object)->lpVtbl->AddRef(*object); + + return S_OK; }

1 0

Christian Costa : d3dx9_36: Implement ID3DXFileDataImpl_IsReference.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: 8f6eee5a731d3789e72cd961f3240a6498f0ce35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6eee5a731d3789e72cd961f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jan 22 08:36:28 2013 +0100 d3dx9_36: Implement ID3DXFileDataImpl_IsReference. --- dlls/d3dx9_36/xfile.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 82c7495..81f9da3 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -235,9 +235,11 @@ static HRESULT WINAPI ID3DXFileDataImpl_GetType(ID3DXFileData *iface, GUID *guid static BOOL WINAPI ID3DXFileDataImpl_IsReference(ID3DXFileData *iface) { - TRACE("(%p)->(): stub\n", iface); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); - return E_NOTIMPL; + TRACE("(%p)->()\n", iface); + + return This->reference; } @@ -320,6 +322,7 @@ static HRESULT ID3DXFileDataImpl_Create(IDirectXFileObject *dxfile_object, ID3DX HeapFree(GetProcessHeap(), 0, object); return E_FAIL; } + object->reference = TRUE; } else {

1 0

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

22 Jan '13

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" => "<span class='queued'>queued</span>", + "running" => "<span class='running'>running</span>", + "completed" => "<span class='success'>completed</span>", + "failed" => "<span class='botfail'>failed</span>"); + 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<span class='$class'>$Failures test failures</span>"; } } - 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/lib: Simplify Jobs::ScheduleOnHost() a bit.
by Alexandre Julliard 22 Jan '13

22 Jan '13

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: Make it possible to restart a failed job.
by Alexandre Julliard 22 Jan '13

22 Jan '13

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 "<p>Job will be cancelled.</p>\n"; + my $Action = $self->GetParam("Action"); + if ($Action eq "Cancel job") + { + print "<p>Job will be cancelled.</p>\n"; + } + elsif ($Action eq "Restart job") + { + print "<p>Job will be restarted.</p>\n"; + } + else + { + print "<p>Unknown action $Action.</p>\n"; + } print "</div>\n"; return; }

1 0

Francois Gouget : testbot/TestAgent: Don't fail if ConfigLocal. pl is missing.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: tools Branch: master Commit: 5bb5be71536bc45d2c6b5497a5be3030dff0fc76 URL: http://source.winehq.org/git/tools.git/?a=commit;h=5bb5be71536bc45d2c6b5497… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 22 04:01:53 2013 +0100 testbot/TestAgent: Don't fail if ConfigLocal.pl is missing. The TestAgent script only needs the TestAgent port from that file, and we can require that the user specify it on the command line. This makes it possible to run TestAgent from any host without requiring complex setup. --- testbot/scripts/TestAgent | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index a4c8e1a..8605002 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -34,6 +34,9 @@ sub BEGIN $::RootDir = $1; unshift @INC, "$::RootDir/lib"; } + # We normally get $AgentPort from ConfigLocal.pl. + # But don't fail if it's missing. + $::BuildEnv = 1 if (!-f "$::RootDir/ConfigLocal.pl"); } my $name0 = $0; @@ -189,6 +192,11 @@ if (!defined $Usage) $Usage = 2; } $AgentPort = $Port if (defined $Port); + if (!defined $AgentPort) + { + error("you must specify the TestAgent port\n"); + $Usage = 2; + } if ($TunnelOpt and $TunnelOpt !~ /^ssh:/) { error("only SSH tunnels are supported\n");

1 0