September 2013 - Wine-commits

Stefan Dösinger : wined3d: Use GL_APPLE_client_storage for volumes if available.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 556e3e0c764ee5eff1eb02b97a01d4141d6ec58f URL: http://source.winehq.org/git/wine.git/?a=commit;h=556e3e0c764ee5eff1eb02b97… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 23 13:29:16 2013 +0200 wined3d: Use GL_APPLE_client_storage for volumes if available. --- dlls/wined3d/volume.c | 53 +++++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 7be0811..d61f32f 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -57,18 +57,48 @@ void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture volume->container = container; } +static BOOL volume_prepare_system_memory(struct wined3d_volume *volume) +{ + if (volume->resource.heap_memory) + return TRUE; + + if (!wined3d_resource_allocate_sysmem(&volume->resource)) + { + ERR("Failed to allocate system memory.\n"); + return FALSE; + } + return TRUE; +} + /* Context activation is done by the caller. */ -static void wined3d_volume_allocate_texture(const struct wined3d_volume *volume, +static void wined3d_volume_allocate_texture(struct wined3d_volume *volume, const struct wined3d_context *context, BOOL srgb) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format *format = volume->resource.format; + void *mem = NULL; + + if (gl_info->supported[APPLE_CLIENT_STORAGE] && !format->convert + && volume_prepare_system_memory(volume)) + { + TRACE("Enabling GL_UNPACK_CLIENT_STORAGE_APPLE for volume %p\n", volume); + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)"); + mem = volume->resource.heap_memory; + volume->flags |= WINED3D_VFLAG_CLIENT_STORAGE; + } GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, volume->texture_level, srgb ? format->glGammaInternal : format->glInternal, volume->resource.width, volume->resource.height, volume->resource.depth, - 0, format->glFormat, format->glType, NULL)); + 0, format->glFormat, format->glType, mem)); checkGLcall("glTexImage3D"); + + if (mem) + { + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); + } } static void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pitch, @@ -261,6 +291,8 @@ static BOOL wined3d_volume_can_evict(const struct wined3d_volume *volume) return FALSE; if (volume->resource.format->convert) return FALSE; + if (volume->flags & WINED3D_VFLAG_CLIENT_STORAGE) + return FALSE; return TRUE; } @@ -452,20 +484,6 @@ static void wined3d_volume_free_pbo(struct wined3d_volume *volume) context_release(context); } -static BOOL volume_prepare_system_memory(struct wined3d_volume *volume) -{ - if (volume->resource.heap_memory) - return TRUE; - - if (!wined3d_resource_allocate_sysmem(&volume->resource)) - { - ERR("Failed to allocate system memory.\n"); - return FALSE; - } - return TRUE; -} - - static void volume_unload(struct wined3d_resource *resource) { struct wined3d_volume *volume = volume_from_resource(resource); @@ -501,7 +519,8 @@ static void volume_unload(struct wined3d_resource *resource) } /* The texture name is managed by the container. */ - volume->flags &= ~(WINED3D_VFLAG_ALLOCATED | WINED3D_VFLAG_SRGB_ALLOCATED); + volume->flags &= ~(WINED3D_VFLAG_ALLOCATED | WINED3D_VFLAG_SRGB_ALLOCATED + | WINED3D_VFLAG_CLIENT_STORAGE); resource_unload(resource); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 02c7aff..5525dd9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2114,6 +2114,7 @@ void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; #define WINED3D_VFLAG_ALLOCATED 0x00000001 #define WINED3D_VFLAG_SRGB_ALLOCATED 0x00000002 #define WINED3D_VFLAG_PBO 0x00000004 +#define WINED3D_VFLAG_CLIENT_STORAGE 0x00000008 #define WINED3D_LOCATION_DISCARDED 0x00000001 #define WINED3D_LOCATION_SYSMEM 0x00000002

1 0

Henri Verbeet : wined3d: Introduce a separate function for updating the viewport and scissor rects.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 864b25e58297f79c3c7f8e4ca349499265fbd9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=864b25e58297f79c3c7f8e4ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 23 10:26:44 2013 +0200 wined3d: Introduce a separate function for updating the viewport and scissor rects. --- dlls/wined3d/device.c | 21 +++++++++++++++++++++ dlls/wined3d/stateblock.c | 17 ----------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 58c3db1..158305b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -827,6 +827,23 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) InterlockedExchangePointer((void **)&device->focus_window, NULL); } +static void device_reset_viewport_scissor(struct wined3d_device *device, UINT width, UINT height) +{ + struct wined3d_state *state = &device->state; + + state->viewport.x = 0; + state->viewport.y = 0; + state->viewport.width = width; + state->viewport.height = height; + state->viewport.min_z = 0.0f; + state->viewport.max_z = 1.0f; + + state->scissor_rect.left = 0; + state->scissor_rect.top = 0; + state->scissor_rect.right = width; + state->scissor_rect.bottom = height; +} + HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc) { @@ -895,6 +912,8 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, /* Setup all the devices defaults */ state_init_default(&device->state, device); + device_reset_viewport_scissor(device, swapchain->desc.backbuffer_width, + swapchain->desc.backbuffer_height); context = context_acquire(device, swapchain->front_buffer); @@ -4704,6 +4723,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (FAILED(hr = state_init(&device->state, &device->adapter->d3d_info))) ERR("Failed to initialize device state, hr %#x.\n", hr); state_init_default(&device->state, device); + device_reset_viewport_scissor(device, swapchain->desc.backbuffer_width, + swapchain->desc.backbuffer_height); device->update_state = &device->state; } else diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c2a5208..c593a63 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1181,7 +1181,6 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi DWORD d; } tmpfloat; unsigned int i; - struct wined3d_swapchain_desc *swapchain_desc; static const struct wined3d_matrix identity = {{{ 1.0f, 0.0f, 0.0f, 0.0f, @@ -1384,22 +1383,6 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi { state->textures[i] = NULL; } - - swapchain_desc = &device->swapchains[0]->desc; - - /* Set the default scissor rect values */ - state->scissor_rect.left = 0; - state->scissor_rect.right = swapchain_desc->backbuffer_width; - state->scissor_rect.top = 0; - state->scissor_rect.bottom = swapchain_desc->backbuffer_height; - - /* Set the default viewport */ - state->viewport.x = 0; - state->viewport.y = 0; - state->viewport.width = swapchain_desc->backbuffer_width; - state->viewport.height = swapchain_desc->backbuffer_height; - state->viewport.min_z = 0.0f; - state->viewport.max_z = 1.0f; } static HRESULT stateblock_init(struct wined3d_stateblock *stateblock,

1 0

Henri Verbeet : wined3d: Copy some missing fields to the new swapchain desc in wined3d_device_reset ().
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: bff80b8bab25aee0cd25e1b10f1edbd7b2091631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff80b8bab25aee0cd25e1b10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 23 10:26:45 2013 +0200 wined3d: Copy some missing fields to the new swapchain desc in wined3d_device_reset(). The ones that matter are enable_auto_depth_stencil and auto_depth_stencil_format. auto_restore_display_mode should never change in practice. --- dlls/wined3d/device.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 158305b..9c3200e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4505,9 +4505,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, /* No special treatment of these parameters. Just store them */ swapchain->desc.swap_effect = swapchain_desc->swap_effect; + swapchain->desc.enable_auto_depth_stencil = swapchain_desc->enable_auto_depth_stencil; + swapchain->desc.auto_depth_stencil_format = swapchain_desc->auto_depth_stencil_format; swapchain->desc.flags = swapchain_desc->flags; - swapchain->desc.swap_interval = swapchain_desc->swap_interval; swapchain->desc.refresh_rate = swapchain_desc->refresh_rate; + swapchain->desc.swap_interval = swapchain_desc->swap_interval; + swapchain->desc.auto_restore_display_mode = swapchain_desc->auto_restore_display_mode; /* What to do about these? */ if (swapchain_desc->backbuffer_count

1 0

Henri Verbeet : d3drm: Avoid VOID.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 7a0390d85a4ffbcdc7265764166472667ae169b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0390d85a4ffbcdc72657641… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 23 10:26:47 2013 +0200 d3drm: Avoid VOID. --- dlls/d3drm/frame.c | 43 +++++++++++++++---------------------------- include/d3drmobj.h | 14 +++++++------- 2 files changed, 22 insertions(+), 35 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 33dfb65..6cd6c0e 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -606,12 +606,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddLight(IDirect3DRMFrame2 *iface, I return IDirect3DRMFrame3_AddLight(&This->IDirect3DRMFrame3_iface, light); } -static HRESULT WINAPI IDirect3DRMFrame2Impl_AddMoveCallback(IDirect3DRMFrame2* iface, - D3DRMFRAMEMOVECALLBACK cb, VOID *arg) +static HRESULT WINAPI IDirect3DRMFrame2Impl_AddMoveCallback(IDirect3DRMFrame2 *iface, + D3DRMFRAMEMOVECALLBACK cb, void *ctx) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - - FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, cb, arg); + FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); return E_NOTIMPL; } @@ -910,12 +908,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteLight(IDirect3DRMFrame2 *iface return IDirect3DRMFrame3_DeleteLight(&This->IDirect3DRMFrame3_iface, light); } -static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteMoveCallback(IDirect3DRMFrame2* iface, - D3DRMFRAMEMOVECALLBACK cb, VOID *arg) +static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteMoveCallback(IDirect3DRMFrame2 *iface, + D3DRMFRAMEMOVECALLBACK cb, void *ctx) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - - FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, cb, arg); + FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); return E_NOTIMPL; } @@ -1187,13 +1183,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_Transform(IDirect3DRMFrame2* iface, } /*** IDirect3DRMFrame2 methods ***/ -static HRESULT WINAPI IDirect3DRMFrame2Impl_AddMoveCallback2(IDirect3DRMFrame2* iface, - D3DRMFRAMEMOVECALLBACK cb, VOID *arg, - DWORD flags) +static HRESULT WINAPI IDirect3DRMFrame2Impl_AddMoveCallback2(IDirect3DRMFrame2 *iface, + D3DRMFRAMEMOVECALLBACK cb, void *ctx, DWORD flags) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - - FIXME("(%p/%p)->(%p,%p,%u): stub\n", iface, This, cb, arg, flags); + FIXME("iface %p, cb %p, ctx %p, flags %#x stub!\n", iface, cb, ctx, flags); return E_NOTIMPL; } @@ -1527,13 +1520,10 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_AddLight(IDirect3DRMFrame3 *iface, I return D3DRM_OK; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_AddMoveCallback(IDirect3DRMFrame3* iface, - D3DRMFRAME3MOVECALLBACK cb, VOID *arg, - DWORD flags) +static HRESULT WINAPI IDirect3DRMFrame3Impl_AddMoveCallback(IDirect3DRMFrame3 *iface, + D3DRMFRAME3MOVECALLBACK cb, void *ctx, DWORD flags) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - - FIXME("(%p/%p)->(%p,%p,%u): stub\n", iface, This, cb, arg, flags); + FIXME("iface %p, cb %p, ctx %p flags %#x stub!\n", iface, cb, ctx, flags); return E_NOTIMPL; } @@ -1922,13 +1912,10 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteLight(IDirect3DRMFrame3 *iface return D3DRM_OK; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteMoveCallback(IDirect3DRMFrame3* iface, - D3DRMFRAME3MOVECALLBACK cb, - VOID *arg) +static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteMoveCallback(IDirect3DRMFrame3 *iface, + D3DRMFRAME3MOVECALLBACK cb, void *ctx) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - - FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, cb, arg); + FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); return E_NOTIMPL; } diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 89198f8..f0ab369 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -1098,7 +1098,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual) /*** IDirect3DRMFrame methods ***/ STDMETHOD(AddChild)(THIS_ IDirect3DRMFrame *child) PURE; STDMETHOD(AddLight)(THIS_ struct IDirect3DRMLight *light) PURE; - STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg) PURE; + STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK cb, void *ctx) PURE; STDMETHOD(AddTransform)(THIS_ D3DRMCOMBINETYPE, D3DRMMATRIX4D) PURE; STDMETHOD(AddTranslation)(THIS_ D3DRMCOMBINETYPE, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD(AddScale)(THIS_ D3DRMCOMBINETYPE, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) PURE; @@ -1127,7 +1127,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual) STDMETHOD(Move)(THIS_ D3DVALUE delta) PURE; STDMETHOD(DeleteChild)(THIS_ IDirect3DRMFrame *child) PURE; STDMETHOD(DeleteLight)(THIS_ struct IDirect3DRMLight *light) PURE; - STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg) PURE; + STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteVisual)(THIS_ IDirect3DRMVisual *visual) PURE; STDMETHOD_(D3DCOLOR, GetSceneBackground)(THIS) PURE; STDMETHOD(GetSceneBackgroundDepth)(THIS_ IDirectDrawSurface **surface) PURE; @@ -1331,7 +1331,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) /*** IDirect3DRMFrame methods ***/ STDMETHOD(AddChild)(THIS_ IDirect3DRMFrame *child) PURE; STDMETHOD(AddLight)(THIS_ struct IDirect3DRMLight *light) PURE; - STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg) PURE; + STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK cb, void *ctx) PURE; STDMETHOD(AddTransform)(THIS_ D3DRMCOMBINETYPE, D3DRMMATRIX4D) PURE; STDMETHOD(AddTranslation)(THIS_ D3DRMCOMBINETYPE, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD(AddScale)(THIS_ D3DRMCOMBINETYPE, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) PURE; @@ -1360,7 +1360,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(Move)(THIS_ D3DVALUE delta) PURE; STDMETHOD(DeleteChild)(THIS_ IDirect3DRMFrame *child) PURE; STDMETHOD(DeleteLight)(THIS_ struct IDirect3DRMLight *light) PURE; - STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg) PURE; + STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteVisual)(THIS_ IDirect3DRMVisual *visual) PURE; STDMETHOD_(D3DCOLOR, GetSceneBackground)(THIS) PURE; STDMETHOD(GetSceneBackgroundDepth)(THIS_ IDirectDrawSurface **surface) PURE; @@ -1392,7 +1392,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(SetZbufferMode)(THIS_ D3DRMZBUFFERMODE) PURE; STDMETHOD(Transform)(THIS_ D3DVECTOR *d, D3DVECTOR *s) PURE; /*** IDirect3DRMFrame2 methods ***/ - STDMETHOD(AddMoveCallback2)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg, DWORD flags) PURE; + STDMETHOD(AddMoveCallback2)(THIS_ D3DRMFRAMEMOVECALLBACK cb, void *ctx, DWORD flags) PURE; STDMETHOD(GetBox)(THIS_ D3DRMBOX *box) PURE; STDMETHOD_(BOOL, GetBoxEnable)(THIS) PURE; STDMETHOD(GetAxes)(THIS_ D3DVECTOR *dir, D3DVECTOR *up); @@ -1613,7 +1613,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) /*** IDirect3DRMFrame3 methods ***/ STDMETHOD(AddChild)(THIS_ IDirect3DRMFrame3 *child) PURE; STDMETHOD(AddLight)(THIS_ struct IDirect3DRMLight *light) PURE; - STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAME3MOVECALLBACK, VOID *arg, DWORD flags) PURE; + STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAME3MOVECALLBACK cb, void *ctx, DWORD flags) PURE; STDMETHOD(AddTransform)(THIS_ D3DRMCOMBINETYPE, D3DRMMATRIX4D) PURE; STDMETHOD(AddTranslation)(THIS_ D3DRMCOMBINETYPE, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD(AddScale)(THIS_ D3DRMCOMBINETYPE, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) PURE; @@ -1641,7 +1641,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) STDMETHOD(Move)(THIS_ D3DVALUE delta) PURE; STDMETHOD(DeleteChild)(THIS_ IDirect3DRMFrame3 *child) PURE; STDMETHOD(DeleteLight)(THIS_ struct IDirect3DRMLight *light) PURE; - STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAME3MOVECALLBACK, VOID *arg) PURE; + STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAME3MOVECALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteVisual)(THIS_ IUnknown *visual) PURE; STDMETHOD_(D3DCOLOR, GetSceneBackground)(THIS) PURE; STDMETHOD(GetSceneBackgroundDepth)(THIS_ IDirectDrawSurface **surface) PURE;

1 0

Henri Verbeet : ddraw: Avoid VOID.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: e02de5ff16fc554ab35f42bbce6bc835a6952001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02de5ff16fc554ab35f42bbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 23 10:26:48 2013 +0200 ddraw: Avoid VOID. --- dlls/ddraw/tests/d3d.c | 3 ++- include/ddrawgdi.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 0ab3b06..042d2d8 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -511,7 +511,8 @@ static void LimitTest(void) IDirectDrawSurface7_Release(pTexture); } -static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPSTR DeviceName, D3DDEVICEDESC *hal, D3DDEVICEDESC *hel, VOID *ctx) +static HRESULT WINAPI enumDevicesCallback(GUID *Guid, char *DeviceDescription, + char *DeviceName, D3DDEVICEDESC *hal, D3DDEVICEDESC *hel, void *ctx) { UINT ver = *((UINT *) ctx); if(IsEqualGUID(&IID_IDirect3DRGBDevice, Guid)) diff --git a/include/ddrawgdi.h b/include/ddrawgdi.h index 9aea733..4b78702 100644 --- a/include/ddrawgdi.h +++ b/include/ddrawgdi.h @@ -27,7 +27,7 @@ extern "C" { #define DdQueryDisplaySettingsUniqueness GdiEntry13 -ULONG APIENTRY DdQueryDisplaySettingsUniqueness(VOID); +ULONG APIENTRY DdQueryDisplaySettingsUniqueness(void); #ifdef __cplusplus }

1 0

Vincent Povirk : gdiplus: Skip drawing lines of text with only empty glyphs .
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: ce9de5c4bb1470e0545cbdb2000fff3f9d164687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce9de5c4bb1470e0545cbdb20… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 20 13:12:45 2013 -0500 gdiplus: Skip drawing lines of text with only empty glyphs. --- dlls/gdiplus/graphics.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a642bd8..3c4b479 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6225,6 +6225,10 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI } } + if (max_glyphsize == 0) + /* Nothing to draw. */ + return Ok; + glyph_mask = GdipAlloc(max_glyphsize); text_mask = GdipAlloc((max_x - min_x) * (max_y - min_y)); text_mask_stride = max_x - min_x;

1 0

Vincent Povirk : gdiplus: Don' t expand the drawing area to include empty glyphs.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 85b989c1fa09793e41b81a798f10f4649f8d6b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b989c1fa09793e41b81a798… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 20 13:15:54 2013 -0500 gdiplus: Don't expand the drawing area to include empty glyphs. --- dlls/gdiplus/graphics.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3c4b479..bd9b70b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6208,15 +6208,18 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI if (glyphsize > max_glyphsize) max_glyphsize = glyphsize; - left = pti[i].x + glyphmetrics.gmptGlyphOrigin.x; - top = pti[i].y - glyphmetrics.gmptGlyphOrigin.y; - right = pti[i].x + glyphmetrics.gmptGlyphOrigin.x + glyphmetrics.gmBlackBoxX; - bottom = pti[i].y - glyphmetrics.gmptGlyphOrigin.y + glyphmetrics.gmBlackBoxY; - - if (left < min_x) min_x = left; - if (top < min_y) min_y = top; - if (right > max_x) max_x = right; - if (bottom > max_y) max_y = bottom; + if (glyphsize != 0) + { + left = pti[i].x + glyphmetrics.gmptGlyphOrigin.x; + top = pti[i].y - glyphmetrics.gmptGlyphOrigin.y; + right = pti[i].x + glyphmetrics.gmptGlyphOrigin.x + glyphmetrics.gmBlackBoxX; + bottom = pti[i].y - glyphmetrics.gmptGlyphOrigin.y + glyphmetrics.gmBlackBoxY; + + if (left < min_x) min_x = left; + if (top < min_y) min_y = top; + if (right > max_x) max_x = right; + if (bottom > max_y) max_y = bottom; + } if (i+1 < length && (flags & DriverStringOptionsRealizedAdvance) == DriverStringOptionsRealizedAdvance) {

1 0

Vincent Povirk : gdiplus: Always provide image data in the format requested by image encoders.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 12586f76e34c64a0b33d5e4626d67d6a07ebaeff URL: http://source.winehq.org/git/wine.git/?a=commit;h=12586f76e34c64a0b33d5e462… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 14 15:04:13 2013 -0500 gdiplus: Always provide image data in the format requested by image encoders. --- dlls/gdiplus/image.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 98c0bd0..0f97fd7 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4002,6 +4002,7 @@ static GpStatus encode_image_WIC(GpImage *image, IStream* stream, HRESULT hr; UINT width, height; PixelFormat gdipformat=0; + const WICPixelFormatGUID *desired_wicformat; WICPixelFormatGUID wicformat; GpRect rc; BitmapData lockeddata; @@ -4054,20 +4055,40 @@ static GpStatus encode_image_WIC(GpImage *image, IStream* stream, { if (pixel_formats[i].gdip_format == bitmap->format) { - memcpy(&wicformat, pixel_formats[i].wic_format, sizeof(GUID)); + desired_wicformat = pixel_formats[i].wic_format; gdipformat = bitmap->format; break; } } if (!gdipformat) { - memcpy(&wicformat, &GUID_WICPixelFormat32bppBGRA, sizeof(GUID)); + desired_wicformat = &GUID_WICPixelFormat32bppBGRA; gdipformat = PixelFormat32bppARGB; } + memcpy(&wicformat, desired_wicformat, sizeof(GUID)); hr = IWICBitmapFrameEncode_SetPixelFormat(frameencode, &wicformat); } + if (SUCCEEDED(hr) && !IsEqualGUID(desired_wicformat, &wicformat)) + { + /* Encoder doesn't support this bitmap's format. */ + gdipformat = 0; + for (i=0; pixel_formats[i].wic_format; i++) + { + if (IsEqualGUID(&wicformat, pixel_formats[i].wic_format)) + { + gdipformat = bitmap->format; + break; + } + } + if (!gdipformat) + { + ERR("Cannot support encoder format %s\n", debugstr_guid(&wicformat)); + hr = E_FAIL; + } + } + if (SUCCEEDED(hr)) { stat = GdipBitmapLockBits(bitmap, &rc, ImageLockModeRead, gdipformat,

1 0

Piotr Caban : msvcp80: Don't forward to msvcp90.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: fc76ad4d225b22ea68008515b73ff37ff5af0815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc76ad4d225b22ea68008515b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 18 09:22:47 2013 +0200 msvcp80: Don't forward to msvcp90. --- dlls/msvcp80/Makefile.in | 9 +- dlls/msvcp80/cxx.h | 447 ++ dlls/msvcp80/exception.c | 563 ++ dlls/msvcp80/ios.c |13313 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp80/locale.c | 9621 +++++++++++++++++++++++++++++++ dlls/msvcp80/math.c | 2165 +++++++ dlls/msvcp80/memory.c | 338 ++ dlls/msvcp80/misc.c | 231 + dlls/msvcp80/msvcp.h | 483 ++ dlls/msvcp80/msvcp80.c | 315 - dlls/msvcp80/msvcp80.spec | 9804 ++++++++++++++++---------------- dlls/msvcp80/msvcp80_main.c | 124 + dlls/msvcp80/string.c | 4456 +++++++++++++++ 13 files changed, 36651 insertions(+), 5218 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc76ad4d225b22ea68008…

1 0

Piotr Caban : msvcp: Make it possible to shrink allocated memory in basic_string::reserve.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 95af810de541be18fd2ce4e93f9be3145b68376a URL: http://source.winehq.org/git/wine.git/?a=commit;h=95af810de541be18fd2ce4e93… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Sep 21 13:02:14 2013 +0200 msvcp: Make it possible to shrink allocated memory in basic_string::reserve. --- dlls/msvcp71/string.c | 8 ++++---- dlls/msvcp90/string.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp71/string.c b/dlls/msvcp71/string.c index 415e514..534d7e7 100644 --- a/dlls/msvcp71/string.c +++ b/dlls/msvcp71/string.c @@ -883,8 +883,8 @@ void __thiscall MSVCP_basic_string_char_reserve(basic_string_char *this, MSVCP_s if(len > size) return; - basic_string_char_grow(this, size, FALSE); - basic_string_char_eos(this, len); + if(basic_string_char_grow(this, size, TRUE)) + basic_string_char_eos(this, len); } /* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ @@ -2618,8 +2618,8 @@ void __thiscall MSVCP_basic_string_wchar_reserve(basic_string_wchar *this, MSVCP if(len > size) return; - basic_string_wchar_grow(this, size, FALSE); - basic_string_wchar_eos(this, len); + if(basic_string_wchar_grow(this, size, TRUE)) + basic_string_wchar_eos(this, len); } /* ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)XZ */ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index a0359a1..0772ade 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -915,8 +915,8 @@ void __thiscall MSVCP_basic_string_char_reserve(basic_string_char *this, MSVCP_s if(len > size) return; - basic_string_char_grow(this, size, FALSE); - basic_string_char_eos(this, len); + if(basic_string_char_grow(this, size, TRUE)) + basic_string_char_eos(this, len); } /* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ @@ -2770,8 +2770,8 @@ void __thiscall MSVCP_basic_string_wchar_reserve(basic_string_wchar *this, MSVCP if(len > size) return; - basic_string_wchar_grow(this, size, FALSE); - basic_string_wchar_eos(this, len); + if(basic_string_wchar_grow(this, size, TRUE)) + basic_string_wchar_eos(this, len); } /* ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)XZ */

1 0