wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Henri Verbeet : wined3d: wined3d_device_get_creation_parameters() never fails.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 2ad58089961aedd1c5e1d6bace503fcf56bae997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad58089961aedd1c5e1d6bac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 22:48:12 2012 +0200 wined3d: wined3d_device_get_creation_parameters() never fails. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 5 ++--- dlls/dxgi/device.c | 10 +--------- dlls/wined3d/device.c | 3 +-- include/wine/wined3d.h | 2 +- 5 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4f6162c..65070bb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -479,16 +479,15 @@ static HRESULT WINAPI d3d8_device_GetCreationParameters(IDirect3DDevice8 *iface, D3DDEVICE_CREATION_PARAMETERS *parameters) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, parameters %p.\n", iface, parameters); wined3d_mutex_lock(); - hr = wined3d_device_get_creation_parameters(device->wined3d_device, + wined3d_device_get_creation_parameters(device->wined3d_device, (struct wined3d_device_creation_parameters *)parameters); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_SetCursorProperties(IDirect3DDevice8 *iface, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4d5c762..fc543d9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -422,16 +422,15 @@ static HRESULT WINAPI d3d9_device_GetCreationParameters(IDirect3DDevice9Ex *ifac D3DDEVICE_CREATION_PARAMETERS *parameters) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, parameters %p.\n", iface, parameters); wined3d_mutex_lock(); - hr = wined3d_device_get_creation_parameters(device->wined3d_device, + wined3d_device_get_creation_parameters(device->wined3d_device, (struct wined3d_device_creation_parameters *)parameters); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetCursorProperties(IDirect3DDevice9Ex *iface, diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 7bbc5e0..b8e6692 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -141,19 +141,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetAdapter(IWineDXGIDevice *iface, { struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); struct wined3d_device_creation_parameters create_parameters; - HRESULT hr; TRACE("iface %p, adapter %p\n", iface, adapter); EnterCriticalSection(&dxgi_cs); - - hr = wined3d_device_get_creation_parameters(This->wined3d_device, &create_parameters); - if (FAILED(hr)) - { - LeaveCriticalSection(&dxgi_cs); - return hr; - } - + wined3d_device_get_creation_parameters(This->wined3d_device, &create_parameters); LeaveCriticalSection(&dxgi_cs); return IWineDXGIFactory_EnumAdapters(This->factory, create_parameters.adapter_idx, adapter); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f9ff67c..c03537d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5263,13 +5263,12 @@ HRESULT CDECL wined3d_device_set_dialog_box_mode(struct wined3d_device *device, } -HRESULT CDECL wined3d_device_get_creation_parameters(const struct wined3d_device *device, +void CDECL wined3d_device_get_creation_parameters(const struct wined3d_device *device, struct wined3d_device_creation_parameters *parameters) { TRACE("device %p, parameters %p.\n", device, parameters); *parameters = device->create_parms; - return WINED3D_OK; } void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bc3e17f..a5465fb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2114,7 +2114,7 @@ HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *devic UINT plane_idx, struct wined3d_vec4 *plane); HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, struct wined3d_clip_status *clip_status); -HRESULT __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, +void __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, struct wined3d_device_creation_parameters *creation_parameters); struct wined3d_surface * __cdecl wined3d_device_get_depth_stencil(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps);

1 0

Henri Verbeet : wined3d: wined3d_device_set_depth_stencil() never fails.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 6e5cf8c69885733c78135983cfaf39d791760160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e5cf8c69885733c78135983c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 22:48:11 2012 +0200 wined3d: wined3d_device_set_depth_stencil() never fails. --- dlls/d3d8/device.c | 6 +++--- dlls/d3d9/device.c | 5 ++--- dlls/wined3d/device.c | 6 +++--- include/wine/wined3d.h | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 751ba05..4f6162c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1085,7 +1085,7 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, struct d3d8_surface *rt_impl = unsafe_impl_from_IDirect3DSurface8(render_target); struct d3d8_surface *ds_impl = unsafe_impl_from_IDirect3DSurface8(depth_stencil); struct wined3d_surface *original_ds = NULL; - HRESULT hr; + HRESULT hr = D3D_OK; TRACE("iface %p, render_target %p, depth_stencil %p.\n", iface, render_target, depth_stencil); @@ -1123,8 +1123,8 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, } original_ds = wined3d_device_get_depth_stencil(device->wined3d_device); - hr = wined3d_device_set_depth_stencil(device->wined3d_device, ds_impl ? ds_impl->wined3d_surface : NULL); - if (SUCCEEDED(hr) && render_target) + wined3d_device_set_depth_stencil(device->wined3d_device, ds_impl ? ds_impl->wined3d_surface : NULL); + if (render_target) { hr = wined3d_device_set_render_target(device->wined3d_device, 0, rt_impl->wined3d_surface, TRUE); if (FAILED(hr)) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index af2a92f..4d5c762 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1224,15 +1224,14 @@ static HRESULT WINAPI d3d9_device_SetDepthStencilSurface(IDirect3DDevice9Ex *ifa { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *ds_impl = unsafe_impl_from_IDirect3DSurface9(depth_stencil); - HRESULT hr; TRACE("iface %p, depth_stencil %p.\n", iface, depth_stencil); wined3d_mutex_lock(); - hr = wined3d_device_set_depth_stencil(device->wined3d_device, ds_impl ? ds_impl->wined3d_surface : NULL); + wined3d_device_set_depth_stencil(device->wined3d_device, ds_impl ? ds_impl->wined3d_surface : NULL); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetDepthStencilSurface(IDirect3DDevice9Ex *iface, IDirect3DSurface9 **depth_stencil) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fa35105..f9ff67c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4568,7 +4568,7 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, struct wined3d_surface *depth_stencil) +void CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, struct wined3d_surface *depth_stencil) { struct wined3d_surface *prev = device->fb.depth_stencil; @@ -4578,7 +4578,7 @@ HRESULT CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, st if (prev == depth_stencil) { TRACE("Trying to do a NOP SetRenderTarget operation.\n"); - return WINED3D_OK; + return; } if (prev) @@ -4617,7 +4617,7 @@ HRESULT CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, st device_invalidate_state(device, STATE_FRAMEBUFFER); - return WINED3D_OK; + return; } HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d527949..bc3e17f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2195,7 +2195,7 @@ void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device, int x_screen_space, int y_screen_space, DWORD flags); HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *device, UINT x_hotspot, UINT y_hotspot, struct wined3d_surface *cursor_surface); -HRESULT __cdecl wined3d_device_set_depth_stencil(struct wined3d_device *device, struct wined3d_surface *depth_stencil); +void __cdecl wined3d_device_set_depth_stencil(struct wined3d_device *device, struct wined3d_surface *depth_stencil); HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs); void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_RSGetState().
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: c7caabb864189c74ded7a221c93154e6bfce326a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7caabb864189c74ded7a221c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 22:48:10 2012 +0200 d3d10core: Implement d3d10_device_RSGetState(). --- dlls/d3d10core/device.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index d43ee4b..eaf0793 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -580,7 +580,12 @@ static void STDMETHODCALLTYPE d3d10_device_SOGetTargets(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_RSGetState(ID3D10Device *iface, ID3D10RasterizerState **rasterizer_state) { - FIXME("iface %p, rasterizer_state %p stub!\n", iface, rasterizer_state); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); + + if ((*rasterizer_state = device->rasterizer_state ? &device->rasterizer_state->ID3D10RasterizerState_iface : NULL)) + ID3D10RasterizerState_AddRef(*rasterizer_state); } static void STDMETHODCALLTYPE d3d10_device_RSGetViewports(ID3D10Device *iface,

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_RSSetState().
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: fbcce6787af79c7a6e11b45a7403a90a8519522b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbcce6787af79c7a6e11b45a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 22:48:09 2012 +0200 d3d10core: Implement d3d10_device_RSSetState(). --- dlls/d3d10core/d3d10core_private.h | 35 ++++++++++++++++++++--------------- dlls/d3d10core/device.c | 6 +++++- dlls/d3d10core/state.c | 9 +++++++++ 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index f88355b..4f98c93 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -44,6 +44,8 @@ #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') +struct d3d10_device; + struct d3d10_shader_info { const DWORD *shader_code; @@ -68,21 +70,6 @@ void skip_dword_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; HRESULT parse_dxbc(const char *data, SIZE_T data_size, HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) DECLSPEC_HIDDEN; -/* IDirect3D10Device */ -struct d3d10_device -{ - IUnknown IUnknown_inner; - ID3D10Device ID3D10Device_iface; - IWineDXGIDeviceParent IWineDXGIDeviceParent_iface; - IUnknown *outer_unk; - LONG refcount; - - struct wined3d_device_parent device_parent; - struct wined3d_device *wined3d_device; -}; - -void d3d10_device_init(struct d3d10_device *device, void *outer_unknown) DECLSPEC_HIDDEN; - /* ID3D10Texture2D */ struct d3d10_texture2d { @@ -248,6 +235,7 @@ struct d3d10_rasterizer_state }; HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) DECLSPEC_HIDDEN; +struct d3d10_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; /* ID3D10SamplerState */ struct d3d10_sampler_state @@ -267,6 +255,23 @@ struct d3d10_query HRESULT d3d10_query_init(struct d3d10_query *query) DECLSPEC_HIDDEN; +/* IDirect3D10Device */ +struct d3d10_device +{ + IUnknown IUnknown_inner; + ID3D10Device ID3D10Device_iface; + IWineDXGIDeviceParent IWineDXGIDeviceParent_iface; + IUnknown *outer_unk; + LONG refcount; + + struct wined3d_device_parent device_parent; + struct wined3d_device *wined3d_device; + + struct d3d10_rasterizer_state *rasterizer_state; +}; + +void d3d10_device_init(struct d3d10_device *device, void *outer_unknown) DECLSPEC_HIDDEN; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 00a34a9..d43ee4b 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -342,7 +342,11 @@ static void STDMETHODCALLTYPE d3d10_device_DrawAuto(ID3D10Device *iface) static void STDMETHODCALLTYPE d3d10_device_RSSetState(ID3D10Device *iface, ID3D10RasterizerState *rasterizer_state) { - FIXME("iface %p, rasterizer_state %p stub!\n", iface, rasterizer_state); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); + + device->rasterizer_state = unsafe_impl_from_ID3D10RasterizerState(rasterizer_state); } static void STDMETHODCALLTYPE d3d10_device_RSSetViewports(ID3D10Device *iface, diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index edb2030..3b5c45f 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -372,6 +372,15 @@ HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) return S_OK; } +struct d3d10_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_rasterizer_state_vtbl); + + return impl_from_ID3D10RasterizerState(iface); +} + static inline struct d3d10_sampler_state *impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) { return CONTAINING_RECORD(iface, struct d3d10_sampler_state, ID3D10SamplerState_iface);

1 0

Rico Schüller : d3dx9: Fix D3DXMatrixAffineTransformation() and add some tests.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: ec9db0a11f4030358f68e238a99c74314eb9c8d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec9db0a11f4030358f68e238a… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 1 12:40:51 2012 +0200 d3dx9: Fix D3DXMatrixAffineTransformation() and add some tests. --- dlls/d3dx9_36/math.c | 15 +++++++++++---- dlls/d3dx9_36/tests/math.c | 35 +++++++++++++++++++++++++++++------ 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 53dddd4..b43c678 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -81,7 +81,7 @@ FLOAT WINAPI D3DXFresnelTerm(FLOAT costheta, FLOAT refractionindex) { FLOAT a, d, g, result; - TRACE("costheta %f, refractionindex %f)\n", costheta, refractionindex); + TRACE("costheta %f, refractionindex %f\n", costheta, refractionindex); g = sqrtf(refractionindex * refractionindex + costheta * costheta - 1.0f); a = g + costheta; @@ -102,6 +102,13 @@ D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *out, FLOAT scalin D3DXMatrixIdentity(out); + if (rotationcenter) + { + out->u.m[3][0] = -rotationcenter->x; + out->u.m[3][1] = -rotationcenter->y; + out->u.m[3][2] = -rotationcenter->z; + } + if (rotation) { FLOAT temp00, temp01, temp02, temp10, temp11, temp12, temp20, temp21, temp22; @@ -130,9 +137,9 @@ D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *out, FLOAT scalin { FLOAT x, y, z; - x = -rotationcenter->x; - y = -rotationcenter->y; - z = -rotationcenter->z; + x = out->u.m[3][0]; + y = out->u.m[3][1]; + z = out->u.m[3][2]; out->u.m[3][0] = x * temp00 + y * temp10 + z * temp20; out->u.m[3][1] = x * temp01 + y * temp11 + z * temp21; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 9043ab3..9a5cbcc 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -275,14 +275,37 @@ static void D3DXMatrixTest(void) U(expectedmat).m[1][0] = 519.760010f; U(expectedmat).m[1][1] = -352.440002f; U(expectedmat).m[1][2] = -277.679993f; U(expectedmat).m[1][3] = 0.0f; U(expectedmat).m[2][0] = 363.119995f; U(expectedmat).m[2][1] = -121.040001f; U(expectedmat).m[2][2] = -117.479996f; U(expectedmat).m[2][3] = 0.0f; U(expectedmat).m[3][0] = -1239.0f; U(expectedmat).m[3][1] = 667.0f; U(expectedmat).m[3][2] = 567.0f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixAffineTransformation(&gotmat,3.56f,&at,&q,&axis); + D3DXMatrixAffineTransformation(&gotmat, 3.56f, &at, &q, &axis); expect_mat(&expectedmat, &gotmat); -/* Test the NULL case */ - U(expectedmat).m[0][0] = -459.239990f; U(expectedmat).m[0][1] = -576.719971f; U(expectedmat).m[0][2] = -263.440002f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 519.760010f; U(expectedmat).m[1][1] = -352.440002f; U(expectedmat).m[1][2] = -277.679993f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 363.119995f; U(expectedmat).m[2][1] = -121.040001f; U(expectedmat).m[2][2] = -117.479996f; U(expectedmat).m[2][3] = 0.0f; + + /* Test the NULL case */ + U(expectedmat).m[3][0] = 1.0f; U(expectedmat).m[3][1] = -3.0f; U(expectedmat).m[3][2] = 7.0f; U(expectedmat).m[3][3] = 1.0f; + D3DXMatrixAffineTransformation(&gotmat, 3.56f, NULL, &q, &axis); + expect_mat(&expectedmat, &gotmat); + + U(expectedmat).m[3][0] = -1240.0f; U(expectedmat).m[3][1] = 670.0f; U(expectedmat).m[3][2] = 560.0f; U(expectedmat).m[3][3] = 1.0f; + D3DXMatrixAffineTransformation(&gotmat, 3.56f, &at, &q, NULL); + expect_mat(&expectedmat, &gotmat); + + U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; + D3DXMatrixAffineTransformation(&gotmat, 3.56f, NULL, &q, NULL); + expect_mat(&expectedmat, &gotmat); + + U(expectedmat).m[0][0] = 3.56f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; + U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 3.56f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; + U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 3.56f; U(expectedmat).m[2][3] = 0.0f; U(expectedmat).m[3][0] = 1.0f; U(expectedmat).m[3][1] = -3.0f; U(expectedmat).m[3][2] = 7.0f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixAffineTransformation(&gotmat,3.56f,NULL,&q,&axis); + D3DXMatrixAffineTransformation(&gotmat, 3.56f, NULL, NULL, &axis); + expect_mat(&expectedmat, &gotmat); + + D3DXMatrixAffineTransformation(&gotmat, 3.56f, &at, NULL, &axis); + expect_mat(&expectedmat, &gotmat); + + U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; + D3DXMatrixAffineTransformation(&gotmat, 3.56f, &at, NULL, NULL); + expect_mat(&expectedmat, &gotmat); + + D3DXMatrixAffineTransformation(&gotmat, 3.56f, NULL, NULL, NULL); expect_mat(&expectedmat, &gotmat); /*____________D3DXMatrixfDeterminant_____________*/

1 0

Piotr Caban : wininet: Make cookies functions thread-safe.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: b9c2a19591b64d78c53aeec5c22b91204412bb86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9c2a19591b64d78c53aeec5c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 14:23:10 2012 +0200 wininet: Make cookies functions thread-safe. --- dlls/wininet/cookie.c | 31 +++++++++++++++++++++++++++++-- dlls/wininet/internet.c | 1 + dlls/wininet/internet.h | 1 + 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 5253b2b..0a65e4c 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -49,7 +49,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); /* FIXME - * Cookies are NOT THREAD SAFE * Cookies could use A LOT OF MEMORY. We need some kind of memory management here! */ @@ -78,6 +77,14 @@ struct _cookie_domain struct list cookie_list; }; +static CRITICAL_SECTION cookie_cs; +static CRITICAL_SECTION_DEBUG cookie_cs_debug = +{ + 0, 0, &cookie_cs, + { &cookie_cs_debug.ProcessLocksList, &cookie_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cookie_cs") } +}; +static CRITICAL_SECTION cookie_cs = { &cookie_cs_debug, -1, 0, 0, 0, 0 }; static struct list domain_list = LIST_INIT(domain_list); static cookie *COOKIE_addCookie(cookie_domain *domain, LPCWSTR name, LPCWSTR data, @@ -529,6 +536,8 @@ BOOL get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD GetSystemTimeAsFileTime(&tm); + EnterCriticalSection(&cookie_cs); + load_persistent_cookie(host, path); LIST_FOR_EACH_ENTRY(domain, &domain_list, cookie_domain, entry) { @@ -577,6 +586,8 @@ BOOL get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD } } + LeaveCriticalSection(&cookie_cs); + if (!domain_count) { TRACE("no cookies found for %s\n", debugstr_w(host)); SetLastError(ERROR_NO_MORE_ITEMS); @@ -825,6 +836,8 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki } } + EnterCriticalSection(&cookie_cs); + load_persistent_cookie(domain, path); LIST_FOR_EACH(cursor, &domain_list) @@ -843,6 +856,7 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki { heap_free(data); if (value != data) heap_free(value); + LeaveCriticalSection(&cookie_cs); return TRUE; } } @@ -866,11 +880,19 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki { heap_free(data); if (value != data) heap_free(value); + LeaveCriticalSection(&cookie_cs); return FALSE; } heap_free(data); if (value != data) heap_free(value); - return !update_persistent || save_persistent_cookie(thisCookieDomain); + + if (!update_persistent || save_persistent_cookie(thisCookieDomain)) + { + LeaveCriticalSection(&cookie_cs); + return TRUE; + } + LeaveCriticalSection(&cookie_cs); + return FALSE; } /*********************************************************************** @@ -1115,3 +1137,8 @@ BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDeci FIXME("(%s, 0x%08x) stub\n", debugstr_w(pchHostName), dwDecision); return FALSE; } + +void free_cookie(void) +{ + DeleteCriticalSection(&cookie_cs); +} diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a6dbaa1..0e83389 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -315,6 +315,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) collect_connections(COLLECT_CLEANUP); NETCON_unload(); free_urlcache(); + free_cookie(); if (g_dwTlsErrIndex != TLS_OUT_OF_INDEXES) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index a4fcdaa..181ef4c 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -553,6 +553,7 @@ server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL); BOOL init_urlcache(void) DECLSPEC_HIDDEN; void free_urlcache(void) DECLSPEC_HIDDEN; +void free_cookie(void) DECLSPEC_HIDDEN; #define MAX_REPLY_LEN 0x5B4

1 0

Piotr Caban : wininet: Added basic cookie domain validation in set_cookie function.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: fc219b0ab37da8b80d023fa1aaa957ec01b61b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc219b0ab37da8b80d023fa1a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 14:22:57 2012 +0200 wininet: Added basic cookie domain validation in set_cookie function. --- dlls/wininet/cookie.c | 83 ++++++++++++++++++++++++++++------------- dlls/wininet/tests/internet.c | 20 ++++++++++ 2 files changed, 77 insertions(+), 26 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 46adf68..5253b2b 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -678,6 +678,43 @@ BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, return r; } + +/*********************************************************************** + * IsDomainLegalCookieDomainW (WININET.@) + */ +BOOL WINAPI IsDomainLegalCookieDomainW( LPCWSTR s1, LPCWSTR s2 ) +{ + DWORD s1_len, s2_len; + + FIXME("(%s, %s) semi-stub\n", debugstr_w(s1), debugstr_w(s2)); + + if (!s1 || !s2) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (s1[0] == '.' || !s1[0] || s2[0] == '.' || !s2[0]) + { + SetLastError(ERROR_INVALID_NAME); + return FALSE; + } + if(!strchrW(s1, '.') || !strchrW(s2, '.')) + return FALSE; + + s1_len = strlenW(s1); + s2_len = strlenW(s2); + if (s1_len > s2_len) + return FALSE; + + if (strncmpiW(s1, s2+s2_len-s1_len, s1_len) || (s2_len>s1_len && s2[s2_len-s1_len-1]!='.')) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return TRUE; +} + BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cookie_data) { cookie_domain *thisCookieDomain = NULL; @@ -727,7 +764,26 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki if (strncmpiW(ptr, szDomain, 7) == 0) { - ptr+=strlenW(szDomain); + WCHAR *end_ptr; + + ptr += sizeof(szDomain)/sizeof(szDomain[0])-1; + if(*ptr == '.') + ptr++; + end_ptr = strchrW(ptr, ';'); + if(end_ptr) + *end_ptr = 0; + + if(!IsDomainLegalCookieDomainW(ptr, domain)) + { + if(value != data) + heap_free(value); + heap_free(data); + return FALSE; + } + + if(end_ptr) + *end_ptr = ';'; + domain = ptr; TRACE("Parsing new domain %s\n",debugstr_w(domain)); } @@ -1059,28 +1115,3 @@ BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDeci FIXME("(%s, 0x%08x) stub\n", debugstr_w(pchHostName), dwDecision); return FALSE; } - -/*********************************************************************** - * IsDomainLegalCookieDomainW (WININET.@) - */ -BOOL WINAPI IsDomainLegalCookieDomainW( LPCWSTR s1, LPCWSTR s2 ) -{ - const WCHAR *p; - - FIXME("(%s, %s)\n", debugstr_w(s1), debugstr_w(s2)); - - if (!s1 || !s2) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if (s1[0] == '.' || !s1[0] || s2[0] == '.' || !s2[0]) - { - SetLastError(ERROR_INVALID_NAME); - return FALSE; - } - if (!(p = strchrW(s2, '.'))) return FALSE; - if (strchrW(p + 1, '.') && !strcmpW(p + 1, s1)) return TRUE; - else if (!strcmpW(s1, s2)) return TRUE; - return FALSE; -} diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 5a8ba99..cf1fc4e 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -496,6 +496,15 @@ static void test_complicated_cookie(void) ret = GetUrlCacheEntryInfo(buffer, NULL, &len); ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() = %d\n", GetLastError()); + + /* try setting cookie for different domain */ + ret = InternetSetCookie("http://www.aaa.example.com/bar",NULL,"E=F; domain=different.com"); + ok(!ret, "InternetSetCookie succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %d\n", GetLastError()); + ret = InternetSetCookie("http://www.aaa.example.com.pl/bar",NULL,"E=F; domain=example.com.pl"); + ok(ret, "InternetSetCookie failed with error: %d\n", GetLastError()); + ret = InternetSetCookie("http://www.aaa.example.com.pl/bar",NULL,"E=F; domain=com.pl"); + todo_wine ok(!ret, "InternetSetCookie succeeded\n"); } static void test_cookie_url(void) @@ -828,6 +837,8 @@ static void test_IsDomainLegalCookieDomainW(void) static const WCHAR dot_com[] = {'.','c','o','m',0}; static const WCHAR gmail_com[] = {'g','m','a','i','l','.','c','o','m',0}; static const WCHAR dot_gmail_com[] = {'.','g','m','a','i','l','.','c','o','m',0}; + static const WCHAR www_gmail_com[] = {'w','w','w','.','g','m','a','i','l','.','c','o','m',0}; + static const WCHAR www_mail_gmail_com[] = {'w','w','w','.','m','a','i','l','.','g','m','a','i','l','.','c','o','m',0}; static const WCHAR mail_gmail_com[] = {'m','a','i','l','.','g','m','a','i','l','.','c','o','m',0}; static const WCHAR gmail_co_uk[] = {'g','m','a','i','l','.','c','o','.','u','k',0}; static const WCHAR co_uk[] = {'c','o','.','u','k',0}; @@ -924,6 +935,12 @@ static void test_IsDomainLegalCookieDomainW(void) ret = pIsDomainLegalCookieDomainW(gmail_com, gmail_com); ok(ret, "IsDomainLegalCookieDomainW failed\n"); + ret = pIsDomainLegalCookieDomainW(gmail_com, www_gmail_com); + ok(ret, "IsDomainLegalCookieDomainW failed\n"); + + ret = pIsDomainLegalCookieDomainW(gmail_com, www_mail_gmail_com); + ok(ret, "IsDomainLegalCookieDomainW failed\n"); + SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(gmail_co_uk, co_uk); error = GetLastError(); @@ -940,6 +957,9 @@ static void test_IsDomainLegalCookieDomainW(void) ret = pIsDomainLegalCookieDomainW(gmail_co_uk, dot_co_uk); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ret = pIsDomainLegalCookieDomainW(co_uk, gmail_co_uk); + todo_wine ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ret = pIsDomainLegalCookieDomainW(gmail_co_uk, gmail_co_uk); ok(ret, "IsDomainLegalCookieDomainW failed\n");

1 0

Piotr Caban : wininet: Added basic persistent cookie tests.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: c34bc977a012957b56076f65f227c2c58af7e7f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c34bc977a012957b56076f65f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 14:22:27 2012 +0200 wininet: Added basic persistent cookie tests. --- dlls/wininet/tests/internet.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index a0b6466..5a8ba99 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <string.h> #include "windef.h" #include "winbase.h" @@ -368,6 +369,7 @@ static void test_complicated_cookie(void) BOOL ret; CHAR buffer[1024]; + CHAR user[256]; ret = InternetSetCookie("http://www.example.com/bar",NULL,"A=B; domain=.example.com"); ok(ret == TRUE,"InternetSetCookie failed\n"); @@ -471,6 +473,29 @@ static void test_complicated_cookie(void) ok(strstr(buffer,"K=L")!=NULL,"K=L missing\n"); ok(strstr(buffer,"M=N")==NULL,"M=N present\n"); ok(strstr(buffer,"O=P")==NULL,"O=P present\n"); + + /* test persistent cookies */ + ret = InternetSetCookie("http://testing.example.com", NULL, "A=B; expires=Fri, 01-Jan-2038 00:00:00 GMT"); + ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); + + len = sizeof(user); + ret = GetUserName(user, &len); + ok(ret, "GetUserName failed with error %d\n", GetLastError()); + for(; len>0; len--) + user[len-1] = tolower(user[len-1]); + + sprintf(buffer, "Cookie:%s@testing.example.com/", user); + ret = GetUrlCacheEntryInfo(buffer, NULL, &len); + ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() = %d\n", GetLastError()); + + /* remove persistent cookie */ + ret = InternetSetCookie("http://testing.example.com", NULL, "A=B"); + ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); + + ret = GetUrlCacheEntryInfo(buffer, NULL, &len); + ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() = %d\n", GetLastError()); } static void test_cookie_url(void)

1 0

Piotr Caban : wininet: Added support for persistent cookies.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: b49c980d0d003f1cbaa750ded2b60fc143b04c1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49c980d0d003f1cbaa750ded… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 14:21:59 2012 +0200 wininet: Added support for persistent cookies. --- dlls/wininet/cookie.c | 297 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 279 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b49c980d0d003f1cbaa75…

1 0

Piotr Caban : wininet: Added support for urlcache file name generating.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: e4a0281679ee8436a8a4632590d11f0f5c675776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a0281679ee8436a8a463259… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 14:21:04 2012 +0200 wininet: Added support for urlcache file name generating. --- dlls/wininet/urlcache.c | 41 +++++++++++++++++++++++++++++------------ 1 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 249ac46..24bf48b 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2861,13 +2861,13 @@ BOOL WINAPI CreateUrlCacheEntryW( BYTE CacheDir; LONG lBufferSize; BOOL bFound = FALSE; + BOOL generate_name = FALSE; int count; DWORD error; HANDLE hFile; FILETIME ft; static const WCHAR szWWW[] = {'w','w','w',0}; - static const WCHAR fmt[] = {'%','0','8','X','%','s',0}; TRACE("(%s, 0x%08x, %s, %p, 0x%08x)\n", debugstr_w(lpszUrlName), @@ -2879,7 +2879,7 @@ BOOL WINAPI CreateUrlCacheEntryW( if (dwReserved) FIXME("dwReserved 0x%08x\n", dwReserved); - lpszUrlEnd = lpszUrlName + strlenW(lpszUrlName); + lpszUrlEnd = lpszUrlName + strlenW(lpszUrlName); if (((lpszUrlEnd - lpszUrlName) > 1) && (*(lpszUrlEnd - 1) == '/' || *(lpszUrlEnd - 1) == '\\')) lpszUrlEnd--; @@ -2917,14 +2917,14 @@ BOOL WINAPI CreateUrlCacheEntryW( while(len && szFile[--len] == '/') szFile[len] = '\0'; /* FIXME: get rid of illegal characters like \, / and : */ + TRACE("File name: %s\n", debugstr_a(szFile)); } else { - FIXME("need to generate a random filename\n"); + generate_name = TRUE; + szFile[0] = 0; } - TRACE("File name: %s\n", debugstr_a(szFile)); - error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { @@ -2978,7 +2978,7 @@ BOOL WINAPI CreateUrlCacheEntryW( lstrcpyW(szExtension+1, lpszFileExtension); } - for (i = 0; i < 255; i++) + for (i = 0; i<255 && !generate_name; i++) { static const WCHAR szFormat[] = {'[','%','u',']','%','s',0}; WCHAR *p; @@ -3008,15 +3008,32 @@ BOOL WINAPI CreateUrlCacheEntryW( } } + /* Try to generate random name */ GetSystemTimeAsFileTime(&ft); - wsprintfW(lpszFileNameNoPath + countnoextension, fmt, ft.dwLowDateTime, szExtension); + strcpyW(lpszFileNameNoPath+countnoextension+8, szExtension); - TRACE("Trying: %s\n", debugstr_w(lpszFileName)); - hFile = CreateFileW(lpszFileName, GENERIC_READ, 0, NULL, CREATE_NEW, 0, NULL); - if (hFile != INVALID_HANDLE_VALUE) + for(i=0; i<255; i++) { - CloseHandle(hFile); - return TRUE; + int j; + ULONGLONG n = ft.dwHighDateTime; + n <<= 32; + n += ft.dwLowDateTime; + n ^= (ULONGLONG)i<<48; + + for(j=0; j<8; j++) + { + int r = (n % 36); + n /= 37; + lpszFileNameNoPath[countnoextension+j] = (r < 10 ? '0' + r : 'A' + r - 10); + } + + TRACE("Trying: %s\n", debugstr_w(lpszFileName)); + hFile = CreateFileW(lpszFileName, GENERIC_READ, 0, NULL, CREATE_NEW, 0, NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + CloseHandle(hFile); + return TRUE; + } } WARN("Could not find a unique filename\n");

1 0

← Newer
1
...
88
89
90
91
92
93
94
95
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