wine-commits May 2007

wine-commits@winehq.org

3 participants
715 discussions

Peter Oberndorfer : ntdll: Call NtQueryAttributesFile in RtlDoesFileExists_U.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 3d57dd3f075b0c92e1c42ba9862cfdbe279d5c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d57dd3f075b0c92e1c42ba98… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Thu May 3 22:33:58 2007 +0200 ntdll: Call NtQueryAttributesFile in RtlDoesFileExists_U. --- dlls/ntdll/directory.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 7045716..64d5ba9 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2013,12 +2013,21 @@ done: BOOLEAN WINAPI RtlDoesFileExists_U(LPCWSTR file_name) { UNICODE_STRING nt_name; - ANSI_STRING unix_name; + FILE_BASIC_INFORMATION basic_info; + OBJECT_ATTRIBUTES attr; BOOLEAN ret; if (!RtlDosPathNameToNtPathName_U( file_name, &nt_name, NULL, NULL )) return FALSE; - ret = (wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN, FALSE ) == STATUS_SUCCESS); - if (ret) RtlFreeAnsiString( &unix_name ); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nt_name; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + ret = NtQueryAttributesFile(&attr, &basic_info) == STATUS_SUCCESS; + RtlFreeUnicodeString( &nt_name ); return ret; }

1 0

José Manuel Ferrer Ortiz : Some Spanish translation updates.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: ac3c960c2634d4892452c975dfc19989893522bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac3c960c2634d4892452c975d… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Thu May 3 12:29:53 2007 -0700 Some Spanish translation updates. --- dlls/oledlg/oledlg_Es.rc | 42 +++++++++++++++++++- dlls/shdoclc/Es.rc | 45 +++++++++++++-------- dlls/shell32/shell32_En.rc | 2 +- dlls/shell32/shell32_Es.rc | 94 +++++++++++++++++++++++--------------------- dlls/winspool.drv/Es.rc | 3 +- 5 files changed, 121 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac3c960c2634d4892452c…

1 0

Konstantin Kondratyuk : ntdll: Correct a copy/paste mistake in NtWriteFile.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: e84d2702524659094adce591d94a4eb87c3cffdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84d2702524659094adce591d… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Thu May 3 15:14:25 2007 +0400 ntdll: Correct a copy/paste mistake in NtWriteFile. --- dlls/ntdll/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index c41d387..6912350 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -881,7 +881,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, timeout = get_next_io_timeout( &timeouts, total ); pfd.fd = unix_handle; - pfd.events = POLLIN; + pfd.events = POLLOUT; if (!timeout || !(ret = poll( &pfd, 1, timeout ))) {

1 0

Alexandre Julliard : Get rid of some empty source files, our makefiles no longer require them.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 60e122b088c55f59598c6eabe3e9336141d8eeb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e122b088c55f59598c6eabe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 4 12:27:34 2007 +0200 Get rid of some empty source files, our makefiles no longer require them. --- dlls/dplay/Makefile.in | 2 -- dlls/dplay/dplay_main.c | 1 - dlls/lz32/Makefile.in | 2 -- dlls/lz32/lzexpand_main.c | 1 - dlls/msdmo/Makefile.in | 3 +-- dlls/msdmo/msdmo_main.c | 1 - dlls/msvcrt40/Makefile.in | 2 -- dlls/msvcrt40/msvcrt40.c | 1 - dlls/shfolder/Makefile.in | 2 -- dlls/shfolder/shfolder_main.c | 1 - 10 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlls/dplay/Makefile.in b/dlls/dplay/Makefile.in index 50b3852..c1d0ad9 100644 --- a/dlls/dplay/Makefile.in +++ b/dlls/dplay/Makefile.in @@ -6,8 +6,6 @@ MODULE = dplay.dll IMPORTLIB = libdplay.$(IMPLIBEXT) IMPORTS = dplayx kernel32 -C_SRCS = dplay_main.c - RC_SRCS = version.rc @MAKE_DLL_RULES@ diff --git a/dlls/dplay/dplay_main.c b/dlls/dplay/dplay_main.c deleted file mode 100644 index 67a01ed..0000000 --- a/dlls/dplay/dplay_main.c +++ /dev/null @@ -1 +0,0 @@ -/* nothing here yet */ diff --git a/dlls/lz32/Makefile.in b/dlls/lz32/Makefile.in index e55d8ee..e50e8cd 100644 --- a/dlls/lz32/Makefile.in +++ b/dlls/lz32/Makefile.in @@ -6,8 +6,6 @@ MODULE = lz32.dll IMPORTLIB = liblz32.$(IMPLIBEXT) IMPORTS = kernel32 -C_SRCS = lzexpand_main.c - RC_SRCS = version.rc C_SRCS16 = lzexpand16.c diff --git a/dlls/lz32/lzexpand_main.c b/dlls/lz32/lzexpand_main.c deleted file mode 100644 index 355c97a..0000000 --- a/dlls/lz32/lzexpand_main.c +++ /dev/null @@ -1 +0,0 @@ -/* Nothing here - See lzexpand.c in kernel32 */ diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in index 57addcf..a0b924e 100644 --- a/dlls/msdmo/Makefile.in +++ b/dlls/msdmo/Makefile.in @@ -9,8 +9,7 @@ EXTRALIBS = -luuid C_SRCS = \ dmoreg.c \ - dmort.c \ - msdmo_main.c + dmort.c RC_SRCS = \ rsrc.rc diff --git a/dlls/msdmo/msdmo_main.c b/dlls/msdmo/msdmo_main.c deleted file mode 100644 index 67a01ed..0000000 --- a/dlls/msdmo/msdmo_main.c +++ /dev/null @@ -1 +0,0 @@ -/* nothing here yet */ diff --git a/dlls/msvcrt40/Makefile.in b/dlls/msvcrt40/Makefile.in index 4494572..6f33b83 100644 --- a/dlls/msvcrt40/Makefile.in +++ b/dlls/msvcrt40/Makefile.in @@ -7,8 +7,6 @@ MODULE = msvcrt40.dll IMPORTLIB = libmsvcrt40.$(IMPLIBEXT) IMPORTS = msvcrt kernel32 -C_SRCS = msvcrt40.c - @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/msvcrt40/msvcrt40.c b/dlls/msvcrt40/msvcrt40.c deleted file mode 100644 index 67a01ed..0000000 --- a/dlls/msvcrt40/msvcrt40.c +++ /dev/null @@ -1 +0,0 @@ -/* nothing here yet */ diff --git a/dlls/shfolder/Makefile.in b/dlls/shfolder/Makefile.in index db0da14..826157d 100644 --- a/dlls/shfolder/Makefile.in +++ b/dlls/shfolder/Makefile.in @@ -6,8 +6,6 @@ MODULE = shfolder.dll IMPORTLIB = libshfolder.$(IMPLIBEXT) IMPORTS = shell32 kernel32 -C_SRCS = shfolder_main.c - RC_SRCS = version.rc @MAKE_DLL_RULES@ diff --git a/dlls/shfolder/shfolder_main.c b/dlls/shfolder/shfolder_main.c deleted file mode 100644 index 67a01ed..0000000 --- a/dlls/shfolder/shfolder_main.c +++ /dev/null @@ -1 +0,0 @@ -/* nothing here yet */

1 0

Alexandre Julliard : Fix minor differences in the formatting of the license notices.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 69a88a9d4012bf9437758cb502562237413652b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69a88a9d4012bf9437758cb50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 4 12:08:15 2007 +0200 Fix minor differences in the formatting of the license notices. --- dlls/comctl32/tests/trackbar.c | 6 +++++- dlls/cryptnet/cryptnet_main.c | 2 +- dlls/itss/chm_lib.c | 21 +++++++++++++++------ dlls/itss/chm_lib.h | 21 +++++++++++++++------ dlls/itss/lzx.c | 25 +++++++++++++++++-------- dlls/itss/lzx.h | 25 +++++++++++++++++-------- dlls/mshtml/hlink.c | 1 + dlls/msi/update.c | 2 +- dlls/rsaenh/des.c | 2 +- dlls/rsaenh/md2.c | 2 +- dlls/rsaenh/mpi.c | 2 +- dlls/rsaenh/rc2.c | 2 +- dlls/rsaenh/rc4.c | 2 +- dlls/rsaenh/rsa.c | 2 +- dlls/rsaenh/rsaenh.c | 2 +- dlls/rsaenh/tomcrypt.h | 2 +- dlls/shell32/cpanelfolder.c | 2 +- include/mapitags.h | 6 +++--- programs/oleview/details.c | 2 +- programs/oleview/pane.c | 2 +- programs/oleview/resource.h | 2 +- programs/oleview/tree.c | 2 +- tools/winedump/pdb.c | 2 +- 23 files changed, 89 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69a88a9d4012bf9437758…

1 0

Alexandre Julliard : server: Allocate the wait event for FSCTL_PIPE_WAIT on the server side.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 46fe7177c108bbb925047a7a4ec509cb323d3e49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46fe7177c108bbb925047a7a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 17:44:32 2007 +0200 server: Allocate the wait event for FSCTL_PIPE_WAIT on the server side. --- dlls/ntdll/file.c | 23 +---------------------- server/named_pipe.c | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 02a175b..c41d387 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1075,28 +1075,6 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc if (!status) status = DIR_unmount_device( handle ); break; - case FSCTL_PIPE_WAIT: - { - HANDLE internal_event = 0; - - if(!event && !apc) - { - status = NtCreateEvent(&internal_event, EVENT_ALL_ACCESS, NULL, FALSE, FALSE); - if (status != STATUS_SUCCESS) break; - event = internal_event; - } - status = server_ioctl_file( handle, event, apc, apc_context, io, code, - in_buffer, in_size, out_buffer, out_size ); - - if (internal_event && status == STATUS_PENDING) - { - while (NtWaitForSingleObject(internal_event, TRUE, NULL) == STATUS_USER_APC) /*nothing*/ ; - status = io->u.Status; - } - if (internal_event) NtClose(internal_event); - } - break; - case FSCTL_PIPE_PEEK: { FILE_PIPE_PEEK_BUFFER *buffer = out_buffer; @@ -1173,6 +1151,7 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc break; case FSCTL_PIPE_LISTEN: + case FSCTL_PIPE_WAIT: default: status = server_ioctl_file( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); diff --git a/server/named_pipe.c b/server/named_pipe.c index a034436..6dba1f3 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -846,6 +846,7 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, c case FSCTL_PIPE_WAIT: { const FILE_PIPE_WAIT_FOR_BUFFER *buffer = data; + obj_handle_t wait_handle = 0; struct named_pipe *pipe; struct pipe_server *server; struct unicode_str name; @@ -867,13 +868,22 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, c { struct async *async; - if (!pipe->waiters && !(pipe->waiters = create_async_queue( NULL ))) + if (!pipe->waiters && !(pipe->waiters = create_async_queue( NULL ))) goto done; + + if (!async_data->event && !async_data->apc) { - release_object( pipe ); - return 0; + async_data_t new_data = *async_data; + if (!(wait_handle = alloc_wait_event( current->process ))) goto done; + new_data.event = wait_handle; + if (!(async = create_async( current, pipe->waiters, &new_data ))) + { + close_handle( current->process, wait_handle ); + wait_handle = 0; + } } + else async = create_async( current, pipe->waiters, async_data ); - if ((async = create_async( current, pipe->waiters, async_data ))) + if (async) { timeout_t when = buffer->TimeoutSpecified ? buffer->Timeout.QuadPart : pipe->timeout; async_set_timeout( async, when, STATUS_IO_TIMEOUT ); @@ -883,8 +893,9 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, c } else release_object( server ); + done: release_object( pipe ); - return 0; + return wait_handle; } default:

1 0

Alexandre Julliard : server: Allocate the wait event for FSCTL_PIPE_LISTEN on the server side.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 63a2372526ff534c997d90a0933dcab834b599e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63a2372526ff534c997d90a09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 17:44:05 2007 +0200 server: Allocate the wait event for FSCTL_PIPE_LISTEN on the server side. --- dlls/ntdll/file.c | 2 +- server/named_pipe.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index cb09e96..02a175b 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1075,7 +1075,6 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc if (!status) status = DIR_unmount_device( handle ); break; - case FSCTL_PIPE_LISTEN: case FSCTL_PIPE_WAIT: { HANDLE internal_event = 0; @@ -1173,6 +1172,7 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc status = STATUS_SUCCESS; break; + case FSCTL_PIPE_LISTEN: default: status = server_ioctl_file( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 9137bf6..a034436 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -570,11 +570,25 @@ static enum server_fd_type pipe_client_get_fd_type( struct fd *fd ) return FD_TYPE_PIPE; } +static obj_handle_t alloc_wait_event( struct process *process ) +{ + obj_handle_t handle = 0; + struct event *event = create_event( NULL, NULL, 0, 1, 0 ); + + if (event) + { + handle = alloc_handle( process, event, EVENT_ALL_ACCESS, 0 ); + release_object( event ); + } + return handle; +} + static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, const void *data, data_size_t size ) { struct pipe_server *server = get_fd_user( fd ); struct async *async; + obj_handle_t wait_handle = 0; switch(code) { @@ -583,12 +597,26 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a { case ps_idle_server: case ps_wait_connect: - set_server_state( server, ps_wait_open ); - if ((async = fd_queue_async( server->ioctl_fd, async_data, ASYNC_TYPE_WAIT, 0 ))) + if (!async_data->event && !async_data->apc) + { + async_data_t new_data = *async_data; + if (!(wait_handle = alloc_wait_event( current->process ))) break; + new_data.event = wait_handle; + if (!(async = fd_queue_async( server->ioctl_fd, &new_data, ASYNC_TYPE_WAIT, 0 ))) + { + close_handle( current->process, wait_handle ); + break; + } + } + else async = fd_queue_async( server->ioctl_fd, async_data, ASYNC_TYPE_WAIT, 0 ); + + if (async) { + set_server_state( server, ps_wait_open ); if (server->pipe->waiters) async_wake_up( server->pipe->waiters, STATUS_SUCCESS ); release_object( async ); set_error( STATUS_PENDING ); + return wait_handle; } break; case ps_connected_server:

1 0

Alexandre Julliard : server: Infrastructure to return a wait handle for blocking ioctls.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: fd59e158a74dd399ecfdf95509fb3b52489e9bef URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd59e158a74dd399ecfdf9550… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 17:43:18 2007 +0200 server: Infrastructure to return a wait handle for blocking ioctls. --- dlls/ntdll/file.c | 11 +++++++++++ include/wine/server_protocol.h | 4 +++- server/fd.c | 12 +++++++----- server/file.h | 8 ++++---- server/named_pipe.c | 34 ++++++++++++++++------------------ server/protocol.def | 2 ++ server/trace.c | 2 ++ 7 files changed, 45 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd59e158a74dd399ecfdf…

1 0

Alexandre Julliard : server: Store valid file options in pseudo file descriptors.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 017480d4e29228dd169f14c31815daee991e3e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=017480d4e29228dd169f14c31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 16:07:30 2007 +0200 server: Store valid file options in pseudo file descriptors. --- server/fd.c | 3 ++- server/file.h | 3 ++- server/mailslot.c | 2 +- server/named_pipe.c | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/server/fd.c b/server/fd.c index 4ad4da5..c4a0288 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1409,7 +1409,7 @@ static struct fd *alloc_fd_object(void) } /* allocate a pseudo fd object, for objects that need to behave like files but don't have a unix fd */ -struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user ) +struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user, unsigned int options ) { struct fd *fd = alloc_object( &fd_ops ); @@ -1420,6 +1420,7 @@ struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *use fd->inode = NULL; fd->closed = NULL; fd->access = 0; + fd->options = options; fd->sharing = 0; fd->unix_fd = -1; fd->signaled = 0; diff --git a/server/file.h b/server/file.h index 09c90c3..df5988d 100644 --- a/server/file.h +++ b/server/file.h @@ -52,7 +52,8 @@ struct fd_ops /* file descriptor functions */ -extern struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user ); +extern struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user, + unsigned int options ); extern void set_no_fd_status( struct fd *fd, unsigned int status ); extern struct fd *open_fd( const char *name, int flags, mode_t *mode, unsigned int access, unsigned int sharing, unsigned int options ); diff --git a/server/mailslot.c b/server/mailslot.c index 8bcb723..fd50080 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -359,7 +359,7 @@ void create_mailslot_device( struct directory *root, const struct unicode_str *n get_error() != STATUS_OBJECT_NAME_EXISTS) { dev->mailslots = NULL; - if (!(dev->fd = alloc_pseudo_fd( &mailslot_device_fd_ops, &dev->obj )) || + if (!(dev->fd = alloc_pseudo_fd( &mailslot_device_fd_ops, &dev->obj, 0 )) || !(dev->mailslots = create_namespace( 7 ))) { release_object( dev ); diff --git a/server/named_pipe.c b/server/named_pipe.c index f2c7947..801b4d7 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -480,7 +480,7 @@ void create_named_pipe_device( struct directory *root, const struct unicode_str get_error() != STATUS_OBJECT_NAME_EXISTS) { dev->pipes = NULL; - if (!(dev->fd = alloc_pseudo_fd( &named_pipe_device_fd_ops, &dev->obj )) || + if (!(dev->fd = alloc_pseudo_fd( &named_pipe_device_fd_ops, &dev->obj, 0 )) || !(dev->pipes = create_namespace( 7 ))) { release_object( dev ); @@ -709,7 +709,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned list_add_head( &pipe->servers, &server->entry ); grab_object( pipe ); - if (!(server->ioctl_fd = alloc_pseudo_fd( &pipe_server_fd_ops, &server->obj ))) + if (!(server->ioctl_fd = alloc_pseudo_fd( &pipe_server_fd_ops, &server->obj, options ))) { release_object( server ); server = NULL;

1 0

Tim Schwartz : net.exe: Initial stub.
by Alexandre Julliard 03 May '07

03 May '07

Module: wine Branch: master Commit: 451616ee4528c82278c538da9ec5ad439fdcec65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451616ee4528c82278c538da9… Author: Tim Schwartz <tim(a)sanityinternet.com> Date: Wed May 2 12:30:19 2007 -0500 net.exe: Initial stub. --- .gitignore | 1 + Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + programs/Makefile.in | 2 ++ programs/net/Makefile.in | 13 +++++++++++++ programs/net/net.c | 41 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 63 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 01e88f1..b3331b2 100644 --- a/.gitignore +++ b/.gitignore @@ -756,6 +756,7 @@ programs/iexplore/iexplore programs/msiexec/msiexec programs/msiexec/msiexec.ico programs/msiexec/rsrc.res +programs/net/net programs/notepad/notepad programs/notepad/rsrc.res programs/oleview/oleview diff --git a/Makefile.in b/Makefile.in index 1f8f0c9..30e0581 100644 --- a/Makefile.in +++ b/Makefile.in @@ -449,6 +449,7 @@ ALL_MAKEFILES = \ programs/icinfo/Makefile \ programs/iexplore/Makefile \ programs/msiexec/Makefile \ + programs/net/Makefile \ programs/notepad/Makefile \ programs/oleview/Makefile \ programs/progman/Makefile \ @@ -794,6 +795,7 @@ programs/hh/Makefile: programs/hh/Makefile.in programs/Makeprog.rules programs/icinfo/Makefile: programs/icinfo/Makefile.in programs/Makeprog.rules programs/iexplore/Makefile: programs/iexplore/Makefile.in programs/Makeprog.rules programs/msiexec/Makefile: programs/msiexec/Makefile.in programs/Makeprog.rules +programs/net/Makefile: programs/net/Makefile.in programs/Makeprog.rules programs/notepad/Makefile: programs/notepad/Makefile.in programs/Makeprog.rules programs/oleview/Makefile: programs/oleview/Makefile.in programs/Makeprog.rules programs/progman/Makefile: programs/progman/Makefile.in programs/Makeprog.rules diff --git a/configure b/configure index 71a66ae..44d6f0e 100755 --- a/configure +++ b/configure @@ -20903,6 +20903,8 @@ ac_config_files="$ac_config_files programs/iexplore/Makefile" ac_config_files="$ac_config_files programs/msiexec/Makefile" +ac_config_files="$ac_config_files programs/net/Makefile" + ac_config_files="$ac_config_files programs/notepad/Makefile" ac_config_files="$ac_config_files programs/oleview/Makefile" @@ -21838,6 +21840,7 @@ do "programs/icinfo/Makefile") CONFIG_FILES="$CONFIG_FILES programs/icinfo/Makefile" ;; "programs/iexplore/Makefile") CONFIG_FILES="$CONFIG_FILES programs/iexplore/Makefile" ;; "programs/msiexec/Makefile") CONFIG_FILES="$CONFIG_FILES programs/msiexec/Makefile" ;; + "programs/net/Makefile") CONFIG_FILES="$CONFIG_FILES programs/net/Makefile" ;; "programs/notepad/Makefile") CONFIG_FILES="$CONFIG_FILES programs/notepad/Makefile" ;; "programs/oleview/Makefile") CONFIG_FILES="$CONFIG_FILES programs/oleview/Makefile" ;; "programs/progman/Makefile") CONFIG_FILES="$CONFIG_FILES programs/progman/Makefile" ;; diff --git a/configure.ac b/configure.ac index ddec5f4..b62c0a5 100644 --- a/configure.ac +++ b/configure.ac @@ -1776,6 +1776,7 @@ AC_CONFIG_FILES([programs/hh/Makefile]) AC_CONFIG_FILES([programs/icinfo/Makefile]) AC_CONFIG_FILES([programs/iexplore/Makefile]) AC_CONFIG_FILES([programs/msiexec/Makefile]) +AC_CONFIG_FILES([programs/net/Makefile]) AC_CONFIG_FILES([programs/notepad/Makefile]) AC_CONFIG_FILES([programs/oleview/Makefile]) AC_CONFIG_FILES([programs/progman/Makefile]) diff --git a/programs/Makefile.in b/programs/Makefile.in index f164c0b..ee2d3c7 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -17,6 +17,7 @@ SUBDIRS = \ icinfo \ iexplore \ msiexec \ + net \ notepad \ oleview \ progman \ @@ -57,6 +58,7 @@ INSTALLSUBDIRS = \ icinfo \ iexplore \ msiexec \ + net \ notepad \ oleview \ progman \ diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in new file mode 100644 index 0000000..5db7fc0 --- /dev/null +++ b/programs/net/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = net.exe +APPMODE = -mconsole +IMPORTS = kernel32 + +C_SRCS = net.c + +@MAKE_PROG_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/net/net.c b/programs/net/net.c new file mode 100644 index 0000000..f77c820 --- /dev/null +++ b/programs/net/net.c @@ -0,0 +1,41 @@ +/* + * Copyright 2007 Tim Schwartz + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#include <string.h> + +int main(int argc, char *argv[]) +{ + int ret = 0; + + if (argc < 2) + { + printf("The syntax of this command is:\n\n"); + printf("NET [ HELP ]\n"); + return 1; + } + + if(!strcasecmp(argv[1], "help")) + { + printf("The syntax of this command is:\n\n"); + printf("NET HELP command\n -or-\nNET command /HELP\n\n"); + printf(" Commands available are:\n"); + printf(" NET HELP\n"); + } + return ret; +}

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2007