wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Henri Verbeet : d3d10: Implement d3d10_effect_sampler_variable_GetSampler() .
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 7cea4645c56257143fe93665a0aa26c469a354d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cea4645c56257143fe93665a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 21:32:39 2012 +0200 d3d10: Implement d3d10_effect_sampler_variable_GetSampler(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 23 +++++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 9449da1..dbd72ba 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -117,6 +117,7 @@ struct d3d10_effect_state_object_variable ID3D10RasterizerState *rasterizer; ID3D10DepthStencilState *depth_stencil; ID3D10BlendState *blend; + ID3D10SamplerState *sampler; } object; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 1afa0b5..c465c43 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1608,6 +1608,9 @@ static HRESULT create_state_object(struct d3d10_effect_variable *v) break; case D3D10_SVT_SAMPLER: + if (FAILED(hr = ID3D10Device_CreateSamplerState(device, + &v->u.state.desc.sampler, &v->u.state.object.sampler))) + return hr; break; default: @@ -6778,9 +6781,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetRawValue(ID3D1 static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetSampler(ID3D10EffectSamplerVariable *iface, UINT index, ID3D10SamplerState **sampler) { - FIXME("iface %p, index %u, sampler %p stub!\n", iface, index, sampler); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, sampler %p.\n", iface, index, sampler); + + if (v->type->element_count) + v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + else if (index) + return E_FAIL; + + if (v->type->basetype != D3D10_SVT_SAMPLER) + { + WARN("Variable is not a sampler state.\n"); + return E_FAIL; + } + + if ((*sampler = v->u.state.object.sampler)) + ID3D10SamplerState_AddRef(*sampler); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetBackingStore(ID3D10EffectSamplerVariable *iface,

1 0

Henri Verbeet : d3d10: Handle blend state in d3d10_effect_object_apply().
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: eda5c393350571d92aa7ce0638e89832d259af6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda5c393350571d92aa7ce063… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 21:32:38 2012 +0200 d3d10: Handle blend state in d3d10_effect_object_apply(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 20 +++++++++++++++++++- dlls/d3d10/tests/effect.c | 9 ++------- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index fc9cb41..9449da1 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -76,6 +76,7 @@ struct d3d10_effect_object { ID3D10RasterizerState *rs; ID3D10DepthStencilState *ds; + ID3D10BlendState *bs; ID3D10VertexShader *vs; ID3D10PixelShader *ps; ID3D10GeometryShader *gs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 4b26562..1afa0b5 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1355,6 +1355,14 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr break; } + case D3D10_EOT_BLEND_STATE: + { + ID3D10EffectBlendVariable *bv = variable->lpVtbl->AsBlend(variable); + if (FAILED(hr = bv->lpVtbl->GetBlendState(bv, variable_idx, &o->object.bs))) + return hr; + break; + } + case D3D10_EOT_VERTEXSHADER: { ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); @@ -1385,7 +1393,6 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr break; } - case D3D10_EOT_BLEND_STATE: case D3D10_EOT_STENCIL_REF: case D3D10_EOT_BLEND_FACTOR: case D3D10_EOT_SAMPLE_MASK: @@ -2181,6 +2188,10 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) ID3D10Device_OMSetDepthStencilState(device, o->object.ds, o->pass->stencil_ref); return S_OK; + case D3D10_EOT_BLEND_STATE: + ID3D10Device_OMSetBlendState(device, o->object.bs, o->pass->blend_factor, o->pass->sample_mask); + return S_OK; + case D3D10_EOT_VERTEXSHADER: ID3D10Device_VSSetShader(device, o->object.vs); return S_OK; @@ -2194,6 +2205,8 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) return S_OK; case D3D10_EOT_STENCIL_REF: + case D3D10_EOT_BLEND_FACTOR: + case D3D10_EOT_SAMPLE_MASK: return S_OK; default: @@ -2293,6 +2306,11 @@ static void d3d10_effect_object_destroy(struct d3d10_effect_object *o) ID3D10DepthStencilState_Release(o->object.ds); break; + case D3D10_EOT_BLEND_STATE: + if (o->object.bs) + ID3D10BlendState_Release(o->object.bs); + break; + case D3D10_EOT_VERTEXSHADER: if (o->object.vs) ID3D10VertexShader_Release(o->object.vs); diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index ce5e18e..7f5ce0a 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3922,12 +3922,7 @@ static void test_effect_state_groups(ID3D10Device *device) ok(pass_desc.BlendFactor[2] == 0.7f, "Got unexpected BlendFactor[2] %.8e.\n", pass_desc.BlendFactor[2]); ok(pass_desc.BlendFactor[3] == 0.8f, "Got unexpected BlendFactor[3] %.8e.\n", pass_desc.BlendFactor[3]); hr = pass->lpVtbl->Apply(pass, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to apply pass, hr %#x.\n", hr); - if (FAILED(hr)) - { - effect->lpVtbl->Release(effect); - return; - } + ok(SUCCEEDED(hr), "Failed to apply pass, hr %#x.\n", hr); ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); ID3D10BlendState_GetDesc(blend_state, &blend_desc); @@ -3958,7 +3953,7 @@ static void test_effect_state_groups(ID3D10Device *device) ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); ok(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ZERO, "Got unexpected DepthWriteMask %#x.\n", ds_desc.DepthWriteMask); - ok(ds_desc.DepthFunc == D3D10_COMPARISON_NEVER, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); + todo_wine ok(ds_desc.DepthFunc == D3D10_COMPARISON_NEVER, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); ok(ds_desc.StencilEnable, "Got unexpected StencilEnable %#x.\n", ds_desc.StencilEnable); ok(ds_desc.StencilReadMask == 0x4, "Got unexpected StencilReadMask %#x.\n", ds_desc.StencilReadMask); ok(ds_desc.StencilWriteMask == 0x5, "Got unexpected StencilWriteMask %#x.\n", ds_desc.StencilWriteMask);

1 0

Alexandre Julliard : user32: Store the pixel format in the window structure .
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: cf799f585246767bad892d6975752b05ca09bfdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf799f585246767bad892d697… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 09:51:29 2012 +0200 user32: Store the pixel format in the window structure. --- dlls/user32/win.c | 10 ++++++++++ dlls/user32/win.h | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index a8882c3..7da4972 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3599,6 +3599,16 @@ BOOL WINAPI SwitchDesktop( HDESK hDesktop) */ BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format ) { + WND *win = WIN_GetPtr( hwnd ); + + if (!win || win == WND_DESKTOP || win == WND_OTHER_PROCESS) + { + WARN( "setting format %d on win %p not supported\n", format, hwnd ); + return FALSE; + } + win->pixel_format = format; + WIN_ReleasePtr( win ); + update_window_state( hwnd ); return TRUE; } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index b35fc00..a19ebe9 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -62,6 +62,7 @@ typedef struct tagWND HICON hIconSmall; /* window's small icon */ struct window_surface *surface; /* Window surface if any */ struct tagDIALOGINFO *dlgInfo;/* Dialog additional info (dialogs only) */ + int pixel_format; /* Pixel format set by the graphics driver */ int cbWndExtra; /* class cbWndExtra at window creation */ DWORD_PTR userdata; /* User private data */ DWORD wExtra[1]; /* Window extra bytes */

1 0

Alexandre Julliard : user32: Add a helper function to update the window visible state.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 6eea257fd1a95b3e8752650019da14865bcac274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eea257fd1a95b3e875265001… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 09:48:11 2012 +0200 user32: Add a helper function to update the window visible state. --- dlls/user32/win.c | 49 +++++++++++++++++++++++-------------------------- 1 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 905648e..a8882c3 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -431,6 +431,21 @@ static void send_parent_notify( HWND hwnd, UINT msg ) /******************************************************************* + * update_window_state + * + * Trigger an update of the window's driver state and surface. + */ +static void update_window_state( HWND hwnd ) +{ + RECT window_rect, client_rect; + + WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); + set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, &window_rect, &client_rect, NULL ); +} + + +/******************************************************************* * get_server_window_text * * Retrieve the window text from the server. @@ -718,7 +733,7 @@ HWND WIN_SetOwner( HWND hwnd, HWND owner ) */ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) { - BOOL ok, needs_show = FALSE; + BOOL ok, made_visible = FALSE; STYLESTRUCT style; WND *win = WIN_GetPtr( hwnd ); @@ -756,7 +771,7 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) /* Some apps try to make their window visible through WM_SETREDRAW. * Only do that if the window was never explicitly hidden, * because Steam messes with WM_SETREDRAW after hiding its windows. */ - needs_show = !(win->flags & WIN_HIDDEN) && (style.styleNew & WS_VISIBLE); + made_visible = !(win->flags & WIN_HIDDEN) && (style.styleNew & WS_VISIBLE); invalidate_dce( win, NULL ); } WIN_ReleasePtr( win ); @@ -764,14 +779,7 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) if (!ok) return 0; USER_Driver->pSetWindowStyle( hwnd, GWL_STYLE, &style ); - if (needs_show) - { - RECT window_rect, client_rect; - WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); - set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, - &window_rect, &client_rect, NULL ); - } + if (made_visible) update_window_state( hwnd ); return style.styleOld; } @@ -2272,7 +2280,7 @@ static LONG_PTR WIN_GetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicod LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, BOOL unicode ) { STYLESTRUCT style; - BOOL ok, needs_show = FALSE; + BOOL ok, made_visible = FALSE; LONG_PTR retval = 0; WND *wndPtr; @@ -2475,7 +2483,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B if ((offset == GWL_STYLE && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) || (offset == GWL_EXSTYLE && ((style.styleOld ^ style.styleNew) & WS_EX_LAYERED))) { - needs_show = !(wndPtr->flags & WIN_HIDDEN) && (wndPtr->dwStyle & WS_VISIBLE); + made_visible = !(wndPtr->flags & WIN_HIDDEN) && (wndPtr->dwStyle & WS_VISIBLE); invalidate_dce( wndPtr, NULL ); } WIN_ReleasePtr( wndPtr ); @@ -2487,14 +2495,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B style.styleOld = retval; style.styleNew = newval; USER_Driver->pSetWindowStyle( hwnd, offset, &style ); - if (needs_show) - { - RECT window_rect, client_rect; - WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); - set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, - &window_rect, &client_rect, NULL ); - } + if (made_visible) update_window_state( hwnd ); SendMessageW( hwnd, WM_STYLECHANGED, offset, (LPARAM)&style ); } @@ -3598,12 +3599,8 @@ BOOL WINAPI SwitchDesktop( HDESK hDesktop) */ BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format ) { - RECT window_rect, client_rect; - - WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); - return set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, - &window_rect, &client_rect, NULL ); + update_window_state( hwnd ); + return TRUE; }

1 0

Alexandre Julliard : user32: Don' t use SWP_SHOWWINDOW when the WS_VISIBLE style was already toggled manually .
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: b9c847a426ab234c6e1ae5901b3f172b5adaed57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9c847a426ab234c6e1ae5901… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 09:45:09 2012 +0200 user32: Don't use SWP_SHOWWINDOW when the WS_VISIBLE style was already toggled manually. --- dlls/user32/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index ee5fac9..905648e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -769,7 +769,7 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) RECT window_rect, client_rect; WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW | SWP_SHOWWINDOW, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, &window_rect, &client_rect, NULL ); } @@ -2492,7 +2492,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B RECT window_rect, client_rect; WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW | SWP_SHOWWINDOW, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, &window_rect, &client_rect, NULL ); } SendMessageW( hwnd, WM_STYLECHANGED, offset, (LPARAM)&style );

1 0

Jacek Caban : winegecko: Added 1.8 release.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: tools Branch: master Commit: 27665fefacef02a973640fd17660e5653771de0e URL: http://source.winehq.org/git/tools.git/?a=commit;h=27665fefacef02a973640fd1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 9 11:25:57 2012 +0200 winegecko: Added 1.8 release. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index 08262f3..c311be7 100644 --- a/winegecko.php +++ b/winegecko.php @@ -68,7 +68,9 @@ $aFileSizes = array( '1.6-x86'=>16802816, '1.6-x86_64'=>17251328, '1.7-x86'=>16995328, - '1.7-x86_64'=>17438720 + '1.7-x86_64'=>17438720, + '1.8-x86'=>17774592, + '1.8-x86_64'=>18238976 ); // Exact size of the file:

1 0

Francois Gouget : testbot/build: Use the standard MinGW compiler names in the Reconfig.pl script.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: tools Branch: master Commit: e7ee02677cc9621782f07b26e4df261dd6b30316 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e7ee02677cc9621782f07b26… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 5 11:16:26 2012 +0200 testbot/build: Use the standard MinGW compiler names in the Reconfig.pl script. --- testbot/bin/Reconfig.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/bin/Reconfig.pl b/testbot/bin/Reconfig.pl index 60018d9..2a75e6f 100755 --- a/testbot/bin/Reconfig.pl +++ b/testbot/bin/Reconfig.pl @@ -86,7 +86,7 @@ sub BuildCross { my $Bits = $_[0]; - my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-pc-mingw32"); + my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits"); system("cd $DataDir/build-mingw$Bits && " . "rm -rf * && " .

1 0

Francois Gouget : testbot/build: Tweak Reconfig. pl to automatically create the build-xxx directories.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: tools Branch: master Commit: 0a22e8ff8ef8e1bf7dc49b37783945d8a54b210d URL: http://source.winehq.org/git/tools.git/?a=commit;h=0a22e8ff8ef8e1bf7dc49b37… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 5 11:16:21 2012 +0200 testbot/build: Tweak Reconfig.pl to automatically create the build-xxx directories. --- testbot/bin/Reconfig.pl | 2 ++ testbot/doc/INSTALL.txt | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/testbot/bin/Reconfig.pl b/testbot/bin/Reconfig.pl index f72ba6c..60018d9 100755 --- a/testbot/bin/Reconfig.pl +++ b/testbot/bin/Reconfig.pl @@ -65,6 +65,7 @@ sub GitPull sub BuildNative { + mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); system("cd $DataDir/build-native && " . "rm -rf * && " . "../wine-git/configure --enable-win64 --without-x --without-freetype " . @@ -86,6 +87,7 @@ sub BuildCross my $Bits = $_[0]; my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-pc-mingw32"); + mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits"); system("cd $DataDir/build-mingw$Bits && " . "rm -rf * && " . "../wine-git/configure --host=$Host --with-wine-tools=../build-native " . diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 27c4053..d7c093e 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -141,6 +141,9 @@ Dependencies: mkdir $HOME/tools/testbot/var $HOME/tools/testbot/log chmod g+w $HOME/tools/testbot/var $HOME/tools/testbot/log - Clone the Wine git repository to $HOME/tools/testbot/var/wine-git. +- In the winetest account, run Reconfig.pl. + Check $HOME/tools/testbot/log/Reconfig.log to make sure it + succeeded. - Take a snapshot of the running VM. Make sure restoring this snapshot will result in a running build VM. - Register this VM as a build VM on the web site.

1 0

Francois Gouget : testbot/scripts: Tweak CheckWineTestBot. pl so it returns 1 if it failed to restart WineTestBot.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: tools Branch: master Commit: 37209e6b133474ebadc64cb80edb7e2218771083 URL: http://source.winehq.org/git/tools.git/?a=commit;h=37209e6b133474ebadc64cb8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 5 11:16:13 2012 +0200 testbot/scripts: Tweak CheckWineTestBot.pl so it returns 1 if it failed to restart WineTestBot. --- testbot/scripts/CheckWineTestBot.pl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index 2793a17..f6f0666 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -34,6 +34,7 @@ use WineTestBot::Engine::Notify; $ENV{PATH} = "/sbin:/usr/sbin:/usr/bin:/bin"; delete $ENV{ENV}; +my $rc = 0; if (! PingEngine()) { system "service winetestbot restart > /dev/null"; @@ -53,6 +54,8 @@ EOF else { print SENDMAIL "Unable to restart the engine\n"; + $rc = 1; } close(SENDMAIL); } +exit($rc);

1 0

Francois Gouget : testbot/bin: Make the wine-patches script names more descriptive and consistent.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: tools Branch: master Commit: 2b03eba4f6f21d1752f116198627da89b77620f6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2b03eba4f6f21d1752f11619… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 5 11:15:58 2012 +0200 testbot/bin: Make the wine-patches script names more descriptive and consistent. Prefix them with 'WinePatches' in reference to both the Wine project and the wine-patches they relate to. The 'WinePatchesML' script deals directly with the wine-patches Mailing List . The Submit script submits the patch directly. The 'WinePatchesWeb' scripts deal with Wine's Patch web site. Specifically the Notify script informs the WineTestBot when new patches are available and the Get script grabs and submits them for testing. --- testbot/bin/Engine.pl | 32 ++++++++++---------- ...inePatchesHandler.pl => WinePatchesMLSubmit.pl} | 2 +- .../{RetrievePatches.pl => WinePatchesWebGet.pl} | 18 +++++----- ...ificationHandler.pl => WinePatchesWebNotify.pl} | 2 +- testbot/doc/INSTALL.txt | 16 +++++----- testbot/lib/WineTestBot/Engine/Notify.pm | 16 +++++----- 6 files changed, 43 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=2b03eba4f6f21d1752f1…

1 0

← Newer
1
...
69
70
71
72
73
74
75
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012