wine-devel

wine-devel@winehq.org

2 participants
84471 discussions

Known listview bugs (take 2)
by Dimitrie O. Paun 29 Oct '02

29 Oct '02

Folks, After my latest X-series patches (currently at X6), I am aware of the following listview bugs: Yes, you read correctly: NONE. :) So I ask you for one of two things: -- bug reports or -- success stories Otherwise, I'm gonna declare listview the coolest, nicest, most huggable piece of code out there <g>. -- Dimi.

8 34

recent ListView problems
by post＠maikschulz.de 29 Oct '02

29 Oct '02

Hi, I'm using WinMX (www.winmx.com) rather frequently, currently version 3.30. Some two weeks ago, Wine HEAD displayed the ListView components from the search and transfer tabs perfectly, now the refresh/redrawing is messed up. The application documented the changes ListView has undergone in the recent months quite well, though (I'm updating Wine from CVS almost every day). Congratulations for implementing that rather complex control (almost) perfectly! Take care, -Maik

2 1

more desperate cries for help...
by Greg Turner 29 Oct '02

29 Oct '02

o I don't yet know how to properly raise and catch exceptions in wine. I see some examples, but I don't see any of try/finally, of which I am a big fan and would probably like to use. Is there a guide somewhere on how to do these things? o If we want MIDL generated code to compile in winelib, we are going to have to implement the RpcTryExcept and RpcTryFinally macros. I think I heard somewhere that, these are somewhat mysterious macros, i.e., their implementation is based on compiler magic instead of normal header files... how on earth shall we deal with that? I tried grepping the psdk header files and they map to __try, __except, __finally, and so on.... does wine have those? Thanks again for any assistance, -- gmt "The purpose of government is to rein in the rights of the people" --President Bill Clinton, MTV interview, 1993

3 5

RE: winapi update
by Patrik Stridvall 29 Oct '02

29 Oct '02

> On October 29, 2002 09:32 am, Patrik Stridvall wrote: > > *** winapi_check > > > > * tools/winapi/win16.api, > > tools/winapi/win32.api: > > API file update. > > > > *** winapi_checked > > Patrik, please send different patches in different emails. I try to do that more and more. However in this case there are some logical relation between the patches. Every issue winapi_check reports results in either a patch to winapi_check (winapi_check.diff) or a patch to some source file (winapi_checked.diff). So if you wish to find any possible misstake I might have done your really should read both. OK, this time they might be not so useful to read both since they are almost 100% percent independant but that is not always when I do the winapi_check update. > See past discussions for rationale. I remember. :-) Speaking of which: Why not, instead of complaining to people who doesn't (or only partly) listens, write some sort of mail "filter" the reformats the mail to one or more mail of a more appropriate format. Inline attachments and that sort of things... Then we could have a wine-patches-filtered mailing list for people that like the patches in a specific format.

2 1

Re: 16-bit shell seperation
by Alexandre Julliard 29 Oct '02

29 Oct '02

"György 'Nog' Jeney" <nog(a)sdf.lonestar.org> writes: > ChangeLog: > * dlls/shell32/shell32_main.h > * dlls/shell32/shell.c > * dlls/shell32/shellreg.c > * dlls/shell32/Makefile.in > * dlls/shell32/shlexec.c > Seperate out 16-bit functions into seperate file. I have applied the registry stuff, but not ShellExecute16; this one will be need to be split properly so that the 32-bit version doesn't contain 16-bit stuff. -- Alexandre Julliard julliard(a)winehq.com

3 2

Re: winapi update
by Dimitrie O. Paun 29 Oct '02

29 Oct '02

On October 29, 2002 09:32 am, Patrik Stridvall wrote: > *** winapi_check > > * tools/winapi/win16.api, > tools/winapi/win32.api: > API file update. > > *** winapi_checked Patrik, please send different patches in different emails. See past discussions for rationale. -- Dimi.

1 0

RE: winsock + DSTRICT
by Patrik Stridvall 29 Oct '02

29 Oct '02

> Perhaps someone could check if SOCKET is really a 32bit type on 64bit > Windows. No it isn't. >From the latest SDK: typedef UINT_PTR SOCKET; A SOCKET is a pointer disguised as an integer and thus 64-bit on 64-bit platforms.

1 0

Re: more desperate cries for help...
by Dustin Navea 29 Oct '02

29 Oct '02

> --- Greg Turner <gmturner007(a)ameritech.net> wrote: > Beware of this one, It's long, and I've spliced > together at least two > (three?) posts, and probably quoted things > out-of-order... First off, everything seems in order to me... but thats just me... [-snip-] > to work, and may not get right? Why make getting > > it right harder by > > adding a lot of complexity, instead of adding > > infrastructure? > > good point, that seems like the logical way to > proceed. I totally agree here, we should always implement things and get them working properly before we get them working fast, or else we become like the evil empire ;) > Also: we could, indeed, implement wine-rpcss as you > mention. Since it's > not properly a "subsystem" in the MS sense of the > term, maybe it's > called "wine-epmap" but that's just semantics... > what you describe is > totally doable, and we could convert from some > low-level kludgy > implementation to an RPC-based implementation once > the necessary > marshalling was in place... I'll give this serious > thought. ok well if it is doable, i believe we should do it, why focus on the stuff that is _truely_ hard and that we may possibly not know jack shit about when we can get the _easier_ (not necessarily easy) stuff out of the way first, that will lead to a more solid codebase with which to work with. > Back to Ove: [snip] > heh, I know how that goes. Your insights, alone, > are helpful and > appreciated; get well, and we will collaborate on > this when you have > the time to devote to it. yes please, do get better soon, i may be coming down with something myself, my friend/roommate's ex may be the one that gave it to me too :( she is in the hospital now with an abcess on her tonsils, and i may have (somehow) gotten something from it, as I now have a sore throat... -Dustin P.S. nice quote Greg ;) __________________________________________________ Do you Yahoo!? HotJobs - Search new jobs daily now http://hotjobs.yahoo.com/

2 1

winsock + DSTRICT
by Martin Wilck 29 Oct '02

29 Oct '02

Hi Michael, all, here is a patch to make winsock compile without warnings without -DWINE_NO_STRICT. Comments are welcome. Martin PS Michael, will you send this stuff to wine-patches? Index: Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/winsock/Makefile.in,v retrieving revision 1.18 diff -u -r1.18 Makefile.in --- Makefile.in 18 Oct 2002 23:46:28 -0000 1.18 +++ Makefile.in 28 Oct 2002 15:02:23 -0000 @@ -1,4 +1,4 @@ -EXTRADEFS = -DUSE_WS_PREFIX -DWINE_NO_STRICT +EXTRADEFS = -DUSE_WS_PREFIX TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ Index: async.c =================================================================== RCS file: /home/wine/wine/dlls/winsock/async.c,v retrieving revision 1.27 diff -u -r1.27 async.c --- async.c 17 Oct 2002 16:43:43 -0000 1.27 +++ async.c 28 Oct 2002 15:02:24 -0000 @@ -136,6 +136,10 @@ #define AQ_GETSERV 2 #define AQ_GETMASK 3 +/* The handles used are pseudo-handles that can be simply casted. */ +/* 16-bit values are used internally (to be sure handle comparison works right in 16-bit apps). */ +#define WSA_H32(h16) ((HANDLE)(ULONG_PTR)(h16)) + /* ----------------------------------- helper functions - */ static int list_size(char** l, int item_size) @@ -335,7 +339,7 @@ return size; } -static HANDLE __ws_async_handle = 0xdead; +static HANDLE16 __ws_async_handle = 0xdead; /* Generic async query struct. we use symbolic names for the different queries * for readability. @@ -486,7 +490,7 @@ } break; } - PostMessageA(HWND_32(aq->hWnd),aq->uMsg,aq->async_handle,size|(fail<<16)); + PostMessageA(HWND_32(aq->hWnd),aq->uMsg,(WPARAM) aq->async_handle,size|(fail<<16)); HeapFree(GetProcessHeap(),0,arg); return 0; } @@ -547,7 +551,8 @@ aq->ptr1 = ptr1; aq->int2 = int2; aq->ptr2 = ptr2; - aq->async_handle = ++__ws_async_handle; + /* avoid async_handle = 0 */ + aq->async_handle = (++__ws_async_handle ? __ws_async_handle : ++__ws_async_handle); aq->flags = flags; aq->sbuf = (SEGPTR)sbuf; aq->sbuflen = sbuflen; @@ -579,10 +584,10 @@ HANDLE WINAPI WSAAsyncGetHostByAddr(HWND hWnd, UINT uMsg, LPCSTR addr, INT len, INT type, LPSTR sbuf, INT buflen) { - TRACE("hwnd %04x, msg %04x, addr %08x[%i]\n", + TRACE("hwnd %p, msg %04x, addr %08x[%i]\n", hWnd, uMsg, (unsigned)addr , len ); - return __WSAsyncDBQuery(hWnd,uMsg,len,addr,type,NULL,sbuf,buflen, - AQ_NUMBER|AQ_COPYPTR1|AQ_WIN32|AQ_GETHOST); + return WSA_H32( __WSAsyncDBQuery(hWnd,uMsg,len,addr,type,NULL,sbuf,buflen, + AQ_NUMBER|AQ_COPYPTR1|AQ_WIN32|AQ_GETHOST)); } /*********************************************************************** @@ -604,10 +609,10 @@ HANDLE WINAPI WSAAsyncGetHostByName(HWND hWnd, UINT uMsg, LPCSTR name, LPSTR sbuf, INT buflen) { - TRACE("hwnd %04x, msg %08x, host %s, buffer %i\n", + TRACE("hwnd %p, msg %08x, host %s, buffer %i\n", hWnd, uMsg, (name)?name:"<null>", (int)buflen ); - return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,sbuf,buflen, - AQ_NAME|AQ_DUPLOWPTR1|AQ_WIN32|AQ_GETHOST); + return WSA_H32( __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,sbuf,buflen, + AQ_NAME|AQ_DUPLOWPTR1|AQ_WIN32|AQ_GETHOST)); } /*********************************************************************** @@ -629,10 +634,10 @@ HANDLE WINAPI WSAAsyncGetProtoByName(HWND hWnd, UINT uMsg, LPCSTR name, LPSTR sbuf, INT buflen) { - TRACE("hwnd %04x, msg %08x, protocol %s\n", + TRACE("hwnd %p, msg %08x, protocol %s\n", hWnd, uMsg, (name)?name:"<null>" ); - return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,sbuf,buflen, - AQ_NAME|AQ_DUPLOWPTR1|AQ_WIN32|AQ_GETPROTO); + return WSA_H32( __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,sbuf,buflen, + AQ_NAME|AQ_DUPLOWPTR1|AQ_WIN32|AQ_GETPROTO)); } @@ -654,9 +659,9 @@ HANDLE WINAPI WSAAsyncGetProtoByNumber(HWND hWnd, UINT uMsg, INT number, LPSTR sbuf, INT buflen) { - TRACE("hwnd %04x, msg %04x, num %i\n", hWnd, uMsg, number ); - return __WSAsyncDBQuery(hWnd,uMsg,number,NULL,0,NULL,sbuf,buflen, - AQ_GETPROTO|AQ_NUMBER|AQ_WIN32); + TRACE("hwnd %p, msg %04x, num %i\n", hWnd, uMsg, number ); + return WSA_H32( __WSAsyncDBQuery(hWnd,uMsg,number,NULL,0,NULL,sbuf,buflen, + AQ_GETPROTO|AQ_NUMBER|AQ_WIN32)); } /*********************************************************************** @@ -678,10 +683,10 @@ HANDLE WINAPI WSAAsyncGetServByName(HWND hWnd, UINT uMsg, LPCSTR name, LPCSTR proto, LPSTR sbuf, INT buflen) { - TRACE("hwnd %04x, msg %04x, name %s, proto %s\n", + TRACE("hwnd %p, msg %04x, name %s, proto %s\n", hWnd, uMsg, (name)?name:"<null>", (proto)?proto:"<null>"); - return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,proto,sbuf,buflen, - AQ_GETSERV|AQ_NAME|AQ_DUPLOWPTR1|AQ_DUPLOWPTR2|AQ_WIN32); + return WSA_H32( __WSAsyncDBQuery(hWnd,uMsg,0,name,0,proto,sbuf,buflen, + AQ_GETSERV|AQ_NAME|AQ_DUPLOWPTR1|AQ_DUPLOWPTR2|AQ_WIN32)); } /*********************************************************************** @@ -703,10 +708,10 @@ HANDLE WINAPI WSAAsyncGetServByPort(HWND hWnd, UINT uMsg, INT port, LPCSTR proto, LPSTR sbuf, INT buflen) { - TRACE("hwnd %04x, msg %04x, port %i, proto %s\n", + TRACE("hwnd %p, msg %04x, port %i, proto %s\n", hWnd, uMsg, port, (proto)?proto:"<null>" ); - return __WSAsyncDBQuery(hWnd,uMsg,port,NULL,0,proto,sbuf,buflen, - AQ_GETSERV|AQ_NUMBER|AQ_DUPLOWPTR2|AQ_WIN32); + return WSA_H32( __WSAsyncDBQuery(hWnd,uMsg,port,NULL,0,proto,sbuf,buflen, + AQ_GETSERV|AQ_NUMBER|AQ_DUPLOWPTR2|AQ_WIN32)); } /*********************************************************************** @@ -714,7 +719,7 @@ */ INT WINAPI WSACancelAsyncRequest(HANDLE hAsyncTaskHandle) { - FIXME("(%08x),stub\n", hAsyncTaskHandle); + FIXME("(%p),stub\n", hAsyncTaskHandle); return 0; } @@ -723,7 +728,7 @@ */ INT16 WINAPI WSACancelAsyncRequest16(HANDLE16 hAsyncTaskHandle) { - return (HANDLE16)WSACancelAsyncRequest((HANDLE)hAsyncTaskHandle); + return (INT16)WSACancelAsyncRequest(WSA_H32 (hAsyncTaskHandle)); } /*********************************************************************** Index: socket.c =================================================================== RCS file: /home/wine/wine/dlls/winsock/socket.c,v retrieving revision 1.109 diff -u -r1.109 socket.c --- socket.c 17 Oct 2002 16:43:43 -0000 1.109 +++ socket.c 28 Oct 2002 15:02:24 -0000 @@ -26,6 +26,7 @@ #include "config.h" #include "wine/port.h" +#include <assert.h> #include <stdio.h> #include <string.h> #include <sys/types.h> @@ -131,6 +132,18 @@ inet_ntoa(((struct sockaddr_in *)a)->sin_addr), \ ntohs(((struct sockaddr_in *)a)->sin_port)) +/* HANDLE<->SOCKET conversion (SOCKET is u_int). */ +#define SOCKET2HANDLE(s) ((HANDLE)(ULONG_PTR)(s)) +#define HANDLE2SOCKET(h) ((SOCKET)(ULONG_PTR)(h)) +#define HANDLE2SOCKET_S(h) __handle2socket(h) + +inline static SOCKET __handle2socket (HANDLE h) +/* Sanity check (necessary if sizeof (HANDLE) > sizeof (SOCKET)) */ +{ + assert ( SOCKET2HANDLE ( HANDLE2SOCKET (h) ) == h ); + return HANDLE2SOCKET(h); +} + /**************************************************************** * Async IO declarations ****************************************************************/ @@ -314,14 +327,15 @@ { int fd; - if (set_error( wine_server_handle_to_fd( s, GENERIC_READ, &fd, NULL, NULL ) )) return -1; + if (set_error( wine_server_handle_to_fd( SOCKET2HANDLE(s), GENERIC_READ, &fd, NULL, NULL ) )) + return -1; return fd; } inline static int _get_sock_fd_type( SOCKET s, DWORD access, enum fd_type *type, int *flags ) { int fd; - if (set_error( wine_server_handle_to_fd( s, access, &fd, type, flags ) )) return -1; + if (set_error( wine_server_handle_to_fd( SOCKET2HANDLE(s), access, &fd, type, flags ) )) return -1; if ( ( (access & GENERIC_READ) && (*flags & FD_FLAG_RECV_SHUTDOWN ) ) || ( (access & GENERIC_WRITE) && (*flags & FD_FLAG_SEND_SHUTDOWN ) ) ) { @@ -332,8 +346,8 @@ return fd; } -static void _enable_event(SOCKET s, unsigned int event, - unsigned int sstate, unsigned int cstate) +static void _enable_event( HANDLE s, unsigned int event, + unsigned int sstate, unsigned int cstate ) { SERVER_START_REQ( enable_socket_event ) { @@ -351,7 +365,7 @@ int ret; SERVER_START_REQ( get_socket_event ) { - req->handle = s; + req->handle = SOCKET2HANDLE(s); req->service = FALSE; req->c_event = 0; wine_server_call( req ); @@ -366,7 +380,7 @@ unsigned int ret; SERVER_START_REQ( get_socket_event ) { - req->handle = s; + req->handle = SOCKET2HANDLE(s); req->service = FALSE; req->c_event = 0; wine_server_call( req ); @@ -389,7 +403,7 @@ SERVER_START_REQ( get_socket_event ) { - req->handle = s; + req->handle = SOCKET2HANDLE(s); req->service = FALSE; req->c_event = 0; wine_server_set_reply( req, events, sizeof(events) ); @@ -427,7 +441,7 @@ */ BOOL WINAPI WS_LibMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("0x%x 0x%lx %p\n", hInstDLL, fdwReason, fImpLoad); + TRACE("%p 0x%lx %p\n", hInstDLL, fdwReason, fImpLoad); switch (fdwReason) { case DLL_PROCESS_ATTACH: opentype_tls_index = TlsAlloc(); @@ -1089,7 +1103,7 @@ } wsa->overlapped->InternalHigh = 0; - TRACE ( "wsa %p, ops %p, h %d, ev %d, fd %d, func %p, ov %p, uov %p, cfunc %p\n", + TRACE ( "wsa %p, ops %p, h %p, ev %p, fd %d, func %p, ov %p, uov %p, cfunc %p\n", wsa, wsa->async.ops, wsa->async.handle, wsa->async.event, wsa->async.fd, wsa->async.func, wsa->overlapped, wsa->user_overlapped, wsa->completion_func ); @@ -1196,7 +1210,7 @@ wsa->overlapped->Internal = STATUS_SUCCESS; wsa->overlapped->InternalHigh = result; TRACE ( "received %d bytes\n", result ); - _enable_event ( (SOCKET) wsa->async.handle, FD_READ, 0, 0 ); + _enable_event ( wsa->async.handle, FD_READ, 0, 0 ); return; } @@ -1204,7 +1218,7 @@ if ( err == WSAEINTR || err == WSAEWOULDBLOCK ) /* errno: EINTR / EAGAIN */ { wsa->overlapped->Internal = STATUS_PENDING; - _enable_event ( (SOCKET) wsa->async.handle, FD_READ, 0, 0 ); + _enable_event ( wsa->async.handle, FD_READ, 0, 0 ); TRACE ( "still pending\n" ); } else @@ -1288,7 +1302,7 @@ wsa->overlapped->Internal = STATUS_SUCCESS; wsa->overlapped->InternalHigh = result; TRACE ( "sent %d bytes\n", result ); - _enable_event ( (SOCKET) wsa->async.handle, FD_WRITE, 0, 0 ); + _enable_event ( wsa->async.handle, FD_WRITE, 0, 0 ); return; } @@ -1296,7 +1310,7 @@ if ( err == WSAEINTR ) { wsa->overlapped->Internal = STATUS_PENDING; - _enable_event ( (SOCKET) wsa->async.handle, FD_WRITE, 0, 0 ); + _enable_event ( wsa->async.handle, FD_WRITE, 0, 0 ); TRACE ( "still pending\n" ); } else @@ -1373,7 +1387,7 @@ goto out; } /* Try immediate completion */ - if ( WSAGetOverlappedResult ( (HANDLE) s, ovl, NULL, FALSE, NULL ) ) + if ( WSAGetOverlappedResult ( s, ovl, NULL, FALSE, NULL ) ) return 0; if ( (err = WSAGetLastError ()) == WSA_IO_INCOMPLETE ) return 0; @@ -1411,11 +1425,11 @@ close(fd); SERVER_START_REQ( accept_socket ) { - req->lhandle = s; + req->lhandle = SOCKET2HANDLE(s); req->access = GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE; req->inherit = TRUE; set_error( wine_server_call( req ) ); - as = (SOCKET)reply->handle; + as = HANDLE2SOCKET_S( reply->handle ); } SERVER_END_REQ; if (as) @@ -1524,7 +1538,7 @@ int WINAPI WS_closesocket(SOCKET s) { TRACE("socket %08x\n", s); - if (CloseHandle(s)) return 0; + if (CloseHandle(SOCKET2HANDLE(s))) return 0; return SOCKET_ERROR; } @@ -1571,7 +1585,7 @@ if (errno == EINPROGRESS) { /* tell wineserver that a connection is in progress */ - _enable_event(s, FD_CONNECT|FD_READ|FD_WRITE, + _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, FD_CONNECT|FD_READ|FD_WRITE, FD_WINE_CONNECTED|FD_WINE_LISTENING); if (_is_blocking(s)) @@ -1608,7 +1622,7 @@ connect_success: close(fd); - _enable_event(s, FD_CONNECT|FD_READ|FD_WRITE, + _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, FD_WINE_CONNECTED|FD_READ|FD_WRITE, FD_CONNECT|FD_WINE_LISTENING); return 0; @@ -2236,9 +2250,9 @@ } close(fd); if (*argp) - _enable_event(s, 0, FD_WINE_NONBLOCKING, 0); + _enable_event(SOCKET2HANDLE(s), 0, FD_WINE_NONBLOCKING, 0); else - _enable_event(s, 0, 0, FD_WINE_NONBLOCKING); + _enable_event(SOCKET2HANDLE(s), 0, 0, FD_WINE_NONBLOCKING); return 0; case WS_SIOCATMARK: @@ -2295,7 +2309,7 @@ if (listen(fd, backlog) == 0) { close(fd); - _enable_event(s, FD_ACCEPT, + _enable_event(SOCKET2HANDLE(s), FD_ACCEPT, FD_WINE_LISTENING, FD_CONNECT|FD_WINE_CONNECTED); return 0; @@ -2562,7 +2576,7 @@ /* Try immediate completion */ if ( lpOverlapped && !NtResetEvent( lpOverlapped->hEvent, NULL ) ) { - if ( WSAGetOverlappedResult ( (HANDLE) s, lpOverlapped, + if ( WSAGetOverlappedResult ( s, lpOverlapped, lpNumberOfBytesSent, FALSE, &dwFlags) ) return 0; @@ -2585,7 +2599,7 @@ { err = wsaErrno(); if ( err == WSAEWOULDBLOCK ) - _enable_event (s, FD_WRITE, 0, 0); + _enable_event (SOCKET2HANDLE(s), FD_WRITE, 0, 0); goto err_free; } @@ -2849,12 +2863,12 @@ close(fd); } - _enable_event( s, 0, 0, clear_flags ); + _enable_event( SOCKET2HANDLE(s), 0, 0, clear_flags ); if ( how > 1) WSAAsyncSelect( s, 0, 0, 0 ); return 0; error: - _enable_event( s, 0, 0, clear_flags ); + _enable_event( SOCKET2HANDLE(s), 0, 0, clear_flags ); WSASetLastError ( err ); return SOCKET_ERROR; } @@ -3247,11 +3261,11 @@ { int ret; - TRACE("%08x, hEvent %08x, lpEvent %08x\n", s, hEvent, (unsigned)lpEvent ); + TRACE("%08x, hEvent %p, lpEvent %08x\n", s, hEvent, (unsigned)lpEvent ); SERVER_START_REQ( get_socket_event ) { - req->handle = s; + req->handle = SOCKET2HANDLE(s); req->service = TRUE; req->c_event = hEvent; wine_server_set_reply( req, lpEvent->iErrorCode, sizeof(lpEvent->iErrorCode) ); @@ -3270,11 +3284,11 @@ { int ret; - TRACE("%08x, hEvent %08x, event %08x\n", s, hEvent, (unsigned)lEvent ); + TRACE("%08x, hEvent %p, event %08x\n", s, hEvent, (unsigned)lEvent ); SERVER_START_REQ( set_socket_event ) { - req->handle = s; + req->handle = SOCKET2HANDLE(s); req->mask = lEvent; req->event = hEvent; req->window = 0; @@ -3319,7 +3333,7 @@ if ( r == WAIT_OBJECT_0 ) NtSetEvent ( lpOverlapped->hEvent, NULL ); } - + if ( lpcbTransfer ) *lpcbTransfer = lpOverlapped->InternalHigh; @@ -3348,11 +3362,11 @@ { int ret; - TRACE("%x, hWnd %x, uMsg %08x, event %08lx\n", s, hWnd, uMsg, lEvent ); + TRACE("%x, hWnd %p, uMsg %08x, event %08lx\n", s, hWnd, uMsg, lEvent ); SERVER_START_REQ( set_socket_event ) { - req->handle = s; + req->handle = SOCKET2HANDLE(s); req->mask = lEvent; req->event = 0; req->window = hWnd; @@ -3404,7 +3418,7 @@ */ BOOL WINAPI WSACloseEvent(WSAEVENT event) { - TRACE ("event=0x%x\n", event); + TRACE ("event=%p\n", event); return CloseHandle(event); } @@ -3491,7 +3505,7 @@ req->flags = dwFlags; req->inherit = TRUE; set_error( wine_server_call( req ) ); - ret = (SOCKET)reply->handle; + ret = HANDLE2SOCKET_S( reply->handle ); } SERVER_END_REQ; if (ret) @@ -4005,7 +4019,7 @@ /* Try immediate completion */ if ( lpOverlapped && !NtResetEvent( lpOverlapped->hEvent, NULL ) ) { - if ( WSAGetOverlappedResult ( (HANDLE) s, lpOverlapped, + if ( WSAGetOverlappedResult ( s, lpOverlapped, lpNumberOfBytesRecvd, FALSE, lpFlags) ) return 0; @@ -4036,7 +4050,7 @@ HeapFree (GetProcessHeap(), 0, iovec); close(fd); - _enable_event(s, FD_READ, 0, 0); + _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0); return 0; @@ -4127,12 +4141,12 @@ case CF_DEFER: SERVER_START_REQ ( set_socket_deferred ) { - req->handle = s; - req->deferred = cs; + req->handle = SOCKET2HANDLE (s); + req->deferred = SOCKET2HANDLE (cs); if ( !wine_server_call_err ( req ) ) { SetLastError ( WSATRY_AGAIN ); - CloseHandle ( cs ); + WS_closesocket ( cs ); } } SERVER_END_REQ; @@ -4184,7 +4198,7 @@ * the target use the global duplicate, or we could copy a reference to us to the structure * and let the target duplicate it from us, but let's do it as simple as possible */ hProcess = OpenProcess(PROCESS_DUP_HANDLE, FALSE, dwProcessId); - DuplicateHandle(GetCurrentProcess(), s, + DuplicateHandle(GetCurrentProcess(), SOCKET2HANDLE(s), hProcess, (LPHANDLE)&lpProtocolInfo->dwCatalogEntryId, 0, FALSE, DUPLICATE_SAME_ACCESS); CloseHandle(hProcess);

3 3

Re: Bug #321: msvcrt-vfprintf-3.diff
by Dmitry Timoshkov 29 Oct '02

29 Oct '02

"Jaco Greeff" <jaco(a)puxedo.org> wrote: > Ok, try number 3. I've made the changes as requested > > * Get result length before allocating and copying with WideCharToMultiByte; > * Make intentions clear on strncat, replaced with strcat > * Removed CHAR castings to get the WCHAR formatting character. > * Fixes as requested by Dimitri and included in previous version; You are still using L prefix and redundant (WCHAR) casts. Instead of if (*szFmt == (WCHAR)L'-') and case (WCHAR)L'd': ADD_FORMAT_TYPE(VFMT_INTEGER, "d"); simple if (*szFmt == '-') and case 'd': ADD_FORMAT_TYPE(VFMT_INTEGER, "d"); will do the job. -- Dmitry.

2 1

problem building rpcrt4 on Mingw
by Steven Edwards 29 Oct '02

29 Oct '02

when building the current sources under mingw- gcc-3.2 I am getting this: rpc_binding.c:869: conflicting types for `I_RpcBindingSetAsync' ../../include/rpcdcep.h:135: previous declaration of `I_RpcBindingSetAsync' I dont really have much time to look at it now but if its a mingw only problem I can look at it tonight. Thanks Steven

2 1

Re: dlls/advapi32/registry.c: RegFlushKey implementation
by Eric Pouech 29 Oct '02

29 Oct '02

> Changelog: > * dlls/advapi32/registry.c: Jaco Greeff <jaco(a)puxedo.org> > - Implementation of the RegFlushKey function it seems however that RegFlushKey shouldn't close the handle see for example (at the bottom of list... it seems this API confuses a lots of people) http://groups.google.com/groups?hl=fr&lr=&ie=UTF-8&threadm=39067129.96B55F7…

2 1

Listview: what next?
by Dimitrie O. Paun 29 Oct '02

29 Oct '02

Folks, I now consider the listview rewrite complete. What this means: -- current revision (1.325) may become a reference rev for a while -- bugs for the listview should be submitted through Bugzilla NOw, I know there are outstanding bugs. Most likely, there would always be. But i have to draw the line somewhere. I would like everybody that submitted bugs/feature requests/etc. to retest with the latest code in CVS, and submit a bug at http://bugs.winehq.org: 1. assign it to me (dpaun(a)rogers.com) 2. try to find the revision that caused it 3. screenshots of visual problems help alot Due to my hand problems, I will not be as active these days. But I will be glad to review problems, and think about solving them, so please fill out those bug reports! :) Again, having the bugs in Bugzilla will help me greatly in managing them. -- Dimi.

1 0

wwn141
by Jürgen Schmied 28 Oct '02

28 Oct '02

Just a comment to the mentioned use of LPC to ememinate the server part of rpc: Since wine uses a server every lpc-call causes a lot of context switching. LPC with the wine server will never be as fast as on winnt. -The client would have to wait on the client side what means a client call needs 2 roundtrips to the server. - There are 3 processes playing a role: client, wine-server and the server. Where winnt needs only a context switch between the client and the server and one back, we need at least 6: client -> wineserver (copies request-message to wineserver) wineserver -> client (gives wait handle back) wineserver->server (server wakes up on it's wait handle and gets request-message) ... server is working now ... server->wineserver (server copies replay-message to wineserver) client->wineserver (client is waken up and calls wineserver for data) wineserver->client (client gets replay-message from wineserver) So I would consider a different IPC mechanism for this. Or could we implement LPC in a better way? juergen --- juergen.schmied(a)debitel.net

4 3

Re: Interrupts / Improve winedos infrastructure
by Alexandre Julliard 28 Oct '02

28 Oct '02

Jukka Heinonen <jhei(a)iki.fi> writes: > Changelog: > Add routines for manipulating protected mode interrupt handlers to > winedos dll. Add routine for checking if process is Windows process. > Fix DOSVM_IsDos32 interface. Move real mode interrupt handler > manipulation routines to interrupts.c. I have applied it, but I think you should change DOSVM_GetBuiltinHandler to use a static function table; there's no need to use GetProcAddress on winedos.dll itself, this is only necessary for 16-bit entry points. -- Alexandre Julliard julliard(a)winehq.com

1 0

open-source friendly network card vendor
by David Christensen 28 Oct '02

28 Oct '02

wine-devel(a)winehq.com: I've looked for a forum, mailing list, or newsgroup specifically oriented for network card device driver development, but haven't found one. Any suggestions? I'm looking for an open-source friendly network card vendor -- e.g. the vendor publicly discloses the technical information required to write device drivers. Does anybody have any recommendations? If so, can you please provide URL's to their technical information? TIA, David Christensen dpchrist(a)holgerdanske.com

1 0

RE: MSVCRT: added support for re-throwing exceptions
by Patrik Stridvall 28 Oct '02

28 Oct '02

> "Patrik Stridvall" <ps(a)leissner.se> wrote: > > > [1] All tests currenly doesn't compile quite yet, but the > > infrastructure is in place. I haven't had much time to look at > > it yet. Help would be nice... > > Patrik, what kind of help do you need regarding this issue? > I'll gladly help when I have time. [I assume any reader is knows how to use MS VC++, Especially how to use workspaces with multi projects] First of all you need two computers. One with Windows and Microsoft Visual C++ 6.0 One with some Unix supported by Wine and Samba installed. Unpack (or better download with CVS) Wine on the Unix computer. cd wine ./tools/winapi/msvcmaker Export the wine directory on the Unix computer using Samba and mount it on the Windows computer. Open the file winetest.dsw in the wine directory (generated by msvcmaker) using Microsoft Visual C++. Now you can compile and run the tests. Or rather you should be able to. All the tests doesn't compile. That what I want help with. The second step would be actually getting all the tests to not fail as well... PS. Note that you can try to compile all of Wine as well by opening wine.dsw instead. Of course that doesn't compile either but that have less priority than the tests...

1 0

Tab Control
by Fabian Cenedese 28 Oct '02

28 Oct '02

Hi When I try to use the tab control in a VB6 program it exits with an error dialog: "Can't load 'SSTab' from TabCtl32.ocx. TabCtl32.ocx is probably too old." This is with builtin dlls. It works when I set ole.dll and oleaut32.dll to native. Winedbg doesn't give more information, it just looks like: --- (snip) --- No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\VB6DE.DLL' (0x66630000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\TABCTL32.OCX' (0x212f0000) (here comes the error dialog, OK) Invalid address for breakpoint 1, disabling it Invalid address for breakpoint 2, disabling it Process of pid=08112ba8 has terminated I also made some traces with +ole but I couldn't see any reasons why it fails. Also a bt at the moment of the popup doesn't show much, it's all inside MSVBVM60.DLL. If somebody wants to try, here's a small test project and exe (VB6). The TabCtl32.ocx in my case is from SP4. I don't know if this matters. http://www.indel.ch/ftp/TabError.zip Thanks bye Fabi

1 0

RE: MSVCRT: added support for re-throwing exceptions
by Patrik Stridvall 28 Oct '02

28 Oct '02

> LICENSE: LGPL > > If you compile the following code with Visual C++ using the > /MD option (so > that it uses msvcrt.dll) > > class CExceptionClass > { > public: > CExceptionClass() {number=0;} > long number; > }; > > void doSomething() > { > try { > throw CExceptionClass(); > } catch(...) { > throw; > } > } > > int main(int argc, char* argv[]) > { > try { > doSomething(); > } catch(CExceptionClass& e) { > printf("%d\n",e.number); > } > return 0; > } > > and run it under WINE, it will crash. It would probably be a good idea to submit this as a test in order to check that this will work in the future. However this is not a normal test because of two reasons 1. It is a C++ only test 2. It is only meaningful if a binary compiled by MS VC++ is run under Wine. Anyway, since very recently thanks to ./tools/winapi/msvcmaker it is possible to compile[1] the Wine tests using MS VC/C++ and run them under Windows. Obviously the binaries generated should be able to run under Wine as well... [1] All tests currenly doesn't compile quite yet, but the infrastructure is in place. I haven't had much time to look at it yet. Help would be nice...

2 1

Re: Listview Z8
by Jeff Smith 28 Oct '02

28 Oct '02

(note that I am presently at a computer *not* set up for i18n) I think Hebrew was made to go RTL just to give programmers headaches. Actually, I'm trying to learn Hebrew, and I keep catching myself trying to write it LTR. Now if Dimi went to the Hebrew alephbet, would he have to change from Z1, Z2,... to 1{aleph}, 2{aleph},... -- Jeff S. >From: Shachar Shemesh <wine-devel(a)sun.consumer.org.il> > >That's why I included them here, so you can copy and paste.... > >Just remeber to set your locale to either Iso-8859-8 or UTF-8, or you'll >lose the special chars. Even more tricky, if your email client supports >BiDi (Your'e using kmail, but only the one that came with KDE-3 did, and I >don't know what version that was), then the first character, "×", is on >the *right* `-) > > Shachar > > >Dimitrie O. Paun wrote: > >>On October 27, 2002 12:14 pm, Shachar Shemesh wrote: >> >> >>>"×××××××××××××× ×¡×¢×€×Š×§×š×©×ª". Very useful `-) >>> >>> >> >>Very cool man, but, ..., hmm, ..., I don't have a Hebrew keyboard. ;) _________________________________________________________________ Get a speedy connection with MSN Broadband. Join now! http://resourcecenter.msn.com/access/plans/freeactivation.asp

2 1

[OT] Announcing Aztech AZF3328/PCI168 sound driver
by Andreas Mohr 28 Oct '02

28 Oct '02

Hi all, the reason I've been rather quiet on the wine-patches side is that I've been busy writing an ALSA driver for the entirely UNDOCUMENTED and UNSUPPORTED PCI soundcard Aztech PCI168. This has been consuming vast amounts of weeks (all in all I'd say in compressed form 4 weeks of 2 hours per evening). This driver (azt3328.c) is more or less working now (some minor quirks remain) and has just been committed to ALSA CVS today. I don't expect anyone here to have access to such a card, but if you have, then you might want to give it a whirl ;-) Greetings, Andi

1 0

Re: Segmentation Fault: A possibility???
by Kye Lewis 28 Oct '02

28 Oct '02

Hi, Sorry for posting all of this to the wine-devel group continuously, but I may have found the problem (or I may not have) but either way I need some help. I have run wine --debugmsg +relay acrord32.exe and read the resulting file. The last thing that comes up is: wineoss.drv I had a quick look through the specific function's code (The actual log entry is: Call wineoss.drv.DriverProc(00000000,403e2858,00000001,00000000,00000000) ret=40c9d2b5 ) Recently in the KDE Control Panel's Sound options, I ticked the 'Use Full Duplex' option - and ever since that it hasn't worked. Could this have been the reason? I can't look and see if it was now, i'll have to restart linux, and right now i'm the internet server on the network - so no restarts for me :( -- Thanks, Kye Lewis kyethespy(a)liquid2k.com

2 1

Bad hand
by Dimitrie O. Paun 28 Oct '02

28 Oct '02

Sorry everybody, My right hand hurts badly, I'll be off for a few days... -- Dimi.

2 1

Re: Bug #321: dlls/msvct/vf[w]printf functions
by Dmitry Timoshkov 28 Oct '02

28 Oct '02

"Jaco Greeff" <jaco(a)puxedo.org> wrote: > Changelog: > * dlls/msvcrt/vfprintf.c, dlls/msvcrt/Makefile.in, > dlls/msvcrt/tests/printf.c, dlls/msvcrt/tests/Makefile.in: Jaco Greeff > <jaco(a)puxedo.org> > - Full implementation to allow for %C & %S in all printf related functions > - Test case for the printf functions to test all known cases of formatting > (test case based on example found on MSDN site) I'm sorry for returning to that topic again and again, but it's really does matter. > +static void test_printf(void) > +{ > + FILE* f; > + char ch = 'a', *string = "computer"; > + int count = -9234; > + double fp = 251.7366; > + wchar_t wch = L'w', *wstring = L"Unicode"; > + void *p = 0x1234ABCD; Please, 1. use explicit WCHAR type instead of wchar_t. 2. explicitly encode unicode strings. > wctomb(ch, wch); 3. directly use Win32 conversion APIs (WideCharToMultiByte in this case). Take a look at other places in the Wine source how to do it properly. Thanks. -- Dmitry.

3 6

Re: Listview Z8
by Dimitrie O. Paun 28 Oct '02

28 Oct '02

On October 27, 2002 11:28 am, Dimitrie O. Paun wrote: > ChangeLog > Mark immutable objects as const. Fix inconsisten *-style. This one, of course, is Z7, not Z8. Hmm, now I have problems with digits, on top of the alphabet... And NO, we used to do a _lot_ of math in Romania! :P -- Dimi.

3 4

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