wine-commits August 2010

2 participants
884 discussions

Francois Gouget : mscoree/tests: Remove spaces before '\n's in traces.

by Alexandre Julliard

Module: wine Branch: master Commit: 394b08972fc66b64d53ee0173b68dde34d2f0d75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=394b08972fc66b64d53ee0173… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 31 11:48:42 2010 +0200 mscoree/tests: Remove spaces before '\n's in traces. --- dlls/mscoree/tests/mscoree.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 0536ba1..a50ce97 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -101,12 +101,12 @@ static void test_versioninfo(void) if(hr == CLR_E_SHIM_RUNTIME) return; /* skipping rest of tests on win2k as .net 2.0 not installed */ ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); - trace(" installed in directory %s is .net version %s \n", wine_dbgstr_w(path), wine_dbgstr_w(version)); + trace(" installed in directory %s is .net version %s\n", wine_dbgstr_w(path), wine_dbgstr_w(version)); hr = pGetRequestedRuntimeInfo( NULL, v1_1, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, &size); ok(hr == S_OK || CLR_E_SHIM_RUNTIME /*v1_1 not installed*/, "GetRequestedRuntimeInfo returned %08x\n", hr); if(hr == S_OK) - trace(" installed in directory %s is .net version %s \n", wine_dbgstr_w(path), wine_dbgstr_w(version)); + trace(" installed in directory %s is .net version %s\n", wine_dbgstr_w(path), wine_dbgstr_w(version)); /* version number NULL not allowed without RUNTIME_INFO_UPGRADE_VERSION flag */ hr = pGetRequestedRuntimeInfo( NULL, NULL, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, &size); ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08x\n", hr);

13 years, 8 months

Andrew Talbot : dinput: Constify some variables.

by Alexandre Julliard

Module: wine Branch: master Commit: e6649952faad3118a36a53c8599577f11391cf8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6649952faad3118a36a53c85… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 30 21:19:22 2010 +0100 dinput: Constify some variables. --- dlls/dinput/device_private.h | 2 +- dlls/dinput/joystick.c | 2 +- dlls/dinput/joystick_private.h | 2 +- dlls/dinput/mouse.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 43b28c9..fd5808d 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -94,7 +94,7 @@ typedef struct LONG lSaturation; } ObjProps; -extern DWORD joystick_map_pov(POINTL *p); +extern DWORD joystick_map_pov(const POINTL *p); extern LONG joystick_map_axis(ObjProps *props, int val); typedef struct diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 0f39a6d..7d781c9 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -434,7 +434,7 @@ LONG joystick_map_axis(ObjProps *props, int val) * 22500 13500 * 18000 */ -DWORD joystick_map_pov(POINTL *p) +DWORD joystick_map_pov(const POINTL *p) { if (p->x > 0) return p->y < 0 ? 4500 : !p->y ? 9000 : 13500; diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index aaa8294..0407e0a 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -55,7 +55,7 @@ typedef struct JoystickGenericImpl LONG joystick_map_axis(ObjProps *props, int val); HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_map); -DWORD joystick_map_pov(POINTL *p); +DWORD joystick_map_pov(const POINTL *p); HRESULT WINAPI JoystickWGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEOBJECTINSTANCEW pdidoi, DWORD dwObj, DWORD dwHow); diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index e05d9e2..1599157 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -84,7 +84,7 @@ const GUID DInput_Wine_Mouse_GUID = { /* 9e573ed8-7734-11d2-8d4a-23903fb6bdf7 */ 0x9e573ed8, 0x7734, 0x11d2, {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} }; -static void _dump_mouse_state(DIMOUSESTATE2 *m_state) +static void _dump_mouse_state(const DIMOUSESTATE2 *m_state) { int i;

13 years, 8 months

Henri Verbeet : wined3d: Rename wined3d_format_desc to wined3d_format.

by Alexandre Julliard

Module: wine Branch: master Commit: 3a7f08a56f30310318df60311e2352a614e74654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7f08a56f30310318df60311… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 30 20:29:49 2010 +0200 wined3d: Rename wined3d_format_desc to wined3d_format. --- dlls/wined3d/arb_program_shader.c | 22 ++-- dlls/wined3d/basetexture.c | 10 +- dlls/wined3d/buffer.c | 20 ++-- dlls/wined3d/context.c | 52 +++--- dlls/wined3d/cubetexture.c | 8 +- dlls/wined3d/device.c | 65 ++++---- dlls/wined3d/directx.c | 216 +++++++++++++------------ dlls/wined3d/drawprim.c | 24 ++-- dlls/wined3d/resource.c | 4 +- dlls/wined3d/shader.c | 6 +- dlls/wined3d/state.c | 64 ++++---- dlls/wined3d/surface.c | 322 ++++++++++++++++++------------------- dlls/wined3d/surface_base.c | 99 ++++++------ dlls/wined3d/surface_gdi.c | 4 +- dlls/wined3d/swapchain.c | 14 +- dlls/wined3d/texture.c | 14 +- dlls/wined3d/utils.c | 270 ++++++++++++++++---------------- dlls/wined3d/vertexdeclaration.c | 4 +- dlls/wined3d/volume.c | 41 ++---- dlls/wined3d/volumetexture.c | 4 +- dlls/wined3d/wined3d_private.h | 46 +++--- 21 files changed, 644 insertions(+), 665 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a7f08a56f30310318df6…

13 years, 8 months

Henri Verbeet : wined3d: Implicit depth/stencil surfaces don' t have a container.

by Alexandre Julliard

Module: wine Branch: master Commit: c568916f9e372ea7191aa55413723bdb0bb6947e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c568916f9e372ea7191aa5541… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 30 20:29:48 2010 +0200 wined3d: Implicit depth/stencil surfaces don't have a container. They're owned by the device instead of the swapchain. --- dlls/d3d10core/device.c | 9 ++++----- dlls/d3d8/device.c | 9 ++++----- dlls/d3d9/device.c | 9 ++++----- dlls/ddraw/ddraw.c | 9 ++++----- dlls/wined3d/device.c | 1 - dlls/wined3d/swapchain.c | 2 +- include/wine/wined3d.idl | 1 - 7 files changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 32b8bb0..f5c4e82 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1374,18 +1374,17 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateRenderTarget(IWineD3DDevice } static HRESULT STDMETHODCALLTYPE device_parent_CreateDepthStencilSurface(IWineD3DDeviceParent *iface, - IUnknown *superior, UINT width, UINT height, enum wined3d_format_id format, - WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, - IWineD3DSurface **surface) + UINT width, UINT height, enum wined3d_format_id format, WINED3DMULTISAMPLE_TYPE multisample_type, + DWORD multisample_quality, BOOL discard, IWineD3DSurface **surface) { struct d3d10_device *This = device_from_device_parent(iface); struct d3d10_texture2d *texture; D3D10_TEXTURE2D_DESC desc; HRESULT hr; - FIXME("iface %p, superior %p, width %u, height %u, format %#x, multisample_type %#x,\n" + FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x,\n" "\tmultisample_quality %u, discard %u, surface %p partial stub!\n", - iface, superior, width, height, format, multisample_type, multisample_quality, discard, surface); + iface, width, height, format, multisample_type, multisample_quality, discard, surface); FIXME("Implement DXGI<->wined3d usage conversion\n"); diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index cafe27d..6d89a48 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2623,17 +2623,16 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateRenderTarget(IWineD3DDevice } static HRESULT STDMETHODCALLTYPE device_parent_CreateDepthStencilSurface(IWineD3DDeviceParent *iface, - IUnknown *superior, UINT width, UINT height, enum wined3d_format_id format, - WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, - IWineD3DSurface **surface) + UINT width, UINT height, enum wined3d_format_id format, WINED3DMULTISAMPLE_TYPE multisample_type, + DWORD multisample_quality, BOOL discard, IWineD3DSurface **surface) { struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); IDirect3DSurface8Impl *d3d_surface; HRESULT hr; - TRACE("iface %p, superior %p, width %u, height %u, format %#x, multisample_type %#x,\n" + TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x,\n" "\tmultisample_quality %u, discard %u, surface %p\n", - iface, superior, width, height, format, multisample_type, multisample_quality, discard, surface); + iface, width, height, format, multisample_type, multisample_quality, discard, surface); hr = IDirect3DDevice8_CreateDepthStencilSurface((IDirect3DDevice8 *)This, width, height, d3dformat_from_wined3dformat(format), multisample_type, (IDirect3DSurface8 **)&d3d_surface); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6b66bb2..7fab981 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2688,17 +2688,16 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateRenderTarget(IWineD3DDevice } static HRESULT STDMETHODCALLTYPE device_parent_CreateDepthStencilSurface(IWineD3DDeviceParent *iface, - IUnknown *superior, UINT width, UINT height, enum wined3d_format_id format, - WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, - IWineD3DSurface **surface) + UINT width, UINT height, enum wined3d_format_id format, WINED3DMULTISAMPLE_TYPE multisample_type, + DWORD multisample_quality, BOOL discard, IWineD3DSurface **surface) { struct IDirect3DDevice9Impl *This = device_from_device_parent(iface); IDirect3DSurface9Impl *d3d_surface; HRESULT hr; - TRACE("iface %p, superior %p, width %u, height %u, format %#x, multisample_type %#x,\n" + TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x,\n" "\tmultisample_quality %u, discard %u, surface %p\n", - iface, superior, width, height, format, multisample_type, multisample_quality, discard, surface); + iface, width, height, format, multisample_type, multisample_quality, discard, surface); hr = IDirect3DDevice9Impl_CreateDepthStencilSurface((IDirect3DDevice9Ex *)This, width, height, d3dformat_from_wined3dformat(format), multisample_type, multisample_quality, discard, diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index af5eb37..d250fb5 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5564,18 +5564,17 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateRenderTarget(IWineD3DDevice } static HRESULT STDMETHODCALLTYPE device_parent_CreateDepthStencilSurface(IWineD3DDeviceParent *iface, - IUnknown *superior, UINT width, UINT height, enum wined3d_format_id format, - WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, - IWineD3DSurface **surface) + UINT width, UINT height, enum wined3d_format_id format, WINED3DMULTISAMPLE_TYPE multisample_type, + DWORD multisample_quality, BOOL discard, IWineD3DSurface **surface) { struct IDirectDrawImpl *This = ddraw_from_device_parent(iface); IDirectDrawSurfaceImpl *ddraw_surface; DDSURFACEDESC2 ddsd; HRESULT hr; - TRACE("iface %p, superior %p, width %u, height %u, format %#x, multisample_type %#x,\n" + TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x,\n" "\tmultisample_quality %u, discard %u, surface %p\n", - iface, superior, width, height, format, multisample_type, multisample_quality, discard, surface); + iface, width, height, format, multisample_type, multisample_quality, discard, surface); *surface = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b4965d..bf28b9c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6265,7 +6265,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE TRACE("Creating the depth stencil buffer\n"); hrc = IWineD3DDeviceParent_CreateDepthStencilSurface(This->device_parent, - This->parent, pPresentationParameters->BackBufferWidth, pPresentationParameters->BackBufferHeight, pPresentationParameters->AutoDepthStencilFormat, diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 538899e..4fa7e64 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -856,7 +856,7 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface TRACE("Creating depth/stencil buffer.\n"); if (!device->auto_depth_stencil) { - hr = IWineD3DDeviceParent_CreateDepthStencilSurface(device->device_parent, parent, + hr = IWineD3DDeviceParent_CreateDepthStencilSurface(device->device_parent, swapchain->presentParms.BackBufferWidth, swapchain->presentParms.BackBufferHeight, swapchain->presentParms.AutoDepthStencilFormat, swapchain->presentParms.MultiSampleType, swapchain->presentParms.MultiSampleQuality, FALSE /* FIXME: Discard */, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 7f88b3a..bff4012 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2143,7 +2143,6 @@ interface IWineD3DDeviceParent : IUnknown ); HRESULT CreateDepthStencilSurface( - [in] IUnknown *superior, [in] UINT width, [in] UINT height, [in] enum wined3d_format_id format_id,

13 years, 8 months

Henri Verbeet : wined3d: Get rid of WINED3DRECT.

by Alexandre Julliard

Module: wine Branch: master Commit: 4005eb2a18e93d61b1bb3ea3d258e58078921f2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4005eb2a18e93d61b1bb3ea3d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 30 20:29:47 2010 +0200 wined3d: Get rid of WINED3DRECT. --- dlls/d3d8/device.c | 3 +-- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 3 +-- dlls/wined3d/device.c | 25 ++++++++++++------------- dlls/wined3d/surface.c | 2 +- include/wine/wined3d.idl | 12 ++---------- 6 files changed, 19 insertions(+), 31 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f889564..cafe27d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1069,9 +1069,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_Clear(LPDIRECT3DDEVICE8 iface, DWORD TRACE("iface %p, rect_count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %u.\n", iface, Count, pRects, Flags, Color, Z, Stencil); - /* Note: D3DRECT is compatible with WINED3DRECT */ wined3d_mutex_lock(); - hr = IWineD3DDevice_Clear(This->WineD3DDevice, Count, (CONST WINED3DRECT*) pRects, Flags, Color, Z, Stencil); + hr = IWineD3DDevice_Clear(This->WineD3DDevice, Count, (const RECT *)pRects, Flags, Color, Z, Stencil); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f5bcbaa..6b66bb2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1044,8 +1044,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(IDirect3DDevice9Ex *iface, } /* Colorfill can only be used on rendertarget surfaces, or offscreen plain surfaces in D3DPOOL_DEFAULT */ - /* Note: D3DRECT is compatible with WINED3DRECT */ - hr = IWineD3DDevice_ColorFill(This->WineD3DDevice, surface->wineD3DSurface, (const WINED3DRECT *)pRect, &c); + hr = IWineD3DDevice_ColorFill(This->WineD3DDevice, surface->wineD3DSurface, pRect, &c); wined3d_mutex_unlock(); @@ -1214,7 +1213,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_Clear(LPDIRECT3DDEVICE9EX iface, DW /* Note: D3DRECT is compatible with WINED3DRECT */ wined3d_mutex_lock(); - hr = IWineD3DDevice_Clear(This->WineD3DDevice, Count, (CONST WINED3DRECT*) pRects, Flags, Color, Z, Stencil); + hr = IWineD3DDevice_Clear(This->WineD3DDevice, Count, (const RECT *)pRects, Flags, Color, Z, Stencil); wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4677f6e..7837dcd 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5220,9 +5220,8 @@ IDirect3DDeviceImpl_7_Clear(IDirect3DDevice7 *iface, TRACE("iface %p, count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %#x.\n", iface, Count, Rects, Flags, Color, Z, Stencil); - /* Note; D3DRECT is compatible with WINED3DRECT */ EnterCriticalSection(&ddraw_cs); - hr = IWineD3DDevice_Clear(This->wineD3DDevice, Count, (WINED3DRECT*) Rects, Flags, Color, Z, Stencil); + hr = IWineD3DDevice_Clear(This->wineD3DDevice, Count, (RECT *)Rects, Flags, Color, Z, Stencil); LeaveCriticalSection(&ddraw_cs); return hr; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a90ad80..9b4965d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4576,28 +4576,27 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Present(IWineD3DDevice *iface, return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Count, - const WINED3DRECT *pRects, DWORD Flags, WINED3DCOLOR color, float Z, DWORD Stencil) +static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD rect_count, + const RECT *rects, DWORD flags, WINED3DCOLOR color, float depth, DWORD stencil) { const WINED3DCOLORVALUE c = {D3DCOLOR_R(color), D3DCOLOR_G(color), D3DCOLOR_B(color), D3DCOLOR_A(color)}; - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)iface; RECT draw_rect; - TRACE("(%p) Count (%d), pRects (%p), Flags (%x), color (0x%08x), Z (%f), Stencil (%d)\n", This, - Count, pRects, Flags, color, Z, Stencil); + TRACE("iface %p, rect_count %u, rects %p, flags %#x, color 0x%08x, depth %.8e, stencil %u.\n", + iface, rect_count, rects, flags, color, depth, stencil); - if (Flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL) && !This->depth_stencil) + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL) && !device->depth_stencil) { WARN("Clearing depth and/or stencil without a depth stencil buffer attached, returning WINED3DERR_INVALIDCALL\n"); /* TODO: What about depth stencil buffers without stencil bits? */ return WINED3DERR_INVALIDCALL; } - device_get_draw_rect(This, &draw_rect); + device_get_draw_rect(device, &draw_rect); - return device_clear_render_targets(This, This->adapter->gl_info.limits.buffers, - This->render_targets, Count, (const RECT *)pRects, &draw_rect, Flags, - &c, Z, Stencil); + return device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, + device->render_targets, rect_count, rects, &draw_rect, flags, &c, depth, stencil); } /***** @@ -5497,12 +5496,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DeletePatch(IWineD3DDevice *iface, UINT } static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, - IWineD3DSurface *surface, const WINED3DRECT *pRect, const WINED3DCOLORVALUE *color) + IWineD3DSurface *surface, const RECT *rect, const WINED3DCOLORVALUE *color) { IWineD3DSurfaceImpl *s = (IWineD3DSurfaceImpl *)surface; TRACE("iface %p, surface %p, rect %s, color {%.8e, %.8e, %.8e, %.8e}.\n", - iface, surface, wine_dbgstr_rect((const RECT *)pRect), + iface, surface, wine_dbgstr_rect(rect), color->r, color->g, color->b, color->a); if (s->resource.pool != WINED3DPOOL_DEFAULT && s->resource.pool != WINED3DPOOL_SYSTEMMEM) @@ -5511,7 +5510,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, return WINED3DERR_INVALIDCALL; } - return surface_color_fill(s, (const RECT *)pRect, color); + return surface_color_fill(s, rect, color); } static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *iface, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0731fb8..1cc5dbd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3790,7 +3790,7 @@ static HRESULT IWineD3DSurfaceImpl_BltZ(IWineD3DSurfaceImpl *This, const RECT *D ERR("Unexpected format for depth fill: %s.\n", debug_d3dformat(This->resource.format_desc->id)); } - return IWineD3DDevice_Clear((IWineD3DDevice *)device, DestRect ? 1 : 0, (const WINED3DRECT *)DestRect, + return IWineD3DDevice_Clear((IWineD3DDevice *)device, DestRect ? 1 : 0, DestRect, WINED3DCLEAR_ZBUFFER, 0x00000000, depth, 0x00000000); } diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 62810db..7f88b3a 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -1573,14 +1573,6 @@ typedef struct _WINED3DMATRIX } DUMMYUNIONNAME; } WINED3DMATRIX; -typedef struct _WINED3DRECT -{ - LONG x1; - LONG y1; - LONG x2; - LONG y2; -} WINED3DRECT; - typedef struct _WINED3DLIGHT { WINED3DLIGHTTYPE Type; @@ -3305,7 +3297,7 @@ interface IWineD3DDevice : IWineD3DBase ); HRESULT Clear( [in] DWORD rect_count, - [in] const WINED3DRECT *rects, + [in] const RECT *rects, [in] DWORD flags, [in] WINED3DCOLOR color, [in] float z, @@ -3367,7 +3359,7 @@ interface IWineD3DDevice : IWineD3DBase ); HRESULT ColorFill( [in] IWineD3DSurface *surface, - [in] const WINED3DRECT *rect, + [in] const RECT *rect, [in] const WINED3DCOLORVALUE *color ); HRESULT UpdateTexture(

13 years, 8 months

Henri Verbeet : wined3d: Use debug_surflocation() in surface_load_location( ).

by Alexandre Julliard

Module: wine Branch: master Commit: 1bf25cfe3fa87c86a049853635d6defa5b7dd3f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf25cfe3fa87c86a04985363… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 30 20:29:46 2010 +0200 wined3d: Use debug_surflocation() in surface_load_location(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9e4fc7c..0731fb8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4386,7 +4386,7 @@ HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RE } else { - FIXME("Unimplemented location %#x for depth/stencil buffers.\n", flag); + FIXME("Unimplemented location %s for depth/stencil buffers.\n", debug_surflocation(flag)); return WINED3DERR_INVALIDCALL; } }

13 years, 8 months

Henri Verbeet : wined3d: Recognize some more Radeon cards.

by Alexandre Julliard

Module: wine Branch: master Commit: 29371bf964e7bea3007d4daff8454947212b24a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29371bf964e7bea3007d4daff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 30 20:29:45 2010 +0200 wined3d: Recognize some more Radeon cards. --- dlls/wined3d/directx.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ae9667c..9c85dca 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1245,7 +1245,11 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s if (strstr(gl_vendor_string, "ATI") || strstr(gl_vendor_string, "Advanced Micro Devices, Inc.") || strstr(gl_vendor_string, "X.Org R300 Project") - || strstr(gl_vendor_string, "DRI R300 Project")) + || strstr(gl_renderer, "R100") + || strstr(gl_renderer, "R200") + || strstr(gl_renderer, "R300") + || strstr(gl_renderer, "R600") + || strstr(gl_renderer, "R700")) return HW_VENDOR_ATI; if (strstr(gl_vendor_string, "Intel(R)")

13 years, 8 months

Owen Rudge : d3dx9: Implement missing D3DXCreateTextureFromFile functions.

by Alexandre Julliard

Module: wine Branch: master Commit: ae695bdfaaea2b114938ff92210a14f5748f7da7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae695bdfaaea2b114938ff922… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Aug 30 11:57:42 2010 -0500 d3dx9: Implement missing D3DXCreateTextureFromFile functions. --- dlls/d3dx9_36/d3dx9_36.spec | 10 +++--- dlls/d3dx9_36/texture.c | 64 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 691f2ec..c6c57fa 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -93,12 +93,12 @@ @ stub D3DXCreateTextA @ stub D3DXCreateTextW @ stdcall D3DXCreateTexture(ptr long long long long long long ptr) -@ stdcall D3DXCreateTextureFromFileA(ptr ptr ptr) -@ stub D3DXCreateTextureFromFileExA -@ stdcall D3DXCreateTextureFromFileExW(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stub D3DXCreateTextureFromFileInMemory +@ stdcall D3DXCreateTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateTextureFromFileExA(ptr str long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateTextureFromFileExW(ptr wstr long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stub D3DXCreateTextureFromFileW +@ stdcall D3DXCreateTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateTextureFromResourceA @ stub D3DXCreateTextureFromResourceExA @ stub D3DXCreateTextureFromResourceExW diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 8895a8f..4c4bc91 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/unicode.h" #include "wine/debug.h" #include "d3dx9_36_private.h" @@ -289,6 +290,17 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, return E_NOTIMPL; } +HRESULT WINAPI D3DXCreateTextureFromFileInMemory(LPDIRECT3DDEVICE9 device, + LPCVOID srcdata, + UINT srcdatasize, + LPDIRECT3DTEXTURE9 *texture) +{ + TRACE("(%p, %p, %d, %p)\n", device, srcdata, srcdatasize, texture); + + return D3DXCreateTextureFromFileInMemoryEx(device, srcdata, srcdatasize, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, + D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, texture); +} + HRESULT WINAPI D3DXCreateTextureFromFileExW(LPDIRECT3DDEVICE9 device, LPCWSTR srcfile, UINT width, @@ -326,11 +338,59 @@ HRESULT WINAPI D3DXCreateTextureFromFileExW(LPDIRECT3DDEVICE9 device, return hr; } +HRESULT WINAPI D3DXCreateTextureFromFileExA(LPDIRECT3DDEVICE9 device, + LPCSTR srcfile, + UINT width, + UINT height, + UINT miplevels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + DWORD filter, + DWORD mipfilter, + D3DCOLOR colorkey, + D3DXIMAGE_INFO *srcinfo, + PALETTEENTRY *palette, + LPDIRECT3DTEXTURE9 *texture) +{ + LPWSTR widename; + HRESULT hr; + DWORD len; + + TRACE("(%p, %p, %u, %u, %u, %x, %x, %x, %u, %u, %x, %p, %p, %p): relay\n", device, debugstr_a(srcfile), width, + height, miplevels, usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture); + + if (!device || !srcfile || !texture) + return D3DERR_INVALIDCALL; + + len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0); + widename = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, srcfile, -1, widename, len); + + hr = D3DXCreateTextureFromFileExW(device, widename, width, height, miplevels, + usage, format, pool, filter, mipfilter, + colorkey, srcinfo, palette, texture); + + HeapFree(GetProcessHeap(), 0, widename); + return hr; +} + HRESULT WINAPI D3DXCreateTextureFromFileA(LPDIRECT3DDEVICE9 device, LPCSTR srcfile, LPDIRECT3DTEXTURE9 *texture) { - FIXME("(%p, %s, %p): stub\n", device, debugstr_a(srcfile), texture); + TRACE("(%p, %s, %p)\n", device, debugstr_a(srcfile), texture); - return E_NOTIMPL; + return D3DXCreateTextureFromFileExA(device, srcfile, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, + D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, texture); +} + +HRESULT WINAPI D3DXCreateTextureFromFileW(LPDIRECT3DDEVICE9 device, + LPCWSTR srcfile, + LPDIRECT3DTEXTURE9 *texture) +{ + TRACE("(%p, %s, %p)\n", device, debugstr_w(srcfile), texture); + + return D3DXCreateTextureFromFileExW(device, srcfile, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, + D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, texture); }

13 years, 8 months

Piotr Caban : msvcp90/tests: Added basic_string<wchar_t> tests.

by Alexandre Julliard

Module: wine Branch: master Commit: 39b98144c7e01a727fc1a27aaf4025012a347f19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b98144c7e01a727fc1a27aa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 30 16:36:07 2010 +0200 msvcp90/tests: Added basic_string<wchar_t> tests. --- dlls/msvcp90/tests/string.c | 114 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 113 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 1eae95d..f780779 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -27,7 +27,7 @@ typedef struct _basic_string_char { void *allocator; - union _data { + union { char buf[BUF_SIZE_CHAR]; char *ptr; } data; @@ -35,6 +35,19 @@ typedef struct _basic_string_char size_t res; } basic_string_char; +/* basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t>> */ +#define BUF_SIZE_WCHAR 8 +typedef struct _basic_string_wchar +{ + void *allocator; + union { + wchar_t buf[BUF_SIZE_WCHAR]; + wchar_t *ptr; + } data; + size_t size; + size_t res; +} basic_string_wchar; + static void* (__cdecl *p_set_invalid_parameter_handler)(void*); #ifdef __i386__ @@ -45,6 +58,14 @@ static void (WINAPI *p_basic_string_char_dtor)(void); static basic_string_char* (WINAPI *p_basic_string_char_erase)(size_t, size_t); static basic_string_char* (WINAPI *p_basic_string_char_assign_cstr_len)(const char*, size_t); static const char* (WINAPI *p_basic_string_char_cstr)(void); + +static basic_string_wchar* (WINAPI *p_basic_string_wchar_ctor)(void); +static basic_string_wchar* (WINAPI *p_basic_string_wchar_copy_ctor)(basic_string_wchar*); +static basic_string_wchar* (WINAPI *p_basic_string_wchar_ctor_cstr)(const wchar_t*); +static void (WINAPI *p_basic_string_wchar_dtor)(void); +static basic_string_wchar* (WINAPI *p_basic_string_wchar_erase)(size_t, size_t); +static basic_string_wchar* (WINAPI *p_basic_string_wchar_assign_cstr_len)(const wchar_t*, size_t); +static const wchar_t* (WINAPI *p_basic_string_wchar_cstr)(void); #else static basic_string_char* (__cdecl *p_basic_string_char_ctor)(basic_string_char*); static basic_string_char* (__cdecl *p_basic_string_char_copy_ctor)(basic_string_char*, basic_string_char*); @@ -53,6 +74,14 @@ static void (__cdecl *p_basic_string_char_dtor)(basic_string_char*); static basic_string_char* (__cdecl *p_basic_string_char_erase)(basic_string_char*, size_t, size_t); static basic_string_char* (__cdecl *p_basic_string_char_assign_cstr_len)(basic_string_char*, const char*, size_t); static const char* (__cdecl *p_basic_string_char_cstr)(basic_string_char*); + +static basic_string_wchar* (__cdecl *p_basic_string_wchar_ctor)(basic_string_wchar*); +static basic_string_wchar* (__cdecl *p_basic_string_wchar_copy_ctor)(basic_string_wchar*, basic_string_wchar*); +static basic_string_wchar* (__cdecl *p_basic_string_wchar_ctor_cstr)(basic_string_wchar*, const wchar_t*); +static void (__cdecl *p_basic_string_wchar_dtor)(basic_string_wchar*); +static basic_string_wchar* (__cdecl *p_basic_string_wchar_erase)(basic_string_wchar*, size_t, size_t); +static basic_string_wchar* (__cdecl *p_basic_string_wchar_assign_cstr_len)(basic_string_wchar*, const wchar_t*, size_t); +static const wchar_t* (__cdecl *p_basic_string_wchar_cstr)(basic_string_wchar*); #endif static int invalid_parameter = 0; @@ -199,6 +228,21 @@ static BOOL init(void) "?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD_K@Z"); p_basic_string_char_cstr = (void*)GetProcAddress(msvcp, "?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ"); + + p_basic_string_wchar_ctor = (void*)GetProcAddress(msvcp, + "??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@XZ"); + p_basic_string_wchar_copy_ctor = (void*)GetProcAddress(msvcp, + "??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV01@@Z"); + p_basic_string_wchar_ctor_cstr = (void*)GetProcAddress(msvcp, + "??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@PEB_W@Z"); + p_basic_string_wchar_dtor = (void*)GetProcAddress(msvcp, + "??1?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@XZ"); + p_basic_string_wchar_erase = (void*)GetProcAddress(msvcp, + "?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@_K0@Z"); + p_basic_string_wchar_assign_cstr_len = (void*)GetProcAddress(msvcp, + "?assign@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@PEB_W_K@Z"); + p_basic_string_wchar_cstr = (void*)GetProcAddress(msvcp, + "?c_str@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAPEB_WXZ"); } else { p_basic_string_char_ctor = (void*)GetProcAddress(msvcp, "??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ"); @@ -214,6 +258,21 @@ static BOOL init(void) "?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBDI@Z"); p_basic_string_char_cstr = (void*)GetProcAddress(msvcp, "?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ"); + + p_basic_string_wchar_ctor = (void*)GetProcAddress(msvcp, + "??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@XZ"); + p_basic_string_wchar_copy_ctor = (void*)GetProcAddress(msvcp, + "??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@ABV01@@Z"); + p_basic_string_wchar_ctor_cstr = (void*)GetProcAddress(msvcp, + "??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@PB_W@Z"); + p_basic_string_wchar_dtor = (void*)GetProcAddress(msvcp, + "??1?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@XZ"); + p_basic_string_wchar_erase = (void*)GetProcAddress(msvcp, + "?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@II@Z"); + p_basic_string_wchar_assign_cstr_len = (void*)GetProcAddress(msvcp, + "?assign@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@PB_WI@Z"); + p_basic_string_wchar_cstr = (void*)GetProcAddress(msvcp, + "?c_str@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEPB_WXZ"); } return TRUE; @@ -268,12 +327,65 @@ static void test_basic_string_char(void) { call_func1(p_basic_string_char_dtor, &str2); } +static void test_basic_string_wchar(void) { + static const wchar_t test[] = { 't','e','s','t',0 }; + + basic_string_wchar str1, str2, *pstr; + const wchar_t *str; + + if(!p_basic_string_wchar_ctor || !p_basic_string_wchar_copy_ctor + || !p_basic_string_wchar_ctor_cstr || !p_basic_string_wchar_dtor + || !p_basic_string_wchar_erase || !p_basic_string_wchar_assign_cstr_len + || !p_basic_string_wchar_cstr) { + win_skip("basic_string<wchar_t> unavailable\n"); + return; + } + + call_func1(p_basic_string_wchar_ctor, &str1); + str = NULL; + str = call_func1(p_basic_string_wchar_cstr, &str1); + ok(str != NULL, "str = NULL\n"); + ok(*str == '\0', "*str = %c\n", *str); + call_func1(p_basic_string_wchar_dtor, &str1); + + pstr = call_func2(p_basic_string_wchar_ctor_cstr, &str1, test); + ok(pstr == &str1, "pstr != &str1\n"); + str = call_func1(p_basic_string_wchar_cstr, &str1); + ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + + memset(&str2, 0, sizeof(basic_string_wchar)); + pstr = call_func2(p_basic_string_wchar_copy_ctor, &str2, &str1); + ok(pstr == &str2, "pstr != &str2\n"); + str = call_func1(p_basic_string_wchar_cstr, &str2); + ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + + call_func3(p_basic_string_wchar_erase, &str2, 1, 2); + str = call_func1(p_basic_string_wchar_cstr, &str2); + ok(str[0]=='t' && str[1]=='t' && str[2]=='\0', "str = %s\n", wine_dbgstr_w(str)); + + call_func3(p_basic_string_wchar_erase, &str2, 1, 100); + str = call_func1(p_basic_string_wchar_cstr, &str2); + ok(str[0]=='t' && str[1]=='\0', "str = %s\n", wine_dbgstr_w(str)); + + call_func3(p_basic_string_wchar_assign_cstr_len, &str2, test, 4); + str = call_func1(p_basic_string_wchar_cstr, &str2); + ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + + call_func3(p_basic_string_wchar_assign_cstr_len, &str2, (str+1), 2); + str = call_func1(p_basic_string_wchar_cstr, &str2); + ok(str[0]=='e' && str[1]=='s' && str[2]=='\0', "str = %s\n", wine_dbgstr_w(str)); + + call_func1(p_basic_string_wchar_dtor, &str1); + call_func1(p_basic_string_wchar_dtor, &str2); +} + START_TEST(string) { if(!init()) return; test_basic_string_char(); + test_basic_string_wchar(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); }

13 years, 8 months

Piotr Caban : msvcp90: Added partiall basic_string<wchar_t> implementation.

by Alexandre Julliard

Module: wine Branch: master Commit: 04f4b8a3d9f011929f2898fd6092e20f6fc91e23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f4b8a3d9f011929f2898fd6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 30 16:35:30 2010 +0200 msvcp90: Added partiall basic_string<wchar_t> implementation. --- dlls/msvcp80/msvcp80.spec | 46 ++++---- dlls/msvcp90/msvcp90.h | 16 +++- dlls/msvcp90/msvcp90.spec | 50 +++++----- dlls/msvcp90/string.c | 249 ++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 311 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04f4b8a3d9f011929f289…

13 years, 8 months

← Newer
1
2
3
4
5
6
7
8
...
89
Older →

Jump to page:

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 August 2010