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

appdb/include application.php sidebar_admin.php
by WineHQ 03 Apr '07

03 Apr '07

ChangeSet ID: 31024 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/02 19:00:48 Modified files: include : application.php sidebar_admin.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add and use application::objectGetEntriesCount() Patch: http://cvs.winehq.org/patch.py?id=31024 Old revision New revision Changes Path 1.98 1.99 +31 -0 appdb/include/application.php 1.36 1.37 +5 -1 appdb/include/sidebar_admin.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.98 appdb/include/application.php:1.99 --- appdb/include/application.php:1.98 3 Apr 2007 0: 0:48 -0000 +++ appdb/include/application.php 3 Apr 2007 0: 0:48 -0000 @@ -913,6 +913,37 @@ class Application { echo "<p>To view a submission, click on its name. ". "From that page you can edit, delete or approve it into the AppDB.</p>\n"; } + + function objectGetEntriesCount($bQueued, $bRejected) + { + $sQueued = objectManager::getQueueString($bQueued, $bRejected); + + if($bQueued && !application::canEdit()) + { + /* Without edit rights users can only resubmit their rejected entries */ + if(!$bRejected) + return FALSE; + + $sQuery = "SELECT COUNT(appId) as count FROM appFamily WHERE + submitterId = '?' + AND + queued = '?'"; + $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, + $sQueued); + } else + { + $sQuery = "SELECT COUNT(appId) as count FROM appFamily WHERE queued = '?'"; + $hResult = query_parameters($sQuery, $sQueued); + } + + if(!$hResult) + return FALSE; + + if(!$oRow = mysql_fetch_object($hResult)) + return FALSE; + + return $oRow->count; + } } function get_vendor_from_keywords($sKeywords) Index: appdb/include/sidebar_admin.php diff -u -p appdb/include/sidebar_admin.php:1.36 appdb/include/sidebar_admin.php:1.37 --- appdb/include/sidebar_admin.php:1.36 3 Apr 2007 0: 0:48 -0000 +++ appdb/include/sidebar_admin.php 3 Apr 2007 0: 0:48 -0000 @@ -9,7 +9,7 @@ function global_admin_menu() { $g = new htmlmenu("Global Admin"); - $g->add("View App Queue (".$_SESSION['current']->getQueuedAppCount().")", + $g->add("View App Queue (".application::objectGetEntriesCount(true, false).")", BASE."objectManager.php?sClass=application&bIsQueue=true&sTitle=". "Application%20Queue"); $g->add("View Version Queue (".$_SESSION['current']->getQueuedVersionCount().")", @@ -41,6 +41,10 @@ function global_admin_menu() { $g->addmisc(" "); + $g->add("View Rejected Applications (".application::objectGetEntriesCount(true, + true).")", + BASE."objectManager.php?sClass=application&bIsQueue=true&bIsRejected=true&". + "sTitle=Rejected%20Applications"); $g->add("View Rejected Test Results (".testData::objectGetEntriesCount(true, true).")", BASE."objectManager.php?sClass=testData&bIsQueue=true&bIsRejected=true&".

1 0

Alexandre Julliard : server: Add a generic wait queue to the file descriptor object.
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: 95ba4b553ca2a20bca8b5c055033ab505ceec86f URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ba4b553ca2a20bca8b5c055… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 12:47:52 2007 +0200 server: Add a generic wait queue to the file descriptor object. --- server/fd.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ server/file.h | 2 ++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/server/fd.c b/server/fd.c index 6fe4ace..d353aca 100644 --- a/server/fd.c +++ b/server/fd.c @@ -173,6 +173,7 @@ struct fd int poll_index; /* index of fd in poll array */ struct list read_q; /* async readers of this fd */ struct list write_q; /* async writers of this fd */ + struct list wait_q; /* other async waiters of this fd */ }; static void fd_dump( struct object *obj, int verbose ); @@ -1287,6 +1288,7 @@ static void fd_destroy( struct object *obj ) async_terminate_queue( &fd->read_q, STATUS_CANCELLED ); async_terminate_queue( &fd->write_q, STATUS_CANCELLED ); + async_terminate_queue( &fd->wait_q, STATUS_CANCELLED ); remove_fd_locks( fd ); list_remove( &fd->inode_entry ); @@ -1365,6 +1367,7 @@ static struct fd *alloc_fd_object(void) list_init( &fd->locks ); list_init( &fd->read_q ); list_init( &fd->write_q ); + list_init( &fd->wait_q ); if ((fd->poll_index = add_poll_user( fd )) == -1) { @@ -1395,6 +1398,7 @@ struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *use list_init( &fd->locks ); list_init( &fd->read_q ); list_init( &fd->write_q ); + list_init( &fd->wait_q ); return fd; } @@ -1736,6 +1740,9 @@ void fd_queue_async_timeout( struct fd *fd, const async_data_t *data, int type, case ASYNC_TYPE_WRITE: queue = &fd->write_q; break; + case ASYNC_TYPE_WAIT: + queue = &fd->wait_q; + break; default: set_error( STATUS_INVALID_PARAMETER ); return; @@ -1751,6 +1758,42 @@ void fd_queue_async_timeout( struct fd *fd, const async_data_t *data, int type, set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); } +void fd_async_terminate_head( struct fd *fd, int type, unsigned int status ) +{ + switch (type) + { + case ASYNC_TYPE_READ: + async_terminate_head( &fd->read_q, status ); + break; + case ASYNC_TYPE_WRITE: + async_terminate_head( &fd->write_q, status ); + break; + case ASYNC_TYPE_WAIT: + async_terminate_head( &fd->wait_q, status ); + break; + default: + assert(0); + } +} + +void fd_async_terminate_queue( struct fd *fd, int type, unsigned int status ) +{ + switch (type) + { + case ASYNC_TYPE_READ: + async_terminate_queue( &fd->read_q, status ); + break; + case ASYNC_TYPE_WRITE: + async_terminate_queue( &fd->write_q, status ); + break; + case ASYNC_TYPE_WAIT: + async_terminate_queue( &fd->wait_q, status ); + break; + default: + assert(0); + } +} + void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) { fd_queue_async_timeout( fd, data, type, count, NULL ); @@ -1760,6 +1803,7 @@ void default_fd_cancel_async( struct fd *fd ) { async_terminate_queue( &fd->read_q, STATUS_CANCELLED ); async_terminate_queue( &fd->write_q, STATUS_CANCELLED ); + async_terminate_queue( &fd->wait_q, STATUS_CANCELLED ); } /* default flush() routine */ diff --git a/server/file.h b/server/file.h index c43352a..507d14c 100644 --- a/server/file.h +++ b/server/file.h @@ -70,6 +70,8 @@ extern int default_fd_get_poll_events( struct fd *fd ); extern void default_poll_event( struct fd *fd, int event ); extern void fd_queue_async_timeout( struct fd *fd, const async_data_t *data, int type, int count, const struct timeval *timeout ); +extern void fd_async_terminate_head( struct fd *fd, int type, unsigned int status ); +extern void fd_async_terminate_queue( struct fd *fd, int type, unsigned int status ); extern void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); extern void default_fd_cancel_async( struct fd *fd ); extern void no_flush( struct fd *fd, struct event **event );

1 0

Alexandre Julliard : make_makefiles: Add the .INIT/. BEGIN rules for the main makefile.
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: 274115f97f779065e32e5a94ac1db14ce0d67bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=274115f97f779065e32e5a94a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 12:47:13 2007 +0200 make_makefiles: Add the .INIT/.BEGIN rules for the main makefile. --- tools/make_makefiles | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index f17dc94..90f9220 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -299,7 +299,9 @@ sub update_makefiles(@) push @lines, "ALL_MAKEFILES = \\\n\t"; push @lines, join (" \\\n\t", @targets ), "\n\n"; push @lines, "Makefile \$(ALL_MAKEFILES): config.status\n"; - push @lines, "\t\@./config.status \$\@\n\n"; + push @lines, "\t\@./config.status \$\@\n"; + push @lines, ".INIT: Makefile\n"; + push @lines, ".BEGIN: Makefile\n\n"; push @lines, "\$(RECURSE_TARGETS) \$(MAKEDEP): \$(ALL_MAKEFILES)\n\n"; push @lines, "distclean::\n"; push @lines, "\t\$(RM) Makefile \$(ALL_MAKEFILES)\n\n";

1 0

Alexandre Julliard : server: Avoid redundant polling in fd_queue_async_timeout.
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: e92f85474f8c81f40437c97fa630eb0326cef749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e92f85474f8c81f40437c97fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 12:48:13 2007 +0200 server: Avoid redundant polling in fd_queue_async_timeout. Moved the file overlapped flag check to default_fd_queue_async. --- server/fd.c | 33 +++++++++++++++++---------------- server/file.h | 4 ++-- server/mailslot.c | 2 +- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/server/fd.c b/server/fd.c index d353aca..baab135 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1719,18 +1719,10 @@ void default_poll_event( struct fd *fd, int event ) wake_up( fd->user, 0 ); } -void fd_queue_async_timeout( struct fd *fd, const async_data_t *data, int type, int count, - const struct timeval *timeout ) +int fd_queue_async_timeout( struct fd *fd, const async_data_t *data, int type, int count, + const struct timeval *timeout ) { struct list *queue; - int events, flags; - - fd->fd_ops->get_file_info( fd, &flags ); - if (!(flags & (FD_FLAG_OVERLAPPED|FD_FLAG_TIMEOUT))) - { - set_error( STATUS_INVALID_HANDLE ); - return; - } switch (type) { @@ -1745,17 +1737,18 @@ void fd_queue_async_timeout( struct fd *fd, const async_data_t *data, int type, break; default: set_error( STATUS_INVALID_PARAMETER ); - return; + return 0; } - if (!create_async( current, timeout, queue, data )) return; + if (!create_async( current, timeout, queue, data )) return 0; set_error( STATUS_PENDING ); - /* Check if the new pending request can be served immediately */ - events = check_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); - if (events) fd->fd_ops->poll_event( fd, events ); + if (!fd->inode) + set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); + else /* regular files are always ready for read and write */ + if (type != ASYNC_TYPE_WAIT) async_terminate_head( queue, STATUS_ALERTED ); - set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); + return 1; } void fd_async_terminate_head( struct fd *fd, int type, unsigned int status ) @@ -1796,6 +1789,14 @@ void fd_async_terminate_queue( struct fd *fd, int type, unsigned int status ) void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) { + int flags; + + fd->fd_ops->get_file_info( fd, &flags ); + if (!(flags & (FD_FLAG_OVERLAPPED|FD_FLAG_TIMEOUT))) + { + set_error( STATUS_INVALID_HANDLE ); + return; + } fd_queue_async_timeout( fd, data, type, count, NULL ); } diff --git a/server/file.h b/server/file.h index 507d14c..f0f3a6b 100644 --- a/server/file.h +++ b/server/file.h @@ -68,8 +68,8 @@ extern void default_fd_remove_queue( struct object *obj, struct wait_queue_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 ); -extern void fd_queue_async_timeout( struct fd *fd, const async_data_t *data, int type, - int count, const struct timeval *timeout ); +extern int fd_queue_async_timeout( struct fd *fd, const async_data_t *data, int type, + int count, const struct timeval *timeout ); extern void fd_async_terminate_head( struct fd *fd, int type, unsigned int status ); extern void fd_async_terminate_queue( struct fd *fd, int type, unsigned int status ); extern void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); diff --git a/server/mailslot.c b/server/mailslot.c index cf0950d..bd637f2 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -302,7 +302,7 @@ static void mailslot_queue_async( struct fd *fd, const async_data_t *data, int t if (mailslot->read_timeout != -1) { struct timeval when = current_time; - add_timeout( &when, mailslot->read_timeout ); + add_timeout( &when, max(1,mailslot->read_timeout) ); fd_queue_async_timeout( fd, data, type, count, &when ); } else fd_queue_async_timeout( fd, data, type, count, NULL );

1 0

Alexandre Julliard : server: Take advantage of the fd generic wait queue to remove a lot of serial code .
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: fd6f83d00adc31c65f6e073376d07bc882c4782c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd6f83d00adc31c65f6e07337… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 12:49:09 2007 +0200 server: Take advantage of the fd generic wait queue to remove a lot of serial code. --- server/serial.c | 94 ++++-------------------------------------------------- 1 files changed, 7 insertions(+), 87 deletions(-) diff --git a/server/serial.c b/server/serial.c index bcb7945..8cd59e2 100644 --- a/server/serial.c +++ b/server/serial.c @@ -61,12 +61,9 @@ static struct fd *serial_get_fd( struct object *obj ); static unsigned int serial_map_access( struct object *obj, unsigned int access ); static void serial_destroy(struct object *obj); -static int serial_get_poll_events( struct fd *fd ); -static void serial_poll_event( struct fd *fd, int event ); static enum server_fd_type serial_get_info( struct fd *fd, int *flags ); static void serial_flush( struct fd *fd, struct event **event ); static void serial_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); -static void serial_cancel_async( struct fd *fd ); struct serial { @@ -85,10 +82,6 @@ struct serial struct termios original; - struct list read_q; - struct list write_q; - struct list wait_q; - /* FIXME: add dcb, comm status, handler module, sharing */ }; @@ -111,12 +104,12 @@ static const struct object_ops serial_ops = static const struct fd_ops serial_fd_ops = { - serial_get_poll_events, /* get_poll_events */ - serial_poll_event, /* poll_event */ + default_fd_get_poll_events, /* get_poll_events */ + default_poll_event, /* poll_event */ serial_flush, /* flush */ serial_get_info, /* get_file_info */ serial_queue_async, /* queue_async */ - serial_cancel_async /* cancel_async */ + default_fd_cancel_async /* cancel_async */ }; /* check if the given fd is a serial port */ @@ -146,9 +139,6 @@ struct object *create_serial( struct fd *fd, unsigned int options ) serial->writemult = 0; serial->writeconst = 0; serial->eventmask = 0; - list_init( &serial->read_q ); - list_init( &serial->write_q ); - list_init( &serial->wait_q ); serial->fd = (struct fd *)grab_object( fd ); set_fd_user( fd, &serial_fd_ops, &serial->obj ); return &serial->obj; @@ -172,11 +162,7 @@ static unsigned int serial_map_access( struct object *obj, unsigned int access ) static void serial_destroy( struct object *obj) { struct serial *serial = (struct serial *)obj; - - async_terminate_queue( &serial->read_q, STATUS_CANCELLED ); - async_terminate_queue( &serial->write_q, STATUS_CANCELLED ); - async_terminate_queue( &serial->wait_q, STATUS_CANCELLED ); - if (serial->fd) release_object( serial->fd ); + release_object( serial->fd ); } static void serial_dump( struct object *obj, int verbose ) @@ -191,21 +177,6 @@ static struct serial *get_serial_obj( struct process *process, obj_handle_t hand return (struct serial *)get_handle_obj( process, handle, access, &serial_ops ); } -static int serial_get_poll_events( struct fd *fd ) -{ - struct serial *serial = get_fd_user( fd ); - int events = 0; - assert( serial->obj.ops == &serial_ops ); - - if (!list_empty( &serial->read_q )) events |= POLLIN; - if (!list_empty( &serial->write_q )) events |= POLLOUT; - if (!list_empty( &serial->wait_q )) events |= POLLIN; - - /* fprintf(stderr,"poll events are %04x\n",events); */ - - return events; -} - static enum server_fd_type serial_get_info( struct fd *fd, int *flags ) { struct serial *serial = get_fd_user( fd ); @@ -224,77 +195,26 @@ static enum server_fd_type serial_get_info( struct fd *fd, int *flags ) return FD_TYPE_SERIAL; } -static void serial_poll_event(struct fd *fd, int event) -{ - struct serial *serial = get_fd_user( fd ); - - /* fprintf(stderr,"Poll event %02x\n",event); */ - - if (!list_empty( &serial->read_q ) && (POLLIN & event) ) - async_terminate_head( &serial->read_q, STATUS_ALERTED ); - - if (!list_empty( &serial->write_q ) && (POLLOUT & event) ) - async_terminate_head( &serial->write_q, STATUS_ALERTED ); - - if (!list_empty( &serial->wait_q ) && (POLLIN & event) ) - async_terminate_head( &serial->wait_q, STATUS_ALERTED ); - - set_fd_events( fd, serial_get_poll_events(fd) ); -} - static void serial_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) { struct serial *serial = get_fd_user( fd ); - struct list *queue; struct timeval when = current_time; - int timeout; - int events; + int timeout = 0; assert(serial->obj.ops == &serial_ops); switch (type) { case ASYNC_TYPE_READ: - queue = &serial->read_q; timeout = serial->readconst + serial->readmult*count; break; - case ASYNC_TYPE_WAIT: - queue = &serial->wait_q; - timeout = 0; - break; case ASYNC_TYPE_WRITE: - queue = &serial->write_q; timeout = serial->writeconst + serial->writemult*count; break; - default: - set_error(STATUS_INVALID_PARAMETER); - return; } add_timeout( &when, timeout ); - if (!create_async( current, timeout ? &when : NULL, queue, data )) return; - set_error( STATUS_PENDING ); - - /* Check if the new pending request can be served immediately */ - events = check_fd_events( fd, serial_get_poll_events( fd ) ); - if (events) - { - /* serial_poll_event() calls set_select_events() */ - serial_poll_event( fd, events ); - return; - } - - set_fd_events( fd, serial_get_poll_events( fd ) ); -} - -static void serial_cancel_async( struct fd *fd ) -{ - struct serial *serial = get_fd_user( fd ); - assert(serial->obj.ops == &serial_ops); - - async_terminate_queue( &serial->read_q, STATUS_CANCELLED ); - async_terminate_queue( &serial->write_q, STATUS_CANCELLED ); - async_terminate_queue( &serial->wait_q, STATUS_CANCELLED ); + fd_queue_async_timeout( fd, data, type, count, timeout ? &when : NULL ); } static void serial_flush( struct fd *fd, struct event **event ) @@ -347,7 +267,7 @@ DECL_HANDLER(set_serial_info) serial->eventmask = req->eventmask; if (!serial->eventmask) { - async_terminate_queue( &serial->wait_q, STATUS_SUCCESS ); + fd_async_terminate_queue( serial->fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); } }

1 0

Alexandre Julliard : server: Use the fd generic wait queue for directory change I/O operations.
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: d99ee344c2f1e61c9702a9c9c124880a20495229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d99ee344c2f1e61c9702a9c9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 12:49:45 2007 +0200 server: Use the fd generic wait queue for directory change I/O operations. --- server/change.c | 23 +++++------------------ 1 files changed, 5 insertions(+), 18 deletions(-) diff --git a/server/change.c b/server/change.c index db50342..70eb54e 100644 --- a/server/change.c +++ b/server/change.c @@ -153,7 +153,6 @@ struct dir int want_data; /* return change data */ long signaled; /* the file changed */ int subtree; /* do we want to watch subdirectories? */ - struct list change_q; /* change readers */ struct list change_records; /* data for the change */ struct list in_entry; /* entry in the inode dirs list */ struct inode *inode; /* inode of the associated directory */ @@ -184,7 +183,6 @@ static const struct object_ops dir_ops = static int dir_get_poll_events( struct fd *fd ); static enum server_fd_type dir_get_info( struct fd *fd, int *flags ); -static void dir_cancel_async( struct fd *fd ); static const struct fd_ops dir_fd_ops = { @@ -193,7 +191,7 @@ static const struct fd_ops dir_fd_ops = no_flush, /* flush */ dir_get_info, /* get_file_info */ default_fd_queue_async, /* queue_async */ - dir_cancel_async /* cancel_async */ + default_fd_cancel_async /* cancel_async */ }; static struct list change_list = LIST_INIT(change_list); @@ -342,7 +340,6 @@ static void dir_destroy( struct object *obj ) free_inode( dir->inode ); } - async_terminate_queue( &dir->change_q, STATUS_CANCELLED ); while ((record = get_first_change_record( dir ))) free( record ); if (dir->event) release_object( dir->event ); @@ -372,13 +369,6 @@ static enum server_fd_type dir_get_info( struct fd *fd, int *flags ) return FD_TYPE_DIR; } -static void dir_cancel_async( struct fd *fd ) -{ - struct dir *dir = (struct dir *) get_fd_user( fd ); - async_terminate_queue( &dir->change_q, STATUS_CANCELLED ); -} - - #ifdef USE_INOTIFY #define HASH_SIZE 31 @@ -582,8 +572,7 @@ static void inotify_do_change_notify( struct dir *dir, unsigned int action, list_add_tail( &dir->change_records, &record->entry ); } - if (!list_empty( &dir->change_q )) - async_terminate_head( &dir->change_q, STATUS_ALERTED ); + fd_async_terminate_head( dir->fd, ASYNC_TYPE_WAIT, STATUS_ALERTED ); } static unsigned int filter_from_event( struct inotify_event *ie ) @@ -1048,7 +1037,6 @@ struct object *create_dir_obj( struct fd *fd ) if (!dir) return NULL; - list_init( &dir->change_q ); list_init( &dir->change_records ); dir->event = NULL; dir->filter = 0; @@ -1091,7 +1079,7 @@ DECL_HANDLER(read_directory_changes) dir->event = event; /* requests don't timeout */ - if (!create_async( current, NULL, &dir->change_q, &req->async )) goto end; + if (!fd_queue_async_timeout( dir->fd, &req->async, ASYNC_TYPE_WAIT, 0, NULL )) goto end; /* assign it once */ if (!dir->filter) @@ -1108,9 +1096,8 @@ DECL_HANDLER(read_directory_changes) dir->signaled--; /* if there's already a change in the queue, send it */ - if (!list_empty( &dir->change_q ) && - !list_empty( &dir->change_records )) - async_terminate_head( &dir->change_q, STATUS_ALERTED ); + if (!list_empty( &dir->change_records )) + fd_async_terminate_head( dir->fd, ASYNC_TYPE_WAIT, STATUS_ALERTED ); /* setup the real notification */ if (!inotify_adjust_changes( dir ))

1 0

Eric Pouech : winedbg: When reloading real PE modules from a minidump, also look in the search path (as we do for ELF modules).
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: 0fc4013f7cf73e986e027dab377e0c804b000ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fc4013f7cf73e986e027dab3… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Apr 1 12:31:57 2007 +0200 winedbg: When reloading real PE modules from a minidump, also look in the search path (as we do for ELF modules). --- programs/winedbg/tgt_minidump.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 9e61130..ea04528 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -131,6 +131,29 @@ BOOL CALLBACK validate_file(PCWSTR name, void* user) return FALSE; /* get the first file we find !! */ } +static BOOL is_pe_module_embedded(struct tgt_process_minidump_data* data, + MINIDUMP_MODULE* pe_mm) +{ + ULONG size; + MINIDUMP_DIRECTORY* dir; + MINIDUMP_MODULE_LIST* mml; + + if (MiniDumpReadDumpStream(data->mapping, Wine_ElfModuleListStream, &dir, + (void**)&mml, &size)) + { + MINIDUMP_MODULE* mm; + unsigned i; + + for (i = 0, mm = &mml->Modules[0]; i < mml->NumberOfModules; i++, mm++) + { + if (mm->BaseOfImage <= pe_mm->BaseOfImage && + mm->BaseOfImage + mm->SizeOfImage >= pe_mm->BaseOfImage + pe_mm->SizeOfImage) + return TRUE; + } + } + return FALSE; +} + static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) { ULONG size; @@ -166,7 +189,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) mm = &mml->Modules[0]; mds = (MINIDUMP_STRING*)((char*)data->mapping + mm->ModuleNameRva); len = WideCharToMultiByte(CP_ACP, 0, mds->Buffer, - mds->Length / sizeof(WCHAR), + mds->Length / sizeof(WCHAR), exec_name, sizeof(exec_name) - 1, NULL, NULL); exec_name[len] = 0; for (ptr = exec_name + len - 1; ptr >= exec_name; ptr--) @@ -309,14 +332,24 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) } if (MiniDumpReadDumpStream(data->mapping, ModuleListStream, &dir, &stream, &size)) { + WCHAR buffer[MAX_PATH]; + mml = (MINIDUMP_MODULE_LIST*)stream; for (i = 0, mm = &mml->Modules[0]; i < mml->NumberOfModules; i++, mm++) { mds = (MINIDUMP_STRING*)((char*)data->mapping + mm->ModuleNameRva); memcpy(nameW, mds->Buffer, mds->Length); nameW[mds->Length / sizeof(WCHAR)] = 0; - SymLoadModuleExW(hProc, NULL, nameW, NULL, mm->BaseOfImage, mm->SizeOfImage, - NULL, 0); + if (SymFindFileInPathW(hProc, NULL, nameW, (void*)(DWORD_PTR)mm->TimeDateStamp, + mm->SizeOfImage, 0, SSRVOPT_DWORD, buffer, validate_file, NULL)) + SymLoadModuleExW(hProc, NULL, buffer, NULL, mm->BaseOfImage, mm->SizeOfImage, + NULL, 0); + else if (is_pe_module_embedded(data, mm)) + SymLoadModuleExW(hProc, NULL, nameW, NULL, mm->BaseOfImage, mm->SizeOfImage, + NULL, 0); + else + SymLoadModuleExW(hProc, NULL, nameW, NULL, mm->BaseOfImage, mm->SizeOfImage, + NULL, SLMFLAG_VIRTUAL); } } if (MiniDumpReadDumpStream(data->mapping, ExceptionStream, &dir, &stream, &size))

1 0

Jason Edmeades : xcopy: /E implies recursive ( fixes ActiveState Perl installer).
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: b8b8f254d87088eaec430115259d4edcb5eb5fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8b8f254d87088eaec4301152… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sat Mar 31 21:31:35 2007 +0100 xcopy: /E implies recursive (fixes ActiveState Perl installer). --- programs/xcopy/xcopy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index eafc1d7..dfbb41d 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -181,7 +181,7 @@ int main (int argc, char *argv[]) XCOPY_FailMessage(ERROR_INVALID_PARAMETER); return RC_INITERROR; } else flags |= OPT_EXCLUDELIST; - } else flags |= OPT_EMPTYDIR; + } else flags |= OPT_EMPTYDIR | OPT_RECURSIVE; break; /* D can be /D or /D: */

1 0

Jason Edmeades : xcopy: Hack/workaround for filenames starting with a '.'.
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: 928f1cb7221cd44c49110dc1e738395c8c0cc851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=928f1cb7221cd44c49110dc1e… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sat Mar 31 21:49:30 2007 +0100 xcopy: Hack/workaround for filenames starting with a '.'. --- programs/xcopy/xcopy.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index dfbb41d..f132dcb 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -130,6 +130,13 @@ int main (int argc, char *argv[]) } } + /* FIXME: On UNIX, files starting with a '.' are treated as hidden under + wine, but on windows these can be normal files. At least one installer + uses files such as .packlist and (validly) expects them to be copied. + Under wine, if we do not copy hidden files by default then they get + lose */ + flags |= OPT_COPYHIDSYS; + /* Skip first arg, which is the program name */ argvW++;

1 0

Michael Ploujnikov : wined3d: Remove DDBLT_WAIT fixme.
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: 56391a3a8519600ab0c92c036b635daf9343a78d URL: http://source.winehq.org/git/wine.git/?a=commit;h=56391a3a8519600ab0c92c036… Author: Michael Ploujnikov <ploujj(a)gmail.com> Date: Sat Mar 31 19:10:53 2007 -0400 wined3d: Remove DDBLT_WAIT fixme. --- dlls/wined3d/surface_gdi.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 4565f72..3c2981e 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -726,10 +726,6 @@ IWineGDISurfaceImpl_Blt(IWineD3DSurface *iface, if (Flags & DDBLT_WAIT) { - static BOOL displayed = FALSE; - if (!displayed) - FIXME("Can't handle DDBLT_WAIT flag right now.\n"); - displayed = TRUE; Flags &= ~DDBLT_WAIT; } if (Flags & DDBLT_ASYNC)

1 0