January 2012 - Wine-commits

Nikolay Sivov : shell32: Rearrange code to avoid forward declarations.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 881299c6a8e806577d639970c5cc4ffc9c6bfbce URL: http://source.winehq.org/git/wine.git/?a=commit;h=881299c6a8e806577d639970c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 13 00:14:14 2012 +0300 shell32: Rearrange code to avoid forward declarations. --- dlls/shell32/shlfsbind.c | 169 +++++++++++++++++++++------------------------ 1 files changed, 79 insertions(+), 90 deletions(-) diff --git a/dlls/shell32/shlfsbind.c b/dlls/shell32/shlfsbind.c index 5988290..53a1d3b 100644 --- a/dlls/shell32/shlfsbind.c +++ b/dlls/shell32/shlfsbind.c @@ -44,86 +44,31 @@ typedef struct IFileSystemBindData IFileSystemBindData_iface; LONG ref; WIN32_FIND_DATAW findFile; -} IFileSystemBindDataImpl; +} FileSystemBindData; -static inline IFileSystemBindDataImpl *impl_from_IFileSystemBindData(IFileSystemBindData *iface) +static inline FileSystemBindData *impl_from_IFileSystemBindData(IFileSystemBindData *iface) { - return CONTAINING_RECORD(iface, IFileSystemBindDataImpl, IFileSystemBindData_iface); + return CONTAINING_RECORD(iface, FileSystemBindData, IFileSystemBindData_iface); } -static HRESULT WINAPI IFileSystemBindData_fnQueryInterface(IFileSystemBindData *, REFIID, LPVOID*); -static ULONG WINAPI IFileSystemBindData_fnAddRef(IFileSystemBindData *); -static ULONG WINAPI IFileSystemBindData_fnRelease(IFileSystemBindData *); -static HRESULT WINAPI IFileSystemBindData_fnGetFindData(IFileSystemBindData *, WIN32_FIND_DATAW *); -static HRESULT WINAPI IFileSystemBindData_fnSetFindData(IFileSystemBindData *, const WIN32_FIND_DATAW *); - -static const IFileSystemBindDataVtbl sbvt = -{ - IFileSystemBindData_fnQueryInterface, - IFileSystemBindData_fnAddRef, - IFileSystemBindData_fnRelease, - IFileSystemBindData_fnSetFindData, - IFileSystemBindData_fnGetFindData, -}; - -static const WCHAR wFileSystemBindData[] = { - 'F','i','l','e',' ','S','y','s','t','e','m',' ','B','i','n','d',' ','D','a','t','a',0}; - -HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV) +static HRESULT WINAPI FileSystemBindData_QueryInterface( + IFileSystemBindData *iface, REFIID riid, LPVOID *ppV) { - IFileSystemBindDataImpl *sb; - HRESULT ret = E_OUTOFMEMORY; - - TRACE("%p, %p\n", pfd, ppV); + FileSystemBindData *This = impl_from_IFileSystemBindData(iface); - if (!ppV) - return E_INVALIDARG; + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppV); *ppV = NULL; - sb = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IFileSystemBindDataImpl)); - if (!sb) - return ret; - - sb->IFileSystemBindData_iface.lpVtbl = &sbvt; - sb->ref = 1; - IFileSystemBindData_fnSetFindData(&sb->IFileSystemBindData_iface, pfd); - - ret = CreateBindCtx(0, ppV); - if (SUCCEEDED(ret)) + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IFileSystemBindData)) { - BIND_OPTS bindOpts; - - bindOpts.cbStruct = sizeof(BIND_OPTS); - bindOpts.grfFlags = 0; - bindOpts.grfMode = STGM_CREATE; - bindOpts.dwTickCountDeadline = 0; - IBindCtx_SetBindOptions(*ppV, &bindOpts); - IBindCtx_RegisterObjectParam(*ppV, (LPOLESTR)wFileSystemBindData, (LPUNKNOWN)sb); - - IFileSystemBindData_Release(&sb->IFileSystemBindData_iface); + *ppV = &This->IFileSystemBindData_iface; } - else - HeapFree(GetProcessHeap(), 0, sb); - return ret; -} - -static HRESULT WINAPI IFileSystemBindData_fnQueryInterface( - IFileSystemBindData *iface, REFIID riid, LPVOID *ppV) -{ - IFileSystemBindDataImpl *This = impl_from_IFileSystemBindData(iface); - TRACE("(%p)->(\n\tIID:\t%s, %p)\n", This, debugstr_guid(riid), ppV); - - *ppV = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppV = This; - else if (IsEqualIID(riid, &IID_IFileSystemBindData)) - *ppV = This; if (*ppV) { - IUnknown_AddRef((IUnknown*)(*ppV)); + IFileSystemBindData_AddRef(iface); TRACE("-- Interface: (%p)->(%p)\n", ppV, *ppV); return S_OK; } @@ -131,36 +76,32 @@ static HRESULT WINAPI IFileSystemBindData_fnQueryInterface( return E_NOINTERFACE; } -static ULONG WINAPI IFileSystemBindData_fnAddRef(IFileSystemBindData *iface) +static ULONG WINAPI FileSystemBindData_AddRef(IFileSystemBindData *iface) { - IFileSystemBindDataImpl *This = impl_from_IFileSystemBindData(iface); - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE("(%p)->(count=%i)\n", This, refCount - 1); - - return refCount; + FileSystemBindData *This = impl_from_IFileSystemBindData(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; } -static ULONG WINAPI IFileSystemBindData_fnRelease(IFileSystemBindData *iface) +static ULONG WINAPI FileSystemBindData_Release(IFileSystemBindData *iface) { - IFileSystemBindDataImpl *This = impl_from_IFileSystemBindData(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + FileSystemBindData *This = impl_from_IFileSystemBindData(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%i)\n", This, refCount + 1); + TRACE("(%p)->(%u)\n", This, ref); - if (!refCount) - { - TRACE(" destroying ISFBindPidl(%p)\n",This); + if (!ref) HeapFree(GetProcessHeap(), 0, This); - } - return refCount; + + return ref; } -static HRESULT WINAPI IFileSystemBindData_fnGetFindData( - IFileSystemBindData *iface, WIN32_FIND_DATAW *pfd) +static HRESULT WINAPI FileSystemBindData_GetFindData(IFileSystemBindData *iface, WIN32_FIND_DATAW *pfd) { - IFileSystemBindDataImpl *This = impl_from_IFileSystemBindData(iface); - TRACE("(%p), %p\n", This, pfd); + FileSystemBindData *This = impl_from_IFileSystemBindData(iface); + + TRACE("(%p)->(%p)\n", This, pfd); if (!pfd) return E_INVALIDARG; @@ -169,11 +110,11 @@ static HRESULT WINAPI IFileSystemBindData_fnGetFindData( return S_OK; } -static HRESULT WINAPI IFileSystemBindData_fnSetFindData( - IFileSystemBindData *iface, const WIN32_FIND_DATAW *pfd) +static HRESULT WINAPI FileSystemBindData_SetFindData(IFileSystemBindData *iface, const WIN32_FIND_DATAW *pfd) { - IFileSystemBindDataImpl *This = impl_from_IFileSystemBindData(iface); - TRACE("(%p), %p\n", This, pfd); + FileSystemBindData *This = impl_from_IFileSystemBindData(iface); + + TRACE("(%p)->(%p)\n", This, pfd); if (pfd) This->findFile = *pfd; @@ -181,3 +122,51 @@ static HRESULT WINAPI IFileSystemBindData_fnSetFindData( memset(&This->findFile, 0, sizeof(WIN32_FIND_DATAW)); return S_OK; } + +static const IFileSystemBindDataVtbl FileSystemBindDataVtbl = { + FileSystemBindData_QueryInterface, + FileSystemBindData_AddRef, + FileSystemBindData_Release, + FileSystemBindData_SetFindData, + FileSystemBindData_GetFindData, +}; + +HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *find_data, LPBC *ppV) +{ + FileSystemBindData *This; + HRESULT ret; + + TRACE("(%p %p)\n", find_data, ppV); + + if (!ppV) + return E_INVALIDARG; + + *ppV = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + + This->IFileSystemBindData_iface.lpVtbl = &FileSystemBindDataVtbl; + This->ref = 1; + IFileSystemBindData_SetFindData(&This->IFileSystemBindData_iface, find_data); + + ret = CreateBindCtx(0, ppV); + if (SUCCEEDED(ret)) + { + static const WCHAR nameW[] = { + 'F','i','l','e',' ','S','y','s','t','e','m',' ','B','i','n','d',' ','D','a','t','a',0}; + BIND_OPTS bindOpts; + + bindOpts.cbStruct = sizeof(BIND_OPTS); + bindOpts.grfFlags = 0; + bindOpts.grfMode = STGM_CREATE; + bindOpts.dwTickCountDeadline = 0; + IBindCtx_SetBindOptions(*ppV, &bindOpts); + IBindCtx_RegisterObjectParam(*ppV, (WCHAR*)nameW, (IUnknown*)&This->IFileSystemBindData_iface); + + IFileSystemBindData_Release(&This->IFileSystemBindData_iface); + } + else + HeapFree(GetProcessHeap(), 0, This); + return ret; +}

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

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 : 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 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 : 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

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

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

Francois Gouget : winhlp32: Standardize the 'Not yet implemented' messages.
by Alexandre Julliard 12 Jan '12

12 Jan '12

1 0

Jacek Caban : mshtml: Get rid of wrapped nsIURI in nsWineURI.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: d42079700245bdd662c8c52325770d49a4633340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d42079700245bdd662c8c5232… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 12 15:37:23 2012 +0100 mshtml: Get rid of wrapped nsIURI in nsWineURI. --- dlls/mshtml/nsio.c | 56 +++++++++++---------------------------------------- 1 files changed, 12 insertions(+), 44 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 2ea7efd..8e7bdec 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -58,7 +58,6 @@ struct nsWineURI { LONG ref; - nsIURI *nsuri; NSContainer *container; windowref_t *window_ref; nsChannelBSC *channel_bsc; @@ -140,7 +139,7 @@ BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) return ret; } -static nsresult create_nsuri(IUri*,nsIURI*,HTMLWindow*,NSContainer*,nsWineURI**); +static nsresult create_nsuri(IUri*,HTMLWindow*,NSContainer*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) { @@ -1766,7 +1765,7 @@ static nsresult NSAPI nsURI_QueryInterface(nsIURL *iface, nsIIDRef riid, void ** } TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), result); - return This->nsuri ? nsIURI_QueryInterface(This->nsuri, riid, result) : NS_NOINTERFACE; + return NS_NOINTERFACE; } static nsrefcnt NSAPI nsURI_AddRef(nsIURL *iface) @@ -1791,8 +1790,6 @@ static nsrefcnt NSAPI nsURI_Release(nsIURL *iface) windowref_release(This->window_ref); if(This->container) nsIWebBrowserChrome_Release(&This->container->nsIWebBrowserChrome_iface); - if(This->nsuri) - nsIURI_Release(This->nsuri); if(This->uri) IUri_Release(This->uri); heap_free(This); @@ -1848,13 +1845,7 @@ static nsresult NSAPI nsURI_SetSpec(nsIURL *iface, const nsACString *aSpec) static nsresult NSAPI nsURI_GetPrePath(nsIURL *iface, nsACString *aPrePath) { nsWineURI *This = impl_from_nsIURL(iface); - - TRACE("(%p)->(%p)\n", This, aPrePath); - - if(This->nsuri) - return nsIURI_GetPrePath(This->nsuri, aPrePath); - - FIXME("default action not implemented\n"); + FIXME("(%p)->(%p)\n", This, aPrePath); return NS_ERROR_NOT_IMPLEMENTED; } @@ -2255,7 +2246,6 @@ static nsresult NSAPI nsURI_SchemeIs(nsIURL *iface, const char *scheme, PRBool * static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval) { nsWineURI *This = impl_from_nsIURL(iface); - nsIURI *nsuri = NULL; nsWineURI *wine_uri; nsresult nsres; @@ -2264,15 +2254,7 @@ static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval) if(!ensure_uri(This)) return NS_ERROR_UNEXPECTED; - if(This->nsuri) { - nsres = nsIURI_Clone(This->nsuri, &nsuri); - if(NS_FAILED(nsres)) { - WARN("Clone failed: %08x\n", nsres); - return nsres; - } - } - - nsres = create_nsuri(This->uri, nsuri, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); + nsres = create_nsuri(This->uri, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); if(NS_FAILED(nsres)) { WARN("create_nsuri failed: %08x\n", nsres); return nsres; @@ -2347,13 +2329,7 @@ static nsresult NSAPI nsURI_GetAsciiHost(nsIURL *iface, nsACString *aAsciiHost) static nsresult NSAPI nsURI_GetOriginCharset(nsIURL *iface, nsACString *aOriginCharset) { nsWineURI *This = impl_from_nsIURL(iface); - - TRACE("(%p)->(%p)\n", This, aOriginCharset); - - if(This->nsuri) - return nsIURI_GetOriginCharset(This->nsuri, aOriginCharset); - - FIXME("default action not implemented\n"); + FIXME("(%p)->(%p)\n", This, aOriginCharset); return NS_ERROR_NOT_IMPLEMENTED; } @@ -2450,7 +2426,7 @@ static nsresult NSAPI nsURI_CloneIgnoreRef(nsIURL *iface, nsIURI **_retval) if(!uri) return NS_ERROR_FAILURE; - nsres = create_nsuri(uri, NULL, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); + nsres = create_nsuri(uri, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); IUri_Release(uri); if(NS_FAILED(nsres)) { WARN("create_nsuri failed: %08x\n", nsres); @@ -2815,14 +2791,13 @@ static const nsIStandardURLVtbl nsStandardURLVtbl = { nsStandardURL_Init }; -static nsresult create_nsuri(IUri *iuri, nsIURI *nsuri, HTMLWindow *window, NSContainer *container, nsWineURI **_retval) +static nsresult create_nsuri(IUri *iuri, HTMLWindow *window, NSContainer *container, nsWineURI **_retval) { nsWineURI *ret = heap_alloc_zero(sizeof(nsWineURI)); ret->nsIURL_iface.lpVtbl = &nsURLVtbl; ret->nsIStandardURL_iface.lpVtbl = &nsStandardURLVtbl; ret->ref = 1; - ret->nsuri = nsuri; ret->is_mutable = TRUE; set_uri_nscontainer(ret, container); @@ -2847,7 +2822,7 @@ HRESULT create_doc_uri(HTMLWindow *window, WCHAR *url, nsWineURI **ret) if(FAILED(hres)) return hres; - nsres = create_nsuri(iuri, NULL, window, window->doc_obj->nscontainer, &uri); + nsres = create_nsuri(iuri, window, window->doc_obj->nscontainer, &uri); IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; @@ -2904,7 +2879,7 @@ HRESULT create_redirect_nschannel(const WCHAR *url, nsChannel *orig_channel, nsC if(orig_channel->uri->window_ref) window = orig_channel->uri->window_ref->window; - nsres = create_nsuri(iuri, NULL, window, NULL, &uri); + nsres = create_nsuri(iuri, window, NULL, &uri); IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; @@ -3178,7 +3153,6 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * WCHAR new_spec[INTERNET_MAX_URL_LENGTH]; HTMLWindow *window = NULL; const char *spec = NULL; - nsIURI *uri = NULL; IUri *urlmon_uri; nsresult nsres; HRESULT hres; @@ -3218,16 +3192,10 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * WARN("CreateUri failed: %08x\n", hres); } - nsres = nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, &uri); - if(NS_FAILED(nsres)) - TRACE("NewURI failed: %08x\n", nsres); - - if(FAILED(hres)) { - *_retval = uri; - return nsres; - } + if(FAILED(hres)) + return nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, _retval); - nsres = create_nsuri(urlmon_uri, uri, window, NULL, &wine_uri); + nsres = create_nsuri(urlmon_uri, window, NULL, &wine_uri); IUri_Release(urlmon_uri); if(base_wine_uri) nsIURI_Release(&base_wine_uri->nsIURL_iface);

1 0