January 2004 - Wine-Devel - list.winehq.org

wintab work
by Aric Stewart Jan. 8, 2004

Jan. 8, 2004

Sorry all, This is way way way _way_ overdue. But it is really the first time i have had a chance to really take some time and review the changes Alexandre gave me, retest everything and put together a patch against the tip. I did some quick testing and it appears that this will work. I have broken it into 2 patches wine_wintab.diff is all the wintab work except for the x11drv stuff wine_x11_wintab.diff is the changes to x11drv. the reason for this is because i still have the ime patch that i submitted earlier in my wine tree so i had to had edit that x11 patch to try to make it not dependent on the xim stuff being already applied. This make there a chance that there are bits that may not apply cleanly, and if you are committing both of my patches (xim and this) then they wont apply cleanly without a bit of fudging. I am also giving you 2 test applications i used for wintab testing. SYSPRESS.EXE and TILTTEST.EXE These applications helped alot on testing things. They where found on the wacom developers site, i think i still have the source kicking around somewhere. Changelog: Enables Tablet support with both Tilt and Pressure -aric Index: dlls/wintab32/Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/wintab32/Makefile.in,v retrieving revision 1.3 diff -u -w -r1.3 Makefile.in --- dlls/wintab32/Makefile.in 11 Oct 2003 01:09:16 -0000 1.3 +++ dlls/wintab32/Makefile.in 8 Jan 2004 14:57:45 -0000 @@ -3,14 +3,15 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wintab32.dll -IMPORTS = kernel32 +IMPORTS = kernel32 user32 ALTNAMES = wintab.dll SPEC_SRCS16 = $(ALTNAMES:.dll=.spec) 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.2 diff -u -w -r1.2 context.c --- dlls/wintab32/context.c 5 Sep 2003 23:08:26 -0000 1.2 +++ dlls/wintab32/context.c 8 Jan 2004 14:57:46 -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,29 +20,340 @@ */ #include "config.h" - +#include <stdio.h> +#include <stdlib.h> #include <stdarg.h> #include "windef.h" -#include "winbase.h" #include "winerror.h" +#include "winbase.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 + */ + +BOOL gLoaded= FALSE; + +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; + pLoadTabletInfo(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); + if (gLoaded == FALSE) + LoadTablet(); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - - return 0; + return pWTInfoA( wCategory, nIndex, lpOutput ); } /*********************************************************************** @@ -61,11 +373,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); + + 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; } /*********************************************************************** @@ -85,9 +424,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; } @@ -97,23 +459,74 @@ */ 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; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("(%p, %d, %p)\n", hCtx, cMaxPkts, lpPkts); + if (!hCtx || !lpPkts) return 0; + + 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); + + TRACE("Copied %i packets\n",limit); + + return limit; +} + /*********************************************************************** * WTPacket (WINTAB32.24) */ BOOL WINAPI WTPacket(HCTX hCtx, UINT wSerial, LPVOID lpPkt) { - FIXME("(%p, %d, %p): stub\n", hCtx, wSerial, lpPkt); + int rc = 0; + LPOPENCONTEXT context; + LPWTPACKET wtp; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("(%p, %d, %p)\n", hCtx, wSerial, lpPkt); - return FALSE; + if (!hCtx) return 0; + + 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); + + TRACE("Returning %i\n",rc+1); + return rc+1; } /*********************************************************************** @@ -121,11 +534,16 @@ */ 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; + if (!hCtx) return 0; + + context = TABLET_FindOpenContext(hCtx); + context->enabled = fEnable; + + return TRUE; } /*********************************************************************** @@ -135,9 +553,7 @@ { FIXME("(%p, %u): stub\n", hCtx, fToTop); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - - return FALSE; + return TRUE; } /*********************************************************************** @@ -157,11 +573,17 @@ */ 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); - return FALSE; + if (!hCtx) return 0; + + context = TABLET_FindOpenContext(hCtx); + + memcpy(lpLogCtx,&context->context,sizeof(LOGCONTEXTA)); + + return TRUE; } /*********************************************************************** @@ -253,49 +675,166 @@ */ int WINAPI WTPacketsPeek(HCTX hCtx, int cMaxPkts, LPVOID lpPkts) { - FIXME("(%p, %d, %p): stub\n", hCtx, cMaxPkts, lpPkts); + int limit; + LPOPENCONTEXT context; + LPVOID ptr = lpPkts; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("(%p, %d, %p)\n", hCtx, cMaxPkts, lpPkts); + + if (!hCtx || !lpPkts) return 0; + + 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; +} + /*********************************************************************** * WTDataGet (WINTAB32.81) */ 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); + if (!hCtx) return 0; + context = TABLET_FindOpenContext(hCtx); + + 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; +} + /*********************************************************************** * WTDataPeek (WINTAB32.82) */ 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); + if (!hCtx) return 0; + + context = TABLET_FindOpenContext(hCtx); + + 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; +} + /*********************************************************************** * WTQueuePacketsEx (WINTAB32.200) */ 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); + + if (!hCtx) return 0; + + 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; } @@ -305,11 +844,13 @@ */ int WINAPI WTQueueSizeGet(HCTX hCtx) { - FIXME("(%p): stub\n", hCtx); + LPOPENCONTEXT context; + TRACE("(%p)\n", hCtx); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + if (!hCtx) return 0; - return 0; + context = TABLET_FindOpenContext(hCtx); + return context->QueueSize; } /*********************************************************************** @@ -317,9 +858,20 @@ */ 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; + if (!hCtx) 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; } --- /dev/null Thu Aug 30 15:30:55 2001 +++ dlls/wintab32/wintab32.c Thu Jan 8 08:47:13 2004 @@ -0,0 +1,155 @@ +/* + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.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; + +UINT (*pWTInfoA)(UINT wCategory, UINT nIndex, LPVOID lpOutput) = NULL; + +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"); + pWTInfoA = (void *)GetProcAddress(hx11drv, "WTInfoA"); + 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 Thu Jan 8 08:47:13 2004 @@ -0,0 +1,163 @@ +/* + * 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_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(HWND hwnddefault); + +typedef int X11_GetCurrentPacket(LPWTPACKET packet); + +typedef int X11_AttachEventQueueToTablet(HWND hOwner); + +X11_LoadTabletInfo *pLoadTabletInfo; +X11_AttachEventQueueToTablet *pAttachEventQueueToTablet; +X11_GetCurrentPacket *pGetCurrentPacket; + +extern UINT (*pWTInfoA)(UINT wCategory, UINT nIndex, LPVOID lpOutput); Index: include/wintab.h =================================================================== RCS file: /home/wine/wine/include/wintab.h,v retrieving revision 1.1 diff -u -w -r1.1 wintab.h --- include/wintab.h 17 Dec 2002 01:49:16 -0000 1.1 +++ include/wintab.h 8 Jan 2004 14:59:11 -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 Index: dlls/x11drv/Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/x11drv/Makefile.in,v retrieving revision 1.38 diff -u -w -r1.38 Makefile.in --- dlls/x11drv/Makefile.in 5 Dec 2003 00:20:28 -0000 1.38 +++ dlls/x11drv/Makefile.in 8 Jan 2004 14:59:54 -0000 @@ -34,10 +34,12 @@ text.c \ window.c \ winpos.c \ + wintab.c \ x11ddraw.c \ x11drv_main.c \ xdnd.c \ Index: dlls/x11drv/event.c =================================================================== RCS file: /home/wine/wine/dlls/x11drv/event.c,v retrieving revision 1.30 diff -u -w -r1.30 event.c --- dlls/x11drv/event.c 5 Dec 2003 04:45:50 -0000 1.30 +++ dlls/x11drv/event.c 8 Jan 2004 14:59:54 -0000 @@ -275,8 +277,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 extension 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) { RCS file: /home/wine/wine/dlls/x11drv/x11drv.spec,v retrieving revision 1.50 diff -u -w -r1.50 x11drv.spec --- dlls/x11drv/x11drv.spec 26 Nov 2003 22:03:34 -0000 1.50 +++ dlls/x11drv/x11drv.spec 8 Jan 2004 14:59:57 -0000 @@ -114,3 +114,12 @@ # X11 locks @ cdecl -norelay wine_tsx11_lock() @ cdecl -norelay wine_tsx11_unlock() + +# WinTab32 +@ cdecl LoadTabletInfo(long) X11DRV_LoadTabletInfo +@ cdecl AttachEventQueueToTablet(long) X11DRV_AttachEventQueueToTablet +@ cdecl GetCurrentPacket(ptr) X11DRV_GetCurrentPacket +@ cdecl WTInfoA(long long ptr) X11DRV_WTInfoA Index: dlls/x11drv/x11drv_main.c =================================================================== RCS file: /home/wine/wine/dlls/x11drv/x11drv_main.c,v retrieving revision 1.83 diff -u -w -r1.83 x11drv_main.c --- dlls/x11drv/x11drv_main.c 5 Dec 2003 00:11:48 -0000 1.83 +++ dlls/x11drv/x11drv_main.c 8 Jan 2004 14:59:57 -0000 @@ -62,7 +62,10 @@ #include "xrandr.h" #include "dga2.h" #include "wine/server.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); --- /dev/null Thu Aug 30 15:30:55 2001 +++ dlls/x11drv/wintab.c Thu Jan 8 08:47:17 2004 @@ -0,0 +1,1134 @@ +/* + * 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 "wine/port.h" + +#include <stdlib.h> +#include <X11/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" + +WINE_DEFAULT_DEBUG_CHANNEL(wintab32); +WINE_DECLARE_DEBUG_CHANNEL(event); + + +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_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 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; + + +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}; + +#define CURSORMAX 10 + +static LOGCONTEXTA gSysContext; +static WTI_DEVICES_INFO gSysDevice; +static WTI_CURSORS_INFO gSysCursor[CURSORMAX]; +static INT gNumCursors; + + +/* 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; +} + +void X11DRV_LoadTabletInfo(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; + } + + hwndTabletDefault = hwnddefault; + + /* Do base initializaion */ + strcpy(gSysContext.lcName, "Wine Tablet Context"); + strcpy(gSysDevice.NAME,"Wine Tablet Device"); + + gSysContext.lcOptions = CXO_SYSTEM | CXO_MESSAGES | CXO_CSRMESSAGES; + gSysContext.lcLocks = CXL_INSIZE | CXL_INASPECT | CXL_MARGIN | + CXL_SENSITIVITY | CXL_SYSOUT; + + gSysContext.lcMsgBase= WT_DEFBASE; + gSysContext.lcDevice = 0; + gSysContext.lcPktData = + PK_CONTEXT | PK_STATUS | PK_SERIAL_NUMBER| PK_TIME | PK_CURSOR | + PK_BUTTONS | PK_X | PK_Y | PK_NORMAL_PRESSURE | PK_ORIENTATION; + gSysContext.lcMoveMask= + PK_BUTTONS | PK_X | PK_Y | PK_NORMAL_PRESSURE | PK_ORIENTATION; + gSysContext.lcStatus = CXS_ONTOP; + gSysContext.lcPktRate = 100; + gSysContext.lcBtnDnMask = 0xffffffff; + gSysContext.lcBtnUpMask = 0xffffffff; + gSysContext.lcSensX = 65536; + gSysContext.lcSensY = 65536; + gSysContext.lcSensX = 65536; + gSysContext.lcSensZ = 65536; + gSysContext.lcSysSensX= 65536; + gSysContext.lcSysSensY= 65536; + + /* Device Defaults */ + gSysDevice.HARDWARE = HWC_HARDPROX|HWC_PHYSID_CURSORS; + gSysDevice.FIRSTCSR= 0; + gSysDevice.PKTRATE = 100; + gSysDevice.PKTDATA = + PK_CONTEXT | PK_STATUS | PK_SERIAL_NUMBER| PK_TIME | PK_CURSOR | + PK_BUTTONS | PK_X | PK_Y | PK_NORMAL_PRESSURE | PK_ORIENTATION; + strcpy(gSysDevice.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; + } + 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 Extension Device\n"); + cursor_target++; + target = &devices[loop]; + cursor = &gSysCursor[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 */ + gSysDevice.X.axMin = Axis->min_value; + gSysDevice.X.axMax= Axis->max_value; + gSysDevice.X.axUnits = 1; + gSysDevice.X.axResolution = Axis->resolution; + gSysContext.lcInOrgX = Axis->min_value; + gSysContext.lcSysOrgX = Axis->min_value; + gSysContext.lcInExtX = Axis->max_value; + gSysContext.lcSysExtX = Axis->max_value; + Axis++; + } + if (Val->num_axes>=2) + { + /* Axis 2 is Y */ + gSysDevice.Y.axMin = Axis->min_value; + gSysDevice.Y.axMax= Axis->max_value; + gSysDevice.Y.axUnits = 1; + gSysDevice.Y.axResolution = Axis->resolution; + gSysContext.lcInOrgY = Axis->min_value; + gSysContext.lcSysOrgY = Axis->min_value; + gSysContext.lcInExtY = Axis->max_value; + gSysContext.lcSysExtY = Axis->max_value; + Axis++; + } + if (Val->num_axes>=3) + { + /* Axis 3 is Normal Pressure */ + gSysDevice.NPRESSURE.axMin = Axis->min_value; + gSysDevice.NPRESSURE.axMax= Axis->max_value; + gSysDevice.NPRESSURE.axUnits = 1; + gSysDevice.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))) + { + gSysDevice.ORIENTATION[0].axMin = 0; + gSysDevice.ORIENTATION[0].axMax = 3600; + gSysDevice.ORIENTATION[0].axUnits = 1; + gSysDevice.ORIENTATION[0].axResolution = + 235929600; + gSysDevice.ORIENTATION[1].axMin = -1000; + gSysDevice.ORIENTATION[1].axMax = 1000; + gSysDevice.ORIENTATION[1].axUnits = 1; + gSysDevice.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(); + gSysDevice.NCSRTYPES = cursor_target+1; + gNumCursors = 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)("Received tablet motion event (%p)\n",hwnd); + TRACE("Received 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]; + 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)("Received tablet button event\n"); + TRACE("Received 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)("Received tablet key press event\n"); + FIXME("Received tablet key press event\n"); + } + else if (event->type == key_release_type) + { + TRACE_(event)("Received tablet key release event\n"); + FIXME("Received tablet key release event\n"); + } + else if ((event->type == proximity_in_type) || + (event->type == proximity_out_type)) + { + TRACE_(event)("Received tablet proximity event\n"); + TRACE("Received 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) +{ + 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, gNumCursors); + + devices = pXListInputDevices(data->display, &num_devices); + + for (cur_loop=0; cur_loop < gNumCursors; cur_loop++) + { + int event_number=0; + + for (loop=0; loop < num_devices; loop ++) + if (strcmp(devices[loop].name,gSysCursor[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; +} + + +int static inline CopyTabletData(LPVOID target, LPVOID src, INT size) +{ + memcpy(target,src,size); + return(size); +} + +/*********************************************************************** + * X11DRV_WTInfoA (X11DRV.@) + */ +UINT X11DRV_WTInfoA(UINT wCategory, UINT nIndex, LPVOID lpOutput) +{ + int rc = 0; + LPWTI_CURSORS_INFO tgtcursor; + TRACE("(%u, %u, %p)\n", wCategory, nIndex, lpOutput); + + switch(wCategory) + { + case 0: + /* return largest necessary 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: + 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; +}

1 0

Serial port under wine
by Paul Sheer Jan. 8, 2004

Jan. 8, 2004

I am trying to write a simple serial port library that has the same lowest-common-denominator interface under both Windows and Linux. I developed it under wine using mingw32 - i want my apps that use it to work under both windows and linux (these are command-line apps only). i noticed that wine does not seem to report errors from GetOverLapped.. and Wait..Object in a way that makes sense. By ignoring errors, and just looking at the dwRead result, i got it to work. my attempt at a posix-like read function is below (the linux version follows further down) best wishes -paul --------- int serial_port_read (struct serial_port *p, unsigned char *buf, int buf_len, int milli_timeout) { static int c = 0; DWORD dwStart, dwRead, r; int l, total = 0; dwStart = GetTickCount (); while (buf_len > 0) { l = serial_port_chars_avail (p); if (l < 0) return total > 0 ? total : SERIAL_PORT_ERROR; if (l == 0 && GetTickCount () - dwStart >= milli_timeout) return total > 0 ? total : SERIAL_PORT_TIMEOUT; /* Like POSIX read(), we return without blocking if we have read at least one character: */ if (l == 0 && total >= 1) return total; /* Read minimum of one character, and a maximum of buf_len characters: */ CLIP (l, 1, buf_len); dwRead = 0; if (!ReadFile (p->hComm, buf, l, &dwRead, &p->osRead)) { if ((r = GetLastError ()) == ERROR_IO_PENDING) { dwRead = 0; GetOverlappedResult (p->hComm, &p->osRead, &dwRead, TRUE); } } total += dwRead; buf_len -= dwRead; buf += dwRead; } return total; } ------------ int serial_port_read (struct serial_port *p, unsigned char *buf, int buf_len, int milli_timeout) { int c; struct timeval tv; fd_set rd; if (!buf_len) return 0; FD_ZERO (&rd); FD_SET (p->fd, &rd); switch (select (p->fd + 1, &rd, NULL, NULL, milli_timeout < 0 ? NULL : (tv.tv_sec = milli_timeout / 1000, tv.tv_usec = milli_timeout % 1000, &tv))) { case 1: c = read (p->fd, buf, buf_len); if (!c) { p->error = 0; return SERIAL_PORT_HANGUP; } if (c < 0) { p->error = errno; return SERIAL_PORT_ERROR; } return c; case 0: return SERIAL_PORT_TIMEOUT; default: p->error = errno; return SERIAL_PORT_ERROR; } }

1 0

Problem with Access-mdb/DAO
by Fabian Cenedese Jan. 8, 2004

Jan. 8, 2004

Hi I have posted this problem already long time ago but I never found the time to test it again. http://www.winehq.org/hypermail/wine-devel/2002/11/1530.html But now I tried with the actual wine from cvs (2003-12-03) and it's still there. The problem is that if I try to create a table in a Access database the last char of the name gets lost. I now have a small program which shows this error, maybe someone can use it for finding this bug. It's a simple VC6 Wizard generated Win32 command line app which uses MFC for DAO. The first time I tried was with SUSE 8.0, now I have Knoppix 3.3 (Debian). Thanks bye Fabi ---------------------------- mdbtest.cpp // mdbtest.cpp : Defines the entry point for the console application. // #include "stdafx.h" #include <afxdao.h> // MFC DAO database classes #ifdef _DEBUG #define new DEBUG_NEW #undef THIS_FILE static char THIS_FILE[] = __FILE__; #endif LPCTSTR lpszTableNodeTable = "Nodes"; LPCTSTR lpszTableNodeName = "NodeName"; LPCTSTR lpszTableNodeNodeType = "NodeType"; LPCTSTR lpszTableNodeBuildCL = "BuildCL"; LPCTSTR lpszTableNodeEditCL = "EditCL"; LPCTSTR lpszTableNodePath = "Path"; LPCTSTR lpszTableNodeFlags = "Flags"; LPCTSTR lpszTableNodeParam1 = "Param1"; LPCTSTR lpszTableNodeParam2 = "Param2"; LPCTSTR lpszTableNodeParam3 = "Param3"; LPCTSTR lpszTableNodeParam4 = "Param4"; ///////////////////////////////////////////////////////////////////////////// // The one and only application object CWinApp theApp; using namespace std; //----------------------------------------------------------------------------- void CreateNodeTable(CDaoDatabase* pDB) // throws CDaoException and CMemoryException { CDaoTableDef nodeDef(pDB); // attempt to create a new table def nodeDef.Create(lpszTableNodeTable); CDaoFieldInfo DaoFieldInfo; // init members DaoFieldInfo.m_strName = lpszTableNodeName; DaoFieldInfo.m_nType = dbText; DaoFieldInfo.m_lSize = 255; DaoFieldInfo.m_lAttributes = dbVariableField; DaoFieldInfo.m_nOrdinalPosition = 0; DaoFieldInfo.m_bRequired = FALSE; DaoFieldInfo.m_bAllowZeroLength = TRUE; DaoFieldInfo.m_lCollatingOrder = 0; // create name field nodeDef.CreateField(DaoFieldInfo); // create type field DaoFieldInfo.m_strName = lpszTableNodeNodeType; DaoFieldInfo.m_lSize = 30; nodeDef.CreateField(DaoFieldInfo); // create path field DaoFieldInfo.m_strName = lpszTableNodePath; DaoFieldInfo.m_lSize = 255; nodeDef.CreateField(DaoFieldInfo); // create flags field nodeDef.CreateField(lpszTableNodeFlags, dbLong, 4, dbFixedField); // create build command line field DaoFieldInfo.m_strName = lpszTableNodeBuildCL; DaoFieldInfo.m_nType = dbMemo; nodeDef.CreateField(DaoFieldInfo); // create edit command line field DaoFieldInfo.m_strName = lpszTableNodeEditCL; DaoFieldInfo.m_nType = dbMemo; nodeDef.CreateField(DaoFieldInfo); DaoFieldInfo.m_nType = dbMemo; //DaoFieldInfo.m_lSize = 200; DaoFieldInfo.m_strName = lpszTableNodeParam1; nodeDef.CreateField(DaoFieldInfo); // create Param cl field DaoFieldInfo.m_strName = lpszTableNodeParam2; nodeDef.CreateField(DaoFieldInfo); // create Param cl field DaoFieldInfo.m_strName = lpszTableNodeParam3; nodeDef.CreateField(DaoFieldInfo); // create Param cl field DaoFieldInfo.m_strName = lpszTableNodeParam4; nodeDef.CreateField(DaoFieldInfo); // create Param cl field nodeDef.Append(); // append table def to database nodeDef.Close(); // end CreateNodeTable } int _tmain(int argc, TCHAR* argv[], TCHAR* envp[]) { int nRetCode = 0; // initialize MFC and print and error on failure if (!AfxWinInit(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), 0)) { // TODO: change error code to suit your needs cerr << _T("Fatal Error: MFC initialization failed") << endl; nRetCode = 1; } else { // TODO: code your application's behavior here. CString m_Path="test.mdb"; CDaoDatabase db; CDaoRecordset rsNode(&db); // rs node try { // create database if not available cout << "Creating Database\n"; try { db.Create(m_Path); db.Close(); } catch (CDaoException* de) { // already exists I guess cout << "Database already existed\n"; de->Delete(); } cout << "Opening Database\n"; // try to open database db.Open(m_Path, TRUE, FALSE, _T("")); // --- delete old node and dependency tables and save new ones --- cout << "Deleting Tabledef\n"; try { // delete node table db.DeleteTableDef(lpszTableNodeTable); } catch (CDaoException* dde) { // catch error, maybe table def hasn't existed dde->Delete(); } cout << "Creating new Tabledef\n"; // create node table CreateNodeTable(&db); cout << "Opening Table\n"; // try to open node table rsNode.Open(dbOpenDynaset, CString(_T("Select * From [")) + lpszTableNodeTable + _T("]"), 0); // look if recordset is updateable if (!rsNode.CanUpdate()) { cout << "No Update\n"; } cout << "Closing Table\n"; // close tables rsNode.Close(); cout << "Closing Database\n"; // close database db.Close(); cout << "Deleting Database\n"; DeleteFile(m_Path); } catch (CDaoException* de) { // catch database exception char msg[256]; de->GetErrorMessage(msg, 256); cout << "Error:" << msg; de->Delete(); goto failure_exit; } catch (CMemoryException* me) { // catch memory exception char msg[256]; me->GetErrorMessage(msg, 256); cout << "Error:" << msg; me->Delete(); goto failure_exit; } cout << "OK\n"; return TRUE; failure_exit: // do some cleanup after failure if (rsNode.IsOpen()) rsNode.Close(); if (db.IsOpen()) db.Close(); } cout << "ERROR!!\n"; return nRetCode; }

2 8

no keyboard events in ddraw application.
by Oleg Prokhorov Jan. 8, 2004

Jan. 8, 2004

Hello wine-devel, I've got a problem with 'Theme Hospital' game application. It requires some keyboard input to start. But the problem is that this application doesn't receive any keyboard events. I've put some checks inside function process_events (dlls/x11drv/event.c) but they show that no keyboard events (KeyPress, KeyRelease) I don't have any experience in this area and ask for you guidance, where to look at. -- Best regards, Oleg mailto:xolegpro(a)rbcmail.ru

3 3

Re: PATCH: Editing DLL overrides in winecfg
by Alexandre Julliard Jan. 7, 2004

Jan. 7, 2004

Robert van Herk <robert(a)robertvanherk.nl> writes: > This is a patch that adds a tabsheet to winecfg, that allows the user > to change the dll overrides; both globally and per app. I put this in, but note that there are more possibilities that just builtin or native that will have to be supported too. Altogether there are five possible combinations: "builtin", "native", "builtin,native", "native,builtin", "". -- Alexandre Julliard julliard(a)winehq.com

3 2

#pre5 - comdlg32 MS_VC + PSDK porting
by Steven Edwards Jan. 7, 2004

Jan. 7, 2004

Hello, I am calling this patch pre5 rather than #5 because it doesnt fully address the rest of the PSDK porting issues and one of my new years resolutions for 2004 is for every patch I send to winehq to be good enough to go right in to CVS. ;) With this patch we can build 90% of comdlg32 on MS_VC with the PSDK except for one major bug and one minor question. 1. Can we please fix winnt.h line 175? This #define NONAMELESSSTRUCT thing is wrong. It breaks building on the PSDK and w32api. I have not be able to find any thing about it in Microsofts documentation or headers. If we removed support for it its going to break GCC 2.8.xx but if someone is on 2.8 its time to upgrade. /me is quoting here from the Microsoft headers under Fair use and all of that...... "// // For compilers that don't support nameless unions // #ifndef DUMMYUNIONNAME #ifdef NONAMELESSUNION #define DUMMYUNIONNAME u #define DUMMYUNIONNAME2 u2 #define DUMMYUNIONNAME3 u3 #define DUMMYUNIONNAME4 u4 #define DUMMYUNIONNAME5 u5 #else #define DUMMYUNIONNAME #define DUMMYUNIONNAME2 #define DUMMYUNIONNAME3 #define DUMMYUNIONNAME4 #define DUMMYUNIONNAME5 #endif #endif // DUMMYUNIONNAME " Thats it. All I can find is the DUMMYUNION stuff in some of the headers. If we just remove support for DUMMYSTRUCT in WINE its going to break a lot of stuff so we will prob'l need to perl script the cleanup. 2. Do you want me to dump printdlg.h now and compleate the cleanup or can it wait untill after the DUMMYSTRUCT thing is fixed? I can move the rest of the structures and internal function declairations to cdlg.h and cdlg16.h now but I want to wait till I can get printdlg.c to compile with out bitching about missing member s1 and u1 blah... Thanks Steven __________________________________ Do you Yahoo!? Find out what made the Top Yahoo! Searches of 2003 http://search.yahoo.com/top2003

3 6

Task Manager for WINE and ReactOS
by Steven Edwards Jan. 7, 2004

Jan. 7, 2004

Hiya Mike, I have CC'd this to wine-devel in case you are short on time or are no longer interested in taskmgr or if Alexandre even wanted it in CVS. I have updated the license header and removed most of the C++ style comments except in the C++ source files we have not been able to convert yet to C. Work on taskmgr has stalled in ReactOS pending our 0.2 release and its mostly fully functional under Windows anyway. WINE should only require minor tweaks to get it to work. Hi Eric I know your busy with the File Reorg stuff but in case you are still interested I CC'd you. After reading over the Winedbg guide I thought a nice feature for the WINELIB build would be the ablity to add a check box to one of the dialogs to show the Windows Thread ID and Unix Process ID's that each process is mapped to. I didnt apply your last patch because taskmgr worked fine under Windows and I lost it in my inbox. =( Thanks Steven __________________________________ Do you Yahoo!? Yahoo! Hotjobs: Enter the "Signing Bonus" Sweepstakes http://hotjobs.sweepstakes.yahoo.com/signingbonus

2 2

Re: imm work
by Steven Edwards Jan. 7, 2004

Jan. 7, 2004

Hiya Aric, --- Aric Stewart <aric(a)codeweavers.com> wrote: > Notes: > I fear this may violate dll separation between Imm32 and X11drv. I > have a very long and bad history of doing that... alot.. so i need to > get better about it. I think it does. We use Imm32 on ReactOS and this wont work for us. Its not the end of the world as we really dont need it atm but we will end up having to rewrite your work down the road. =( Thanks Steven __________________________________ Do you Yahoo!? Yahoo! Hotjobs: Enter the "Signing Bonus" Sweepstakes http://hotjobs.sweepstakes.yahoo.com/signingbonus

2 2

SEH general info
by Jakob Eriksson Jan. 7, 2004

Jan. 7, 2004

You all probably know, but maybe this is of interest: http://www.jorgon.freeserve.co.uk/ExceptFrame.htm

1 0

Re: wine/ libs/wine/wine.def libs/wine/loader.c in ...
by Ferenc Wagner Jan. 7, 2004

Jan. 7, 2004

Alexandre Julliard <julliard(a)winehq.org> writes: > ChangeSet ID: 10547 > Changes by: julliard(a)wine.codeweavers.com 2004/01/02 15:08:05 > > Modified files: > libs/wine : wine.def loader.c > include/wine : library.h > > Log message: > Added wine_dll_get_owner function that retrieves the > 32-bit dll containing a given 16-bit dll by reading > the symlink, so that we don't need to dlopen it. This patch broke cross-compilation, as mingw does not have a readlink function. I have got no idea about the proper way, but can emit a wild shot. Feri. Index: include/wine/port.h =================================================================== RCS file: /home/wine/wine/include/wine/port.h,v retrieving revision 1.45 diff -u -r1.45 port.h --- include/wine/port.h 4 Dec 2003 05:48:03 -0000 1.45 +++ include/wine/port.h 7 Jan 2004 20:49:44 -0000 @@ -113,6 +113,7 @@ #ifndef S_ISLNK # define S_ISLNK(mod) (0) +# define readlink(path,buffer,size) (-1) #endif /* S_ISLNK */ /* So we open files in 64 bit access mode on Linux */

1 0

Re: Comment on new file implementation
by Juan Lang Jan. 7, 2004

Jan. 7, 2004

Eric, the sooner the better as far as I'm concerned. In my quick read of the patch I didn't see any translating from the Win32 namespace to the NT namespace; do you plan to do anything there? To pick a (bad) example, the name \\server\share\file is valid in the Win32 namespace, but not in the NT namespace; it must be translated to \??\UNC\server\share\file Since you mentioned SMB, I will too: don't worry too much, it's currently broken anyway. As long as the code's cleaner it should be easier to fix (and this looks much cleaner). --Juan __________________________________ Do you Yahoo!? Yahoo! Hotjobs: Enter the "Signing Bonus" Sweepstakes http://hotjobs.sweepstakes.yahoo.com/signingbonus

2 1

Comment on new file implementation
by Eric Pouech Jan. 7, 2004

Jan. 7, 2004

I've been working lately on rehauling the file handling in Wine. The current output is a large patch, available here: http://perso.wanadoo.fr/pouech-eric/ep-file.diff.gz (400 KB uncompressed) It's not completly ready yet for inclusion, however some ongoing discussions could overlap with what I've currently done (like how to configure drive without a config file, SMB handling...). So better discuss it widely (yet another flame war). The benefit of the patch: - all file creation, opening, directory browsing is now done in ntdll instead of kernel32 - file IO management can be cleanly separated between kernel32 and ntdll (1) - files/ directory could be removed (not done in the patch (also nuked include/drive.h and include/file.h) - homogenous drive & device handling (we no longer store those objects in the server). Drive and device are now standard file handles (from a Windows point of view). - a few current Wine bugs have been fixed (see the todo_wine removed in the tests subdirs) - we no longer rely on the Wine config dir for the drive settings - partial NT volume management implementation - most of the volume related information (& ioctl) are done on the real unix device attached to the volume What has been removed (from current implementation): - file system options (all FS are considered case insensitive) - per drive code page (all drives are now handled with the wine specfic UNIXCP code page) What still need some improvement - fix all the introduced bugs (even if all the current tests actually pass) - setting a first default environment (even if tools/winefs provides it - see below) Drives (and all their attributes - mount points, labels...) are defined this way: 1 Volumes & drives ------------------ Every volume on each available volume (partition on a physical disk) on the system will be listed in ${WINEPREFIX}/device directory. This directory will also be populated by other needed devices (serial, parallel, physical disks). Each item in this devices list will be stored as a subdirectory of ${WINEPREFIX}/device. Each subdirectory will contain various files & symlinks related to this device. Every volume will be named volume{XXX} where XXX is the actual unix device name. We're using this syntax so that we can distinguish from other (non-volume) devices and because under windows, volumes are named as Volume{<UID>} where <UID> is the unique identifier of the volume. Every DOS drive letter will be known from a (directory) entry in ${WINEPREFIX}/dosdevices. This directory will also contains entries for VxDs. A drive letter entry will in fact be a symlink to $WINEPREFIX/device/volume{XXX}/mount. This later will be another symlink to the actual mount point of volume XXX. This double indirection is needed: a DOS drive can be mounted either at the root of a volume, or as a subdirectory on that volume. The first symlink (in the dosdevices directory) will point to subdirectory we want to mount on, and the second will hold where the volume itself is mounted. For convenience reasons, we also list, for every DOS drive, the volume on which it is mounted, by creating a symlink between ${WINEPREFIX}/device/x: and ${WINEPREFIX}/device/volume{XXX} 2 Example --------- Unix side: /dev/scd0 on /mnt/cdrom /dev/fd0 on /mnt/floppy /dev/hda1 on /mnt/ntfs /dev/hda5 on /mnt/windows /dev/hda6 on / /dev/hda8 on /opt /dev/hda9 on /home Note, from now on, all paths are relative to ${WINEPREFIX} From this, we will define this hierarchy: device/ volume{fd0}/ device -> /dev/fd0 mount -> /mnt/floppy/ volume{hda1}/ device -> /dev/hda1 mount -> /mnt/ntfs/ volume{hda5}/ device -> /dev/hda5 mount -> /mnt/windows/ volume{hda6}/ device -> /dev/hda6 mount -> / volume{hda8}/ device -> /dev/hda8 mount -> /opt/ volume{hda9}/ device -> /dev/hda9 mount -> /home/ volume{scd0}/ device -> /dev/scd0 mount -> /mnt/cdrom/ This hierarchy doesn't depend on what's actually mounted (both on unix side and windows side), it's just the volume definition. We also define a few more disks related entries: device/ harddisk0/ device -> /dev/hda and some other devices as well: device/ null/ device -> /dev/null parallel0/ device -> /dev/lp0 serial0/ device -> /dev/ttyS0 Now, assume we want to define our DOS drives as follow: a: -> /mnt/fd0/ c: -> /home/eric/.wine/c_copy/ d: -> /opt/winapps/ e: -> /mnt/cdrom/ f: -> /tmp g: -> /home/eric/ m: -> /mnt/windows/ We will create two new symlinks per drive: one in $WINEPREFIX/device which will point to the device of the volume, another one in $WINEPREFIX/dosdevices which will point to the unix root we want for the drive. device/ a: -> volume{fd0} c: -> volume{hda9} d: -> volume{hda8} e: -> volume{scd0} f: -> volume{hda6} g: -> volume{hda9} m: -> volume{hda5} dosdevices/ a: -> ../device/volume{fd0}/mount/ c: -> ../device/volume{hda9}/mount/eric/.wine/c_copy/ d: -> ../device/volume{hda8}/mount/winapps/ e: -> ../device/volume{scd0}/mount/ f: -> ../device/volume{hda6}/mount/tmp/ g: -> ../device/volume{hda9}/mount/eric/ m: -> ../device/volume{hda5}/mount/ We also define some more DOS devices (for the other devices we defined): dosdevices/ com1 -> ../device/serial0/device lpt1 -> ../device/parallel0/device nul -> ../device/null/device physicaldrive0 -> ../device/harddisk0/device 3 More details on volumes ------------------------- In a volume subdirectory in ${WINEPREFIX}/volume{XXX} we can also find some other files used for: - getting volume label. We try to get information in the following order: 1/ read it from device (done for disks with FAT partition, and AUDIO or data CDROM - mixed mode is not supported) 2/ if 1/ fails, read the file .windows-label at (unix) root of volume (handy for hard, floppy disks) 3/ if 2/ fails, read the file label from the file ${WINEPREFIX}/device/volume{XXX}/label - getting volume serial number. We try to get information in the following order: 1/ read it from device (done for disks with FAT partition, and CDROMs) 2/ if 1/ fails, read the file .windows-serial at (unix) root of volume (handy for hard, floppy disks) 3/ if 2/ fails, read the file label from the file ${WINEPREFIX}/device/volume{XXX}/serial - some specific attributes are stored in ${WINEPREFIX}/device/volume{XXX}/flags. This file stores an unsigned value, which high word is the device characteristics, while its low word is the device type (from include/winioctl.h FILE_DEVICE_????). The VxDs and TSRs will be defined as an empty file (which name is VxD or TSR name) in ${WINEPREFIX}/dosdevices. Every filename will be case insensitive (device, VxD, TSR...) as we always do case insensitive matching. 4 Example of the full configuration ----------------------------------- -> is a symlink to <> contains device/ a: -> volume{fd0} c: -> volume{hda9} d: -> volume{hda8} e: -> volume{scd0} f: -> volume{hda6} g: -> volume{hda9} harddisk0/ device -> /dev/hda m: -> volume{hda5} null/ device -> /dev/null parallel0/ device -> /dev/lp0 serial0/ device -> /dev/ttyS0 volume{fd0}/ device -> /dev/fd0 flags <> FILE_DEVICE_DISK + FILE_REMOVABLE_MEDIA|FILE_FLOPPY_DISKETTE mount -> /mnt/floppy/ volume{hda1}/ device -> /dev/hda1 flags <> FILE_DEVICE_DISK mount -> /mnt/ntfs/ volume{hda5}/ device -> /dev/hda5 flags <> FILE_DEVICE_DISK label <> VolumeC mount -> /mnt/windows/ volume{hda6}/ device -> /dev/hda6 flags <> FILE_DEVICE_DISK mount -> / volume{hda8}/ device -> /dev/hda8 flags <> FILE_DEVICE_DISK mount -> /opt/ volume{hda9}/ device -> /dev/hda9 flags <> FILE_DEVICE_DISK mount -> /home/ volume{scd0}/ device -> /dev/scd0 flags <> FILE_DEVICE_CD_ROM + FILE_READ_ONLY_DEVICE|FILE_REMOVABLE_DEVICE mount -> /mnt/cdrom/ dosdevices/ a: -> ../device/volume{fd0}/mount/ afilter awredir aux -> ../dosdevices/com1 bios bios_ext bioshook biosxlat blockdev c: -> ../device/volume{hda9}/mount/eric/.wine/standalone/c_copy/ chbios com1 -> ../device/serial0/device configmg d: -> ../device/volume{hda8}/mount/winapps/ debug debugcmd dosmgr dosnet dragcli dragsrv dsvxd dwcfgmg e: -> ../device/volume{scd0}/mount/ ebios efax efilter eisa emmxxxx0 enable eten f: -> ../device/volume{hda6}/mount/tmp/ ffilter filesec g: -> ../device/volume{hda9}/mount/eric/ hasp95 hpscan ifsmgr int13 irlamp isapnp logger lpt1 -> ../device/parallel0/device m: -> ../device/volume{hda5}/mount/ mca_pos memprobe mmdevldr monodebg.vxd mrci2 msodisup ndis ndis2sup nscl nul -> ../device/null/device nwlink nwredir nwserver nwsup pagefile pageswap parity pccard pci peloader perf physicaldrive0 -> ../device/harddisk0/device ppp reboot scsi scsifd scsimgr$ scsiport secprov server shell splitter spooler stat80 tfilter tsrload v86mmgr vasync vbrowse vcache vcd vcdfsd vcomm vcond vdd vdd2 vdhcp vdmad vfat vfbackup vfd vhbiosd vime vip vkd20 vmcpd vmd vmm vmpoll vmsgd vnb vnbt vnetbios vnetsup vnwlink vpd vpend vpicd vpowerd vppid vprod vredir vsd vshare vtcp vtd vtdapi vtdi vudp vwin32 vxdldr win32s windebug winload winsock wsipx wsock wstcp 5 Configuration --------------- All this configuration is done automatically by a new tool: tools/winefs. This tool : a/ creates (in all cases) from the /etc/fstab entries (and the known VxD and TSR) all possible entries in ~/.wine/device and ~/.wine/dosdevice b/ will try to define the DOS drives depending on various sources You can run it in several fashions: 1/ winefs ~/.wine Will get all possible information from the current ~/.wine/config for Wine drive settings (mount points, device, labels, serial number...) 2/ winefs ~/.wine --bios-assign Will do as previously, but creating the DOS drive assignments as the BIOS would do 3/ winefs ~/.wine --no-assign Will only provide step a/ Beware, rerunning winefs will erase all your previous settings. Have fun !! A+ (1): not entirely true in this patch => the volume management (even if most of the code exists in ntdll) doesn't work as expected from ntdll. So the current kernel32 implementation remains

2 2

Re: Wineconf update, RFC re remote participation
by Ivan Leo Murray-Smith Jan. 7, 2004

Jan. 7, 2004

> One thing I would like to do is to stream audio This would be a regression, the last wineconf had a video stream. Ivan.

2 1

my patch is in neverland :-)
by Tom Jan. 7, 2004

Jan. 7, 2004

Hi, I sent a 100k Status Update patch and its been around 18 hours now and its still not showed up. Is the moderator on strike? :)) Tom

5 5

Re: [Fwd: [unixODBC-DEV] - UnixODBC, Wine, Crystal Report -- would appreciate insight]]
by Ulrich Czekalla Jan. 7, 2004

Jan. 7, 2004

On Wed, Jan 07, 2004 at 07:11:54AM -0800, Bill Medland wrote: > On January 6, 2004 07:35 pm, Dan Kegel wrote: > > Can somebody have a look at this? > > Thanks, > > Dan > > I'll do what I can; everyone else feel free to jump in. > > > > > -------- Original Message -------- > > Subject: [unixODBC-DEV] - UnixODBC, Wine, Crystal Report -- would > > appreciate insight Date: Tue, 06 Jan 2004 15:07:11 -0500 > > From: Aurelien Marchand <aurelien.marchand(a)researchcapital.com> > > Reply-To: unixodbc-dev(a)unixodbc.org > > To: unixodbc-dev(a)easysoft.com > > > > Hi, > > > > I am a bit confused as to who I should send this email. Please let me > > know if this is the wrong place. > > > > I am really, really close to making the whole thing work (I'll show in a > > minute why I think that) but I'm stomped and need some help. > > > > I've dumped my WinNT workstation and replaced it with Linux. So far, I > > can do exactly everything I was able to do (except updating my calendar > > on the Exchange server used where I work), minus using Crystal Report. > > I have installed it using CodeWeavers' CrossOver Office and it installed > > without even a hiccup. > > I've also installed unixODBC and tested the odbc.ini configuration using > > isql. It works great when I try to connect to the company's AS400 > > database. The default library is set to my username and I can query > > other libraries using the dot (.) as a separator (e.g: SELECT * from > > OTHERLIB.OTHERTABLE). > > > > So far so good: UnixODBC works perfectly to talk to IBM's AS400. > > > > Now I need to tell Crystal which drivers to use. I've read on the web > > that Crystal is not a very good student and thus ignores Windows' > > ODBC.ini settings but checks what's in the registry. I've also come to > > understand I must set ODBC.dll = "builtin, native" in my Wine's config > > file so that it will try to use whatever is set for > > LIB_ODBC_DRIVER_MANAGER env variable for Windows' ODBC connections. > > Those instructions were put together in order to get Crystal Reports runtime > working. Do you get anywhere if you change the override to "native"? > This is the way I do it. Switch to native odbc32, install mdac (available with ms office or download from MS site) and then setup the dsns using odbcad32.exe. /Ulrich

1 0

[Fwd: [unixODBC-DEV] - UnixODBC, Wine, Crystal Report -- would appreciate insight]
by Dan Kegel Jan. 7, 2004

Jan. 7, 2004

Can somebody have a look at this? Thanks, Dan -------- Original Message -------- Subject: [unixODBC-DEV] - UnixODBC, Wine, Crystal Report -- would appreciate insight Date: Tue, 06 Jan 2004 15:07:11 -0500 From: Aurelien Marchand <aurelien.marchand(a)researchcapital.com> Reply-To: unixodbc-dev(a)unixodbc.org To: unixodbc-dev(a)easysoft.com Hi, I am a bit confused as to who I should send this email. Please let me know if this is the wrong place. I am really, really close to making the whole thing work (I'll show in a minute why I think that) but I'm stomped and need some help. I've dumped my WinNT workstation and replaced it with Linux. So far, I can do exactly everything I was able to do (except updating my calendar on the Exchange server used where I work), minus using Crystal Report. I have installed it using CodeWeavers' CrossOver Office and it installed without even a hiccup. I've also installed unixODBC and tested the odbc.ini configuration using isql. It works great when I try to connect to the company's AS400 database. The default library is set to my username and I can query other libraries using the dot (.) as a separator (e.g: SELECT * from OTHERLIB.OTHERTABLE). So far so good: UnixODBC works perfectly to talk to IBM's AS400. Now I need to tell Crystal which drivers to use. I've read on the web that Crystal is not a very good student and thus ignores Windows' ODBC.ini settings but checks what's in the registry. I've also come to understand I must set ODBC.dll = "builtin, native" in my Wine's config file so that it will try to use whatever is set for LIB_ODBC_DRIVER_MANAGER env variable for Windows' ODBC connections. I've come to that point: my system.reg or my user.reg contain one ODBC setting (the same name found on /etc/odbc.ini and ~/.odbc.ini). My wine config file uses "builtin, native" for it's ODBC setting and my ~/.odbc.ini contains proper DSN settings (since I can query from the console using isql). The best part is, when I start Crystal Report, and select ODBC sources, I have in the dropdown that appears all the entries I've put in my ~/.odbc.ini file. As I said earlier, great strides indeed. Now the last missing piece is that it seems Crystal using Wine and unixODBC cannot login properly and retrieve the table list. It just hangs when I expand the "+" box beside a DSN entry. I've enabled sql log (in /etc/odbcinst.ini) but I can't find really relevant information. Let me know if you want to see it. So now I'm stuck. Any ideas on how I can make it work? Note: I've tried to Crystal's DB2 ODBC drivers and also with IBM DB2 ODBC drivers (both for Windows) - although it shouldn't make a difference. Thanks, Aurelien Marchand

2 1

Re: winewrap: fix wrapper linking
by Richard Cohen Jan. 7, 2004

Jan. 7, 2004

Dimitrie O. Paun wrote: > Richard, > > You patch from Nov 28: > http://www.winehq.org/hypermail/wine-cvs/2003/11/0299.html > says (among other things): > "Compiling with -lwine needs to use the given -L paths." > > In other words, it adds all the -Lxxx libs to the linking step > for the wrapper. I see no reason to do so. At the Windows/DLL > level, we only link with kernel32, and we know exactly where > it is: in DLLDIR. At the Linux/ELF level, we only link with > -lwine, and similarly, we know it resides in LIBDIR. Those libraries only reside there after Wine has been installed. winegcc needs to be able to build programs/* etc. from inside the tree Anyway, it looks like the wrapper will be going away soon ... Richard.

1 0

Notes on implementing mscms.dll - for anybody who's interested in digital colour management
by Mike McCormack Jan. 7, 2004

Jan. 7, 2004

Hi, For whoever is interested in running Phase One's Capture One software (http://www.phaseone.com/) on Wine, you'll need mscms.dll for Colour Management. Unfortunately Wine has no implementation of it yet. I had a quick look into what is needed to implement mscms.dll (http://msdn.microsoft.com/library/default.asp?url=/library/en-us/icm/icmsta…) It appears the functionality of mscms.dll is mostly defined by the International Color consortium (http://www.color.org) and a free implementation exists(http://www.littlecms.com/, and is available as a (shared?) library on many distros. I think it's feasable to interface that library to an mscms.dll implemented in Wine. I've created a stub library incase anybody wants to have a go at it... mail me if you're interested in working on it. Mike TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mscms.dll IMPORTS = user32 advapi32 kernel32 ntdll EXTRALIBS = $(LIBUNICODE) $(LIBUUID) EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ mscms.c @MAKE_DLL_RULES@ ### Dependencies: /* * Copyright (C) 2004 Mike McCormack for Codeweavers * * 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 <stdarg.h> #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "icm.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mscms); BOOL WINAPI SetColorProfileElementSize( HPROFILE hProfile, TAGTYPE tag, DWORD cbSize) { FIXME("%p %08lx %ld\n", hProfile, tag, cbSize); return TRUE; } BOOL WINAPI GetColorProfileElement( HPROFILE hProfile, TAGTYPE tag, DWORD dwOffset, DWORD *pcbSize, PVOID pBuffer, PBOOL pbReference) { FIXME("\n"); return TRUE; } BOOL WINAPI GetCountColorProfileElements( HPROFILE hProfile, PDWORD pnCount) { FIXME("\n"); return TRUE; } BOOL WINAPI SetColorProfileElement( HPROFILE hProfile, TAGTYPE tag, DWORD dwOffset, PDWORD pcbSize, PVOID pBuffer) { FIXME("\n"); return TRUE; } BOOL WINAPI DeleteColorTransform( HTRANSFORM hColorTransform ) { FIXME("\n"); return TRUE; } BOOL WINAPI CloseColorProfile( HPROFILE hProfile ) { FIXME("\n"); return TRUE; } BOOL WINAPI GetColorDirectoryA( LPCSTR pMachineName, LPSTR pBuffer, PDWORD pdwSize ) { FIXME("\n"); return TRUE; } BOOL WINAPI TranslateBitmapBits( HTRANSFORM hColorTransform, PVOID pSrcBits, BMFORMAT bmInput, DWORD dwWidth, DWORD dwHeight, DWORD dwInputStride, PVOID pDestBits, BMFORMAT bmOutput, DWORD dwOutputStride, PBMCALLBACKFN pfnCallback, ULONG ulCallbackData) { FIXME("\n"); return TRUE; } HTRANSFORM WINAPI CreateMultiProfileTransform( PHPROFILE pahProfiles, DWORD nProfiles, DWORD *padwIntent, DWORD nIntents, DWORD dwFlags, DWORD indexPreferredCMM ) { FIXME("\n"); return NULL; } HPROFILE WINAPI OpenColorProfileA( PPROFILE pProfile, DWORD dwDesiredAccess, DWORD dwShareMode, DWORD dwCreationMode) { FIXME("\n"); return NULL; } BOOL WINAPI GetColorProfileElementTag( HPROFILE hProfile, DWORD dwIndex, PTAGTYPE pTag ) { FIXME("\n"); return TRUE; } BOOL WINAPI GetColorProfileHeader( HPROFILE hProfile, PPROFILEHEADER pHeader ) { FIXME("\n"); return TRUE; } @ stdcall SetColorProfileElementSize(ptr long long) @ stdcall GetCountColorProfileElements(ptr ptr) @ stdcall SetColorProfileElement(ptr ptr long ptr ptr) @ stdcall GetColorProfileElement(ptr ptr long ptr ptr ptr) @ stdcall DeleteColorTransform(ptr) @ stdcall CloseColorProfile(ptr) @ stdcall GetColorDirectoryA(str ptr ptr) @ stdcall TranslateBitmapBits(ptr ptr ptr long long long ptr ptr long ptr long) @ stdcall CreateMultiProfileTransform(ptr long ptr long long long) @ stdcall OpenColorProfileA(ptr long long long) @ stdcall GetColorProfileElementTag() @ stdcall GetColorProfileHeader(ptr ptr) /* * Copyright (C) the Wine project * * 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 */ #ifndef __WINE_ICM_H #define __WINE_ICM_H typedef HANDLE HPROFILE; typedef HPROFILE *PHPROFILE; typedef HANDLE HTRANSFORM; typedef DWORD TAGTYPE; typedef TAGTYPE *PTAGTYPE,*LPTAGTYPE; typedef enum { BM_x555RGB = 0x00, BM_565RGB = 0x01, BM_RGBTRIPLETS = 0x02, BM_BGRTRIPLETS = 0x04, BM_xRGBQUADS = 0x08, BM_10b_RGB = 0x09, BM_16b_RGB = 0x0a, BM_xBGRQUADS = 0x10, BM_CMYKQUADS = 0x20, BM_x555XYZ = 0x101, BM_x555Yxz, BM_x555Lab, BM_x555G3CH, BM_XYZTRIPLETS = 0x201, BM_YxyTRIPLETS, BM_LabTRIPLETS, BM_G3CHTRIPLETS, BM_5CHANNEL, BM_6CHANNEL, BM_7CHANNEL, BM_8CHANNEL, BM_GRAY, BM_xXYZQUADS = 0x301, BM_xYxyQUADS, BM_xLabQUADS, BM_xG3CHQUADS, BM_KYMCQUADS, BM_10b_XYZ = 0x401, BM_10b_Yxy, BM_10b_Lab, BM_10b_G3CH, BM_NAMED_INDEX, BM_16b_XYZ = 0x501, BM_16b_Yxy, BM_16b_Lab, BM_16b_G3CH, BM_16b_GRAY, } BMFORMAT; typedef BOOL WINAPI (*PBMCALLBACKFN)(ULONG,ULONG,ULONG); typedef PBMCALLBACKFN LPPBMCALLBACKFN; typedef struct tagPROFILEHEADER { DWORD phSize; DWORD phCMMType; DWORD phVersion; DWORD phClass; DWORD phDataColorSpace; DWORD phConnectionSpace; DWORD phDateTime[3]; DWORD phSignature; DWORD phPlatform; DWORD phProfileFlags; DWORD phManufacturer; DWORD phModel; DWORD phAttributes; DWORD phRenderingIntent; CIEXYZ phIlluminant; DWORD phCreator; BYTE phReserved[44]; } PROFILEHEADER; typedef PROFILEHEADER *PPROFILEHEADER,*LPPROFILEHEADER; typedef struct tagPROFILE { DWORD dwType; PVOID pProfileData; DWORD cbDataSize; } PROFILE; typedef PROFILE *PPROFILE,*LPPROFILE; #endif

1 0

Re: widl patch
by Alexandre Julliard Jan. 6, 2004

Jan. 6, 2004

Ove Kaaven <ovek(a)arcticnet.no> writes: > Log: > Added rules to parse library, coclass, dispinterface, and module > definitions, and a number of attributes, and cleaned up a few things. > Started on a typelib generation framework. This breaks compilation of shobjidl.idl, because it makes 'id' a keyword but there are some functions arguments named 'id' in that file. We could of course change the names, but the Windows version of that file uses the same names so it looks like an incompatibility with MIDL. -- Alexandre Julliard julliard(a)winehq.com

2 2

Re: Check for null ptr return from RegEnumValue
by Alexandre Julliard Jan. 6, 2004

Jan. 6, 2004

Mike Hearn <mike(a)theoretic.com> writes: > This was crashing IE setup. Dunno where the regression came from, but I > think null returns like this are legal, so we should check for it. data is passed by value, it cannot possibly be set to null by RegEnumValue. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: Don't let cabinet Extract() crash IE
by Stefan Leichter Jan. 6, 2004

Jan. 6, 2004

Am Freitag, 2. Januar 2004 17:28 schrieb Mike Hearn: > Hi Stefan, > > The attached patch is necessary for IE installer to work again. It seems > the magic value is not always correct: advpack derefs this value so it > probably points to a struct. I'll try and find out what it contains when > using the native DLL (if anything). > > It seems to be optional, making it 0 allows IE to continue. > Hi Mike, your are right. Its a pointer to a structure. By running native cabinet.dll i found that the dll allocates two memory areas per file inside the cabinet that are not freed within the extract function. The first memory area is always 12 bytes. The size of the second one is the length of the filename without path plus 1. The pointer points to a structure like this: struct ExtractFileList { LPSTR filename; struct ExtractFileList *next; DWORD unknown; // always 1L } ; Did your start modifying/fixing the extract function for this item? If not i will do it. Bye Stefan

3 3

RE: Will DCOM98 be pulled?
by Ivan Leo Murray-Smith Jan. 6, 2004

Jan. 6, 2004

>can somebody with legal knowledge check the EULA and see if we >are allowed to redistribute this file? No legal knowledge needed, the EULA at http://www.microsoft.com/com/dcom/dcom98/eula.asp is very clear, and says that the user cannot distribute the dcom installer. Ivan.

2 1

Re: Re: install default config files to $PREFIX/share/wine
by chmorgan＠charter.net Jan. 6, 2004

Jan. 6, 2004

How do we plan to get rid of having default config files? Where would the default registry go? Chris > > From: Alexandre Julliard <julliard(a)winehq.org> > Date: 2004/01/05 Mon PM 03:19:54 EST > To: Chris Morgan <cmorgan(a)alum.wpi.edu> > CC: wine-devel(a)winehq.com > Subject: Re: install default config files to $PREFIX/share/wine > > Chris Morgan <cmorgan(a)alum.wpi.edu> writes: > > > * configure.ac, Makefile.in, documentation/Makefile.in, documentation/samples/ > > Makefile.in > > Chris Morgan <cmorgan(a)alum.wpi.edu> > > Install default wine configuration files to $PREFIX/share/wine for use by > > packages and by future changes to create a default configuration if none is > > present. > > I don't think we want that. Future changes are supposed to get rid of > the need for a config file, so we don't want to give the impression > that external apps can depend on finding a sample config file. > > -- > Alexandre Julliard > julliard(a)winehq.com > > >

7 8

Re: minimum timeout for SetTimer should be 10ms
by Alexandre Julliard Jan. 6, 2004

Jan. 6, 2004

Mike McCormack <mike(a)codeweavers.com> writes: > MSDN defines 10ms as the minimum timeout for Win 2000. Win9x is not > defined, but tests show it is slightly different... it's minimum > timeout is longer than 10ms, but setting to 10ms should not hurt. Actually it should have no effect at all, because the timeout is forced to SYS_TIMER_RATE (which is the Win9x minimum AFAIK) a few lines below... -- Alexandre Julliard julliard(a)winehq.com

1 0

Of games and shorcuts [was -> Re:More Games Tested]
by Subhobroto Sinha Jan. 6, 2004

Jan. 6, 2004

Hello all, I had completed the patch for IPersistFile::Load() and associated functions. In the last patch which I had submitted for review here, Mike McCormack had pointed out an incorrect assumption that I had made about all locales being DBCS. Thanks to him, many of you will not suffer ;) Now that I fixed that last (?) weeny, I had sent it to Mike for a review. However, it seems he's a bit down now, and after waiting for about a week for his reply, I thought maybe I should ask you guys to nitpick ;) I really send this in because I went through Mike Kost's post 'More Games Tested', and I saw lots of 'err:menubuilder' and 'err:menubuilder:WinMain failed to build menu item for C:\windows\Start Menu\Programs\.......\ShortcutName.lnk' messages in his report. Hopefully, this patch should solve it ... If I get any bug reports, I will be happy to fill them out,else this one's going to Alexandre (with a few cosmetic changes of course !) Regards Subhobroto Sinha

2 1