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

Chris Robinson : quartz: Tell filters to stop sending data when the chain is broken.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 30abd4ed155730b534897e05cec9a44454e4e05a URL: http://source.winehq.org/git/wine.git/?a=commit;h=30abd4ed155730b534897e05c… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Apr 3 11:04:59 2007 -0700 quartz: Tell filters to stop sending data when the chain is broken. --- dlls/quartz/pin.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 6791c2d..48cedfc 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -913,7 +913,10 @@ HRESULT OutputPin_SendSample(OutputPin * This, IMediaSample * pSample) * then it causes some problems (most notably with the native Video * Renderer) if we are re-entered for whatever reason */ hr = IMemInputPin_Receive(pMemConnected, pSample); - IBaseFilter_Release(pinInfo.pFilter); + + /* If the filter's destroyed, tell upstream to stop sending data */ + if(IBaseFilter_Release(pinInfo.pFilter) == 0 && SUCCEEDED(hr)) + hr = S_FALSE; } if (pMemConnected) IMemInputPin_Release(pMemConnected);

1 0

Fabian Bieler : wined3d: Fix GLSL cmp instruction for INF and NAN arguments .
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 2843b0f9296fa93a85e8bf58418f411ce3094ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2843b0f9296fa93a85e8bf584… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Mar 29 19:57:41 2007 +0200 wined3d: Fix GLSL cmp instruction for INF and NAN arguments. --- dlls/wined3d/glsl_shader.c | 46 ++++++++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 707c325..3d04f45 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -784,18 +784,26 @@ static DWORD shader_glsl_add_dst_param(SHADER_OPCODE_ARG* arg, const DWORD param } /* Append the destination part of the instruction to the buffer, return the effective write mask */ -static DWORD shader_glsl_append_dst(SHADER_BUFFER *buffer, SHADER_OPCODE_ARG *arg) { +static DWORD shader_glsl_append_dst_ext(SHADER_BUFFER *buffer, SHADER_OPCODE_ARG *arg, const DWORD param) { glsl_dst_param_t dst_param; DWORD mask; int shift; - shift = (arg->dst & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; - mask = shader_glsl_add_dst_param(arg, arg->dst, arg->dst_addr, &dst_param); - shader_addline(buffer, "%s%s = %s(", dst_param.reg_name, dst_param.mask_str, shift_glsl_tab[shift]); + mask = shader_glsl_add_dst_param(arg, param, arg->dst_addr, &dst_param); + + if(mask) { + shift = (param & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; + shader_addline(buffer, "%s%s = %s(", dst_param.reg_name, dst_param.mask_str, shift_glsl_tab[shift]); + } return mask; } +/* Append the destination part of the instruction to the buffer, return the effective write mask */ +static DWORD shader_glsl_append_dst(SHADER_BUFFER *buffer, SHADER_OPCODE_ARG *arg) { + return shader_glsl_append_dst_ext(buffer, arg, arg->dst); +} + /** Process GLSL instruction modifiers */ void shader_glsl_add_instruction_modifiers(SHADER_OPCODE_ARG* arg) { @@ -1115,20 +1123,26 @@ void shader_glsl_cmp(SHADER_OPCODE_ARG* arg) { glsl_src_param_t src0_param; glsl_src_param_t src1_param; glsl_src_param_t src2_param; - DWORD write_mask; - size_t mask_size; - - write_mask = shader_glsl_append_dst(arg->buffer, arg); - mask_size = shader_glsl_get_write_mask_size(write_mask); + DWORD write_mask, cmp_channel = 0; + unsigned int i, j; + + /* Cycle through all source0 channels */ + for (i=0; i<4; i++) { + write_mask = 0; + /* Find the destination channels which use the current source0 channel */ + for (j=0; j<4; j++) { + if ( ((arg->src[0] >> (WINED3DSP_SWIZZLE_SHIFT + 2*j)) & 0x3) == i ) { + write_mask |= WINED3DSP_WRITEMASK_0 << j; + cmp_channel = WINED3DSP_WRITEMASK_0 << j; + } + } + write_mask = shader_glsl_append_dst_ext(arg->buffer, arg, arg->dst & (~WINED3DSP_SWIZZLE_MASK | write_mask)); + if (!write_mask) continue; - shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], write_mask, &src0_param); - shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); - shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], cmp_channel, &src0_param); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); + shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); - if (mask_size > 1) { - shader_addline(arg->buffer, "mix(%s, %s, vec%d(lessThan(%s, vec%d(0.0)))));\n", - src1_param.param_str, src2_param.param_str, mask_size, src0_param.param_str, mask_size); - } else { shader_addline(arg->buffer, "%s >= 0.0 ? %s : %s);\n", src0_param.param_str, src1_param.param_str, src2_param.param_str); }

1 0

Fabian Bieler : wined3d: Fix GLSL cnd instruction for INF and NAN arguments .
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 91df23062445f9146e3f28a29c4aaf076f56d981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91df23062445f9146e3f28a29… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Mar 29 19:59:11 2007 +0200 wined3d: Fix GLSL cnd instruction for INF and NAN arguments. --- dlls/wined3d/glsl_shader.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3d04f45..3ceb935 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1156,26 +1156,35 @@ void shader_glsl_cnd(SHADER_OPCODE_ARG* arg) { glsl_src_param_t src0_param; glsl_src_param_t src1_param; glsl_src_param_t src2_param; - DWORD write_mask; - size_t mask_size; - - write_mask = shader_glsl_append_dst(arg->buffer, arg); + DWORD write_mask, cmp_channel = 0; + unsigned int i, j; if (shader->baseShader.hex_version < WINED3DPS_VERSION(1, 4)) { - mask_size = 1; + write_mask = shader_glsl_append_dst(arg->buffer, arg); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0, &src0_param); - } else { - mask_size = shader_glsl_get_write_mask_size(write_mask); - shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], write_mask, &src0_param); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); + shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); + shader_addline(arg->buffer, "%s < 0.5 ? %s : %s);\n", + src0_param.param_str, src1_param.param_str, src2_param.param_str); + return; } + /* Cycle through all source0 channels */ + for (i=0; i<4; i++) { + write_mask = 0; + /* Find the destination channels which use the current source0 channel */ + for (j=0; j<4; j++) { + if ( ((arg->src[0] >> (WINED3DSP_SWIZZLE_SHIFT + 2*j)) & 0x3) == i ) { + write_mask |= WINED3DSP_WRITEMASK_0 << j; + cmp_channel = WINED3DSP_WRITEMASK_0 << j; + } + } + write_mask = shader_glsl_append_dst_ext(arg->buffer, arg, arg->dst & (~WINED3DSP_SWIZZLE_MASK | write_mask)); + if (!write_mask) continue; - shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); - shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], cmp_channel, &src0_param); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); + shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); - if (mask_size > 1) { - shader_addline(arg->buffer, "mix(%s, %s, vec%d(lessThan(%s, vec%d(0.5)))));\n", - src2_param.param_str, src1_param.param_str, mask_size, src0_param.param_str, mask_size); - } else { shader_addline(arg->buffer, "%s < 0.5 ? %s : %s);\n", src0_param.param_str, src1_param.param_str, src2_param.param_str); }

1 0

Fabian Bieler : wined3d: Add support for float texture formats back in.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 7df5deab23acf47e662d2eaede22d3e69b4fe6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df5deab23acf47e662d2eaed… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Mar 29 19:53:52 2007 +0200 wined3d: Add support for float texture formats back in. --- dlls/wined3d/directx.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dea1d43..2d4024f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1702,6 +1702,23 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } + if (GL_SUPPORT(ARB_TEXTURE_FLOAT)) { + + BOOL half_pixel_support = GL_SUPPORT(ARB_HALF_FLOAT_PIXEL); + + switch (CheckFormat) { + case WINED3DFMT_R16F: + case WINED3DFMT_A16B16G16R16F: + if (!half_pixel_support) break; + case WINED3DFMT_R32F: + case WINED3DFMT_A32B32G32R32F: + TRACE_(d3d_caps)("[OK]\n"); + return WINED3D_OK; + default: + break; /* Avoid compiler warnings */ + } + } + /* This format is nothing special and it is supported perfectly. * However, ati and nvidia driver on windows do not mark this format as * supported (tested with the dxCapsViewer) and pretending to

1 0

Alexandre Julliard : server: Fix the handling of the signaled status for file descriptors.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: ba896e75d7fce68e5183007b65eae7e35490ccd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba896e75d7fce68e5183007b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 4 19:39:29 2007 +0200 server: Fix the handling of the signaled status for file descriptors. File handles are signaled when an I/O operation completes, and reset when another operation is queued. --- server/async.c | 2 + server/fd.c | 58 ++++++++++---------------------------------------- server/file.c | 4 +- server/file.h | 3 +- server/mailslot.c | 4 +- server/named_pipe.c | 8 +++--- server/serial.c | 4 +- 7 files changed, 25 insertions(+), 58 deletions(-) diff --git a/server/async.c b/server/async.c index 027dd25..e0877b2 100644 --- a/server/async.c +++ b/server/async.c @@ -193,6 +193,7 @@ struct async *create_async( struct thread *thread, struct async_queue *queue, co list_add_tail( &queue->queue, &async->queue_entry ); grab_object( async ); + if (queue->fd) set_fd_signaled( queue->fd, 0 ); if (event) reset_event( event ); return async; } @@ -230,6 +231,7 @@ void async_set_result( struct object *obj, unsigned int status ) thread_queue_apc( async->thread, NULL, &data ); } if (async->event) set_event( async->event ); + else if (async->queue->fd) set_fd_signaled( async->queue->fd, 1 ); } } diff --git a/server/fd.c b/server/fd.c index 25917ae..3a044b2 100644 --- a/server/fd.c +++ b/server/fd.c @@ -168,6 +168,7 @@ struct fd unsigned int access; /* file access (FILE_READ_DATA etc.) */ unsigned int sharing; /* file sharing mode */ int unix_fd; /* unix file descriptor */ + int signaled :1; /* is the fd signaled? */ int fs_locks :1; /* can we use filesystem locks for this fd? */ int unmounted :1;/* has the device been unmounted? */ int poll_index; /* index of fd in poll array */ @@ -1360,6 +1361,7 @@ static struct fd *alloc_fd_object(void) fd->access = 0; fd->sharing = 0; fd->unix_fd = -1; + fd->signaled = 1; fd->fs_locks = 1; fd->unmounted = 0; fd->poll_index = -1; @@ -1391,6 +1393,7 @@ struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *use fd->access = 0; fd->sharing = 0; fd->unix_fd = -1; + fd->signaled = 0; fd->fs_locks = 0; fd->unmounted = 0; fd->poll_index = -1; @@ -1610,6 +1613,13 @@ int is_fd_removable( struct fd *fd ) return (fd->inode && fd->inode->device->removable); } +/* set or clear the fd signaled state */ +void set_fd_signaled( struct fd *fd, int signaled ) +{ + fd->signaled = signaled; + if (signaled) wake_up( fd->user, 0 ); +} + /* handler for close_handle that refuses to close fd-associated handles in other processes */ int fd_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) { @@ -1635,55 +1645,11 @@ int check_fd_events( struct fd *fd, int events ) return pfd.revents; } -/* default add_queue() routine for objects that poll() on an fd */ -int default_fd_add_queue( struct object *obj, struct wait_queue_entry *entry ) -{ - struct fd *fd = get_obj_fd( obj ); - - if (!fd) return 0; - if (!fd->inode && list_empty( &obj->wait_queue )) /* first on the queue */ - set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); - add_queue( obj, entry ); - release_object( fd ); - return 1; -} - -/* default remove_queue() routine for objects that poll() on an fd */ -void default_fd_remove_queue( struct object *obj, struct wait_queue_entry *entry ) -{ - struct fd *fd = get_obj_fd( obj ); - - grab_object( obj ); - remove_queue( obj, entry ); - if (!fd->inode && list_empty( &obj->wait_queue )) /* last on the queue is gone */ - set_fd_events( fd, 0 ); - release_object( obj ); - release_object( fd ); -} - /* default signaled() routine for objects that poll() on an fd */ int default_fd_signaled( struct object *obj, struct thread *thread ) { - int events, ret; struct fd *fd = get_obj_fd( obj ); - - if (fd->inode) ret = 1; /* regular files are always signaled */ - else - { - events = fd->fd_ops->get_poll_events( fd ); - ret = check_fd_events( fd, events ) != 0; - - if (ret) - { - /* stop waiting on select() if we are signaled */ - set_fd_events( fd, 0 ); - } - else if (!list_empty( &obj->wait_queue )) - { - /* restart waiting on poll() if we are no longer signaled */ - set_fd_events( fd, events ); - } - } + int ret = fd->signaled; release_object( fd ); return ret; } @@ -1705,7 +1671,7 @@ void default_poll_event( struct fd *fd, int event ) /* if an error occurred, stop polling this fd to avoid busy-looping */ if (event & (POLLERR | POLLHUP)) set_fd_events( fd, -1 ); - wake_up( fd->user, 0 ); + else set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); } struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) diff --git a/server/file.c b/server/file.c index 5f5349d..edc92f7 100644 --- a/server/file.c +++ b/server/file.c @@ -76,8 +76,8 @@ static const struct object_ops file_ops = { sizeof(struct file), /* size */ file_dump, /* dump */ - default_fd_add_queue, /* add_queue */ - default_fd_remove_queue, /* remove_queue */ + add_queue, /* add_queue */ + remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ diff --git a/server/file.h b/server/file.h index 3514022..096b9df 100644 --- a/server/file.h +++ b/server/file.h @@ -63,9 +63,8 @@ extern int check_fd_events( struct fd *fd, int events ); extern void set_fd_events( struct fd *fd, int events ); extern obj_handle_t lock_fd( struct fd *fd, file_pos_t offset, file_pos_t count, int shared, int wait ); extern void unlock_fd( struct fd *fd, file_pos_t offset, file_pos_t count ); +extern void set_fd_signaled( struct fd *fd, int signaled ); -extern int default_fd_add_queue( struct object *obj, struct wait_queue_entry *entry ); -extern void default_fd_remove_queue( struct object *obj, struct wait_queue_entry *entry ); extern int default_fd_signaled( struct object *obj, struct thread *thread ); extern int default_fd_get_poll_events( struct fd *fd ); extern void default_poll_event( struct fd *fd, int event ); diff --git a/server/mailslot.c b/server/mailslot.c index 89af2bf..2898d1a 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -74,8 +74,8 @@ static const struct object_ops mailslot_ops = { sizeof(struct mailslot), /* size */ mailslot_dump, /* dump */ - default_fd_add_queue, /* add_queue */ - default_fd_remove_queue, /* remove_queue */ + add_queue, /* add_queue */ + remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ diff --git a/server/named_pipe.c b/server/named_pipe.c index 0a4ab96..a736d83 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -143,8 +143,8 @@ static const struct object_ops pipe_server_ops = { sizeof(struct pipe_server), /* size */ pipe_server_dump, /* dump */ - default_fd_add_queue, /* add_queue */ - default_fd_remove_queue, /* remove_queue */ + add_queue, /* add_queue */ + remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ @@ -177,8 +177,8 @@ static const struct object_ops pipe_client_ops = { sizeof(struct pipe_client), /* size */ pipe_client_dump, /* dump */ - default_fd_add_queue, /* add_queue */ - default_fd_remove_queue, /* remove_queue */ + add_queue, /* add_queue */ + remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ diff --git a/server/serial.c b/server/serial.c index f2b88c1..8dc1d18 100644 --- a/server/serial.c +++ b/server/serial.c @@ -89,8 +89,8 @@ static const struct object_ops serial_ops = { sizeof(struct serial), /* size */ serial_dump, /* dump */ - default_fd_add_queue, /* add_queue */ - default_fd_remove_queue, /* remove_queue */ + add_queue, /* add_queue */ + remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */

1 0

Alexandre Julliard : server: Add support for associating a file descriptor to a message queue.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 0cb29f47ca7a87c4c876a7c1796d3f1e0eec37f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb29f47ca7a87c4c876a7c17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 4 18:02:01 2007 +0200 server: Add support for associating a file descriptor to a message queue. --- include/wine/server_protocol.h | 17 ++++++++++- server/protocol.def | 6 ++++ server/queue.c | 65 +++++++++++++++++++++++++++++++++++++++- server/request.h | 2 + server/trace.c | 8 +++++ 5 files changed, 96 insertions(+), 2 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a254128..2c486e2 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2395,6 +2395,18 @@ struct get_msg_queue_reply +struct set_queue_fd_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct set_queue_fd_reply +{ + struct reply_header __header; +}; + + + struct set_queue_mask_request { struct request_header __header; @@ -4118,6 +4130,7 @@ enum request REQ_empty_atom_table, REQ_init_atom_table, REQ_get_msg_queue, + REQ_set_queue_fd, REQ_set_queue_mask, REQ_get_queue_status, REQ_get_process_idle_event, @@ -4341,6 +4354,7 @@ union generic_request struct empty_atom_table_request empty_atom_table_request; struct init_atom_table_request init_atom_table_request; struct get_msg_queue_request get_msg_queue_request; + struct set_queue_fd_request set_queue_fd_request; struct set_queue_mask_request set_queue_mask_request; struct get_queue_status_request get_queue_status_request; struct get_process_idle_event_request get_process_idle_event_request; @@ -4562,6 +4576,7 @@ union generic_reply struct empty_atom_table_reply empty_atom_table_reply; struct init_atom_table_reply init_atom_table_reply; struct get_msg_queue_reply get_msg_queue_reply; + struct set_queue_fd_reply set_queue_fd_reply; struct set_queue_mask_reply set_queue_mask_reply; struct get_queue_status_reply get_queue_status_reply; struct get_process_idle_event_reply get_process_idle_event_reply; @@ -4662,6 +4677,6 @@ union generic_reply struct allocate_locally_unique_id_reply allocate_locally_unique_id_reply; }; -#define SERVER_PROTOCOL_VERSION 289 +#define SERVER_PROTOCOL_VERSION 290 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index ef20235..48d1096 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1783,6 +1783,12 @@ enum char_info_mode @END +/* Set the file descriptor associated to the current thread queue */ +(a)REQ(set_queue_fd) + obj_handle_t handle; /* handle to the file descriptor */ +(a)END + + /* Set the current message queue wakeup mask */ @REQ(set_queue_mask) unsigned int wake_mask; /* wakeup bits mask */ diff --git a/server/queue.c b/server/queue.c index 1973152..4e66f99 100644 --- a/server/queue.c +++ b/server/queue.c @@ -113,6 +113,7 @@ struct thread_input struct msg_queue { struct object obj; /* object header */ + struct fd *fd; /* optional file descriptor to poll */ unsigned int wake_bits; /* wakeup bits */ unsigned int wake_mask; /* wakeup mask */ unsigned int changed_bits; /* changed wakeup bits */ @@ -139,6 +140,7 @@ static void msg_queue_remove_queue( struct object *obj, struct wait_queue_entry static int msg_queue_signaled( struct object *obj, struct thread *thread ); static int msg_queue_satisfied( struct object *obj, struct thread *thread ); static void msg_queue_destroy( struct object *obj ); +static void msg_queue_poll_event( struct fd *fd, int event ); static void thread_input_dump( struct object *obj, int verbose ); static void thread_input_destroy( struct object *obj ); static void timer_callback( void *private ); @@ -160,6 +162,16 @@ static const struct object_ops msg_queue_ops = msg_queue_destroy /* destroy */ }; +static const struct fd_ops msg_queue_fd_ops = +{ + NULL, /* get_poll_events */ + msg_queue_poll_event, /* poll_event */ + no_flush, /* flush */ + no_get_file_info, /* get_file_info */ + no_queue_async, /* queue_async */ + no_cancel_async /* cancel async */ +}; + static const struct object_ops thread_input_ops = { @@ -243,6 +255,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ if (!input && !(input = create_thread_input( thread ))) return NULL; if ((queue = alloc_object( &msg_queue_ops ))) { + queue->fd = NULL; queue->wake_bits = 0; queue->wake_mask = 0; queue->changed_bits = 0; @@ -778,6 +791,8 @@ static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *ent { if (process->idle_event) set_event( process->idle_event ); } + if (queue->fd && list_empty( &obj->wait_queue )) /* first on the queue */ + set_fd_events( queue->fd, POLLIN ); add_queue( obj, entry ); return 1; } @@ -788,6 +803,8 @@ static void msg_queue_remove_queue(struct object *obj, struct wait_queue_entry * struct process *process = entry->thread->process; remove_queue( obj, entry ); + if (queue->fd && list_empty( &obj->wait_queue )) /* last on the queue is gone */ + set_fd_events( queue->fd, 0 ); assert( entry->thread->queue == queue ); @@ -808,7 +825,18 @@ static void msg_queue_dump( struct object *obj, int verbose ) static int msg_queue_signaled( struct object *obj, struct thread *thread ) { struct msg_queue *queue = (struct msg_queue *)obj; - return is_signaled( queue ); + int ret = 0; + + if (queue->fd) + { + if ((ret = check_fd_events( queue->fd, POLLIN ))) + /* stop waiting on select() if we are signaled */ + set_fd_events( queue->fd, 0 ); + else if (!list_empty( &obj->wait_queue )) + /* restart waiting on poll() if we are no longer signaled */ + set_fd_events( queue->fd, POLLIN ); + } + return ret || is_signaled( queue ); } static int msg_queue_satisfied( struct object *obj, struct thread *thread ) @@ -843,6 +871,16 @@ static void msg_queue_destroy( struct object *obj ) if (queue->timeout) remove_timeout_user( queue->timeout ); if (queue->input) release_object( queue->input ); if (queue->hooks) release_object( queue->hooks ); + if (queue->fd) release_object( queue->fd ); +} + +static void msg_queue_poll_event( struct fd *fd, int event ) +{ + struct msg_queue *queue = get_fd_user( fd ); + assert( queue->obj.ops == &msg_queue_ops ); + + if (event & (POLLERR | POLLHUP)) set_fd_events( fd, -1 ); + wake_up( &queue->obj, 0 ); } static void thread_input_dump( struct object *obj, int verbose ) @@ -1524,6 +1562,31 @@ DECL_HANDLER(get_msg_queue) } +/* set the file descriptor associated to the current thread queue */ +DECL_HANDLER(set_queue_fd) +{ + struct msg_queue *queue = get_current_queue(); + struct file *file; + int unix_fd; + + if (queue->fd) /* fd can only be set once */ + { + set_error( STATUS_ACCESS_DENIED ); + return; + } + if (!(file = get_file_obj( current->process, req->handle, SYNCHRONIZE ))) return; + + if ((unix_fd = get_file_unix_fd( file )) != -1) + { + if ((unix_fd = dup( unix_fd )) != -1) + queue->fd = create_anonymous_fd( &msg_queue_fd_ops, unix_fd, &queue->obj ); + else + file_set_error(); + } + release_object( file ); +} + + /* set the current message queue wakeup mask */ DECL_HANDLER(set_queue_mask) { diff --git a/server/request.h b/server/request.h index aa4f8e4..5b28a7f 100644 --- a/server/request.h +++ b/server/request.h @@ -228,6 +228,7 @@ DECL_HANDLER(set_atom_information); DECL_HANDLER(empty_atom_table); DECL_HANDLER(init_atom_table); DECL_HANDLER(get_msg_queue); +DECL_HANDLER(set_queue_fd); DECL_HANDLER(set_queue_mask); DECL_HANDLER(get_queue_status); DECL_HANDLER(get_process_idle_event); @@ -450,6 +451,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_empty_atom_table, (req_handler)req_init_atom_table, (req_handler)req_get_msg_queue, + (req_handler)req_set_queue_fd, (req_handler)req_set_queue_mask, (req_handler)req_get_queue_status, (req_handler)req_get_process_idle_event, diff --git a/server/trace.c b/server/trace.c index c4572bd..0d11e7c 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2214,6 +2214,11 @@ static void dump_get_msg_queue_reply( const struct get_msg_queue_reply *req ) fprintf( stderr, " handle=%p", req->handle ); } +static void dump_set_queue_fd_request( const struct set_queue_fd_request *req ) +{ + fprintf( stderr, " handle=%p", req->handle ); +} + static void dump_set_queue_mask_request( const struct set_queue_mask_request *req ) { fprintf( stderr, " wake_mask=%08x,", req->wake_mask ); @@ -3568,6 +3573,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_empty_atom_table_request, (dump_func)dump_init_atom_table_request, (dump_func)dump_get_msg_queue_request, + (dump_func)dump_set_queue_fd_request, (dump_func)dump_set_queue_mask_request, (dump_func)dump_get_queue_status_request, (dump_func)dump_get_process_idle_event_request, @@ -3787,6 +3793,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)0, (dump_func)dump_init_atom_table_reply, (dump_func)dump_get_msg_queue_reply, + (dump_func)0, (dump_func)dump_set_queue_mask_reply, (dump_func)dump_get_queue_status_reply, (dump_func)dump_get_process_idle_event_reply, @@ -4006,6 +4013,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "empty_atom_table", "init_atom_table", "get_msg_queue", + "set_queue_fd", "set_queue_mask", "get_queue_status", "get_process_idle_event",

1 0

Alexandre Julliard : winex11.drv: Store the display file descriptor directly in the server message queue.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 072698c9539f5420f0996a3c03ea5f379786578e URL: http://source.winehq.org/git/wine.git/?a=commit;h=072698c9539f5420f0996a3c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 4 18:02:53 2007 +0200 winex11.drv: Store the display file descriptor directly in the server message queue. Get rid of a few WaitForMultipleObjectsEx hacks. --- dlls/user32/message.c | 3 +-- dlls/winex11.drv/event.c | 18 ++++++------------ dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/x11drv_main.c | 34 +++++++++++++++++++++++++++------- 4 files changed, 34 insertions(+), 22 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index bde85d9..f612277 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3188,13 +3188,12 @@ DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, CONST HANDLE *pHandles, } SERVER_END_REQ; - /* Add the thread event to the handle list */ + /* add the queue to the handle list */ for (i = 0; i < count; i++) handles[i] = pHandles[i]; handles[count] = get_server_queue_handle(); ReleaseThunkLock( &lock ); ret = USER_Driver->pMsgWaitForMultipleObjectsEx( count+1, handles, timeout, mask, flags ); - if (ret == count+1) ret = count; /* pretend the msg queue is ready */ if (lock) RestoreThunkLock( lock ); return ret; } diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 0ea1f9c..ab890e9 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -278,32 +278,26 @@ static int process_events( Display *display, ULONG_PTR mask ) DWORD X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { - DWORD i, ret; + DWORD ret; struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); - if (!data || data->process_event_count) + if (!data) { if (!count && !timeout) return WAIT_TIMEOUT; return WaitForMultipleObjectsEx( count, handles, flags & MWMO_WAITALL, timeout, flags & MWMO_ALERTABLE ); } - /* check whether only server queue handle was passed in */ - if (count < 2) flags &= ~MWMO_WAITALL; + if (data->process_event_count) mask = 0; /* don't process nested events */ data->process_event_count++; - if (process_events( data->display, mask )) ret = count; + if (process_events( data->display, mask )) ret = count - 1; else if (count || timeout) { - HANDLE new_handles[MAXIMUM_WAIT_OBJECTS+1]; /* FIXME! */ - - for (i = 0; i < count; i++) new_handles[i] = handles[i]; - new_handles[count] = data->display_fd; - - ret = WaitForMultipleObjectsEx( count+1, new_handles, flags & MWMO_WAITALL, + ret = WaitForMultipleObjectsEx( count, handles, flags & MWMO_WAITALL, timeout, flags & MWMO_ALERTABLE ); - if (ret == count) process_events( data->display, mask ); + if (ret == count - 1) process_events( data->display, mask ); } else ret = WAIT_TIMEOUT; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4053c2f..8de2e25 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -498,7 +498,6 @@ struct x11drv_escape_set_dce struct x11drv_thread_data { Display *display; - HANDLE display_fd; int process_event_count; /* recursion count for event processing */ Cursor cursor; /* current cursor */ Window cursor_window; /* current window that contains the cursor */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 078a514..8012c2d 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -459,7 +459,6 @@ static void thread_detach(void) if (data) { X11DRV_ResetSelectionOwner(); - CloseHandle( data->display_fd ); wine_tsx11_lock(); if (data->xim) XCloseIM( data->xim ); XCloseDisplay( data->display ); @@ -489,6 +488,32 @@ static void process_detach(void) } +/* store the display fd into the message queue */ +static void set_queue_display_fd( Display *display ) +{ + HANDLE handle; + int ret; + + if (wine_server_fd_to_handle( ConnectionNumber(display), GENERIC_READ | SYNCHRONIZE, 0, &handle )) + { + MESSAGE( "x11drv: Can't allocate handle for display fd\n" ); + ExitProcess(1); + } + SERVER_START_REQ( set_queue_fd ) + { + req->handle = handle; + ret = wine_server_call( req ); + } + SERVER_END_REQ; + if (ret) + { + MESSAGE( "x11drv: Can't store handle for display fd\n" ); + ExitProcess(1); + } + CloseHandle( handle ); +} + + /*********************************************************************** * X11DRV thread initialisation routine */ @@ -535,12 +560,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) else if (!(data->xim = X11DRV_SetupXIM( data->display, input_style ))) WARN("Input Method is not available\n"); - if (wine_server_fd_to_handle( ConnectionNumber(data->display), GENERIC_READ | SYNCHRONIZE, - 0, &data->display_fd )) - { - MESSAGE( "x11drv: Can't allocate handle for display fd\n" ); - ExitProcess(1); - } + set_queue_display_fd( data->display ); data->process_event_count = 0; data->cursor = None; data->cursor_window = None;

1 0

Felix Nawothnig : wined3d: Only issue state_patchsegments FIXME once.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: e3d3d1823df8765a6292319953ea1765a4877183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3d3d1823df8765a629231995… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Tue Apr 3 23:39:22 2007 +0200 wined3d: Only issue state_patchsegments FIXME once. --- dlls/wined3d/state.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ab2e448..cd60841 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1418,8 +1418,13 @@ static void state_patchsegments(DWORD state, IWineD3DStateBlockImpl *stateblock, TRACE("Stub\n"); if (stateblock->renderState[WINED3DRS_PATCHSEGMENTS] != tmpvalue.d) { + static BOOL displayed = FALSE; + tmpvalue.d = stateblock->renderState[WINED3DRS_PATCHSEGMENTS]; - FIXME("(WINED3DRS_PATCHSEGMENTS,%f) not yet implemented\n", tmpvalue.f); + if(!displayed) + FIXME("(WINED3DRS_PATCHSEGMENTS,%f) not yet implemented\n", tmpvalue.f); + + displayed = TRUE; } }

1 0

Aric Stewart : comctl32: Propsheet exception fix.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 5688ffb7abb09469023a0bfe43595555962c5c4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5688ffb7abb09469023a0bfe4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 3 12:58:19 2007 -0500 comctl32: Propsheet exception fix. Do not attempt to draw a page during WM_PAINT if there is no active page. --- dlls/comctl32/propsheet.c | 1 + dlls/comctl32/tests/propsheet.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index c84f23a..201e554 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3229,6 +3229,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) WCHAR szBuffer[256]; int nLength; + if (psInfo->active_page < 0) return 1; hdc = hdcParam ? hdcParam : BeginPaint(hwnd, &ps); if (!hdc) return 1; diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index db71bfe..8627351 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -98,7 +98,42 @@ static void test_title(void) DestroyWindow(hdlg); } +static void test_nopage(void) +{ + HPROPSHEETPAGE hpsp[1]; + PROPSHEETPAGEA psp; + PROPSHEETHEADERA psh; + HWND hdlg; + + memset(&psp, 0, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.dwFlags = 0; + psp.hInstance = GetModuleHandleW(NULL); + U(psp).pszTemplate = "prop_page1"; + U2(psp).pszIcon = NULL; + psp.pfnDlgProc = page_dlg_proc; + psp.lParam = 0; + + hpsp[0] = CreatePropertySheetPageA(&psp); + + memset(&psh, 0, sizeof(psh)); + psh.dwSize = sizeof(psh); + psh.dwFlags = PSH_MODELESS | PSH_USECALLBACK; + psh.pszCaption = "test caption"; + psh.nPages = 1; + psh.hwndParent = GetDesktopWindow(); + U3(psh).phpage = hpsp; + psh.pfnCallback = sheet_callback; + + hdlg = (HWND)PropertySheetA(&psh); + ShowWindow(hdlg,SW_NORMAL); + SendMessage(hdlg, PSM_REMOVEPAGE, 0, 0); + RedrawWindow(hdlg,NULL,NULL,RDW_UPDATENOW|RDW_ERASENOW); + DestroyWindow(hdlg); +} + START_TEST(propsheet) { test_title(); + test_nopage(); }

1 0

Paul Vriens : odbccp32: Don't print *pcbPathOut as it can be NULL (Coverity ).
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 60ff8d17dd9fa78c4cda035ef4c342453b7c69eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ff8d17dd9fa78c4cda035ef… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Apr 4 11:28:42 2007 +0200 odbccp32: Don't print *pcbPathOut as it can be NULL (Coverity). --- dlls/odbccp32/odbccp32.c | 4 +- dlls/odbccp32/tests/misc.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 5289e14..0d4662b 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -523,7 +523,7 @@ BOOL WINAPI SQLInstallDriverManagerW(LPWSTR lpszPath, WORD cbPathMax, WCHAR path[MAX_PATH]; clear_errors(); - TRACE("(%p %d %d)\n", lpszPath, cbPathMax, *pcbPathOut); + TRACE("(%p %d %p)\n", lpszPath, cbPathMax, pcbPathOut); len = GetSystemDirectoryW(path, MAX_PATH); @@ -546,7 +546,7 @@ BOOL WINAPI SQLInstallDriverManager(LPSTR lpszPath, WORD cbPathMax, WCHAR path[MAX_PATH]; clear_errors(); - TRACE("(%p %d %d)\n", lpszPath, cbPathMax, *pcbPathOut); + TRACE("(%p %d %p)\n", lpszPath, cbPathMax, pcbPathOut); ret = SQLInstallDriverManagerW(path, MAX_PATH, &cbOut); if (ret) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 0779b44..fdfecc0 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -74,8 +74,59 @@ static void test_SQLInstallerError(void) ok(sql_ret == SQL_SUCCESS_WITH_INFO, "SQLInstallerError(null addresses) failed with %d instead of SQL_SUCCESS_WITH_INFO\n", sql_ret); } +static void test_SQLInstallDriverManager(void) +{ + BOOL bool_ret; + RETCODE sql_ret; + DWORD error_code; + CHAR target_path[MAX_PATH]; + WORD path_out; + + /* NULL check */ + bool_ret = SQLInstallDriverManager(NULL, 0, NULL); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(!bool_ret, "SQLInstallDriverManager unexpectedly succeeded\n"); + todo_wine + ok(sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_BUFF_LEN, + "Expected SQLInstallDriverManager to fail with ODBC_ERROR_INVALID_BUFF_LEN\n"); + + /* Length smaller then MAX_PATH */ + bool_ret = SQLInstallDriverManager(target_path, MAX_PATH / 2, NULL); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + todo_wine { + ok(!bool_ret, "SQLInstallDriverManager unexpectedly succeeded\n"); + ok(sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_BUFF_LEN, + "Expected SQLInstallDriverManager to fail with ODBC_ERROR_INVALID_BUFF_LEN\n"); + } + + path_out = 0xcafe; + bool_ret = SQLInstallDriverManager(target_path, MAX_PATH / 2, &path_out); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + todo_wine { + ok(!bool_ret, "SQLInstallDriverManager unexpectedly succeeded\n"); + ok(sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_BUFF_LEN, + "Expected SQLInstallDriverManager to fail with ODBC_ERROR_INVALID_BUFF_LEN\n"); + ok(path_out == 0xcafe, "Expected path_out to not have changed\n"); + } + + /* Length OK */ + bool_ret = SQLInstallDriverManager(target_path, MAX_PATH, NULL); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(bool_ret, "SQLInstallDriverManager unexpectedly failed\n"); + ok(sql_ret == SQL_NO_DATA, "Expected SQL_NO_DATA, got %d\n", sql_ret); + + path_out = 0xcafe; + bool_ret = SQLInstallDriverManager(target_path, MAX_PATH, &path_out); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(bool_ret, "SQLInstallDriverManager unexpectedly failed\n"); + ok(sql_ret == SQL_NO_DATA, "Expected SQL_NO_DATA, got %d\n", sql_ret); + /* path_out should in practice be less then 0xcafe */ + ok(path_out != 0xcafe, "Expected path_out to show the correct amount of bytes\n"); +} + START_TEST(misc) { test_SQLConfigMode(); test_SQLInstallerError(); + test_SQLInstallDriverManager(); }

1 0