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

H. Verbeet : wined3d: Make bind_fbo a bit more generic.
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: 2e1e3d48f21e261376280cee2695393711308e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1e3d48f21e261376280cee2… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 9 01:53:47 2007 +0200 wined3d: Make bind_fbo a bit more generic. --- dlls/wined3d/device.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2b5a168..99f0690 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5093,14 +5093,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice return WINED3D_OK; } -static void bind_fbo(IWineD3DDevice *iface) { +static void bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - if (!This->fbo) { - GL_EXTCALL(glGenFramebuffersEXT(1, &This->fbo)); + if (!*fbo) { + GL_EXTCALL(glGenFramebuffersEXT(1, fbo)); checkGLcall("glGenFramebuffersEXT()"); } - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, This->fbo)); + GL_EXTCALL(glBindFramebufferEXT(target, *fbo)); checkGLcall("glBindFramebuffer()"); } @@ -5203,7 +5203,7 @@ void apply_fbo_state(IWineD3DDevice *iface) { unsigned int i; if (This->render_offscreen) { - bind_fbo(iface); + bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->fbo); /* Apply render targets */ for (i = 0; i < GL_LIMITS(buffers); ++i) { @@ -5787,13 +5787,13 @@ static void WINAPI IWineD3DDeviceImpl_ResourceReleased(IWineD3DDevice *iface, IW /* Cleanup any FBO attachments */ for (i = 0; i < GL_LIMITS(buffers); ++i) { if (This->fbo_color_attachments[i] == (IWineD3DSurface *)resource) { - bind_fbo(iface); + bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->fbo); set_render_target_fbo(iface, i, NULL); This->fbo_color_attachments[i] = NULL; } } if (This->fbo_depth_attachment == (IWineD3DSurface *)resource) { - bind_fbo(iface); + bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->fbo); set_depth_stencil_fbo(iface, NULL); This->fbo_depth_attachment = NULL; }

1 0

H. Verbeet : wined3d: Fixup FBO depth attachments when the depth attachment is larger than the render target .
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: c9b178b594ee5b0668cd05de821faa9a8313faba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b178b594ee5b0668cd05de8… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 9 01:53:32 2007 +0200 wined3d: Fixup FBO depth attachments when the depth attachment is larger than the render target. --- dlls/wined3d/device.c | 55 +++++++++++++++++++++++++++++--------- dlls/wined3d/drawprim.c | 5 +++ dlls/wined3d/surface.c | 57 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 12 ++++++++ 4 files changed, 116 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9b178b594ee5b0668cd0…

1 0

H. Verbeet : wined3d: Handle FBO attachments slightly more efficiently.
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: 3d4e054b552c4b3956b52b086b43857a84aaa187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d4e054b552c4b3956b52b086… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 9 01:53:27 2007 +0200 wined3d: Handle FBO attachments slightly more efficiently. --- dlls/wined3d/context.c | 5 +-- dlls/wined3d/device.c | 117 ++++++++++++++++++++++++++-------------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/drawprim.c | 18 ++----- dlls/wined3d/wined3d_private.h | 4 +- 5 files changed, 85 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d4e054b552c4b3956b52…

1 0

Alexandre Julliard : ntdll: Use send(2) instead of write(2) for zero-byte writes to sockets.
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: c915215ba6a7bae5d4f850e2c67f29c81df9a1a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c915215ba6a7bae5d4f850e2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 9 12:21:24 2007 +0200 ntdll: Use send(2) instead of write(2) for zero-byte writes to sockets. --- dlls/kernel32/tests/mailslot.c | 2 +- dlls/ntdll/file.c | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index 6eb8d8a..995f144 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -258,8 +258,8 @@ static int mailslot_test(void) dwNext = dwMsgCount = 0; ok( GetMailslotInfo( hSlot, NULL, &dwNext, &dwMsgCount, NULL ), "getmailslotinfo failed\n"); - todo_wine { ok( dwNext == 0, "dwNext incorrect\n"); + todo_wine { ok( dwMsgCount == 1, "dwMsgCount incorrect\n"); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 65710c5..0a7eccb 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -668,6 +668,7 @@ static void WINAPI FILE_AsyncWriteService(void *ovp, IO_STATUS_BLOCK *iosb, ULON { async_fileio *fileio = (async_fileio *) ovp; int result, fd, needs_close; + enum server_fd_type type; TRACE("(%p %p 0x%x)\n",iosb, fileio->buffer, status); @@ -676,12 +677,16 @@ static void WINAPI FILE_AsyncWriteService(void *ovp, IO_STATUS_BLOCK *iosb, ULON case STATUS_ALERTED: /* write some data (non-blocking) */ if ((status = server_get_unix_fd( fileio->handle, FILE_WRITE_DATA, &fd, - &needs_close, NULL, NULL ))) + &needs_close, &type, NULL ))) { fileio_terminate(fileio, iosb, status); break; } - result = write(fd, &fileio->buffer[fileio->already], fileio->count - fileio->already); + if (!fileio->count && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_PIPE || type == FD_TYPE_SOCKET)) + result = send( fd, fileio->buffer, 0, 0 ); + else + result = write( fd, &fileio->buffer[fileio->already], fileio->count - fileio->already ); + if (needs_close) close( fd ); if (result < 0) @@ -772,7 +777,13 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, for (;;) { - if ((result = write( unix_handle, (const char *)buffer + total, length - total )) >= 0) + /* zero-length writes on sockets may not work with plain write(2) */ + if (!length && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_PIPE || type == FD_TYPE_SOCKET)) + result = send( unix_handle, buffer, 0, 0 ); + else + result = write( unix_handle, (const char *)buffer + total, length - total ); + + if (result >= 0) { total += result; if (total == length)

1 0

Marcus Meissner : ntdll: Remove superflous NULL checks.
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: 6c2e14e5b0f47cd519431399b203716c34e5ed0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c2e14e5b0f47cd519431399b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 8 18:11:47 2007 +0200 ntdll: Remove superflous NULL checks. --- dlls/ntdll/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 0a7eccb..6584a92 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2119,8 +2119,8 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( PHANDLE handle, ULONG access, SERVER_START_REQ( create_named_pipe ) { req->access = access; - req->attributes = (attr) ? attr->Attributes : 0; - req->rootdir = attr ? attr->RootDirectory : 0; + req->attributes = attr->Attributes; + req->rootdir = attr->RootDirectory; req->options = options; req->flags = (pipe_type) ? NAMED_PIPE_MESSAGE_STREAM_WRITE : 0 |

1 0

Alexandre Julliard : ntdll: Add some test cases for asynchronous I/O.
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: a6ecf0a7a56262458e4c7aed1bdf29ffecddc72a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6ecf0a7a56262458e4c7aed1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 9 12:23:13 2007 +0200 ntdll: Add some test cases for asynchronous I/O. --- dlls/ntdll/tests/file.c | 298 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 298 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a6ecf0a7a56262458e4c7…

1 0

Andrew Talbot : kernel32: Remove superfluous semicolons.
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: a0b2dbd1dc515f2612e86db8ca82ea6ef64cc2b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b2dbd1dc515f2612e86db8c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Apr 8 16:26:07 2007 +0100 kernel32: Remove superfluous semicolons. --- dlls/kernel32/heap.c | 4 ++-- dlls/kernel32/thunk.c | 28 ++++++++++++++-------------- dlls/kernel32/vxd.c | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 11aa580..dfaf69a 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1155,7 +1155,7 @@ void WINAPI __regs_AllocMappedBuffer( } } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( AllocMappedBuffer, 0, 0 ); +DEFINE_REGS_ENTRYPOINT( AllocMappedBuffer, 0, 0 ) #endif /********************************************************************** @@ -1180,7 +1180,7 @@ void WINAPI __regs_FreeMappedBuffer( } } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( FreeMappedBuffer, 0, 0 ); +DEFINE_REGS_ENTRYPOINT( FreeMappedBuffer, 0, 0 ) #endif /*********************************************************************** diff --git a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c index 5e10a5d..096d6b3 100644 --- a/dlls/kernel32/thunk.c +++ b/dlls/kernel32/thunk.c @@ -192,7 +192,7 @@ void WINAPI __regs_LogApiThkLSF( LPSTR func, CONTEXT86 *context ) TRACE( "%s\n", debugstr_a(func) ); } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( LogApiThkLSF, 4, 4 ); +DEFINE_REGS_ENTRYPOINT( LogApiThkLSF, 4, 4 ) #endif /*********************************************************************** @@ -205,7 +205,7 @@ void WINAPI __regs_LogApiThkSL( LPSTR func, CONTEXT86 *context ) TRACE( "%s\n", debugstr_a(func) ); } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( LogApiThkSL, 4, 4 ); +DEFINE_REGS_ENTRYPOINT( LogApiThkSL, 4, 4 ) #endif /*********************************************************************** @@ -218,7 +218,7 @@ void WINAPI __regs_LogCBThkSL( LPSTR func, CONTEXT86 *context ) TRACE( "%s\n", debugstr_a(func) ); } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( LogCBThkSL, 4, 4 ); +DEFINE_REGS_ENTRYPOINT( LogCBThkSL, 4, 4 ) #endif /*********************************************************************** @@ -487,7 +487,7 @@ void WINAPI __regs_QT_Thunk( CONTEXT86 *context ) ( OFFSETOF(NtCurrentTeb()->WOW32Reserved) - argsize ); } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( QT_Thunk, 0, 0 ); +DEFINE_REGS_ENTRYPOINT( QT_Thunk, 0, 0 ) #endif @@ -555,7 +555,7 @@ void WINAPI __regs_FT_Prolog( CONTEXT86 *context ) *(DWORD *)(context->Ebp - 52) = context->Edx; } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( FT_Prolog, 0, 0 ); +DEFINE_REGS_ENTRYPOINT( FT_Prolog, 0, 0 ) #endif /********************************************************************** @@ -623,7 +623,7 @@ void WINAPI __regs_FT_Thunk( CONTEXT86 *context ) memcpy( oldstack, newstack, argsize ); } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( FT_Thunk, 0, 0 ); +DEFINE_REGS_ENTRYPOINT( FT_Thunk, 0, 0 ) #endif #ifdef __i386__ @@ -779,7 +779,7 @@ void WINAPI __regs_Common32ThkLS( CONTEXT86 *context ) context->Esp += LOBYTE(context16.Ebx); } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( Common32ThkLS, 0, 0 ); +DEFINE_REGS_ENTRYPOINT( Common32ThkLS, 0, 0 ) #endif /*********************************************************************** @@ -836,7 +836,7 @@ void WINAPI __regs_OT_32ThkLSF( CONTEXT86 *context ) ( OFFSETOF(NtCurrentTeb()->WOW32Reserved) - argsize ); } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( OT_32ThkLSF, 0, 0 ); +DEFINE_REGS_ENTRYPOINT( OT_32ThkLSF, 0, 0 ) #endif /*********************************************************************** @@ -938,7 +938,7 @@ void WINAPI __regs_FT_PrologPrime( CONTEXT86 *context ) context->Eip = (DWORD)relayCode; } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( FT_PrologPrime, 0, 0 ); +DEFINE_REGS_ENTRYPOINT( FT_PrologPrime, 0, 0 ) #endif /*********************************************************************** @@ -970,7 +970,7 @@ void WINAPI __regs_QT_ThunkPrime( CONTEXT86 *context ) context->Eip = (DWORD)relayCode; } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( QT_ThunkPrime, 0, 0 ); +DEFINE_REGS_ENTRYPOINT( QT_ThunkPrime, 0, 0 ) #endif /*********************************************************************** @@ -1113,7 +1113,7 @@ void WINAPI __regs_W32S_BackTo32( CONTEXT86 *context ) context->Eip = stack32_pop(context); } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( W32S_BackTo32, 0, 0 ); +DEFINE_REGS_ENTRYPOINT( W32S_BackTo32, 0, 0 ) #endif /********************************************************************** @@ -1291,7 +1291,7 @@ void WINAPI __regs_K32Thk1632Prolog( CONTEXT86 *context ) ReleaseThunkLock(&CURRENT_STACK16->entry_point); } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( K32Thk1632Prolog, 0, 0 ); +DEFINE_REGS_ENTRYPOINT( K32Thk1632Prolog, 0, 0 ) #endif /*********************************************************************** @@ -1328,7 +1328,7 @@ void WINAPI __regs_K32Thk1632Epilog( CONTEXT86 *context ) } } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( K32Thk1632Epilog, 0, 0 ); +DEFINE_REGS_ENTRYPOINT( K32Thk1632Epilog, 0, 0 ) #endif /********************************************************************* @@ -2140,7 +2140,7 @@ void WINAPI __regs_CommonUnimpStub( CONTEXT86 *context ) context->Esp += (context->Ecx & 0x0f) * 4; } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( CommonUnimpStub, 0, 0 ); +DEFINE_REGS_ENTRYPOINT( CommonUnimpStub, 0, 0 ) #endif /********************************************************************** diff --git a/dlls/kernel32/vxd.c b/dlls/kernel32/vxd.c index bd984da..875aeed 100644 --- a/dlls/kernel32/vxd.c +++ b/dlls/kernel32/vxd.c @@ -294,7 +294,7 @@ void WINAPI __regs_VxDCall( DWORD service, CONTEXT86 *context ) } } #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( VxDCall, 4, 4 ); +DEFINE_REGS_ENTRYPOINT( VxDCall, 4, 4 ) #endif

1 0

Andrew Talbot : mapi32: Void functions should not return a value.
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: f2acf60044a261e6580a4bc8014f6e9a15642198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2acf60044a261e6580a4bc80… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Apr 8 16:52:06 2007 +0100 mapi32: Void functions should not return a value. --- dlls/mapi32/prop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 3c0bd83..484e64a 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -665,7 +665,7 @@ VOID WINAPI FreePadrlist(LPADRLIST lpAddrs) TRACE("(%p)\n", lpAddrs); /* Structures are binary compatible; use the same implementation */ - return FreeProws((LPSRowSet)lpAddrs); + FreeProws((LPSRowSet)lpAddrs); } /*************************************************************************

1 0

Dmitry Timoshkov : winebuild: Check if a given forward does exist in one of the imported dlls, fix a couple of problems detected.
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: d57872567dad54da0ee4c5742108e5387986b2bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57872567dad54da0ee4c5742… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 9 14:40:57 2007 +0900 winebuild: Check if a given forward does exist in one of the imported dlls, fix a couple of problems detected. --- dlls/imm32/imm32.spec | 2 +- dlls/w32skrnl/Makefile.in | 2 +- tools/winebuild/import.c | 42 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 0134954..1ab4993 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -93,7 +93,7 @@ @ stdcall ImmSetCompositionStringW(long long ptr long ptr long) @ stdcall ImmSetCompositionWindow(long ptr) @ stdcall ImmSetConversionStatus(long long long) -@ stdcall ImmSetHotKey(long long long ptr) user32.CliImmSetHotKey +#@ stdcall ImmSetHotKey(long long long ptr) user32.CliImmSetHotKey @ stdcall ImmSetOpenStatus(long long) @ stdcall ImmSetStatusWindowPos(long ptr) @ stub ImmShowSoftKeyboard diff --git a/dlls/w32skrnl/Makefile.in b/dlls/w32skrnl/Makefile.in index 1f67722..61017ce 100644 --- a/dlls/w32skrnl/Makefile.in +++ b/dlls/w32skrnl/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = w32skrnl.dll -IMPORTS = kernel32 +IMPORTS = kernel32 ntdll C_SRCS = \ w32skernel.c \ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index c6a1e1b..44c7802 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -429,6 +429,42 @@ static int check_unused( const struct import* imp, const DLLSPEC *spec ) return 1; } +/* check if a given forward does exist in one of the imported dlls */ +static void check_undefined_forward( DLLSPEC *spec, ORDDEF *odp ) +{ + char *link_name, *api_name, *dll_name, *p; + int i, found = 0; + + assert( odp->flags & FLAG_FORWARD ); + + link_name = xstrdup( odp->link_name ); + p = strrchr( link_name, '.' ); + *p = 0; + api_name = p + 1; + dll_name = get_dll_name( link_name, NULL ); + + for (i = 0; i < nb_imports; i++) + { + struct import *imp = dll_imports[i]; + + if (!strcasecmp( imp->spec->file_name, dll_name )) + { + if (find_export( api_name, imp->exports, imp->nb_exports )) + { + found = 1; + break; + } + } + } + + free( link_name ); + free( dll_name ); + + if (!found) + warning( "%s:%d: forward '%s' not found in the imported dll list\n", + spec->src_name, odp->lineno, odp->link_name ); +} + /* flag the dll exports that link to an undefined symbol */ static void check_undefined_exports( DLLSPEC *spec ) { @@ -438,7 +474,11 @@ static void check_undefined_exports( DLLSPEC *spec ) { ORDDEF *odp = &spec->entry_points[i]; if (odp->type == TYPE_STUB) continue; - if (odp->flags & FLAG_FORWARD) continue; + if (odp->flags & FLAG_FORWARD) + { + check_undefined_forward( spec, odp ); + continue; + } if (find_name( odp->link_name, &undef_symbols )) { switch(odp->type)

1 0

Felix Nawothnig : wined3d: Issue an error when the render target is read back without SFLAG_INDRAWABLE being set .
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: e600f7d0822c58ed557fe4b3aaa729f67ce01f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e600f7d0822c58ed557fe4b3a… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Sun Apr 8 00:56:45 2007 +0200 wined3d: Issue an error when the render target is read back without SFLAG_INDRAWABLE being set. --- dlls/wined3d/surface.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index af90b61..526c311 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1788,6 +1788,7 @@ static BOOL palette9_changed(IWineD3DSurfaceImpl *This) { static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; GLenum format, internal, type; CONVERT_TYPES convert; int bpp; @@ -1862,7 +1863,13 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) { TRACE("Updated target %d\n", This->glDescription.target); } return WINED3D_OK; - } + } else + /* The only place where LoadTexture() might get called when isInDraw=1 + * is ActivateContext where lastActiveRenderTarget is preloaded. + */ + if(iface == device->lastActiveRenderTarget && device->isInDraw) + ERR("Reading back render target but SFLAG_INDRAWABLE not set\n"); + /* Otherwise: System memory copy must be most up to date */ if(This->CKeyFlags & DDSD_CKSRCBLT) {

1 0