wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

[PATCH FINALLY FIXED] tools/wineconf
by Speeddymon 25 Apr '02

25 Apr '02

this works perfectly on my system too added check for ntfs drives (in case it is drive c) NOTE: if you have read/write on for NTFS (in your kernel) i would not recommend using that as your c drive. thats why the wineinstall script says you should probably check the ~/.wine/config file anyways added check for cdroms mounted at /cdrom to be non-supermount (it got broken when i added the check for supermount cdroms) added supermount cdrom checking NOTE: if you have more than 1 cdrom, make sure you change the "Device" = line in ~/.wine.config for 1 of the cdroms as the script says both cdroms are /dev/cdrom __________________________________________________ Do You Yahoo!? Yahoo! Games - play chess, backgammon, pool and more http://games.yahoo.com/ Name: tools_wineconf-dnavea-patch.diff ModifiedFiles: tools/wineconf ChangeLog: Add check for ntfs drives (wouldn't recommend writing to them if you have it enabled tho), fixed check for non-supermount cdroms mounted at /cdrom (only got broken when I added in supermount checking), added supermount cdrom checking =============================================================================== --- tools/wineconf Sat Mar 9 18:24:22 2002 +++ /tmp/wineconf Tue Apr 23 18:50:41 2002 @@ -93,13 +93,20 @@ my ($device, $mntpoint, $type, @rest) = split(' ', $_); if ($device !~ m"^/dev/fd") { - if ($type eq "msdos" || $type eq "vfat") { + if ($type eq "ntfs") { + push(@::FatDrives, [$device, $mntpoint, 'win95']); + } + elsif ($type eq "msdos" || $type eq "vfat") { push(@::FatDrives, [$device, $mntpoint, $type]); } elsif ($type eq "iso9660" || - $mntpoint eq "/cdrom" || + ($mntpoint eq "/cdrom" && ! $type eq 'supermount') || ($device eq '/dev/cdrom' && $type eq 'auto') ) { push(@::CdromDrives, [$device, $mntpoint, 'win95']); + } + elsif ( ($mntpoint eq '/mnt/cdrom' || $mntpoint eq '/cdrom') + && $type eq 'supermount') { + push(@::CdromDrives, [ '/dev/cdrom', $mntpoint, 'win95']); } } }

1 0

Compiling the latest version of wine ...
by Fabrizio Regalli 25 Apr '02

25 Apr '02

Hello, I'm trying to compile the latest version of wine, but I see some problem: ./configure && make dep && make , works fine. After that I see this: root@bizio:/home/rizla/wine-20020411# ./tools/wineinstall WINE Installer v0.72 You are running wineinstall as root, this is not advisable. Please rerun as a user. Aborting. Ok, I switch user from root to rizla rizla@bizio:~/wine-20020411$ ./tools/wineinstall ..and It' works.. WINE Installer v0.72 Warning !! wine binary (still) found, which may indicate a (conflicting) previous installation. You might want to abort and uninstall Wine first. I see that WINE has already been configured, so I'll skip that. We need to install wine as root user, do you want us to 'su root' and install Wine? Enter 'no' to continue without installing (yes/no) -I ANSWER YES-Wine build complete. Performing 'make install' as root to install binaries, enter root password Password: (I put my EXACT password, casesensitive too but I see this)/bin/bash: - : unrecognized option Either you entered an incorrect password or we failed to run 'make install' correctly. If you didn't enter an incorrect password then please report this error to wine-devel(a)winehq.com. Installation failed, aborting. How to solve this problem ? If i answer NO at the question of su - root , it seems work as user but, when it try to configure something, it has stopped. We need to install wine as root user, do you want us to build wine, 'su root' and install Wine? Enter 'no' to continue without installing (yes/no) no NOTE! To run Wine without installing, you must set the environment variable LD_LIBRARY_PATH to /home/rizla/wine-20020411:/home/rizla/wine-20020411/dlls in your logon scripts. Create local config file ~/.wine/config? (yes/no) yes Searching for an existing Windows installation... found. Created /home/rizla/.wine/config using your existing Windows installation. You probably want to review the file, though. ..and it has stopped without the prompt... I'm using slack 8 with kernel 2.4.18 Bye and thanks

3 2

PATCH: Unit test for winsock2
by Martin Wilck 25 Apr '02

25 Apr '02

This patch introduces a unit test for winsock2 functionality. It is not complete yet, but I have found it useful already. The most important part (for me), tests for overlapped IO, have yet to be added. The test code implements a simple echo protocol over the loopback device. Servers and clients are started as threads, so that differently implemented servers/clients can be used. It should be easy to add more server and client routines to get extensive testing. Apart from wine error checks, correct data transmission is also checked for. Currently two tests are run: - synchronous server/synchronous client(s) - synchronous server/event-driven client(s). Applies: CVS 2002-04-24. Only with all patches from my series and today's two bugfixes will all tests succeed! Modified files: dlls/winsock: Makefile.in Added files: dlls/winsock: sock.c testlist.c ws2_32_test.spec diff -ruNX ignore CVS/wine/dlls/winsock/Makefile.in TMP/wine/dlls/winsock/Makefile.in --- CVS/wine/dlls/winsock/Makefile.in Tue Apr 2 15:39:30 2002 +++ TMP/wine/dlls/winsock/Makefile.in Wed Apr 24 11:56:37 2002 @@ -13,6 +13,12 @@ async.c \ socket.c +EXTRASUBDIRS = \ + tests + +CTESTS = \ + tests/sock.c + @MAKE_DLL_RULES@ ### Dependencies: diff -ruNX ignore CVS/wine/dlls/winsock/tests/sock.c TMP/wine/dlls/winsock/tests/sock.c --- CVS/wine/dlls/winsock/tests/sock.c Thu Jan 1 01:00:00 1970 +++ TMP/wine/dlls/winsock/tests/sock.c Thu Apr 25 19:27:42 2002 @@ -0,0 +1,683 @@ +/* + * Unit test suite for winsock functions + * + * Copyright 2002 Martin Wilck + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "wine/test.h" +#include <winbase.h> +#include <winnt.h> +#include <winerror.h> +#undef USE_WS_PREFIX +#include <winsock2.h> + +#define MAX_CLIENTS 4 /* Max number of clients */ +#define NUM_TESTS 2 /* Number of tests performed */ +#define FIRST_CHAR 'A' /* First character in transferred pattern */ +#define BIND_SLEEP 10 /* seconds to wait between attempts to bind() */ +#define BIND_TRIES 6 /* Number of bind() attempts */ +#define TEST_TIMEOUT 30 /* seconds to wait before killing child threads + after server initialization, if something hangs */ + +#define wsa_ok(op, cond, msg) \ + do { \ + int tmp, err = 0; \ + tmp = op; \ + if ( !(cond tmp) ) err = WSAGetLastError(); \ + ok ( cond tmp, msg, GetCurrentThreadId(), err); \ + } while (0); + + +/**************** Structs and typedefs ***************/ + +typedef struct thread_info +{ + HANDLE thread; + DWORD id; +} thread_info; + +/* Information in the server about open client connections */ +typedef struct sock_info +{ + SOCKET s; + struct sockaddr_in addr; + struct sockaddr_in peer; + char *buf; + int nread; +} sock_info; + +/* Test parameters for both server & client */ +typedef struct test_params +{ + int sock_type; + int sock_prot; + char *inet_addr; + int inet_port; + int chunk_size; + int n_chunks; + int n_clients; +} test_params; + +/* server-specific test parameters */ +typedef struct server_params +{ + test_params *general; + DWORD sock_flags; + int buflen; +} server_params; + +/* client-specific test parameters */ +typedef struct client_params +{ + test_params *general; + DWORD sock_flags; + int buflen; +} client_params; + +/* This type combines all information for setting up a test scenario */ +typedef struct test_setup +{ + test_params general; + LPVOID srv; + server_params srv_params; + LPVOID clt; + client_params clt_params; +} test_setup; + +/* Thread local storage for server */ +typedef struct server_memory +{ + SOCKET s; + struct sockaddr_in addr; + sock_info sock[MAX_CLIENTS]; +} server_memory; + +/* Thread local storage for client */ +typedef struct client_memory +{ + SOCKET s; + struct sockaddr_in addr; + char *send_buf; + char *recv_buf; +} client_memory; + +/**************** Static variables ***************/ + +static DWORD tls; /* Thread local storage index */ +static HANDLE thread[1+MAX_CLIENTS]; +static DWORD thread_id[1+MAX_CLIENTS]; +static HANDLE server_ready; +static HANDLE client_ready[MAX_CLIENTS]; +static int client_id; + +/**************** General utility functions ***************/ + +static void set_so_opentype ( BOOL overlapped ) +{ + int optval = !overlapped, newval, len = sizeof (int); + + ok ( setsockopt ( INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, + (LPVOID) &optval, sizeof (optval) ) == 0, + "setting SO_OPENTYPE failed" ); + ok ( getsockopt ( INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, + (LPVOID) &newval, &len ) == 0, + "getting SO_OPENTYPE failed" ); + ok ( optval == newval, "failed to set SO_OPENTYPE" ); +} + +static int set_blocking ( SOCKET s, BOOL blocking ) +{ + u_long val = !blocking; + return ioctlsocket ( s, FIONBIO, &val ); +} + +static void fill_buffer ( char *buf, int chunk_size, int n_chunks ) +{ + char c, *p; + for ( c = FIRST_CHAR, p = buf; c < FIRST_CHAR + n_chunks; c++, p += chunk_size ) + memset ( p, c, chunk_size ); +} + +static char* test_buffer ( char *buf, int chunk_size, int n_chunks ) +{ + char c, *p; + int i; + for ( c = FIRST_CHAR, p = buf; c < FIRST_CHAR + n_chunks; c++, p += chunk_size ) + { + for ( i = 0; i < chunk_size; i++ ) + if ( p[i] != c ) return p + i; + } + return NULL; +} + +/* + * This routine is called when a client / server does not expect any more data, + * but needs to acknowedge the closing of the connection (by reasing 0 bytes). + */ +static void read_zero_bytes ( SOCKET s ) +{ + char buf[256]; + int tmp, n = 0; + while ( ( tmp = recv ( s, buf, 256, 0 ) ) > 0 ) + n += tmp; + ok ( n <= 0, "garbage data received: %d bytes\n", n ); +} + +static int do_synchronous_send ( SOCKET s, char *buf, int buflen, int sendlen ) +{ + char* last = buf + buflen, *p; + int n = 1; + for ( p = buf; n > 0 && p < last; p += n ) + n = send ( s, p, min ( sendlen, last - p ), 0 ); + wsa_ok ( n, 0 <=, "do_synchronous_send (%x): error %d" ); + return p - buf; +} + +static int do_synchronous_recv ( SOCKET s, char *buf, int buflen, int recvlen ) +{ + char* last = buf + buflen, *p; + int n = 1; + for ( p = buf; n > 0 && p < last; p += n ) + n = recv ( s, p, min ( recvlen, last - p ), 0 ); + wsa_ok ( n, 0 <=, "do_synchronous_recv (%x): error %d:" ); + return p - buf; +} + +/* + * Call this routine right after thread startup. + * SO_OPENTYPE must by 0, regardless what the server did. + */ +static void check_so_opentype (void) +{ + int tmp = 1, len; + len = sizeof (tmp); + getsockopt ( INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, (LPVOID) &tmp, &len ); + ok ( tmp == 0, "check_so_opentype: wrong startup value of SO_OPENTYPE: %d", tmp ); +} + +/**************** Server utility functions ***************/ + +/* + * Even if we have closed our server socket cleanly, + * the OS may mark the address "in use" for some time - + * this happens with native Linux apps, too. + */ +static void do_bind ( SOCKET s, struct sockaddr* addr, int addrlen ) +{ + int err, wsaerr = 0, n_try = BIND_TRIES; + + while ( ( err = bind ( s, addr, addrlen ) ) != 0 && + ( wsaerr = WSAGetLastError () ) == WSAEADDRINUSE && + n_try-- >= 0) + { + trace ( "address in use, waiting ...\n" ); + Sleep ( 1000 * BIND_SLEEP ); + } + ok ( err == 0, "failed to bind: %d\n", wsaerr ); +} + +static void server_start ( server_params *par ) +{ + int i; + test_params *gen = par->general; + server_memory *mem = (LPVOID) LocalAlloc ( LPTR, sizeof (server_memory)); + + TlsSetValue ( tls, mem ); + mem->s = WSASocketA ( AF_INET, gen->sock_type, gen->sock_prot, + NULL, 0, par->sock_flags ); + ok ( mem->s != INVALID_SOCKET, "Server: WSASocket failed" ); + + mem->addr.sin_family = AF_INET; + mem->addr.sin_addr.s_addr = inet_addr ( gen->inet_addr ); + mem->addr.sin_port = htons ( gen->inet_port ); + + for (i = 0; i < MAX_CLIENTS; i++) + { + mem->sock[i].s = INVALID_SOCKET; + mem->sock[i].buf = (LPVOID) LocalAlloc ( LPTR, gen->n_chunks * gen->chunk_size ); + mem->sock[i].nread = 0; + } + + if ( gen->sock_type == SOCK_STREAM ) + do_bind ( mem->s, (struct sockaddr*) &mem->addr, sizeof (mem->addr) ); +} + +static void server_stop (void) +{ + int i; + server_memory *mem = TlsGetValue ( tls ); + + for (i = 0; i < MAX_CLIENTS; i++ ) + { + LocalFree ( (HANDLE) mem->sock[i].buf ); + if ( mem->sock[i].s != INVALID_SOCKET ) + closesocket ( mem->sock[i].s ); + } + ok ( closesocket ( mem->s ) == 0, "closesocket failed" ); + LocalFree ( (HANDLE) mem ); + ExitThread ( GetCurrentThreadId () ); +} + +/**************** Client utilitiy functions ***************/ + +static void client_start ( client_params *par ) +{ + test_params *gen = par->general; + client_memory *mem = (LPVOID) LocalAlloc (LPTR, sizeof (client_memory)); + + TlsSetValue ( tls, mem ); + + WaitForSingleObject ( server_ready, INFINITE ); + + mem->s = WSASocketA ( AF_INET, gen->sock_type, gen->sock_prot, + NULL, 0, par->sock_flags ); + + mem->addr.sin_family = AF_INET; + mem->addr.sin_addr.s_addr = inet_addr ( gen->inet_addr ); + mem->addr.sin_port = htons ( gen->inet_port ); + + ok ( mem->s != INVALID_SOCKET, "Client: WSASocket failed" ); + + mem->send_buf = (LPVOID) LocalAlloc ( LPTR, 2 * gen->n_chunks * gen->chunk_size ); + mem->recv_buf = mem->send_buf + gen->n_chunks * gen->chunk_size; + fill_buffer ( mem->send_buf, gen->chunk_size, gen->n_chunks ); + + SetEvent ( client_ready[client_id] ); + /* Wait for the other clients to come up */ + WaitForMultipleObjects ( min ( gen->n_clients, MAX_CLIENTS ), client_ready, TRUE, INFINITE ); +} + +static void client_stop (void) +{ + client_memory *mem = TlsGetValue ( tls ); + wsa_ok ( closesocket ( mem->s ), 0 ==, "closesocket error (%x): %d\n" ); + LocalFree ( (HANDLE) mem->send_buf ); + LocalFree ( (HANDLE) mem ); + ExitThread ( GetCurrentThreadId () ); +} + +/**************** Servers ***************/ + +/* + * simple_server: A very basic server doing synchronous IO. + */ +static VOID WINAPI simple_server ( server_params *par ) +{ + test_params *gen = par->general; + server_memory *mem; + int n_recvd, n_sent, n_expected = gen->n_chunks * gen->chunk_size, tmp, i, + id = GetCurrentThreadId(); + char *p; + + trace ( "simple_server (%x) starting\n", id ); + + set_so_opentype ( FALSE ); /* non-overlapped */ + server_start ( par ); + mem = TlsGetValue ( tls ); + + wsa_ok ( set_blocking ( mem->s, TRUE ), 0 ==, "simple_server (%x): failed to set blocking mode: %d"); + wsa_ok ( listen ( mem->s, SOMAXCONN ), 0 ==, "simple_server (%x): listen failed: %d"); + + trace ( "simple_server (%x) ready\n", id ); + SetEvent ( server_ready ); /* notify clients */ + + for ( i = 0; i < min ( gen->n_clients, MAX_CLIENTS ); i++ ) + { + trace ( "simple_server (%x): waiting for client\n", id ); + + /* accept a single connection */ + tmp = sizeof ( mem->sock[0].peer ); + mem->sock[0].s = accept ( mem->s, (struct sockaddr*) &mem->sock[0].peer, &tmp ); + wsa_ok ( mem->sock[0].s, INVALID_SOCKET !=, "simple_server (%x): accept failed: %d" ); + + ok ( mem->sock[0].peer.sin_addr.s_addr == inet_addr ( gen->inet_addr ), + "simple_server (%x): strange peer address", id ); + + /* Receive data & check it */ + n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); + ok ( n_recvd == n_expected, + "simple_server (%x): received less data then expected: %d of %d", id, n_recvd, n_expected ); + p = test_buffer ( mem->sock[0].buf, gen->chunk_size, gen->n_chunks ); + ok ( p == NULL, "simple_server (%x): test pattern error: %d", p - mem->sock[0].buf); + + /* Echo data back */ + n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); + ok ( n_sent == n_expected, + "simple_server (%x): sent less data then expected: %d of %d", id, n_sent, n_expected ); + + /* cleanup */ + read_zero_bytes ( mem->sock[0].s ); + wsa_ok ( closesocket ( mem->sock[0].s ), 0 ==, "simple_server (%x): closesocket error: %d" ); + mem->sock[0].s = INVALID_SOCKET; + } + + trace ( "simple_server (%x) exiting\n", id ); + server_stop (); +} + +/**************** Clients ***************/ + +/* + * simple_client: A very basic client doing synchronous IO. + */ +static VOID WINAPI simple_client ( client_params *par ) +{ + test_params *gen = par->general; + client_memory *mem; + int n_sent, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, id; + char *p; + + id = GetCurrentThreadId(); + trace ( "simple_client (%x): starting\n", id ); + /* wait here because we want to call set_so_opentype before creating a socket */ + WaitForSingleObject ( server_ready, INFINITE ); + trace ( "simple_client (%x): server ready\n", id ); + + check_so_opentype (); + set_so_opentype ( FALSE ); /* non-overlapped */ + client_start ( par ); + mem = TlsGetValue ( tls ); + + /* Connect */ + wsa_ok ( connect ( mem->s, (struct sockaddr*) &mem->addr, sizeof ( mem->addr ) ), + 0 ==, "simple_client (%x): connect error: %d" ); + ok ( set_blocking ( mem->s, TRUE ) == 0, + "simple_client (%x): failed to set blocking mode", id ); + trace ( "simple_client (%x) connected\n", id ); + + /* send data to server */ + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen ); + ok ( n_sent == n_expected, + "simple_client (%x): sent less data then expected: %d of %d", id, n_sent, n_expected ); + + /* shutdown send direction */ + wsa_ok ( shutdown ( mem->s, SD_SEND ), 0 ==, "simple_client (%x): shutdown failed: %d" ); + + /* Receive data echoed back & check it */ + n_recvd = do_synchronous_recv ( mem->s, mem->recv_buf, n_expected, par->buflen ); + ok ( n_recvd == n_expected, + "simple_client (%x): received less data then expected: %d of %d", id, n_recvd, n_expected ); + + /* check data */ + p = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); + ok ( p == NULL, "simple_client (%x): test pattern error: %d", id, p - mem->recv_buf); + + /* cleanup */ + read_zero_bytes ( mem->s ); + trace ( "simple_client (%x) exiting\n", id ); + client_stop (); +} + +/* + * event_client: An event-driven client + */ +static void WINAPI event_client ( client_params *par ) +{ + test_params *gen = par->general; + client_memory *mem; + int id = GetCurrentThreadId(), n_expected = gen->n_chunks * gen->chunk_size, + tmp, err, n; + HANDLE event; + WSANETWORKEVENTS wsa_events; + char *send_last, *recv_last, *send_p, *recv_p; + long mask = FD_READ | FD_WRITE | FD_CLOSE; + + trace ( "event_client (%x): starting\n", id ); + client_start ( par ); + trace ( "event_client (%x): server ready\n", id ); + + mem = TlsGetValue ( tls ); + + /* Prepare event notification for connect, makes socket nonblocking */ + event = WSACreateEvent (); + WSAEventSelect ( mem->s, event, FD_CONNECT ); + tmp = connect ( mem->s, (struct sockaddr*) &mem->addr, sizeof ( mem->addr ) ); + if ( tmp != 0 && ( err = WSAGetLastError () ) != WSAEWOULDBLOCK ) + ok ( 0, "event_client (%x): connect error: %d", id, err ); + + tmp = WaitForSingleObject ( event, INFINITE ); + ok ( tmp == WAIT_OBJECT_0, "event_client (%x): wait for connect event failed: %d", id, tmp ); + err = WSAEnumNetworkEvents ( mem->s, event, &wsa_events ); + wsa_ok ( err, 0 ==, "event_client (%x): WSAEnumNetworkEvents error: %d\n" ); + + err = wsa_events.iErrorCode[ FD_CONNECT_BIT ]; + ok ( err == 0, "event_client (%x): connect error: %d", id, err ); + if ( err ) goto out; + + trace ( "event_client (%x) connected\n", id ); + + WSAEventSelect ( mem->s, event, mask ); + + recv_p = mem->recv_buf; + recv_last = mem->recv_buf + n_expected; + send_p = mem->send_buf; + send_last = mem->send_buf + n_expected; + + while ( TRUE ) + { + err = WaitForSingleObject ( event, INFINITE ); + ok ( err == WAIT_OBJECT_0, "event_client (%x): wait failed", id, tmp ); + + err = WSAEnumNetworkEvents ( mem->s, event, &wsa_events ); + wsa_ok ( err, 0 ==, "event_client (%x): WSAEnumNetworkEvents error: %d\n" ); + + if ( wsa_events.lNetworkEvents & FD_WRITE ) + { + err = wsa_events.iErrorCode[ FD_WRITE_BIT ]; + ok ( err == 0, "event_client (%x): FD_WRITE error code: %d\n", id, err ); + + if ( err== 0 ) + do + { + n = send ( mem->s, send_p, min ( send_last - send_p, par->buflen ), 0 ); + if ( n < 0 ) + { + err = WSAGetLastError (); + ok ( err == WSAEWOULDBLOCK, "event_client (%x): send error: %d\n", id, err ); + } + else + send_p += n; + } + while ( n >= 0 && send_p < send_last ); + + if ( send_p == send_last ) + { + trace ( "event_client (%x): all data sent - shutdown\n", id ); + shutdown ( mem->s, SD_SEND ); + mask &= ~FD_WRITE; + WSAEventSelect ( mem->s, event, mask ); + } + } + else if ( wsa_events.lNetworkEvents & FD_READ ) + { + err = wsa_events.iErrorCode[ FD_READ_BIT ]; + ok ( err == 0, "event_client (%x): FD_READ error code: %d\n", id, err ); + + n = recv ( mem->s, recv_p, min ( recv_last - recv_p, par->buflen ), 0 ); + wsa_ok ( n, 0 <=, "event_client (%x): recv error: %d\n" ); + if ( err != 0 || n < 0 ) + break; + else if ( n == 0 ) + { + ok ( 0, "event_client (%x): empty receive", id ); + break; + } + + recv_p += n; + if ( recv_p == recv_last ) + { + trace ( "event_client (%x): all data received\n", id ); + mask &= ~FD_READ; + WSAEventSelect ( mem->s, event, mask ); + } + } + else if ( wsa_events.lNetworkEvents & FD_CLOSE ) + { + trace ( "event_client (%x): close event\n", id ); + err = wsa_events.iErrorCode[ FD_CLOSE_BIT ]; + ok ( err == 0, "event_client (%x): FD_CLOSE error code: %d\n", id, err ); + break; + } + } + + ok ( send_p == send_last, + "simple_client (%x): sent less data then expected: %d of %d", + id, send_p - mem->send_buf, n_expected ); + ok ( recv_p == recv_last, + "simple_client (%x): received less data then expected: %d of %d", + id, recv_p - mem->recv_buf, n_expected ); + recv_p = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); + ok ( recv_p == NULL, "event_client (%x): test pattern error: %d", id, recv_p - mem->recv_buf); + +out: + WSACloseEvent ( event ); + trace ( "event_client (%x) exiting\n", id ); + client_stop (); +} + +/**************** Main program utility functions ***************/ + +static void Init (void) +{ + WORD ver = MAKEWORD (2, 2); + WSADATA data; + + ok ( WSAStartup ( ver, &data ) == 0, "WSAStartup failed" ); + tls = TlsAlloc(); +} + +static void Exit (void) +{ + TlsFree ( tls ); + ok ( WSACleanup() == 0, "WSACleanup failed" ); +} + +static void StartServer (LPTHREAD_START_ROUTINE routine, + test_params *general, server_params *par) +{ + par->general = general; + thread[0] = CreateThread ( NULL, 0, routine, par, 0, &thread_id[0] ); + ok ( thread[0] != (HANDLE) NULL, "Failed to create server thread" ); +} + +static void StartClients (LPTHREAD_START_ROUTINE routine, + test_params *general, client_params *par) +{ + int i; + par->general = general; + for ( i = 1; i <= min ( general->n_clients, MAX_CLIENTS ); i++ ) + { + client_id = i - 1; + thread[i] = CreateThread ( NULL, 0, routine, par, 0, &thread_id[i] ); + ok ( thread[i] != (HANDLE) NULL, "Failed to create client thread" ); + /* Make sure the client is up and running */ + WaitForSingleObject ( client_ready[client_id], INFINITE ); + }; +} + +static void do_test( test_setup *test ) +{ + int i, n = min (test->general.n_clients, MAX_CLIENTS); + int wait; + + server_ready = CreateEventA ( NULL, TRUE, FALSE, NULL ); + for (i = 0; i <= n; i++) + client_ready[i] = CreateEventA ( NULL, TRUE, FALSE, NULL ); + + StartServer ( test->srv, &test->general, &test->srv_params ); + StartClients ( test->clt, &test->general, &test->clt_params ); + WaitForSingleObject ( server_ready, INFINITE ); + + wait = WaitForMultipleObjects ( 1 + n, thread, TRUE, 1000 * TEST_TIMEOUT ); + ok ( wait == WAIT_OBJECT_0, "some threads have not completed\n" ); + + if ( wait == WAIT_TIMEOUT ) + { + for (i = 0; i <= n; i++) + { + trace ("terminating thread %08x\n", thread_id[i]); + if ( WaitForSingleObject ( thread[i], 0 ) != WAIT_OBJECT_0 ) + TerminateThread ( thread [i], 0 ); + } + } + CloseHandle ( server_ready ); + for (i = 0; i <= n; i++) + CloseHandle ( client_ready[i] ); +} + +/************* Array containing the tests to run **********/ + +#define STD_STREAM_SOCKET \ + sock_type: SOCK_STREAM, \ + sock_prot: 0, \ + inet_addr: "127.0.0.1", \ + inet_port: 9374 + +static test_setup tests [NUM_TESTS] = +{ + /* Test 0: synchronous client and server */ + { + general: { + STD_STREAM_SOCKET, + chunk_size: 2048, + n_chunks: 16, + n_clients: 2 + }, + srv: simple_server, + srv_params: { + buflen: 64 + }, + clt: simple_client, + clt_params: { + buflen: 128 + } + }, + /* Test 1: event-driven client, synchronous server */ + { + general: { + STD_STREAM_SOCKET, + chunk_size: 2048, + n_chunks: 16, + n_clients: 2 + }, + srv: simple_server, + srv_params: { + buflen: 64 + }, + clt: event_client, + clt_params: { + buflen: 128 + } + } +}; + +/**************** Main program ***************/ + +START_TEST( sock ) +{ + int i; + Init(); + + for (i = 0; i < NUM_TESTS; i++) + { + trace ( " **** STARTING TEST %d **** \n", i ); + do_test ( &tests[i] ); + trace ( " **** TEST %d COMPLETE **** \n", i ); + } + + Exit(); +} diff -ruNX ignore CVS/wine/dlls/winsock/tests/testlist.c TMP/wine/dlls/winsock/tests/testlist.c --- CVS/wine/dlls/winsock/tests/testlist.c Thu Jan 1 01:00:00 1970 +++ TMP/wine/dlls/winsock/tests/testlist.c Wed Apr 24 12:04:00 2002 @@ -0,0 +1,13 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +extern void func_sock(void); + +const struct +{ + const char *name; + void (*func)(void); +} winetest_testlist[] = +{ + { "sock", func_sock }, + { 0, 0 } +}; diff -ruNX ignore CVS/wine/dlls/winsock/tests/ws2_32_test.spec TMP/wine/dlls/winsock/tests/ws2_32_test.spec --- CVS/wine/dlls/winsock/tests/ws2_32_test.spec Thu Jan 1 01:00:00 1970 +++ TMP/wine/dlls/winsock/tests/ws2_32_test.spec Wed Apr 24 11:53:55 2002 @@ -0,0 +1,7 @@ +name ws2_32_test +type win32 +mode cuiexe + +import ntdll.dll +import kernel32.dll +import ws2_32.dll

1 0

Fail to run visio2000 installation - wineoss.drv.so
by leanne 25 Apr '02

25 Apr '02

Dear all, When I mounted my Visio 2000 and try to run Setup.exe, I got the following error: err:module:BUILTIN32_dlopen failed to load .so lib for builtin wineoss.drv: /usr/local/lib/wine/wineoss.drv.so: undefined symbol: OSS_MidiInit err:module:MODULE_LoadLibraryExA Loading of native DLL C:\Windows\System\wineoss.drv failed (error 193), check this file. err:module:BUILTIN32_dlopen failed to load .so lib for builtin wineoss.drv: /usr/local/lib/wine/wineoss.drv.so: undefined symbol: OSS_MidiInit I have create a fake-windows directory and I'm using 22042002 version of WINE. Anyone could help? Thanks in advance. Leanne

2 1

Separating Process and Debugger Debugmsg Output
by Uwe Bonnes 25 Apr '02

25 Apr '02

Hallo, if one starts a program via wine with e.g. relay debug messages enabled, and the program crashes, these debugmessages get also enabled for the winedbg process and this clutters the relay log to get nearly unreadable. Until Alexandre's restructuring of the Command Line handling, I had "---debugmsg -all" as additional argument to the winedbg command line in system.reg, aedebug section. No wine spits on this argument. How do you solve this problem? 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

x86 -> java bytecode?
by frank mori hess 25 Apr '02

25 Apr '02

Hello, I was just wondering if anyone could give me a clue about how hard it might be to write an x86->java bytecode translator, or if one exists already? This isn't totally irrelevant to wine, since it seems like it could be used to get wine running on non-x86 machines (very inefficiently of course). Frank

1 0

WINE XIM Patch
by Aric Stewart 25 Apr '02

25 Apr '02

Hello everyone, Myself, Mike McCormack and Ulrich Czekalla have been working like mad to get XIM into Wine. We have a very early and unclean patch for people to try and help improve. This patch applies to the winehq tip as of today and probably changed a bunch of things it does not need to. If you use XIM input and can work with this please give it a try. I know it works with Japanese input with kinput2 on my redhat 7.2 machine. Since i do japanese that is what i have been testing but i have not idea for any other input methods or languages. Some known issues. * The xim box does not appear in the right place, and i cannot see what i type as i type it in. * the input does not always go to the correct edit window. * Presently it probably only works for edit controls... Hope this helps people! -aric

1 0

Re: wine and aol7 [was: Re: New Winsock2 patch series - now tested]
by Michael Cardenas 25 Apr '02

25 Apr '02

thanks. On Thursday 25 April 2002 03:30 pm, you wrote: > Nothing was attached... > > On Thu, 25 Apr 2002 10:16:38 -0400, Michael Cardenas > > <michael.cardenas(a)lindows.com> wrote: > >Now, on to the work at hand. > > > >Attached is the output of running aol7 with +winsock, +file, with your > > latest series of winsock patches. Aol is still unable to handshake > > properly with it's web proxy and so you can't see any web content in aol > > or the buddy list. > > > >If anyone wants to work on aol or just to see it working, I can provide a > > deb package or a tarball that lets you install aol, so you don't have to > > worry about the aol installer working. I submitted some patches a few > > weeks ago that allow aol7 to launch. -- michael cardenas lead windows compatibility engineer lindows.com "Be the change you want to see in the world" -Mahatma Gandhi

1 0

overlapped read problem.
by Rein Klazes 25 Apr '02

25 Apr '02

Hi, The changes to the async/overlapped IO in the last week have caused a problem in Girotel 2.1, Dutch online banking program. After successfully calling the bank's computer: | 0806cfe8:Call kernel32.ClearCommError(000000e8,405953a8,405953b0) ret=60052d0f | trace:comm:ClearCommError handle 232 cbInQue = 8 cbOutQue = 0 | 0806cfe8:Ret kernel32.ClearCommError() retval=00000001 ret=60052d0f 8 characters in the in-queue. | 0806cfe8:Call kernel32.ReadFile(000000e8,405953f0,00000008,405953a4,409032e4) ret=60052d44 | trace:file:ReadFile 232 0x405953f0 8 0x405953a4 0x409032e4 request read of 8 characters. | trace:file:FILE_ReadFileEx file 232 to buf 0x405953f0 num 8 0x409032e4 func (nil) | trace:file:GetOverlappedResult (232 0x409032e4 0x405953a4 0) | trace:file:GetOverlappedResult waiting on 0x409032e4 | trace:file:GetOverlappedResult wait on 0x409032e4 returned 258 | 0806cfe8:Ret kernel32.ReadFile() retval=00000000 ret=60052d44 | 0806cfe8:Call kernel32.GetLastError() ret=60052d52 | 0806cfe8:Ret kernel32.GetLastError() retval=000003e5 ret=60052d52 ReadFile() returns ERROR, with gle() set to ERROR_IO_PENDING | 0806cfe8:Call kernel32.lstrlenA(40595270 "Problemen bij aansturen van modem\n(121-997)") ret=6c37396c Start preparing the error message ("problems communicating with modem, check your settings") for the alerting dialogbox. While clicking away this dialogbox, and the 20 subsequent ones the communications proceeds successfully. Any suggestions? Rein. -- Rein Klazes rklazes(a)xs4all.nl

2 3

Question about Warning when building wine under Cygwin/Mingw/MSYS
by Steven Edwards 25 Apr '02

25 Apr '02

Anyone have any idea what to do about this? mingw32-gcc -c -I. -I. -I../../include -I../../include -D__MINGW__ -D_WINDOWS - DWINE_NOWINSOCK -Wall -mpreferred-stack-boundary=2 -DSTRICT -DNONAMELESSUNION -D NONAMELESSSTRUCT -D_REENTRANT -o regedit.o regedit.c In file included from ../../include/winnt.h:24, from ../../include/windef.h:30, from ../../include/windows.h:32, from regedit.c:23: ../../include/basetsd.h:47: warning: useless keyword or type name in empty decla ration ../../include/basetsd.h:47: warning: empty declaration Basetsd.h has #ifndef _MSC_VER typedef char __int8; typedef short __int16; typedef int __int32; typedef long long __int64; #endif /* !defined(_MSC_VER) */ With "typedef long long __int64;" being the problem on line 47. Thanks Steven "Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson

2 2

Port.h issue with mingw
by Steven Edwards 25 Apr '02

25 Apr '02

I need help with fixing this too. ../include/wine/port.h:175: parse error before `pread' ../include/wine/port.h:175: warning: type defaults to `int' in declaration of `p read' ../include/wine/port.h:175: warning: data definition has no type or storage clas s ../include/wine/port.h:179: parse error before `pwrite' ../include/wine/port.h:179: warning: type defaults to `int' in declaration of `p write' ../include/wine/port.h:179: warning: data definition has no type or storage clas S Thanks Steven "Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson

1 0

Unexpected calls of MODULE_LoadLibraryExA
by Sylvain Petreolle 25 Apr '02

25 Apr '02

Hi, Running the installer of the latest beta version of Povray gives these error when copying a file : MODULE_LoadLibraryExA fails because it is called with plain text files (for example pov sources). Function returns as it should, 193 (ERROR_BAD_EXE_FORMAT) err:module:MODULE_LoadLibraryExA Loading of native DLL C:\Program Files\POV-Ray for Windows v3.5\renderer\slow.ini failed (error 193), check this file. err:module:MODULE_LoadLibraryExA Loading of native DLL C:\Program Files\POV-Ray for Windows v3.5\renderer\tgaflc.ini failed (error 193), check this file. err:module:MODULE_LoadLibraryExA Loading of native DLL C:\Program Files\POV-Ray for Windows v3.5\renderer\tgafli.ini failed (error 193), check this file. ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

1 0

Patch to quite another Mingw Build warning (mmsystem.h)
by Steven Edwards 25 Apr '02

25 Apr '02

=================================================================== RCS file: /home/wine/wine/include/mmsystem.h,v retrieving revision 1.49 diff -u -r1.49 mmsystem.h --- mmsystem.h 10 Mar 2002 00:02:34 -0000 1.49 +++ mmsystem.h 25 Apr 2002 16:42:43 -0000 @@ -1335,9 +1335,11 @@ #define MMIO_CREATERIFF 0x0020 /* mmioCreateChunk: make a LIST chunk */ #define MMIO_CREATELIST 0x0040 /* mmioCreateChunk: make a RIFF chunk */ +#ifndef __MINGW__ #define SEEK_SET 0 #define SEEK_CUR 1 #define SEEK_END 2 +#endif /* __MINGW__ */ #define MMIOM_READ MMIO_READ /* read */ #define MMIOM_WRITE MMIO_WRITE /* write */ "Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson

2 2

Re: Kernel32 segfaults on compile
by Paul A. Kerr 25 Apr '02

25 Apr '02

Hi, my name is Paul. I have had a similar problem compiling various software, after a long battle I discovered that I had too little RAM on my machine. 48 mb on a 233PR IBM machine. I have now increased that memory to 96 mb, the problem has disapeared. If you could furnish a short list of the hardware, and software tools it would help greatly. Best regards Paul A. Kerr stardust(a)starmail.co.za On Wed, 17 Apr 2002 13:22:25 -0300 Ben Woodhead (ben(a)echotech.ca) wrote: >Hello Everybody.. > >I just tried but the 20020411 release and cvs and I get the same results >running ./tools/wineinstall > >make[2]: Entering directory `/home/ben/homes/src/wine/dlls/kernel' >LD_LIBRARY_PATH="../../unicode:$LD_LIBRARY_PATH" >../../tools/winebuild/winebuild -fPIC -L../../dlls -o kernel32.spec.c -spec >./kernel32.spec >make[2]: *** [kernel32.spec.c] Segmentation fault >make[2]: *** Deleting file `kernel32.spec.c' >make[2]: Leaving directory `/home/ben/homes/src/wine/dlls/kernel' >make[1]: *** [kernel/kernel32.dll.so] Error 2 >make[1]: Leaving directory `/home/ben/homes/src/wine/dlls' >make: *** [dlls] Error 2 > >I am running Slackware8.. >GCC version - 2.95.3 >GLIB version - 2.2.5 >GNU make verison - 3.79.1 > >Thanks, Ben >ps Is anybody else having this problem.. > E-mail stardust(a)starmail.co.za Ph +27 21 593 9100 Fax +27 593 1410 _______________________________________________________________ http://www.webmail.co.za the South-African free email service

1 0

CDRW precomando mount
by Marcelo Welter 25 Apr '02

25 Apr '02

Greatings Recently i install the packet module and UDF support in my kernel to use a CDRom writer like a diskete, but to mount this driver a need a precomand, and affer umount that need another comand That are possible in wine...? Thanks Marcelo Welter

2 1

Re: wine and aol7 [was: Re: New Winsock2 patch series - now tested]
by Michael Cardenas 25 Apr '02

25 Apr '02

Now, on to the work at hand. Attached is the output of running aol7 with +winsock, +file, with your latest series of winsock patches. Aol is still unable to handshake properly with it's web proxy and so you can't see any web content in aol or the buddy list. If anyone wants to work on aol or just to see it working, I can provide a deb package or a tarball that lets you install aol, so you don't have to worry about the aol installer working. I submitted some patches a few weeks ago that allow aol7 to launch. -- michael cardenas lead windows compatibility engineer lindows.com "Be the change you want to see in the world" -Mahatma Gandhi

1 0

Visual Basic 6 Setup Kit
by degs 25 Apr '02

25 Apr '02

Hi, I'm trying to run an installer which I *think* is built with the VB6 Setup Kit using Wine recent CVS. I get past the initial phase where the installer updates some files required by the installer itself but then when the blue background and the initial dialog comes up it wil not accept mouse or keyboard input. Has anybody come across this problem with VB apps/VB setup kit before? I've tried running with the default settings and also with managed=y or desktop=640x480 in .wine/config I notice that the inital dialog window is still managed by wine even if I have managed=y in .wine/config (other applications run under wine are managed by my X window manager though) I notice that I get a second desktop with the blue screen + initial dialog in it when desktop=640x480. The initial desktop window is empty (black). Clicking in the empty desktop window gives messages on the console such as: "fixme:class:get_class_ptr reading from class of other process window 10025" Clicking in the desktop where the installer is displayed does nothing and produces no console output. Any pointers as to how to debug this would be useful. thanks -- degs

1 0

Re: C/L utility to translate unix and dos paths
by Michael Wetherell 25 Apr '02

25 Apr '02

The 'configure' band still had broken long lines, and perhaps I shouldn't have had it there anyway since it can be generated, so I've just removed it. ChangeLog: * configure, configure.ac, Makefile.in, schedule/process.c programs/Makefile.in, programs/winepath/.cvsignore programs/winepath/Makefile.in, programs/winepath/winepath.c Mike Wetherell <mike.wetherell(a)ntlworld.com> Utility to convert between Unix and Windows paths at the command line. Index: configure.ac =================================================================== RCS file: /home/wine/wine/configure.ac,v retrieving revision 1.20 diff -u -r1.20 configure.ac --- configure.ac 20 Apr 2002 21:00:42 -0000 1.20 +++ configure.ac 22 Apr 2002 22:50:08 -0000 @@ -1406,6 +1406,7 @@ programs/wcmd/Makefile programs/wineconsole/Makefile programs/winemine/Makefile +programs/winepath/Makefile programs/winetest/Makefile programs/winhelp/Makefile programs/winver/Makefile Index: Makefile.in =================================================================== RCS file: /home/wine/wine/Makefile.in,v retrieving revision 1.115 diff -u -r1.115 Makefile.in --- Makefile.in 17 Apr 2002 16:51:47 -0000 1.115 +++ Makefile.in 22 Apr 2002 22:50:09 -0000 @@ -30,7 +30,8 @@ # Programs that link with libwine LIBPROGRAMS = \ debugger/winedbg \ - programs/wineconsole/wineconsole + programs/wineconsole/wineconsole \ + programs/winepath/winepath # Libraries (not dlls) to build LIBRARIES = \ @@ -66,6 +67,7 @@ library \ ole \ programs/wineconsole \ + programs/winepath \ server \ tools \ tsx11 \ Index: scheduler/process.c =================================================================== RCS file: /home/wine/wine/scheduler/process.c,v retrieving revision 1.177 diff -u -r1.177 process.c --- scheduler/process.c 15 Apr 2002 15:38:10 -0000 1.177 +++ scheduler/process.c 22 Apr 2002 22:50:18 -0000 @@ -241,7 +241,7 @@ * * Main process initialisation code */ -static BOOL process_init( char *argv[] ) +BOOL process_init( char *argv[] ) { BOOL ret; size_t info_size = 0; Index: programs/Makefile.in =================================================================== RCS file: /home/wine/wine/programs/Makefile.in,v retrieving revision 1.14 diff -u -r1.14 Makefile.in --- programs/Makefile.in 11 Apr 2002 23:58:40 -0000 1.14 +++ programs/Makefile.in 22 Apr 2002 22:50:19 -0000 @@ -20,6 +20,7 @@ wcmd \ wineconsole \ winemine \ + winepath \ winetest \ winhelp \ winver diff -Nu programs/winepath/.cvsignore programs/winepath/.cvsignore --- programs/winepath/.cvsignore Thu Jan 1 01:00:00 1970 +++ programs/winepath/.cvsignore Tue Apr 23 00:15:47 2002 @@ -0,0 +1,2 @@ +Makefile +winepath diff -Nu programs/winepath/Makefile.in programs/winepath/Makefile.in --- programs/winepath/Makefile.in Thu Jan 1 01:00:00 1970 +++ programs/winepath/Makefile.in Tue Apr 23 00:15:47 2002 @@ -0,0 +1,27 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ + +PROGRAMS = winepath +MODULE = none +IMPORTS = ntdll.dll + +C_SRCS = \ + winepath.c + +all: $(PROGRAMS) + +@MAKE_RULES@ + +winepath: $(OBJS) + $(CC) $(CFLAGS) -o winepath $(OBJS) -L$(DLLDIR) $(IMPORTS:%=-l%) $(LIBWINE) $(LIBUNICODE) $(LDFLAGS) + +install:: $(PROGRAMS) + [ -d $(bindir) ] || $(MKDIR) $(bindir) + $(INSTALL_PROGRAM) winepath $(bindir)/winepath + +uninstall:: + $(RM) $(bindir)/winepath + +### Dependencies: diff -Nu programs/winepath/winepath.c programs/winepath/winepath.c --- programs/winepath/winepath.c Thu Jan 1 01:00:00 1970 +++ programs/winepath/winepath.c Tue Apr 23 00:17:07 2002 @@ -0,0 +1,184 @@ +/* + * Translate between Wine and Unix paths + * + * Copyright 2002 Mike Wetherell + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" + +#include <windows.h> +#include <stdio.h> +#include <stdlib.h> + +#if defined(_WIN32) || defined(_WIN64) || defined(WINELIB) +#define WINDOWS 1 +#endif + +#define VERSION "0.1 (" PACKAGE_STRING ")" + +enum { + SHORTFORMAT = 1, + LONGFORMAT = 2, + UNIXFORMAT = 4 +}; + +static char *progname; + +/* Wine specific functions */ +extern BOOL process_init(char *argv[]); +typedef BOOL WINAPI wine_get_unix_file_name_t ( LPCSTR dos, + LPSTR buffer, + DWORD len ); +/* + * handle an option + */ +int option(int shortopt, char *longopt) +{ + const char *helpmsg = + "Convert PATH(s) to Unix or Windows long or short paths.\n" + "\n" + " -u, --unix output Unix format\n" + " -l, --long output Windows long format\n" + " -s, --short output Windows short format \n" + " -h, --help output this help message and exit\n" + " -v, --version output version information and exit\n" + "\n" + "The input paths can be in any format. If more than one option is given\n" + "then the input paths are ouput in all formats specified, in the order\n" + "Unix, long, short. If no option is given the default is Unix format.\n"; + + switch (shortopt) { + case 'h': + printf("Usage: %s [OPTION] [PATH]...\n", progname); + printf(helpmsg); + exit(0); + case 'v': + printf("%s version " VERSION "\n", progname); + exit(0); + case 'l': + return LONGFORMAT; + case 's': + return SHORTFORMAT; + case 'u': + return UNIXFORMAT; + } + + fprintf(stderr, "%s: invalid option ", progname); + if (longopt) + fprintf(stderr, "'%s'\n", longopt); + else + fprintf(stderr, "'-%c'\n", shortopt); + fprintf(stderr, "Try '%s --help' for help\n", progname); + exit(2); +} + +/* + * Parse command line options + */ +int parse_options(char *argv[]) +{ + int outputformats = 0; + int done = 0; + char *longopts[] = { "long", "short", "unix", "help", "version", "" }; + int i, j; + + for (i = 1; argv[i] && !done; ) + { + if (argv[i][0] != '-') { + /* not an option */ + i++; + continue; + } + + if (argv[i][1] == '-') { + if (argv[i][2] == 0) { + /* '--' end of options */ + done = 1; + } else { + /* long option */ + for (j = 0; longopts[j][0]; j++) + if (strcmp(argv[i]+2, longopts[j]) == 0) + break; + outputformats |= option(longopts[j][0], argv[i]); + } + } else { + /* short options */ + for (j = 1; argv[i][j]; j++) + outputformats |= option(argv[i][j], NULL); + } + + /* remove option */ + for (j = i + 1; argv[j - 1]; j++) + argv[j - 1] = argv[j]; + } + + return outputformats; +} + +/* + * Main function + */ +int main(int argc, char *argv[]) +{ +#ifndef WINDOWS + char *noargs[2] = { argv[0], NULL }; +#endif + wine_get_unix_file_name_t *wine_get_unix_file_name_ptr; + static char path[MAX_PATH]; + int outputformats; + int i; + + progname = argv[0]; + outputformats = parse_options(argv); + if (outputformats == 0) + outputformats = UNIXFORMAT; + +#ifndef WINDOWS + if (!process_init(noargs)) + exit(1); + wine_get_unix_file_name_ptr = wine_get_unix_file_name; +#else + if (outputformats & UNIXFORMAT) { + wine_get_unix_file_name_ptr = (wine_get_unix_file_name_t*) + GetProcAddress(GetModuleHandle("KERNEL32"), + "wine_get_unix_file_name"); + if (wine_get_unix_file_name_ptr == NULL) { + fprintf(stderr, "%s: cannot get the address of " + "'wine_get_unix_file_name'\n", progname); + exit(3); + } + } +#endif + + for (i = 1; argv[i]; i++) + { + if (outputformats & LONGFORMAT) { + GetLongPathNameA(argv[i], path, sizeof(path)); + printf("%s\n", path); + } + if (outputformats & SHORTFORMAT) { + GetShortPathNameA(argv[i], path, sizeof(path)); + printf("%s\n", path); + } + if (outputformats & UNIXFORMAT) { + wine_get_unix_file_name_ptr(argv[i], path, sizeof(path)); + printf("%s\n", path); + } + } + + exit(0); +}

1 0

New Winsock2 patch series - now tested
by Martin Wilck 25 Apr '02

25 Apr '02

Hi, I will now start to submit a new series of patches for Winsock2-related issues. Most of it is for overlapped IO, but there are some other issues, too. I have done a fair bit of testing with 16 and 32 bit network-oriented Windows apps, and found no regressions (well some apps wouldn't install or run with either the CVS version or my patched version of wine). Among the tested apps are - Opera (v5.12, 32bit, and 3.62, 16bit) - FreeAgent (news reader, 16bit) - Solstice Internet Mail (16bit) - Hamster local news server (32bit, interesting because it's using ReadFile()/WriteFile() for overlapped socket IO) - My evil overlapped testing server/client app I spotted a number of bugs with the "big" patch I sent to wine-devel last Friday. These are fixed in the version I'll submit now. The patch is now split into parts again (one bug fix for an earlier patch of mine that is already in CVS, and 7 "real" parts). Most of the testing has of course been done with the full patch set applied. I have tried to separate logically independent units, but I cannot swear that all is fine if only part of them is applied, and the later patches do fix some important problems. The main reason for splitting the stuff up is to make it easier for people to review. I honestly think that these patches are now ready for being applied to CVS and tested in the field. Here is the overall patch summary (for detailed explanantions see the patches thenmselves): - Correct handling of deferred WSAAccept() operations, - Change register_async() and the queue_async() method to allow more flexibility, needed for sockets, - Server support for overlapped IO on sockets, - Fix problem with FD_CLOSE never being delivered in some situations, - Wait for POLLIN if FD_CLOSE event notification is requested to catch grateful close or shutdown by the peer (empty recv(), no POLLHUP), - Implement overlapped WSARecvFrom()/WSASendTo() and WSAGetOverlappedResult(), - Change shutdown() to account for pending overlapped requests, - Change ReadFile() semantics for overlapped reads on sockets (return even if buffer is not yet full), - Improve error reporting for asynchronous requests (files and sockets) - Account for the SO_OPENTYPE socket option on a per-thread basis. I plan to look into the regression-testing code and also supply a few tests for the new socket functionality. Cheers (and please test this stuff with your apps!), Martin -- Martin Wilck Phone: +49 5251 8 15113 Fujitsu Siemens Computers Fax: +49 5251 8 20409 Heinz-Nixdorf-Ring 1 mailto:Martin.Wilck@Fujitsu-Siemens.com D-33106 Paderborn http://www.fujitsu-siemens.com/primergy

2 4

Re: wine and aol7 [was: Re: New Winsock2 patch series - now tested]
by Martin Wilck 25 Apr '02

25 Apr '02

On Wed, 24 Apr 2002, Michael Cardenas wrote: > If anyone wants to work on aol or just to see it working, I can provide a deb > package or a tarball that lets you install aol, so you don't have to worry > about the aol installer working. I submitted some patches a few weeks ago > that allow aol7 to launch. I'd like to test it, but I can't connect to AOL proxies from here (firewall). And I am not really interested in becoming an AOL member just to get this straight... However I shall help as much as I can without having AOL running on my machines. Martin -- Martin Wilck Phone: +49 5251 8 15113 Fujitsu Siemens Computers Fax: +49 5251 8 20409 Heinz-Nixdorf-Ring 1 mailto:Martin.Wilck@Fujitsu-Siemens.com D-33106 Paderborn http://www.fujitsu-siemens.com/primergy

1 0

Re: wine and aol7 [was: Re: New Winsock2 patch series - now tested]
by Martin Wilck 25 Apr '02

25 Apr '02

Hi Michael, I wonder whether "flags" is an invalid pointer - but I cannot figure out why it should be, from the calls to FILE_GetUnixGandleType that exist. Please try to generate a trace with trace+winsock,trace+server,trace+file. Martin -- Martin Wilck Phone: +49 5251 8 15113 Fujitsu Siemens Computers Fax: +49 5251 8 20409 Heinz-Nixdorf-Ring 1 mailto:Martin.Wilck@Fujitsu-Siemens.com D-33106 Paderborn http://www.fujitsu-siemens.com/primergy

1 0

Last patch for Mingw32 Warnings
by Steven Edwards 25 Apr '02

25 Apr '02

Once again if someone wants to help I only have one warning left to fix. Changelog: More Mingw32 warning fixes cvs diff -u winnls.h Index: winnls.h =================================================================== RCS file: /home/wine/wine/include/winnls.h,v retrieving revision 1.32 diff -u -r1.32 winnls.h --- winnls.h 10 Mar 2002 00:02:34 -0000 1.32 +++ winnls.h 25 Apr 2002 07:07:43 -0000 @@ -26,6 +26,13 @@ extern "C" { #endif +#ifdef __MINGW__ +#undef _MAX_PATH +#undef _MAX_DIR +#undef _MAX_EXT +#undef _MAX_DRIVE +#include "stdlib.h" +#endif #define MB_PRECOMPOSED 0x00000001 #define MB_COMPOSITE 0x00000002 "Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson

1 0

Send the first two mingw32 patches to /dev/null and use these instead
by Steven Edwards 25 Apr '02

25 Apr '02

Sorry about that. If you decide to apply them use this instead. I messed up and used CFLAGS=-D_MINGW_ instead of __MINGW__ cvs diff -u windef.h Index: windef.h =================================================================== RCS file: /home/wine/wine/include/windef.h,v retrieving revision 1.62 diff -u -r1.62 windef.h --- windef.h 10 Mar 2002 00:02:34 -0000 1.62 +++ windef.h 25 Apr 2002 02:09:36 -0000 @@ -157,8 +157,9 @@ #define _MAX_EXT _MAX_FNAME #define _MAX_PATH 260 #endif +#if ! defined (__MINGW__) #define MAX_PATH _MAX_PATH - +#endif #define HFILE_ERROR ((HFILE)-1) cvs diff -u makedep.c Index: makedep.c =================================================================== RCS file: /home/wine/wine/tools/makedep.c,v retrieving revision 1.10 diff -u -r1.10 makedep.c --- makedep.c 10 Mar 2002 00:24:22 -0000 1.10 +++ makedep.c 25 Apr 2002 02:11:38 -0000 @@ -24,6 +24,10 @@ #include <string.h> #include <unistd.h> +#ifdef __MINGW__ /* Taken from GLib */ +#define ftruncate(fd, size) +#endif + /* Max first-level includes per file */ #define MAX_INCLUDES 200 "Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson

1 0

Re: Installing MS Office gives error in installer
by Speeddymon 25 Apr '02

25 Apr '02

actually i did manage to get it work work from the cd, you have to explicitly specify the -o unhide command when you run mount or put the unhide command in your /etc/fstab... as for the files not getting written, i had the same problem, it is the .lnk files (that i assume go in the start menu on windows)...i am thinking that they aren't being properly converted to .desktop files or something. I will try installing with crossover office tonight and post the results tomorrow -Dustin --- Rizsanyi Zsolt <rizsanyi(a)myrealbox.com> wrote: On Wednesday 17 April 2002 21:42, Speeddymon wrote: > > I just recently installed wine-20020411 (as you > > may > > have noticed from my patch) > > I haven't tried installing Office 2000 on previous > > versions, but heard that it worked, so I decided > to > > try it. First I tried it in Crossover Office > (since i > > just recently got that also) and the Office 2000 > > installer complained that it couldnt find a > package to > > install on the installation media. So I tried it > in > > wine and it did the same thing... There were no > debug > > messages or anything (in the console). > > > > If anyone knows of a way around this, please let > me > > know... If it has been mentioned before please > point > > me to the right wine-devel archive so I can find > it... > > I have also dared to try to install office2k, and > had the same problem. > But I have found a workaround... > When the installation fails, the MSI installer is > already copied to your > windows directory (I think its name is > installmsi.exe or something like that > - I dont have it at hand). So I have tried to invoke > it with the msi file in > the root of the CD (the data1.msi or something like > that - the other msi is > something else). > This way the installation started. The configuration > of what programs to > install worked perfectly, but when copying the files > the installer broke, and > said that it can't write a file. I dont know what > was the problem. I had > enough space, the persmissions were ok, and so on. > > I have tried again, and the installer broke again > but now with a different > file. So I give up, since I don't really need it to > install, just I wanted to > see what the people are talking about... But if you > find a solution (or > submit a patch :), then I will be interested... > > Best regards, > Zsolt Rizsanyi > __________________________________________________ Do You Yahoo!? Yahoo! Games - play chess, backgammon, pool and more http://games.yahoo.com/

3 9

Another warning fix for Mingw32
by Steven Edwards 25 Apr '02

25 Apr '02

Same as last, if someone wants to help write a conf check by all means. Changelog: If the platform isnt MingW32 then define MAX_PATH cvs diff -u windef.h Index: windef.h =================================================================== RCS file: /home/wine/wine/include/windef.h,v retrieving revision 1.62 diff -u -r1.62 windef.h --- windef.h 10 Mar 2002 00:02:34 -0000 1.62 +++ windef.h 25 Apr 2002 02:00:24 -0000 @@ -157,8 +157,9 @@ #define _MAX_EXT _MAX_FNAME #define _MAX_PATH 260 #endif +#if ! defined (_MINGW_) #define MAX_PATH _MAX_PATH - +#endif #define HFILE_ERROR ((HFILE)-1)

1 0

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