October 2012 - Wine-commits

Jacek Caban : mshtml: Added IHTMLWindow2::onblur property implementation.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 2c6cbf75d4290875d725dc461637b29240a06f70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6cbf75d4290875d725dc461… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 25 15:11:53 2012 +0200 mshtml: Added IHTMLWindow2::onblur property implementation. --- dlls/mshtml/htmlwindow.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0fad7aa..28b3b7f 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -958,15 +958,19 @@ static HRESULT WINAPI HTMLWindow2_get_onfocus(IHTMLWindow2 *iface, VARIANT *p) static HRESULT WINAPI HTMLWindow2_put_onblur(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_window_event(This, EVENTID_BLUR, &v); } static HRESULT WINAPI HTMLWindow2_get_onblur(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_BLUR, p); } static HRESULT WINAPI HTMLWindow2_put_onload(IHTMLWindow2 *iface, VARIANT v)

1 0

Piotr Caban : msvcp100: Fixed ios_base structure.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 58de52a9564099b2516be77122fed8e6ed7fc69a URL: http://source.winehq.org/git/wine.git/?a=commit;h=58de52a9564099b2516be7712… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 25 15:54:15 2012 +0200 msvcp100: Fixed ios_base structure. --- dlls/msvcp100/msvcp.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp100/msvcp.h b/dlls/msvcp100/msvcp.h index c2f492a..08c3471 100644 --- a/dlls/msvcp100/msvcp.h +++ b/dlls/msvcp100/msvcp.h @@ -289,7 +289,7 @@ typedef struct _fnarray { /* class ios_base */ typedef struct _ios_base { const vtable_ptr *vtable; - MSVCP_size_t stdstr; + MSVCP_size_t DECLSPEC_ALIGN(8) stdstr; IOSB_iostate state; IOSB_iostate except; IOSB_fmtflags fmtfl;

1 0

Christian Costa : d3drm: When creating a mesh, if all faces have the same number of vertex, set vertex_per_face and don' t put nb indices in face data.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 2978dbea0b382765dbce551bde7f0859c0e40f87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2978dbea0b382765dbce551bd… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 23 21:28:32 2012 +0200 d3drm: When creating a mesh, if all faces have the same number of vertex, set vertex_per_face and don't put nb indices in face data. --- dlls/d3drm/meshbuilder.c | 22 ++++++++++++++++++++-- dlls/d3drm/tests/d3drm.c | 4 ++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 4ba29cc..87ff35c 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2063,6 +2063,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); HRESULT hr; D3DRMGROUPINDEX group; + ULONG vertex_per_face = 0; TRACE("(%p)->(%p)\n", This, mesh); @@ -2089,10 +2090,27 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil } out_ptr = face_data; + /* If all faces have the same number of vertex, set vertex_per_face */ + for (i = 0; i < This->nb_faces; i++) + { + if (vertex_per_face && (vertex_per_face != *in_ptr)) + break; + vertex_per_face = *in_ptr; + in_ptr += 1 + *in_ptr * 2; + } + if (i != This->nb_faces) + vertex_per_face = 0; + /* Put only vertex indices */ + in_ptr = This->pFaceData; for (i = 0; i < This->nb_faces; i++) { - DWORD nb_indices = *out_ptr++ = *in_ptr++; + DWORD nb_indices = *in_ptr++; + + /* Don't put nb indices when vertex_per_face is set */ + if (vertex_per_face) + *out_ptr++ = nb_indices; + for (j = 0; j < nb_indices; j++) { *out_ptr++ = *in_ptr++; @@ -2101,7 +2119,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil } } - hr = IDirect3DRMMesh_AddGroup(*mesh, This->nb_vertices, This->nb_faces, 0, face_data, &group); + hr = IDirect3DRMMesh_AddGroup(*mesh, This->nb_vertices, This->nb_faces, vertex_per_face, face_data, &group); HeapFree(GetProcessHeap(), 0, face_data); if (SUCCEEDED(hr)) { diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0d600c5..cde1577 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -402,8 +402,8 @@ static void test_MeshBuilder(void) ok(hr == D3DRM_OK, "GetCroup failed returning hr = %x\n", hr); ok(nb_vertices == 3, "Wrong number of vertices %u (must be 3)\n", nb_vertices); ok(nb_faces == 1, "Wrong number of faces %u (must be 1)\n", nb_faces); - todo_wine ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices); - todo_wine ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size); + ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices); + ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size); color = IDirect3DRMMesh_GetGroupColor(mesh, 0); ok(color == 0xff00ff00, "Wrong color returned %#x instead of %#x\n", color, 0xff00ff00); hr = IDirect3DRMMesh_GetGroupTexture(mesh, 0, &texture);

1 0

Christian Costa : krnl386.exe: Display FIXME instead of ERR for instructions that are not well implemented .
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: a42d4c4b95d04f479846f08beca0772edb4aec57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42d4c4b95d04f479846f08be… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 23 21:28:50 2012 +0200 krnl386.exe: Display FIXME instead of ERR for instructions that are not well implemented. --- dlls/krnl386.exe16/instr.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/krnl386.exe16/instr.c b/dlls/krnl386.exe16/instr.c index 59420ef..459885d 100644 --- a/dlls/krnl386.exe16/instr.c +++ b/dlls/krnl386.exe16/instr.c @@ -516,9 +516,9 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) switch (instr[2]) { case 0xc0: - ERR("mov %%eax, %%cr0 at 0x%08x, EAX=0x%08x\n", - context->Eip,context->Eax ); - context->Eip += prefixlen+3; + FIXME("mov %%eax, %%cr0 at 0x%08x, EAX=0x%08x\n", + context->Eip,context->Eax ); + context->Eip += prefixlen+3; return ExceptionContinueExecution; default: break; /* Fallthrough to bad instruction handling */ @@ -539,12 +539,12 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) * bit 7: PGE Enable global pages * bit 8: PCE Enable performance counters at IPL3 */ - ERR("mov %%cr4, %%eax at 0x%08x\n",context->Eip); + FIXME("mov %%cr4, %%eax at 0x%08x\n",context->Eip); context->Eax = 0; context->Eip += prefixlen+3; return ExceptionContinueExecution; case 0xc0: /* mov %cr0, %eax */ - ERR("mov %%cr0, %%eax at 0x%08x\n",context->Eip); + FIXME("mov %%cr0, %%eax at 0x%08x\n",context->Eip); context->Eax = 0x10; /* FIXME: set more bits ? */ context->Eip += prefixlen+3; return ExceptionContinueExecution; @@ -567,7 +567,7 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) context->Eip += prefixlen+3; return ExceptionContinueExecution; } - ERR("Unsupported DR register, eip+2 is %02x\n", instr[2]); + FIXME("Unsupported DR register, eip+2 is %02x\n", instr[2]); /* fallthrough to illegal instruction */ break; case 0x23: /* mov %eax, %drX */ @@ -578,7 +578,7 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) context->Eip += prefixlen+3; return ExceptionContinueExecution; } - ERR("Unsupported DR register, eip+2 is %02x\n", instr[2]); + FIXME("Unsupported DR register, eip+2 is %02x\n", instr[2]); /* fallthrough to illegal instruction */ break; case 0xa1: /* pop fs */

1 0

André Hentschel : d3dx9_36: Fix free of address-of expression (coverity).
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 8f6b6303ecbb081e84f70d5258bc50ae7dde4549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6b6303ecbb081e84f70d525… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 20:53:00 2012 +0200 d3dx9_36: Fix free of address-of expression (coverity). --- dlls/d3dx9_36/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index ded0848..3e8fc1f 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3590,7 +3590,7 @@ static HRESULT filedata_get_name(IDirectXFileData *filedata, char **name) hr = IDirectXFileObject_GetName(filedata, *name, &name_len); if (FAILED(hr)) - HeapFree(GetProcessHeap(), 0, name); + HeapFree(GetProcessHeap(), 0, *name); if (!name_len) (*name)[0] = 0;

1 0

André Hentschel : gdi32: Fix free of address-of expression (coverity).
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: f5df798611e37a5f2d885f20b852b74d86b41026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5df798611e37a5f2d885f20b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 20:53:03 2012 +0200 gdi32: Fix free of address-of expression (coverity). --- dlls/gdi32/freetype.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 20186fa..b22fb52 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1024,8 +1024,8 @@ static BOOL add_font_subst(struct list *subst_list, FontSubst *subst, INT flags) if(from_exist && (flags & ADD_FONT_SUBST_FORCE)) { list_remove(&from_exist->entry); - HeapFree(GetProcessHeap(), 0, &from_exist->from.name); - HeapFree(GetProcessHeap(), 0, &from_exist->to.name); + HeapFree(GetProcessHeap(), 0, from_exist->from.name); + HeapFree(GetProcessHeap(), 0, from_exist->to.name); HeapFree(GetProcessHeap(), 0, from_exist); from_exist = NULL; }

1 0

Henri Verbeet : ddraw: Move the mipmap desc fixup code to ddraw_surface_create_texture() from device_parent_create_texture_surface().
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 191db92fd59073242600c90cb58e5cf27ebda325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=191db92fd59073242600c90cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 24 21:23:35 2012 +0200 ddraw: Move the mipmap desc fixup code to ddraw_surface_create_texture() from device_parent_create_texture_surface(). --- dlls/ddraw/ddraw.c | 41 ----------------------------------------- dlls/ddraw/surface.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 41 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index fa1beff..014ad27 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5218,47 +5218,6 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ desc.dwWidth = width; desc.dwHeight = height; - if (level) - desc.ddsCaps.dwCaps2 |= DDSCAPS2_MIPMAPSUBLEVEL; - else - desc.ddsCaps.dwCaps2 &= ~DDSCAPS2_MIPMAPSUBLEVEL; - - if (desc.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) - { - desc.ddsCaps.dwCaps2 &= ~DDSCAPS2_CUBEMAP_ALLFACES; - - switch (face) - { - case WINED3D_CUBEMAP_FACE_POSITIVE_X: - desc.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEX; - break; - - case WINED3D_CUBEMAP_FACE_NEGATIVE_X: - desc.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEX; - break; - - case WINED3D_CUBEMAP_FACE_POSITIVE_Y: - desc.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEY; - break; - - case WINED3D_CUBEMAP_FACE_NEGATIVE_Y: - desc.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEY; - break; - - case WINED3D_CUBEMAP_FACE_POSITIVE_Z: - desc.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEZ; - break; - - case WINED3D_CUBEMAP_FACE_NEGATIVE_Z: - desc.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEZ; - break; - - default: - ERR("Unexpected cube face.\n"); - return DDERR_INVALIDPARAMS; - } - - } /* FIXME: Validate that format, usage, pool, etc. really make sense. */ if (FAILED(hr = ddraw_create_surface(ddraw, &desc, &ddraw_surface, tex_root->version))) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 51bd876..1c548a5 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5592,6 +5592,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface) struct wined3d_resource *resource; enum wined3d_format_id format; UINT layers, levels, i, j; + DDSURFACEDESC2 *mip_desc; enum wined3d_pool pool; HRESULT hr; @@ -5638,6 +5639,41 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface) if (mip == surface) continue; + mip_desc = &mip->surface_desc; + + if (j) + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_MIPMAPSUBLEVEL; + else + mip_desc->ddsCaps.dwCaps2 &= ~DDSCAPS2_MIPMAPSUBLEVEL; + + if (mip_desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + { + mip_desc->ddsCaps.dwCaps2 &= ~DDSCAPS2_CUBEMAP_ALLFACES; + + switch (i) + { + case WINED3D_CUBEMAP_FACE_POSITIVE_X: + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEX; + break; + case WINED3D_CUBEMAP_FACE_NEGATIVE_X: + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEX; + break; + case WINED3D_CUBEMAP_FACE_POSITIVE_Y: + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEY; + break; + case WINED3D_CUBEMAP_FACE_NEGATIVE_Y: + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEY; + break; + case WINED3D_CUBEMAP_FACE_POSITIVE_Z: + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEZ; + break; + case WINED3D_CUBEMAP_FACE_NEGATIVE_Z: + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEZ; + break; + } + + } + *attach = mip; attach = &mip->complex_array[0]; }

1 0

Henri Verbeet : wined3d: Replace the face and level parameters to device_parent_create_texture_surface () with the sub-resource index.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 2bf46c60fbb6999ce155f644077e5a2e899a006f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bf46c60fbb6999ce155f6440… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 24 21:23:36 2012 +0200 wined3d: Replace the face and level parameters to device_parent_create_texture_surface() with the sub-resource index. --- dlls/d3d10core/device.c | 6 +++--- dlls/d3d8/device.c | 6 +++--- dlls/d3d9/device.c | 6 +++--- dlls/ddraw/ddraw.c | 8 ++++---- dlls/wined3d/texture.c | 8 ++++---- include/wine/wined3d.h | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index cd2d710..8dd5b95 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1440,13 +1440,13 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - enum wined3d_pool pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) + enum wined3d_pool pool, UINT sub_resource_idx, struct wined3d_surface **surface) { struct d3d10_device *device = device_from_wined3d_device_parent(device_parent); TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, usage %#x,\n" - "\tpool %#x, level %u, face %u, surface %p.\n", - device_parent, container_parent, width, height, format, usage, pool, level, face, surface); + "\tpool %#x, sub_resource_idx %u, surface %p.\n", + device_parent, container_parent, width, height, format, usage, pool, sub_resource_idx, surface); return wined3d_surface_create(device->wined3d_device, width, height, format, usage, pool, WINED3D_MULTISAMPLE_NONE, 0, WINED3D_SURFACE_TYPE_OPENGL, 0, container_parent, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 58aaf3c..c73f065 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2739,7 +2739,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - enum wined3d_pool pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) + enum wined3d_pool pool, UINT sub_resource_idx, struct wined3d_surface **surface) { struct d3d8_device *device = device_from_device_parent(device_parent); struct d3d8_surface *d3d_surface; @@ -2747,8 +2747,8 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, usage %#x,\n" - "\tpool %#x, level %u, face %u, surface %p.\n", - device_parent, container_parent, width, height, format, usage, pool, level, face, surface); + "\tpool %#x, sub_resource_idx %u, surface %p.\n", + device_parent, container_parent, width, height, format, usage, pool, sub_resource_idx, surface); if (pool == WINED3D_POOL_DEFAULT && !(usage & WINED3DUSAGE_DYNAMIC)) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6c9ccc9..ce5bf1a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3106,7 +3106,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - enum wined3d_pool pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) + enum wined3d_pool pool, UINT sub_resource_idx, struct wined3d_surface **surface) { struct d3d9_device *device = device_from_device_parent(device_parent); struct d3d9_surface *d3d_surface; @@ -3114,8 +3114,8 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, usage %#x,\n" - "\tpool %#x, level %u, face %u, surface %p.\n", - device_parent, container_parent, width, height, format, usage, pool, level, face, surface); + "\tpool %#x, sub_resource_idx %u, surface %p.\n", + device_parent, container_parent, width, height, format, usage, pool, sub_resource_idx, surface); if (pool == WINED3D_POOL_DEFAULT && !(usage & D3DUSAGE_DYNAMIC)) lockable = FALSE; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 014ad27..376db17 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5197,7 +5197,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - enum wined3d_pool pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) + enum wined3d_pool pool, UINT sub_resource_idx, struct wined3d_surface **surface) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); struct ddraw_surface *tex_root = container_parent; @@ -5206,11 +5206,11 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, usage %#x,\n" - "\tpool %#x, level %u, face %u, surface %p.\n", - device_parent, container_parent, width, height, format, usage, pool, level, face, surface); + "\tpool %#x, sub_resource_idx %u, surface %p.\n", + device_parent, container_parent, width, height, format, usage, pool, sub_resource_idx, surface); /* The ddraw root surface is created before the wined3d texture. */ - if (!level && face == WINED3D_CUBEMAP_FACE_POSITIVE_X) + if (!sub_resource_idx) { ddraw_surface = tex_root; goto done; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9fb6b80..d9152b1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -859,8 +859,8 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, UINT edge_lengt UINT idx = j * texture->level_count + i; struct wined3d_surface *surface; - if (FAILED(hr = device->device_parent->ops->create_texture_surface(device->device_parent, parent, - tmp_w, tmp_w, format_id, usage, pool, i /* Level */, j, &surface))) + if (FAILED(hr = device->device_parent->ops->create_texture_surface(device->device_parent, + parent, tmp_w, tmp_w, format_id, usage, pool, idx, &surface))) { FIXME("(%p) Failed to create surface, hr %#x.\n", texture, hr); wined3d_texture_cleanup(texture); @@ -1014,8 +1014,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he struct wined3d_surface *surface; /* Use the callback to create the texture surface. */ - if (FAILED(hr = device->device_parent->ops->create_texture_surface(device->device_parent, parent, - tmp_w, tmp_h, format->id, usage, pool, i, 0, &surface))) + if (FAILED(hr = device->device_parent->ops->create_texture_surface(device->device_parent, + parent, tmp_w, tmp_h, format->id, usage, pool, i, &surface))) { FIXME("Failed to create surface %p, hr %#x\n", texture, hr); wined3d_texture_cleanup(texture); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 05af2ee..e201c2e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2004,7 +2004,7 @@ struct wined3d_device_parent_ops struct wined3d_surface **surface); HRESULT (__cdecl *create_texture_surface)(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format_id, DWORD usage, enum wined3d_pool pool, - UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface); + UINT sub_resource_idx, struct wined3d_surface **surface); HRESULT (__cdecl *create_volume)(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, UINT depth, enum wined3d_format_id format_id, enum wined3d_pool pool, DWORD usage, struct wined3d_volume **volume);

1 0

Henri Verbeet : wined3d: Make the shader backend responsible for controlling the fixed function fragment pipe .
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 17e33e9b27ced39a93e61dad20cba9195b2e18e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17e33e9b27ced39a93e61dad2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 24 21:23:37 2012 +0200 wined3d: Make the shader backend responsible for controlling the fixed function fragment pipe. --- dlls/wined3d/arb_program_shader.c | 36 ++++++++++++++- dlls/wined3d/context.c | 11 +++-- dlls/wined3d/device.c | 85 ++++++++++++------------------------- dlls/wined3d/glsl_shader.c | 32 +++++++++++++- dlls/wined3d/shader.c | 56 +++++++++++++++++++++++- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 6 ++- 7 files changed, 157 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17e33e9b27ced39a93e61…

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DCUBETEXTURE9.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 9b19d755198e70d82263e5235e13fdd57f5f30b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b19d755198e70d82263e5235… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 24 21:23:38 2012 +0200 d3dx9: Avoid LPDIRECT3DCUBETEXTURE9. --- dlls/d3dx9_36/texture.c | 19 ++---- include/d3dx9core.h | 2 +- include/d3dx9tex.h | 152 ++++++++++++----------------------------------- 3 files changed, 45 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b19d755198e70d82263e…

1 0