April 2011 - Wine-commits - list.winehq.org

Dylan Smith : d3dx9: Implement LockAttributeBuffer & UnlockAttributeBuffer.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 8baf96bb2216a063ce41804b124ca588ed3ae90d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8baf96bb2216a063ce41804b1… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Apr 27 18:12:05 2011 -0400 d3dx9: Implement LockAttributeBuffer & UnlockAttributeBuffer. --- dlls/d3dx9_36/mesh.c | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 404f447..8928536 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -48,6 +48,8 @@ typedef struct ID3DXMeshImpl IDirect3DVertexDeclaration9 *vertex_declaration; IDirect3DVertexBuffer9 *vertex_buffer; IDirect3DIndexBuffer9 *index_buffer; + DWORD *attrib_buffer; + int attrib_buffer_lock_count; } ID3DXMeshImpl; static inline ID3DXMeshImpl *impl_from_ID3DXMesh(ID3DXMesh *iface) @@ -97,6 +99,7 @@ static ULONG WINAPI ID3DXMeshImpl_Release(ID3DXMesh *iface) IDirect3DVertexBuffer9_Release(This->vertex_buffer); IDirect3DVertexDeclaration9_Release(This->vertex_declaration); IDirect3DDevice9_Release(This->device); + HeapFree(GetProcessHeap(), 0, This->attrib_buffer); HeapFree(GetProcessHeap(), 0, This); } @@ -473,18 +476,30 @@ static HRESULT WINAPI ID3DXMeshImpl_LockAttributeBuffer(ID3DXMesh *iface, DWORD { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); - FIXME("(%p)->(%u,%p): stub\n", This, flags, data); + TRACE("(%p)->(%u,%p)\n", This, flags, data); - return E_NOTIMPL; + InterlockedIncrement(&This->attrib_buffer_lock_count); + + *data = This->attrib_buffer; + + return D3D_OK; } static HRESULT WINAPI ID3DXMeshImpl_UnlockAttributeBuffer(ID3DXMesh *iface) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); + int lock_count; + + TRACE("(%p)\n", This); - FIXME("(%p): stub\n", This); + lock_count = InterlockedDecrement(&This->attrib_buffer_lock_count); - return E_NOTIMPL; + if (lock_count < 0) { + InterlockedIncrement(&This->attrib_buffer_lock_count); + return D3DERR_INVALIDCALL; + } + + return D3D_OK; } static HRESULT WINAPI ID3DXMeshImpl_Optimize(ID3DXMesh *iface, DWORD flags, CONST DWORD *adjacency_in, DWORD *adjacency_out, @@ -1131,6 +1146,7 @@ HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, IDirect3DVertexDeclaration9 *vertex_declaration; IDirect3DVertexBuffer9 *vertex_buffer; IDirect3DIndexBuffer9 *index_buffer; + DWORD *attrib_buffer; ID3DXMeshImpl *object; DWORD index_usage = 0; D3DPOOL index_pool = D3DPOOL_DEFAULT; @@ -1242,9 +1258,11 @@ HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, return hr; } + attrib_buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, numfaces * sizeof(*attrib_buffer)); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXMeshImpl)); - if (object == NULL) + if (object == NULL || attrib_buffer == NULL) { + HeapFree(GetProcessHeap(), 0, attrib_buffer); IDirect3DIndexBuffer9_Release(index_buffer); IDirect3DVertexBuffer9_Release(vertex_buffer); IDirect3DVertexDeclaration9_Release(vertex_declaration); @@ -1264,6 +1282,7 @@ HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, object->vertex_declaration = vertex_declaration; object->vertex_buffer = vertex_buffer; object->index_buffer = index_buffer; + object->attrib_buffer = attrib_buffer; *mesh = &object->ID3DXMesh_iface;

1 0

Dylan Smith : d3dx9: Implement GetAttributeTable and SetAttributeTable.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: e2d7fdf1f91ea669e599f7b5ab8dd53aafb68af0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d7fdf1f91ea669e599f7b5a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Apr 27 18:12:14 2011 -0400 d3dx9: Implement GetAttributeTable and SetAttributeTable. --- dlls/d3dx9_36/mesh.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 8928536..e67dffa 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -50,6 +50,8 @@ typedef struct ID3DXMeshImpl IDirect3DIndexBuffer9 *index_buffer; DWORD *attrib_buffer; int attrib_buffer_lock_count; + DWORD attrib_table_size; + D3DXATTRIBUTERANGE *attrib_table; } ID3DXMeshImpl; static inline ID3DXMeshImpl *impl_from_ID3DXMesh(ID3DXMesh *iface) @@ -100,6 +102,7 @@ static ULONG WINAPI ID3DXMeshImpl_Release(ID3DXMesh *iface) IDirect3DVertexDeclaration9_Release(This->vertex_declaration); IDirect3DDevice9_Release(This->device); HeapFree(GetProcessHeap(), 0, This->attrib_buffer); + HeapFree(GetProcessHeap(), 0, This->attrib_table); HeapFree(GetProcessHeap(), 0, This); } @@ -278,9 +281,15 @@ static HRESULT WINAPI ID3DXMeshImpl_GetAttributeTable(ID3DXMesh *iface, D3DXATTR { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); - FIXME("(%p)->(%p,%p): stub\n", This, attrib_table, attrib_table_size); + TRACE("(%p)->(%p,%p)\n", This, attrib_table, attrib_table_size); - return E_NOTIMPL; + if (attrib_table_size) + *attrib_table_size = This->attrib_table_size; + + if (attrib_table) + CopyMemory(attrib_table, This->attrib_table, This->attrib_table_size * sizeof(*attrib_table)); + + return D3D_OK; } static HRESULT WINAPI ID3DXMeshImpl_ConvertPointRepsToAdjacency(ID3DXMesh *iface, CONST DWORD *point_reps, DWORD *adjacency) @@ -480,6 +489,13 @@ static HRESULT WINAPI ID3DXMeshImpl_LockAttributeBuffer(ID3DXMesh *iface, DWORD InterlockedIncrement(&This->attrib_buffer_lock_count); + if (!(flags & D3DLOCK_READONLY)) { + D3DXATTRIBUTERANGE *attrib_table = This->attrib_table; + This->attrib_table_size = 0; + This->attrib_table = NULL; + HeapFree(GetProcessHeap(), 0, attrib_table); + } + *data = This->attrib_buffer; return D3D_OK; @@ -525,10 +541,26 @@ static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flag static HRESULT WINAPI ID3DXMeshImpl_SetAttributeTable(ID3DXMesh *iface, CONST D3DXATTRIBUTERANGE *attrib_table, DWORD attrib_table_size) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); + D3DXATTRIBUTERANGE *new_table = NULL; - FIXME("(%p)->(%p,%u): stub\n", This, attrib_table, attrib_table_size); + TRACE("(%p)->(%p,%u)\n", This, attrib_table, attrib_table_size); - return E_NOTIMPL; + if (attrib_table_size) { + size_t size = attrib_table_size * sizeof(*attrib_table); + + new_table = HeapAlloc(GetProcessHeap(), 0, size); + if (!new_table) + return E_OUTOFMEMORY; + + CopyMemory(new_table, attrib_table, size); + } else if (attrib_table) { + return D3DERR_INVALIDCALL; + } + HeapFree(GetProcessHeap(), 0, This->attrib_table); + This->attrib_table = new_table; + This->attrib_table_size = attrib_table_size; + + return D3D_OK; } static const struct ID3DXMeshVtbl D3DXMesh_Vtbl =

1 0

Dylan Smith : d3dx9: Implement ID3DXMesh::DrawSubset.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 417534fdb7e955c8c6d670de3b3c4179ebc65a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=417534fdb7e955c8c6d670de3… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Apr 27 18:12:20 2011 -0400 d3dx9: Implement ID3DXMesh::DrawSubset. --- dlls/d3dx9_36/mesh.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index e67dffa..201b2b3 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -113,10 +113,43 @@ static ULONG WINAPI ID3DXMeshImpl_Release(ID3DXMesh *iface) static HRESULT WINAPI ID3DXMeshImpl_DrawSubset(ID3DXMesh *iface, DWORD attrib_id) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); + HRESULT hr; + DWORD face_start; + DWORD face_end = 0; + DWORD vertex_size; - FIXME("(%p)->(%u): stub\n", This, attrib_id); + TRACE("(%p)->(%u)\n", This, attrib_id); - return E_NOTIMPL; + vertex_size = iface->lpVtbl->GetNumBytesPerVertex(iface); + + hr = IDirect3DDevice9_SetVertexDeclaration(This->device, This->vertex_declaration); + if (FAILED(hr)) return hr; + hr = IDirect3DDevice9_SetStreamSource(This->device, 0, This->vertex_buffer, 0, vertex_size); + if (FAILED(hr)) return hr; + hr = IDirect3DDevice9_SetIndices(This->device, This->index_buffer); + if (FAILED(hr)) return hr; + + while (face_end < This->numfaces) + { + for (face_start = face_end; face_start < This->numfaces; face_start++) + { + if (This->attrib_buffer[face_start] == attrib_id) + break; + } + if (face_start >= This->numfaces) + break; + for (face_end = face_start + 1; face_end < This->numfaces; face_end++) + { + if (This->attrib_buffer[face_end] != attrib_id) + break; + } + + hr = IDirect3DDevice9_DrawIndexedPrimitive(This->device, D3DPT_TRIANGLELIST, + 0, 0, This->numvertices, face_start * 3, face_end - face_start); + if (FAILED(hr)) return hr; + } + + return D3D_OK; } static DWORD WINAPI ID3DXMeshImpl_GetNumFaces(ID3DXMesh *iface)

1 0

Piotr Caban : msvcrt: Added wcsrtombs implementation.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 168909283c371f42a3b5074b96f1fe3e91c9a956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=168909283c371f42a3b5074b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 27 20:08:41 2011 +0200 msvcrt: Added wcsrtombs implementation. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvcrt/tests/string.c | 22 ++++++++++++ dlls/msvcrt/wcs.c | 78 ++++++++++++++++++++++++++++++++++--------- 7 files changed, 93 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=168909283c371f42a3b50…

1 0

Piotr Caban : msvcrt: Added _set_printf_count_output and _get_printf_count_output implementation .
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 6ecabf7cae3145931889eed5466b51740eddd1c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ecabf7cae3145931889eed54… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 27 20:09:00 2011 +0200 msvcrt: Added _set_printf_count_output and _get_printf_count_output implementation. --- dlls/msvcr100/msvcr100.c | 3 ++- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr80/Makefile.in | 2 ++ dlls/msvcr80/msvcr80.c | 2 ++ dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.c | 2 ++ dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 2 ++ dlls/msvcrt/printf.h | 10 +++++++++- dlls/msvcrt/wcs.c | 16 ++++++++++++++++ include/msvcrt/stdio.h | 2 ++ 11 files changed, 43 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 274d4c7..5ea84d1 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -20,7 +20,7 @@ #include <stdarg.h> -#include "stdlib.h" +#include "stdio.h" #include "windef.h" #include "winbase.h" @@ -37,6 +37,7 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hdll); + _set_printf_count_output(0); } return TRUE; } diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4a724bc..8ef8eac 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -686,7 +686,7 @@ @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @ cdecl _get_output_format() msvcrt._get_output_format @ stub _get_pgmptr -@ stub _get_printf_count_output +@ cdecl _get_printf_count_output() msvcrt._get_printf_count_output @ stub _get_purecall_handler @ cdecl _get_terminate() msvcrt._get_terminate @ stub _get_timezone @@ -1077,7 +1077,7 @@ @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait @ stub _set_output_format -@ stub _set_printf_count_output +@ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _seterrormode(long) msvcrt._seterrormode @ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index 17f3f66..760f1bf 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -1,5 +1,7 @@ MODULE = msvcr80.dll IMPORTS = msvcrt +MODCFLAGS = @BUILTINFLAG@ +EXTRAINCL = -I$(top_srcdir)/include/msvcrt C_SRCS = \ msvcr80.c diff --git a/dlls/msvcr80/msvcr80.c b/dlls/msvcr80/msvcr80.c index 3f81dcb..3953e0e 100644 --- a/dlls/msvcr80/msvcr80.c +++ b/dlls/msvcr80/msvcr80.c @@ -20,6 +20,7 @@ #include <stdarg.h> +#include "stdio.h" #include "windef.h" #include "winbase.h" @@ -32,6 +33,7 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hdll); + _set_printf_count_output(0); } return TRUE; } diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3f5bd04..05e179a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -530,7 +530,7 @@ @ stub _get_osver @ cdecl _get_output_format() msvcrt._get_output_format @ stub _get_pgmptr -@ stub _get_printf_count_output +@ cdecl _get_printf_count_output() msvcrt._get_printf_count_output @ stub _get_purecall_handler @ cdecl _get_sbh_threshold() msvcrt._get_sbh_threshold @ cdecl _get_terminate() msvcrt._get_terminate @@ -930,7 +930,7 @@ @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait @ stub _set_output_format -@ stub _set_printf_count_output +@ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold @ cdecl _seterrormode(long) msvcrt._seterrormode diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index fe563e3..fd24f11 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -22,6 +22,7 @@ #include <stdarg.h> #include "stdlib.h" +#include "stdio.h" #include "errno.h" #include "malloc.h" #include "windef.h" @@ -101,6 +102,7 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hdll); + _set_printf_count_output(0); } return TRUE; } diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c7efd3a..9bc984f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -520,7 +520,7 @@ @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @ cdecl _get_output_format() msvcrt._get_output_format @ stub _get_pgmptr -@ stub _get_printf_count_output +@ cdecl _get_printf_count_output() msvcrt._get_printf_count_output @ stub _get_purecall_handler @ cdecl _get_sbh_threshold() msvcrt._get_sbh_threshold @ cdecl _get_terminate() msvcrt._get_terminate @@ -916,7 +916,7 @@ @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait @ stub _set_output_format -@ stub _set_printf_count_output +@ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold @ cdecl _seterrormode(long) msvcrt._seterrormode diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 94064fe..8baa37e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1491,3 +1491,5 @@ @ cdecl -arch=i386 _statusfp2(ptr ptr) @ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l @ cdecl _wdupenv_s(ptr ptr str) +@ cdecl _get_printf_count_output() +@ cdecl _set_printf_count_output(long) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 0198756..64d159e 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -491,7 +491,15 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API i = FUNC_NAME(pf_output_format_str)(pf_puts, puts_ctx, buf, -1, &flags, locale); #endif } else if(flags.Format == 'n') { - int *used = pf_args(args_ctx, pos, VT_PTR, &valist).get_ptr; + int *used; + + if(!n_format_enabled) { + MSVCRT_INVALID_PMT("\'n\' format specifier disabled"); + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + + used = pf_args(args_ctx, pos, VT_PTR, &valist).get_ptr; *used = written; i = 0; } else if(flags.Format && strchr("diouxX", flags.Format)) { diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 5a7a43c..527bcff 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -33,11 +33,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +static BOOL n_format_enabled = TRUE; + #include "printf.h" #define PRINTF_WIDE #include "printf.h" #undef PRINTF_WIDE +/* _get_printf_count_output - not exported in native msvcrt */ +int CDECL _get_printf_count_output( void ) +{ + return n_format_enabled ? 1 : 0; +} + +/* _set_printf_count_output - not exported in native msvcrt */ +int CDECL _set_printf_count_output( int enable ) +{ + BOOL old = n_format_enabled; + n_format_enabled = (enable ? TRUE : FALSE); + return old ? 1 : 0; +} + /********************************************************************* * _wcsdup (MSVCRT.@) */ diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index c167110..4e43635 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -108,12 +108,14 @@ int __cdecl _flsbuf(int,FILE*); int __cdecl _flushall(void); int __cdecl _fputchar(int); FILE* __cdecl _fsopen(const char*,const char*,int); +int __cdecl _get_printf_count_output(void); int __cdecl _getmaxstdio(void); int __cdecl _getw(FILE*); int __cdecl _pclose(FILE*); FILE* __cdecl _popen(const char*,const char*); int __cdecl _putw(int,FILE*); int __cdecl _rmtmp(void); +int __cdecl _set_printf_count_output(int); int __cdecl _setmaxstdio(int); int __cdecl _snprintf(char*,size_t,const char*,...); int __cdecl _snprintf_s(char*,size_t,size_t,const char*,...);

1 0

Henri Verbeet : wined3d: Merge the IWineD3DSurface::PreLoad() implementations.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 13146e216f0dd3e55326af74883fa23c9acd0a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=13146e216f0dd3e55326af748… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 27 20:21:39 2011 +0200 wined3d: Merge the IWineD3DSurface::PreLoad() implementations. --- dlls/wined3d/surface.c | 41 ++++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 09c07fc..34be870 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -755,6 +755,13 @@ static HRESULT surface_draw_overlay(IWineD3DSurfaceImpl *surface) return hr; } +static void surface_preload(IWineD3DSurfaceImpl *surface) +{ + TRACE("surface %p.\n", surface); + + surface_internal_preload(surface, SRGB_ANY); +} + static void surface_map(IWineD3DSurfaceImpl *surface, const RECT *rect, DWORD flags) { IWineD3DDeviceImpl *device = surface->resource.device; @@ -1036,6 +1043,7 @@ static const struct wined3d_surface_ops surface_ops = surface_cleanup, surface_realize_palette, surface_draw_overlay, + surface_preload, surface_map, surface_unmap, }; @@ -1153,6 +1161,13 @@ static HRESULT gdi_surface_draw_overlay(IWineD3DSurfaceImpl *surface) return E_FAIL; } +static void gdi_surface_preload(IWineD3DSurfaceImpl *surface) +{ + TRACE("surface %p.\n", surface); + + ERR("Preloading GDI surfaces is not supported.\n"); +} + static void gdi_surface_map(IWineD3DSurfaceImpl *surface, const RECT *rect, DWORD flags) { TRACE("surface %p, rect %s, flags %#x.\n", @@ -1190,6 +1205,7 @@ static const struct wined3d_surface_ops gdi_surface_ops = surface_gdi_cleanup, gdi_surface_realize_palette, gdi_surface_draw_overlay, + gdi_surface_preload, gdi_surface_map, gdi_surface_unmap, }; @@ -2097,6 +2113,15 @@ static DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) return resource_get_priority(&((IWineD3DSurfaceImpl *)iface)->resource); } +static void WINAPI IWineD3DBaseSurfaceImpl_PreLoad(IWineD3DSurface *iface) +{ + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; + + TRACE("iface %p.\n", iface); + + surface->surface_ops->surface_preload(surface); +} + static void * WINAPI IWineD3DBaseSurfaceImpl_GetParent(IWineD3DSurface *iface) { TRACE("iface %p.\n", iface); @@ -3848,11 +3873,6 @@ void surface_internal_preload(IWineD3DSurfaceImpl *surface, enum WINED3DSRGB srg } } -static void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) -{ - surface_internal_preload((IWineD3DSurfaceImpl *)iface, SRGB_ANY); -} - BOOL surface_init_sysmem(IWineD3DSurfaceImpl *surface) { if (!surface->resource.allocatedMemory) @@ -6969,7 +6989,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DBaseSurfaceImpl_FreePrivateData, IWineD3DBaseSurfaceImpl_SetPriority, IWineD3DBaseSurfaceImpl_GetPriority, - IWineD3DSurfaceImpl_PreLoad, + IWineD3DBaseSurfaceImpl_PreLoad, /* IWineD3DSurface */ IWineD3DBaseSurfaceImpl_GetResource, IWineD3DBaseSurfaceImpl_Map, @@ -7243,13 +7263,6 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return TRUE; } -static void WINAPI IWineGDISurfaceImpl_PreLoad(IWineD3DSurface *iface) -{ - ERR("(%p): PreLoad is not supported on X11 surfaces!\n", iface); - ERR("(%p): Most likely the parent library did something wrong.\n", iface); - ERR("(%p): Please report to wine-devel\n", iface); -} - /***************************************************************************** * IWineD3DSurface::Flip, GDI version * @@ -7455,7 +7468,7 @@ static const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DBaseSurfaceImpl_FreePrivateData, IWineD3DBaseSurfaceImpl_SetPriority, IWineD3DBaseSurfaceImpl_GetPriority, - IWineGDISurfaceImpl_PreLoad, + IWineD3DBaseSurfaceImpl_PreLoad, /* IWineD3DSurface */ IWineD3DBaseSurfaceImpl_GetResource, IWineD3DBaseSurfaceImpl_Map, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 45fcd91..e8208bd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2024,6 +2024,7 @@ struct wined3d_surface_ops void (*surface_cleanup)(struct IWineD3DSurfaceImpl *surface); void (*surface_realize_palette)(struct IWineD3DSurfaceImpl *surface); HRESULT (*surface_draw_overlay)(struct IWineD3DSurfaceImpl *surface); + void (*surface_preload)(struct IWineD3DSurfaceImpl *surface); void (*surface_map)(struct IWineD3DSurfaceImpl *surface, const RECT *rect, DWORD flags); void (*surface_unmap)(struct IWineD3DSurfaceImpl *surface); };

1 0

Henri Verbeet : wined3d: Merge the IWineD3DSurface::GetDC() implementations .
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: dcaca7225b6653952afcbf514cf8c547fb2f2936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcaca7225b6653952afcbf514… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 27 20:21:40 2011 +0200 wined3d: Merge the IWineD3DSurface::GetDC() implementations. --- dlls/wined3d/surface.c | 443 ++++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 200 insertions(+), 244 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dcaca7225b6653952afcb…

1 0

Henri Verbeet : wined3d: Merge the IWineD3DSurface::ReleaseDC() implementations.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: a5febcf7a1cc84ae43fe1ed18fb3265fe3164abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5febcf7a1cc84ae43fe1ed18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 27 20:21:41 2011 +0200 wined3d: Merge the IWineD3DSurface::ReleaseDC() implementations. --- dlls/wined3d/surface.c | 86 ++++++++++++++++++------------------------------ 1 files changed, 32 insertions(+), 54 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d384f6e..48bb253 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3979,6 +3979,36 @@ static HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDC(IWineD3DSurface *iface, HDC return WINED3D_OK; } +static HRESULT WINAPI IWineD3DBaseSurfaceImpl_ReleaseDC(IWineD3DSurface *iface, HDC dc) +{ + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; + + TRACE("iface %p, dc %p.\n", iface, dc); + + if (!(surface->flags & SFLAG_DCINUSE)) + return WINEDDERR_NODC; + + if (surface->hDC != dc) + { + WARN("Application tries to release invalid DC %p, surface DC is %p.\n", + dc, surface->hDC); + return WINEDDERR_NODC; + } + + if ((surface->flags & SFLAG_PBO) && surface->resource.allocatedMemory) + { + /* Copy the contents of the DIB over to the PBO. */ + memcpy(surface->resource.allocatedMemory, surface->dib.bitmap_data, surface->dib.bitmap_size); + } + + /* We locked first, so unlock now. */ + IWineD3DSurface_Unmap(iface); + + surface->flags &= ~SFLAG_DCINUSE; + + return WINED3D_OK; +} + /* **************************************************** IWineD3DSurface IWineD3DResource parts follow **************************************************** */ @@ -4469,34 +4499,6 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *surface, context_release(context); } -static HRESULT WINAPI IWineD3DSurfaceImpl_ReleaseDC(IWineD3DSurface *iface, HDC hDC) -{ - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - - TRACE("(%p)->(%p)\n",This,hDC); - - if (!(This->flags & SFLAG_DCINUSE)) - return WINEDDERR_NODC; - - if (This->hDC !=hDC) { - WARN("Application tries to release an invalid DC(%p), surface dc is %p\n", hDC, This->hDC); - return WINEDDERR_NODC; - } - - if ((This->flags & SFLAG_PBO) && This->resource.allocatedMemory) - { - /* Copy the contents of the DIB over to the PBO */ - memcpy(This->resource.allocatedMemory, This->dib.bitmap_data, This->dib.bitmap_size); - } - - /* we locked first, so unlock now */ - IWineD3DSurface_Unmap(iface); - - This->flags &= ~SFLAG_DCINUSE; - - return WINED3D_OK; -} - /* ****************************************************** IWineD3DSurface Internal (No mapping to directx api) parts follow ****************************************************** */ @@ -7033,7 +7035,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DBaseSurfaceImpl_Map, IWineD3DBaseSurfaceImpl_Unmap, IWineD3DBaseSurfaceImpl_GetDC, - IWineD3DSurfaceImpl_ReleaseDC, + IWineD3DBaseSurfaceImpl_ReleaseDC, IWineD3DSurfaceImpl_Flip, IWineD3DSurfaceImpl_Blt, IWineD3DBaseSurfaceImpl_GetBltStatus, @@ -7333,30 +7335,6 @@ static HRESULT WINAPI IWineGDISurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DS return hr; } -static HRESULT WINAPI IWineGDISurfaceImpl_ReleaseDC(IWineD3DSurface *iface, HDC dc) -{ - IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; - - TRACE("iface %p, dc %p.\n", iface, dc); - - if (!(surface->flags & SFLAG_DCINUSE)) - return WINEDDERR_NODC; - - if (surface->hDC != dc) - { - WARN("Application tries to release invalid DC %p, surface DC is %p.\n", - dc, surface->hDC); - return WINEDDERR_NODC; - } - - /* We locked first, so unlock now. */ - IWineD3DSurface_Unmap(iface); - - surface->flags &= ~SFLAG_DCINUSE; - - return WINED3D_OK; -} - static HRESULT WINAPI IWineGDISurfaceImpl_SetMem(IWineD3DSurface *iface, void *mem) { IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; @@ -7429,7 +7407,7 @@ static const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DBaseSurfaceImpl_Map, IWineD3DBaseSurfaceImpl_Unmap, IWineD3DBaseSurfaceImpl_GetDC, - IWineGDISurfaceImpl_ReleaseDC, + IWineD3DBaseSurfaceImpl_ReleaseDC, IWineGDISurfaceImpl_Flip, IWineD3DBaseSurfaceImpl_Blt, IWineD3DBaseSurfaceImpl_GetBltStatus,

1 0

Henri Verbeet : wined3d: Merge the IWineD3DSurface::SetMem() implementations.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 92120cb52782579b92d79852e43b3ce3042602ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=92120cb52782579b92d79852e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 27 20:21:42 2011 +0200 wined3d: Merge the IWineD3DSurface::SetMem() implementations. --- dlls/wined3d/surface.c | 240 ++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 124 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92120cb52782579b92d79…

1 0

Henri Verbeet : wined3d: Merge the IWineD3DSurface::SetFormat() implementations.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: c5baf8f237a4682910147e174a16aa3200268a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5baf8f237a4682910147e174… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 27 20:21:43 2011 +0200 wined3d: Merge the IWineD3DSurface::SetFormat() implementations. --- dlls/wined3d/surface.c | 21 ++++----------------- 1 files changed, 4 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b1cbcd7..80c9263 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2712,9 +2712,12 @@ static HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetFormat(IWineD3DSurface *iface, 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->flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); 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; } @@ -4993,22 +4996,6 @@ BOOL palette9_changed(IWineD3DSurfaceImpl *This) return TRUE; } -static HRESULT WINAPI IWineD3DSurfaceImpl_SetFormat(IWineD3DSurface *iface, enum wined3d_format_id format) -{ - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - HRESULT hr; - - TRACE("(%p) : Calling base function first\n", This); - hr = IWineD3DBaseSurfaceImpl_SetFormat(iface, format); - if (SUCCEEDED(hr)) - { - This->flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); - TRACE("(%p) : glFormat %d, glFormatInternal %d, glType %d\n", This, This->resource.format->glFormat, - This->resource.format->glInternal, This->resource.format->glType); - } - return hr; -} - void flip_surface(IWineD3DSurfaceImpl *front, IWineD3DSurfaceImpl *back) { /* Flip the surface contents */ @@ -7114,7 +7101,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DBaseSurfaceImpl_SetClipper, IWineD3DBaseSurfaceImpl_GetClipper, /* Internal use: */ - IWineD3DSurfaceImpl_SetFormat, + IWineD3DBaseSurfaceImpl_SetFormat, }; static HRESULT ffp_blit_alloc(IWineD3DDeviceImpl *device) { return WINED3D_OK; }

1 0