wine-devel

wine-devel@winehq.org

84463 discussions

Re: wine/ tools/winewrap.c tools/winegcc.c include ...
by Dimitrie O. Paun 01 Apr '03

01 Apr '03

On March 31, 2003 07:12 pm, Alexandre Julliard wrote: > Log message: > Use _spawnvp to replace fork for non-Unix platforms. What about adding it to the portability lib? I can do the patch if you want... -- Dimi.

3 6

Fw: glibc tracker bug - installshiels
by Davide Giannotti 01 Apr '03

01 Apr '03

> RedHat 9 > > You need to set the environment variable LD_ASSUME_KERNEL=2.2.5 in the shell > prior to running configure and prior to running wine. > after installing i suggest to add the line in your winelauncher script (/usr/local/bin/winelauncher) and to launch associate the .exe extension with winelauncher. It works fine for me. ---- I'm still hanging on installshield. I copied the suggested stdole* files and rcp*4 from my win98 cd (or whatever i don't rembe now) in my … [View More]

1 0

Re: PATCH: /dlls/ntdll/cdrom.c -- portability breakage
by Alexandre Julliard 01 Apr '03

01 Apr '03

Gerald Pfeifer <pfeifer(a)dbai.tuwien.ac.at> writes: > How about the following patch? > > It's needed for compilation on FreeBSD; in case it's not correct, > how should we solve the problem? I think the code is wrong, we shouldn't store a Linux-only define in a Windows structure, we should use a Windows define. Any one knows what the right value should be? -- Alexandre Julliard julliard(a)winehq.com

3 2

Whither specmaker?
by Kevin Cousins 01 Apr '03

01 Apr '03

Searching for an answer to my problem, comp.emulators.ms-windows.wine archives at google throw up a post [1] suggesting looking into tools/specmaker. Sources checked out from winehq.com CVS as of last week, updated today, have tools/specmaker as an empty directory. Where might I be able to investigate specmaker? Is specmaker still viable? FWIW, my problem is the oft-asked "How do I call functions in a Windows DLL from an ELF process?" I appreciate WineLib is an option, and have run into a … [View More]

2 1

Edit box input problem
by Brad Campbell 01 Apr '03

01 Apr '03

G'day all, I'm having a strange problem with any application that uses a delphi TMaskEdit component. I have knocked up a simple test application. http://www.seme.com.au/masktest.tgz It's in Borland Delphi 4 and contains both the .exe and the source for the interested or security conscious. Can someone else run this up on their wine build and see if it's doing the same thing? Under windows, it will only accept three numeric characters, under wine I'm unable to edit the field, it accepts … [View More]

1 0

Question about kernel32 resources
by Maxime Bellengé 01 Apr '03

01 Apr '03

I am currently working on the EnumSystemLanguageGroups/EnumLanguageGroupLocales functions. I have finished everything but there is one thing I don't know. The different language group names are stored in the kernel32.dll resources in a string table. They are indexed from 1 to 17 in the win2k/winxp kernel32 dll. However, in wine it seems these ID are used. So I am wondering how can I workaround that. I can't change the ID for the groups because they are defined in winnls.h from 1 to 17. At … [View More]

2 1

Problem with debugging: XIO: fatal IO error 0 (Success) on X server ":0.0"
by Juraj Hercek 01 Apr '03

01 Apr '03

Hi, I have troubles with debugging winelib applications. This is what makes me unhappy: --- $ gdb wine (gdb) r notepad Starting program: /usr/local/bin/wine notepad XIO: fatal IO error 0 (Success) on X server ":0.0" after 187 requests (187 known processed) with 0 events remaining. Program exited with code 01. --- I'm getting similar results with winedbg (running "winedbg notepad") - there is just bunch of debug outputs before the error is printed. However, this happens only when I'm … [View More]

2 1

Re: wine/ scheduler/timer.c scheduler/synchro.c in ...
by Bill Medland 31 Mar '03

31 Mar '03

On March 30, 2003 05:37 pm, Alexandre Julliard wrote: > ChangeSet ID: 7728 > CVSROOT: /opt/cvs-commit > Module name: wine > Changes by: julliard(a)wine.codeweavers.com 2003/03/30 19:37:05 > > Modified files: > scheduler : timer.c synchro.c > include : winternl.h > dlls/ntdll : time.c sync.c om.c ntdll_misc.h ntdll.spec > > Log message: > Moved WaitForMultipleObjects to ntdll (based on a patch by Eric > Pouech). > Added … [View More]

1 0

Re: lostwages/. winehq.css
by Dimitrie O. Paun 31 Mar '03

31 Mar '03

On Mon, 31 Mar 2003, Jeremy Newman wrote: > ChangeSet ID: 7729 > CVSROOT: /opt/cvs-commit > Module name: lostwages > Changes by: jnewman(a)wine.codeweavers.com 2003/03/31 11:03:14 > > Added files: > . : winehq.css Should we move all CSS stuff in there (like the stuff I use in my Fun/Winelib/etc. pages)? -- Dimi.

2 3

Multicast options in WinSock with java
by Mike Hearn 31 Mar '03

31 Mar '03

Hi all, I have a bit of a problem. Essentially, the problem is that Java 1.4 is buggy, it includes winsock.h, but then proceeds to use winsock2. That wouldn't be an issue, except that my app uses multicast sockets, and for reasons known only to Redmond they decided to change the values of some of the multicast socket option constants. Java, therefore, passes in the winsock1 values to winsock2. Windows apparently can deal with this just fine (well, the appw works), despite there being no … [View More]

2 2

Error in CVS?
by Vilppa Salt 31 Mar '03

31 Mar '03

<snip> gcc -c -I. -I. -I../../include -I../../include -g -O2 -Wall -mpreferred-stack-boundary=2 -gstabs+ -Wpointer-arith -fPIC -D__WINESRC__ -D_NTSYSTEM_ -DBINDIR="\"/usr/local/bin\"" -DETCDIR="\"/usr/local/etc\"" -D_REENTRANT -o signal_sparc.o signal_sparc.c gcc -c -I. -I. -I../../include -I../../include -g -O2 -Wall -mpreferred-stack-boundary=2 -gstabs+ -Wpointer-arith -fPIC -D__WINESRC__ -D_NTSYSTEM_ -DBINDIR="\"/usr/local/bin\"" -DETCDIR="\"/usr/local/etc\"" -D_REENTRANT -o … [View More]

2 1

cross compiling Wine under MSVC
by Rolf Kalbermatter 31 Mar '03

31 Mar '03

Hello, I have just got the whole Wine sources on a Linux computer and shared the sources directory over samba to try to compile parts of it in MSVC. Here I get several problems which seem to me configuration related, but I wonder how I'm supposed to proceed to get everything working. I have run ./tools/winapi/msvcmaker to create the MSVC project files and hopefully anything else which is required for this. I can of course add some (the correct?) definitions by hand to config.h or port.h but … [View More]

1 0

Re: lostwages/templates/en fun_projects.template
by Dimitrie O. Paun 31 Mar '03

31 Mar '03

On March 30, 2003 11:23 am, Andreas Mohr wrote: > ChangeSet ID: 7720 > CVSROOT: /opt/cvs-commit > Module name: lostwages > Changes by: amohr(a)wine.codeweavers.com 2003/03/30 10:23:41 > > Modified files: > templates/en : fun_projects.template > > Log message: > Update by Francois > > Patch: http://cvs.winehq.com/patch.py?id=7720 > > Old revision New revision Changes Path > 1.2 1.3 +1 -1 > lostwages/templates/en/… [View More]

1 0

Re: lostwages/templates/en contributing.template
by Dimitrie O. Paun 31 Mar '03

31 Mar '03

On March 30, 2003 10:59 am, Andreas Mohr wrote: > ChangeSet ID: 7718 > CVSROOT: /opt/cvs-commit > Module name: lostwages > Changes by: amohr(a)wine.codeweavers.com 2003/03/30 09:59:45 > > Modified files: > templates/en : contributing.template > > Log message: > Update by Francois > > Patch: http://cvs.winehq.com/patch.py?id=7718 > > Old revision New revision Changes Path > 1.4 1.5 +67 -62 > lostwages/templates/en/… [View More]

1 0

Re: Contributing page needs fixing
by Dimitrie O. Paun 30 Mar '03

30 Mar '03

On March 30, 2003 03:30 pm, Francois Gouget wrote: > Yes, definitely. Now is not the time to say the 'web site is finished we > don't need anyone'. That's simply not true. That will not cut it, sorry. I've posted a list of "still TODO", and asked for comments. Nobody bothered to reply to it. The web site is not the open ended project Wine is. We can reach a state where we are happy with it, and I think that state is not far away. What we need is a list of things that we think we need. I'… [View More]

1 0

Re: bin2rc
by Alexandre Julliard 30 Mar '03

30 Mar '03

"Dimitrie O. Paun" <dpaun(a)rogers.com> writes: > I've just stupidly lost an hour or so trying to figure out > how to convert a .bmp to a .rc script. Such a simple problem... That's what tools/bin2res is for... -- Alexandre Julliard julliard(a)winehq.com

3 3

Re: Contributing page needs fixing
by Dimitrie O. Paun 30 Mar '03

30 Mar '03

On March 29, 2003 09:48 pm, Francois Gouget wrote: > Wine-Develipmont</a>. > + <p>WineHQ has been redisigned recently. But there is still work to do. > + So you would feel like writing about Wine or coding in Php your > + contribution will be appreciated. You can find the current task list I think we should remove this section altogether. The page is already way too big, and this is as bad as a not enough info. The site has been redesigned, and there … [View More]

2 2

SHFileOperation regression test
by Rolf Kalbermatter 30 Mar '03

30 Mar '03

While working on SHFileOperation in shell32.dll I came across the error in line 286 and 287 which happens on Win98/ME/2K/XP but not on 95/NT. Investigation showed that the copy operation of multiple files with one source file not existing in the list, has different behaviour on these two groups of OS Versions. Win 95/NT abort the copy operation at the first file not existing, and return WITHOUT any error indication whatsoever, leaving the already copied files in the target directory. Win 98/… [View More]ME/2K/XP have obviously fixed this bug in a rather strict manner, in that such a copy operation is aborted with error return value 1026 (undocumented, resp. meaningless in this cicumstance other than that it is non-zero), and no file is copied at all. (There still exists a small bug, at least in 2K, in that the fAnyOperationsAborted flag in the SHFILEOPSTRUCT structure is not set at all in this case on return.) Obviously our shlfileop.c test needs fixing but I'm not sure how to proceed as I'm fairly new to the Wine regression testing. From what I gathered it is not really acceptable to create Windows version dependant tests in the regression framework, which leaves only two other options, IMO: 1) Remove this particular test altogether or 2) Test only the behaviour which is consistent on all platforms which in this case would be only the non-existence of the test2.txt file. Both options leave out possibly important regression test cases for the future. Any comments on this issue from the more seasoned guys into regression test writing? Appended is the patch which is correct for Win 98/ME/2K/XP but will cause test failure on 95/NT. Rolf Kalbermatter Index: dlls/shell32/tests/shlfileop.c =================================================================== RCS file: /home/wine/wine/dlls/shell32/tests/shlfileop.c,v retrieving revision 1.6 diff -u -r1.6 shlfileop.c --- dlls/shell32/tests/shlfileop.c 14 Jan 2003 23:43:42 -0000 1.6 +++ dlls/shell32/tests/shlfileop.c 30 Mar 2003 08:52:58 -0000 @@ -278,13 +278,15 @@ ok(file_exists(".\\testdir2\\test2.txt"), "The file is copied"); clean_after_shfo_tests(); + /* Copying multiple files with one not existing as source, fails the + entire operation in Win98/ME/2K/XP with return value 1026, but only + the files after the one not existing and without any error indication + in 95/NT, ! */ init_shfo_tests(); tmp_flags = shfo.fFlags; set_curr_dir_path(from, "test1.txt\0test10.txt\0test2.txt\0"); ok(!file_exists(".\\testdir2\\test1.txt"), "The file is not copied yet"); ok(!file_exists(".\\testdir2\\test2.txt"), "The file is not copied yet"); - ok(!SHFileOperationA(&shfo), "Files are copied to other directory "); - ok(file_exists(".\\testdir2\\test1.txt"), "The file is copied"); + ok(SHFileOperationA(&shfo), "Files are copied to other directory "); + ok(!file_exists(".\\testdir2\\test1.txt"), "The file is copied"); ok(!file_exists(".\\testdir2\\test2.txt"), "The file is copied"); shfo.fFlags = tmp_flags; } [View Less]

1 0

Re: Compiling WINE - Hopeless situation? :)
by Dan Kegel 30 Mar '03

30 Mar '03

Sylvain wrote: > --- Michael Stefaniuc <mstefani(a)redhat.de> a écrit : > On Sun, Mar 30, > 2003 at 12:44:31AM +0100, Sylvain Petreolle wrote: >> > The code that has problem for now is C code, not C++, am I right >> here ? >> > Then it has nothing to do with C++ thing. >> Yeah, but the page you pointed to is for C++ incompatibilities, not >> C. >> And a newer 2.96 is stable for C. > If there is one, it isnt shipped with RH 8, or not … [View More]

1 0

Re: Compiling WINE - Hopeless situation? :)
by Sylvain Petreolle 30 Mar '03

30 Mar '03

Please update gcc to version 3.x.x, gcc2.96 was a broken unofficial version of RedHat and all dependancies must be updated too. (like binutils) Time to put an entry in README or something else ? Is gcc version checked by configure ? --- Matt Bailey <mattb(a)rtccom.net> a écrit : > Hi, > > Any ideas on that last error message I sent? One detail I did not > mention > is that I still have libstdc++2.10 installed, it says it's version > 2.96-0.76mdk. I knew there was … [View More]

3 8

Re: Possible regression: wine/dlls/kernel/tests/process crashes
by Sylvain Petreolle 29 Mar '03

29 Mar '03

> Here is what I did: > > cd ../wine/dlls/kernel/tests > > rm process.o > > > make test > ../../../tools/runtest -q -P wine -M kernel32.dll -T ../../.. -p > kernel32_test.exe.so process.c && touch process.ok you can run it with wine/winedbg without runtest : wine kernel32_test.exe.so process > and after some time this automatically pops up: > process.c:382: Test failed: Child process termination > wine: process.c:400: test_Startup: Assertion `… [View More]

1 0

Possible regression: wine/dlls/kernel/tests/process crashes
by Uwe Bonnes 29 Mar '03

29 Mar '03

Hallo, wine/dlls/kernel/tests/process crashed. I was not able to decipher what is going on. Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

3 2

More QEMU fixes
by Ulrich Weigand 29 Mar '03

29 Mar '03

Hello Fabrice, I've played a bit with your qemu-0.1.2 release, and got putty running under Wine under qemu on s390-ibm-linux (using a wineserver also running under qemu on s390). To make this work I've had to add a bunch of missing byteorder conversions and other fixes, which I've appended here. Mostly, the changes concern the socket area; wine and wineserver extensively use sockets (sendmsg/recvmsg with ancillary data), and also the X connection needed fixes (setsockopt). There were also … [View More]some other fixes required (poll, select, execve). I haven't found any problem with the actual CPU emulation, however! Here's the detailed list of changes: glibc-2.3.2 compile fix: Recent glibc supports nanosecond resolution file timestamps in their struct stat, using this construct struct timespec st_atim; /* Time of last access. */ struct timespec st_mtim; /* Time of last modification. */ struct timespec st_ctim; /* Time of last status change. */ # define st_atime st_atim.tv_sec /* Backward compatibility. */ # define st_mtime st_mtim.tv_sec # define st_ctime st_ctim.tv_sec This breaks the use of st_atime etc. as struct members; I've renamed them to target_st_atime etc. Missing data conversion: - socketcall on-stack arguments need to be byteswapped - struct sockaddr (sa_family) needs to be byteswapped - sendmsg/recvmsg ancillary data needs to be converted - execve arg and env vectors need to be byteswapped - select fdset conversion wasn't done due to typo in #if - added marginal support for setsockopt Incorrect data conversion: - poll pollfd array was clobbered (even on native) If you like, I could also send you the patch to make qemu actually work on s390; I'm not sure if you are interested in that at this point ... Bye, Ulrich diff -ur qemu-0.1.2/syscall-i386.h qemu-0.1.2-s390/syscall-i386.h --- qemu-0.1.2/syscall-i386.h 2003-03-26 23:34:59.000000000 +0100 +++ qemu-0.1.2-s390/syscall-i386.h 2003-03-29 02:33:28.000000000 +0100 @@ -255,11 +255,11 @@ target_ulong st_size; target_ulong st_blksize; target_ulong st_blocks; - target_ulong st_atime; + target_ulong target_st_atime; target_ulong __unused1; - target_ulong st_mtime; + target_ulong target_st_mtime; target_ulong __unused2; - target_ulong st_ctime; + target_ulong target_st_ctime; target_ulong __unused3; target_ulong __unused4; target_ulong __unused5; @@ -290,13 +290,13 @@ target_ulong st_blocks; /* Number 512-byte blocks allocated. */ target_ulong __pad4; /* future possible st_blocks high bits */ - target_ulong st_atime; + target_ulong target_st_atime; target_ulong __pad5; - target_ulong st_mtime; + target_ulong target_st_mtime; target_ulong __pad6; - target_ulong st_ctime; + target_ulong target_st_ctime; target_ulong __pad7; /* will be high 32 bits of ctime someday */ unsigned long long st_ino; diff -ur qemu-0.1.2/syscall.c qemu-0.1.2-s390/syscall.c --- qemu-0.1.2/syscall.c 2003-03-26 23:34:59.000000000 +0100 +++ qemu-0.1.2-s390/syscall.c 2003-03-29 04:45:12.000000000 +0100 @@ -26,6 +26,7 @@ #include <errno.h> #include <unistd.h> #include <fcntl.h> +#include <time.h> #include <sys/types.h> #include <sys/wait.h> #include <sys/time.h> @@ -40,6 +41,7 @@ #include <sys/uio.h> #include <sys/poll.h> //#include <sys/user.h> +#include <netinet/tcp.h> #define termios host_termios #define winsize host_winsize @@ -166,7 +168,7 @@ static inline fd_set *target_to_host_fds(fd_set *fds, target_long *target_fds, int n) { -#if !defined(BSWP_NEEDED) && !defined(WORD_BIGENDIAN) +#if !defined(BSWP_NEEDED) && !defined(WORDS_BIGENDIAN) return (fd_set *)target_fds; #else int i, b; @@ -188,7 +190,7 @@ static inline void host_to_target_fds(target_long *target_fds, fd_set *fds, int n) { -#if !defined(BSWP_NEEDED) && !defined(WORD_BIGENDIAN) +#if !defined(BSWP_NEEDED) && !defined(WORDS_BIGENDIAN) /* nothing to do */ #else int i, nw, j, k; @@ -256,55 +258,267 @@ return ret; } -static long do_socketcall(int num, long *vptr) +static inline void target_to_host_sockaddr(struct sockaddr *addr, + struct target_sockaddr *target_addr, + socklen_t len) +{ + memcpy(addr, target_addr, len); + addr->sa_family = tswap16(target_addr->sa_family); +} + +static inline void host_to_target_sockaddr(struct target_sockaddr *target_addr, + struct sockaddr *addr, + socklen_t len) +{ + memcpy(target_addr, addr, len); + target_addr->sa_family = tswap16(addr->sa_family); +} + +static inline void target_to_host_cmsg(struct msghdr *msgh, + struct target_msghdr *target_msgh) +{ + struct cmsghdr *cmsg = CMSG_FIRSTHDR(msgh); + struct target_cmsghdr *target_cmsg = TARGET_CMSG_FIRSTHDR(target_msgh); + socklen_t space = 0; + + while (cmsg && target_cmsg) { + void *data = CMSG_DATA(cmsg); + void *target_data = TARGET_CMSG_DATA(target_cmsg); + + int len = tswapl(target_cmsg->cmsg_len) + - TARGET_CMSG_ALIGN(sizeof (struct target_cmsghdr)); + + space += CMSG_SPACE(len); + if (space > msgh->msg_controllen) { + space -= CMSG_SPACE(len); + gemu_log("Host cmsg overflow"); + break; + } + + cmsg->cmsg_level = tswap32(target_cmsg->cmsg_level); + cmsg->cmsg_type = tswap32(target_cmsg->cmsg_type); + cmsg->cmsg_len = CMSG_LEN(len); + + if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) { + gemu_log("Unsupported ancillary data: %d/%d\n", cmsg->cmsg_level, cmsg->cmsg_type); + memcpy(data, target_data, len); + } else { + int *fd = (int *)data; + int *target_fd = (int *)target_data; + int i, numfds = len / sizeof(int); + + for (i = 0; i < numfds; i++) + fd[i] = tswap32(target_fd[i]); + } + + cmsg = CMSG_NXTHDR(msgh, cmsg); + target_cmsg = TARGET_CMSG_NXTHDR(target_msgh, target_cmsg); + } + + msgh->msg_controllen = space; +} + +static inline void host_to_target_cmsg(struct target_msghdr *target_msgh, + struct msghdr *msgh) +{ + struct cmsghdr *cmsg = CMSG_FIRSTHDR(msgh); + struct target_cmsghdr *target_cmsg = TARGET_CMSG_FIRSTHDR(target_msgh); + socklen_t space = 0; + + while (cmsg && target_cmsg) { + void *data = CMSG_DATA(cmsg); + void *target_data = TARGET_CMSG_DATA(target_cmsg); + + int len = cmsg->cmsg_len - CMSG_ALIGN(sizeof (struct cmsghdr)); + + space += TARGET_CMSG_SPACE(len); + if (space > tswapl(target_msgh->msg_controllen)) { + space -= TARGET_CMSG_SPACE(len); + gemu_log("Target cmsg overflow"); + break; + } + + target_cmsg->cmsg_level = tswap32(cmsg->cmsg_level); + target_cmsg->cmsg_type = tswap32(cmsg->cmsg_type); + target_cmsg->cmsg_len = tswapl(TARGET_CMSG_LEN(len)); + + if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) { + gemu_log("Unsupported ancillary data: %d/%d\n", cmsg->cmsg_level, cmsg->cmsg_type); + memcpy(target_data, data, len); + } else { + int *fd = (int *)data; + int *target_fd = (int *)target_data; + int i, numfds = len / sizeof(int); + + for (i = 0; i < numfds; i++) + target_fd[i] = tswap32(fd[i]); + } + + cmsg = CMSG_NXTHDR(msgh, cmsg); + target_cmsg = TARGET_CMSG_NXTHDR(target_msgh, target_cmsg); + } + + msgh->msg_controllen = tswapl(space); +} + +static long do_setsockopt(int sockfd, int level, int optname, + void *optval, socklen_t optlen) +{ + if (level == SOL_TCP) { + /* TCP options all take an 'int' value. */ + int val; + + if (optlen < sizeof(uint32_t)) + return -EINVAL; + + val = tswap32(*(uint32_t *)optval); + return get_errno(setsockopt(sockfd, level, optname, &val, sizeof(val))); + } + + else if (level != SOL_SOCKET) { + gemu_log("Unsupported setsockopt level: %d\n", level); + return -ENOSYS; + } + + switch (optname) { + /* Options with 'int' argument. */ + case SO_DEBUG: + case SO_REUSEADDR: + case SO_TYPE: + case SO_ERROR: + case SO_DONTROUTE: + case SO_BROADCAST: + case SO_SNDBUF: + case SO_RCVBUF: + case SO_KEEPALIVE: + case SO_OOBINLINE: + case SO_NO_CHECK: + case SO_PRIORITY: + case SO_BSDCOMPAT: + case SO_PASSCRED: + case SO_TIMESTAMP: + case SO_RCVLOWAT: + case SO_RCVTIMEO: + case SO_SNDTIMEO: + { + int val; + if (optlen < sizeof(uint32_t)) + return -EINVAL; + val = tswap32(*(uint32_t *)optval); + return get_errno(setsockopt(sockfd, level, optname, &val, sizeof(val))); + } + + default: + gemu_log("Unsupported setsockopt SOL_SOCKET option: %d\n", optname); + return -ENOSYS; + } +} + +static long do_getsockopt(int sockfd, int level, int optname, + void *optval, socklen_t *optlen) +{ + gemu_log("getsockopt not yet supported\n"); + return -ENOSYS; +} + +static long do_socketcall(int num, int32_t *vptr) { long ret; switch(num) { case SOCKOP_socket: - ret = get_errno(socket(vptr[0], vptr[1], vptr[2])); + { + int domain = tswap32(vptr[0]); + int type = tswap32(vptr[1]); + int protocol = tswap32(vptr[2]); + + ret = get_errno(socket(domain, type, protocol)); + } break; case SOCKOP_bind: - ret = get_errno(bind(vptr[0], (struct sockaddr *)vptr[1], vptr[2])); + { + int sockfd = tswap32(vptr[0]); + void *target_addr = (void *)tswap32(vptr[1]); + socklen_t addrlen = tswap32(vptr[2]); + void *addr = alloca(addrlen); + + target_to_host_sockaddr(addr, target_addr, addrlen); + ret = get_errno(bind(sockfd, addr, addrlen)); + } break; case SOCKOP_connect: - ret = get_errno(connect(vptr[0], (struct sockaddr *)vptr[1], vptr[2])); + { + int sockfd = tswap32(vptr[0]); + void *target_addr = (void *)tswap32(vptr[1]); + socklen_t addrlen = tswap32(vptr[2]); + void *addr = alloca(addrlen); + + target_to_host_sockaddr(addr, target_addr, addrlen); + ret = get_errno(connect(sockfd, addr, addrlen)); + } break; case SOCKOP_listen: - ret = get_errno(listen(vptr[0], vptr[1])); + { + int sockfd = tswap32(vptr[0]); + int backlog = tswap32(vptr[1]); + + ret = get_errno(listen(sockfd, backlog)); + } break; case SOCKOP_accept: { - socklen_t size; - size = tswap32(*(int32_t *)vptr[2]); - ret = get_errno(accept(vptr[0], (struct sockaddr *)vptr[1], &size)); - if (!is_error(ret)) - *(int32_t *)vptr[2] = size; + int sockfd = tswap32(vptr[0]); + void *target_addr = (void *)tswap32(vptr[1]); + uint32_t *target_addrlen = (void *)tswap32(vptr[2]); + socklen_t addrlen = tswap32(*target_addrlen); + void *addr = alloca(addrlen); + + ret = get_errno(accept(sockfd, addr, &addrlen)); + if (!is_error(ret)) { + host_to_target_sockaddr(target_addr, addr, addrlen); + *target_addrlen = tswap32(addrlen); + } } break; case SOCKOP_getsockname: { - socklen_t size; - size = tswap32(*(int32_t *)vptr[2]); - ret = get_errno(getsockname(vptr[0], (struct sockaddr *)vptr[1], &size)); - if (!is_error(ret)) - *(int32_t *)vptr[2] = size; + int sockfd = tswap32(vptr[0]); + void *target_addr = (void *)tswap32(vptr[1]); + uint32_t *target_addrlen = (void *)tswap32(vptr[2]); + socklen_t addrlen = tswap32(*target_addrlen); + void *addr = alloca(addrlen); + + ret = get_errno(getsockname(sockfd, addr, &addrlen)); + if (!is_error(ret)) { + host_to_target_sockaddr(target_addr, addr, addrlen); + *target_addrlen = tswap32(addrlen); + } } break; case SOCKOP_getpeername: { - socklen_t size; - size = tswap32(*(int32_t *)vptr[2]); - ret = get_errno(getpeername(vptr[0], (struct sockaddr *)vptr[1], &size)); - if (!is_error(ret)) - *(int32_t *)vptr[2] = size; + int sockfd = tswap32(vptr[0]); + void *target_addr = (void *)tswap32(vptr[1]); + uint32_t *target_addrlen = (void *)tswap32(vptr[2]); + socklen_t addrlen = tswap32(*target_addrlen); + void *addr = alloca(addrlen); + + ret = get_errno(getpeername(sockfd, addr, &addrlen)); + if (!is_error(ret)) { + host_to_target_sockaddr(target_addr, addr, addrlen); + *target_addrlen = tswap32(addrlen); + } } break; case SOCKOP_socketpair: { + int domain = tswap32(vptr[0]); + int type = tswap32(vptr[1]); + int protocol = tswap32(vptr[2]); + int32_t *target_tab = (void *)tswap32(vptr[3]); int tab[2]; - int32_t *target_tab = (int32_t *)vptr[3]; - ret = get_errno(socketpair(vptr[0], vptr[1], vptr[2], tab)); + + ret = get_errno(socketpair(domain, type, protocol, tab)); if (!is_error(ret)) { target_tab[0] = tswap32(tab[0]); target_tab[1] = tswap32(tab[1]); @@ -312,27 +526,64 @@ } break; case SOCKOP_send: - ret = get_errno(send(vptr[0], (void *)vptr[1], vptr[2], vptr[3])); + { + int sockfd = tswap32(vptr[0]); + void *msg = (void *)tswap32(vptr[1]); + size_t len = tswap32(vptr[2]); + int flags = tswap32(vptr[3]); + + ret = get_errno(send(sockfd, msg, len, flags)); + } break; case SOCKOP_recv: - ret = get_errno(recv(vptr[0], (void *)vptr[1], vptr[2], vptr[3])); + { + int sockfd = tswap32(vptr[0]); + void *msg = (void *)tswap32(vptr[1]); + size_t len = tswap32(vptr[2]); + int flags = tswap32(vptr[3]); + + ret = get_errno(recv(sockfd, msg, len, flags)); + } break; case SOCKOP_sendto: - ret = get_errno(sendto(vptr[0], (void *)vptr[1], vptr[2], vptr[3], - (struct sockaddr *)vptr[4], vptr[5])); + { + int sockfd = tswap32(vptr[0]); + void *msg = (void *)tswap32(vptr[1]); + size_t len = tswap32(vptr[2]); + int flags = tswap32(vptr[3]); + void *target_addr = (void *)tswap32(vptr[4]); + socklen_t addrlen = tswap32(vptr[5]); + void *addr = alloca(addrlen); + + target_to_host_sockaddr(addr, target_addr, addrlen); + ret = get_errno(sendto(sockfd, msg, len, flags, addr, addrlen)); + } break; case SOCKOP_recvfrom: { - socklen_t size; - size = tswap32(*(int32_t *)vptr[5]); - ret = get_errno(recvfrom(vptr[0], (void *)vptr[1], vptr[2], - vptr[3], (struct sockaddr *)vptr[4], &size)); - if (!is_error(ret)) - *(int32_t *)vptr[5] = size; + int sockfd = tswap32(vptr[0]); + void *msg = (void *)tswap32(vptr[1]); + size_t len = tswap32(vptr[2]); + int flags = tswap32(vptr[3]); + void *target_addr = (void *)tswap32(vptr[4]); + uint32_t *target_addrlen = (void *)tswap32(vptr[5]); + socklen_t addrlen = tswap32(*target_addrlen); + void *addr = alloca(addrlen); + + ret = get_errno(recvfrom(sockfd, msg, len, flags, addr, &addrlen)); + if (!is_error(ret)) { + host_to_target_sockaddr(target_addr, addr, addrlen); + *target_addrlen = tswap32(addrlen); + } } break; case SOCKOP_shutdown: - ret = get_errno(shutdown(vptr[0], vptr[1])); + { + int sockfd = tswap32(vptr[0]); + int how = tswap32(vptr[1]); + + ret = get_errno(shutdown(sockfd, how)); + } break; case SOCKOP_sendmsg: case SOCKOP_recvmsg: @@ -344,11 +595,11 @@ struct iovec *vec; struct target_iovec *target_vec; - msgp = (void *)vptr[1]; + msgp = (void *)tswap32(vptr[1]); msg.msg_name = (void *)tswapl(msgp->msg_name); msg.msg_namelen = tswapl(msgp->msg_namelen); - msg.msg_control = (void *)tswapl(msgp->msg_control); - msg.msg_controllen = tswapl(msgp->msg_controllen); + msg.msg_controllen = 2 * tswapl(msgp->msg_controllen); + msg.msg_control = alloca(msg.msg_controllen); msg.msg_flags = tswap32(msgp->msg_flags); count = tswapl(msgp->msg_iovlen); @@ -361,17 +612,43 @@ msg.msg_iovlen = count; msg.msg_iov = vec; - fd = vptr[0]; - flags = vptr[2]; - if (num == SOCKOP_sendmsg) - ret = sendmsg(fd, &msg, flags); - else - ret = recvmsg(fd, &msg, flags); - ret = get_errno(ret); + fd = tswap32(vptr[0]); + flags = tswap32(vptr[2]); + if (num == SOCKOP_sendmsg) { + target_to_host_cmsg(&msg, msgp); + ret = get_errno(sendmsg(fd, &msg, flags)); + } else { + ret = get_errno(recvmsg(fd, &msg, flags)); + if (!is_error(ret)) + host_to_target_cmsg(msgp, &msg); + } } break; case SOCKOP_setsockopt: + { + int sockfd = tswap32(vptr[0]); + int level = tswap32(vptr[1]); + int optname = tswap32(vptr[2]); + void *optval = (void *)tswap32(vptr[3]); + socklen_t optlen = tswap32(vptr[4]); + + ret = do_setsockopt(sockfd, level, optname, optval, optlen); + } + break; case SOCKOP_getsockopt: + { + int sockfd = tswap32(vptr[0]); + int level = tswap32(vptr[1]); + int optname = tswap32(vptr[2]); + void *optval = (void *)tswap32(vptr[3]); + uint32_t *target_len = (void *)tswap32(vptr[4]); + socklen_t optlen = tswap32(*target_len); + + ret = do_getsockopt(sockfd, level, optname, optval, &optlen); + if (!is_error(ret)) + *target_len = tswap32(optlen); + } + break; default: gemu_log("Unsupported socketcall: %d\n", num); ret = -ENOSYS; @@ -880,7 +1157,27 @@ ret = get_errno(unlink((const char *)arg1)); break; case TARGET_NR_execve: - ret = get_errno(execve((const char *)arg1, (void *)arg2, (void *)arg3)); + { + char **argp, **envp; + int argc = 0, envc = 0; + uint32_t *p; + char **q; + + for (p = (void *)arg2; *p; p++) + argc++; + for (p = (void *)arg3; *p; p++) + envc++; + + argp = alloca(argc * sizeof(void *)); + envp = alloca(envc * sizeof(void *)); + + for (p = (void *)arg2, q = argp; *p; p++, q++) + *q = (void *)tswap32(*p); + for (p = (void *)arg3, q = envp; *p; p++, q++) + *q = (void *)tswap32(*p); + + ret = get_errno(execve((const char *)arg1, argp, envp)); + } break; case TARGET_NR_chdir: ret = get_errno(chdir((const char *)arg1)); @@ -1404,7 +1701,7 @@ case TARGET_NR_ioperm: goto unimplemented; case TARGET_NR_socketcall: - ret = do_socketcall(arg1, (long *)arg2); + ret = do_socketcall(arg1, (int32_t *)arg2); break; case TARGET_NR_syslog: goto unimplemented; @@ -1468,9 +1765,9 @@ target_st->st_size = tswapl(st.st_size); target_st->st_blksize = tswapl(st.st_blksize); target_st->st_blocks = tswapl(st.st_blocks); - target_st->st_atime = tswapl(st.st_atime); - target_st->st_mtime = tswapl(st.st_mtime); - target_st->st_ctime = tswapl(st.st_ctime); + target_st->target_st_atime = tswapl(st.st_atime); + target_st->target_st_mtime = tswapl(st.st_mtime); + target_st->target_st_ctime = tswapl(st.st_ctime); } } break; @@ -1644,17 +1941,17 @@ unsigned int nfds = arg2; int timeout = arg3; struct pollfd *pfd; - int i; + unsigned int i; pfd = alloca(sizeof(struct pollfd) * nfds); for(i = 0; i < nfds; i++) { - pfd->fd = tswap32(target_pfd->fd); - pfd->events = tswap16(target_pfd->events); + pfd[i].fd = tswap32(target_pfd[i].fd); + pfd[i].events = tswap16(target_pfd[i].events); } ret = get_errno(poll(pfd, nfds, timeout)); if (!is_error(ret)) { for(i = 0; i < nfds; i++) { - target_pfd->revents = tswap16(pfd->revents); + target_pfd[i].revents = tswap16(pfd[i].revents); } } } @@ -1859,9 +2156,9 @@ target_st->st_size = tswapl(st.st_size); target_st->st_blksize = tswapl(st.st_blksize); target_st->st_blocks = tswapl(st.st_blocks); - target_st->st_atime = tswapl(st.st_atime); - target_st->st_mtime = tswapl(st.st_mtime); - target_st->st_ctime = tswapl(st.st_ctime); + target_st->target_st_atime = tswapl(st.st_atime); + target_st->target_st_mtime = tswapl(st.st_mtime); + target_st->target_st_ctime = tswapl(st.st_ctime); } } break; diff -ur qemu-0.1.2/syscall_defs.h qemu-0.1.2-s390/syscall_defs.h --- qemu-0.1.2/syscall_defs.h 2003-03-26 23:34:59.000000000 +0100 +++ qemu-0.1.2-s390/syscall_defs.h 2003-03-29 02:36:30.000000000 +0100 @@ -19,6 +19,11 @@ #define SOCKOP_sendmsg 16 #define SOCKOP_recvmsg 17 +struct target_sockaddr { + uint16_t sa_family; + uint8_t sa_data[14]; +}; + struct target_timeval { target_long tv_sec; target_long tv_usec; @@ -49,6 +54,43 @@ unsigned int msg_flags; }; +struct target_cmsghdr { + target_long cmsg_len; + int cmsg_level; + int cmsg_type; +}; + +#define TARGET_CMSG_DATA(cmsg) ((unsigned char *) ((struct target_cmsghdr *) (cmsg) + 1)) +#define TARGET_CMSG_NXTHDR(mhdr, cmsg) __target_cmsg_nxthdr (mhdr, cmsg) +#define TARGET_CMSG_FIRSTHDR(mhdr) \ + ((size_t) tswapl((mhdr)->msg_controllen) >= sizeof (struct target_cmsghdr) \ + ? (struct target_cmsghdr *) tswapl((mhdr)->msg_control) : (struct target_cmsghdr *) NULL) +#define TARGET_CMSG_ALIGN(len) (((len) + sizeof (target_long) - 1) \ + & (size_t) ~(sizeof (target_long) - 1)) +#define TARGET_CMSG_SPACE(len) (TARGET_CMSG_ALIGN (len) \ + + TARGET_CMSG_ALIGN (sizeof (struct target_cmsghdr))) +#define TARGET_CMSG_LEN(len) (TARGET_CMSG_ALIGN (sizeof (struct target_cmsghdr)) + (len)) + +static __inline__ struct target_cmsghdr * +__target_cmsg_nxthdr (struct target_msghdr *__mhdr, struct target_cmsghdr *__cmsg) +{ + if (tswapl(__cmsg->cmsg_len) < sizeof (struct target_cmsghdr)) + /* The kernel header does this so there may be a reason. */ + return 0; + + __cmsg = (struct target_cmsghdr *) ((unsigned char *) __cmsg + + TARGET_CMSG_ALIGN (tswapl(__cmsg->cmsg_len))); + if ((unsigned char *) (__cmsg + 1) > ((unsigned char *) tswapl(__mhdr->msg_control) + + tswapl(__mhdr->msg_controllen)) + || ((unsigned char *) __cmsg + TARGET_CMSG_ALIGN (tswapl(__cmsg->cmsg_len)) + > ((unsigned char *) tswapl(__mhdr->msg_control) + + tswapl(__mhdr->msg_controllen)))) + /* No more entries. */ + return 0; + return __cmsg; +} + + struct target_rusage { struct target_timeval ru_utime; /* user time used */ struct target_timeval ru_stime; /* system time used */ -- Dr. Ulrich Weigand weigand(a)informatik.uni-erlangen.de [View Less]

1 0

Fwd: Re: Installshield.... no way!
by Davide Giannotti 29 Mar '03

29 Mar '03

Oh yeah... i have the native std*tlb files... i unpacked them from my WinXP Pro cd. I'm currently running wine without windows installation. Don't know what to say... are you sure that latests installshield work with wine? I think this is a priority task... I recompiled wine from a clean tarballz... and as i said, some apps works fine. But nothing to do with installshield.... :-( Thanks Subject: Re: Installshield.... no way! Date: Saturday 29 March 2003 11:54 From: Uwe Bonnes <bon(a)… [View More]

1 0

Installshield.... no way!
by Davide Giannotti 29 Mar '03

29 Mar '03

I give up, after 2 days of try.. Nothing to do with some setups. I'm using latest wine on redhat 8.1 with glibc 2.3.1 recompiled for my processor (athlon xp). Apps are launched with winelauncher and the LD_ASSUME_KERNEL=2.2.5 var. set. Wine has been compiled from source, everything went fine and some apps work fine and fast. (like ms office viewers) There's no original dll or config setting or suggestion in the mailing lists that brought me further. My $800 macromedia studio hangs after … [View More]

2 1

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