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

Dan Kegel : winex11.drv: GetAsyncKeyState must check mouse buttons, too.
by Alexandre Julliard 13 Apr '07

13 Apr '07

Module: wine Branch: master Commit: c2ae970e6055f6d18a9166c4cd2d760edfabf20d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ae970e6055f6d18a9166c4c… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Apr 12 10:20:43 2007 -0700 winex11.drv: GetAsyncKeyState must check mouse buttons, too. --- dlls/winex11.drv/keyboard.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 96a0dc1..8738425 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1827,7 +1827,8 @@ SHORT X11DRV_GetAsyncKeyState(INT key) { SHORT retval; - X11DRV_MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_KEY, 0 ); + /* Photoshop livelocks unless mouse events are included here */ + X11DRV_MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_KEY | QS_MOUSE, 0 ); retval = ((key_state_table[key] & 0x40) ? 0x0001 : 0) | ((key_state_table[key] & 0x80) ? 0x8000 : 0);

1 0

Alexandre Julliard : server: Don' t bother with default entry points for objects that don't even return an fd .
by Alexandre Julliard 13 Apr '07

13 Apr '07

Module: wine Branch: master Commit: 3f0575943e1cea48174e8b724c8353fb1450068d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f0575943e1cea48174e8b724… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 12 20:21:53 2007 +0200 server: Don't bother with default entry points for objects that don't even return an fd. --- server/change.c | 10 +++++----- server/fd.c | 18 ------------------ server/file.h | 3 --- server/process.c | 8 ++++---- server/queue.c | 8 ++++---- server/request.c | 8 ++++---- server/signal.c | 8 ++++---- server/thread.c | 8 ++++---- 8 files changed, 25 insertions(+), 46 deletions(-) diff --git a/server/change.c b/server/change.c index 6f4489d..c7d5823 100644 --- a/server/change.c +++ b/server/change.c @@ -518,11 +518,11 @@ static const struct fd_ops inotify_fd_ops = { inotify_get_poll_events, /* get_poll_events */ inotify_poll_event, /* poll_event */ - no_flush, /* flush */ - no_get_fd_type, /* get_fd_type */ - default_fd_queue_async, /* queue_async */ - default_fd_reselect_async, /* reselect_async */ - default_fd_cancel_async, /* cancel_async */ + NULL, /* flush */ + NULL, /* get_fd_type */ + NULL, /* queue_async */ + NULL, /* reselect_async */ + NULL, /* cancel_async */ }; static int inotify_get_poll_events( struct fd *fd ) diff --git a/server/fd.c b/server/fd.c index 7797ced..88fa6a4 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1779,24 +1779,6 @@ void no_flush( struct fd *fd, struct event **event ) set_error( STATUS_OBJECT_TYPE_MISMATCH ); } -/* default get_fd_type() routine */ -enum server_fd_type no_get_fd_type( struct fd *fd ) -{ - return FD_TYPE_INVALID; -} - -/* default queue_async() routine */ -void no_queue_async( struct fd *fd, const async_data_t *data, int type, int count) -{ - set_error( STATUS_OBJECT_TYPE_MISMATCH ); -} - -/* default cancel_async() routine */ -void no_cancel_async( struct fd *fd ) -{ - set_error( STATUS_OBJECT_TYPE_MISMATCH ); -} - static inline int is_valid_mounted_device( struct stat *st ) { #if defined(linux) || defined(__sun__) diff --git a/server/file.h b/server/file.h index 25d74b2..5e2e5f0 100644 --- a/server/file.h +++ b/server/file.h @@ -78,9 +78,6 @@ extern void default_fd_queue_async( struct fd *fd, const async_data_t *data, int extern void default_fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern void default_fd_cancel_async( struct fd *fd ); extern void no_flush( struct fd *fd, struct event **event ); -extern enum server_fd_type no_get_fd_type( struct fd *fd ); -extern void no_queue_async( struct fd *fd, const async_data_t *data, int type, int count); -extern void no_cancel_async( struct fd *fd ); extern void main_loop(void); extern void remove_process_locks( struct process *process ); diff --git a/server/process.c b/server/process.c index 1724a24..2e9fd59 100644 --- a/server/process.c +++ b/server/process.c @@ -84,11 +84,11 @@ static const struct fd_ops process_fd_ops = { NULL, /* get_poll_events */ process_poll_event, /* poll_event */ - no_flush, /* flush */ - no_get_fd_type, /* get_fd_type */ - no_queue_async, /* queue_async */ + NULL, /* flush */ + NULL, /* get_fd_type */ + NULL, /* queue_async */ NULL, /* reselect_async */ - no_cancel_async /* cancel async */ + NULL /* cancel async */ }; /* process startup info */ diff --git a/server/queue.c b/server/queue.c index 7335cfc..fa80d62 100644 --- a/server/queue.c +++ b/server/queue.c @@ -166,11 +166,11 @@ static const struct fd_ops msg_queue_fd_ops = { NULL, /* get_poll_events */ msg_queue_poll_event, /* poll_event */ - no_flush, /* flush */ - no_get_fd_type, /* get_fd_type */ - no_queue_async, /* queue_async */ + NULL, /* flush */ + NULL, /* get_fd_type */ + NULL, /* queue_async */ NULL, /* reselect_async */ - no_cancel_async /* cancel async */ + NULL /* cancel async */ }; diff --git a/server/request.c b/server/request.c index ec83ef9..404dda0 100644 --- a/server/request.c +++ b/server/request.c @@ -106,11 +106,11 @@ static const struct fd_ops master_socket_fd_ops = { NULL, /* get_poll_events */ master_socket_poll_event, /* poll_event */ - no_flush, /* flush */ - no_get_fd_type, /* get_fd_type */ - no_queue_async, /* queue_async */ + NULL, /* flush */ + NULL, /* get_fd_type */ + NULL, /* queue_async */ NULL, /* reselect_async */ - no_cancel_async /* cancel_async */ + NULL /* cancel_async */ }; diff --git a/server/signal.c b/server/signal.c index 89fc809..11a0179 100644 --- a/server/signal.c +++ b/server/signal.c @@ -82,11 +82,11 @@ static const struct fd_ops handler_fd_ops = { NULL, /* get_poll_events */ handler_poll_event, /* poll_event */ - no_flush, /* flush */ - no_get_fd_type, /* get_fd_type */ - no_queue_async, /* queue_async */ + NULL, /* flush */ + NULL, /* get_fd_type */ + NULL, /* queue_async */ NULL, /* reselect_async */ - no_cancel_async /* cancel_async */ + NULL /* cancel_async */ }; static struct handler *handler_sighup; diff --git a/server/thread.c b/server/thread.c index a4a113d..2bf031e 100644 --- a/server/thread.c +++ b/server/thread.c @@ -129,11 +129,11 @@ static const struct fd_ops thread_fd_ops = { NULL, /* get_poll_events */ thread_poll_event, /* poll_event */ - no_flush, /* flush */ - no_get_fd_type, /* get_fd_type */ - no_queue_async, /* queue_async */ + NULL, /* flush */ + NULL, /* get_fd_type */ + NULL, /* queue_async */ NULL, /* reselect_async */ - no_cancel_async /* cancel_async */ + NULL /* cancel_async */ }; static struct list thread_list = LIST_INIT(thread_list);

1 0

Alexandre Julliard : server: Create a separate fd object for each mailslot writer. Make them first-class file handles.
by Alexandre Julliard 13 Apr '07

13 Apr '07

Module: wine Branch: master Commit: 72ff2bf363f93429dc0d3394971608d59d62c6c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ff2bf363f93429dc0d33949… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 12 20:19:28 2007 +0200 server: Create a separate fd object for each mailslot writer. Make them first-class file handles. --- server/mailslot.c | 50 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 34 insertions(+), 16 deletions(-) diff --git a/server/mailslot.c b/server/mailslot.c index 8e17862..8872742 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -56,7 +56,7 @@ struct mailslot { struct object obj; struct fd *fd; - struct fd *write_fd; + int write_fd; unsigned int max_msgsize; int read_timeout; struct list writers; @@ -105,6 +105,7 @@ static const struct fd_ops mailslot_fd_ops = struct mail_writer { struct object obj; + struct fd *fd; struct mailslot *mailslot; struct list entry; unsigned int access; @@ -137,12 +138,13 @@ static enum server_fd_type mail_writer_get_fd_type( struct fd *fd ); static const struct fd_ops mail_writer_fd_ops = { - NULL, /* get_poll_events */ - NULL, /* poll_event */ + default_fd_get_poll_events, /* get_poll_events */ + default_poll_event, /* poll_event */ no_flush, /* flush */ mail_writer_get_fd_type, /* get_fd_type */ - no_queue_async, /* queue_async */ - NULL /* cancel_async */ + default_fd_queue_async, /* queue_async */ + default_fd_reselect_async, /* reselect_async */ + default_fd_cancel_async /* cancel_async */ }; @@ -195,11 +197,13 @@ static void mailslot_destroy( struct object *obj) struct mailslot *mailslot = (struct mailslot *) obj; assert( mailslot->fd ); - assert( mailslot->write_fd ); - shutdown( get_unix_fd( mailslot->fd ), SHUT_RDWR ); + if (mailslot->write_fd != -1) + { + shutdown( mailslot->write_fd, SHUT_RDWR ); + close( mailslot->write_fd ); + } release_object( mailslot->fd ); - release_object( mailslot->write_fd ); } static void mailslot_dump( struct object *obj, int verbose ) @@ -236,6 +240,7 @@ static struct object *mailslot_open_file( struct object *obj, unsigned int acces { struct mailslot *mailslot = (struct mailslot *)obj; struct mail_writer *writer; + int unix_fd; if (!(sharing & FILE_SHARE_READ)) { @@ -258,13 +263,27 @@ static struct object *mailslot_open_file( struct object *obj, unsigned int acces } } - if (!(writer = alloc_object( &mail_writer_ops ))) return NULL; + if ((unix_fd = dup( mailslot->write_fd )) == -1) + { + file_set_error(); + return NULL; + } + if (!(writer = alloc_object( &mail_writer_ops ))) + { + close( unix_fd ); + return NULL; + } grab_object( mailslot ); writer->mailslot = mailslot; writer->access = mail_writer_map_access( &writer->obj, access ); writer->sharing = sharing; - list_add_head( &mailslot->writers, &writer->entry ); + + if (!(writer->fd = create_anonymous_fd( &mail_writer_fd_ops, unix_fd, &writer->obj, options ))) + { + release_object( writer ); + return NULL; + } return &writer->obj; } @@ -396,7 +415,7 @@ static struct mailslot *create_mailslot( struct directory *root, if (!mailslot) return NULL; mailslot->fd = NULL; - mailslot->write_fd = NULL; + mailslot->write_fd = -1; mailslot->max_msgsize = max_msgsize; mailslot->read_timeout = read_timeout; list_init( &mailslot->writers ); @@ -406,11 +425,10 @@ static struct mailslot *create_mailslot( struct directory *root, fcntl( fds[0], F_SETFL, O_NONBLOCK ); fcntl( fds[1], F_SETFL, O_NONBLOCK ); shutdown( fds[0], SHUT_RD ); + mailslot->write_fd = fds[0]; mailslot->fd = create_anonymous_fd( &mailslot_fd_ops, fds[1], &mailslot->obj, FILE_SYNCHRONOUS_IO_NONALERT ); - mailslot->write_fd = create_anonymous_fd( &mail_writer_fd_ops, fds[0], &mailslot->obj, - FILE_SYNCHRONOUS_IO_NONALERT ); - if (mailslot->fd && mailslot->write_fd) return mailslot; + if (mailslot->fd) return mailslot; } else file_set_error(); @@ -427,6 +445,7 @@ static void mail_writer_destroy( struct object *obj) { struct mail_writer *writer = (struct mail_writer *) obj; + if (writer->fd) release_object( writer->fd ); list_remove( &writer->entry ); release_object( writer->mailslot ); } @@ -439,8 +458,7 @@ static enum server_fd_type mail_writer_get_fd_type( struct fd *fd ) static struct fd *mail_writer_get_fd( struct object *obj ) { struct mail_writer *writer = (struct mail_writer *) obj; - - return (struct fd *)grab_object( writer->mailslot->write_fd ); + return (struct fd *)grab_object( writer->fd ); } static unsigned int mail_writer_map_access( struct object *obj, unsigned int access )

1 0

Marcus Meissner : configure: Include <sys/types.h> before including <linux/ joystick.h>.
by Alexandre Julliard 12 Apr '07

12 Apr '07

Module: wine Branch: master Commit: 7c434992d65f2dea6a4227fbd61926537423ace2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c434992d65f2dea6a4227fbd… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Apr 12 12:12:05 2007 +0200 configure: Include <sys/types.h> before including <linux/joystick.h>. --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/configure b/configure index e240093..df5dbe3 100755 --- a/configure +++ b/configure @@ -17450,6 +17450,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <sys/ioctl.h> + #include <sys/types.h> #include <linux/joystick.h> struct js_event blub; diff --git a/configure.ac b/configure.ac index 6d9e2cf..c9766dc 100644 --- a/configure.ac +++ b/configure.ac @@ -1302,6 +1302,7 @@ then wine_cv_linux_joystick_22_api, AC_TRY_COMPILE([ #include <sys/ioctl.h> + #include <sys/types.h> #include <linux/joystick.h> struct js_event blub;

1 0

Vitaliy Margolen : ntdll: Take size of the arena from the current pointer before advancing.
by Alexandre Julliard 12 Apr '07

12 Apr '07

Module: wine Branch: master Commit: 5b4cfac3bf7a6c8df04680da73232a6b70d2ec00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b4cfac3bf7a6c8df04680da7… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Apr 11 07:08:25 2007 -0600 ntdll: Take size of the arena from the current pointer before advancing. --- dlls/ntdll/heap.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 61b25db..25aefd9 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1613,7 +1613,19 @@ NTSTATUS WINAPI RtlWalkHeap( HANDLE heap, PVOID entry_ptr ) goto HW_end; } - ptr += entry->cbData; /* point to next arena */ + if (((ARENA_INUSE *)ptr - 1)->magic == ARENA_INUSE_MAGIC) + { + ARENA_INUSE *pArena = (ARENA_INUSE *)ptr - 1; + ptr += pArena->size & ARENA_SIZE_MASK; + } + else if (((ARENA_FREE *)ptr - 1)->magic == ARENA_FREE_MAGIC) + { + ARENA_FREE *pArena = (ARENA_FREE *)ptr - 1; + ptr += pArena->size & ARENA_SIZE_MASK; + } + else + ptr += entry->cbData; /* point to next arena */ + if (ptr > (char *)currentheap + currentheap->size - 1) { /* proceed with next subheap */ if (!(currentheap = currentheap->next))

1 0

Jason Edmeades : cmd.exe: Fix regression when launching a fully qualified program.
by Alexandre Julliard 12 Apr '07

12 Apr '07

Module: wine Branch: master Commit: 53c05cb53419907029a0c7e56ec5a7dd521ada98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53c05cb53419907029a0c7e56… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Wed Apr 11 22:25:54 2007 +0100 cmd.exe: Fix regression when launching a fully qualified program. --- programs/cmd/wcmdmain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 44195a5..5ef6ef6 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -837,8 +837,8 @@ void WCMD_run_program (char *command, int called) { /* Convert eg. ..\fred to include a directory by removing file part */ GetFullPathName(param1, sizeof(pathtosearch), pathtosearch, NULL); lastSlash = strrchr(pathtosearch, '\\'); + if (lastSlash && strchr(lastSlash, '.') != NULL) extensionsupplied = TRUE; if (lastSlash) *lastSlash = 0x00; - if (strchr(lastSlash, '.') != NULL) extensionsupplied = TRUE; strcpy(stemofsearch, lastSlash+1); }

1 0

Jason Edmeades : cmd.exe: Add prompting and COPYCMD plus /Y support to move .
by Alexandre Julliard 12 Apr '07

12 Apr '07

Module: wine Branch: master Commit: 2f5bfc0f786e86412aeb8ce166ec1e209f44a291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5bfc0f786e86412aeb8ce16… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Wed Apr 11 22:25:53 2007 +0100 cmd.exe: Add prompting and COPYCMD plus /Y support to move. --- programs/cmd/Cs.rc | 1 + programs/cmd/De.rc | 1 + programs/cmd/En.rc | 1 + programs/cmd/Es.rc | 1 + programs/cmd/Fr.rc | 1 + programs/cmd/Ja.rc | 1 + programs/cmd/Ko.rc | 1 + programs/cmd/Nl.rc | 1 + programs/cmd/No.rc | 1 + programs/cmd/Pl.rc | 1 + programs/cmd/Pt.rc | 1 + programs/cmd/Ru.rc | 1 + programs/cmd/Si.rc | 1 + programs/cmd/Tr.rc | 1 + programs/cmd/builtins.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- programs/cmd/wcmd.h | 1 + 16 files changed, 60 insertions(+), 1 deletions(-) diff --git a/programs/cmd/Cs.rc b/programs/cmd/Cs.rc index 7939fd4..83d01b2 100644 --- a/programs/cmd/Cs.rc +++ b/programs/cmd/Cs.rc @@ -236,4 +236,5 @@ Zadejte HELP <p��kaz> pro podrobn�j�� informace o n�kter�m z v��e uveden�ch p��k WCMD_NO, "N" WCMD_NOASSOC, "File association missing for extension %s\n" WCMD_NOFTYPE, "No open command associated with file type '%s'\n" + WCMD_OVERWRITE, "Overwrite" } diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index a8ad3b5..b60cd2a 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -253,4 +253,5 @@ obigen Befehle erhalten.\n" WCMD_NO, "N" WCMD_NOASSOC, "File association missing for extension %s\n" WCMD_NOFTYPE, "No open command associated with file type '%s'\n" + WCMD_OVERWRITE, "Overwrite" } diff --git a/programs/cmd/En.rc b/programs/cmd/En.rc index e542bcb..7fd28a6 100644 --- a/programs/cmd/En.rc +++ b/programs/cmd/En.rc @@ -240,4 +240,5 @@ Enter HELP <command> for further information on any of the above commands\n" WCMD_NO, "N" WCMD_NOASSOC, "File association missing for extension %s\n" WCMD_NOFTYPE, "No open command associated with file type '%s'\n" + WCMD_OVERWRITE, "Overwrite" } diff --git a/programs/cmd/Es.rc b/programs/cmd/Es.rc index 9feac82..0933496 100644 --- a/programs/cmd/Es.rc +++ b/programs/cmd/Es.rc @@ -248,4 +248,5 @@ Introduzca HELP <comando> para m�s informaci�n sobre cualquiera de los comandos\ WCMD_NO, "N" WCMD_NOASSOC, "File association missing for extension %s\n" WCMD_NOFTYPE, "No open command associated with file type '%s'\n" + WCMD_OVERWRITE, "Overwrite" } diff --git a/programs/cmd/Fr.rc b/programs/cmd/Fr.rc index e4c0c42..6897438 100644 --- a/programs/cmd/Fr.rc +++ b/programs/cmd/Fr.rc @@ -230,4 +230,5 @@ Entrez HELP <commande> pour plus d'informations sur les commandes ci-dessus\n" WCMD_NO, "N" WCMD_NOASSOC, "File association missing for extension %s\n" WCMD_NOFTYPE, "No open command associated with file type '%s'\n" + WCMD_OVERWRITE, "Overwrite" } diff --git a/programs/cmd/Ja.rc b/programs/cmd/Ja.rc index 7762e80..f7435a6 100644 --- a/programs/cmd/Ja.rc +++ b/programs/cmd/Ja.rc @@ -234,4 +234,5 @@ EXIT\t\tCMD��I��\n\n\ WCMD_NO, "N" WCMD_NOASSOC, "File association missing for extension %s\n" WCMD_NOFTYPE, "No open command associated with file type '%s'\n" + WCMD_OVERWRITE, "Overwrite" } diff --git a/programs/cmd/Ko.rc b/programs/cmd/Ko.rc index ebc3116..0a5b2fd 100644 --- a/programs/cmd/Ko.rc +++ b/programs/cmd/Ko.rc @@ -232,4 +232,5 @@ HELP <��>�� ġ�� \n" WCMD_NO, "�ƴϿ�" WCMD_NOASSOC, "�� Ȯ�� %s�� Ǯ�׸�� ϴ�. \n" WCMD_NOFTYPE, "�� '%s'�� �� ɵ� ��ϴ�.'\n" + WCMD_OVERWRITE, "Overwrite" } diff --git a/programs/cmd/Nl.rc b/programs/cmd/Nl.rc index 3a94d92..ef6c7e2 100644 --- a/programs/cmd/Nl.rc +++ b/programs/cmd/Nl.rc @@ -233,4 +233,5 @@ type HELP <opdracht> voor meer informatie over bovengenoemde opdrachten\n" WCMD_NO, "N" WCMD_NOASSOC, "File association missing for extension %s\n" WCMD_NOFTYPE, "No open command associated with file type '%s'\n" + WCMD_OVERWRITE, "Overwrite" } diff --git a/programs/cmd/No.rc b/programs/cmd/No.rc index 6bf129d..87e84d2 100644 --- a/programs/cmd/No.rc +++ b/programs/cmd/No.rc @@ -231,4 +231,5 @@ Skriv �HELP <kommando>� for mer informasjon om kommandoene ovenfor\n" WCMD_NO, "N" WCMD_NOASSOC, "File association missing for extension %s\n" WCMD_NOFTYPE, "No open command associated with file type '%s'\n" + WCMD_OVERWRITE, "Overwrite" } diff --git a/programs/cmd/Pl.rc b/programs/cmd/Pl.rc index 2c797e0..59afcf0 100644 --- a/programs/cmd/Pl.rc +++ b/programs/cmd/Pl.rc @@ -235,4 +235,5 @@ Wpisz HELP <komenda> dla dok�adniejszych informacji o komendzie\n" WCMD_NO, "N" WCMD_NOASSOC, "File association missing for extension %s\n" WCMD_NOFTYPE, "No open command associated with file type '%s'\n" + WCMD_OVERWRITE, "Overwrite" } diff --git a/programs/cmd/Pt.rc b/programs/cmd/Pt.rc index f4a28ce..3c9809f 100644 --- a/programs/cmd/Pt.rc +++ b/programs/cmd/Pt.rc @@ -440,4 +440,5 @@ Digite HELP <comando> para mais informa��es sobre alguns dos comandos acima\n" WCMD_NO, "N" WCMD_NOASSOC, "File association missing for extension %s\n" WCMD_NOFTYPE, "No open command associated with file type '%s'\n" + WCMD_OVERWRITE, "Overwrite" } diff --git a/programs/cmd/Ru.rc b/programs/cmd/Ru.rc index 6f3f01a..781aa26 100644 --- a/programs/cmd/Ru.rc +++ b/programs/cmd/Ru.rc @@ -246,4 +246,5 @@ EXIT\t\t�� CMD\n\n\ WCMD_NO, "N" WCMD_NOASSOC, "File association missing for extension %s\n" WCMD_NOFTYPE, "No open command associated with file type '%s'\n" + WCMD_OVERWRITE, "Overwrite" } diff --git a/programs/cmd/Si.rc b/programs/cmd/Si.rc index f7224c5..f70c915 100644 --- a/programs/cmd/Si.rc +++ b/programs/cmd/Si.rc @@ -232,4 +232,5 @@ Enter HELP <command> for further information on any of the above commands\n" WCMD_NO, "N" WCMD_NOASSOC, "File association missing for extension %s\n" WCMD_NOFTYPE, "No open command associated with file type '%s'\n" + WCMD_OVERWRITE, "Overwrite" } diff --git a/programs/cmd/Tr.rc b/programs/cmd/Tr.rc index 1d8d67f..8b4820b 100644 --- a/programs/cmd/Tr.rc +++ b/programs/cmd/Tr.rc @@ -234,4 +234,5 @@ Yukar�daki komutlar hakk�nda daha fazla bilgi i�in HELP <komut> girin\n" WCMD_NO, "N" WCMD_NOASSOC, "File association missing for extension %s\n" WCMD_NOFTYPE, "No open command associated with file type '%s'\n" + WCMD_OVERWRITE, "Overwrite" } diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 832da83..3d4f034 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -783,7 +783,51 @@ void WCMD_move (void) { SetLastError(ERROR_ACCESS_DENIED); status = 0; } else { - status = MoveFile (src, dest); + BOOL ok = TRUE; + + /* If destination exists, prompt unless /Y supplied */ + if (GetFileAttributesA(dest) != INVALID_FILE_ATTRIBUTES) { + BOOL force = FALSE; + char copycmd[MAXSTRING]; + int len; + + /* /-Y has the highest priority, then /Y and finally the COPYCMD env. variable */ + if (strstr (quals, "/-Y")) + force = FALSE; + else if (strstr (quals, "/Y")) + force = TRUE; + else { + len = GetEnvironmentVariable ("COPYCMD", copycmd, sizeof(copycmd)); + force = (len && len < sizeof(copycmd) && ! lstrcmpi (copycmd, "/Y")); + } + + /* Prompt if overwriting */ + if (!force) { + char question[MAXSTRING]; + char overwrite[MAXSTRING]; + + LoadString (hinst, WCMD_OVERWRITE, overwrite, sizeof(overwrite)); + + /* Ask for confirmation */ + sprintf(question, "%s %s? ", overwrite, dest); + ok = WCMD_ask_confirm(question, TRUE); + + /* So delete the destination prior to the move */ + if (ok) { + if (!DeleteFile (dest)) { + WCMD_print_error (); + errorlevel = 1; + ok = FALSE; + } + } + } + } + + if (ok) { + status = MoveFile (src, dest); + } else { + status = 1; /* Anything other than 0 to prevent error msg below */ + } } if (!status) { diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 29efbe4..2873ea2 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -179,6 +179,7 @@ extern const char anykey[]; #define WCMD_NO 1003 #define WCMD_NOASSOC 1004 #define WCMD_NOFTYPE 1005 +#define WCMD_OVERWRITE 1006 /* msdn specified max for Win XP */ #define MAXSTRING 8192

1 0

Jason Edmeades : cmd.exe: Add move support for wildcards and directories.
by Alexandre Julliard 12 Apr '07

12 Apr '07

Module: wine Branch: master Commit: d0a6fe101acd2c88659737e83fdf650b002331f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0a6fe101acd2c88659737e83… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Wed Apr 11 22:25:52 2007 +0100 cmd.exe: Add move support for wildcards and directories. --- programs/cmd/builtins.c | 87 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 64 insertions(+), 23 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7e79aeb..832da83 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -715,47 +715,89 @@ void WCMD_if (char *p) { * WCMD_move * * Move a file, directory tree or wildcarded set of files. - * FIXME: Needs input and output files to be fully specified. */ void WCMD_move (void) { - int status; - char outpath[MAX_PATH], inpath[MAX_PATH], *infile; + int status; WIN32_FIND_DATA fd; - HANDLE hff; + HANDLE hff; + char input[MAX_PATH]; + char output[MAX_PATH]; + char drive[10]; + char dir[MAX_PATH]; + char fname[MAX_PATH]; + char ext[MAX_PATH]; if (param1[0] == 0x00) { WCMD_output ("Argument missing\n"); return; } - if ((strchr(param1,'*') != NULL) || (strchr(param1,'%') != NULL)) { - WCMD_output ("Wildcards not yet supported\n"); - return; - } - /* If no destination supplied, assume current directory */ if (param2[0] == 0x00) { strcpy(param2, "."); } /* If 2nd parm is directory, then use original filename */ - GetFullPathName (param2, sizeof(outpath), outpath, NULL); - if (outpath[strlen(outpath) - 1] == '\\') - outpath[strlen(outpath) - 1] = '\0'; - hff = FindFirstFile (outpath, &fd); - if (hff != INVALID_HANDLE_VALUE) { - if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - GetFullPathName (param1, sizeof(inpath), inpath, &infile); - strcat (outpath, "\\"); - strcat (outpath, infile); + /* Convert partial path to full path */ + GetFullPathName (param1, sizeof(input), input, NULL); + GetFullPathName (param2, sizeof(output), output, NULL); + WINE_TRACE("Move from '%s'('%s') to '%s'\n", input, param1, output); + + /* Split into components */ + WCMD_splitpath(input, drive, dir, fname, ext); + + hff = FindFirstFile (input, &fd); + while (hff != INVALID_HANDLE_VALUE) { + char dest[MAX_PATH]; + char src[MAX_PATH]; + DWORD attribs; + + WINE_TRACE("Processing file '%s'\n", fd.cFileName); + + /* Build src & dest name */ + strcpy(src, drive); + strcat(src, dir); + + /* See if dest is an existing directory */ + attribs = GetFileAttributes(output); + if (attribs != INVALID_FILE_ATTRIBUTES && + (attribs & FILE_ATTRIBUTE_DIRECTORY)) { + strcpy(dest, output); + strcat(dest, "\\"); + strcat(dest, fd.cFileName); + } else { + strcpy(dest, output); } - FindClose (hff); - } - status = MoveFile (param1, outpath); - if (!status) WCMD_print_error (); + strcat(src, fd.cFileName); + + WINE_TRACE("Source '%s'\n", src); + WINE_TRACE("Dest '%s'\n", dest); + + /* Check if file is read only, otherwise move it */ + attribs = GetFileAttributesA(src); + if ((attribs != INVALID_FILE_ATTRIBUTES) && + (attribs & FILE_ATTRIBUTE_READONLY)) { + SetLastError(ERROR_ACCESS_DENIED); + status = 0; + } else { + status = MoveFile (src, dest); + } + + if (!status) { + WCMD_print_error (); + errorlevel = 1; + } + + /* Step on to next match */ + if (FindNextFile(hff, &fd) == 0) { + FindClose(hff); + hff = INVALID_HANDLE_VALUE; + break; + } + } } /**************************************************************************** @@ -838,7 +880,6 @@ void WCMD_remove_dir (char *command) { * WCMD_rename * * Rename a file. - * FIXME: Needs input and output files to be fully specified. */ void WCMD_rename (void) {

1 0

Louis Lenders : user32: Add RealChildWindowFromPoint.
by Alexandre Julliard 12 Apr '07

12 Apr '07

Module: wine Branch: master Commit: 2ca1ddd8f0558a62383f5b4d8991cc3c6155f7a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ca1ddd8f0558a62383f5b4d8… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Apr 11 21:57:00 2007 +0100 user32: Add RealChildWindowFromPoint. --- dlls/user32/user32.spec | 2 +- dlls/user32/winpos.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index dcb1e6b..7e4ce33 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -542,7 +542,7 @@ @ stdcall PtInRect(ptr double) @ stub QuerySendMessage # @ stub QueryUserCounters -@ stub RealChildWindowFromPoint +@ stdcall RealChildWindowFromPoint(long double) @ stdcall RealGetWindowClass(long ptr long) RealGetWindowClassA @ stdcall RealGetWindowClassA(long ptr long) @ stdcall RealGetWindowClassW(long ptr long) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 635e968..1bfd16b 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -433,6 +433,14 @@ HWND WINAPI ChildWindowFromPoint( HWND hwndParent, POINT pt ) } /******************************************************************* + * RealChildWindowFromPoint (USER32.@) + */ +HWND WINAPI RealChildWindowFromPoint( HWND hwndParent, POINT pt ) +{ + return ChildWindowFromPointEx( hwndParent, pt, CWP_SKIPTRANSPARENT ); +} + +/******************************************************************* * ChildWindowFromPointEx (USER32.@) */ HWND WINAPI ChildWindowFromPointEx( HWND hwndParent, POINT pt, UINT uFlags)

1 0

Jason Edmeades : cmd.exe: Add support for move with simple wildcards.
by Alexandre Julliard 12 Apr '07

12 Apr '07

Module: wine Branch: master Commit: 32fc366955683a237d78beba69568f8b873b68ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=32fc366955683a237d78beba6… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Wed Apr 11 22:25:51 2007 +0100 cmd.exe: Add support for move with simple wildcards. --- programs/cmd/builtins.c | 101 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 95 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 36d41a0..7e79aeb 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -843,18 +843,107 @@ void WCMD_remove_dir (char *command) { void WCMD_rename (void) { - int status; + int status; + HANDLE hff; + WIN32_FIND_DATA fd; + char input[MAX_PATH]; + char *dotDst = NULL; + char drive[10]; + char dir[MAX_PATH]; + char fname[MAX_PATH]; + char ext[MAX_PATH]; + DWORD attribs; + + errorlevel = 0; + /* Must be at least two args */ if (param1[0] == 0x00 || param2[0] == 0x00) { WCMD_output ("Argument missing\n"); + errorlevel = 1; return; } - if ((strchr(param1,'*') != NULL) || (strchr(param1,'%') != NULL)) { - WCMD_output ("Wildcards not yet supported\n"); - return; + + /* Destination cannot contain a drive letter or directory separator */ + if ((strchr(param1,':') != NULL) || (strchr(param1,'\\') != NULL)) { + SetLastError(ERROR_INVALID_PARAMETER); + WCMD_print_error(); + errorlevel = 1; + return; + } + + /* Convert partial path to full path */ + GetFullPathName (param1, sizeof(input), input, NULL); + WINE_TRACE("Rename from '%s'('%s') to '%s'\n", input, param1, param2); + dotDst = strchr(param2, '.'); + + /* Split into components */ + WCMD_splitpath(input, drive, dir, fname, ext); + + hff = FindFirstFile (input, &fd); + while (hff != INVALID_HANDLE_VALUE) { + char dest[MAX_PATH]; + char src[MAX_PATH]; + char *dotSrc = NULL; + int dirLen; + + WINE_TRACE("Processing file '%s'\n", fd.cFileName); + + /* FIXME: If dest name or extension is *, replace with filename/ext + part otherwise use supplied name. This supports: + ren *.fred *.jim + ren jim.* fred.* etc + However, windows has a more complex algorithum supporting eg + ?'s and *'s mid name */ + dotSrc = strchr(fd.cFileName, '.'); + + /* Build src & dest name */ + strcpy(src, drive); + strcat(src, dir); + strcpy(dest, src); + dirLen = strlen(src); + strcat(src, fd.cFileName); + + /* Build name */ + if (param2[0] == '*') { + strcat(dest, fd.cFileName); + if (dotSrc) dest[dirLen + (dotSrc - fd.cFileName)] = 0x00; + } else { + strcat(dest, param2); + if (dotDst) dest[dirLen + (dotDst - param2)] = 0x00; + } + + /* Build Extension */ + if (dotDst && (*(dotDst+1)=='*')) { + if (dotSrc) strcat(dest, dotSrc); + } else if (dotDst) { + if (dotDst) strcat(dest, dotDst); + } + + WINE_TRACE("Source '%s'\n", src); + WINE_TRACE("Dest '%s'\n", dest); + + /* Check if file is read only, otherwise move it */ + attribs = GetFileAttributesA(src); + if ((attribs != INVALID_FILE_ATTRIBUTES) && + (attribs & FILE_ATTRIBUTE_READONLY)) { + SetLastError(ERROR_ACCESS_DENIED); + status = 0; + } else { + status = MoveFile (src, dest); + } + + if (!status) { + WCMD_print_error (); + errorlevel = 1; + } + + /* Step on to next match */ + if (FindNextFile(hff, &fd) == 0) { + FindClose(hff); + hff = INVALID_HANDLE_VALUE; + break; + } } - status = MoveFile (param1, param2); - if (!status) WCMD_print_error (); } /*****************************************************************************

1 0