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

H. Verbeet : wined3d: Add a function to determine if a surface is the front or the backbuffer for a swapchain , and return the corresponding GLenum.
by Alexandre Julliard 17 Apr '07

17 Apr '07

Module: wine Branch: master Commit: 1b9a5ba68225ebd6ab61219da003ec68a9eb0530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b9a5ba68225ebd6ab61219da… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 16 21:20:25 2007 +0200 wined3d: Add a function to determine if a surface is the front or the backbuffer for a swapchain, and return the corresponding GLenum. --- dlls/wined3d/surface.c | 17 +++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 117c457..049b827 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -287,6 +287,23 @@ void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, unsigned int wi checkGLcall("set_compatible_renderbuffer"); } +GLenum surface_get_gl_buffer(IWineD3DSurface *iface, IWineD3DSwapChain *swapchain) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + IWineD3DSwapChainImpl *swapchain_impl = (IWineD3DSwapChainImpl *)swapchain; + + TRACE("(%p) : swapchain %p\n", This, swapchain); + + if (swapchain_impl->backBuffer && swapchain_impl->backBuffer[0] == iface) { + TRACE("Returning GL_BACK\n"); + return GL_BACK; + } else if (swapchain_impl->frontBuffer == iface) { + TRACE("Returning GL_FRONT\n"); + return GL_FRONT; + } + + FIXME("Higher back buffer, returning GL_BACK\n"); + return GL_BACK; +} /* ******************************************* IWineD3DSurface IUnknown parts follow diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9fb4343..3de938a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1412,6 +1412,7 @@ void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, WINED3DT void set_texture_matrix(const float *smat, DWORD flags, BOOL calculatedCoords); void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, unsigned int width, unsigned int height); +GLenum surface_get_gl_buffer(IWineD3DSurface *iface, IWineD3DSwapChain *swapchain); int D3DFmtMakeGlCfg(WINED3DFORMAT BackBufferFormat, WINED3DFORMAT StencilBufferFormat, int *attribs, int* nAttribs, BOOL alternate);

1 0

H. Verbeet : wined3d: Use surface_get_gl_buffer where appropriate.
by Alexandre Julliard 17 Apr '07

17 Apr '07

Module: wine Branch: master Commit: 5fddfd5bbc6479a4aedb37cee51e5cb97374c26c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fddfd5bbc6479a4aedb37cee… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 16 21:20:32 2007 +0200 wined3d: Use surface_get_gl_buffer where appropriate. --- dlls/wined3d/surface.c | 52 ++++++++++++++--------------------------------- 1 files changed, 16 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 049b827..4067ac8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -809,19 +809,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED glReadBuffer(myDevice->offscreenBuffer); srcIsUpsideDown = TRUE; } else { - if(iface == swapchain->frontBuffer) { - TRACE("Locking the front buffer\n"); - glReadBuffer(GL_FRONT); - } else if(swapchain->backBuffer && iface == swapchain->backBuffer[0]) { - TRACE("Locking the back buffer\n"); - glReadBuffer(GL_BACK); - } else { - /* Ok, there is an issue: OpenGL does not guarant any back buffer number, so all we can do is to read GL_BACK - * and hope it gives what the app wants - */ - FIXME("Application is locking a 2nd or higher back buffer\n"); - glReadBuffer(GL_BACK); - } + GLenum buffer = surface_get_gl_buffer(iface, (IWineD3DSwapChain *)swapchain); + TRACE("Locking %#x buffer\n", buffer); + glReadBuffer(buffer); + checkGLcall("glReadBuffer"); + IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); srcIsUpsideDown = FALSE; } @@ -1207,19 +1199,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { glDrawBuffer(myDevice->offscreenBuffer); checkGLcall("glDrawBuffer(myDevice->offscreenBuffer)"); } else { - if(iface == swapchain->frontBuffer) { - TRACE("Onscreen front buffer\n"); - glDrawBuffer(GL_FRONT); - checkGLcall("glDrawBuffer(GL_FRONT)"); - } else if(iface == swapchain->backBuffer[0]) { - TRACE("Onscreen back buffer\n"); - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer(GL_BACK)"); - } else { - FIXME("Unlocking a higher back buffer\n"); - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer(GL_BACK)"); - } + GLenum buffer = surface_get_gl_buffer(iface, (IWineD3DSwapChain *)swapchain); + TRACE("Unlocking %#x buffer\n", buffer); + glDrawBuffer(buffer); + checkGLcall("glDrawBuffer"); + IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); } @@ -2364,10 +2348,9 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D checkGLcall("glBindTexture"); if(!swapchain) { glReadBuffer(myDevice->offscreenBuffer); - } else if(swapchain->backBuffer && SrcSurface == swapchain->backBuffer[0]) { - glReadBuffer(GL_BACK); } else { - glReadBuffer(GL_FRONT); + GLenum buffer = surface_get_gl_buffer(SrcSurface, (IWineD3DSwapChain *)swapchain); + glReadBuffer(buffer); } checkGLcall("glReadBuffer"); @@ -2877,14 +2860,11 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * if(!dstSwapchain) { TRACE("Drawing to offscreen buffer\n"); glDrawBuffer(myDevice->offscreenBuffer); - } else if(This == (IWineD3DSurfaceImpl *) dstSwapchain->frontBuffer) { - TRACE("Drawing to front buffer\n"); - glDrawBuffer(GL_FRONT); - checkGLcall("glDrawBuffer GL_FRONT"); } else { - TRACE("Drawing to back buffer\n"); - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer GL_BACK"); + GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This, (IWineD3DSwapChain *)dstSwapchain); + TRACE("Drawing to %#x buffer\n", buffer); + glDrawBuffer(buffer); + checkGLcall("glDrawBuffer"); } /* Bind the texture */

1 0

Alexandre Julliard : server: Implement the FSCTL_PIPE_DISCONNECT ioctl on the server side.
by Alexandre Julliard 17 Apr '07

17 Apr '07

Module: wine Branch: master Commit: 8c46095484f56a168eb76bb05bb77d49a9beb1b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c46095484f56a168eb76bb05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 16 14:51:29 2007 +0200 server: Implement the FSCTL_PIPE_DISCONNECT ioctl on the server side. --- dlls/kernel32/tests/pipe.c | 2 + dlls/ntdll/file.c | 14 ++---- include/wine/server_protocol.h | 17 +-------- server/named_pipe.c | 84 +++++++++++++++++++++------------------- server/protocol.def | 6 --- server/request.h | 2 - server/trace.c | 8 ---- 7 files changed, 52 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c46095484f56a168eb76…

1 0

Alexandre Julliard : server: Move the server part of device unmounting to the ioctl processing.
by Alexandre Julliard 17 Apr '07

17 Apr '07

Module: wine Branch: master Commit: 2669af73df3324a102de2355ea3752516be545e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2669af73df3324a102de2355e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 16 14:54:52 2007 +0200 server: Move the server part of device unmounting to the ioctl processing. --- dlls/ntdll/directory.c | 8 -------- dlls/ntdll/file.c | 4 +++- include/wine/server_protocol.h | 17 +---------------- server/fd.c | 35 ++++++++++++++++------------------- server/protocol.def | 6 ------ server/request.h | 2 -- server/trace.c | 8 -------- 7 files changed, 20 insertions(+), 60 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 6af4129..7045716 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2034,14 +2034,6 @@ NTSTATUS DIR_unmount_device( HANDLE handle ) NTSTATUS status; int unix_fd, needs_close; - SERVER_START_REQ( unmount_device ) - { - req->handle = handle; - status = wine_server_call( req ); - } - SERVER_END_REQ; - if (status) return status; - if (!(status = server_get_unix_fd( handle, 0, &unix_fd, &needs_close, NULL, NULL ))) { struct stat st; diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 9e46548..cb895ab 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1064,7 +1064,9 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc switch(code) { case FSCTL_DISMOUNT_VOLUME: - status = DIR_unmount_device( handle ); + status = server_ioctl_file( handle, event, apc, apc_context, io, code, + in_buffer, in_size, out_buffer, out_size ); + if (!status) status = DIR_unmount_device( handle ); break; case FSCTL_PIPE_LISTEN: diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index b134513..c686113 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1140,18 +1140,6 @@ struct unlock_file_reply -struct unmount_device_request -{ - struct request_header __header; - obj_handle_t handle; -}; -struct unmount_device_reply -{ - struct reply_header __header; -}; - - - struct create_socket_request { struct request_header __header; @@ -4052,7 +4040,6 @@ enum request REQ_flush_file, REQ_lock_file, REQ_unlock_file, - REQ_unmount_device, REQ_create_socket, REQ_accept_socket, REQ_set_socket_event, @@ -4276,7 +4263,6 @@ union generic_request struct flush_file_request flush_file_request; struct lock_file_request lock_file_request; struct unlock_file_request unlock_file_request; - struct unmount_device_request unmount_device_request; struct create_socket_request create_socket_request; struct accept_socket_request accept_socket_request; struct set_socket_event_request set_socket_event_request; @@ -4498,7 +4484,6 @@ union generic_reply struct flush_file_reply flush_file_reply; struct lock_file_reply lock_file_reply; struct unlock_file_reply unlock_file_reply; - struct unmount_device_reply unmount_device_reply; struct create_socket_reply create_socket_reply; struct accept_socket_reply accept_socket_reply; struct set_socket_event_reply set_socket_event_reply; @@ -4675,6 +4660,6 @@ union generic_reply struct allocate_locally_unique_id_reply allocate_locally_unique_id_reply; }; -#define SERVER_PROTOCOL_VERSION 294 +#define SERVER_PROTOCOL_VERSION 295 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/fd.c b/server/fd.c index 37ddefb..adcaa20 100644 --- a/server/fd.c +++ b/server/fd.c @@ -77,6 +77,7 @@ #include "request.h" #include "winternl.h" +#include "winioctl.h" #if defined(HAVE_SYS_EPOLL_H) && defined(HAVE_EPOLL_CREATE) # include <sys/epoll.h> @@ -1686,13 +1687,6 @@ void default_poll_event( struct fd *fd, int event ) else if (!fd->inode) set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); } -/* default ioctl() routine */ -void default_fd_ioctl( struct fd *fd, unsigned int code, const async_data_t *async, - const void *data, data_size_t size ) -{ - set_error( STATUS_NOT_SUPPORTED ); -} - struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) { struct async_queue *queue; @@ -1833,6 +1827,21 @@ static void unmount_device( struct fd *device_fd ) release_object( device ); } +/* default ioctl() routine */ +void default_fd_ioctl( struct fd *fd, unsigned int code, const async_data_t *async, + const void *data, data_size_t size ) +{ + switch(code) + { + case FSCTL_DISMOUNT_VOLUME: + unmount_device( fd ); + break; + default: + set_error( STATUS_NOT_SUPPORTED ); + break; + } +} + /* same as get_handle_obj but retrieve the struct fd associated to the object */ static struct fd *get_handle_fd_obj( struct process *process, obj_handle_t handle, unsigned int access ) @@ -1913,18 +1922,6 @@ DECL_HANDLER(get_handle_fd) } } -/* get ready to unmount a Unix device */ -DECL_HANDLER(unmount_device) -{ - struct fd *fd; - - if ((fd = get_handle_fd_obj( current->process, req->handle, 0 ))) - { - unmount_device( fd ); - release_object( fd ); - } -} - /* perform an ioctl on a file */ DECL_HANDLER(ioctl) { diff --git a/server/protocol.def b/server/protocol.def index 8cc44fc..629c82b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -936,12 +936,6 @@ enum server_fd_type @END -/* Get ready to unmount a Unix device */ -(a)REQ(unmount_device) - obj_handle_t handle; /* handle to a file on the device */ -(a)END - - /* Create a socket */ @REQ(create_socket) unsigned int access; /* wanted access rights */ diff --git a/server/request.h b/server/request.h index fe0e87d..63a7ee4 100644 --- a/server/request.h +++ b/server/request.h @@ -152,7 +152,6 @@ DECL_HANDLER(get_handle_fd); DECL_HANDLER(flush_file); DECL_HANDLER(lock_file); DECL_HANDLER(unlock_file); -DECL_HANDLER(unmount_device); DECL_HANDLER(create_socket); DECL_HANDLER(accept_socket); DECL_HANDLER(set_socket_event); @@ -375,7 +374,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_flush_file, (req_handler)req_lock_file, (req_handler)req_unlock_file, - (req_handler)req_unmount_device, (req_handler)req_create_socket, (req_handler)req_accept_socket, (req_handler)req_set_socket_event, diff --git a/server/trace.c b/server/trace.c index de24553..171b836 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1321,11 +1321,6 @@ static void dump_unlock_file_request( const struct unlock_file_request *req ) fprintf( stderr, " count_high=%08x", req->count_high ); } -static void dump_unmount_device_request( const struct unmount_device_request *req ) -{ - fprintf( stderr, " handle=%p", req->handle ); -} - static void dump_create_socket_request( const struct create_socket_request *req ) { fprintf( stderr, " access=%08x,", req->access ); @@ -3509,7 +3504,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_flush_file_request, (dump_func)dump_lock_file_request, (dump_func)dump_unlock_file_request, - (dump_func)dump_unmount_device_request, (dump_func)dump_create_socket_request, (dump_func)dump_accept_socket_request, (dump_func)dump_set_socket_event_request, @@ -3729,7 +3723,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_flush_file_reply, (dump_func)dump_lock_file_reply, (dump_func)0, - (dump_func)0, (dump_func)dump_create_socket_reply, (dump_func)dump_accept_socket_reply, (dump_func)0, @@ -3949,7 +3942,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "flush_file", "lock_file", "unlock_file", - "unmount_device", "create_socket", "accept_socket", "set_socket_event",

1 0

H. Verbeet : wined3d: Add a function for dumping FBO status codes.
by Alexandre Julliard 17 Apr '07

17 Apr '07

Module: wine Branch: master Commit: c4cc10a59513da02908ddf633df996f4f8e460e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4cc10a59513da02908ddf633… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 16 21:19:12 2007 +0200 wined3d: Add a function for dumping FBO status codes. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/utils.c | 19 +++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dd9d320..1820f53 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5193,7 +5193,7 @@ static void check_fbo_status(IWineD3DDevice *iface) { status = GL_EXTCALL(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT)); switch(status) { case GL_FRAMEBUFFER_COMPLETE_EXT: TRACE("FBO complete.\n"); break; - default: FIXME("FBO status %#x.\n", status); break; + default: FIXME("FBO status %s (%#x)\n", debug_fbostatus(status), status); break; } } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 849eb38..dff91af 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -696,6 +696,25 @@ const char* debug_d3dpool(WINED3DPOOL Pool) { } } +const char *debug_fbostatus(GLenum status) { + switch(status) { +#define FBOSTATUS_TO_STR(u) case u: return #u + FBOSTATUS_TO_STR(GL_FRAMEBUFFER_COMPLETE_EXT); + FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT); + FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT); + FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT); + FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT); + FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT); + FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT); + FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT); + FBOSTATUS_TO_STR(GL_FRAMEBUFFER_UNSUPPORTED_EXT); +#undef FBOSTATUS_TO_STR + default: + FIXME("Unrecognied FBO status 0x%08x\n", status); + return "unrecognized"; + } +} + /***************************************************************************** * Useful functions mapping GL <-> D3D values */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7aae5e5..9fb4343 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1402,6 +1402,7 @@ const char* debug_d3dtexturefiltertype(WINED3DTEXTUREFILTERTYPE filter_type); const char* debug_d3dtexturestate(DWORD state); const char* debug_d3dtstype(WINED3DTRANSFORMSTATETYPE tstype); const char* debug_d3dpool(WINED3DPOOL pool); +const char *debug_fbostatus(GLenum status); /* Routines for GL <-> D3D values */ GLenum StencilOp(DWORD op);

1 0

H. Verbeet : wined3d: Dump the FBO' s attachments when its status is GL_FRAMEBUFFER_UNSUPPORTED_EXT.
by Alexandre Julliard 17 Apr '07

17 Apr '07

Module: wine Branch: master Commit: 3777ef3a7199441d3c3f4c208123fcab338390f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3777ef3a7199441d3c3f4c208… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 16 21:19:20 2007 +0200 wined3d: Dump the FBO's attachments when its status is GL_FRAMEBUFFER_UNSUPPORTED_EXT. --- dlls/wined3d/device.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1820f53..d4f8ddd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5191,9 +5191,29 @@ static void check_fbo_status(IWineD3DDevice *iface) { GLenum status; status = GL_EXTCALL(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT)); - switch(status) { - case GL_FRAMEBUFFER_COMPLETE_EXT: TRACE("FBO complete.\n"); break; - default: FIXME("FBO status %s (%#x)\n", debug_fbostatus(status), status); break; + if (status == GL_FRAMEBUFFER_COMPLETE_EXT) { + TRACE("FBO complete\n"); + } else { + FIXME("FBO status %s (%#x)\n", debug_fbostatus(status), status); + + /* Dump the FBO attachments */ + if (status == GL_FRAMEBUFFER_UNSUPPORTED_EXT) { + IWineD3DSurfaceImpl *attachment; + int i; + + for (i = 0; i < GL_LIMITS(buffers); ++i) { + attachment = (IWineD3DSurfaceImpl *)This->fbo_color_attachments[i]; + if (attachment) { + FIXME("\tColor attachment %d: (%p) %s %ux%u\n", i, attachment, debug_d3dformat(attachment->resource.format), + attachment->pow2Width, attachment->pow2Height); + } + } + attachment = (IWineD3DSurfaceImpl *)This->fbo_depth_attachment; + if (attachment) { + FIXME("\tDepth attachment: (%p) %s %ux%u\n", attachment, debug_d3dformat(attachment->resource.format), + attachment->pow2Width, attachment->pow2Height); + } + } } }

1 0

H. Verbeet : wined3d: Use GL_UNSIGNED_BYTE as data type for WINED3DFMT_A8.
by Alexandre Julliard 17 Apr '07

17 Apr '07

Module: wine Branch: master Commit: b154081356ea87c50f88d4932a44d39ee5d98eea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b154081356ea87c50f88d4932… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 16 21:19:28 2007 +0200 wined3d: Use GL_UNSIGNED_BYTE as data type for WINED3DFMT_A8. --- dlls/wined3d/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dff91af..a9eb3ea 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -68,7 +68,7 @@ static const PixelFormatDesc formats[] = { {WINED3DFMT_A1R5G5B5 ,0x00008000 ,0x00007c00 ,0x000003e0 ,0x0000001f ,2 ,FALSE ,GL_RGB5_A1 ,GL_BGRA ,GL_UNSIGNED_SHORT_1_5_5_5_REV }, {WINED3DFMT_A4R4G4B4 ,0x0000f000 ,0x00000f00 ,0x000000f0 ,0x0000000f ,2 ,FALSE ,GL_RGBA4 ,GL_BGRA ,GL_UNSIGNED_SHORT_4_4_4_4_REV }, {WINED3DFMT_R3G3B2 ,0x0 ,0x000000e0 ,0x0000001c ,0x00000003 ,1 ,FALSE ,GL_R3_G3_B2 ,GL_RGB ,GL_UNSIGNED_BYTE_2_3_3_REV }, - {WINED3DFMT_A8 ,0x000000ff ,0x0 ,0x0 ,0x0 ,1 ,FALSE ,GL_ALPHA8 ,GL_ALPHA ,GL_ALPHA }, + {WINED3DFMT_A8 ,0x000000ff ,0x0 ,0x0 ,0x0 ,1 ,FALSE ,GL_ALPHA8 ,GL_ALPHA ,GL_UNSIGNED_BYTE }, {WINED3DFMT_A8R3G3B2 ,0x0000ff00 ,0x000000e0 ,0x0000001c ,0x00000003 ,2 ,FALSE ,0 ,0 ,0 }, {WINED3DFMT_X4R4G4B4 ,0x0 ,0x00000f00 ,0x000000f0 ,0x0000000f ,2 ,FALSE ,GL_RGB4 ,GL_BGRA ,GL_UNSIGNED_SHORT_4_4_4_4_REV }, {WINED3DFMT_A2B10G10R10 ,0xb0000000 ,0x000003ff ,0x000ffc00 ,0x3ff00000 ,4 ,FALSE ,GL_RGB ,GL_RGBA ,GL_UNSIGNED_INT_2_10_10_10_REV },

1 0

H. Verbeet : wined3d: Ignore SetTextureStageState on unsupported texture stages.
by Alexandre Julliard 17 Apr '07

17 Apr '07

Module: wine Branch: master Commit: 863a0bfe33444a52e672151487686aaf39b96891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=863a0bfe33444a52e67215148… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 16 21:44:27 2007 +0200 wined3d: Ignore SetTextureStageState on unsupported texture stages. --- dlls/wined3d/device.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d4f8ddd..d19d773 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3774,6 +3774,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *if TRACE("(%p) : Stage=%d, Type=%s(%d), Value=%d\n", This, Stage, debug_d3dtexturestate(Type), Type, Value); + if (Stage >= MAX_TEXTURES) { + WARN("Attempting to set stage %u which is higher than the max stage %u, ignoring\n", Stage, MAX_TEXTURES - 1); + return WINED3D_OK; + } + This->updateStateBlock->changed.textureState[Stage][Type] = TRUE; This->updateStateBlock->set.textureState[Stage][Type] = TRUE; This->updateStateBlock->textureState[Stage][Type] = Value;

1 0

Alexandre Julliard : kernel32: Use the correct access rights when opening named pipes.
by Alexandre Julliard 17 Apr '07

17 Apr '07

Module: wine Branch: master Commit: 9eaaadbb47033584055b90d5f91cd824686cc300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eaaadbb47033584055b90d5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 16 14:32:18 2007 +0200 kernel32: Use the correct access rights when opening named pipes. --- dlls/kernel32/sync.c | 32 +++++++++++++++++++++++--------- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 7c15fd8..949e1b7 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1114,7 +1114,7 @@ HANDLE WINAPI CreateNamedPipeW( LPCWSTR name, DWORD dwOpenMode, HANDLE handle; UNICODE_STRING nt_name; OBJECT_ATTRIBUTES attr; - DWORD options; + DWORD access, options; BOOLEAN pipe_type, read_mode, non_block; NTSTATUS status; IO_STATUS_BLOCK iosb; @@ -1144,13 +1144,27 @@ HANDLE WINAPI CreateNamedPipeW( LPCWSTR name, DWORD dwOpenMode, attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; attr.SecurityQualityOfService = NULL; - options = 0; + switch(dwOpenMode & 3) + { + case PIPE_ACCESS_INBOUND: + options = FILE_PIPE_INBOUND; + access = GENERIC_READ; + break; + case PIPE_ACCESS_OUTBOUND: + options = FILE_PIPE_OUTBOUND; + access = GENERIC_WRITE; + break; + case PIPE_ACCESS_DUPLEX: + options = FILE_PIPE_FULL_DUPLEX; + access = GENERIC_READ | GENERIC_WRITE; + break; + default: + SetLastError( ERROR_INVALID_PARAMETER ); + return INVALID_HANDLE_VALUE; + } + access |= SYNCHRONIZE; if (dwOpenMode & FILE_FLAG_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; if (!(dwOpenMode & FILE_FLAG_OVERLAPPED)) options |= FILE_SYNCHRONOUS_IO_ALERT; - if ((dwOpenMode & PIPE_ACCESS_DUPLEX) == PIPE_ACCESS_DUPLEX) - options |= FILE_PIPE_FULL_DUPLEX; - else if (dwOpenMode & PIPE_ACCESS_INBOUND) options |= FILE_PIPE_INBOUND; - else if (dwOpenMode & PIPE_ACCESS_OUTBOUND) options |= FILE_PIPE_OUTBOUND; pipe_type = (dwPipeMode & PIPE_TYPE_MESSAGE) ? TRUE : FALSE; read_mode = (dwPipeMode & PIPE_READMODE_MESSAGE) ? TRUE : FALSE; non_block = (dwPipeMode & PIPE_NOWAIT) ? TRUE : FALSE; @@ -1159,9 +1173,9 @@ HANDLE WINAPI CreateNamedPipeW( LPCWSTR name, DWORD dwOpenMode, timeout.QuadPart = (ULONGLONG)nDefaultTimeOut * -10000; SetLastError(0); - - status = NtCreateNamedPipeFile(&handle, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, - 0, FILE_OVERWRITE_IF, options, pipe_type, + + status = NtCreateNamedPipeFile(&handle, access, &attr, &iosb, 0, + FILE_OVERWRITE_IF, options, pipe_type, read_mode, non_block, nMaxInstances, nInBufferSize, nOutBufferSize, &timeout);

1 0

Alexandre Julliard : server: Add infrastructure for ioctl server request.
by Alexandre Julliard 17 Apr '07

17 Apr '07

Module: wine Branch: master Commit: 635714397fc25b92d0f8bda1ca9af65bd060ff00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=635714397fc25b92d0f8bda1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 16 14:45:03 2007 +0200 server: Add infrastructure for ioctl server request. --- dlls/ntdll/file.c | 68 ++++++++++++++++++++++++++++++++------- include/wine/server_protocol.h | 21 ++++++++++++- server/change.c | 2 + server/fd.c | 20 ++++++++++++ server/file.c | 1 + server/file.h | 5 +++ server/mailslot.c | 3 ++ server/named_pipe.c | 3 ++ server/process.c | 1 + server/protocol.def | 11 ++++++ server/queue.c | 1 + server/request.c | 1 + server/request.h | 2 + server/serial.c | 1 + server/signal.c | 1 + server/sock.c | 1 + server/thread.c | 1 + server/trace.c | 21 ++++++++++++ 18 files changed, 150 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=635714397fc25b92d0f8b…

1 0