April 2003 - Wine-Devel - list.winehq.org

re: need you experts to confirm this about wine and mingw
by Dan Kegel April 26, 2003

April 26, 2003

shorthair_kai(a)yahoo.com.cn wrote: > I try to compile wine in mingw, is it possible? > Can the compiled wine run in mingw? What are you trying to do? We really can't advise you until we understand why you're trying to build wine in mingw. Please tell us a story about why you decided to try this, and what you hope to get out of it. > What I need? > I installed the following package on my win2000: > MinGW-2.0.0-3.exe > MSYS-1.0.8.exe > msysDTK-1.0.1.exe > gdb-5.2.1.1-1.exe > is it enough? > > But when I try, i got the following error: > configure: error: no suitable bison/yacc found. Please > install the 'bison' package. > Where can I get the package? Since I have no idea what you're trying to really do, and I've never compiled Wine under MinGW or Cygwin, take this advice with a grain of salt: You may be happier building under cygwin, which comes with bison. MinGW is like a fork of cygwin. Only difference is you'll need the --mno-cygwin option to the gcc commandline to avoid linking with cygwin.dll. - Dan - Dan -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045

1 0

Debugging
by Ann and Jason Edmeades April 25, 2003

April 25, 2003

2 questions... 1. Is there any macro to dump out a hex dump of memory, eg. TRACE_DUMP("Memory", pMem, numBytes); If not, can I add one (inline in debug.h?) 2. When debugging using winedbg, is there any way to view the contents of a lot of memory in one go (eg. hex dump of 256 bytes)? Jason

4 4

New Server?
by hatky April 25, 2003

April 25, 2003

Since the Slash Dot pice on Wine the server is dead half the day.... Why not get the site on a new server I know what you are going to say: "Have you got one?" :) How about wine.sf.net? You already have a project open on source forge is it that difficult to move the site to their server? I THINK they can handle the load I assume there is some reason it has not been done but if there is not any meager issue I think it will be done at least for now (till the users stop coming :) ) What do you think? Hatky. __________________________________________________ Do you Yahoo!? The New Yahoo! Search - Faster. Easier. Bingo http://search.yahoo.com

3 3

[FYI] Mozilla & MinGW
by Dimitrie O. Paun April 25, 2003

April 25, 2003

Folks, Mozilla officially builds on MinGW: http://www.mozilla.org/build/win32.html#ss2.2 Bug #134113 tracking this effort was closed: http://bugzilla.mozilla.org/show_bug.cgi?id=134113 Unfortunately, the new windres I was working on did not make it in time for this release, so a bunch of ugly hacks had to be checked in to work around various problems, but hopefully we'll be able to remove them in a few weeks, when the next binutils package is released. We can now start looking into the real Winelib port. :) -- Dimi.

1 0

help, service thread, pthread, segv
by KK singh April 25, 2003

April 25, 2003

hi, am a newbee and in need of help about wine, following are my querries. using wine20030408 on linux rhl 8.0 1. wine-devel doc says that the code for service thread should be in scheduler/services.c, I could not locate the file in my source code. 2. scheduler/pthread.c baffled me. It seems a pthread implementation using windows code. The header says. /* * pthread emulation for re-entrant libcs * * We can't use pthreads directly, so why not let libcs * that want pthreads use Wine's own threading */ Why cannot we use pthreads directly ? 3. I get a SIGBUS and repeated SIGSEGV, keeps coming, while running wine under gdb, this segv or sigbus is not normally visible, I mean running without gdb. This must be affecting the performance severly ? How can i know which thread is causing this ? gdb version is 5.2.1-4 4. The stack trace of sisegv looks like ..... for SIGBUS #0 0x4207be77 in memset () from /lib/i686/libc.so.6 #1 0x00000010 in ?? () #2 0x400c4bf8 in NtAllocateVirtualMemory (process=0xffffffff, ret=0x40722854, addr=0x41920000, size_ptr=0x40722858, type=4096, protect=64) at virtual.c:1045 #3 0x400b6b57 in HEAP_FindFreeBlock (heap=0x418f0000, size=65040, ppSubHeap=0x40722884) at heap.c:340 #4 0x400b74a5 in RtlAllocateHeap (heap=0x418f0000, flags=3, size=65040) at heap.c:1102 #5 0x004014f6 in ?? () ========================================== FOR SIGSEGV #0 RtlImageNtHeader (hModule=0x0) at loader.c:1242 #1 0x400ba560 in RtlImageDirectoryEntryToData (module=0x0, image=1, dir=0, size=0x40722650) at loader.c:1270 #2 0x400b97c7 in LdrGetProcedureAddress (module=0x0, name=0x4072267c, ord=0, address=0x40722678) at loader.c:754 #3 0x4007c8f9 in GetProcAddress (hModule=0x0, function=0xac46c4 "IID_ITextServices") at ../../loader/module.c:1053 #4 0x0046b5ed in ?? () #5 0x006074d7 in ?? () #6 0x00467708 in ?? () #7 0x00469e99 in ?? () #8 0x00607865 in ?? () #9 0x004671ae in ?? () #10 0x004610f1 in ?? () #11 0x00466ffa in ?? () #12 0x00466fa5 in ?? () #13 0x00463e07 in ?? () #14 0x0040b610 in ?? () #15 0x00463c22 in ?? () #16 0x00431979 in ?? () #17 0x00462662 in ?? () #18 0x00463a94 in ?? () #19 0x00463a0d in ?? () #20 0x004631b2 in ?? () ---------------------------------------- Please help me to know what are these functions ?? () tia -kks __________________________________________________ Do you Yahoo!? The New Yahoo! Search - Faster. Easier. Bingo http://search.yahoo.com

2 1

Re: wintab32 (from CrossOver Office)
by Mike Hearn April 25, 2003

April 25, 2003

Thanks, I already have some code in the form of libegg, but I suspect Chris' code might be clearer. Chris - if you have any tips or could send me that code, it'd be good. Just remember that if you start getting it to work with Wine, please drop me a line. On Fri, 2003-04-25 at 04:09, Mike McCormack wrote: > Hi Mike, > > Now is a good time to mention to you that Chris Hoff did some work on > getting XEmbed to work with Wine. As far as I know, he had a standalone > program that could put something in the gnome toolbar, but no Wine code. > > You might want to write him an email to see how far he got with it. > > Mike > > Mike Hearn wrote: > > > I don't really have any, I'm much happier now that the policy has been > > made clear. It seems fine to me. No promised on xembed though ;) > -- Mike Hearn <m.hearn(a)signal.qinetiq.com> QinetiQ - Malvern Technology Center

1 0

wintab32 (from CrossOver Office)
by Aric Stewart April 25, 2003

April 25, 2003

Changelog: Adds wintab32 support using XInput. Merged from CrossOver Office. I am including this on the wine-devel list because there was discussion and comment about it there. -aric Index: dlls/wintab32/Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/wintab32/Makefile.in,v retrieving revision 1.2 diff -u -r1.2 Makefile.in --- dlls/wintab32/Makefile.in 23 Mar 2003 20:00:02 -0000 1.2 +++ dlls/wintab32/Makefile.in 23 Apr 2003 13:55:27 -0000 @@ -3,7 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wintab32.dll -IMPORTS = kernel32 +IMPORTS = kernel32 user32 ALTNAMES = wintab.dll LDDLLFLAGS = @LDDLLFLAGS@ @@ -13,7 +13,8 @@ C_SRCS = \ context.c \ - manager.c + manager.c \ + wintab32.c C_SRCS16 = \ wintab16.c Index: dlls/wintab32/context.c =================================================================== RCS file: /home/wine/wine/dlls/wintab32/context.c,v retrieving revision 1.1 diff -u -r1.1 context.c --- dlls/wintab32/context.c 17 Dec 2002 01:49:16 -0000 1.1 +++ dlls/wintab32/context.c 23 Apr 2003 13:55:27 -0000 @@ -2,6 +2,7 @@ * Tablet Context * * Copyright 2002 Patrik Stridvall + * Copyright 2003 Codeweavers, Aric Stewart * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,27 +20,737 @@ */ #include "config.h" +#include <stdio.h> +#include <stdlib.h> -#include "windef.h" #include "winbase.h" +#include "windef.h" #include "winerror.h" +#include "winuser.h" +#include "user.h" #include "wintab.h" +#include "wintab_internal.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wintab32); +/* + * Documentation found at + * http://www.csl.sony.co.jp/projects/ar/restricted/wintabl.html + */ + +#define CURSORMAX 10 + +BOOL gLoaded= FALSE; +LOGCONTEXTA gSysContext; +WTI_CURSORS_INFO gSysCursor[CURSORMAX]; +WTI_DEVICES_INFO gSysDevice; +INT gNumCursors; + +LPOPENCONTEXT gOpenContexts = NULL; +INT gContextCount = 0; +HCTX gTopContext = (HCTX)0xc00; + +extern HWND hwndDefault; +extern CRITICAL_SECTION csTablet; + +char* DUMPBITS(int x, char* buf) +{ + strcpy(buf,"{"); + if (x&PK_CONTEXT) strcat(buf,"PK_CONTEXT "); + if (x&PK_STATUS) strcat(buf, "PK_STATUS "); + if (x&PK_TIME) strcat(buf, "PK_TIME "); + if (x&PK_CHANGED) strcat(buf, "PK_CHANGED "); + if (x&PK_SERIAL_NUMBER) strcat(buf, "PK_SERIAL_NUMBER "); + if (x&PK_CURSOR) strcat(buf, "PK_CURSOR "); + if (x&PK_BUTTONS) strcat(buf, "PK_BUTTONS "); + if (x&PK_X) strcat(buf, "PK_X "); + if (x&PK_Y) strcat(buf, "PK_Y "); + if (x&PK_Z) strcat(buf, "PK_Z "); + if (x&PK_NORMAL_PRESSURE) strcat(buf, "PK_NORMAL_PRESSURE "); + if (x&PK_TANGENT_PRESSURE) strcat(buf, "PK_TANGENT_PRESSURE "); + if (x&PK_ORIENTATION) strcat(buf, "PK_ORIENTATION "); + if (x&PK_ROTATION) strcat(buf, "PK_ROTATION "); + strcat(buf, "}"); + return buf; +} + +static inline void DUMPPACKET(WTPACKET packet) +{ + TRACE("pkContext: 0x%x pkStatus: 0x%x pkTime : 0x%x pkChanged: 0x%x pkSerialNumber: 0x%x pkCursor : %i pkButtons: %x pkX: %li pkY: %li pkZ: %li pkNormalPressure: %i pkTangentPressure: %i pkOrientation: (%i,%i,%i) pkRotation: (%i,%i,%i)\n" +,(UINT)packet.pkContext, + (UINT)packet.pkStatus, + (UINT)packet.pkTime, + (UINT)packet.pkChanged, + packet.pkSerialNumber, + packet.pkCursor, + (UINT)packet.pkButtons, + packet.pkX, + packet.pkY, + packet.pkZ, + packet.pkNormalPressure, + packet.pkTangentPressure, + packet.pkOrientation.orAzimuth, + packet.pkOrientation.orAltitude, packet.pkOrientation.orTwist, + packet.pkRotation.roPitch, + packet.pkRotation.roRoll, packet.pkRotation.roYaw); +} + +static inline void DUMPCONTEXT(LOGCONTEXTA lc) +{ + CHAR mmsg[4000]; + CHAR bits[100]; + CHAR bits1[100]; + CHAR bits2[100]; + + sprintf(mmsg,"%s, %x, %x, %x, %x, %x, %x, %x%s, %x%s, %x%s, %x, %x, %i, %i, %i, %li ,%li, %li, %li, %li, %li,%li, %li, %li, %li, %li, %li, %i, %i, %i, %i, %i %li %li\n", + debugstr_a(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, +lc.lcDevice, lc.lcPktRate, (UINT)lc.lcPktData, DUMPBITS(lc.lcPktData,bits), +(UINT)lc.lcPktMode, DUMPBITS(lc.lcPktMode,bits1), (UINT)lc.lcMoveMask, +DUMPBITS(lc.lcMoveMask,bits2), (INT)lc.lcBtnDnMask, (INT)lc.lcBtnUpMask, +(INT)lc.lcInOrgX, (INT)lc.lcInOrgY, (INT)lc.lcInOrgZ, lc.lcInExtX, lc.lcInExtY, +lc.lcInExtZ, lc.lcOutOrgX, lc.lcOutOrgY, lc.lcOutOrgZ, lc.lcOutExtX, +lc.lcOutExtY, lc.lcOutExtZ, lc.lcSensX, lc.lcSensY, lc.lcSensZ, lc.lcSysMode, +lc.lcSysOrgX, lc.lcSysOrgY, lc.lcSysExtX, lc.lcSysExtY, lc.lcSysSensX, +lc.lcSysSensY); + TRACE("context: %s",mmsg); +} + + +/* Find an open context given the handle */ +LPOPENCONTEXT TABLET_FindOpenContext(HCTX hCtx) +{ + LPOPENCONTEXT ptr = gOpenContexts; + while (ptr) + { + if (ptr->handle == hCtx) return ptr; + ptr = ptr->next; + } + return NULL; +} + +static void LoadTablet() +{ + TRACE("Initilizing the tablet to hwnd 0x%x\n",(INT)hwndDefault); + gLoaded= TRUE; + memset(&gSysContext,0,sizeof(LOGCONTEXTA)); + memset(&gSysDevice,0,sizeof(WTI_DEVICES_INFO)); + memset(gSysCursor,0,sizeof(WTI_CURSORS_INFO)*gNumCursors); + gNumCursors = pLoadTabletInfo(&gSysContext, &gSysDevice, gSysCursor, + CURSORMAX, hwndDefault); +} + +int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam, + LPARAM lParam, BOOL send_always) +{ + if ((send_always) || (newcontext->context.lcOptions & CXO_MESSAGES)) + { + TRACE("Posting message %x to %x\n",msg, (UINT)newcontext->hwndOwner); + return PostMessageA(newcontext->hwndOwner, msg, wParam, lParam); + } + return 0; +} + +static inline DWORD ScaleForContext(DWORD In, DWORD InOrg, DWORD InExt, DWORD + OutOrg, DWORD OutExt) +{ + if (((InExt > 0 )&&(OutExt > 0)) || ((InExt<0) && (OutExt < 0))) + return ((In - InOrg) * abs(OutExt) / abs(InExt)) + OutOrg; + else + return ((abs(InExt) - (In - InOrg))*abs(OutExt) / abs(InExt)) + OutOrg; +} + +LPOPENCONTEXT FindOpenContext(HWND hwnd) +{ + LPOPENCONTEXT ptr=NULL; + ptr = gOpenContexts; + while (ptr) + { + TRACE("Trying Context %lx (%x %x)\n",(LONG)ptr->handle,(INT)hwnd, + (INT)ptr->hwndOwner); + + if (ptr->hwndOwner == hwnd) + return ptr; + } + return NULL; +} + +LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) +{ + LPOPENCONTEXT ptr=NULL; + + EnterCriticalSection(&csTablet); + + ptr = gOpenContexts; + while (ptr) + { + TRACE("Trying Queue %lx (%x %x)\n",(LONG)ptr->handle,(INT)hwnd, + (INT)ptr->hwndOwner); + + if (ptr->hwndOwner == hwnd) + { + int tgt; + if (!ptr->enabled) + { + ptr = ptr->next; + continue; + } + + tgt = ptr->PacketsQueued; + + packet->pkContext = ptr->handle; + + /* translate packet data to the context */ + + /* Scale as per documentation */ + packet->pkY = ScaleForContext(packet->pkY, ptr->context.lcInOrgY, + ptr->context.lcInExtY, ptr->context.lcOutOrgY, + ptr->context.lcOutExtY); + + packet->pkX = ScaleForContext(packet->pkX, ptr->context.lcInOrgX, + ptr->context.lcInExtX, ptr->context.lcOutOrgX, + ptr->context.lcOutExtX); + + /* flip the Y axis */ + if (ptr->context.lcOutExtY > 0) + packet->pkY = ptr->context.lcOutExtY - packet->pkY; + + DUMPPACKET(*packet); + + if (tgt + 1 == ptr->QueueSize) + { + TRACE("Queue Overflow %p\n",ptr->handle); + packet->pkStatus = TPS_QUEUE_ERR; + } + else + { + TRACE("Placed in queue %p index %i\n",ptr->handle,tgt); + memcpy(&ptr->PacketQueue[tgt], packet, sizeof + (WTPACKET)); + ptr->PacketsQueued++; + + if (ptr->ActiveCursor != packet->pkCursor) + { + ptr->ActiveCursor = packet->pkCursor; + if (ptr->context.lcOptions & CXO_CSRMESSAGES) + TABLET_PostTabletMessage(ptr, WT_CSRCHANGE, + (WPARAM)packet->pkSerialNumber, (LPARAM)ptr->handle, + FALSE); + } + } + break; + } + ptr = ptr->next; + } + LeaveCriticalSection(&csTablet); + TRACE("Done (%p)\n",ptr); + return ptr; +} + +int static inline CopyTabletData(LPVOID target, LPVOID src, INT size) +{ + memcpy(target,src,size); + return(size); +} + +static INT TABLET_FindPacket(LPOPENCONTEXT context, UINT wSerial, + LPWTPACKET *pkt) +{ + int loop; + int index = -1; + for (loop = 0; loop < context->PacketsQueued; loop++) + if (context->PacketQueue[loop].pkSerialNumber == wSerial) + { + index = loop; + *pkt = &context->PacketQueue[loop]; + break; + } + + TRACE("%i .. %i\n",context->PacketsQueued,index); + + return index; +} + + +static LPVOID TABLET_CopyPacketData(LPOPENCONTEXT context, LPVOID lpPkt, + LPWTPACKET wtp) +{ + LPBYTE ptr; + CHAR bits[100]; + + ptr = lpPkt; + TRACE("Packet Bits %s\n",DUMPBITS(context->context.lcPktData,bits)); + + if (context->context.lcPktData & PK_CONTEXT) + ptr+=CopyTabletData(ptr,&wtp->pkContext,sizeof(HCTX)); + if (context->context.lcPktData & PK_STATUS) + ptr+=CopyTabletData(ptr,&wtp->pkStatus,sizeof(UINT)); + if (context->context.lcPktData & PK_TIME) + ptr+=CopyTabletData(ptr,&wtp->pkTime,sizeof(LONG)); + if (context->context.lcPktData & PK_CHANGED) + ptr+=CopyTabletData(ptr,&wtp->pkChanged,sizeof(WTPKT)); + if (context->context.lcPktData & PK_SERIAL_NUMBER) + ptr+=CopyTabletData(ptr,&wtp->pkChanged,sizeof(UINT)); + if (context->context.lcPktData & PK_CURSOR) + ptr+=CopyTabletData(ptr,&wtp->pkCursor,sizeof(UINT)); + if (context->context.lcPktData & PK_BUTTONS) + ptr+=CopyTabletData(ptr,&wtp->pkButtons,sizeof(DWORD)); + if (context->context.lcPktData & PK_X) + ptr+=CopyTabletData(ptr,&wtp->pkX,sizeof(DWORD)); + if (context->context.lcPktData & PK_Y) + ptr+=CopyTabletData(ptr,&wtp->pkY,sizeof(DWORD)); + if (context->context.lcPktData & PK_Z) + ptr+=CopyTabletData(ptr,&wtp->pkZ,sizeof(DWORD)); + if (context->context.lcPktData & PK_NORMAL_PRESSURE) + ptr+=CopyTabletData(ptr,&wtp->pkNormalPressure,sizeof(UINT)); + if (context->context.lcPktData & PK_TANGENT_PRESSURE) + ptr+=CopyTabletData(ptr,&wtp->pkTangentPressure,sizeof(UINT)); + if (context->context.lcPktData & PK_ORIENTATION) + ptr+=CopyTabletData(ptr,&wtp->pkOrientation,sizeof(ORIENTATION)); + if (context->context.lcPktData & PK_ROTATION) + ptr+=CopyTabletData(ptr,&wtp->pkRotation,sizeof(ROTATION)); + + //TRACE("Copied %i bytes\n",(INT)ptr - (INT)lpPkt); + return ptr; +} + +static VOID TABLET_BlankPacketData(LPOPENCONTEXT context, LPVOID lpPkt, INT n) +{ + int rc = 0; + + if (context->context.lcPktData & PK_CONTEXT) + rc +=sizeof(HCTX); + if (context->context.lcPktData & PK_STATUS) + rc +=sizeof(UINT); + if (context->context.lcPktData & PK_TIME) + rc += sizeof(LONG); + if (context->context.lcPktData & PK_CHANGED) + rc += sizeof(WTPKT); + if (context->context.lcPktData & PK_SERIAL_NUMBER) + rc += sizeof(UINT); + if (context->context.lcPktData & PK_CURSOR) + rc += sizeof(UINT); + if (context->context.lcPktData & PK_BUTTONS) + rc += sizeof(DWORD); + if (context->context.lcPktData & PK_X) + rc += sizeof(DWORD); + if (context->context.lcPktData & PK_Y) + rc += sizeof(DWORD); + if (context->context.lcPktData & PK_Z) + rc += sizeof(DWORD); + if (context->context.lcPktData & PK_NORMAL_PRESSURE) + rc += sizeof(UINT); + if (context->context.lcPktData & PK_TANGENT_PRESSURE) + rc += sizeof(UINT); + if (context->context.lcPktData & PK_ORIENTATION) + rc += sizeof(ORIENTATION); + if (context->context.lcPktData & PK_ROTATION) + rc += sizeof(ROTATION); + + rc *= n; + memset(lpPkt,0,rc); +} + + /*********************************************************************** * WTInfoA (WINTAB32.20) */ UINT WINAPI WTInfoA(UINT wCategory, UINT nIndex, LPVOID lpOutput) { - FIXME("(%u, %u, %p): stub\n", wCategory, nIndex, lpOutput); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - - return 0; + int rc = 0; + LPWTI_CURSORS_INFO tgtcursor; + TRACE("(%u, %u, %p)\n", wCategory, nIndex, lpOutput); + + if (gLoaded == FALSE) + LoadTablet(); + switch(wCategory) + { + case 0: + /* return largest nessecary buffer */ + TRACE("%i cursors\n",gNumCursors); + if (gNumCursors>0) + { + FIXME("Return proper size\n"); + return 200; + } + else + return 0; + break; + case WTI_INTERFACE: + switch (nIndex) + { + WORD version; + case IFC_WINTABID: + strcpy(lpOutput,"Wine Wintab 1.1"); + rc = 16; + break; + case IFC_SPECVERSION: + version = (0x01) | (0x01 << 8); + rc = CopyTabletData(lpOutput, &version,sizeof(WORD)); + break; + case IFC_IMPLVERSION: + version = (0x00) | (0x01 << 8); + rc = CopyTabletData(lpOutput, &version,sizeof(WORD)); + break; + default: + FIXME("WTI_INTERFACE unhandled index %i\n",nIndex); + rc = 0; + + } + case WTI_DEFSYSCTX: + case WTI_DDCTXS: + case WTI_DEFCONTEXT: + DUMPCONTEXT(gSysContext); + switch (nIndex) + { + case 0: + memcpy(lpOutput, &gSysContext, + sizeof(LOGCONTEXTA)); + rc = sizeof(LOGCONTEXTA); + break; + case CTX_NAME: + rc = CopyTabletData(lpOutput, &gSysContext.lcName, + strlen(gSysContext.lcName)+1); + break; + case CTX_OPTIONS: + rc = CopyTabletData(lpOutput, &gSysContext.lcOptions, + sizeof(UINT)); + break; + case CTX_STATUS: + rc = CopyTabletData(lpOutput, &gSysContext.lcStatus, + sizeof(UINT)); + break; + case CTX_LOCKS: + rc= CopyTabletData (lpOutput, &gSysContext.lcLocks, + sizeof(UINT)); + break; + case CTX_MSGBASE: + rc = CopyTabletData(lpOutput, &gSysContext.lcMsgBase, + sizeof(UINT)); + break; + case CTX_DEVICE: + rc = CopyTabletData(lpOutput, &gSysContext.lcDevice, + sizeof(UINT)); + break; + case CTX_PKTRATE: + rc = CopyTabletData(lpOutput, &gSysContext.lcPktRate, + sizeof(UINT)); + break; + case CTX_PKTMODE: + rc = CopyTabletData(lpOutput, &gSysContext.lcPktMode, + sizeof(WTPKT)); + break; + case CTX_MOVEMASK: + rc = CopyTabletData(lpOutput, &gSysContext.lcMoveMask, + sizeof(WTPKT)); + break; + case CTX_BTNDNMASK: + rc = CopyTabletData(lpOutput, &gSysContext.lcBtnDnMask, + sizeof(DWORD)); + break; + case CTX_BTNUPMASK: + rc = CopyTabletData(lpOutput, &gSysContext.lcBtnUpMask, + sizeof(DWORD)); + break; + case CTX_INORGX: + rc = CopyTabletData(lpOutput, &gSysContext.lcInOrgX, + sizeof(LONG)); + break; + case CTX_INORGY: + rc = CopyTabletData(lpOutput, &gSysContext.lcInOrgY, + sizeof(LONG)); + break; + case CTX_INORGZ: + rc = CopyTabletData(lpOutput, &gSysContext.lcInOrgZ, + sizeof(LONG)); + break; + case CTX_INEXTX: + rc = CopyTabletData(lpOutput, &gSysContext.lcInExtX, + sizeof(LONG)); + break; + case CTX_INEXTY: + rc = CopyTabletData(lpOutput, &gSysContext.lcInExtY, + sizeof(LONG)); + break; + case CTX_INEXTZ: + rc = CopyTabletData(lpOutput, &gSysContext.lcInExtZ, + sizeof(LONG)); + break; + case CTX_OUTORGX: + rc = CopyTabletData(lpOutput, &gSysContext.lcOutOrgX, + sizeof(LONG)); + break; + case CTX_OUTORGY: + rc = CopyTabletData(lpOutput, &gSysContext.lcOutOrgY, + sizeof(LONG)); + break; + case CTX_OUTORGZ: + rc = CopyTabletData(lpOutput, &gSysContext.lcOutOrgZ, + sizeof(LONG)); + break; + case CTX_OUTEXTX: + rc = CopyTabletData(lpOutput, &gSysContext.lcOutExtX, + sizeof(LONG)); + break; + case CTX_OUTEXTY: + rc = CopyTabletData(lpOutput, &gSysContext.lcOutExtY, + sizeof(LONG)); + break; + case CTX_OUTEXTZ: + rc = CopyTabletData(lpOutput, &gSysContext.lcOutExtZ, + sizeof(LONG)); + break; + case CTX_SENSX: + rc = CopyTabletData(lpOutput, &gSysContext.lcSensX, + sizeof(LONG)); + break; + case CTX_SENSY: + rc = CopyTabletData(lpOutput, &gSysContext.lcSensY, + sizeof(LONG)); + break; + case CTX_SENSZ: + rc = CopyTabletData(lpOutput, &gSysContext.lcSensZ, + sizeof(LONG)); + break; + case CTX_SYSMODE: + rc = CopyTabletData(lpOutput, &gSysContext.lcSysMode, + sizeof(LONG)); + break; + case CTX_SYSORGX: + rc = CopyTabletData(lpOutput, &gSysContext.lcSysOrgX, + sizeof(LONG)); + break; + case CTX_SYSORGY: + rc = CopyTabletData(lpOutput, &gSysContext.lcSysOrgY, + sizeof(LONG)); + break; + case CTX_SYSEXTX: + rc = CopyTabletData(lpOutput, &gSysContext.lcSysExtX, + sizeof(LONG)); + break; + case CTX_SYSEXTY: + rc = CopyTabletData(lpOutput, &gSysContext.lcSysExtY, + sizeof(LONG)); + break; + case CTX_SYSSENSX: + rc = CopyTabletData(lpOutput, &gSysContext.lcSysSensX, + sizeof(LONG)); + break; + case CTX_SYSSENSY: + rc = CopyTabletData(lpOutput, &gSysContext.lcSysSensY, + sizeof(LONG)); + break; + default: + FIXME("WTI_DEFSYSCTX unhandled index %i\n",nIndex); + rc = 0; + } + break; + case WTI_CURSORS: + case WTI_CURSORS+1: + case WTI_CURSORS+2: + case WTI_CURSORS+3: + case WTI_CURSORS+4: + case WTI_CURSORS+5: + case WTI_CURSORS+6: + case WTI_CURSORS+7: + case WTI_CURSORS+8: + case WTI_CURSORS+9: + case WTI_CURSORS+10: + tgtcursor = &gSysCursor[wCategory - WTI_CURSORS]; + switch (nIndex) + { + case CSR_NAME: + rc = CopyTabletData(lpOutput, &tgtcursor->NAME, + strlen(tgtcursor->NAME)+1); + break; + case CSR_ACTIVE: + rc = CopyTabletData(lpOutput,&tgtcursor->ACTIVE, + sizeof(BOOL)); + break; + case CSR_PKTDATA: + rc = CopyTabletData(lpOutput,&tgtcursor->PKTDATA, + sizeof(WTPKT)); + break; + case CSR_BUTTONS: + rc = CopyTabletData(lpOutput,&tgtcursor->BUTTONS, + sizeof(BYTE)); + break; + case CSR_BUTTONBITS: + rc = CopyTabletData(lpOutput,&tgtcursor->BUTTONBITS, + sizeof(BYTE)); + break; + case CSR_BTNNAMES: + FIXME("Button Names not returned correctly\n"); + rc = CopyTabletData(lpOutput,&tgtcursor->BTNNAMES, + strlen(tgtcursor->BTNNAMES)+1); + break; + case CSR_BUTTONMAP: + rc = CopyTabletData(lpOutput,&tgtcursor->BUTTONMAP, + sizeof(BYTE)*32); + break; + case CSR_SYSBTNMAP: + rc = CopyTabletData(lpOutput,&tgtcursor->SYSBTNMAP, + sizeof(BYTE)*32); + break; + case CSR_NPBTNMARKS: + memcpy(lpOutput,&tgtcursor->NPBTNMARKS,sizeof(UINT)*2); + rc = sizeof(UINT)*2; + break; + case CSR_NPBUTTON: + rc = CopyTabletData(lpOutput,&tgtcursor->NPBUTTON, + sizeof(BYTE)); + break; + case CSR_NPRESPONSE: + FIXME("Not returning CSR_NPRESPONSE correctly\n"); + rc = 0; + break; + case CSR_TPBUTTON: + rc = CopyTabletData(lpOutput,&tgtcursor->TPBUTTON, + sizeof(BYTE)); + break; + case CSR_TPBTNMARKS: + memcpy(lpOutput,&tgtcursor->TPBTNMARKS,sizeof(UINT)*2); + rc = sizeof(UINT)*2; + break; + case CSR_TPRESPONSE: + FIXME("Not returning CSR_TPRESPONSE correctly\n"); + rc = 0; + break; + case CSR_PHYSID: + { + DWORD id; + rc = CopyTabletData(&id,&tgtcursor->PHYSID, + sizeof(DWORD)); + id += (wCategory - WTI_CURSORS); + memcpy(lpOutput,&id,sizeof(DWORD)); + } + break; + case CSR_MODE: + rc = CopyTabletData(lpOutput,&tgtcursor->MODE,sizeof(UINT)); + break; + case CSR_MINPKTDATA: + rc = CopyTabletData(lpOutput,&tgtcursor->MINPKTDATA, + sizeof(UINT)); + break; + case CSR_MINBUTTONS: + rc = CopyTabletData(lpOutput,&tgtcursor->MINBUTTONS, + sizeof(UINT)); + break; + case CSR_CAPABILITIES: + rc = CopyTabletData(lpOutput,&tgtcursor->CAPABILITIES, + sizeof(UINT)); + break; + case CSR_TYPE: + rc = CopyTabletData(lpOutput,&tgtcursor->TYPE, + sizeof(UINT)); + break; + default: + FIXME("WTI_CURSORS unhandled index %i\n",nIndex); + rc = 0; + } + break; + case WTI_DEVICES: + switch (nIndex) + { + case DVC_NAME: + rc = CopyTabletData(lpOutput,gSysDevice.NAME, + strlen(gSysDevice.NAME)+1); + break; + case DVC_HARDWARE: + rc = CopyTabletData(lpOutput,&gSysDevice.HARDWARE, + sizeof(UINT)); + break; + case DVC_NCSRTYPES: + rc = CopyTabletData(lpOutput,&gSysDevice.NCSRTYPES, + sizeof(UINT)); + break; + case DVC_FIRSTCSR: + rc = CopyTabletData(lpOutput,&gSysDevice.FIRSTCSR, + sizeof(UINT)); + break; + case DVC_PKTRATE: + rc = CopyTabletData(lpOutput,&gSysDevice.PKTRATE, + sizeof(UINT)); + break; + case DVC_PKTDATA: + rc = CopyTabletData(lpOutput,&gSysDevice.PKTDATA, + sizeof(WTPKT)); + break; + case DVC_PKTMODE: + rc = CopyTabletData(lpOutput,&gSysDevice.PKTMODE, + sizeof(WTPKT)); + break; + case DVC_CSRDATA: + rc = CopyTabletData(lpOutput,&gSysDevice.CSRDATA, + sizeof(WTPKT)); + break; + case DVC_XMARGIN: + rc = CopyTabletData(lpOutput,&gSysDevice.XMARGIN, + sizeof(INT)); + break; + case DVC_YMARGIN: + rc = CopyTabletData(lpOutput,&gSysDevice.YMARGIN, + sizeof(INT)); + break; + case DVC_ZMARGIN: + rc = 0; /* unsupported */ + /* + rc = CopyTabletData(lpOutput,&gSysDevice.ZMARGIN, + sizeof(INT)); + */ + break; + case DVC_X: + rc = CopyTabletData(lpOutput,&gSysDevice.X, + sizeof(AXIS)); + break; + case DVC_Y: + rc = CopyTabletData(lpOutput,&gSysDevice.Y, + sizeof(AXIS)); + break; + case DVC_Z: + rc = 0; /* unsupported */ + /* + rc = CopyTabletData(lpOutput,&gSysDevice.Z, + sizeof(AXIS)); + */ + break; + case DVC_NPRESSURE: + rc = CopyTabletData(lpOutput,&gSysDevice.NPRESSURE, + sizeof(AXIS)); + break; + case DVC_TPRESSURE: + rc = 0; /* unsupported */ + /* + rc = CopyTabletData(lpOutput,&gSysDevice.TPRESSURE, + sizeof(AXIS)); + */ + break; + case DVC_ORIENTATION: + memcpy(lpOutput,&gSysDevice.ORIENTATION,sizeof(AXIS)*3); + rc = sizeof(AXIS)*3; + break; + case DVC_ROTATION: + rc = 0; /* unsupported */ + /* + memcpy(lpOutput,&gSysDevice.ROTATION,sizeof(AXIS)*3); + rc = sizeof(AXIS)*3; + */ + break; + case DVC_PNPID: + rc = CopyTabletData(lpOutput,gSysDevice.PNPID, + strlen(gSysDevice.PNPID)+1); + break; + default: + FIXME("WTI_DEVICES unhandled index %i\n",nIndex); + rc = 0; + } + break; + default: + FIXME("Unhandled Category %i\n",wCategory); + } + return rc; } /*********************************************************************** @@ -59,11 +770,38 @@ */ HCTX WINAPI WTOpenA(HWND hWnd, LPLOGCONTEXTA lpLogCtx, BOOL fEnable) { - FIXME("(%p, %p, %u): stub\n", hWnd, lpLogCtx, fEnable); + LPOPENCONTEXT newcontext; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("(%p, %p, %u)\n", hWnd, lpLogCtx, fEnable); + DUMPCONTEXT(*lpLogCtx); - return NULL; + newcontext = HeapAlloc(GetProcessHeap(), 0 , sizeof(OPENCONTEXT)); + memcpy(&(newcontext->context),lpLogCtx,sizeof(LOGCONTEXTA)); + newcontext->hwndOwner = hWnd; + newcontext->enabled = fEnable; + newcontext->ActiveCursor = -1; + newcontext->QueueSize = 10; + newcontext->PacketsQueued = 0; + newcontext->PacketQueue=HeapAlloc(GetProcessHeap(),0,sizeof(WTPACKET)*10); + newcontext->handle = gTopContext++; + newcontext->next = gOpenContexts; + + EnterCriticalSection(&csTablet); + gOpenContexts = newcontext; + LeaveCriticalSection(&csTablet); + + pAttachEventQueueToTablet(hWnd, gSysCursor, gNumCursors); + + TABLET_PostTabletMessage(newcontext, WT_CTXOPEN, (WPARAM)newcontext->handle, + newcontext->context.lcStatus, TRUE); + + newcontext->context.lcStatus = CXS_ONTOP; + + TABLET_PostTabletMessage(newcontext, WT_CTXOVERLAP, + (WPARAM)newcontext->handle, + newcontext->context.lcStatus, TRUE); + + return newcontext->handle; } /*********************************************************************** @@ -83,9 +821,32 @@ */ BOOL WINAPI WTClose(HCTX hCtx) { - FIXME("(%p): stub\n", hCtx); + LPOPENCONTEXT context,ptr; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("(%p)\n", hCtx); + + ptr = context = gOpenContexts; + + while ((context->handle != hCtx) && (context)) + { + ptr = context; + context = context->next; + } + if (!context) + return TRUE; + + EnterCriticalSection(&csTablet); + if (context == gOpenContexts) + gOpenContexts = context->next; + else + ptr->next = context->next; + LeaveCriticalSection(&csTablet); + + TABLET_PostTabletMessage(context, WT_CTXCLOSE, (WPARAM)context->handle, + context->context.lcStatus,TRUE); + + HeapFree(GetProcessHeap(),0,context->PacketQueue); + HeapFree(GetProcessHeap(),0,context); return TRUE; } @@ -95,11 +856,36 @@ */ int WINAPI WTPacketsGet(HCTX hCtx, int cMaxPkts, LPVOID lpPkts) { - FIXME("(%p, %d, %p): stub\n", hCtx, cMaxPkts, lpPkts); + int limit; + LPOPENCONTEXT context; + LPVOID ptr = lpPkts; + + TRACE("(%p, %d, %p)\n", hCtx, cMaxPkts, lpPkts); + + context = TABLET_FindOpenContext(hCtx); + TABLET_BlankPacketData(context,lpPkts,cMaxPkts); + + EnterCriticalSection(&csTablet); + if (context->PacketsQueued == 0) + { + LeaveCriticalSection(&csTablet); + return 0; + } + + for(limit = 0; limit < cMaxPkts && limit < context->PacketsQueued; limit++) + ptr=TABLET_CopyPacketData(context ,ptr, &context->PacketQueue[limit]); + + if (limit < context->PacketsQueued) + { + memcpy(context->PacketQueue, &context->PacketQueue[limit], + (context->QueueSize - (limit))*sizeof(WTPACKET)); + } + context->PacketsQueued -= limit; + LeaveCriticalSection(&csTablet); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("Copied %i packets\n",limit); - return 0; + return limit; } /*********************************************************************** @@ -107,11 +893,33 @@ */ BOOL WINAPI WTPacket(HCTX hCtx, UINT wSerial, LPVOID lpPkt) { - FIXME("(%p, %d, %p): stub\n", hCtx, wSerial, lpPkt); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + int rc = 0; + LPOPENCONTEXT context; + LPWTPACKET wtp; + + TRACE("(%p, %d, %p)\n", hCtx, wSerial, lpPkt); + + context = TABLET_FindOpenContext(hCtx); + + EnterCriticalSection(&csTablet); + rc = TABLET_FindPacket(context ,wSerial, &wtp); + + if (rc >= 0) + { + if (lpPkt) + TABLET_CopyPacketData(context ,lpPkt, wtp); + + if ((rc+1) < context->QueueSize) + { + memcpy(context->PacketQueue, &context->PacketQueue[rc+1], + (context->QueueSize - (rc+1))*sizeof(WTPACKET)); + } + context->PacketsQueued -= (rc+1); + } + LeaveCriticalSection(&csTablet); - return FALSE; + TRACE("Returning %i\n",rc+1); + return rc+1; } /*********************************************************************** @@ -119,11 +927,14 @@ */ BOOL WINAPI WTEnable(HCTX hCtx, BOOL fEnable) { - FIXME("(%p, %u): stub\n", hCtx, fEnable); + LPOPENCONTEXT context; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("(%p, %u)\n", hCtx, fEnable); - return FALSE; + context = TABLET_FindOpenContext(hCtx); + context->enabled = fEnable; + + return TRUE; } /*********************************************************************** @@ -133,9 +944,7 @@ { FIXME("(%p, %u): stub\n", hCtx, fToTop); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - - return FALSE; + return TRUE; } /*********************************************************************** @@ -155,11 +964,14 @@ */ BOOL WINAPI WTGetA(HCTX hCtx, LPLOGCONTEXTA lpLogCtx) { - FIXME("(%p, %p): stub\n", hCtx, lpLogCtx); + LPOPENCONTEXT context; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("(%p, %p)\n", hCtx, lpLogCtx); + context = TABLET_FindOpenContext(hCtx); - return FALSE; + memcpy(lpLogCtx,&context->context,sizeof(LOGCONTEXTA)); + + return TRUE; } /*********************************************************************** @@ -251,11 +1063,27 @@ */ int WINAPI WTPacketsPeek(HCTX hCtx, int cMaxPkts, LPVOID lpPkts) { - FIXME("(%p, %d, %p): stub\n", hCtx, cMaxPkts, lpPkts); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - - return 0; + int limit; + LPOPENCONTEXT context; + LPVOID ptr = lpPkts; + + TRACE("(%p, %d, %p)\n", hCtx, cMaxPkts, lpPkts); + + context = TABLET_FindOpenContext(hCtx); + + EnterCriticalSection(&csTablet); + if (context->PacketsQueued == 0) + { + LeaveCriticalSection(&csTablet); + return 0; + } + + for (limit = 0; limit < cMaxPkts && limit < context->PacketsQueued; limit++) + ptr = TABLET_CopyPacketData(context ,ptr, &context->PacketQueue[limit]); + + LeaveCriticalSection(&csTablet); + TRACE("Copied %i packets\n",limit); + return limit; } /*********************************************************************** @@ -264,12 +1092,53 @@ int WINAPI WTDataGet(HCTX hCtx, UINT wBegin, UINT wEnd, int cMaxPkts, LPVOID lpPkts, LPINT lpNPkts) { - FIXME("(%p, %u, %u, %d, %p, %p): stub\n", + LPOPENCONTEXT context; + LPVOID ptr = lpPkts; + UINT bgn = 0; + UINT end = 0; + UINT num = 0; + + TRACE("(%p, %u, %u, %d, %p, %p)\n", hCtx, wBegin, wEnd, cMaxPkts, lpPkts, lpNPkts); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + context = TABLET_FindOpenContext(hCtx); - return 0; + EnterCriticalSection(&csTablet); + if (context->PacketsQueued == 0) + { + LeaveCriticalSection(&csTablet); + return 0; + } + + while (bgn < context->PacketsQueued && + context->PacketQueue[bgn].pkSerialNumber != wBegin) + bgn++; + + end = bgn; + while (end < context->PacketsQueued && + context->PacketQueue[end].pkSerialNumber != wEnd) + end++; + + if (bgn == end == context->PacketsQueued) + { + LeaveCriticalSection(&csTablet); + return 0; + } + + for (num = bgn; num <= end; num++) + ptr = TABLET_CopyPacketData(context ,ptr, &context->PacketQueue[end]); + + /* remove read packets */ + if ((end+1) < context->PacketsQueued) + memcpy( &context->PacketQueue[bgn], &context->PacketQueue[end+1], + (context->PacketsQueued - ((end-bgn)+1)) * sizeof (WTPACKET)); + + context->PacketsQueued -= ((end-bgn)+1); + *lpNPkts = ((end-bgn)+1); + + LeaveCriticalSection(&csTablet); + TRACE("Copied %i packets\n",*lpNPkts); + return (end - bgn)+1; } /*********************************************************************** @@ -278,12 +1147,48 @@ int WINAPI WTDataPeek(HCTX hCtx, UINT wBegin, UINT wEnd, int cMaxPkts, LPVOID lpPkts, LPINT lpNPkts) { - FIXME("(%p, %u, %u, %d, %p, %p): stub\n", + LPOPENCONTEXT context; + LPVOID ptr = lpPkts; + UINT bgn = 0; + UINT end = 0; + UINT num = 0; + + TRACE("(%p, %u, %u, %d, %p, %p)\n", hCtx, wBegin, wEnd, cMaxPkts, lpPkts, lpNPkts); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + context = TABLET_FindOpenContext(hCtx); - return 0; + EnterCriticalSection(&csTablet); + if (context->PacketsQueued == 0) + { + LeaveCriticalSection(&csTablet); + return 0; + } + + while (bgn < context->PacketsQueued && + context->PacketQueue[bgn].pkSerialNumber != wBegin) + bgn++; + + end = bgn; + while (end < context->PacketsQueued && + context->PacketQueue[end].pkSerialNumber != wEnd) + end++; + + if (bgn == context->PacketsQueued || end == context->PacketsQueued) + { + TRACE("%i %i %i \n", bgn, end, context->PacketsQueued); + LeaveCriticalSection(&csTablet); + return 0; + } + + for (num = bgn; num <= end; num++) + ptr = TABLET_CopyPacketData(context ,ptr, &context->PacketQueue[end]); + + *lpNPkts = ((end-bgn)+1); + LeaveCriticalSection(&csTablet); + + TRACE("Copied %i packets\n",*lpNPkts); + return (end - bgn)+1; } /*********************************************************************** @@ -291,9 +1196,24 @@ */ BOOL WINAPI WTQueuePacketsEx(HCTX hCtx, UINT *lpOld, UINT *lpNew) { - FIXME("(%p, %p, %p): stub\n", hCtx, lpOld, lpNew); + LPOPENCONTEXT context; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("(%p, %p, %p)\n", hCtx, lpOld, lpNew); + context = TABLET_FindOpenContext(hCtx); + + EnterCriticalSection(&csTablet); + if (context->PacketsQueued) + { + *lpOld = context->PacketQueue[0].pkSerialNumber; + *lpNew = context->PacketQueue[context->PacketsQueued-1].pkSerialNumber; + } + else + { + TRACE("No packets\n"); + LeaveCriticalSection(&csTablet); + return FALSE; + } + LeaveCriticalSection(&csTablet); return TRUE; } @@ -303,11 +1223,11 @@ */ int WINAPI WTQueueSizeGet(HCTX hCtx) { - FIXME("(%p): stub\n", hCtx); + LPOPENCONTEXT context; + TRACE("(%p)\n", hCtx); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - - return 0; + context = TABLET_FindOpenContext(hCtx); + return context->QueueSize; } /*********************************************************************** @@ -315,9 +1235,18 @@ */ BOOL WINAPI WTQueueSizeSet(HCTX hCtx, int nPkts) { - FIXME("(%p, %d): stub\n", hCtx, nPkts); + LPOPENCONTEXT context; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("(%p, %d)\n", hCtx, nPkts); - return 0; + context = TABLET_FindOpenContext(hCtx); + + EnterCriticalSection(&csTablet); + context->PacketQueue = HeapReAlloc(GetProcessHeap(), 0, + context->PacketQueue, sizeof(WTPACKET)*nPkts); + + context->QueueSize = nPkts; + LeaveCriticalSection(&csTablet); + + return nPkts; } Index: dlls/x11drv/Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/x11drv/Makefile.in,v retrieving revision 1.30 diff -u -r1.30 Makefile.in --- dlls/x11drv/Makefile.in 31 Oct 2002 02:38:20 -0000 1.30 +++ dlls/x11drv/Makefile.in 23 Apr 2003 13:55:27 -0000 @@ -38,7 +38,8 @@ x11ddraw.c \ x11drv_main.c \ xrender.c \ - xvidmode.c + xvidmode.c \ + wintab.c PROGRAMS = wineclipsrv Index: dlls/x11drv/event.c =================================================================== RCS file: /home/wine/wine/dlls/x11drv/event.c,v retrieving revision 1.18 diff -u -r1.18 event.c --- dlls/x11drv/event.c 23 Jan 2003 01:29:58 -0000 1.18 +++ dlls/x11drv/event.c 23 Apr 2003 13:55:28 -0000 @@ -275,8 +275,18 @@ WARN( "Got event %s for unknown Window %08lx\n", event_names[event->type], event->xany.window ); else - TRACE("Got event %s for hwnd %p\n", - event_names[event->type], hWnd ); + if (event->type <= MappingNotify) + TRACE("Got event %s for hwnd/window %p/%lx, GetFocus()=%p\n", + event_names[event->type], hWnd, event->xany.window, GetFocus() ); + else + TRACE("Got extention event for hwnd/window %p/%lx, GetFocus()=%p\n", + hWnd, event->xany.window, GetFocus() ); + + if (X11DRV_ProcessTabletEvent(hWnd, event)) + { + TRACE("Return: filtered by tablet\n"); + return; + } switch(event->type) { Index: dlls/x11drv/x11drv.spec =================================================================== RCS file: /home/wine/wine/dlls/x11drv/x11drv.spec,v retrieving revision 1.45 diff -u -r1.45 x11drv.spec --- dlls/x11drv/x11drv.spec 22 Apr 2003 00:15:48 -0000 1.45 +++ dlls/x11drv/x11drv.spec 23 Apr 2003 13:55:28 -0000 @@ -104,3 +104,8 @@ # X11 locks @ cdecl -norelay wine_tsx11_lock() @ cdecl -norelay wine_tsx11_unlock() + +# WinTab32 +@ cdecl LoadTabletInfo(ptr ptr ptr long ptr) X11DRV_LoadTabletInfo +@ cdecl AttachEventQueueToTablet(ptr ptr long) X11DRV_AttachEventQueueToTablet +@ cdecl GetCurrentPacket(ptr) X11DRV_GetCurrentPacket Index: include/wintab.h =================================================================== RCS file: /home/wine/wine/include/wintab.h,v retrieving revision 1.1 diff -u -r1.1 wintab.h --- include/wintab.h 17 Dec 2002 01:49:16 -0000 1.1 +++ include/wintab.h 23 Apr 2003 13:55:28 -0000 @@ -328,7 +328,9 @@ #define CSR_MINPKTDATA 17 /* 1.1 */ #define CSR_MINBUTTONS 18 /* 1.1 */ #define CSR_CAPABILITIES 19 /* 1.1 */ -#define CSR_MAX 19 +/* from http://www.wacomeng.com/devsupport/ibmpc/wacomwindevfaq.html */ +#define CSR_TYPE 20 +#define CSR_MAX 20 #endif --- /dev/null Thu Aug 30 15:30:55 2001 +++ dlls/wintab32/wintab32.c Wed Apr 23 08:22:37 2003 @@ -0,0 +1,150 @@ +/* + * WinTab32 library + * + * Copyright 2003 Codeweavers, Aric Stewart + * + * 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 "winbase.h" +#include "windef.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" +#include "wintab.h" +#include "wintab_internal.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wintab32); + +HWND hwndDefault = (HWND)NULL; +static HANDLE hTabletInst; +static const WCHAR +WC_TABLETCLASSNAME[] = {'W','i','n','e','T','a','b','l','e','t','C','l','a','s','s',0}; +CRITICAL_SECTION csTablet; + +static LRESULT WINAPI TABLET_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, + LPARAM lParam); + +static VOID TABLET_Register() +{ + WNDCLASSW wndClass; + ZeroMemory(&wndClass, sizeof(WNDCLASSW)); + wndClass.style = CS_GLOBALCLASS; + wndClass.lpfnWndProc = (WNDPROC) TABLET_WindowProc; + wndClass.cbClsExtra = 0; + wndClass.cbWndExtra = 0; + wndClass.hCursor = (HCURSOR)NULL; + wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW +1); + wndClass.lpszClassName = WC_TABLETCLASSNAME; + RegisterClassW(&wndClass); +} + +static VOID TABLET_Unregister() +{ + UnregisterClassW(WC_TABLETCLASSNAME, (HINSTANCE)NULL); +} + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) +{ + static const WCHAR name[] = {'T','a','b','l','e','t',0}; + static HMODULE hx11drv = NULL; + + TRACE("%p, %lx, %p\n",hInstDLL,fdwReason,lpReserved); + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + TRACE("Initialization\n"); + InitializeCriticalSection(&csTablet); + hx11drv = LoadLibraryA("x11drv.dll"); + if (hx11drv) + { + pLoadTabletInfo = (X11_LoadTabletInfo*)GetProcAddress(hx11drv, + "LoadTabletInfo"); + pAttachEventQueueToTablet = (X11_AttachEventQueueToTablet*) + GetProcAddress(hx11drv, "AttachEventQueueToTablet"); + pGetCurrentPacket = (X11_GetCurrentPacket*) + GetProcAddress(hx11drv, "GetCurrentPacket"); + TABLET_Register(); + hTabletInst = hInstDLL; + hwndDefault = CreateWindowW(WC_TABLETCLASSNAME, name, + WS_POPUPWINDOW,0,0,0,0,0,0,hTabletInst,0); + } + else + return FALSE; + break; + case DLL_PROCESS_DETACH: + TRACE("Detaching\n"); + if (hx11drv) + { + FreeLibrary(hx11drv); + if (hwndDefault) + { + DestroyWindow(hwndDefault); + hwndDefault = 0; + } + TABLET_Unregister(); + } + DeleteCriticalSection(&csTablet); + break; + } + return TRUE; +} + + +/* + * The window proc for the default TABLET window + */ +static LRESULT WINAPI TABLET_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, + LPARAM lParam) +{ + TRACE("Incomming Message 0x%x (0x%08x, 0x%08x)\n", uMsg, (UINT)wParam, + (UINT)lParam); + + switch(uMsg) + { + case WM_NCCREATE: + return TRUE; + + case WT_PACKET: + { + WTPACKET packet; + LPOPENCONTEXT handler; + pGetCurrentPacket(&packet); + handler = AddPacketToContextQueue(&packet,(HWND)lParam); + if (handler) + TABLET_PostTabletMessage(handler, WT_PACKET, + (WPARAM)packet.pkSerialNumber, + (LPARAM)handler->handle, FALSE); + break; + } + case WT_PROXIMITY: + { + LPOPENCONTEXT handler; + LPARAM prox; + handler = FindOpenContext((HWND)lParam); + if (handler) + { + prox = wParam | 0x1 << 16; + TABLET_PostTabletMessage(handler, WT_PROXIMITY, + (WPARAM)handler->handle, (LPARAM)prox, + TRUE); + } + break; + } + } + return 0; +} + --- /dev/null Thu Aug 30 15:30:55 2001 +++ dlls/wintab32/wintab_internal.h Wed Apr 23 08:26:57 2003 @@ -0,0 +1,329 @@ +/* + * Tablet header + * + * Copyright 2003 Codeweavers (Aric Stewart) + * + * 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 + */ + +typedef struct tagWTI_INTERFACE_INFO { + CHAR WINTABID[1024]; + /* a copy of the null-terminated tablet hardware identification string + * in the user buffer. This string should include make, model, and + * revision information in user-readable format. + */ + WORD SPECVERSION; + /* the specification version number. The high-order byte contains the + * major version number; the low-order byte contains the minor version + * number. + */ + WORD IMPLVERSION; + /* the implementation version number. The high-order byte contains the + * major version number; the low-order byte contains the minor version + * number. + */ + UINT NDEVICES; + /* the number of devices supported. */ + UINT NCURSORS; + /* the total number of cursor types supported. */ + UINT NCONTEXTS; + /* the number of contexts supported. */ + UINT CTXOPTIONS; + /* flags indicating which context options are supported */ + UINT CTXSAVESIZE; + /* the size of the save information returned from WTSave.*/ + UINT NEXTENSIONS; + /* the number of extension data items supported.*/ + UINT NMANAGERS; + /* the number of manager handles supported.*/ + }WTI_INTERFACE_INFO, *LPWTI_INTERFACE_INFO; + +typedef struct tagWTI_STATUS_INFO{ + UINT CONTEXTS; + /* the number of contexts currently open.*/ + UINT SYSCTXS; + /* the number of system contexts currently open.*/ + UINT PKTRATE; + /* the maximum packet report rate currently being received by any + * context, in Hertz. + */ + WTPKT PKTDATA; + /* a mask indicating which packet data items are requested by at + * least one context. + */ + UINT MANAGERS; + /* the number of manager handles currently open.*/ + BOOL SYSTEM; + /* a non-zero value if system pointing is available to the whole + * screen; zero otherwise. + */ + DWORD BUTTONUSE; + /* a button mask indicating the logical buttons whose events are + * requested by at least one context. + */ + DWORD SYSBTNUSE; + /* a button mask indicating which logical buttons are assigned a system + * button function by the current cursor's system button map. + */ +} WTI_STATUS_INFO, *LPWTI_STATUS_INFO; + + +typedef struct tagWTI_DEVICES_INFO +{ + CHAR NAME[256]; + /* a displayable null- terminated string describing the device, + * manufacturer, and revision level. + */ + UINT HARDWARE; + /* flags indicating hardware and driver capabilities, as defined + * below: + HWC_INTEGRATED: + Indicates that the display and digitizer share the same surface. + HWC_TOUCH + Indicates that the cursor must be in physical contact with the + device to report position. + HWC_HARDPROX + Indicates that device can generate events when the cursor is + entering and leaving the physical detection range. + HWC_PHYSID_CURSORS + Indicates that device can uniquely identify the active cursor in + hardware. + */ + UINT NCSRTYPES; + /* the number of supported cursor types.*/ + UINT FIRSTCSR; + /* the first cursor type number for the device. */ + UINT PKTRATE; + /* the maximum packet report rate in Hertz. */ + WTPKT PKTDATA; + /* a bit mask indicating which packet data items are always available.*/ + WTPKT PKTMODE; + /* a bit mask indicating which packet data items are physically + * relative, i.e., items for which the hardware can only report change, + * not absolute measurement. + */ + WTPKT CSRDATA; + /* a bit mask indicating which packet data items are only available when + * certain cursors are connected. The individual cursor descriptions + * must be consulted to determine which cursors return which data. + */ + INT XMARGIN; + INT YMARGIN; + INT ZMARGIN; + /* the size of tablet context margins in tablet native coordinates, in + * the x, y, and z directions, respectively. + */ + AXIS X; + AXIS Y; + AXIS Z; + /* the tablet's range and resolution capabilities, in the x, y, and z + * axes, respectively. + */ + AXIS NPRESSURE; + AXIS TPRESSURE; + /* the tablet's range and resolution capabilities, for the normal and + * tangential pressure inputs, respectively. + */ + AXIS ORIENTATION[3]; + /* a 3-element array describing the tablet's orientation range and + * resolution capabilities. + */ + AXIS ROTATION[3]; + /* a 3-element array describing the tablet's rotation range and + * resolution capabilities. + */ + CHAR PNPID[256]; + /* a null-terminated string containing the devices Plug and Play ID.*/ +} WTI_DEVICES_INFO, *LPWTI_DEVICES_INFO; + +typedef struct tagWTI_CURSORS_INFO +{ + CHAR NAME[256]; + /* a displayable zero-terminated string containing the name of the + * cursor. + */ + BOOL ACTIVE; + /* whether the cursor is currently connected. */ + WTPKT PKTDATA; + /* a bit mask indicating the packet data items supported when this + * cursor is connected. + */ + BYTE BUTTONS; + /* the number of buttons on this cursor. */ + BYTE BUTTONBITS; + /* the number of bits of raw button data returned by the hardware.*/ + CHAR BTNNAMES[1024]; /* FIXME: make this dynamic */ + /* a list of zero-terminated strings containing the names of the + * cursor's buttons. The number of names in the list is the same as the + * number of buttons on the cursor. The names are separated by a single + * zero character; the list is terminated by two zero characters. + */ + BYTE BUTTONMAP[32]; + /* a 32 byte array of logical button numbers, one for each physical + * button. + */ + BYTE SYSBTNMAP[32]; + /* a 32 byte array of button action codes, one for each logical + * button. + */ + BYTE NPBUTTON; + /* the physical button number of the button that is controlled by normal + * pressure. + */ + UINT NPBTNMARKS[2]; + /* an array of two UINTs, specifying the button marks for the normal + * pressure button. The first UINT contains the release mark; the second + * contains the press mark. + */ + UINT *NPRESPONSE; + /* an array of UINTs describing the pressure response curve for normal + * pressure. + */ + BYTE TPBUTTON; + /* the physical button number of the button that is controlled by + * tangential pressure. + */ + UINT TPBTNMARKS[2]; + /* an array of two UINTs, specifying the button marks for the tangential + * pressure button. The first UINT contains the release mark; the second + * contains the press mark. + */ + UINT *TPRESPONSE; + /* an array of UINTs describing the pressure response curve for + * tangential pressure. + */ + DWORD PHYSID; + /* a manufacturer-specific physical identifier for the cursor. This + * value will distinguish the physical cursor from others on the same + * device. This physical identifier allows applications to bind + * functions to specific physical cursors, even if category numbers + * change and multiple, otherwise identical, physical cursors are + * present. + */ + UINT MODE; + /* the cursor mode number of this cursor type, if this cursor type has + * the CRC_MULTIMODE capability. + */ + UINT MINPKTDATA; + /* the minimum set of data available from a physical cursor in this + * cursor type, if this cursor type has the CRC_AGGREGATE capability. + */ + UINT MINBUTTONS; + /* the minimum number of buttons of physical cursors in the cursor type, + * if this cursor type has the CRC_AGGREGATE capability. + */ + UINT CAPABILITIES; + /* flags indicating cursor capabilities, as defined below: + CRC_MULTIMODE + Indicates this cursor type describes one of several modes of a + single physical cursor. Consecutive cursor type categories + describe the modes; the CSR_MODE data item gives the mode number + of each cursor type. + CRC_AGGREGATE + Indicates this cursor type describes several physical cursors + that cannot be distinguished by software. + CRC_INVERT + Indicates this cursor type describes the physical cursor in its + inverted orientation; the previous consecutive cursor type + category describes the normal orientation. + */ + UINT TYPE; + /* Manufacturer Unique id for the item type */ +} WTI_CURSORS_INFO, *LPWTI_CURSORS_INFO; + + +typedef struct tagWTI_EXTENSIONS_INFO +{ + CHAR NAME[256]; + /* a unique, null-terminated string describing the extension.*/ + UINT TAG; + /* a unique identifier for the extension. */ + WTPKT MASK; + /* a mask that can be bitwise OR'ed with WTPKT-type variables to select + * the extension. + */ + UINT SIZE[2]; + /* an array of two UINTs specifying the extension's size within a packet + * (in bytes). The first is for absolute mode; the second is for + * relative mode. + */ + AXIS *AXES; + /* an array of axis descriptions, as needed for the extension. */ + BYTE *DEFAULT; + /* the current global default data, as needed for the extension. This + * data is modified via the WTMgrExt function. + */ + BYTE *DEFCONTEXT; + BYTE *DEFSYSCTX; + /* the current default context-specific data, as needed for the + * extension. The indices identify the digitizing- and system-context + * defaults, respectively. + */ + BYTE *CURSORS; + /* Is the first of one or more consecutive indices, one per cursor type. + * Each returns the current default cursor-specific data, as need for + * the extension. This data is modified via the WTMgrCsrExt function. + */ +} WTI_EXTENSIONS_INFO, *LPWTI_EXTENSIONS_INFO; + +typedef struct tagWTPACKET { + HCTX pkContext; + UINT pkStatus; + LONG pkTime; + WTPKT pkChanged; + UINT pkSerialNumber; + UINT pkCursor; + DWORD pkButtons; + DWORD pkX; + DWORD pkY; + DWORD pkZ; + UINT pkNormalPressure; + UINT pkTangentPressure; + ORIENTATION pkOrientation; + ROTATION pkRotation; /* 1.1 */ +} WTPACKET, *LPWTPACKET; + +typedef struct tagOPENCONTEXT +{ + HCTX handle; + LOGCONTEXTA context; + HWND hwndOwner; + BOOL enabled; + INT ActiveCursor; + INT QueueSize; + INT PacketsQueued; + LPWTPACKET PacketQueue; + struct tagOPENCONTEXT *next; +} OPENCONTEXT, *LPOPENCONTEXT; + +LPOPENCONTEXT TABLET_FindOpenContext(HCTX hCtx); +int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam, + LPARAM lParam, BOOL send_always); +LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd); +LPOPENCONTEXT FindOpenContext(HWND hwnd); + +/* X11drv functions */ +typedef int X11_LoadTabletInfo(LPLOGCONTEXTA context, LPWTI_DEVICES_INFO + device, LPWTI_CURSORS_INFO cursor_list, int + num_cursors, HWND hwnddefault); + +typedef int X11_GetCurrentPacket(LPWTPACKET packet); + +typedef int X11_AttachEventQueueToTablet(HWND hOwner, LPWTI_CURSORS_INFO + cursor_list, int num_cursors); + +X11_LoadTabletInfo *pLoadTabletInfo; +X11_AttachEventQueueToTablet *pAttachEventQueueToTablet; +X11_GetCurrentPacket *pGetCurrentPacket; --- /dev/null Thu Aug 30 15:30:55 2001 +++ dlls/x11drv/wintab.c Wed Apr 23 08:27:47 2003 @@ -0,0 +1,551 @@ +/* + * X11 tablet driver + * + * Copyright 2003 Codeweavers (Aric Stewart) + * + * 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 "ts_xlib.h" +#include <X11/extensions/XInput.h> +#include <X11/extensions/XI.h> + +#include "windef.h" +#include "x11drv.h" +#include "wine/debug.h" +#include "wintab.h" +#include <dlfcn.h> +#include "../wintab32/wintab_internal.h" +#include <stdlib.h> + +WINE_DEFAULT_DEBUG_CHANNEL(wintab32); +WINE_DECLARE_DEBUG_CHANNEL(event); + +static int motion_type = -1; +static int button_press_type = -1; +static int button_release_type = -1; +static int key_press_type = -1; +static int key_release_type = -1; +static int proximity_in_type = -1; +static int proximity_out_type = -1; + +HWND hwndTabletDefault = (HWND)NULL; +WTPACKET gMsgPacket; +static DWORD gSerial = 0; +static INT button_state[10] = {0,0,0,0,0,0,0,0,0,0}; + + +/* XInput stuff */ +static void *xinput_handle; + +#define MAKE_FUNCPTR(f) static typeof(f) * p##f; +MAKE_FUNCPTR(XListInputDevices) +MAKE_FUNCPTR(XOpenDevice) +MAKE_FUNCPTR(XQueryDeviceState) +MAKE_FUNCPTR(XGetDeviceButtonMapping) +MAKE_FUNCPTR(XCloseDevice) +MAKE_FUNCPTR(XSelectExtensionEvent) +MAKE_FUNCPTR(XFreeDeviceState) +#undef MAKE_FUNCPTR + +INT X11DRV_XInput_Init(void) +{ + xinput_handle = wine_dlopen("libXi.so", RTLD_NOW, NULL, 0); + if (xinput_handle) + { +#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(xinput_handle, #f, NULL, 0)) == NULL) goto sym_not_found; + LOAD_FUNCPTR(XListInputDevices) + LOAD_FUNCPTR(XOpenDevice) + LOAD_FUNCPTR(XGetDeviceButtonMapping) + LOAD_FUNCPTR(XCloseDevice) + LOAD_FUNCPTR(XSelectExtensionEvent) + LOAD_FUNCPTR(XQueryDeviceState) + LOAD_FUNCPTR(XFreeDeviceState) +#undef LOAD_FUNCPTR + return 1; + } +sym_not_found: + return 0; +} + +int X11DRV_LoadTabletInfo(LPLOGCONTEXTA context, LPWTI_DEVICES_INFO device, + LPWTI_CURSORS_INFO cursor_list, int num_cursors, HWND + hwnddefault) +{ + struct x11drv_thread_data *data = x11drv_thread_data(); + int num_devices; + int loop; + int cursor_target; + XDeviceInfo *devices; + XDeviceInfo *target = NULL; + BOOL axis_read_complete= FALSE; + + XAnyClassPtr any; + XButtonInfoPtr Button; + XValuatorInfoPtr Val; + XAxisInfoPtr Axis; + + XDevice *opendevice; + + if (!X11DRV_XInput_Init()) + { + ERR("Unable to initialized the XInput library.\n"); + return 0; + } + + hwndTabletDefault = hwnddefault; + + /* Do base initializaion */ + strcpy(context->lcName, "Wine Tablet Context"); + strcpy(device->NAME,"Wine Tablet Device"); + + context->lcOptions = CXO_SYSTEM | CXO_MESSAGES | CXO_CSRMESSAGES; + context->lcLocks = CXL_INSIZE | CXL_INASPECT | CXL_MARGIN | + CXL_SENSITIVITY | CXL_SYSOUT; + + context->lcMsgBase= WT_DEFBASE; + context->lcDevice = 0; + context->lcPktData = + PK_CONTEXT | PK_STATUS | PK_SERIAL_NUMBER| PK_TIME | PK_CURSOR | + PK_BUTTONS | PK_X | PK_Y | PK_NORMAL_PRESSURE | PK_ORIENTATION; + context->lcMoveMask= + PK_BUTTONS | PK_X | PK_Y | PK_NORMAL_PRESSURE | PK_ORIENTATION; + context->lcStatus = CXS_ONTOP; + context->lcPktRate = 100; + context->lcBtnDnMask = 0xffffffff; + context->lcBtnUpMask = 0xffffffff; + context->lcSensX = 65536; + context->lcSensY = 65536; + context->lcSensX = 65536; + context->lcSensZ = 65536; + context->lcSysSensX= 65536; + context->lcSysSensY= 65536; + + /* Device Defaults */ + device->HARDWARE = HWC_HARDPROX|HWC_PHYSID_CURSORS; + device->FIRSTCSR= 0; + device->PKTRATE = 100; + device->PKTDATA = + PK_CONTEXT | PK_STATUS | PK_SERIAL_NUMBER| PK_TIME | PK_CURSOR | + PK_BUTTONS | PK_X | PK_Y | PK_NORMAL_PRESSURE | PK_ORIENTATION; + strcpy(device->PNPID,"non-pluginplay"); + + wine_tsx11_lock(); + + cursor_target = -1; + devices = pXListInputDevices(data->display, &num_devices); + if (!devices) + { + WARN("XInput Extenstions reported as not avalable\n"); + wine_tsx11_unlock(); + return 0; + } + for (loop=0; loop < num_devices; loop++) + { + int class_loop; + + TRACE("Trying device %i(%s)\n",loop,devices[loop].name); + if (devices[loop].use == IsXExtensionDevice) + { + LPWTI_CURSORS_INFO cursor; + + TRACE("Is Extention Device\n"); + cursor_target++; + target = &devices[loop]; + cursor = &cursor_list[cursor_target]; + + opendevice = pXOpenDevice(data->display,target->id); + if (opendevice) + { + unsigned char map[32]; + int i; + int shft = 0; + + pXGetDeviceButtonMapping(data->display, opendevice, map, 32); + + for (i=0; i< cursor->BUTTONS; i++,shft++) + { + cursor->BUTTONMAP[i] = map[i]; + cursor->SYSBTNMAP[i] = (1<<shft); + } + pXCloseDevice(data->display, opendevice); + } + else + { + WARN("Unable to open device %s\n",target->name); + cursor_target --; + continue; + } + + strcpy(cursor->NAME,target->name); + + cursor->ACTIVE = 1; + cursor->PKTDATA = PK_TIME | PK_CURSOR | PK_BUTTONS | PK_X | PK_Y | + PK_NORMAL_PRESSURE | PK_TANGENT_PRESSURE | + PK_ORIENTATION; + + cursor->PHYSID = cursor_target; + cursor->NPBUTTON = 1; + cursor->NPBTNMARKS[0] = 0 ; + cursor->NPBTNMARKS[1] = 1 ; + cursor->CAPABILITIES = 1; + if (strcasecmp(cursor->NAME,"stylus")==0) + cursor->TYPE = 0x4825; + if (strcasecmp(cursor->NAME,"eraser")==0) + cursor->TYPE = 0xc85a; + + + any = (XAnyClassPtr) (target->inputclassinfo); + + for (class_loop = 0; class_loop < target->num_classes; class_loop++) + { + switch (any->class) + { + case ValuatorClass: + if (!axis_read_complete) + { + Val = (XValuatorInfoPtr) any; + Axis = (XAxisInfoPtr) ((char *) Val + sizeof + (XValuatorInfo)); + + if (Val->num_axes>=1) + { + /* Axis 1 is X */ + device->X.axMin = Axis->min_value; + device->X.axMax= Axis->max_value; + device->X.axUnits = 1; + device->X.axResolution = Axis->resolution; + context->lcInOrgX = Axis->min_value; + context->lcSysOrgX = Axis->min_value; + context->lcInExtX = Axis->max_value; + context->lcSysExtX = Axis->max_value; + Axis++; + } + if (Val->num_axes>=2) + { + /* Axis 2 is Y */ + device->Y.axMin = Axis->min_value; + device->Y.axMax= Axis->max_value; + device->Y.axUnits = 1; + device->Y.axResolution = Axis->resolution; + context->lcInOrgY = Axis->min_value; + context->lcSysOrgY = Axis->min_value; + context->lcInExtY = Axis->max_value; + context->lcSysExtY = Axis->max_value; + Axis++; + } + if (Val->num_axes>=3) + { + /* Axis 3 is Normal Pressure */ + device->NPRESSURE.axMin = Axis->min_value; + device->NPRESSURE.axMax= Axis->max_value; + device->NPRESSURE.axUnits = 1; + device->NPRESSURE.axResolution = + Axis->resolution; + Axis++; + } + if (Val->num_axes >= 5) + { + /* Axis 4 and 5 are X and Y tilt */ + XAxisInfoPtr XAxis = Axis; + Axis++; + if (max (abs(Axis->max_value), + abs(XAxis->max_value))) + { + device->ORIENTATION[0].axMin = 0; + device->ORIENTATION[0].axMax = 3600; + device->ORIENTATION[0].axUnits = 1; + device->ORIENTATION[0].axResolution = + 235929600; + device->ORIENTATION[1].axMin = -1000; + device->ORIENTATION[1].axMax = 1000; + device->ORIENTATION[1].axUnits = 1; + device->ORIENTATION[1].axResolution = + 235929600; + Axis++; + } + } + axis_read_complete = TRUE; + } + break; + case ButtonClass: + { + CHAR *ptr = cursor->BTNNAMES; + int i; + + Button = (XButtonInfoPtr) any; + cursor->BUTTONS = Button->num_buttons; + for (i = 0; i < cursor->BUTTONS; i++) + { + strcpy(ptr,cursor->NAME); + ptr+=8; + } + } + break; + } + any = (XAnyClassPtr) ((char*) any + any->length); + } + } + } + wine_tsx11_unlock(); + device->NCSRTYPES = cursor_target+1; + return cursor_target+1; +} + +static int figure_deg(int x, int y) +{ + int rc; + + if (y != 0) + { + rc = (int) 10 * (atan( (FLOAT)abs(y) / (FLOAT)abs(x)) / (3.1415 / 180)); + if (y>0) + { + if (x>0) + rc += 900; + else + rc = 2700 - rc; + } + else + { + if (x>0) + rc = 900 - rc; + else + rc += 2700; + } + } + else + { + if (x >= 0) + rc = 900; + else + rc = 2700; + } + + return rc; +} + +static int get_button_state(int deviceid) +{ + return button_state[deviceid]; +} + +static void set_button_state(XID deviceid) +{ + struct x11drv_thread_data *data = x11drv_thread_data(); + XDevice *device; + XDeviceState *state; + XInputClass *class; + int loop; + int rc = 0; + + wine_tsx11_lock(); + device = pXOpenDevice(data->display,deviceid); + state = pXQueryDeviceState(data->display,device); + + if (state) + { + class = state->data; + for (loop = 0; loop < state->num_classes; loop++) + { + if (class->class == ButtonClass) + { + int loop2; + XButtonState *button_state = (XButtonState*)class; + for (loop2 = 1; loop2 <= button_state->num_buttons; loop2++) + { + if (button_state->buttons[loop2 / 8] & (1 << (loop2 % 8))) + { + rc |= (1<<(loop2-1)); + } + } + } + class = (XInputClass *) ((char *) class + class->length); + } + } + pXFreeDeviceState(state); + wine_tsx11_unlock(); + button_state[deviceid] = rc; +} + +int X11DRV_ProcessTabletEvent(HWND hwnd, XEvent *event) +{ + memset(&gMsgPacket,0,sizeof(WTPACKET)); + + if(event->type == motion_type) + { + XDeviceMotionEvent *motion = (XDeviceMotionEvent *)event; + + TRACE_(event)("Recieved tablet motion event (%p)\n",hwnd); + TRACE("Recieved tablet motion event (%p)\n",hwnd); + gMsgPacket.pkTime = motion->time; + gMsgPacket.pkSerialNumber = gSerial++; + gMsgPacket.pkCursor = motion->deviceid; + gMsgPacket.pkX = motion->axis_data[0]; + gMsgPacket.pkY = motion->axis_data[1]; + gMsgPacket.pkOrientation.orAzimuth = + figure_deg(motion->axis_data[3],motion->axis_data[4]); + gMsgPacket.pkOrientation.orAltitude = 1000 - 15 * max + (abs(motion->axis_data[3]),abs(motion->axis_data[4])); + gMsgPacket.pkNormalPressure = motion->axis_data[2]; + + if (!gMsgPacket.pkNormalPressure) + button_state[motion->deviceid] &= ~(1); + else + button_state[motion->deviceid] |= 1; + + gMsgPacket.pkButtons = get_button_state(motion->deviceid); + SendMessageW(hwndTabletDefault,WT_PACKET,0,(LPARAM)hwnd); + } + else if ((event->type == button_press_type)||(event->type == + button_release_type)) + { + XDeviceButtonEvent *button = (XDeviceButtonEvent *) event; + + TRACE_(event)("Recieved tablet button event\n"); + TRACE("Recieved tablet button %s event\n", (event->type == + button_press_type)?"press":"release"); + + set_button_state(button->deviceid); + } + else if (event->type == key_press_type) + { + TRACE_(event)("Recieved tablet key press event\n"); + FIXME("Recieved tablet key press event\n"); + } + else if (event->type == key_release_type) + { + TRACE_(event)("Recieved tablet key release event\n"); + FIXME("Recieved tablet key release event\n"); + } + else if ((event->type == proximity_in_type) || + (event->type == proximity_out_type)) + { + TRACE_(event)("Recieved tablet proximity event\n"); + TRACE("Recieved tablet proximity event\n"); + gMsgPacket.pkStatus = (event->type==proximity_out_type)?TPS_PROXIMITY:0; + SendMessageW(hwndTabletDefault, WT_PROXIMITY, + (event->type==proximity_out_type)?0:1, (LPARAM)hwnd); + } + else + return 0; + + return 1; +} + +int X11DRV_AttachEventQueueToTablet(HWND hOwner, LPWTI_CURSORS_INFO cursor_list, + int num_cursors) +{ + struct x11drv_thread_data *data = x11drv_thread_data(); + int num_devices; + int loop; + int cur_loop; + XDeviceInfo *devices; + XDeviceInfo *target = NULL; + XDevice *the_device; + XInputClassInfo *ip; + XEventClass event_list[7]; + Window win; + WND *wndPtr; + + wine_tsx11_lock(); + + wndPtr = WIN_GetPtr(hOwner); + win = ((struct x11drv_win_data*)wndPtr->pDriverData)->whole_window; + + TRACE("Creating context for window 0x%x (%lx) %i cursors\n",(INT)hOwner, + win, num_cursors); + + devices = pXListInputDevices(data->display, &num_devices); + + for (cur_loop=0; cur_loop < num_cursors; cur_loop++) + { + int event_number=0; + + for (loop=0; loop < num_devices; loop ++) + if (strcmp(devices[loop].name,cursor_list[cur_loop].NAME)==0) + target = &devices[loop]; + + TRACE("Opening cursor %i id %i\n",cur_loop,(INT)target->id); + + the_device = pXOpenDevice(data->display, target->id); + + if (!the_device) + { + WARN("Unable to Open device\n"); + continue; + } + + if (the_device->num_classes > 0) + { + for (ip = the_device->classes, loop=0; loop < target->num_classes; + ip++, loop++) + { + switch(ip->input_class) + { + case KeyClass: + DeviceKeyPress(the_device, key_press_type, + event_list[event_number]); + event_number++; + DeviceKeyRelease(the_device, key_release_type, + event_list[event_number]); + event_number++; + break; + case ButtonClass: + DeviceButtonPress(the_device, button_press_type, + event_list[event_number]); + event_number++; + DeviceButtonRelease(the_device, button_release_type, + event_list[event_number]); + event_number++; + break; + case ValuatorClass: + DeviceMotionNotify(the_device, motion_type, + event_list[event_number]); + event_number++; + ProximityIn(the_device, proximity_in_type, + event_list[event_number]); + event_number++; + ProximityOut(the_device, proximity_out_type, + event_list[event_number]); + event_number++; + break; + default: + ERR("unknown class\n"); + break; + } + } + if (pXSelectExtensionEvent(data->display, win, event_list, + event_number)) + { + ERR( "error selecting extended events\n"); + goto end; + } + } + } + +end: + WIN_ReleasePtr(wndPtr); + wine_tsx11_unlock(); + return 0; +} + +int X11DRV_GetCurrentPacket(LPWTPACKET *packet) +{ + memcpy(packet,&gMsgPacket,sizeof(WTPACKET)); + return 1; +}

6 6

wine-dbg gone mad?
by Kye Lewis April 24, 2003

April 24, 2003

I've just had this problem: A program had crashed and wing-dbg has been initiated, when I pressed CTRL+C it went back to the console. however then like mad "wine-dbg>" kept appearing over and over until I exited the console. Like "winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg>" Over and over and over (and over... and over...... and over..... etc) Any ideas why this is? Oh, and on an unrelated note, I noticed that Opera 5 runs well in wine - do the newer versions run just as well?

3 2

Re: Fix comctl/trackbar creation
by BiGgUn April 24, 2003

April 24, 2003

> If you run for example edonkey 0.26+, you can see that it crashes as > soon as you enter the preference dialog box. do u talk about edonkey or emule ? Anyway, this path fixes a crash bug in emule 0.27c :)

3 2

Re: winehq mailing list archives being harvested by spammers
by Brian Vincent (C) April 24, 2003

April 24, 2003

> executive summary: "please obscure the email addresses in the > winehq mailing list archives, I'm drowning in spam"! FWIW, Zack Brown and I began obscuring all the email address in the Wine Traffic / Kernel Traffic newsletters a while ago. They used to be embedded in the XML, HTML and various pages referenced on the site. However, any email sent to wine-devel before mid October will show up in the mailing list stats in the XML pages on both WineHQ and Wine Traffic (Zack's site). --------------- Brian Vincent Copper Mountain Telecom vincentb(a)coppercolorado.com

3 2

winehq mailing list archives being harvested by spammers
by Dan Kegel April 24, 2003

April 24, 2003

Hi, executive summary: "please obscure the email addresses in the winehq mailing list archives, I'm drowning in spam"! I am facing a tidal wave of spam. Recent research showed that the main way spammers get email addresses is by web crawling. Therefore, I'm doing a web search for my work email address (dank at ixiacom.com) and doing my best to erase all mention of it. I hate doing this, but the spam is getting so bad I have to do something, and spam filtering isn't quite doing the job. I expect others are now or will soon be in the same situation. Most mentions of my work address are in web archives of mailing lists. While many mailing lists have instituted some privacy controls, many others have not. Here's a couple examples of archived messages containing my work address: http://www.winehq.com/hypermail/wine-users/2001/09/0474.html http://www.winehq.com/hypermail/wine-devel/2003/02/0190.html I have no specific evidence the wine archives in particular have been harvested by spammers, but if Google can see my address there, so can they... Examples of effective privacy measures for mailing list archives include: * restricting archive access to list members * not restricting access, but using the HTTP password mechanism to discourage spiders (e.g. perforce-users mailing list) * simply obscuring all email addresses in message headers or trailers That last countermeasure is my favorite one, since it means that Google will still have full access to the info in the list archive. I would greatly appreciate it if the archive would institute one of the above spam countermeasures (preferably the last one). I understand that overly harsh spam countermeasures would be harmful to normal discourse, but I trust some useful middle ground can be found. Thanks, Dan Kegel -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045

6 6

Re: ODBC
by Bill Medland April 24, 2003

April 24, 2003

On April 23, 2003 09:46 am, Ludueña, Leonardo wrote: > We have an application developed by our company, that > application use a ODBC connection. I need to know if there > previous experiencies with that kind of port. > > TIA What do you want to know? The builtin version of odbc32.dll basically acts as a connection to any underlying unix ODBC (e.g. unixODBC or iODBC; I only have experience of unixODBC). Therefore it basically handles just about anything that the underlying ODBC does. We use it against IBM DB2 databases, and I think we have succeeded (sort of, in the past) against Oracle databases. The problem against MS-SQL and other databases is finding a unixODBC driver. The other possibility is to use a native Microsoft odbc32.dll and its drivers (if that is legal) and depend upon Wine handling the low-level network stuff etc. I don't personally have any experience of that. -- Bill Medland ACCPAC International, Inc. medbi01(a)accpac.com Corporate: www.accpac.com Hosted Services: www.accpaconline.com

1 0

Re: PATCH: include/objidl.h
by Uwe Bonnes April 24, 2003

April 24, 2003

>>>>> "Gerald" == Gerald Pfeifer <pfeifer(a)dbai.tuwien.ac.at> writes: Gerald> Modern compilers (such as the one shipped with SuSE Linux 8.2) Gerald> complain about this construct, which is quite useless anyway. Gerald> Gerald Gerald> ChangeLog: Remove useless DUMMYSTRUCTNAME from _userSTGMEDIUM. Gerald, either this is wrong for the other 30 occurances in ~/include, or more explanation is needed, why this is wrong here and not in the other places. Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

1 0

I: Wine and SQl server.
by Carlo Pelini April 24, 2003

April 24, 2003

> -----Messaggio originale----- > Da: Carlo Pelini > Inviato: giovedì 24 aprile 2003 17.42 > A: 'wine-users(a)Winehq.com' > Oggetto: Wine and SQl server. > > Hy. I am a computer science student, and I am studing wine for my degree > thesis. > I have succeded to run VisualFoxPro on wine and by VisualFoxPro i have > succeded to utilize the unixODBC and the ODBC windows. With the unixODBC I > have succeded to open a connession with a database SQL server, to execute > a interrogation and to visualize the result. > For to can to do there, I dont'have utilized directly the driver SQL > server, but I have utilzed easysoft ODBC-ODBC bridge > (http://www.easysoft.com/products/oob/main.phtml) a ODBCF driver, which > do precisely from bridge between the ODBC client and the ODBC server, and > allow the connession with a database SQL server. > Thank at there proceeding, I have succeded to run AD HOC REVOLUTION, a > managerial software, even if is slow. > Bye.

1 0

Server Crash
by Jeremy Newman April 24, 2003

April 24, 2003

It's time for the annual server crash kids! Whee! Our server melted last night at about 3am or so after 2 days of solid high traffic (the load average was up over 100). I managed to get it up and running with some WD-40, Duct Tape, and some bubble gum. I can't guarantee uptime right now. I AM, however, scrambling to beef it up to handle the load. I apologize in advance for any further downtime. As you can imagine, with all this good press, I don't want the server do be down any longer than a few nanoseconds. If anyone has a quad processor Xeon they are not using, feel free to send it my way. :-D -- Jeremy Newman <jnewman(a)codeweavers.com> CodeWeavers, Inc.

1 0

Wintab32 dll devlopment
by Robert North April 23, 2003

April 23, 2003

I have just posted a status update on my wintab32 development to the following wine bug. http://bugs.winehq.com/show_bug.cgi?id=1160 And following on from that update there are a number of questions I need answered to guide my further development: 1. Cross over office and tablets. I heard somewhere that Crossover office had a tablet implementation. Does anyone know about this, and who to contact to find out more? If they've got an implementation of wintab, I wonder if it's worth continuing the development. 2. When to post patches I could start producing patches quite soon. For instance, I could post patches when the WTInfo function is working. Or, I could wait till the whole system is working fully with at least one app? 3. Size of the patches. Is it better to break patches into small (valid compile, but non-functioning) chunks, or to release large functioning patches? 4. Config files Wintab will need some config data. I assume the best place to put this is in the ~/.wine/config file, within a registry key named "wintab"? 5. Development notes. I have some notes on the design that other developers will probably find useful. Where in the wine project should they go? There seems to be no place for rough notes. 6. x11drv integration. Currently the code is implemented to connect to X11 in a similar way to directX. No additional code is placed in the x11drv dll. This X11 connection should be discarded. To this end I have a number of functions that I'd like to place in x11drv dll. The question is: Should I put them into x11drv before releasing any patches, or maintain the directX style connection in the initial wine patches? 7. Cross-platform abilities Is there any need to think about allowing alternatives to XInput to plug into the wintab dll? Yeah, I know that's a lot of questions, But I hope you guys can give me some guidance. Bye -Rob.

4 4

WineHQ's CVS server performance..
by Lionel Ulmer April 23, 2003

April 23, 2003

Hi all, Am I the only to find the current CVS performance abyssmal ? About 5 minutes for a CVS update and 10 for a CVS diff is not what I usually have on my connection... Let's hope it's Alexandre merging all the Crossover Office 2.0 patches <g>. Lionel -- Lionel Ulmer - http://www.bbrox.org/

3 2

CVS Character set (was: lostwages/templates/en documentation.template)
by Joerg Mayer April 23, 2003

April 23, 2003

I'm noticing that during the last few weeks several mails have been sent to the cvs list that use 8-bit characters but do not specifiy an encoding in the mail header. Would it be possible to either add one (depends on whether cvs does recognize the encoding type) or remove those extra characters? On Tue, Apr 22, 2003 at 01:28:01PM -0500, Jeremy Newman wrote: > Log message: > ChangeLog > Â Â Â Dimitrie O. Paun <dpaun(a)rogers.com> > Â Â Â Remove references to no longer existing document. > > Patch: http://cvs.winehq.com/patch.py?id=7945 Thanks Jörg -- Joerg Mayer <jmayer(a)loplof.de> We are stuck with technology when what we really want is just stuff that works. Some say that should read Microsoft instead of technology.

1 0

RE: FoxPro & Wine :)
by Patrik Stridvall April 23, 2003

April 23, 2003

> On Wed, 23 Apr 2003, Patrik Stridvall wrote: > > > While, I suppose, you can have a license the regulates this to, even > > if the LGPL doesn't, the problem is the doctrine of first sale means > > anybody that it can be distributed to can resell (or give) that copy > > to anybody that can't be distributed directly to. > > And that is in no contradiction with the (L)GPL, as it does not > restrict to whom we can redistribute, but rather under what > conditions a derived work can be distributed. But that is exactly what I said above. Should I interpret it as you agree? But please note that the last step meantioned above is not distribution, it is sale (or gift) on an invidual copy allowed by first sale. And as I said earlier, it makes the conditions for redistribution is rather meaningless, since anybody regardless or willingless or abillity to follow the redistribution conditional can indirectly for all intent and purposed have distributed to anybody your work, while seperately distributing anything that uses, modififies, adapts etc your work for his purposes on the end users computer. The situation for the Microsoft Visual FoxPro (MVFP) runtime is almost identical since you analagous to above can for all intent and purpose have it distributed seperately. Summary: Microsoft released the MVFP runtime for all intent an purpose for free since they thought that charging for it would be bad for their purposes. Some people release some work under the LGPL because they thought charging for it would be bad for their purposes... Nobody can both have the cake and eat it. Microsoft can't, I can't, you can't... And futher more, again, Copyright law is designed that way on purpose, not by accident.

1 0

odd message
by Robert Lunnon April 23, 2003

April 23, 2003

I am debugging a shareware game my kids often play called little fighter 2 (It deadlocks after creating the third thread) But before I get to the deadloack I noticed I get the following two messages from wine, err:module:BUILTIN_LoadModule loaded .so but dll wineaudioio.drv still not found err:module:BUILTIN_LoadModule loaded .so but dll joystick.drv still not found from what I can see wine is loading the two shared libraries ok and __wine_dll_register gets properly called EG Breakpoint 2, __wine_dll_register (header=0xdcb82480, filename=0xdcb721f6 "wineaudioio.drv") at loader.c:327 Yet find_dll_descr( dllname ) in builtin.c fails to find the name ?? Any hints would be appreciated

1 1

Re: oleaut32 patch
by Alexandre Julliard April 23, 2003

April 23, 2003

Ove Kaaven <ovek(a)arcticnet.no> writes: > The oaidl_p.c is almost unmodified MIDL output generated from Wine's > oaidl.idl (I only had to add an #undef __WINE__ at the top to get all > the Winelib definitions, perhaps this isn't needed under Wine anymore), > so it shouldn't be hard to maintain, and Alexandre once said MIDL output > is acceptable as a stopgap solution. I don't know if proper > InstallShield repaint support calls for stopgaps, though. One problem is that this code causes hundreds of warnings, and I don't think that's acceptable (it also fails to link but that could be fixed by adding a few stubs). We could fix the warnings manually but that will cause obvious maintenance problems. How far are we from being able to generate that with widl? -- Alexandre Julliard julliard(a)winehq.com

3 3

Re: Winelib CoolPlayer port
by Dimitrie O. Paun April 23, 2003

April 23, 2003

On April 22, 2003 04:17 pm, Vincent Béron wrote: > Next is the actual Winelib stuff, which is very small. Just a few lines indeed! > The first part is an MFC header (thankfully, nothing else seems to be > needed from MFC). This is the: --- CoolPlayerCVS-20030421-2130-orig/afxres.h 1969-12-31 19:00:00.000000000 -0500 +++ CoolPlayerCVS-20030421-2130/afxres.h 2003-04-21 21:51:07.000000000 -0400 @@ -0,0 +1 @@ +#include "winres.h" right? > The second part is the only problematic thing. The current div > implementation works fine for binary compatibility on i386, but doesn't > work well for source level compatibility on the same platform. I would prefer if we fix this one in Wine, so we don't have to submit this part for inclusion in the CoolPlayer code. This would be _our_ benefit for the port, no? :) -- Dimi.

1 0

Re: Fix trackbar size
by Dimitrie O. Paun April 23, 2003

April 23, 2003

On April 22, 2003 05:55 pm, Maxime Bellengé wrote: > + * Copyright 2003 Maxime Belleng�<maxime.bellenge(a)laposte.net> > * > * This library is free software; you can redistribute it and/or > * modify it under the terms of the GNU Lesser General Public > @@ -231,13 +232,13 @@ > channel->top = lpRect.top + offsetedge; > channel->bottom = lpRect.bottom - offsetedge; > channel->left = lpRect.left + offsetthumb; > - if (dwStyle & (TBS_BOTH | TBS_LEFT)) channel->left += 8; > + if (dwStyle & (TBS_BOTH | TBS_LEFT)) channel->left += > (lpRect.right-lpRect.left-offsetthumb-cyChannel)/2; Unfortunately, the patch seems to be wrapped, and your name did not show up properly in the copyright notice. -- Dimi.

1 0

Re: Fix Maskedit from Delphi - part 2 - Resend as attach to fix formatting
by Alexandre Julliard April 23, 2003

April 23, 2003

Brad Campbell <brad(a)seme.com.au> writes: > EM_REPLACESTR was not respecting buffer_limit set > by EM_SETLIMITTEXT. Shouldn't the EDIT_MakeFit() call a few lines above already take care of that? Why doesn't it work? -- Alexandre Julliard julliard(a)winehq.com

2 1

RE: FoxPro & Wine :)
by Patrik Stridvall April 22, 2003

April 22, 2003

> On Tue, 22 Apr 2003, Patrik Stridvall wrote: > > > EULAs tries to restrict, yes. However a copyright license > does as well, > > if it, like most copyleft licenses, tries to take back the rights > > you have already given up by allowing redistribution of the work > > in the first place. > > This is the source of the confusion. I don't take back anything, as > I don't allow limitless redistribution. Since you allow everybody that wants the work to legally get it for free, that is just meaningless game withs words. Even if not everybody can (re)distribute it, enough can to make it for all intent and purpose a meaningless distiction. See below. > I allow redistribution only > under certain condition. It's conditional: > A => B > You seem to think that one can not use conditionals. This is obviously > false. "You can do B IF condition A holds" is a very reasonable > statement. It's basic logic, no cake and no eating involved. [You don't really expect me to have missed something as trivial as that, do you?] The problem is that you with the LGPL only have conditionals on who can (re)distribute the work, but no conditional on whom it can be (re)distributed to. While, I suppose, you can have a license the regulates this to, even if the LGPL doesn't, the problem is the doctrine of first sale means anybody that it can be distributed to can resell (or give) that copy to anybody that can't be distributed directly to. Futhermore I would argue that first sale doctrine, for all intent and purpose, means that you as the copyright holder, can't regulate who ultimately a copy of your work, ends up with. So any such clause would be null and void, so no trickery would be needed. Note that copyright is designed that way on purpose, not as a freak accident. So now we are back to: 1. You can give your work away for free 2. You can sell your work for a fee But you can't control whom ultimately recieves and uses your work. So again: "You can't both have the cake and eat it"

3 2

RE: FoxPro & Wine :)
by Patrik Stridvall April 22, 2003

April 22, 2003

> On Tue, 22 Apr 2003, Patrik Stridvall wrote: > > > Very, very simplified. You have basicly have two choices: > > 1. Distribute your work (or part of it) for free > > 2. Distribute your work (or part of it) for a fee. > > Says who? Says close to every business who uses copyright. Open sourse is not that large yet, you know. > Why would you think price is *the* fundamental feature? Because in the end there is really nothing else. If the work is useful to some extent, somebody will profit from directly or indirectly. Hopefully the author will as well... Futhermore, since if we are to have things like first sale, which we have, you really can't avoid that somebody converts each copy you have allowed the distribution of, to money. (Except by releasing more copies which will at least in theory drive the price to zero.) So unless you convert each copy you allow to distribute to money somebody else will. Note however this is not nessarily negative for you. Indirectly you might get more back that would have gotten through direct sale. > Copyright law gives you rights (by restricting other's rights) > so that you could use them, if you so desire, to get some money > for your work. Copyleft just says you give up some of your rights, > EULA restricts. Which is fine, but within limits -- it's much > harder (legally) to take from people than to give. EULAs tries to restrict, yes. However a copyright license does as well, if it, like most copyleft licenses, tries to take back the rights you have already given up by allowing redistribution of the work in the first place. That is what I mean by "trying to both have the cake and eat it". You have voluntary "eaten the cake" by allowing redistribution of the work and now you want it back... > As I said, why would we want to give the manufacturer of a TV set > the right to tell me what programs I'm allowed to watch on my TV? > Or what brand of gas to put in my car. Or what brand of detergent > in my washing machine? Agreed. However, your argument supports my position concerning LGPL, more than yours. > Having generally accepted interfaces (steering wheel, pedals, and > stick for a car, gas of certain octane, etc) is good because it > allows for multiple implementations == competition. But this works > as long as you can't restrict what *implementations* you're allowed > to use. Exactly, but again, it support my position more than yours. > I don't know my histroy right, but I believe this sort of > restrictions (among other things) allowed Rockefeller to build his > Standard Oil monopolistic empire, and is now illegal. IIRC the Standard Oil problem, was more a refusal to do business at all unless you cooperated more than anything else. Not really revelevent to this discussing. In the case above you have already done business by allowing redistribution ("eaten the cake") and later through legal wrangling wants to "have it" back.

2 1

Re: rpc exception
by Robert Shearman April 22, 2003

April 22, 2003

> I see that Greg's exception stuff is not in Wine yet. Until that's > accepted, this'll have to do. [snip] This is just an idea, but would something like this work (obviously without Intel syntax): #define RpcExcept(expr) \ VOID * FuncPtr = GETEIP; \ if (__wine_in_exception_filter()) \ { \ int retval; \ switch( expr ) \ { \ case -1: \ retval = -1; \ break; \ case 0: \ retval = 0; \ break; \ case 1: \ retval = 1; \ break; \ } \ __asm \ { \ mov eax,retval \ ret 4 \ }; \ } \ __EXCEPT((__WINE_FILTER)FuncPtr) Rob

1 0

another wine apps database
by Dan Kegel April 22, 2003

April 22, 2003

Anyone seen this one yet? http://thetechnozone.com/pcbuyersguide/software/system/TheWineList.html It seems good enough that perhaps there should be a link to it from http://www.winehq.com/?page=supported_applications We might want to nudge the author into disclosing the version number of the Wine he was using, so non-Knoppix users can compare versions. - Dan p.s. Here's its lead-in text: "The WINE List By Graeme Bennett Posted Aug. 6, 2002; updated Mar. 26, 2003 Introduction Wine (which, its authors say, stands for 'Wine is not an emulator') is a Windows-compatible application launching environment for Linux and several other non-Microsoft other operating systems in which users can run many programs designed for Windows. Since not every Windows program runs correctly under Wine, and many of the programs I tested successfully were not listed on the other Wine compatibility lists I found, I've put together this list of programs that work (or at least seem to work -- I didn't test every function of every program!) more or less as they do under Windows. For these tests, I used the Wine version built into Knoppix versions 3.1 and 3.2. Knoppix is a free Debian-based Linux distribution that requires no installation on or changes to your hard drive. It boots and runs its filesystem directly from a CD. Additionally, it write-protects your Windows hard drive(s) by default, making it an exceptionally safe way to test Wine and/or Linux. Zero Config Wine All programs tested were previously installed and no special setup, configuration or manual file copying under Wine was used. In other words, any program listed below works "as is." ..." -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045

2 1

RE: FoxPro & Wine :)
by Patrik Stridvall April 22, 2003

April 22, 2003

> > > And the question is: is this enforceable? > > > > And the answer is: if it isn't, neither is the (L)GPL. Why > would MS not > > be able to place restrictions on distribution of their own > copyrighted code? > > > > Not in the case of Microsoft. This should fall under the > sherman Anti-Trust Act. Probably true, but I would hate to use that argument in court, unless as the very last line of defence. > If I buy a copy > of MS Visual Studio and I have to redistribute files to > Windows 9x, NT, 2K, XP, Etc then I should > be able to also redistribute the same files to Linux or ReactOS. Also note that if you for example put it on a web site, you are not really redistributing to a special OS, in fact you are not really even redistributing to a special person or company, you are just redistributing it period....

1 0

Re: NTPL & pthreads locks
by Dan Kegel April 22, 2003

April 22, 2003

Alexandre Julliard wrote: > I don't think we can implement Win32 primitives on top of pthreads, at > least not in a reasonable way. We may be able to do it on top of the > raw kernel futexes, but that's not exactly libc integration (and it > will most likely require new kernel features too). And the only reason > for doing that would be performance, it's certainly not going to make > things more intuitive or more solid. Somebody begs to differ. From http://downloads.transgaming.com/files/winex-3_0_releasenotes.txt : * The core threading model has moved to pthreads to decouple WineX from the continuing changes to certain core system libraries. If Gav can do it, why can't we? :-) - Dan -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045

4 5

windres: -fo (fwd)
by Dimitrie O. Paun April 22, 2003

April 22, 2003

---------- Forwarded message ---------- Date: Tue, 22 Apr 2003 14:07:11 -0400 (EDT) From: Dimitrie O. Paun <dimi(a)intelliware.ca> To: binutils(a)sources.redhat.com Subject: windres: -fo This one is the last (famous last words :)) patch in my series of compatibility patches. With this one in, we can hopefully get rid of the ugly ifdefs in Makefiles. You gotta hate MS for the ugly choice of option names... :( BTW, this is now also supported by wrc, so we get the tree way compatibility: windres, wrc, rc. 2003-04-22 Dimitrie O. Paun <dpaun(a)rogers.com> * windres.c: Support -fo for compatibility with rc. (main): Support the -fo option as a synonym for -o. * doc/binutils.texi: Added -fo to the list of options. Index: windres.c =================================================================== RCS file: /cvs/src/src/binutils/windres.c,v retrieving revision 1.17 diff -u -r1.17 windres.c --- windres.c 22 Apr 2003 17:31:08 -0000 1.17 +++ windres.c 22 Apr 2003 18:01:56 -0000 @@ -698,7 +698,7 @@ program_name); fprintf (stream, _(" The options are:\n\ -i --input=<file> Name input file\n\ - -o --output=<file> Name output file\n\ + -o -fo --output=<file> Name output file\n\ -J --input-format=<format> Specify input format\n\ -O --output-format=<format> Specify output format\n\ -F --target=<target> Specify COFF target\n\ @@ -813,7 +813,7 @@ language = 0x409; /* LANG_ENGLISH, SUBLANG_ENGLISH_US. */ use_temp_file = 0; - while ((c = getopt_long (argc, argv, "i:l:o:I:J:O:F:D:U:rhHvV", long_options, + while ((c = getopt_long (argc, argv, "f:i:l:o:I:J:O:F:D:U:rhHvV", long_options, (int *) 0)) != EOF) { switch (c) @@ -822,6 +822,10 @@ input_filename = optarg; break; + case 'f': + if (*optarg != 'o') fatal (_("Unknown option -f%s.\n"), optarg); + optarg++; + /* fall through */ case 'o': output_filename = optarg; break; Index: doc/binutils.texi =================================================================== RCS file: /cvs/src/src/binutils/doc/binutils.texi,v retrieving revision 1.37 diff -u -r1.37 binutils.texi --- doc/binutils.texi 22 Apr 2003 17:31:08 -0000 1.37 +++ doc/binutils.texi 22 Apr 2003 18:02:05 -0000 @@ -2570,6 +2570,7 @@ standard input. @item -o @var{filename} +(a)item -fo(a)var{filename} @itemx --output @var{filename} The name of the output file. If this option is not used, then @command{windres} will use the first non-option argument, after any used -- Dimi.

1 0

new script uses winedump
by David Miller April 22, 2003

April 22, 2003

I have modified the script which cross references dll imports to use winedump instead of dumpbin. It runs in linux now so that more people are able to run it. It is available at http://home.ptd.net/~compsol Please send any questions or comments to me.

1 0

windres: -J -I (take 4)
by Dimitrie O. Paun April 22, 2003

April 22, 2003

OK, I've received the copyright assignment notification on Apr 10, 2003. (I've forwarded a copy to the list, let me know if you did not get it). So I guess it's prime time for this little patch of mine. Please apply. I have one more patch in mind for windres, and I'm happy :) 2003-04-15 Dimitrie O. Paun <dpaun(a)rogers.com> * windres.c (format_from_name): make the exit on error behaviour optional. (main): Rename the -I option to -J. Introduce -I as synonym for --include-dir. For backwards compatibility also support the old -I behaviour, but issue a deprecation warning. * doc/binutils.texi: Rename -I to -J. Document the new behaviour of the -I option. * testsuite/binutils-all/windres/windres.exp: Add test for the new -J option. Index: windres.c =================================================================== RCS file: /cvs/src/src/binutils/windres.c,v retrieving revision 1.16 diff -u -r1.16 windres.c --- windres.c 5 Apr 2003 08:21:46 -0000 1.16 +++ windres.c 16 Apr 2003 03:14:37 -0000 @@ -106,8 +106,7 @@ /* 150 isn't special; it's just an arbitrary non-ASCII char value. */ -#define OPTION_INCLUDE_DIR 150 -#define OPTION_PREPROCESSOR (OPTION_INCLUDE_DIR + 1) +#define OPTION_PREPROCESSOR 150 #define OPTION_USE_TEMP_FILE (OPTION_PREPROCESSOR + 1) #define OPTION_NO_USE_TEMP_FILE (OPTION_USE_TEMP_FILE + 1) #define OPTION_YYDEBUG (OPTION_NO_USE_TEMP_FILE + 1) @@ -116,8 +115,8 @@ { {"define", required_argument, 0, 'D'}, {"help", no_argument, 0, 'h'}, - {"include-dir", required_argument, 0, OPTION_INCLUDE_DIR}, - {"input-format", required_argument, 0, 'I'}, + {"include-dir", required_argument, 0, 'I'}, + {"input-format", required_argument, 0, 'J'}, {"language", required_argument, 0, 'l'}, {"output-format", required_argument, 0, 'O'}, {"preprocessor", required_argument, 0, OPTION_PREPROCESSOR}, @@ -135,7 +134,7 @@ static void res_init PARAMS ((void)); static int extended_menuitems PARAMS ((const struct menuitem *)); -static enum res_format format_from_name PARAMS ((const char *)); +static enum res_format format_from_name PARAMS ((const char *, int)); static enum res_format format_from_filename PARAMS ((const char *, int)); static void usage PARAMS ((FILE *, int)); static int cmp_res_entry PARAMS ((const PTR, const PTR)); @@ -583,8 +582,9 @@ /* Convert a string to a format type, or exit if it can't be done. */ static enum res_format -format_from_name (name) +format_from_name (name, exit_on_error) const char *name; + int exit_on_error; { const struct format_map *m; @@ -592,7 +592,7 @@ if (strcasecmp (m->name, name) == 0) break; - if (m->name == NULL) + if (m->name == NULL && exit_on_error) { non_fatal (_("unknown format type `%s'"), name); fprintf (stderr, _("%s: supported formats:"), program_name); @@ -699,15 +699,15 @@ fprintf (stream, _(" The options are:\n\ -i --input=<file> Name input file\n\ -o --output=<file> Name output file\n\ - -I --input-format=<format> Specify input format\n\ + -J --input-format=<format> Specify input format\n\ -O --output-format=<format> Specify output format\n\ -F --target=<target> Specify COFF target\n\ --preprocessor=<program> Program to use to preprocess rc file\n\ - --include-dir=<dir> Include directory when preprocessing rc file\n\ + -I --include-dir=<dir> Include directory when preprocessing rc file\n\ -D --define <sym>[=<val>] Define SYM when preprocessing rc file\n\ -U --undefine <sym> Undefine SYM when preprocessing rc file\n\ -v --verbose Verbose - tells you what it's doing\n\ - --language=<val> Set language when reading rc file\n\ + -l --language=<val> Set language when reading rc file\n\ --use-temp-file Use a temporary file instead of popen to read\n\ the preprocessor output\n\ --no-use-temp-file Use popen (default)\n")); @@ -776,6 +776,7 @@ char *input_filename; char *output_filename; enum res_format input_format; + enum res_format input_format_tmp; enum res_format output_format; char *target; char *preprocessor; @@ -812,7 +813,7 @@ language = 0x409; /* LANG_ENGLISH, SUBLANG_ENGLISH_US. */ use_temp_file = 0; - while ((c = getopt_long (argc, argv, "i:l:o:I:O:F:D:U:rhHvV", long_options, + while ((c = getopt_long (argc, argv, "i:l:o:I:J:O:F:D:U:rhHvV", long_options, (int *) 0)) != EOF) { switch (c) @@ -825,12 +826,12 @@ output_filename = optarg; break; - case 'I': - input_format = format_from_name (optarg); + case 'J': + input_format = format_from_name (optarg, 1); break; case 'O': - output_format = format_from_name (optarg); + output_format = format_from_name (optarg, 1); break; case 'F': @@ -869,7 +870,16 @@ verbose ++; break; - case OPTION_INCLUDE_DIR: + case 'I': + /* for backward compatibility, should be removed in the future */ + input_format_tmp = format_from_name (optarg, 0); + if (input_format_tmp != RES_FORMAT_UNKNOWN) + { + fprintf (stderr, _("Option -I is deprecated for setting the input format, please use -J instead.\n")); + input_format = input_format_tmp; + break; + } + if (preprocargs == NULL) { quotedarg = quot (optarg); Index: doc/binutils.texi =================================================================== RCS file: /cvs/src/src/binutils/doc/binutils.texi,v retrieving revision 1.36 diff -u -r1.36 binutils.texi --- doc/binutils.texi 9 Apr 2003 09:55:13 -0000 1.36 +++ doc/binutils.texi 16 Apr 2003 03:14:42 -0000 @@ -2577,7 +2577,7 @@ non-option argument, then @command{windres} will write to standard output. @command{windres} can not write a COFF file to standard output. -(a)item -I @var{format} +(a)item -J @var{format} @itemx --input-format @var{format} The input format to read. @var{format} may be @samp{res}, @samp{rc}, or @samp{coff}. If no input format is specified, @command{windres} will @@ -2605,11 +2605,17 @@ to use, including any leading arguments. The default preprocessor argument is @code{gcc -E -xc-header -DRC_INVOKED}. +(a)item -I @var{directory} @item --include-dir @var{directory} Specify an include directory to use when reading an @code{rc} file. @command{windres} will pass this to the preprocessor as an @option{-I} option. @command{windres} will also search this directory when looking for -files named in the @code{rc} file. +files named in the @code{rc} file. If the argument passed to this command +matches any of the supported @var{formats} (as descrived in the @option{-J} +option), it will issue a deprecation warning, and behave just like the +(a)option{-J} option. New programs should not use this behaviour. If a +directory happens to match a @var{format}, simple prefix it with @samp{./} +to disable the backward compatibility. @item -D @var{target} @itemx --define @var{sym}[=@var{val}] Index: testsuite/binutils-all/windres/windres.exp =================================================================== RCS file: /cvs/src/src/binutils/testsuite/binutils-all/windres/windres.exp,v retrieving revision 1.3 diff -u -r1.3 windres.exp --- testsuite/binutils-all/windres/windres.exp 27 Jul 2001 16:16:07 -0000 1.3 +++ testsuite/binutils-all/windres/windres.exp 16 Apr 2003 03:14:43 -0000 @@ -81,6 +81,40 @@ setup_xfail *-* } + verbose "$wr -J rc -O res $res tmpdir/$broot.res" 1 + catch "exec $wr -J rc -O res $res tmpdir/$broot.res" err + + if ![string match "" $err] then { + send_log "$err\n" + verbose "$err" 1 + fail "windres/$broot (parse)" + continue; + } + pass "windres/$broot (parse)" + + set rc [open $res] + while { [gets $rc line] != -1 } { + if ![regexp "^(//|/\*|#)" $line] { + break + } + if [regexp "parse-only" $line] { + file delete "tmpdir/$broot.res" + set done 1 + break; + } + if [regexp "\[xc\]fail *(\[^ \]*)" $line junk sys] { + setup_xfail $sys + continue; + } + } + if { $done != 0 } { + continue; + } + + if { "$broot" != "bmpalign" && "$target_xfail" == "yes" } { + setup_xfail *-* + } + verbose "$wr -I rc -O res $res tmpdir/$broot.res" 1 catch "exec $wr -I rc -O res $res tmpdir/$broot.res" err -- Dimi.

2 1

vxd idea
by Vilppa Salt April 22, 2003

April 22, 2003

Hi Could this Qemu emulator be used for running applications with vxd files on x86? If ring 0 is reserved so could it be emulated with qemu and mapped appropriately inside Wine? --- Vilppa- Sunpoint.net ilmoittaa: Sunpoint.net tarjoaa kaikille rekisteröityneille käyttäjilleen kuukausimaksuttoman Internet -yhteyden (pvm). http://www.sunpoint.net/SunAds/click.htm?mode=footer&id=71&jump=http%3A%2F%…

2 1

Re: named pipe patch
by Dan Kegel April 22, 2003

April 22, 2003

Bill Medland wrote: >>Agreed. But blocking is hard. It may require the full rewrite of >>wine's named pipe support the other guy is working on. > > > It probably requires more than that; I reckon it may require a rewrite of the > general flushing code. Since it has to block, I don't know where the waiting > is supposed to happen (in the server or in the client) I had an idea on this -- might not be so hard after all. >>My guess is that the data loss you were running into is the >>main real-world issue, and the fact we don't blocking on pipe flush >>won't be a showstopper. Please do try my patch, and >>let me know what you see in practice. I'd like to know if >>what I'm doing is even close. > > > Doesn't seem to work, I'm afraid. OK, I'll chuck that part of my patch then. > Don't bother trying to hack it on my behalf, just do it for yourself. I get > around it by sticking a 50ms sleep in the server before the flush; it's long > enough to force a process switch and for the client to read the pipe. It'll > do for a few months while I am developing and hopefully the proper fix will > be out then. I bet I can stick in a test on bytes in the pipe and loop appropriately. My need has vanished -- now I'm just trying to achieve win32 compliance. - Dan -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045

1 0

RE: FoxPro & Wine :)
by Patrik Stridvall April 22, 2003

April 22, 2003

> Dimitrie O. Paun wrote: > > On April 22, 2003 01:17 am, Dan Kegel wrote: > > > >>It may not be, but at least it brings it into the realm > >>of Microsoft moves we've seen before. (cf. MFC dlls, which are > >>never distributed with Windows itself, and may legally > >>tie all MFC apps to run on Windows alone, if the MFC EULA > >>holds. Or so I recall.) > > > > > > And the question is: is this enforceable? > > And the answer is: if it isn't, neither is the (L)GPL. Why > would MS not > be able to place restrictions on distribution of their own > copyrighted code? With risk of rekindling the LGPL debate, I have to agree. Both the Wine LGPL issue and the Microsoft "DLL" redistribution issue above have one thing in common: "Somebody is both trying to have the cake and eat it." I have a long time, invain it seems, been trying to argue that copyright law neither: 1. Should (from a sane public policy point of view) 2. Intends (from what copyright traditionally is meant for) 3. Does (from a strict, by the letter, analysis on the law) support the view that it is allowed to both "have the cake and eat it". Very, very simplified. You have basicly have two choices: 1. Distribute your work (or part of it) for free 2. Distribute your work (or part of it) for a fee. if you choose (1) because you for some reason doesn't think (2) is to your advantages you have no right to complain that things didn't work out as you hoped. In the Microsoft Visual FoxPro it is quite obvious that demanding a fee for the "runtime" would reduce the number of developers using the product, so they didn't. Now they have to live with the consequences...

2 1

re: FoxPro & Wine :)
by Dan Kegel April 22, 2003

April 22, 2003

Dimi wrote: > Summary: Microsoft threatens developers for running > Visual FoxPro on Linux using Wine. > > http://yro.slashdot.org/yro/03/04/21/2045200.shtml?tid=109&tid=125 > > I still don't get it how it is legal to tie a product to the OS. It's the redistributable files. See http://www.linuxtransfer.com/h/misc_vfplinuxjackofhearts.htm for the details. - Dan -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045

7 8

getopt_long not found, even though it is present
by Gerald Pfeifer April 22, 2003

April 22, 2003

Assume we are on a system which does have /usr/local/include/getopt.h, and support for getopt_long, but where getopt_long is _not_ in libc. Our configure then diagnoses #define HAVE_GETOPT_H 1 /* #undef HAVE_GETOPT_LONG */ which leads a compilation error for tools/wrc/wrc.c which includes "wine/port.h" and <getopt.h>, for _both_ define struct option. As far as I can see, the problem here is that in tools/wrc/wrc.c we check for the presence of HAVE_GETOPT_H, while in wine/port.h we check for HAVE_GETOPT_LONG. The patch below is one way to fix this problem, another way would be to move the #inclusion of <getopt.h> from individual files to wine/port.h. Yet another option would be the hack autoconf to try linking libgnugetopt when looking for getopt_long, but I don't know how to hack this into configure. How should we resolve this? Gerald Index: wrc.c =================================================================== RCS file: /home/wine/wine/tools/wrc/wrc.c,v retrieving revision 1.33 diff -u -3 -p -r1.33 wrc.c --- wrc.c 28 Mar 2003 19:31:49 -0000 1.33 +++ wrc.c 17 Apr 2003 10:18:18 -0000 @@ -32,7 +32,9 @@ #include <ctype.h> #include <signal.h> #ifdef HAVE_GETOPT_H -# include <getopt.h> +# ifdef HAVE_GETOPT_LONG +# include <getopt.h> +# endif #endif #include "wrc.h"

1 1

Abiword on Wine. Still pathological text display.
by Dan Kegel April 22, 2003

April 22, 2003

Various people have tried running Abiword on Wine in the past. I and one other person had trouble with 0.9 and 0.99: http://www.winehq.com/hypermail/wine-devel/2001/08/0036.html http://www.abisource.com/mailinglists/abiword-dev/01/November/0005.html http://www.kegel.com/linux/winelog.html#abiword I thought I'd see if things were working any better today, with Abiword 1.0.5 and Wine cvs (April 19, 2003). Installation on redhat 9 went perfectly -- I even got a nice desktop icon -- but when I ran Abiword, it used a dingbats font for the UI! After I finished laughing, I ran --debugmsg +font, and saw trace:font:WineEngCreateFontInstance L"System", h=16, it=0, weight=400, PandF=22, charset=0 orient 0 escapement 0 trace:font:WineEngCreateFontInstance Chosen: L"Dingbats" L"Regular" I'm running a vanilla Red Hat 9 installation, and I'd expect *some* system font to be a better match for System than the one Wine picked, "Dingbats". Amusingly, it looks like what's going on is that Abiword itself installs Dingbats into %WINDIR%/Fonts. Since I'm using a fake Windows, this is then the *only* font in that directory, and it's used for all matches. Heh. OK, so I removed that one font. That lets AbiWord present a user interface (yay), but just try typing into it! Each successive line displays more or less directly on top of the previous one. This is the same failure mode I observed in my previous runs. Wine has evidently not progressed much in this area. Guess it's time to open a bug report in the wine bug tracker (perhaps marking it as related to http://bugs.winehq.com/show_bug.cgi?id=698 ). (And ask the guy who rated AbiWord "works great" what he was smoking. Maybe he was using a real Windows installation?) - Dan -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045

1 0

Solaris Maintenance
by Robert Lunnon April 21, 2003

April 21, 2003

I am doing some maintenance for Solaris x86 Two major (new) things were noted. 1. The introduction of ptrace(GETREGS... which is not supported under Solaris was patched with a suitable stub file. This will be moved to an emulation of ptrace using /proc debugging facilities as time allows. For now this works without the debugger. 2. There are some NULL pointers being passed to printf and friends again, this might work under linux/glibc but is not at all portable to other libc implementations where you can expect a segmentation fault If I might be so bold as to suggest the following advise 1. Check portability of interfaces you use against the docs for the platforms Wine supports. For Solaris look at http://docs.sun.com 2. Be carefull about passing null pointers to library functions unless the documentation for all affected systems says it's allowable. Be particularly careful with printf and friends because NULL gets accepted silently on linux (quite improperly IMHO). Now I have one question Someone cleaned up a whole pile of NULL pointer passing to printf some time ago, how was this done ? I.E. was there a generallised solution to this problem or was it an instance by instance search and destroy mission ? Thanks Bob

1 0

FoxPro & Wine :)
by Dimitrie O. Paun April 21, 2003

April 21, 2003

Summary: Microsoft threatens developers for running Visual FoxPro on Linux using Wine. http://yro.slashdot.org/yro/03/04/21/2045200.shtml?tid=109&tid=125 I still don't get it how it is legal to tie a product to the OS. -- Dimi.

1 0

System Shock 2 Working (Almost)
by OverrideX April 21, 2003

April 21, 2003

Hey guys, I don't know if anyone else has but I've been trying to get system shock 2 working with wine for quite some time. It segfaults with the latest versions of winex, but with a cvs of wine from 20030115 it works! Menus, sound and 3D all seem to be working fine, except for some slight texture corruption on things like door handles. The problem is the 2D overlay stuff - the HUD, inventory, etc. are all missing which makes it unplayable. I saw on some other forum that it had been added to either wine or winex... anyone have any ideas? Another problem is that ss2 no longer seems to work with the newer wine builds (20030327 at least) it just displays a message that says video card not supported. So, I'd just like to know if the 2D stuff may work in the latest wines or not, and if so how to fix the video card not supported message - thanks for any info :) -Dan -- OverrideX <overridex(a)punkass.com> GPG Key Fingerprint = 4AD5 CE9C D7C8 0069 BDD3 7F72 3AB2 642A 5A5D EB89 The Road goes ever on and on Down from the door where it began. Now far ahead the Road has gone, And I must follow, if I can, Pursuing it with eager feet, Until it joins some larger way Where many paths and errands meet. And whither then? I cannot say. -- J. R. R. Tolkien

1 0

dlls/d3d8/device.c: `GL_DOT3_RGBA' undeclared
by Gerald Pfeifer April 21, 2003

April 21, 2003

The following change to dlls/d3d8/device.c unfortunately broke building an many systems: revision 1.39 date: 2003/04/19 20:30:58; author: julliard; state: Exp; lines: +7 -3 Jason Edmeades <us(a)the-edmeades.demon.co.uk> Add DotProduct3 support if supported by opengl. Here is the diagnostics I got: /usr/bin/gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include -D_REENTRANT -fPIC -D__WINESRC__ -Wall -mpreferred-stack-boundary=2 -gstabs+ -Wpointer-arith -g -O2 -o device.o device.c device.c: In function `IDirect3DDevice8Impl_SetTextureStageState': device.c:3413: `GL_DOT3_RGBA' undeclared (first use in this function) device.c:3413: (Each undeclared identifier is reported only once device.c:3413: for each function it appears in.) gmake[2]: *** [device.o] Error 1 gmake[2]: Leaving directory `/.amd_mnt/nashira/files5/test/wine/dlls/d3d8' gmake[1]: *** [d3d8] Error 2 Would you mind having a look? Gerald The packages I've installed are the following; this is a FreeBSD system, but the breakage appears "portable". % pkg_info | grep -i XF XFree86-4.2.0_1,1 X11/XFree86 core distribution (complete, using mini/meta-po XFree86-FontServer-4.2.0 XFree86-4 Font Server XFree86-Server-4.2.1_3 XFree86-4 X server and related programs XFree86-VirtualFramebufferServer-4.2.1 XFree86-4 Virtual Framebuffer Server XFree86-aoutlibs-3.3.6.9 XFree86 a.out compatibility libraries XFree86-clients-4.2.1_1 XFree86-4 Client environments XFree86-documents-4.2.0 XFree86-4 Document Files XFree86-font100dpi-4.2.0 XFree86-4 bitmap 100 dpi fonts XFree86-font75dpi-4.2.0 XFree86-4 bitmap 75 dpi fonts XFree86-fontCyrillic-4.2.0_4 XFree86-4 Cyrillic Fonts XFree86-fontDefaultBitmaps-4.2.0 XFree86-4 default bitmap fonts XFree86-fontEncodings-4.2.0 XFree86-4 font encoding files XFree86-fontScalable-4.2.0 XFree86-4 Scalable font files XFree86-libraries-4.2.1_1 XFree86-4 include/(shared) library kit % pkg_info | grep -i mesa Mesa-3.4.2_2 A graphics library similar to SGI's OpenGL

2 1

Re: Localization to portuguese of ptb.nls and ptg.nls
by Dmitry Timoshkov April 21, 2003

April 21, 2003

"Marcelo Duarte" <wine-devel(a)bol.com.br> wrote: > > Please do not change standard LOCALE_Sxxx and LOCALE_Ixxx values, they > > all were generated automatically by Alexandre to return exactly the same > > values as Windows does. > > Ok, but the correct it's what I send. For ptb.nls I sure. What source of information are you referring as a correct one? I think that Alexandre uses NT 4.0 as a reference system. I believe that the case of the first letter should not be a source for disagreement and debates. -- Dmitry.

1 0

Re: keyboard mapping with XFree86 4.3.0
by Paulo Sousa April 21, 2003

April 21, 2003

Hi, I just installed RH9 with XFree 4.3.0 and my Portuguese Keyboard is detected as a "close match" of a Latin American one. As I saw that, I tried to figure out if there was no support for Portuguese keyboards, but there was. The layout is this one: /*** Portuguese keyboard layout */ static const char main_key_PT[MAIN_LEN][4] = { "\\¦","1!","2\"@","3#£","4$§","5%","6&","7/{","8([","9)]","0=}","'?","«»", "qQ", "wW","eE", "rR", "tT", "yY", "uU", "iI", "oO", "pP", "+*\\¨","\\'\\`", "aA", "sS","dD", "fF", "gG", "hH", "jJ", "kK", "lL", "çÇ", "ºª", "\\~\\^", "zZ", "xX","cC", "vV", "bB", "nN", "mM", ",;", ".:", "-_", "<>" }; This is prety much correct (except for the missing Euro sign in some new keyboards). I then checked out what where the undetected keys and noticed that they were the ones with 3 caracters (eg: 3#£). By removing the third character I got this layout: /*** Portuguese keyboard layout */ static const char main_key_PT[MAIN_LEN][4] = { "\\|","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","«»", "qQ", "wW","eE", "rR", "tT", "yY", "uU", "iI", "oO", "pP", "+*","´`", "aA", "sS","dD", "fF", "gG", "hH", "jJ", "kK", "lL", "çÇ", "ºª", "~^", "zZ", "xX","cC", "vV", "bB", "nN", "mM", ",;", ".:", "-_", "<>" }; After compiling, this new layout is detected perfectly, although it does not reflect all the characters in my keyboard. Also, the "«'çº" keys do not work! Does anybody know why isn't the third character being reported by XFree? Is this a XFree bug? Thanks, Paulo Sousa

2 1

Wine10?
by Dan Kegel April 21, 2003

April 21, 2003

Any interest in a party to celebrate Wine's 10th birthday? We could date it from the first Usenet message that mentions Wine, which I think is: > Newsgroups: comp.os.linux > From: bob(a)amscons.com (Bob Amstadt) > Subject: Re: Impressions of WABI/Univel vs Linux > References: <C9JoGx.IMM(a)news2.cis.umn.edu> > Organization: Amstadt Consulting Group > Date: Fri, 2 Jul 1993 17:36:48 GMT > X-Newsreader: Tin 1.1 PL4 > Message-ID: <1993Jul2.173648.3202(a)amscons.com> > Lines: 7 > > > Of course, for those of you who are interested in running Windows programs > there is an effort in progress to create something similar to Sun's WABI. > There is an activists channel, "WABI", for discussion of this project. > There is need for many volunteers to complete this project. > -- > Bob Amstadt > bob(a)amscons.com - Dan -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045

2 1

Re: Localization to portuguese of ptb.nls and ptg.nls
by Dmitry Timoshkov April 21, 2003

April 21, 2003

"Marcelo Duarte" <wine-devel(a)bol.com.br> wrote: > Changelog > * Localization to portuguese of ptb.nls and ptg.nls > - LOCALE_SMONTHNAME11 "novembro" > - LOCALE_SMONTHNAME12 "dezembro" > + LOCALE_SMONTHNAME11 "Novembro" > + LOCALE_SMONTHNAME12 "Dezembro" > - LOCALE_SSHORTDATE "d/M/yyyy" > + LOCALE_SSHORTDATE "dd/MM/yyyy" Please do not change standard LOCALE_Sxxx and LOCALE_Ixxx values, they all were generated automatically by Alexandre to return exactly the same values as Windows does. -- Dmitry.

1 0

Re: [dx8-7] Fix compile problem introduced by dx8-2
by Marcelo Duarte April 21, 2003

April 21, 2003

Em Dom 20 Abr 2003 07:34, Ann and Jason Edmeades escreveu: > Sorry about the compilation problem - missed this one! > > Changelog > > DOT3 isnt there on earlier opengl versions > > Jason other compiler problem: make[2]: Entering directory `/home/mduarte/wine/dlls/d3d8' gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include -D_REENTRANT -fPIC -D__WINESRC__ -Wall -mpreferred-stack-boundary=2 -gstabs+ -g -O2 -o device.o device.c device.c: In function `IDirect3DDevice8Impl_SetTextureStageState': device.c:3456: `GL_MIRRORED_REPEAT_ARB' undeclared (first use in this function) device.c:3456: (Each undeclared identifier is reported only once device.c:3456: for each function it appears in.) make[2]: *** [device.o] Error 1 make[2]: Leaving directory `/home/mduarte/wine/dlls/d3d8' make[1]: *** [d3d8] Error 2 make[1]: Leaving directory `/home/mduarte/wine/dlls' make: *** [dlls] Error 2

1 0

compiling wine under cygwin - status ??
by Kai Kai April 20, 2003

April 20, 2003

Hi, all, I am a NEWBIE in this area. I am very interested inthe wine and cygwin. Can wine work under cygwin now? Or Can I build Wine dll under cygwin? I just found the status from David on Nov28, 2002, isthere news about it now? howto is better:-) Thanks Kai _________________________________________________________ Do You Yahoo!? 雅虎邀你参与CCTV-2对话节目调查：移动、联通、灵通，要说爱你不容易 http://rd.yahoo.com/mail_cn/tag/?http://cn.surveys.yahoo.com/cctv_wireless_…

2 1

New trace option?
by Ann and Jason Edmeades April 20, 2003

April 20, 2003

I just noticed there is an option --debugmsg +tid which adds the thread prefix to the debugmsg trace. I would really, really like a timestamp prefix - Is this something people would/could find acceptable? I've hacked a version for my own use using gettimeofday, but anything which shows seconds or slightly higher resolution would be invaluable. Perhaps a +time option? Is this something people would find useful? If so, anyone know a good, portable way of doing it? Jason

4 3