wine-devel

wine-devel@winehq.org

9 participants
84457 discussions

FreeBSD and Total Annihilation (Bug 1392)
by Rod Taylor 19 Apr '03

19 Apr '03

With the sound fix, the demo version works great. The real version (which I just bought) doesn't work at all (blank screen) as shipped or with patches from the distributor. Attached is a trace of dplay and virtual, and below is the code snippit which I believe to be causing the problem. FreeBSD 4.8-RELEASE using 20030408 Wine sources ('official port') Any suggestions? Interesting lines from trace: trace:dplay:DPLAYX_ConstructData Through wait trace:dplay:DPLAYX_ConstructData File mapped 0x5c created trace:virtual:NtMapViewOfSection handle=0x5c addr=0x50000000 off=000000000 size=0 access=4 err:dplay:DPLAYX_ConstructData : unable to map static data into process memory space (487) trace:virtual:NtAllocateVirtualMemory 0x0 00110000 2000 00000040 The source of the error (487) seems to be line 466 in ntdll/virtual.c: static NTSTATUS anon_mmap_aligned( void **addr, unsigned int size, int prot, int flags ) { void *ptr, *base = *addr; unsigned int view_size = size + (base ? 0 : granularity_mask + 1); if ((ptr = wine_anon_mmap( base, view_size, prot, flags )) == (void *)-1) { if (errno == ENOMEM) return STATUS_NO_MEMORY; return STATUS_INVALID_PARAMETER; } if (!base) { /* Release the extra memory while keeping the range * starting on the granularity boundary. */ if ((unsigned int)ptr & granularity_mask) { unsigned int extra = granularity_mask + 1 - ((unsigned int)ptr & granularity_mask); munmap( ptr, extra ); ptr = (char *)ptr + extra; view_size -= extra; } if (view_size > size) munmap( (char *)ptr + size, view_size - size ); } else if (ptr != base) { /* We couldn't get the address we wanted */ munmap( ptr, view_size ); return STATUS_CONFLICTING_ADDRESSES; /* !! HERE !! */ } -- Rod Taylor <rbt(a)rbt.ca> PGP Key: http://www.rbt.ca/rbtpub.asc

1 0

named pipe patch
by Dan Kegel 18 Apr '03

18 Apr '03

Here's a draft of a patch that tries to fix two problems: 1. can't open a pipe until server has called ConnectNamedPipe (on Win32, pipes can be opened immediately after CreateNamedPipe) 2. client loses any data in pipe if server calls FlushFileBuffers and then immediately calls DisconnectNamedPipe. I work around this by keeping a reference to the server side fd in the client pipe user. FlushFileBuffers still doesn't work, but we don't care; this is kind of a unixification of named pipe semantics. It shifts our win32 noncompliance from a very touchy spot to a less touchy spot, I hope. In both cases, I try to solve the problem by passing fd's inside wineserver. I have no idea if I'm doing this right, but it does pass most of my single-process regression tests. (Overlapped I/O is still broken, and I'm not sure if this fd passing magic will work if the pipe ends are in different processes.) Interestingly, it seems that the DisconnectNamedPipe()/ConnectNamedPipe() sequence as previously written would have failed if a unix file descriptor was created or deleted between pipe disconnection and reconnection. This is because a new fd is used for each pipe session, but the old fd number was never removed from the handle-to-unix-fd cache upon DisconnectNamedPipe. My workaround for the data loss problem exposed this issue. I "fixed" it by invalidating the cached fd for the handle passed to DisconnectNamedPipe. (If there are any other handles to this object, their fds won't be invalidated. Shouldn't matter in practice...) This patch also includes an improved test for named pipes. I'm posting it here rather than to wine-patches to get feedback on whether the fd passing I'm doing is sane. Thanks, Dan -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045 Index: server/object.c =================================================================== RCS file: /home/wine/wine/server/object.c,v retrieving revision 1.27 diff -d -u -r1.27 object.c --- server/object.c 19 Feb 2003 00:33:33 -0000 1.27 +++ server/object.c 18 Apr 2003 17:41:17 -0000 @@ -193,6 +193,7 @@ struct object *grab_object( void *ptr ) { struct object *obj = (struct object *)ptr; + assert( obj ); assert( obj->refcount < INT_MAX ); obj->refcount++; return obj; Index: server/file.h =================================================================== RCS file: /home/wine/wine/server/file.h,v retrieving revision 1.7 diff -d -u -r1.7 file.h --- server/file.h 26 Mar 2003 23:41:43 -0000 1.7 +++ server/file.h 18 Apr 2003 17:41:17 -0000 @@ -49,6 +49,7 @@ extern struct fd *create_anonymous_fd( const struct fd_ops *fd_user_ops, int unix_fd, struct object *user ); extern void *get_fd_user( struct fd *fd ); +extern void set_fd_user( struct fd *fd, struct object *user ); extern int get_unix_fd( struct fd *fd ); extern void fd_poll_event( struct fd *fd, int event ); extern int check_fd_events( struct fd *fd, int events ); Index: server/fd.c =================================================================== RCS file: /home/wine/wine/server/fd.c,v retrieving revision 1.8 diff -d -u -r1.8 fd.c --- server/fd.c 26 Mar 2003 01:32:18 -0000 1.8 +++ server/fd.c 18 Apr 2003 17:41:18 -0000 @@ -884,6 +884,12 @@ return fd->user; } +/* change the object that is using an fd */ +void set_fd_user( struct fd *fd, struct object *user ) +{ + fd->user = user; +} + /* retrieve the unix fd for an object */ int get_unix_fd( struct fd *fd ) { @@ -993,15 +999,22 @@ return fd; } -/* flush a file buffers */ +/* flush a file's buffers */ DECL_HANDLER(flush_file) { - struct fd *fd = get_handle_fd_obj( current->process, req->handle, 0 ); - - if (fd) - { - fd->fd_ops->flush( fd ); - release_object( fd ); + struct object *obj = get_handle_obj(current->process, req->handle, 0, NULL); + if (!obj) { + set_error( STATUS_INVALID_HANDLE ); + } else { + struct fd *fd = get_obj_fd(obj); + /* It's ok for named pipes, and possibly other kinds of objects, + * to not have fds associated sometimes, so do nothing if no fd. + */ + if (fd) { + fd->fd_ops->flush( fd ); + release_object( fd ); + } + release_object( obj ); } } Index: server/handle.h =================================================================== RCS file: /home/wine/wine/server/handle.h,v retrieving revision 1.12 diff -d -u -r1.12 handle.h --- server/handle.h 14 Feb 2003 20:27:10 -0000 1.12 +++ server/handle.h 18 Apr 2003 17:41:18 -0000 @@ -39,6 +39,7 @@ extern struct object *get_handle_obj( struct process *process, obj_handle_t handle, unsigned int access, const struct object_ops *ops ); extern int get_handle_unix_fd( struct process *process, obj_handle_t handle, unsigned int access ); +extern void invalidate_handle_unix_fd( struct process *process, obj_handle_t handle ); extern int set_handle_info( struct process *process, obj_handle_t handle, int mask, int flags, int *fd ); extern obj_handle_t duplicate_handle( struct process *src, obj_handle_t src_handle, struct process *dst, unsigned int access, int inherit, int options ); Index: server/handle.c =================================================================== RCS file: /home/wine/wine/server/handle.c,v retrieving revision 1.26 diff -d -u -r1.26 handle.c --- server/handle.c 19 Feb 2003 00:33:33 -0000 1.26 +++ server/handle.c 18 Apr 2003 17:41:19 -0000 @@ -397,6 +397,17 @@ return entry->fd; } +/* invalidate the cached fd for a given handle */ +void invalidate_handle_unix_fd( struct process *process, obj_handle_t handle ) +{ + struct handle_entry *entry; + + entry = get_handle( process, handle ); + /*fprintf(stderr, "invalidate_handle_unix_fd: handle %d, clearing client unix process fd %d\n", (int)handle, entry->fd);*/ + if (entry) + entry->fd = -1; +} + /* find the first inherited handle of the given type */ /* this is needed for window stations and desktops (don't ask...) */ obj_handle_t find_inherited_handle( struct process *process, const struct object_ops *ops ) Index: server/named_pipe.c =================================================================== RCS file: /home/wine/wine/server/named_pipe.c,v retrieving revision 1.22 diff -d -u -r1.22 named_pipe.c --- server/named_pipe.c 4 Apr 2003 22:26:34 -0000 1.22 +++ server/named_pipe.c 18 Apr 2003 17:41:19 -0000 @@ -48,12 +48,13 @@ enum pipe_state { ps_none, - ps_idle_server, - ps_wait_open, - ps_wait_connect, + ps_fresh_server, /* server after create, before first connect */ + ps_idle_server, /* server after disconnect */ + ps_wait_open, /* server during ConnectNamedPipe() wait */ + ps_wait_connect, /* client during WaitNamedPipe() */ ps_connected_server, ps_connected_client, - ps_disconnected + ps_disconnected, /* client after disconnect */ }; struct named_pipe; @@ -62,6 +63,7 @@ { struct object obj; struct fd *fd; + struct fd *fd_for_peer; enum pipe_state state; struct pipe_user *other; struct named_pipe *pipe; @@ -103,6 +105,7 @@ static void pipe_user_destroy( struct object *obj); static int pipe_user_get_poll_events( struct fd *fd ); +static int pipe_user_flush( struct fd *fd ); static int pipe_user_get_info( struct fd *fd, struct get_file_info_reply *reply, int *flags ); static const struct object_ops pipe_user_ops = @@ -121,7 +124,7 @@ { pipe_user_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ - no_flush, /* flush */ + pipe_user_flush, /* flush */ pipe_user_get_info, /* get_file_info */ no_queue_async /* queue_async */ }; @@ -163,6 +166,8 @@ static struct fd *pipe_user_get_fd( struct object *obj ) { struct pipe_user *user = (struct pipe_user *)obj; + if (!user->fd) + return NULL; return (struct fd *)grab_object( user->fd ); } @@ -177,15 +182,20 @@ if(user->other) { - release_object( user->other->fd ); - user->other->fd = NULL; switch(user->other->state) { case ps_connected_server: user->other->state = ps_idle_server; + release_object( user->other->fd ); + user->other->fd = NULL; break; case ps_connected_client: user->other->state = ps_disconnected; + if (user->fd) { + user->other->fd_for_peer = user->fd; + set_fd_user(user->fd, &user->other->obj); + user->fd = NULL; + } break; default: fprintf(stderr,"connected pipe has strange state %d!\n", @@ -202,6 +212,7 @@ if (user->thread) release_object(user->thread); release_object(user->pipe); if (user->fd) release_object( user->fd ); + if (user->fd_for_peer) release_object(user->fd_for_peer); } static int pipe_user_get_poll_events( struct fd *fd ) @@ -209,6 +220,14 @@ return POLLIN | POLLOUT; /* FIXME */ } +static int pipe_user_flush( struct fd *fd ) +{ + /* Pretend we work. We don't, but the fact that we don't + * destroy contents on disconnect makes up for it in most cases. + */ + return 0; +} + static int pipe_user_get_info( struct fd *fd, struct get_file_info_reply *reply, int *flags ) { if (reply) @@ -273,6 +292,7 @@ return NULL; user->fd = NULL; + user->fd_for_peer = NULL; user->pipe = pipe; user->state = ps_none; user->other = NULL; @@ -290,13 +310,14 @@ return user; } -static struct pipe_user *find_partner(struct named_pipe *pipe, enum pipe_state state) +/* Find a pipe_user in any of the given states */ +static struct pipe_user *_find_partner(struct named_pipe *pipe, int states) { struct pipe_user *x; for(x = pipe->users; x; x=x->next) { - if(x->state==state) + if((1 << x->state) & states) break; } @@ -306,6 +327,12 @@ return (struct pipe_user *)grab_object( x ); } +/* Find a pipe_user in the given state */ +static inline struct pipe_user *find_partner(struct named_pipe *pipe, enum pipe_state s) +{ + return _find_partner(pipe, 1<<s); +} + DECL_HANDLER(create_named_pipe) { struct named_pipe *pipe; @@ -329,7 +356,14 @@ if(user) { - user->state = ps_idle_server; + int fds[2]; + user->state = ps_fresh_server; + if (!socketpair(PF_UNIX, SOCK_STREAM, 0, fds)) + { + user->fd = create_anonymous_fd( &pipe_user_fd_ops, fds[1], &user->obj ); + user->fd_for_peer = create_anonymous_fd( &pipe_user_fd_ops, fds[0], &user->obj ); + /* fprintf(stderr, "create_named_pipe: user %p, created fd %p, created fd_for_peer %p\n", user, user->fd, user->fd_for_peer); */ + } reply->handle = alloc_handle( current->process, user, GENERIC_READ|GENERIC_WRITE, 0 ); release_object( user ); } @@ -349,7 +383,7 @@ set_error( STATUS_NO_SUCH_FILE ); return; } - if (!(partner = find_partner(pipe, ps_wait_open))) + if (!(partner = _find_partner(pipe, (1<<ps_wait_open) | (1<<ps_fresh_server)))) { release_object(pipe); set_error( STATUS_PIPE_NOT_AVAILABLE ); @@ -359,22 +393,36 @@ { int fds[2]; - if(!socketpair(PF_UNIX, SOCK_STREAM, 0, fds)) - { - user->fd = create_anonymous_fd( &pipe_user_fd_ops, fds[1], &user->obj ); - partner->fd = create_anonymous_fd( &pipe_user_fd_ops, fds[0], &partner->obj ); - if (user->fd && partner->fd) - { - notify_waiter(partner,STATUS_SUCCESS); - partner->state = ps_connected_server; - partner->other = user; - user->state = ps_connected_client; - user->other = partner; - reply->handle = alloc_handle( current->process, user, req->access, 0 ); - } - } - else file_set_error(); + if (partner->fd_for_peer != NULL) { + /* Server side is fresh, so it already created the fds. + * Grab the fd it created for us, and set its user (since + * it couldn't know ahead of time). + */ + user->fd = partner->fd_for_peer; + partner->fd_for_peer = NULL; + set_fd_user(user->fd, &user->obj); + /* fprintf(stderr, "open_named_pipe: user %p grabbing fd %p from partner %p\n", user, user->fd, partner); */ + } else if (!socketpair(PF_UNIX, SOCK_STREAM, 0, fds)) { + /* Server side isn't fresh, so we have to create the fds for + * both sides. + */ + user->fd = create_anonymous_fd( &pipe_user_fd_ops, fds[1], &user->obj ); + partner->fd = create_anonymous_fd( &pipe_user_fd_ops, fds[0], &partner->obj ); + /* fprintf(stderr, "open_named_pipe: user %p, created fd %p, created fd %p for partner %p\n", user, user->fd, partner->fd, partner); */ + } else + file_set_error(); + if (user->fd && partner->fd) + { + enum pipe_state old_partner_state = partner->state; + partner->state = ps_connected_server; + partner->other = user; + user->state = ps_connected_client; + user->other = partner; + reply->handle = alloc_handle( current->process, user, req->access, 0 ); + if (old_partner_state == ps_wait_open) + notify_waiter(partner,STATUS_SUCCESS); + } release_object( user ); } release_object( partner ); @@ -389,7 +437,7 @@ if(!user) return; - if( user->state != ps_idle_server ) + if( (user->state & (ps_idle_server|ps_fresh_server)) == 0 ) { set_error(STATUS_PORT_ALREADY_SET); } @@ -455,16 +503,28 @@ if( (user->state == ps_connected_server) && (user->other->state == ps_connected_client) ) { - release_object( user->other->fd ); + /* This duplicates a fair bit of code from the destroy method */ + if (user->fd) { + /* fprintf(stderr, "disconnect_named_pipe: user %p passing fd %p to partner %p\n", user, user->fd, user->other); */ + user->other->fd_for_peer = user->fd; + set_fd_user(user->fd, &user->other->obj); + user->fd = NULL; + } user->other->fd = NULL; user->other->state = ps_disconnected; user->other->other = NULL; - - release_object( user->fd ); - user->fd = NULL; - user->state = ps_idle_server; user->other = NULL; + user->state = ps_idle_server; } + + /* IMPOSSIBLE PART: invalidate the cached unix fd for all + * handles that refer to user. + * We can only do it for the handle we were passed, + * so this will only work if that handle has no duplicate. + * FIXME: find out what happens to a handle in win32 when you + * disconnect a duplicate of it. + */ + invalidate_handle_unix_fd(current->process, req->handle); release_object(user); } Index: dlls/kernel/tests/pipe.c =================================================================== RCS file: /home/wine/wine/dlls/kernel/tests/pipe.c,v retrieving revision 1.2 diff -d -u -r1.2 pipe.c --- dlls/kernel/tests/pipe.c 25 Feb 2003 03:56:43 -0000 1.2 +++ dlls/kernel/tests/pipe.c 18 Apr 2003 17:41:20 -0000 @@ -21,23 +21,40 @@ #include <stdlib.h> #include <stdio.h> #include <time.h> +#include <assert.h> + +#include <wtypes.h> +#include <windef.h> +#include <winbase.h> +#include <winerror.h> #ifndef STANDALONE #include "wine/test.h" +#define trace2(a,b) trace((a),(b)) #else #include <assert.h> #define START_TEST(name) main(int argc, char **argv) #define ok(condition, msg) assert(condition) -#define todo_wine +#define todo_wine if (0) +static void trace2(const char *s, const char *t) +{ + DWORD cbWritten; + char buf[512]; + sprintf(buf, s, t); + WriteFile(GetStdHandle(STD_ERROR_HANDLE), buf, strlen(buf), &cbWritten, NULL); +} +static void trace(const char *s) +{ + DWORD cbWritten; + char buf[512]; + sprintf(buf, "%s", s); + WriteFile(GetStdHandle(STD_ERROR_HANDLE), buf, strlen(buf), &cbWritten, NULL); +} #endif -#include <wtypes.h> -#include <windef.h> -#include <winbase.h> -#include <winerror.h> - #define PIPENAME "\\\\.\\PiPe\\tests_" __FILE__ + void test_CreateNamedPipeA(void) { HANDLE hnp; @@ -45,8 +62,9 @@ const char obuf[] = "Bit Bucket"; char ibuf[32]; DWORD written; - DWORD gelesen; + DWORD nbytes_read; + trace("test_CreateNamedPipe starting\n"); /* Bad parameter checks */ hnp = CreateNamedPipeA("not a named pipe", PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE|PIPE_WAIT, @@ -86,10 +104,8 @@ /* lpSecurityAttrib */ NULL); ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed"); - hFile = CreateFileA(PIPENAME, GENERIC_READ|GENERIC_WRITE, 0, - NULL, OPEN_EXISTING, 0, 0); - todo_wine - { + hFile = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + todo_wine { ok(hFile != INVALID_HANDLE_VALUE, "CreateFile failed"); } @@ -101,15 +117,15 @@ memset(ibuf, 0, sizeof(ibuf)); ok(WriteFile(hnp, obuf, sizeof(obuf), &written, NULL), "WriteFile"); ok(written == sizeof(obuf), "write file len"); - ok(ReadFile(hFile, ibuf, sizeof(obuf), &gelesen, NULL), "ReadFile"); - ok(gelesen == sizeof(obuf), "read file len"); + ok(ReadFile(hFile, ibuf, sizeof(obuf), &nbytes_read, NULL), "ReadFile"); + ok(nbytes_read == sizeof(obuf), "read file len"); ok(memcmp(obuf, ibuf, written) == 0, "content check"); memset(ibuf, 0, sizeof(ibuf)); ok(WriteFile(hFile, obuf, sizeof(obuf), &written, NULL), "WriteFile"); ok(written == sizeof(obuf), "write file len"); - ok(ReadFile(hnp, ibuf, sizeof(obuf), &gelesen, NULL), "ReadFile"); - ok(gelesen == sizeof(obuf), "read file len"); + ok(ReadFile(hnp, ibuf, sizeof(obuf), &nbytes_read, NULL), "ReadFile"); + ok(nbytes_read == sizeof(obuf), "read file len"); ok(memcmp(obuf, ibuf, written) == 0, "content check"); /* Picky conformance tests */ @@ -148,9 +164,460 @@ } ok(CloseHandle(hnp), "CloseHandle"); + + trace("test_CreateNamedPipe returning\n"); +} + +void test_CreateNamedPipe_instances_must_match(void) +{ + HANDLE hnp, hnp2; + + /* Check no mismatch */ + hnp = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 2, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed"); + + hnp2 = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 2, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(hnp2 != INVALID_HANDLE_VALUE, "CreateNamedPipe failed"); + + ok(CloseHandle(hnp), "CloseHandle"); + ok(CloseHandle(hnp2), "CloseHandle"); + + /* Check nMaxInstances */ + hnp = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed"); + + todo_wine { + hnp2 = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(hnp2 == INVALID_HANDLE_VALUE + && GetLastError() == ERROR_PIPE_BUSY, "nMaxInstances not obeyed"); + } + + ok(CloseHandle(hnp), "CloseHandle"); + + /* Check PIPE_ACCESS_* */ + hnp = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 2, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed"); + + todo_wine { + hnp2 = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_INBOUND, PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(hnp2 == INVALID_HANDLE_VALUE + && GetLastError() == ERROR_ACCESS_DENIED, "PIPE_ACCESS_* mismatch allowed"); + } + + /* etc, etc */ +} + +/** implementation of alarm() */ +static DWORD CALLBACK alarmThreadMain(LPVOID arg) +{ + DWORD timeout = (DWORD) arg; + trace("alarmThreadMain\n"); + Sleep(timeout); + ok(FALSE, "alarm"); + ExitProcess(1); + return 1; +} + +HANDLE hnp = INVALID_HANDLE_VALUE; + +/** Trivial byte echo server - disconnects after each session */ +static DWORD CALLBACK serverThreadMain1(LPVOID arg) +{ + int i; + + trace("serverThreadMain1 start\n"); + /* Set up a simple echo server */ + hnp = CreateNamedPipeA(PIPENAME "serverThreadMain1", PIPE_ACCESS_DUPLEX, + PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + + ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed"); + for (i = 0; ; i++) { + char buf[512]; + DWORD written; + DWORD nbytes_read; + DWORD success; + + /* Wait for client to connect */ + trace("Server calling ConnectNamedPipe...\n"); + ok(ConnectNamedPipe(hnp, NULL) + || GetLastError() == ERROR_PIPE_CONNECTED, "ConnectNamedPipe"); + trace("ConnectNamedPipe returned.\n"); + + /* Echo bytes once */ + memset(buf, 0, sizeof(buf)); + + trace("Server reading...\n"); + success = ReadFile(hnp, buf, sizeof(buf), &nbytes_read, NULL); + trace("Server done reading.\n"); + ok(success, "ReadFile"); + trace2("Server read '%s'\n", buf); + ok(memcmp(buf, "client->server", 14) == 0, "content check"); + + trace("Server writing...\n"); + sprintf(buf, "server->client i %d ", i); + ok(WriteFile(hnp, buf, nbytes_read, &written, NULL), "WriteFile"); + trace("Server done writing.\n"); + ok(written == nbytes_read, "write file len"); + + /* finish this connection, wait for next one */ + trace("Server flushing.\n"); + todo_wine { + ok(FlushFileBuffers(hnp), "FlushFileBuffers"); + } + trace("Server disconnecting.\n"); + ok(DisconnectNamedPipe(hnp), "DisconnectNamedPipe"); + } +} + +/** Trivial byte echo server - closes after each connection */ +static DWORD CALLBACK serverThreadMain2(LPVOID arg) +{ + int i; + HANDLE hnpNext = 0; + + trace("serverThreadMain2\n"); + /* Set up a simple echo server */ + hnp = CreateNamedPipeA(PIPENAME "serverThreadMain2", PIPE_ACCESS_DUPLEX, + PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 2, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed"); + + for (i = 0; ; i++) { + char buf[512]; + DWORD written; + DWORD nbytes_read; + DWORD success; + + /* Wait for client to connect */ + trace("Server calling ConnectNamedPipe...\n"); + ok(ConnectNamedPipe(hnp, NULL) + || GetLastError() == ERROR_PIPE_CONNECTED, "ConnectNamedPipe"); + trace("ConnectNamedPipe returned.\n"); + + /* Echo bytes once */ + memset(buf, 0, sizeof(buf)); + + trace("Server reading...\n"); + success = ReadFile(hnp, buf, sizeof(buf), &nbytes_read, NULL); + trace("Server done reading.\n"); + ok(success, "ReadFile"); + + trace("Server writing...\n"); + ok(WriteFile(hnp, buf, nbytes_read, &written, NULL), "WriteFile"); + trace("Server done writing.\n"); + ok(written == nbytes_read, "write file len"); + + /* finish this connection, wait for next one */ + trace("Server flushing.\n"); + todo_wine { ok( FlushFileBuffers(hnp), "FlushFileBuffers"); } + trace("Server disconnecting.\n"); + ok(DisconnectNamedPipe(hnp), "DisconnectNamedPipe"); + + /* Set up next echo server */ + hnpNext = + CreateNamedPipeA(PIPENAME "serverThreadMain2", PIPE_ACCESS_DUPLEX, + PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 2, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + + ok(hnpNext != INVALID_HANDLE_VALUE, "CreateNamedPipe failed"); + + ok(CloseHandle(hnp), "CloseHandle"); + hnp = hnpNext; + } +} + +/** Trivial byte echo server - uses overlapped named pipe calls */ +static DWORD CALLBACK serverThreadMain3(LPVOID arg) +{ + int i; + HANDLE hEvent; + + trace("serverThreadMain3\n"); + /* Set up a simple echo server */ + hnp = CreateNamedPipeA(PIPENAME "serverThreadMain3", PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed"); + + hEvent = CreateEvent(NULL, // security attribute + TRUE, // manual reset event + FALSE, // initial state + NULL); // name + ok(hEvent != NULL, "CreateEvent"); + + for (i = 0; ; i++) { + char buf[512]; + DWORD written; + DWORD nbytes_read; + DWORD dummy; + DWORD success; + OVERLAPPED oOverlap; + int letWFSOEwait = (i & 2); + int letGORwait = (i & 1); + DWORD err; + + memset(&oOverlap, 0, sizeof(oOverlap)); + oOverlap.hEvent = hEvent; + + /* Wait for client to connect */ + trace("Server calling overlapped ConnectNamedPipe...\n"); + success = ConnectNamedPipe(hnp, &oOverlap); + err = GetLastError(); + ok(success || err == ERROR_IO_PENDING + || err == ERROR_PIPE_CONNECTED, "overlapped ConnectNamedPipe"); + trace("overlapped ConnectNamedPipe returned.\n"); + if (!success && (err == ERROR_IO_PENDING) && letWFSOEwait) + ok(WaitForSingleObjectEx(hEvent, INFINITE, TRUE) == 0, "wait ConnectNamedPipe"); + success = GetOverlappedResult(hnp, &oOverlap, &dummy, letGORwait); + if (!letGORwait && !letWFSOEwait && !success) { + ok(GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult"); + success = GetOverlappedResult(hnp, &oOverlap, &dummy, TRUE); + } + ok(success, "GetOverlappedResult ConnectNamedPipe"); + trace("overlapped ConnectNamedPipe operation complete.\n"); + + /* Echo bytes once */ + memset(buf, 0, sizeof(buf)); + + trace("Server reading...\n"); + success = ReadFile(hnp, buf, sizeof(buf), NULL, &oOverlap); + trace("Server ReadFile returned...\n"); + err = GetLastError(); + ok(success || err == ERROR_IO_PENDING, "overlapped ReadFile"); + trace("overlapped ReadFile returned.\n"); + if (!success && (err == ERROR_IO_PENDING) && letWFSOEwait) + ok(WaitForSingleObjectEx(hEvent, INFINITE, TRUE) == 0, "wait ReadFile"); + success = GetOverlappedResult(hnp, &oOverlap, &nbytes_read, letGORwait); + if (!letGORwait && !letWFSOEwait && !success) { + ok(GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult"); + success = GetOverlappedResult(hnp, &oOverlap, &nbytes_read, TRUE); + } + trace("Server done reading.\n"); + ok(success, "overlapped ReadFile"); + + trace("Server writing...\n"); + success = WriteFile(hnp, buf, nbytes_read, NULL, &oOverlap); + trace("Server WriteFile returned...\n"); + err = GetLastError(); + ok(success || err == ERROR_IO_PENDING, "overlapped WriteFile"); + trace("overlapped WriteFile returned.\n"); + if (!success && (err == ERROR_IO_PENDING) && letWFSOEwait) + ok(WaitForSingleObjectEx(hEvent, INFINITE, TRUE) == 0, "wait WriteFile"); + success = GetOverlappedResult(hnp, &oOverlap, &written, letGORwait); + if (!letGORwait && !letWFSOEwait && !success) { + ok(GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult"); + success = GetOverlappedResult(hnp, &oOverlap, &written, TRUE); + } + trace("Server done writing.\n"); + ok(success, "overlapped WriteFile"); + ok(written == nbytes_read, "write file len"); + + /* finish this connection, wait for next one */ + trace("Server flushing.\n"); + todo_wine { ok( FlushFileBuffers(hnp), "FlushFileBuffers"); } + trace("Server disconnecting.\n"); + ok(DisconnectNamedPipe(hnp), "DisconnectNamedPipe"); + } +} + +static void exercizeServer(const char *pipename, HANDLE serverThread) +{ + int i; + DWORD success; + + trace("exercizeServer starting\n"); + for (i = 0; i < 8; i++) { + HANDLE hFile; + char obuf[32]; + char ibuf[32]; + DWORD written; + DWORD nbytes_read; + int loop; + + for (loop = 0; loop < 3; loop++) { + DWORD err; + trace("Client connecting...\n"); + /* Connect to the server */ + hFile = CreateFileA(pipename, GENERIC_READ | GENERIC_WRITE, 0, + NULL, OPEN_EXISTING, 0, 0); + if (hFile != INVALID_HANDLE_VALUE) + break; + err = GetLastError(); + if (loop == 0) + ok(err == ERROR_PIPE_BUSY || err == ERROR_FILE_NOT_FOUND, "connecting to pipe"); + else + ok(err == ERROR_PIPE_BUSY, "connecting to pipe"); + trace("connect failed, retrying\n"); + Sleep(200); + } + ok(hFile != INVALID_HANDLE_VALUE, "client opening named pipe"); + + /* Make sure it can echo */ + memset(ibuf, 0, sizeof(ibuf)); + sprintf(obuf, "client->server i %d ", i); + trace2("Client writing '%s'...\n", obuf); + ok(WriteFile(hFile, obuf, sizeof(obuf), &written, NULL), "WriteFile to client end of pipe"); + ok(written == sizeof(obuf), "write file len"); + trace("Client reading...\n"); + success = ReadFile(hFile, ibuf, sizeof(ibuf), &nbytes_read, NULL); + if (!success) + printf("ReadFile(%p, %p, %d,,0) failed, err %ld\n", hFile, ibuf, sizeof(ibuf), GetLastError()); + trace2("Client read '%s'\n", ibuf); + ok(success, "ReadFile from client end of pipe"); + ok(nbytes_read == sizeof(obuf), "read file len"); + /*ok(memcmp(obuf, ibuf, written) == 0, "content check");*/ + + trace("Client closing...\n"); + ok(CloseHandle(hFile), "CloseHandle"); + } + + ok(TerminateThread(serverThread, 0), "TerminateThread"); + CloseHandle(hnp); + trace("exercizeServer returning\n"); +} + +void test_NamedPipe_2(void) +{ + HANDLE serverThread; + DWORD serverThreadId; + HANDLE alarmThread; + DWORD alarmThreadId; + + trace("test_NamedPipe_2 starting\n"); + /* Set up a ten second timeout */ + alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 10000, 0, &alarmThreadId); + + /* The servers we're about to exercize do try to clean up carefully, + * but to reduce the change of a test failure due to a pipe handle + * leak in the test code, we'll use a different pipe name for each server. + */ + + trace("Try server #1\n"); + serverThread = CreateThread(NULL, 0, serverThreadMain1, 0, 0, &serverThreadId); + ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread"); + exercizeServer(PIPENAME "serverThreadMain1", serverThread); + + trace("Try server #2\n"); + serverThread = CreateThread(NULL, 0, serverThreadMain2, 0, 0, &serverThreadId); + ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread"); + exercizeServer(PIPENAME "serverThreadMain2", serverThread); + + todo_wine { + trace("Try server #3\n"); + serverThread = CreateThread(NULL, 0, serverThreadMain3, 0, 0, &serverThreadId); + ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread"); + exercizeServer(PIPENAME "serverThreadMain3", serverThread); + + ok(TerminateThread(alarmThread, 0), "TerminateThread"); + trace("test_NamedPipe_2 returning\n"); + } +} + +void test_DisconnectNamedPipe(void) +{ + HANDLE hnp; + HANDLE hFile; + const char obuf[] = "Bit Bucket"; + char ibuf[32]; + DWORD written; + DWORD nbytes_read; + + hnp = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed"); + + ok(WriteFile(hnp, obuf, sizeof(obuf), &written, NULL) == 0 + && GetLastError() == ERROR_PIPE_LISTENING, "WriteFile to not-yet-connected pipe"); + ok(ReadFile(hnp, ibuf, sizeof(ibuf), &nbytes_read, NULL) == 0 + && GetLastError() == ERROR_PIPE_LISTENING, "ReadFile from not-yet-connected pipe"); + + hFile = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + todo_wine { + ok(hFile != INVALID_HANDLE_VALUE, "CreateFile failed"); + } + + /* don't try to do i/o if one side couldn't be opened, as it hangs */ + if (hFile != INVALID_HANDLE_VALUE) { + + /* see what happens if server calls DisconnectNamedPipe + * when there are bytes in the pipe + */ + + ok(WriteFile(hFile, obuf, sizeof(obuf), &written, NULL), "WriteFile"); + ok(written == sizeof(obuf), "write file len"); + ok(DisconnectNamedPipe(hnp), "DisconnectNamedPipe while messages waiting"); + ok(WriteFile(hFile, obuf, sizeof(obuf), &written, NULL) == 0 + && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "WriteFile to disconnected pipe"); + ok(ReadFile(hnp, ibuf, sizeof(ibuf), &nbytes_read, NULL) == 0 + && GetLastError() == ERROR_PIPE_NOT_CONNECTED, + "ReadFile from disconnected pipe with bytes waiting"); + ok(CloseHandle(hFile), "CloseHandle"); + } + + ok(CloseHandle(hnp), "CloseHandle"); + } START_TEST(pipe) { + trace("test 1 of 4:\n"); test_CreateNamedPipeA(); + trace("test 2 of 4:\n"); + test_CreateNamedPipe_instances_must_match(); + trace("test 3 of 4:\n"); + test_NamedPipe_2(); + trace("test 4 of 4:\n"); + test_DisconnectNamedPipe(); + trace("all tests done\n"); }

1 0

winelib on sparc?
by Robert Reif 18 Apr '03

18 Apr '03

I would like to do some winelib programming on a sparc and I'm struggling with a few concepts. winelib and wine are the same sources? When you build and run the tests in wine, are the tests really winelib apps? Has anyone really done this? The docs just say "uncharted territory" and don't go any further. I added code for my architecture and compile the wine source but get assembler errors on the spec files. Any help would be welcomed. Thanks, Bob.

1 0

Bug Hunting - uninstaller.exe on Win2K with uninstall information.
by Steven Edwards 18 Apr '03

18 Apr '03

Hello Everyone, This bug is a year+ old and I have not done much work on it untill now as I never could debug the stupid thing. This has always bothered me because this program should work fine under Win2K if we are compatible with the registry APIs and such. Does anyone have a idea as to what is going on? Here is the info from bug 1395 in bugzilla When running uninstaller built from Mingw or MS-VC++ 6 under Win2K the application seems to work and run fine when there is no information in the uninstall branch of the registry. As soon as a program is registered and uninstaller is run the program crashes. This has been tested on 3 systems and with many differnt sources and versions of Mingw. When debugging under MSVC with uninstall information in the registry the debugger stops at this code. FetchUninstallInformation() Line 225/226: entries[numentries-1].key = HeapAlloc(GetProcessHeap(), 0, strlen(subKeyName)+1); Entries : Cxx0030: Expression could not be evaluated I will attach a Visual Stdio build with sources/debugging information this evening. Thanks Steven

1 0

Re: remove server silliniess
by Bill Medland 18 Apr '03

18 Apr '03

On April 16, 2003 01:51 pm, Gregory M. Turner wrote: > remove run-time checks of compile-time constants. Why is that a silliness? I dearly wish that there were a way of doing compile-time assertion, but there isn't, so it has to be done by a runtime assertion. So it adds a tiny amount to the runtime. If that really bugs you then create a function of compile-time assertions and ensure that it gets called once only. Personally considering the current status of wine and the way we have to work on code that we don't really understand I am surprised at how few assertions there are (and lets not get started on internal code documentation) Or are you saying that assertions are a waste of time :-) -- Bill Medland ACCPAC International, Inc. medbi01(a)accpac.com Corporate: www.accpac.com Hosted Services: www.accpaconline.com

5 5

Re: docu: remove uber document
by Francois Gouget 18 Apr '03

18 Apr '03

On Thu, 17 Apr 2003, Dimitrie O. Paun wrote: [...] > Index: documentation/architecture.sgml > =================================================================== > RCS file: /home/wine/wine/documentation/architecture.sgml,v > retrieving revision 1.6 > diff -u -r1.6 architecture.sgml > --- documentation/architecture.sgml 1 Apr 2003 03:26:13 -0000 1.6 > +++ documentation/architecture.sgml 17 Apr 2003 22:09:52 -0000 > @@ -1029,6 +1029,5 @@ >  IMHO, rather than removing these lines, it would be better to modify them to attach the file to the proper book: wine-user.sgml or winelib-user.sgml. -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ f u kn rd ts, ur wy 2 gky 4 ur wn gd.

2 2

Re: rpc server patch
by Gregory M. Turner 18 Apr '03

18 Apr '03

On Thursday 17 April 2003 09:36 pm, Ove Kaaven wrote: > diff -u -r1.12 rpc_server.c > --- dlls/rpcrt4/rpc_server.c 18 Apr 2003 02:04:17 -0000 1.12 > +++ dlls/rpcrt4/rpc_server.c 18 Apr 2003 02:16:51 -0000 > @@ -285,11 +286,18 @@ > > static void RPCRT4_new_client(RpcConnection* conn) > { > - conn->thread = CreateThread(NULL, 0, RPCRT4_io_thread, conn, 0, NULL); > - if (!conn->thread) { > + HANDLE thread = CreateThread(NULL, 0, RPCRT4_io_thread, conn, 0, NULL); > + if (!thread) { > DWORD err = GetLastError(); > ERR("failed to create thread, error=%08lx\n", err); > + RPCRT4_DestroyConnection(conn); > } > + /* we could set conn->thread, but then we'd have to make the io_thread wait > + * for that, otherwise the thread might finish, destroy the connection, and > + * free the memory we'd write to before we did, causing crashes and stuff - > + * so let's implement that later, when we really need conn->thread */ > + > + CloseHandle( thread ); > } > > static DWORD CALLBACK RPCRT4_server_thread(LPVOID the_arg) great, I don't understand this underlying pipe issue yet, but somehow, I'm betting this was just what the doctor ordered to get RPC back in on its feet ... thanks! btw, if you have kludgy patches that you would like to get back to wine, I reccomend you post them to wine-devel, which differentiates "not ready" from "ready" patches (that's just how I do it -- for all I know, this might contradict some official guideline). -- gmt "Democracy is the theory that holds that the common people know what they want, and deserve to get it good and hard." HL Mencken

1 0

Re: remove server silliniess
by John K. Hohm 18 Apr '03

18 Apr '03

Thus spake "Gregory M. Turner" <gmturner007(a)ameritech.net>: > ah, the hidden powers of the preprocessor -- how it drives us to obsfucation > with it's robotic stupidity... I wonder, is cpp a turing machine? Makes me > want to implement vim as a sed script ;) I don't think so. However, the C++ compile-time template mechanism *is* a turing machine (proof omitted). That is a persuasive argument, but I'm not sure if it's for or against C++.

1 0

winecfg kickoff
by Dimitrie O. Paun 17 Apr '03

17 Apr '03

Hi Alexandre, I have a little (and hopefully not too controversial :) suggesting on how to kickoff our little winecfg utility. Namely, we need to get the load/save from/to registry code going. To do so, we need the regisry key structure in place. Item C1 says "Merge configuration into the registry": http://www.dssd.ca/wine/Wine-0.9-TODO.html#conf So here's my proposal: 1. Do C1 now, but keep the current configuration in place 2. Label the conf file in CVS, to know when we merged it 3. Work on winecfg to load/save stuff properly 4. When done, compare the current version of the conf file with the labeled one, to see what's changed. 5. Adapt winecfg to the new changes 6. Drop the old config file Now, if this sounds like a plan, I was hopeing you could do (1) & (2) as it seems you have an idea where things should end up :) (and because only you can label stuff in CVS). Hopefully people will pick up on (3), if not I guess I can take a look, time permitting. -- Dimi.

2 1

Re: my dmusic and dpnhpast work, revised and resent
by Alexandre Julliard 17 Apr '03

17 Apr '03

"Rok Mandeljc" <rokmandeljc(a)hotmail.com> writes: > I just found out that my dpnhpast patch doesn't apply to current cvs tree > (msvcrtd implementation changed Makefile.in and configure). This also mean > that dmusic patch I've sent won't apply either. So I'm sending it again, > this time in one patch. It *should* apply to (today's) cvs cleanly. I have applied all the new dlls, but not the dmusic stubs. I think you should try to group related interfaces in the same source file (and possibly merge some of the existing files too), we can't have 40 different source files for a stub dll. A dozen files is the maximum IMO. -- Alexandre Julliard julliard(a)winehq.com

5 8

Re: Set TZ environment variable when not set
by Rein Klazes 17 Apr '03

17 Apr '03

On Wed, 16 Apr 2003 21:05:28 +0200, you wrote: > Changelog: > memory/environ.c: build_environment > Set the TZ value to GMT0, if TZ is not set > > Synplify.exe from the Quicklogic FPGA suite refused to work with the demo > license. Setting TZ to any value made it work. GMT0 should be a good > approach. > > Awaiting the "flame war" about noise level for that silent change :-) Uwe, Some programs, like Agent email/news client that I use, check the existence of TZ before attempting other timezone API call's. With your patch Agent displays all times in UTC, which is not making me happy. A correct patch should take care of the local timezone and daylight saving. Rein. -- Rein Klazes rklazes(a)xs4all.nl

2 4

Re: Initialise tid in WIN_CreateDesktopWindow
by Alexandre Julliard 17 Apr '03

17 Apr '03

Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> writes: > windows/win.c: WIN_CreateDesktopWindow > Initialise pWndDesktop->tid > > This makes the Xilinx command line tools run with ttydrv This is wrong, the desktop should not be owned by the current thread. What's the problem with Xilinx? -- Alexandre Julliard julliard(a)winehq.com

2 1

Re: wine/ files/dos_fs.c dlls/kernel/tests/file.c
by Uwe Bonnes 17 Apr '03

17 Apr '03

>>>>> "Alexandre" == Alexandre Julliard <julliard(a)wine.codeweavers.com> writes: Alexandre> ChangeSet ID: 7890 CVSROOT: /opt/cvs-commit Module name: wine Alexandre> Changes by: julliard(a)wine.codeweavers.com 2003/04/16 21:10:04 Alexandre> Modified files: files : dos_fs.c dlls/kernel/tests: file.c Alexandre> Log message: Uwe Bonnes Alexandre> <bon(a)elektron.ikp.physik.tu-darmstadt.de> FindFirstFile on Alexandre> root directory should fail. Alexandre> Patch: http://cvs.winehq.com/patch.py?id=7890 @@ -1937,7 +1937,6 @@ UINT codepage; data->dwReserved0 = data->dwReserved1 = 0x0; - if (!lpFileName) return 0; if (lpFileName[0] == '\\' && lpFileName[1] == '\\') { ERR("UNC path name\n"); This first patch thunk wasn't in the patch I sent. Is this intentional? Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

2 1

Re: wine/include/msvcrt malloc.h
by Dimitrie O. Paun 17 Apr '03

17 Apr '03

On Wed, 16 Apr 2003, Alexandre Julliard wrote: > Log message: > Fixed alloca handling the way mingw does it (reported by Vincent > Béron). > #ifndef USE_MSVCRT_PREFIX > -static inline void* alloca(MSVCRT(size_t) i) { return _alloca(i); } > +# ifdef __GNUC__ > +# define _alloca(x) __builtin_alloca((x)) > +# define alloca(x) __builtin_alloca((x)) > +# endif > #endif /* USE_MSVCRT_PREFIX */ If we know it's GNUC, isn't it better to use the alias feature, so we don't run into problems with the macros, like we use to? -- Dimi.

2 1

RE: What happend to the Stdole2 / Stdole32 (RESEND) patch fromRobert Shearman
by Robert Shearman 17 Apr '03

17 Apr '03

> -----Original Message----- > From: Uwe Bonnes [mailto:bon@elektron.ikp.physik.tu-darmstadt.de] > Sent: 02 April 2003 14:40 > To: Robert Shearman > Subject: Re: What happend to the Stdole2 / Stdole32 (RESEND) patch > fromRobert Shearman > > > >>>>> "Robert" == Robert Shearman <R.J.Shearman(a)warwick.ac.uk> writes: > > >> what happend to the stdole32.tlb patch that Robert sent > around 22.1? > Robert> It was rejected on the grounds that we shouldn't have binary > Robert> files in CVS and we can't generate the .tlb files at > the moment. > > Did you generate the files from some source you wrote? Yes. > What compiler was used? MkTypLib from MS Platform SDK > What constraints are put on distributing those generated files? None, as far as I could tell. > The present need for stdole*.tlb from a windows installation is > unsatisfactory. Agreed. > Bye > > -- > Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de > > Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt > --------- Tel. 06151 162516 -------- Fax. 06151 164321 ---------- Hope this helps and sorry for not getting back to you sooner, Rob

1 0

Winelib MFC?
by Christopher Thielen 17 Apr '03

17 Apr '03

Hello, I've written an application in MFC which runs beautifully in wine. I'd like to distribute a Winelib version, so Unix users don't need wine. Can I recompile MFC applications with Winelib? Is this possible? -- chris (chris(a)luethy.net)

3 4

wild pointers in current named pipe implementation?
by Dan Kegel 17 Apr '03

17 Apr '03

I know Mike is planning to rewrite the named pipe implementation, but the current implementation could use a little love while we're waiting for the new one. So I'm looking into the recent user complaint about FlushFileBuffers and named pipes, in hopes I can find a very simple patch that will tide us over until the new named pipes code is ready (whenever that might be; Mike's busy on other things at the moment). So I added an early call to FlushFileBuffers in the named pipe regression test (see attached patch). While poking around in wineserver, I found a few places where pointers were not set to NULL after being invalidated, and after I added the missing statements to set them to NULL, wineserver started behaving badly on the regression test. A run of wineserver under valgrind showed a null pointer access, so I added a couple null pointer check asserts (see attached patch). And sure enough, they fire. So the question is -- did I screw up, or did I uncover a real issue? The answer will help me as I continue digging into the FlushFileBuffers named pipe bug report (and testing possible simple enhancements to the current named pipe implementation). Thanks, Dan -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045 Index: server/object.c =================================================================== RCS file: /home/wine/wine/server/object.c,v retrieving revision 1.27 diff -d -u -r1.27 object.c --- server/object.c 19 Feb 2003 00:33:33 -0000 1.27 +++ server/object.c 14 Apr 2003 16:59:45 -0000 @@ -193,6 +193,7 @@ struct object *grab_object( void *ptr ) { struct object *obj = (struct object *)ptr; + assert( obj ); assert( obj->refcount < INT_MAX ); obj->refcount++; return obj; Index: server/named_pipe.c =================================================================== RCS file: /home/wine/wine/server/named_pipe.c,v retrieving revision 1.22 diff -d -u -r1.22 named_pipe.c --- server/named_pipe.c 4 Apr 2003 22:26:34 -0000 1.22 +++ server/named_pipe.c 14 Apr 2003 16:59:45 -0000 @@ -163,6 +163,7 @@ static struct fd *pipe_user_get_fd( struct object *obj ) { struct pipe_user *user = (struct pipe_user *)obj; + assert(user->fd); return (struct fd *)grab_object( user->fd ); } @@ -200,8 +201,11 @@ if (user->prev) user->prev->next = user->next; else user->pipe->users = user->next; if (user->thread) release_object(user->thread); + user->thread = NULL; release_object(user->pipe); + user->pipe = NULL; if (user->fd) release_object( user->fd ); + user->fd = NULL; } static int pipe_user_get_poll_events( struct fd *fd ) Index: dlls/kernel/tests/pipe.c =================================================================== RCS file: /home/wine/wine/dlls/kernel/tests/pipe.c,v retrieving revision 1.2 diff -d -u -r1.2 pipe.c --- dlls/kernel/tests/pipe.c 25 Feb 2003 03:56:43 -0000 1.2 +++ dlls/kernel/tests/pipe.c 14 Apr 2003 16:59:45 -0000 @@ -86,6 +86,10 @@ /* lpSecurityAttrib */ NULL); ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed"); + if (!FlushFileBuffers(hnp)) { + /* we'll add a check here once we know how windows behaves */ + fprintf(stderr, "FlushFileBuffers on new pipe failed, err %d\n", GetLastError()); + } hFile = CreateFileA(PIPENAME, GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); todo_wine

5 14

Re: Duplicate messages
by Michal Janusz Miroslaw 17 Apr '03

17 Apr '03

> I receive duplicate messages with following headers. Could people please > look after their setup? It's my fault. Apologies for everyone. My fetchmail went crazy and I wasn't fast enough to stop it. :( -- Michal Miroslaw

1 0

Duplicate messages
by Uwe Bonnes 17 Apr '03

17 Apr '03

Hallo, I receive duplicate messages with following headers. Could people please look after their setup? Thanks Return-Path: <wine-devel-admin(a)winehq.com> Received: from mailserver2.hrz.tu-darmstadt.de (mailserver2.hrz.tu-darmstadt.de [130.83.22.129]) by elektron.ikp.physik.tu-darmstadt.de (8.11.2/8.11.2/SuSE Linux 8.11.1-0.5) with ESMTP id h3HDs0j28561 for <bon(a)elektron.ikp.physik.tu-darmstadt.de>; Thu, 17 Apr 2003 15:54:00 +0200 Received: from ziemniak.ustronie.pw.edu.pl (czuby.resetnet.pl [62.233.189.254]) by mailserver2.hrz.tu-darmstadt.de (8.12.9/8.12.8) with ESMTP id h3HDqNdj008074 for <bon(a)elektron.ikp.physik.tu-darmstadt.de>; Thu, 17 Apr 2003 15:52:25 +0200 Received: (qmail 7122 invoked by uid 1000); 17 Apr 2003 13:56:56 -0000 Received: from mion.elka.pw.edu.pl [194.29.160.35] by localhost with IMAP (fetchmail-6.2.2) for mirq-forwarded@localhost (single-drop); Thu, 17 Apr 2003 15:56:55 +0200 (CEST) Received: from [198.144.4.3] ([198.144.4.3]:39372 "EHLO wine.codeweavers.com") by mion.elka.pw.edu.pl with ESMTP id <S318308AbTDQAbg>; Thu, 17 Apr 2003 02:31:36 +0200 Received: from localhost.localdomain (wine [127.0.0.1]) by wine.codeweavers.com (8.11.6/8.11.6) with ESMTP id h3H0BHG22385; Wed, 16 Apr 2003 19:11:17 -0500 Received: from mail.wine.dyndns.org (adsl-64-142-4-165.sonic.net [64.142.4.165]) by wine.codeweavers.com (8.11.6/8.11.6) with ESMTP id h3H0A5G22281 for <wine-devel(a)winehq.com>; Wed, 16 Apr 2003 19:10:05 -0500 -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

1 0

Re: wineinstall: use pwd and drop ttydrv
by Steven Edwards 17 Apr '03

17 Apr '03

--- Vincent B�ron <vberon(a)mecano.gme.usherb.ca> wrote: > Testing as shown that either x11drv or ttydrv could be set, even without > X present, as long as the app doesn't use user or gdi. > Also, the second change allows to build from anywhere, not limited to > one of the pre-mapped drives. > > Changelog: > Don't change to ttydrv to install registry, regedit doesn't use X. > Make sure the current dir is mapped in DOS. regedit will use user32 and friends if the ReactOS changes are merged in. ATM our regedit is read only when you use the GUI but you can still use the command-line for writes. __________________________________________________ Do you Yahoo!? The New Yahoo! Search - Faster. Easier. Bingo http://search.yahoo.com

1 0

winsock.h portability patch causing portability problem
by Gerald Pfeifer 17 Apr '03

17 Apr '03

Alexandre, I am afraid the following patch revision 1.52 date: 2003/03/31 23:56:35; author: julliard; state: Exp; lines: +63 -60 Try to make winsock.h more portable (based on a patch by Francois Gouget). actually caused a portability problem for FreeBSD. /usr/bin/gcc -c -I. -I. -I../../../include -I../../../include -g -O2 -Wall -mpreferred-stack-boundary=2 -gstabs+ -Wpointer-arith -fPIC -D_REENTRANT -o pipe.o pipe.c In file included from ../../../include/winsock2.h:47, from ../../../include/windows.h:62, from ../../../include/rpc.h:22, from ../../../include/wtypes.h:2, from pipe.c:34: ../../../include/winsock.h:925: conflicting types for `htonl' /usr/include/machine/endian.h:63: previous declaration of `htonl' ../../../include/winsock.h:926: conflicting types for `htons' /usr/include/machine/endian.h:64: previous declaration of `htons' ../../../include/winsock.h:927: conflicting types for `ntohl' /usr/include/machine/endian.h:65: previous declaration of `ntohl' ../../../include/winsock.h:928: conflicting types for `ntohs' /usr/include/machine/endian.h:66: previous declaration of `ntohs' gmake[3]: *** [pipe.o] Error 1 gmake[3]: Leaving directory `/.amd_mnt/nashira/files5/test/wine/dlls/kernel/tests' gmake[2]: *** [tests] Error 2 gmake[2]: Leaving directory `/.amd_mnt/nashira/files5/test/wine/dlls/kernel' The FreeBSD declarations are unsigned long htonl __P((unsigned long)); unsigned short htons __P((unsigned short)); unsigned long ntohl __P((unsigned long)); unsigned short ntohs __P((unsigned short)); Sorry, Gerald

2 6

Re: Set TZ environment variable when not set
by Alexandre Julliard 17 Apr '03

17 Apr '03

Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> writes: > Changelog: > memory/environ.c: build_environment > Set the TZ value to GMT0, if TZ is not set > > Synplify.exe from the Quicklogic FPGA suite refused to work with the demo > license. Setting TZ to any value made it work. You should set it in your environment then, this doesn't belong in Wine. -- Alexandre Julliard julliard(a)winehq.com

4 4

RE: remove server silliniess
by Patrik Stridvall 17 Apr '03

17 Apr '03

> On Thursday 17 April 2003 02:13 am, Fabian Cenedese wrote: > > >> remove run-time checks of compile-time constants. > > > > > >I dearly wish that there were a way of doing compile-time > assertion, but > > > there isn't, so it has to be done by a runtime assertion. > > > > Well, there seem to be some reasonable tricks for that: > > http://www.jaggersoft.com/pubs/CVu11_3.html > > http://www.panelsoft.com/murphyslaw/apr01.htm > > > > This is for C++ but maybe also adaptable for C: > > http://www.boost.org/libs/static_assert/static_assert.htm > > > > bye Fabi > > ah, the hidden powers of the preprocessor -- how it drives us > to obsfucation > with it's robotic stupidity... I wonder, is cpp a turing > machine? I don't think so. > Makes me > want to implement vim as a sed script ;) :-) > nonetheless, considering one must sometimes make do with what > one has, that > array-of-zero trick is super-clever... perhaps I'll actually make a > constructive patch out of this debacle yet.. Note that Wine already have a macro for this that is not a Wine specific invention but is rather a feature of the Win32 API. >From include/winnt.h: /* Compile time assertion */ #if defined(_MSC_VER) # define C_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1] #elif defined(__GNUC__) # define C_ASSERT(e) extern char __C_ASSERT__[(e)?1:-1] #endif

1 0

winedbg regression?
by Mike Hearn 17 Apr '03

17 Apr '03

Hi, For the past week or so winedbg has refused to start, it just hangs whenever it tries to attach to a pid. Some traces indicate it's getting an access denied error when trying to attach? Not sure why i'd be getting that. I thought it was just my tree at first but Splinter on IRC says he has the same problem. Does anybody else see this?

6 9

Re: div in msvcrt
by Alexandre Julliard 17 Apr '03

17 Apr '03

Vincent Béron <vberon(a)mecano.gme.usherb.ca> writes: > This was in msvcrt/stdlib.h since version 1.1, probably straight from > mingw. It caused some problems because div_t is a structure, not a long > long (same thing for ldiv_t). > > Changelog: > Fixed the definition of div/ldiv. This won't work, the calling sequence on i386 is not compatible. I'm not sure there's a good solution for that one... -- Alexandre Julliard julliard(a)winehq.com

2 2

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-devel