December 2012 - Wine-commits

Jacek Caban : itss: Fixed fragment part handling in IInternetProtocolInfo:: CombineUrl.
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: wine Branch: master Commit: 60195ff6a963a6842df77697b78ae7d0c32d5a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=60195ff6a963a6842df77697b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 5 18:38:40 2012 +0100 itss: Fixed fragment part handling in IInternetProtocolInfo::CombineUrl. --- dlls/itss/protocol.c | 4 +++- dlls/itss/tests/protocol.c | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 6b188c6..1463518 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -469,7 +469,9 @@ static HRESULT WINAPI ITSProtocolInfo_CombineUrl(IInternetProtocolInfo *iface, if(strchrW(pwzRelativeUrl, ':')) return STG_E_INVALIDNAME; - if(pwzRelativeUrl[0] != '/') { + if(pwzRelativeUrl[0] == '#') { + base_end += strlenW(base_end); + }else if(pwzRelativeUrl[0] != '/') { ptr = strrchrW(base_end, '/'); if(ptr) base_end = ptr+1; diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index 133a8bf..6fd3431 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -483,6 +483,12 @@ static const struct { {"mk:@MSITStore:test.chm::/dir/blank.html", "test.html", 0, S_OK, "mk:@MSITStore:test.chm::/dir/test.html"}, {"xxx:test.chm::/dir/blank.html", "test.html", 0, INET_E_USE_DEFAULT_PROTOCOLHANDLER, NULL}, {"its:test.chm::/dir/blank.html", "/test.html", 0, S_OK, "its:test.chm::/test.html"}, + {"its:test.chm::/blank.html", "#frag", 0, S_OK, "its:test.chm::/blank.html#frag"}, + {"its:test.chm::/blank.html#hash", "#frag", 0, S_OK, "its:test.chm::/blank.html#hash#frag"}, + {"its:test.chm::/blank.html", "test.html#frag", 0, S_OK, "its:test.chm::/test.html#frag"}, + {"its:test.chm::/blank.html", "/test.html#frag", 0, S_OK, "its:test.chm::/test.html#frag"}, + {"its:test.chm::/blank.html", "?query", 0, S_OK, "its:test.chm::/?query"}, + {"its:test.chm::/blank.html#frag/blank", "test.html", 0, S_OK, "its:test.chm::/blank.html#frag/test.html"}, }; static void test_its_protocol_info(IInternetProtocol *protocol)

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXALLOCATEHIERARCHY.
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: wine Branch: master Commit: c4ef74bd1971da1442e5c4a8d38e8377c15407d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ef74bd1971da1442e5c4a8d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 4 22:10:07 2012 +0100 d3dx9: Avoid LPD3DXALLOCATEHIERARCHY. --- dlls/d3dx9_36/mesh.c | 2 +- include/d3dx9anim.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index ad7bfa7..986cbd4 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3803,7 +3803,7 @@ HRESULT WINAPI D3DXCleanMesh(D3DXCLEANTYPE clean_type, ID3DXMesh *mesh_in, const return E_NOTIMPL; } -HRESULT WINAPI D3DXFrameDestroy(LPD3DXFRAME frame, LPD3DXALLOCATEHIERARCHY alloc_hier) +HRESULT WINAPI D3DXFrameDestroy(D3DXFRAME *frame, ID3DXAllocateHierarchy *alloc_hier) { HRESULT hr; BOOL last = FALSE; diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 5e9ef58..2ae780d 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -385,7 +385,7 @@ HRESULT WINAPI D3DXSaveMeshHierarchyToFileW(const WCHAR *filename, DWORD format, const D3DXFRAME *frame_root, ID3DXAnimationController *animation_controller, ID3DXSaveUserData *user_data_saver); #define D3DXSaveMeshHierarchyToFile WINELIB_NAME_AW(D3DXSaveMeshHierarchyToFile) -HRESULT WINAPI D3DXFrameDestroy(LPD3DXFRAME, LPD3DXALLOCATEHIERARCHY); +HRESULT WINAPI D3DXFrameDestroy(D3DXFRAME *frame_root, ID3DXAllocateHierarchy *alloc); HRESULT WINAPI D3DXFrameAppendChild(LPD3DXFRAME, CONST D3DXFRAME*); LPD3DXFRAME WINAPI D3DXFrameFind(CONST D3DXFRAME*, LPCSTR); HRESULT WINAPI D3DXFrameRegisterNamedMatrices(D3DXFRAME *frame_root, ID3DXAnimationController *animation_controller);

1 0

Henri Verbeet : d3dx9: Fix the LPLPD3DXFILE typedef.
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: wine Branch: master Commit: ff10151a02a4bf2c0adb13f1b0e0437922ee05df URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff10151a02a4bf2c0adb13f1b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 4 22:10:08 2012 +0100 d3dx9: Fix the LPLPD3DXFILE typedef. --- include/d3dx9xof.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index 4bcb769..785bc1c 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -60,7 +60,7 @@ DEFINE_GUID(IID_ID3DXFileEnumObject, 0xcef08cfc, 0x7b4f, 0x4429, 0x96, 0x24, 0x2 DEFINE_GUID(IID_ID3DXFileData, 0xcef08cfd, 0x7b4f, 0x4429, 0x96, 0x24, 0x2a, 0x69, 0x0a, 0x93, 0x32, 0x01); #endif /* _NO_COM */ -typedef interface ID3DXFile *LPD3DXFILE, *LPLPD3DXFILE; +typedef interface ID3DXFile *LPD3DXFILE, **LPLPD3DXFILE; typedef interface ID3DXFileSaveObject *LPD3DXFILESAVEOBJECT, **LPLPD3DXFILESAVEOBJECT; typedef interface ID3DXFileSaveData *LPD3DXFILESAVEDATA, **LPLPD3DXFILESAVEDATA; typedef interface ID3DXFileEnumObject *LPD3DXFILEENUMOBJECT, **LPLPD3DXFILEENUMOBJECT;

1 0

Henri Verbeet : ddraw: Avoid LPDDSCAPS.
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: wine Branch: master Commit: 1e856a9a23569f43711f833bb0b3b619d71c92d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e856a9a23569f43711f833bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 4 22:10:09 2012 +0100 ddraw: Avoid LPDDSCAPS. --- include/ddraw.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index 8bdb99f..ec4b850 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1455,7 +1455,7 @@ DECLARE_INTERFACE_(IDirectDraw2,IUnknown) /*54*/ STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE; /*58*/ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE; /* added in v2 */ -/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE; +/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ DDSCAPS *caps, DWORD *total, DWORD *free) PURE; }; #undef INTERFACE @@ -1553,7 +1553,7 @@ DECLARE_INTERFACE_(IDirectDraw3,IUnknown) /*54*/ STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE; /*58*/ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE; /* added in v2 */ -/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE; +/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ DDSCAPS *caps, DWORD *total, DWORD *free) PURE; /* added in v3 */ /*60*/ STDMETHOD(GetSurfaceFromDC)(THIS_ HDC dc, struct IDirectDrawSurface **surface) PURE; }; @@ -1884,7 +1884,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown) /*2c*/ STDMETHOD(Flip)(THIS_ IDirectDrawSurface *dst_surface, DWORD flags) PURE; /*30*/ STDMETHOD(GetAttachedSurface)(THIS_ DDSCAPS *caps, IDirectDrawSurface **attachment) PURE; /*34*/ STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; -/*38*/ STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE; +/*38*/ STDMETHOD(GetCaps)(THIS_ DDSCAPS *caps) PURE; /*3c*/ STDMETHOD(GetClipper)(THIS_ IDirectDrawClipper **clipper) PURE; /*40*/ STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; /*44*/ STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE; @@ -2018,7 +2018,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown) STDMETHOD(Flip)(THIS_ IDirectDrawSurface2 *dst_surface, DWORD flags) PURE; STDMETHOD(GetAttachedSurface)(THIS_ DDSCAPS *caps, IDirectDrawSurface2 **attachment) PURE; STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; - STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE; + STDMETHOD(GetCaps)(THIS_ DDSCAPS *caps) PURE; STDMETHOD(GetClipper)(THIS_ IDirectDrawClipper **clipper) PURE; STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE; @@ -2164,7 +2164,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown) STDMETHOD(Flip)(THIS_ IDirectDrawSurface3 *dst_surface, DWORD flags) PURE; STDMETHOD(GetAttachedSurface)(THIS_ DDSCAPS *caps, IDirectDrawSurface3 **attachment) PURE; STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; - STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE; + STDMETHOD(GetCaps)(THIS_ DDSCAPS *caps) PURE; STDMETHOD(GetClipper)(THIS_ IDirectDrawClipper **clipper) PURE; STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE;

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_PSSetConstantBuffers().
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: wine Branch: master Commit: b034f49183f557628a78bbda41598a65a63d8245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b034f49183f557628a78bbda4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 4 22:10:10 2012 +0100 d3d10core: Implement d3d10_device_PSSetConstantBuffers(). --- dlls/d3d10core/device.c | 13 ++++++++++++- dlls/wined3d/device.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/stateblock.c | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 6 files changed, 63 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 438beb0..cb0c168 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -194,8 +194,19 @@ static void STDMETHODCALLTYPE d3d10_device_Draw(ID3D10Device *iface, UINT vertex static void STDMETHODCALLTYPE d3d10_device_PSSetConstantBuffers(ID3D10Device *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer *const *buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + for (i = 0; i < buffer_count; ++i) + { + struct d3d10_buffer *buffer = unsafe_impl_from_ID3D10Buffer(buffers[i]); + + wined3d_device_set_ps_cb(device->wined3d_device, start_slot + i, + buffer ? buffer->wined3d_buffer : NULL); + } } static void STDMETHODCALLTYPE d3d10_device_IASetInputLayout(ID3D10Device *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c293636..d55a155 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2966,6 +2966,45 @@ struct wined3d_shader * CDECL wined3d_device_get_pixel_shader(const struct wined return device->stateBlock->state.pixel_shader; } +void CDECL wined3d_device_set_ps_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) +{ + struct wined3d_buffer *prev; + + TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); + + if (idx >= MAX_CONSTANT_BUFFERS) + { + WARN("Invalid constant buffer index %u.\n", idx); + return; + } + + prev = device->updateStateBlock->state.ps_cb[idx]; + device->updateStateBlock->state.ps_cb[idx] = buffer; + + if (device->isRecordingState) + { + if (buffer) + wined3d_buffer_incref(buffer); + if (prev) + wined3d_buffer_decref(prev); + return; + } + + if (prev != buffer) + { + if (buffer) + { + InterlockedIncrement(&buffer->resource.bind_count); + wined3d_buffer_incref(buffer); + } + if (prev) + { + InterlockedDecrement(&prev->resource.bind_count); + wined3d_buffer_decref(prev); + } + } +} + HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, UINT start_register, const BOOL *constants, UINT bool_count) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6499877..518ae2a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -550,6 +550,15 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) state->pixel_shader = NULL; wined3d_shader_decref(shader); } + + for (i = 0; i < MAX_CONSTANT_BUFFERS; ++i) + { + if ((buffer = state->ps_cb[i])) + { + state->ps_cb[i] = NULL; + wined3d_buffer_decref(buffer); + } + } } ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c97e7af..b1b4513 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -126,6 +126,7 @@ @ cdecl wined3d_device_set_npatch_mode(ptr float) @ cdecl wined3d_device_set_pixel_shader(ptr ptr) @ cdecl wined3d_device_set_primitive_type(ptr long) +@ cdecl wined3d_device_set_ps_cb(ptr long ptr) @ cdecl wined3d_device_set_ps_consts_b(ptr long ptr long) @ cdecl wined3d_device_set_ps_consts_f(ptr long ptr long) @ cdecl wined3d_device_set_ps_consts_i(ptr long ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4d7d456..f0c44eb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2309,6 +2309,7 @@ struct wined3d_state struct wined3d_buffer *gs_cb[MAX_CONSTANT_BUFFERS]; struct wined3d_shader *pixel_shader; + struct wined3d_buffer *ps_cb[MAX_CONSTANT_BUFFERS]; BOOL ps_consts_b[MAX_CONST_B]; INT ps_consts_i[MAX_CONST_I * 4]; float *ps_consts_f; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 82287df..bdc1092 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2219,6 +2219,7 @@ HRESULT __cdecl wined3d_device_set_npatch_mode(struct wined3d_device *device, fl void __cdecl wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_primitive_type(struct wined3d_device *device, enum wined3d_primitive_type primitive_topology); +void __cdecl wined3d_device_set_ps_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_set_ps_consts_b(struct wined3d_device *device, UINT start_register, const BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_set_ps_consts_f(struct wined3d_device *device,

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_PSGetConstantBuffers().
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: wine Branch: master Commit: 6ac3c48384f3d17c8897d52fadfdd5017f232864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac3c48384f3d17c8897d52fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 4 22:10:11 2012 +0100 d3d10core: Implement d3d10_device_PSGetConstantBuffers(). --- dlls/d3d10core/device.c | 21 ++++++++++++++++++++- dlls/wined3d/device.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index cb0c168..03c1e67 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -600,8 +600,27 @@ static void STDMETHODCALLTYPE d3d10_device_VSGetShader(ID3D10Device *iface, ID3D static void STDMETHODCALLTYPE d3d10_device_PSGetConstantBuffers(ID3D10Device *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer **buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffer %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d10_buffer *buffer_impl; + + if (!(wined3d_buffer = wined3d_device_get_ps_cb(device->wined3d_device, start_slot + i))) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + buffers[i] = &buffer_impl->ID3D10Buffer_iface; + ID3D10Buffer_AddRef(buffers[i]); + } } static void STDMETHODCALLTYPE d3d10_device_IAGetInputLayout(ID3D10Device *iface, ID3D10InputLayout **input_layout) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d55a155..fd1de1b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3005,6 +3005,19 @@ void CDECL wined3d_device_set_ps_cb(struct wined3d_device *device, UINT idx, str } } +struct wined3d_buffer * CDECL wined3d_device_get_ps_cb(const struct wined3d_device *device, UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_CONSTANT_BUFFERS) + { + WARN("Invalid constant buffer index %u.\n", idx); + return NULL; + } + + return device->stateBlock->state.ps_cb[idx]; +} + HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, UINT start_register, const BOOL *constants, UINT bool_count) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b1b4513..f94057d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -74,6 +74,7 @@ @ cdecl wined3d_device_get_npatch_mode(ptr) @ cdecl wined3d_device_get_pixel_shader(ptr) @ cdecl wined3d_device_get_primitive_type(ptr ptr) +@ cdecl wined3d_device_get_ps_cb(ptr long) @ cdecl wined3d_device_get_ps_consts_b(ptr long ptr long) @ cdecl wined3d_device_get_ps_consts_f(ptr long ptr long) @ cdecl wined3d_device_get_ps_consts_i(ptr long ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bdc1092..258c926 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2138,6 +2138,7 @@ float __cdecl wined3d_device_get_npatch_mode(const struct wined3d_device *device struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_primitive_type(const struct wined3d_device *device, enum wined3d_primitive_type *primitive_topology); +struct wined3d_buffer * __cdecl wined3d_device_get_ps_cb(const struct wined3d_device *device, UINT idx); HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *device,

1 0

Francois Gouget : testbot/build: Chdir to the Wine source directory before calling 'git apply'.
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: tools Branch: master Commit: f2b993f5b366664295708d63a4c330ff58155e9b URL: http://source.winehq.org/git/tools.git/?a=commit;h=f2b993f5b366664295708d63… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 5 05:35:10 2012 +0100 testbot/build: Chdir to the Wine source directory before calling 'git apply'. The --directory option is not meant to specify where the Git repository lives. --- testbot/bin/build/Build.pl | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 7a20c1a..c2e53e6 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -109,8 +109,9 @@ sub ApplyPatch } InfoMsg "Applying patch\n"; - system("git apply --verbose --directory=$DataDir/wine-git $PatchFile " . - ">> $LogDir/Build.log 2>&1"); + system("( cd $DataDir/wine-git && set -x && " . + " git apply --verbose $PatchFile " . + ") >> $LogDir/Build.log 2>&1"); if ($? != 0) { LogMsg "Patch failed to apply\n";

1 0

Francois Gouget : testbot/testagentd: 'make clean' should not fail if some files don't exist.
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: tools Branch: master Commit: 42160e6915332b5d6ad755cde6068335a89bcbea URL: http://source.winehq.org/git/tools.git/?a=commit;h=42160e6915332b5d6ad755cd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 5 05:35:41 2012 +0100 testbot/testagentd: 'make clean' should not fail if some files don't exist. --- testbot/src/testagentd/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index f6035be..417120e 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -40,6 +40,6 @@ winetestbot.iso: TestAgentd.exe clean: - rm *.obj *.o - rm TestAgentd.exe - rm winetestbot.iso + rm -f *.obj *.o + rm -f TestAgentd.exe + rm -f winetestbot.iso

1 0

Francois Gouget : testbot/TestAgent: Change the protocol and API for increased flexibility.
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: tools Branch: master Commit: d7ff1920278971503d70cface1f9b9bc387101a4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d7ff1920278971503d70cfac… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 5 05:37:34 2012 +0100 testbot/TestAgent: Change the protocol and API for increased flexibility. The old protocol relied on being able to close the sending side of the connection to signal the end of the request, and then iusing the other side to read the reply. However this is not always feasible, especially when adding support for tunneling. Also it makes it impossible to use a single connection for multiple requests. In the new protocol each request is composed of an RPC id, an argument count, and for each argument its type, size and then data. So the other side always knows exactly how much to read and thus a given connection can be used for multiple RPCs. The Perl TestAgent API is now object-oriented which makes connection reuse simple. The set of operations provided by the Perl TestAgent module has also been changed to be more flexible. In particular, where RunScript() was duplicating the functionality of SendFile(), we now have Run(), Wait() and Rm() which each perform a single function. This change also unburdens the TestAgent server from the selection of temporary filenames, and eliminates a hard-coded path. The internal client and server APIs have also been tweaked to make sending and receiving the RPCs and their replies easier. --- testbot/lib/WineTestBot/TestAgent.pm | 1020 ++++++++++++++++++++++++----- testbot/lib/WineTestBot/VMs.pm | 31 +- testbot/scripts/TestAgent | 194 +++++-- testbot/src/testagentd/Makefile | 5 +- testbot/src/testagentd/list.h | 232 +++++++ testbot/src/testagentd/platform.h | 54 ++- testbot/src/testagentd/platform_unix.c | 157 +++-- testbot/src/testagentd/platform_windows.c | 214 +++++-- testbot/src/testagentd/testagentd.c | 1028 ++++++++++++++++++++++------- 9 files changed, 2345 insertions(+), 590 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=d7ff1920278971503d70…

1 0

Francois Gouget : testbot/TestAgent: Make it possible to tunnel the TestAgent connection through SSH.
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: tools Branch: master Commit: 98c47a2f7aa18862e4604175b14940d234adfa24 URL: http://source.winehq.org/git/tools.git/?a=commit;h=98c47a2f7aa18862e4604175… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 5 05:38:43 2012 +0100 testbot/TestAgent: Make it possible to tunnel the TestAgent connection through SSH. --- testbot/doc/INSTALL.txt | 1 + testbot/lib/WineTestBot/TestAgent.pm | 93 ++++++++++++++++++++++++++++++++-- testbot/lib/WineTestBot/VMs.pm | 32 ++++++++++-- testbot/scripts/TestAgent | 25 ++++++++- 4 files changed, 140 insertions(+), 11 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index b01aa48..95b2a08 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -9,6 +9,7 @@ Dependencies: - Sys::Virt (libsys-virt-perl, see http://libvirt.org/) - Image::Magick (perlmagick) - Optional: IO::Socket::IP (for IPv6, libio-socket-ip-perl) +- Optional: Net::SSH2 (for SSH tunneling, libnet-ssh2-perl) MySQL setup: - Create a new 'winetestbot' database and its tables using the diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index a5f8083..e0066c5 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -51,19 +51,28 @@ sub debug(@) print STDERR @_ if ($Debug); } -sub new($$$) +sub new($$$;$) { - my ($class, $Hostname, $Port) = @_; + my ($class, $Hostname, $Port, $Tunnel) = @_; my $self = { agenthost => $Hostname, + host => $Hostname, agentport => $Port, + port => $Port, connection => "$Hostname:$Port", ctimeout => 30, timeout => 0, fd => undef, deadline => undef, err => undef}; + if ($Tunnel) + { + $self->{host} = $Tunnel->{sshhost} || $Hostname; + $self->{port} = $Tunnel->{sshport} || 22; + $self->{connection} = "$self->{host}:$self->{port}:$self->{connection}"; + $self->{tunnel} = $Tunnel; + } $self = bless $self, $class; return $self; @@ -73,6 +82,18 @@ sub Disconnect($) { my ($self) = @_; + if ($self->{ssh}) + { + # This may close the SSH channel ($self->{fd}) as a side-effect, + # which will avoid undue delays. + $self->{ssh}->disconnect(); + $self->{ssh} = undef; + } + if ($self->{sshfd}) + { + close($self->{sshfd}); + $self->{sshfd} = undef; + } if ($self->{fd}) { close($self->{fd}); @@ -717,6 +738,13 @@ if ($@) $create_socket = \&create_inet_socket; } +sub _ssherror($) +{ + my ($self) = @_; + my @List = $self->{ssh}->error(); + return $List[2]; +} + sub _Connect($) { my ($self) = @_; @@ -730,8 +758,8 @@ sub _Connect($) while (1) { - $self->{fd} = &$create_socket(PeerHost => $self->{agenthost}, - PeerPort => $self->{agentport}, + $self->{fd} = &$create_socket(PeerHost => $self->{host}, + PeerPort => $self->{port}, Type => SOCK_STREAM); last if ($self->{fd}); $Err = $!; @@ -750,6 +778,63 @@ sub _Connect($) return undef; } + if ($self->{tunnel}) + { + # We are in fact connected to the SSH server. + # Now forward that connection to the TestAgent server. + $self->{sshfd} = $self->{fd}; + $self->{fd} = undef; + + require Net::SSH2; + $self->{ssh} = Net::SSH2->new(); + $self->{ssh}->debug(1) if ($Debug > 2); + if (!$self->{ssh}->connect($self->{sshfd})) + { + $self->_SetError($FATAL, "Unable to connect to the SSH server: " . $self->_ssherror()); + return undef; + } + + # Authenticate ourselves + my $Tunnel = $self->{tunnel}; + my %AuthOptions=(username => $Tunnel->{username} || $ENV{USER}); + foreach my $Key ("username", "password", "publickey", "privatekey", + "hostname", "local_username", "interact") + { + $AuthOptions{$Key} = $Tunnel->{$Key} if (exists $Tunnel->{$Key}); + } + # Interactive authentication makes no sense with automatic reconnects + $AuthOptions{interact} = 0; + if (!$self->{ssh}->auth(%AuthOptions)) + { + # auth() returns no error of any sort :-( + $self->_SetError($FATAL, "Unable to authenticate to the SSH server"); + return undef; + } + + $self->{fd} = $self->{ssh}->channel(); + if (!$self->{fd}) + { + $self->_SetError($FATAL, "Unable to create the SSH channel: " . $self->_ssherror()); + return undef; + } + + # Check that the agent hostname and port won't mess with quoting. + if ($self->{agenthost} !~ /^[-a-zA-Z0-9.]*$/ or + $self->{agentport} !~ /^[a-zA-Z0-9]*$/) + { + $self->_SetError($FATAL, "The agent hostname or port is invalid"); + return undef; + } + + # Use netcat to forward the connection from the SSH server to the TestAgent + # server. Note that we won't know about netcat errors at this point. + if (!$self->{fd}->exec("nc '$self->{agenthost}' '$self->{agentport}'")) + { + $self->_SetError($FATAL, "Unable to start netcat: " . $self->_ssherror()); + return undef; + } + } + # Get the protocol version supported by the server. # This also lets us verify that the connection really works. $self->{agentversion} = $self->_RecvString(); diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 35af883..4be607a 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -37,6 +37,8 @@ This class caches these objects so only one is created per URI. =cut +use URI; + use WineTestBot::Config; use vars qw (@ISA @EXPORT_OK); @@ -344,11 +346,31 @@ sub PowerOff return $self->UpdateStatus($Domain); } +sub _GetTunnel($) +{ + my ($self) = @_; + + # Auto-detect the SSH settings based on the libvirt URI + my $VirtURI = $self->VirtURI; + if ($VirtURI =~ s/^[a-z]+\+(?:ssh|libssh2):/ssh:/) + { + my $URI = URI->new($VirtURI); + my $TunnelInfo = { + sshhost => $URI->host, + sshport => $URI->port, + username => $URI->userinfo, + }; + return $TunnelInfo; + } + + return undef; +} + sub WaitForToolsInGuest($$) { my ($self, $Timeout) = @_; - my $TA = TestAgent->new($self->Hostname, $AgentPort); + my $TA = TestAgent->new($self->Hostname, $AgentPort, $self->_GetTunnel()); $TA->SetConnectTimeout($Timeout); my $Success = $TA->Ping(); $TA->Disconnect(); @@ -358,7 +380,7 @@ sub WaitForToolsInGuest($$) sub CopyFileFromHostToGuest($$$) { my ($self, $HostPathName, $GuestPathName) = @_; - my $TA = TestAgent->new($self->Hostname, $AgentPort); + my $TA = TestAgent->new($self->Hostname, $AgentPort, $self->_GetTunnel()); my $Success = $TA->SendFile($HostPathName, $GuestPathName); $TA->Disconnect(); return $Success ? undef : $TA->GetLastError(); @@ -367,8 +389,8 @@ sub CopyFileFromHostToGuest($$$) sub CopyFileFromGuestToHost($$$) { my ($self, $GuestPathName, $HostPathName) = @_; - my $TA = TestAgent->new($self->Hostname, $AgentPort); - my $Err = $TA->GetFile($GuestPathName, $HostPathName); + my $TA = TestAgent->new($self->Hostname, $AgentPort, $self->_GetTunnel()); + my $Success = $TA->GetFile($GuestPathName, $HostPathName); $TA->Disconnect(); return $Success ? undef : $TA->GetLastError(); } @@ -376,7 +398,7 @@ sub CopyFileFromGuestToHost($$$) sub RunScriptInGuestTimeout($$$) { my ($self, $ScriptText, $Timeout) = @_; - my $TA = TestAgent->new($self->Hostname, $AgentPort); + my $TA = TestAgent->new($self->Hostname, $AgentPort, $self->_GetTunnel()); $TA->SetTimeout($Timeout); my $Success; diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 10f6f2e..db31a3d 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -33,6 +33,7 @@ sub BEGIN my $name0 = $0; $name0 =~ s+^.*/++; +use URI; use WineTestBot::Config; use WineTestBot::TestAgent; use WineTestBot::Log; @@ -46,7 +47,7 @@ my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, @Rm); my (@Run, $RunIn, $RunOut, $RunErr); my $SendFlags = 0; my $RunFlags = 0; -my ($Port, $ConnectTimeout, $Timeout); +my ($Port, $ConnectTimeout, $Timeout, $Tunnel); my $Usage; sub check_opt_val($$) @@ -86,6 +87,10 @@ while (@ARGV) { $Timeout = check_opt_val($arg, $Timeout); } + elsif ($arg eq "--tunnel") + { + $Tunnel = check_opt_val($arg, $Tunnel); + } elsif ($arg eq "--sendfile-exe") { $SendFlags |= $TestAgent::SENDFILE_EXE; @@ -178,6 +183,11 @@ if (!defined $Usage) $Usage = 2; } $AgentPort = $Port if (defined $Port); + if (defined $Tunnel and $Tunnel !~ /^ssh:/) + { + error("only SSH proxies are supported\n"); + $Usage = 2; + } } if (defined $Usage) { @@ -217,11 +227,22 @@ if (defined $Usage) print " connecting instead of the default one.\n"; print " --timeout <timeout> Use the specified timeout (in seconds) instead of the\n"; print " default one for the operation.\n"; + print " --tunnel <uri> Tunnel the connection through ssh. The SSH connection is\n"; + print " specified in the form of an ssh:// URI.\n"; print " --help Shows this usage message.\n"; exit 0; } -my $TA = TestAgent->new($Hostname, $AgentPort); +my $TunnelInfo; +if (defined $Tunnel) +{ + my $URI = URI->new($Tunnel); + $TunnelInfo = {sshhost => $URI->host, + sshport => $URI->port, + username => $URI->userinfo}; +} + +my $TA = TestAgent->new($Hostname, $AgentPort, $TunnelInfo); $TA->SetConnectTimeout($ConnectTimeout) if (defined $ConnectTimeout); $TA->SetTimeout($Timeout) if (defined $Timeout);

1 0