wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

André Hentschel : d3drm: Fix QueryInterface forwarding .
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 59186dd4a0f6e672b24ef424c4250eda595652dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=59186dd4a0f6e672b24ef424c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 13 00:12:14 2012 +0100 d3drm: Fix QueryInterface forwarding. --- dlls/d3drm/meshbuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index ce910a9..d6b1735 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1159,7 +1159,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_QueryInterface(IDirect3DRMMesh REFIID riid, void** ppvObject) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - return IDirect3DRMMeshBuilder_QueryInterface(&This->IDirect3DRMMeshBuilder3_iface, riid, ppvObject); + return IDirect3DRMMeshBuilder2_QueryInterface(&This->IDirect3DRMMeshBuilder2_iface, riid, ppvObject); } static ULONG WINAPI IDirect3DRMMeshBuilder3Impl_AddRef(IDirect3DRMMeshBuilder3* iface)

1 0

Daniel Lehman : msvcp90: Flip num_get<char/wchar_t> do_get_long and do_get_ulong in vtable.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 6f9f27d1bf1e0d6a760aec0dfa8f3c2a3328a944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9f27d1bf1e0d6a760aec0df… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Jan 12 19:41:16 2012 -0800 msvcp90: Flip num_get<char/wchar_t> do_get_long and do_get_ulong in vtable. --- dlls/msvcp90/locale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index a4f42a0..12b4300 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4235,8 +4235,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(num_get_char_do_get_float) VTABLE_ADD_FUNC(num_get_char_do_get_uint64) VTABLE_ADD_FUNC(num_get_char_do_get_int64) - VTABLE_ADD_FUNC(num_get_char_do_get_long) VTABLE_ADD_FUNC(num_get_char_do_get_ulong) + VTABLE_ADD_FUNC(num_get_char_do_get_long) VTABLE_ADD_FUNC(num_get_char_do_get_uint) VTABLE_ADD_FUNC(num_get_char_do_get_ushort) VTABLE_ADD_FUNC(num_get_char_do_get_bool)); @@ -4259,8 +4259,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(num_get_wchar_do_get_float) VTABLE_ADD_FUNC(num_get_wchar_do_get_uint64) VTABLE_ADD_FUNC(num_get_wchar_do_get_int64) - VTABLE_ADD_FUNC(num_get_wchar_do_get_long) VTABLE_ADD_FUNC(num_get_wchar_do_get_ulong) + VTABLE_ADD_FUNC(num_get_wchar_do_get_long) VTABLE_ADD_FUNC(num_get_wchar_do_get_uint) VTABLE_ADD_FUNC(num_get_wchar_do_get_ushort) VTABLE_ADD_FUNC(num_get_wchar_do_get_bool));

1 0

Daniel Lehman : msvcp90: Add num_get<short> stubs.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 015ccccfeb07b047b68df5d852979d2a7dc35f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=015ccccfeb07b047b68df5d85… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jan 3 16:16:43 2012 -0800 msvcp90: Add num_get<short> stubs. --- dlls/msvcp90/locale.c | 115 +++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 130 ++++++++++++++++++++++---------------------- 2 files changed, 180 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=015ccccfeb07b047b68df…

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 68371e848120595d5cbacbeae02adb90a2d743c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68371e848120595d5cbacbeae… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 13 00:25:19 2012 +0100 po: Update German translation. --- po/de.po | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index 6158153..594c925 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-01-10 23:39+0100\n" +"PO-Revision-Date: 2012-01-12 21:12+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -585,13 +585,11 @@ msgid "&Hue:" msgstr "&Farbe:" #: comdlg32.rc:290 -#, fuzzy msgctxt "Saturation" msgid "&Sat:" msgstr "&Sätt:" #: comdlg32.rc:292 -#, fuzzy msgctxt "Luminance" msgid "&Lum:" msgstr "H&ell:"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 77882728c707f82b77177dff6f5af6efa4f34fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77882728c707f82b77177dff6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 12 21:08:52 2012 +0100 po: Update French translation. --- po/fr.po | 203 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 101 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77882728c707f82b77177…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DTEXTUREFILTERTYPE typedef.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: e70990041b08c8d2978fa481cbed1c5454f4c714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70990041b08c8d2978fa481c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 12 21:43:12 2012 +0100 wined3d: Get rid of the WINED3DTEXTUREFILTERTYPE typedef. --- dlls/d3d8/device.c | 6 +- dlls/d3d9/cubetexture.c | 2 +- dlls/d3d9/texture.c | 2 +- dlls/d3d9/volumetexture.c | 2 +- dlls/ddraw/device.c | 138 ++++++++++++++++++++++++--------------- dlls/ddraw/surface.c | 8 +- dlls/wined3d/device.c | 12 ++-- dlls/wined3d/stateblock.c | 6 +- dlls/wined3d/surface.c | 83 ++++++++++++------------ dlls/wined3d/swapchain.c | 8 +- dlls/wined3d/texture.c | 38 ++++++------ dlls/wined3d/utils.c | 24 ++++--- dlls/wined3d/wined3d_private.h | 22 +++--- include/wine/wined3d.h | 29 ++++---- 14 files changed, 207 insertions(+), 173 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e70990041b08c8d2978fa…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DCUBEMAP_FACES typedef.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: a44b062aed558c7aea64c51db19e88767032517a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44b062aed558c7aea64c51db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 12 21:43:11 2012 +0100 wined3d: Get rid of the WINED3DCUBEMAP_FACES typedef. --- dlls/d3d10core/device.c | 2 +- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/ddraw/ddraw.c | 19 ++++++++++--------- dlls/dxgi/device.c | 2 +- include/wine/wined3d.h | 21 ++++++++++----------- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 772726d..065c643 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1364,7 +1364,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface) + WINED3DPOOL pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) { struct d3d10_device *device = device_from_wined3d_device_parent(device_parent); struct d3d10_texture2d *texture; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 043f582..dcdefff 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2812,7 +2812,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface) + WINED3DPOOL pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) { IDirect3DDevice8Impl *device = device_from_device_parent(device_parent); IDirect3DSurface8Impl *d3d_surface; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 444d6b4..c46bd59 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3102,7 +3102,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface) + WINED3DPOOL pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) { struct IDirect3DDevice9Impl *device = device_from_device_parent(device_parent); IDirect3DSurface9Impl *d3d_surface; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c54f878..e413ae6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5333,7 +5333,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface) + WINED3DPOOL pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) { struct IDirectDrawImpl *ddraw = ddraw_from_device_parent(device_parent); IDirectDrawSurfaceImpl *surf = NULL; @@ -5345,31 +5345,32 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent * device_parent, container_parent, width, height, format, usage, pool, level, face, surface); searchcaps.dwCaps2 &= ~DDSCAPS2_CUBEMAP_ALLFACES; - switch(face) + switch (face) { - case WINED3DCUBEMAP_FACE_POSITIVE_X: + case WINED3D_CUBEMAP_FACE_POSITIVE_X: TRACE("Asked for positive x\n"); if (searchcaps.dwCaps2 & DDSCAPS2_CUBEMAP) { searchcaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEX; } surf = ddraw->tex_root; break; - case WINED3DCUBEMAP_FACE_NEGATIVE_X: + case WINED3D_CUBEMAP_FACE_NEGATIVE_X: TRACE("Asked for negative x\n"); searchcaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEX; break; - case WINED3DCUBEMAP_FACE_POSITIVE_Y: + case WINED3D_CUBEMAP_FACE_POSITIVE_Y: TRACE("Asked for positive y\n"); searchcaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEY; break; - case WINED3DCUBEMAP_FACE_NEGATIVE_Y: + case WINED3D_CUBEMAP_FACE_NEGATIVE_Y: TRACE("Asked for negative y\n"); searchcaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEY; break; - case WINED3DCUBEMAP_FACE_POSITIVE_Z: + case WINED3D_CUBEMAP_FACE_POSITIVE_Z: TRACE("Asked for positive z\n"); searchcaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEZ; break; - case WINED3DCUBEMAP_FACE_NEGATIVE_Z: + case WINED3D_CUBEMAP_FACE_NEGATIVE_Z: TRACE("Asked for negative z\n"); searchcaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEZ; break; - default: {ERR("Unexpected cube face\n");} /* Stupid compiler */ + default: + ERR("Unexpected cube face.\n"); } if (!surf) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 39c1a21..ed5aba0 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -191,7 +191,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac hr = device_parent->ops->create_surface(device_parent, NULL, desc->Width, desc->Height, wined3dformat_from_dxgi_format(desc->Format), usage, WINED3DPOOL_DEFAULT, 0, - WINED3DCUBEMAP_FACE_POSITIVE_X, &wined3d_surface); + WINED3D_CUBEMAP_FACE_POSITIVE_X, &wined3d_surface); if (FAILED(hr)) { ERR("CreateSurface failed, returning %#x\n", hr); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5759f4a..ea9493c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -648,16 +648,15 @@ enum wined3d_basis_type WINED3D_BASIS_INTERPOLATE = 2, }; -typedef enum _WINED3DCUBEMAP_FACES -{ - WINED3DCUBEMAP_FACE_POSITIVE_X = 0, - WINED3DCUBEMAP_FACE_NEGATIVE_X = 1, - WINED3DCUBEMAP_FACE_POSITIVE_Y = 2, - WINED3DCUBEMAP_FACE_NEGATIVE_Y = 3, - WINED3DCUBEMAP_FACE_POSITIVE_Z = 4, - WINED3DCUBEMAP_FACE_NEGATIVE_Z = 5, - WINED3DCUBEMAP_FACE_FORCE_DWORD = 0xffffffff -} WINED3DCUBEMAP_FACES; +enum wined3d_cubemap_face +{ + WINED3D_CUBEMAP_FACE_POSITIVE_X = 0, + WINED3D_CUBEMAP_FACE_NEGATIVE_X = 1, + WINED3D_CUBEMAP_FACE_POSITIVE_Y = 2, + WINED3D_CUBEMAP_FACE_NEGATIVE_Y = 3, + WINED3D_CUBEMAP_FACE_POSITIVE_Z = 4, + WINED3D_CUBEMAP_FACE_NEGATIVE_Z = 5, +}; typedef enum _WINED3DTEXTUREFILTERTYPE { @@ -1986,7 +1985,7 @@ struct wined3d_device_parent_ops void (__cdecl *mode_changed)(struct wined3d_device_parent *device_parent); HRESULT (__cdecl *create_surface)(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format_id, DWORD usage, WINED3DPOOL pool, - UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface); + UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface); HRESULT (__cdecl *create_rendertarget)(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, struct wined3d_surface **surface);

1 0

Henri Verbeet : include: Add some missing DDLOCK constants.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: e1f6a81a2d870e01fb66a971bfab1758c646bccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f6a81a2d870e01fb66a971b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 12 21:43:10 2012 +0100 include: Add some missing DDLOCK constants. --- include/ddraw.h | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index 5b1c621..5feddf4 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1397,14 +1397,18 @@ DECLARE_INTERFACE_(IDirectDraw,IUnknown) /* flags for Lock() */ -#define DDLOCK_SURFACEMEMORYPTR 0x00000000 -#define DDLOCK_WAIT 0x00000001 -#define DDLOCK_EVENT 0x00000002 -#define DDLOCK_READONLY 0x00000010 -#define DDLOCK_WRITEONLY 0x00000020 -#define DDLOCK_NOSYSLOCK 0x00000800 -#define DDLOCK_NOOVERWRITE 0x00001000 -#define DDLOCK_DISCARDCONTENTS 0x00002000 +#define DDLOCK_SURFACEMEMORYPTR __MSABI_LONG(0x00000000) +#define DDLOCK_WAIT __MSABI_LONG(0x00000001) +#define DDLOCK_EVENT __MSABI_LONG(0x00000002) +#define DDLOCK_READONLY __MSABI_LONG(0x00000010) +#define DDLOCK_WRITEONLY __MSABI_LONG(0x00000020) +#define DDLOCK_NOSYSLOCK __MSABI_LONG(0x00000800) +#define DDLOCK_NOOVERWRITE __MSABI_LONG(0x00001000) +#define DDLOCK_DISCARDCONTENTS __MSABI_LONG(0x00002000) +#define DDLOCK_OKTOSWAP __MSABI_LONG(0x00002000) +#define DDLOCK_DONOTWAIT __MSABI_LONG(0x00004000) +#define DDLOCK_HASVOLUMETEXTUREBOXRECT __MSABI_LONG(0x00008000) +#define DDLOCK_NODIRTYUPDATE __MSABI_LONG(0x00010000) /*****************************************************************************

1 0

Henri Verbeet : wined3d: Get rid of wined3d_surface_set_format().
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: a206f43648304f3c54b03f98765677ae0b5eecd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a206f43648304f3c54b03f987… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 12 21:43:09 2012 +0100 wined3d: Get rid of wined3d_surface_set_format(). --- dlls/d3d8/device.c | 9 ++++++++- dlls/wined3d/surface.c | 24 ------------------------ dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 8 insertions(+), 27 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 16a0b37..043f582 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -932,6 +932,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(IDirect3DDevice8 *iface, struct wined3d_resource_desc wined3d_desc; struct wined3d_resource *wined3d_resource; UINT src_w, src_h; + HRESULT hr; TRACE("iface %p, src_surface %p, src_rects %p, rect_count %u, dst_surface %p, dst_points %p.\n", iface, pSourceSurface, pSourceRects, cRects, pDestinationSurface, pDestPoints); @@ -961,7 +962,13 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(IDirect3DDevice8 *iface, else if (WINED3DFMT_UNKNOWN == destFormat) { TRACE("(%p) : Converting destination surface from WINED3DFMT_UNKNOWN to the source format\n", iface); - wined3d_surface_set_format(Dest->wined3d_surface, srcFormat); + if (FAILED(hr = wined3d_surface_update_desc(Dest->wined3d_surface, wined3d_desc.width, wined3d_desc.height, + srcFormat, wined3d_desc.multisample_type, wined3d_desc.multisample_quality))) + { + WARN("Failed to update surface desc, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } } /* Quick if complete copy ... */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2cf01f9..4945041 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3378,30 +3378,6 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, return WINED3D_OK; } -HRESULT CDECL wined3d_surface_set_format(struct wined3d_surface *surface, enum wined3d_format_id format_id) -{ - const struct wined3d_format *format = wined3d_get_format(&surface->resource.device->adapter->gl_info, format_id); - - TRACE("surface %p, format %s.\n", surface, debug_d3dformat(format_id)); - - if (surface->resource.format->id != WINED3DFMT_UNKNOWN) - { - FIXME("The format of the surface must be WINED3DFORMAT_UNKNOWN.\n"); - return WINED3DERR_INVALIDCALL; - } - - surface->resource.size = wined3d_format_calculate_size(format, surface->resource.device->surface_alignment, - surface->pow2Width, surface->pow2Height); - surface->flags |= (WINED3DFMT_D16_LOCKABLE == format_id) ? SFLAG_LOCKABLE : 0; - surface->resource.format = format; - - TRACE("size %u, byte_count %u\n", surface->resource.size, format->byte_count); - TRACE("glFormat %#x, glInternal %#x, glType %#x.\n", - format->glFormat, format->glInternal, format->glType); - - return WINED3D_OK; -} - static void convert_r32_float_r16_float(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8279aa6..f0821fb 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -211,7 +211,6 @@ @ cdecl wined3d_surface_releasedc(ptr ptr) @ cdecl wined3d_surface_restore(ptr) @ cdecl wined3d_surface_set_color_key(ptr long ptr) -@ cdecl wined3d_surface_set_format(ptr long) @ cdecl wined3d_surface_set_mem(ptr ptr) @ cdecl wined3d_surface_set_overlay_position(ptr long long) @ cdecl wined3d_surface_set_palette(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b423dd8..5759f4a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2328,7 +2328,6 @@ HRESULT __cdecl wined3d_surface_releasedc(struct wined3d_surface *surface, HDC d HRESULT __cdecl wined3d_surface_restore(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_set_color_key(struct wined3d_surface *surface, DWORD flags, const struct wined3d_color_key *color_key); -HRESULT __cdecl wined3d_surface_set_format(struct wined3d_surface *surface, enum wined3d_format_id format_id); HRESULT __cdecl wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem); HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); HRESULT __cdecl wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette);

1 0

Henri Verbeet : ddraw: Implement width and height changes in ddraw_surface7_SetSurfaceDesc().
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: afb64506ba0eb958af72d8535d8c5473f7fcc06e URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb64506ba0eb958af72d8535… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 12 21:43:08 2012 +0100 ddraw: Implement width and height changes in ddraw_surface7_SetSurfaceDesc(). --- dlls/ddraw/surface.c | 66 +++++++++++++++++++++++++++++-------- dlls/ddraw/tests/dsurface.c | 8 ++-- dlls/wined3d/device.c | 75 +++++------------------------------------- dlls/wined3d/surface.c | 64 ++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 3 ++ 6 files changed, 133 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afb64506ba0eb958af72d…

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
98
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 January 2012