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

Forming a SOC review committee
by Jeremy White April 19, 2006

April 19, 2006

Hi Folks, Last year, Dan Kegel, myself, Alexandre, Dimi Paun, and Lionel Ulmer served on the review committee for the SOC proposals. Our work was to sort the incoming applications, rank them, and then assign mentors to those that were funded. We probably should have done a better job of staying with and reporting on the status of the projects, but perhaps that can be something we try to do better this year. I think we should form a similar committee again this year. Dan Kegel is on it automatically, because he's 'connected'. Alexandre is on it automatically, because, well, he's Alexandre. Beyond that, I think it would be useful to have a relatively small committee (5 worked well, I think, although 7 is probably doable). I think the ideal is folks that have solid experience with Wine, and I think we need to have decent coverage of all of Wine. For example, I ended up dragooning Lionel (sorry, Lionel :-/) last year, because I felt we needed expertise on judging DirectX related proposals. If you're foolish enough to...er..willing to serve on the committee, please email me privately. I'll collate the data. If we end up with too many volunteers (a problem we didn't have last year), I'm not sure what we'll do. My gut instinct is to rely on Alexandre's judgement in culling the list. So the purpose of this thread is twofold: 1) To discuss this process, and make sure that everyone thinks its reasonable and that I didn't miss anything. 2) To ask folks that are willing to serve to volunteer. Cheers, Jeremy

2 1

Documentation for CLEANLOCALSTORAGE in OLE Automation
by Robert Shearman April 19, 2006

April 19, 2006

Hi, I just thought I'd document the CLEANLOCALSTORAGE use in oleaut32 for anyone that wants to implement it, although I can't implement it now for obvious reasons. First of all the background: the reason CLEANLOCALSTORAGE is needed is because the structures returned from various Get* functions in ITypeInfo and ITypeLib have pointers that have been allocated opaquely and have to be freed using the corresponding Release* function. AFAICS, the problem is not that the memory will not be freed (the RPC runtime should traverse the structure thoroughly and release all of the pointers with NdrOleFree), but that some of the memory may not need to be freed (and memory corruption could take place if it were). So what should the various CLEANLOCALSTORAGE functions actually do? CLEANLOCALSTORAGE_UserFree - nothing, as the marshaled DWORD does not need to be freed. CLEANLOCALSTORAGE_UserMarshal: o DWORD align the buffer. o Put the storage type into the buffer and increment it. o Call the relevent freer for the storage type, passing in the memory pointed to in CLEANLOCALSTORAGE. o Release the interface in CLEANLOCALSTORAGE. o Set memory pointed to in CLEANLOCALSTORAGE to NULL (so that the memory isn't freed again by the RPC runtime). CLEANLOCALSTORAGE_UserUnmarshal: o DWORD align the buffer. o Take the storage type from the buffer, increment the buffer and put the storage type into CLEANLOCALSTORAGE. CLEANLOCALSTORAGE_UserSize: o DWORD align the size and add sizeof(DWORD) to it. What should each of the Get* functions do that have a corresponding Release* function? o Put a type into CLEANLOCALSTORAGE (see below for what number this should be). o AddRef the interface to call the Release* function on and put it into CLEANLOCALSTORAGE. o Put a pointer to a pointer to the structure that is being allocated into CLEANLOCALSTORAGE. What type number corresponds to what function? ITypeComp_Bind - 0x66 or 0x76, depending on what is returned. ITypeInfo_GetTypeAttr - 0x74 ITypeInfo_GetFuncDesc - 0x66 ITypeInfo_GetVarDesc - 0x76 ITypeLib_GetLibAttr - 0x6c Note: it may be necessary to zero out certain fields of the various structures in the stub functions so that bad pointers don't get marshalled. Thanks, P.S. Take care to deep free all memory when releasing the pointers on the proxy side when implementing the Release*_Proxy functions. -- Rob Shearman

3 2

Re: [1/6] internal cursor / icon memory layout change
by Alexandre Julliard April 19, 2006

April 19, 2006

"H. Verbeet" <hverbeet(a)gmail.com> writes: > This patch adds an header with animation info (number of frames, delay > between frames) to the front of the internal cursor / icon memory > layout, in order to support animated mouse cursors. That's quite ugly, and it will break any app that depends on the cursor format, which is the only reason we are storing them in a memory block in the first place. -- Alexandre Julliard julliard(a)winehq.org

2 2

Easy patch submission with GIT + imap folders
by Mike McCormack April 19, 2006

April 19, 2006

Hi, As of the recently released GIT 1.3.0, sending patches via an IMAP folder with GIT just got easier. If everything is set up right, you should be able to run the following command: git-format-patch --attach --stdout --keep origin | git-imap-send This requires some configuration in ~/.git/config: [core] name = "Mike McCormack" email = "mike(a)codeweavers.com" [imap] Folder = "INBOX.Drafts" Tunnel = "ssh -q usr(a)svr /usr/bin/imapd ./Maildir 2> /dev/null" [format] headers = "To: wine-patches <wine-patches(a)winehq.org>\n" Using Mozilla, you can just click on the "Edit Draft:" in the message, check/edit the message and then click send. Alexandre has said that he doesn't mind if the subject line contains the ChangeLog entry. No more missing patches, missing ChangeLog entries, or patches generated from the wrong directory. I think James Hawkins has written a program similar to git-imap-send that works with GMail... Mike

3 3

Re: gdi: [2 of 3] Add header for GetCharABCWidthI
by Marcus Meissner April 19, 2006

April 19, 2006

On Wed, Apr 19, 2006 at 07:22:35PM +1000, Jeff L wrote: > I have repackaged this as package. > > This add the the WineEngGetCharABCWidthsI fuction for GetCharABCWidthsI. > There is no A or W suffix for this function as it works from a glyph > rather than a char. > > Change log: > Add WineEngGetCharABCWidthsI. > > Jeff Latimer > +// FIXME("%p, %d, %d, %p\n", font, firstChar, count, buffer); Please do not use C99 style comments. Ciao, Marcus

1 0

Re: advpack: Fix a missing declaration warning.
by James Hawkins April 19, 2006

April 19, 2006

On 4/18/06, Mike McCormack <mike(a)codeweavers.com> wrote: > > Changelog: > advpack: Fix a missing declaration warning > Can we hold on this patch? I sent a patch to add advpack_private.h which contains commonly used declarations that should fix this. Thanks, James Hawkins

1 0

Wine Front-End development
by Rich Gilson April 19, 2006

April 19, 2006

I was wondering... If somebody were writing a Wine GUI front-end for uses with the hope that it might possibly make it into the Wine distribution one day, what language(s) and toolkit(s) would be acceptable to the Wine developers for that person to use? Or, of course, do you not forsee that happening? Rich -- -- In a world without fences, who needs Gates?

13 24

Re: AutoCAD in Linux
by Tom Spear (Dustin Booker, Dustin Navea) April 18, 2006

April 18, 2006

Alexander N. Sørnes wrote: > Uwe Bonnes skrev: > >>>>>>> "Richardson" == Richardson <desdu(a)click21.com.br> writes: >>>>>>> >> >> Richardson> Hello! >> >> Richardson> My name is Richardson and I am from Brazil and I am >> needing >> Richardson> to know how I can install the AutoCAD r14 and AutoCAD >> 2000 >> Richardson> in a machine turning Fedora 3. he/she would Like to know >> Richardson> which the versions of Wine and the links to lower, and >> also >> Richardson> as I will proceed with the installation of CAD's. I >> await >> Richardson> answers soon. >> >> Autocad is copy protexted software. There are no easy and legal ways >> to run >> those software in wine >> > Installing a crack is both easy and legal. I haven't checked if there > are any for AutoCAD, though. > Cracks are not legal (at least not under US law and the DMCA), and under linux they can sometimes be not easy either.. Part of the DMCA says you cannot circumvent any sort of copy protection (which a crack does). If the laws in your country are different, feel free to do whatever is allowed under those laws.

1 0

RFC/PATCH: Twain + Gphoto
by Marcus Meissner April 18, 2006

April 18, 2006

Hi, I have started adding gphoto2 support to twain.dll. My current work (before a otherwise busy week begins again), is attached. I started to break up the currently very sane centric view. Alexandre/Aric, can I do it this way? Some other general comments? (The code btw works as-is for detection at least.) Ciao, Marcus Index: configure.ac =================================================================== RCS file: /home/wine/wine/configure.ac,v retrieving revision 1.468 diff -u -r1.468 configure.ac --- configure.ac 6 Apr 2006 10:53:39 -0000 1.468 +++ configure.ac 9 Apr 2006 19:13:29 -0000 @@ -521,6 +521,37 @@ CPPFLAGS="$ac_save_CPPFLAGS" fi +dnl **** Check for libgphoto2 **** +AC_CHECK_PROG(gphoto2_devel,gphoto2-config,gphoto2-config,no) +AC_CHECK_PROG(gphoto2port_devel,gphoto2-port-config,gphoto2-port-config,no) +AC_SUBST(GPHOTO2LIBS,"") +AC_SUBST(GPHOTO2INCL,"") +if test "$gphoto2_devel" != "no" -a "$gphoto2port_devel" != "no" +then + GPHOTO2INCL="`$gphoto2_devel --cflags` `$gphoto2port_devel --cflags`" + GPHOTO2LIBS="" + for i in `$gphoto2_devel --libs` `$gphoto2port_devel --libs` + do + case "$i" in + -L/usr/lib|-L/usr/lib64) ;; + -L*|-l*) GPHOTO2LIBS="$GPHOTO2LIBS $i";; + esac + done + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LIBS="$LIBS" + CPPFLAGS="$CPPFLAGS $GPHOTO2INCL" + LIBS="$LIBS $GPHOTO2LIBS" + AC_CHECK_HEADER(gphoto2-camera.h, + [AC_CHECK_LIB(gphoto2,gp_camera_new, + [AC_DEFINE(HAVE_GPHOTO2, 1, [Define if we have libgphoto2 development environment])], + [GPHOTO2LIBS="" + GPHOTO2INCL=""])], + [GPHOTO2LIBS="" + GPHOTO2INCL=""]) + LIBS="$ac_save_LIBS" + CPPFLAGS="$ac_save_CPPFLAGS" +fi + dnl **** Check for the ICU library **** if test "$ac_cv_header_unicode_ubidi_h" = "yes" then Index: dlls/twain/Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/twain/Makefile.in,v retrieving revision 1.10 diff -u -r1.10 Makefile.in --- dlls/twain/Makefile.in 28 Mar 2006 18:13:00 -0000 1.10 +++ dlls/twain/Makefile.in 9 Apr 2006 19:13:29 -0000 @@ -4,8 +4,8 @@ VPATH = @srcdir@ MODULE = twain_32.dll IMPORTS = comctl32 user32 gdi32 kernel32 ntdll -EXTRALIBS = @SANELIBS@ -EXTRAINCL = @SANEINCL@ +EXTRALIBS = @SANELIBS@ @GPHOTO2LIBS@ +EXTRAINCL = @SANEINCL@ @GPHOTO2INCL@ C_SRCS = \ capability.c \ Index: dlls/twain/ds_ctrl.c =================================================================== RCS file: /home/wine/wine/dlls/twain/ds_ctrl.c,v retrieving revision 1.6 diff -u -r1.6 ds_ctrl.c --- dlls/twain/ds_ctrl.c 28 Mar 2006 18:13:00 -0000 1.6 +++ dlls/twain/ds_ctrl.c 9 Apr 2006 19:13:29 -0000 @@ -648,27 +650,37 @@ if (pUserInterface->ShowUI) { BOOL rc; + FIXME("Showing UI now.\n"); pSource->currentState = 5; /* Transitions to state 5 */ - rc = DoScannerUI(pSource); - if (!rc) - { - pSource->pendingEvent.TWMessage = MSG_CLOSEDSREQ; - } + switch (devices[pSource->deviceIndex].type) { #ifdef HAVE_SANE - else - { - sane_get_parameters (pSource->deviceHandle, &pSource->sane_param); - pSource->sane_param_valid = TRUE; - } + case DEVTYPE_SANE: + rc = DoScannerUI(pSource); + if (!rc) { + pSource->pendingEvent.TWMessage = MSG_CLOSEDSREQ; + } else { + sane_get_parameters (pSource->deviceHandle, &pSource->sane_param); + pSource->sane_param_valid = TRUE; + } + break; #endif - } - else - { +#ifdef HAVE_GPHOTO2 + case DEVTYPE_GPHOTO: + FIXME("No GPHOTO UI yet.\n"); + pSource->pendingEvent.TWMessage = MSG_XFERREADY; + pSource->currentState = 6; /* Transitions to state 6 directly */ + break; +#endif + default: + FIXME("Device type %d is unknown\n", devices[pSource->deviceIndex].type); + break; + } + } else { + FIXME("UI not shown, preparing to transfer data.\n"); /* no UI will be displayed, so source is ready to transfer data */ pSource->pendingEvent.TWMessage = MSG_XFERREADY; pSource->currentState = 6; /* Transitions to state 6 directly */ } - pSource->hwndOwner = pUserInterface->hParent; twRC = TWRC_SUCCESS; pSource->twCC = TWCC_SUCCESS; Index: dlls/twain/ds_image.c =================================================================== RCS file: /home/wine/wine/dlls/twain/ds_image.c,v retrieving revision 1.8 diff -u -r1.8 ds_image.c --- dlls/twain/ds_image.c 28 Mar 2006 18:13:00 -0000 1.8 +++ dlls/twain/ds_image.c 9 Apr 2006 19:13:29 -0000 @@ -80,76 +80,81 @@ TW_UINT16 TWAIN_ImageInfoGet (pTW_IDENTITY pOrigin, pTW_IDENTITY pDest, TW_MEMREF pData) { -#ifndef HAVE_SANE - return TWRC_FAILURE; -#else - TW_UINT16 twRC = TWRC_SUCCESS; - pTW_IMAGEINFO pImageInfo = (pTW_IMAGEINFO) pData; - activeDS *pSource = TWAIN_LookupSource (pDest); - SANE_Status status; - - TRACE("DG_IMAGE/DAT_IMAGEINFO/MSG_GET\n"); - - if (!pSource) - { - twRC = TWRC_FAILURE; - DSM_twCC = TWCC_BADDEST; - } - else if (pSource->currentState != 6 && pSource->currentState != 7) - { - twRC = TWRC_FAILURE; - pSource->twCC = TWCC_SEQERROR; - } - else - { - if (pSource->currentState == 6) - { - /* return general image description information about the image about to be transferred */ - status = sane_get_parameters (pSource->deviceHandle, &pSource->sane_param); - pSource->sane_param_valid = TRUE; - TRACE("Getting parameters\n"); - } + pTW_IMAGEINFO pImageInfo = (pTW_IMAGEINFO) pData; + activeDS *pSource = TWAIN_LookupSource (pDest); - pImageInfo->XResolution.Whole = -1; - pImageInfo->XResolution.Frac = 0; - pImageInfo->YResolution.Whole = -1; - pImageInfo->YResolution.Frac = 0; - pImageInfo->ImageWidth = pSource->sane_param.pixels_per_line; - pImageInfo->ImageLength = pSource->sane_param.lines; + TRACE("DG_IMAGE/DAT_IMAGEINFO/MSG_GET\n"); - TRACE("Bits per Sample %i\n",pSource->sane_param.depth); - TRACE("Frame Format %i\n",pSource->sane_param.format); - - if (pSource->sane_param.format == SANE_FRAME_RGB ) - { - pImageInfo->BitsPerPixel = pSource->sane_param.depth * 3; - pImageInfo->Compression = TWCP_NONE; - pImageInfo->Planar = TRUE; - pImageInfo->SamplesPerPixel = 3; - pImageInfo->BitsPerSample[0] = pSource->sane_param.depth; - pImageInfo->BitsPerSample[1] = pSource->sane_param.depth; - pImageInfo->BitsPerSample[2] = pSource->sane_param.depth; - pImageInfo->PixelType = TWPT_RGB; - } - else if (pSource->sane_param.format == SANE_FRAME_GRAY) - { - pImageInfo->BitsPerPixel = pSource->sane_param.depth; - pImageInfo->Compression = TWCP_NONE; - pImageInfo->Planar = TRUE; - pImageInfo->SamplesPerPixel = 1; - pImageInfo->BitsPerSample[0] = pSource->sane_param.depth; - pImageInfo->PixelType = TWPT_GRAY; - } - else - { - ERR("Unhandled source frame type %i\n",pSource->sane_param.format); - twRC = TWRC_FAILURE; - pSource->twCC = TWCC_SEQERROR; - } - } - - return twRC; + if (!pSource) { + FIXME("no source\n"); + DSM_twCC = TWCC_BADDEST; + return TWRC_FAILURE; + } + if (pSource->currentState != 6 && pSource->currentState != 7) { + FIXME("bad state %d\n", pSource->currentState); + pSource->twCC = TWCC_SEQERROR; + return TWRC_FAILURE; + } + + switch (devices[pSource->deviceIndex].type) { +#ifdef HAVE_SANE + case DEVTYPE_SANE: { + SANE_Status status; + if (pSource->currentState == 6) + { + /* return general image description information about the image about to be transferred */ + status = sane_get_parameters (pSource->deviceHandle, &pSource->sane_param); + pSource->sane_param_valid = TRUE; + TRACE("Getting parameters\n"); + } + + pImageInfo->XResolution.Whole = -1; + pImageInfo->XResolution.Frac = 0; + pImageInfo->YResolution.Whole = -1; + pImageInfo->YResolution.Frac = 0; + pImageInfo->ImageWidth = pSource->sane_param.pixels_per_line; + pImageInfo->ImageLength = pSource->sane_param.lines; + + TRACE("Bits per Sample %i\n",pSource->sane_param.depth); + TRACE("Frame Format %i\n",pSource->sane_param.format); + + if (pSource->sane_param.format == SANE_FRAME_RGB ) + { + pImageInfo->BitsPerPixel = pSource->sane_param.depth * 3; + pImageInfo->Compression = TWCP_NONE; + pImageInfo->Planar = TRUE; + pImageInfo->SamplesPerPixel = 3; + pImageInfo->BitsPerSample[0] = pSource->sane_param.depth; + pImageInfo->BitsPerSample[1] = pSource->sane_param.depth; + pImageInfo->BitsPerSample[2] = pSource->sane_param.depth; + pImageInfo->PixelType = TWPT_RGB; + } + else if (pSource->sane_param.format == SANE_FRAME_GRAY) + { + pImageInfo->BitsPerPixel = pSource->sane_param.depth; + pImageInfo->Compression = TWCP_NONE; + pImageInfo->Planar = TRUE; + pImageInfo->SamplesPerPixel = 1; + pImageInfo->BitsPerSample[0] = pSource->sane_param.depth; + pImageInfo->PixelType = TWPT_GRAY; + } + else + { + ERR("Unhandled source frame type %i\n",pSource->sane_param.format); + pSource->twCC = TWCC_SEQERROR; + return TWRC_FAILURE; + } + break; + } #endif + case DEVTYPE_GPHOTO: + FIXME("gphoto case\n"); + break; + default: + FIXME("Unknown devtype %d\n", devices[pSource->deviceIndex].type); + break; + } + return TWRC_SUCCESS; } /* DG_IMAGE/DAT_IMAGELAYOUT/MSG_GET */ Index: dlls/twain/dsm_ctrl.c =================================================================== RCS file: /home/wine/wine/dlls/twain/dsm_ctrl.c,v retrieving revision 1.13 diff -u -r1.13 dsm_ctrl.c --- dlls/twain/dsm_ctrl.c 28 Mar 2006 18:13:00 -0000 1.13 +++ dlls/twain/dsm_ctrl.c 9 Apr 2006 19:13:29 -0000 @@ -2,6 +2,7 @@ * TWAIN32 Source Manager * * Copyright 2000 Corel Corporation + * Copyright 2006 Marcus Meissner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,54 +35,149 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); -/* DG_CONTROL/DAT_IDENTITY/MSG_CLOSEDS */ -TW_UINT16 TWAIN_CloseDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) -{ -#ifndef HAVE_SANE - DSM_twCC = TWCC_NODS; - return TWRC_FAILURE; -#else - TW_UINT16 twRC = TWRC_SUCCESS; - pTW_IDENTITY pIdentity = (pTW_IDENTITY) pData; - activeDS *currentDS = NULL, *prevDS = NULL; +int nrdevices = 0; +struct all_devices *devices = NULL; - TRACE ("DG_CONTROL/DAT_IDENTITY/MSG_CLOSEDS\n"); +static int detectionrun = 0; - for (currentDS = activeSources; currentDS; currentDS = currentDS->next) - { - if (currentDS->identity.Id == pIdentity->Id) - break; - prevDS = currentDS; - } - if (currentDS) - { - /* Only valid to close a data source if it is in state 4 */ - if (currentDS->currentState == 4) - { - sane_close (currentDS->deviceHandle); - /* remove the data source from active data source list */ - if (prevDS) - prevDS->next = currentDS->next; - else - activeSources = currentDS->next; - HeapFree (GetProcessHeap(), 0, currentDS); - twRC = TWRC_SUCCESS; - DSM_twCC = TWCC_SUCCESS; +static void +detect_sane_devices() { +#ifdef HAVE_SANE + const SANE_Device **sane_devlist; + int i; + + FIXME("detecting sane...\n"); + if (sane_get_devices (&sane_devlist, SANE_FALSE) != SANE_STATUS_GOOD) + return; + for ( i=0; + sane_devlist[i] && + sane_devlist[i]->model && + sane_devlist[i]->vendor && + sane_devlist[i]->name; + i++ + ) { + if (nrdevices) + devices = realloc(devices, sizeof(devices[0])*(nrdevices+1)); + else + devices = malloc(sizeof(devices[0])); + devices[nrdevices].type = DEVTYPE_SANE; + devices[nrdevices].u.sane.dev = sane_devlist[i]; + nrdevices++; + } + return; +#endif +} + +static void +detect_gphoto_devices() { +#ifdef HAVE_GPHOTO2 + int x, count; + CameraList *list; + CameraAbilitiesList *al = NULL; + int result; + + GPPortInfoList *plist = NULL; + + TRACE("detecting gphoto...\n"); + if (gp_port_info_list_new (&plist) < GP_OK) + return; + result = gp_port_info_list_load (plist); + if (result < 0) { + gp_port_info_list_free (plist); + return; } - else - { - twRC = TWRC_FAILURE; - DSM_twCC = TWCC_SEQERROR; + count = gp_port_info_list_count (plist); + if (count <= 0) + return; + if (gp_list_new (&list) < GP_OK) + return; + gp_abilities_list_new (&al); + gp_abilities_list_load (al, NULL); + gp_abilities_list_detect (al, plist, list, NULL); + gp_abilities_list_free (al); + + count = gp_list_count (list); + if (count < GP_OK) { + gp_list_free (list); + return; + } + for (x = 0; x < count; x++) { + const char *s; + if (nrdevices) + devices = realloc(devices, sizeof(devices[0])*(nrdevices+1)); + else + devices = malloc(sizeof(devices[0])); + devices[nrdevices].type = DEVTYPE_GPHOTO; + gp_list_get_name (list, x, &s); + devices[nrdevices].u.gphoto.name = strdup(s); + gp_list_get_value (list, x, &s); + devices[nrdevices].u.gphoto.port = strdup(s); + TRACE("Adding gphoto device %s:%s...\n", devices[nrdevices].u.gphoto.name, devices[nrdevices].u.gphoto.port); + nrdevices++; } - } - else - { - twRC = TWRC_FAILURE; - DSM_twCC = TWCC_NODS; - } + gp_list_free (list); +#endif +} - return twRC; +static void +twain_autodetect() { + if (detectionrun) return; + detectionrun = 1; + + detect_sane_devices(); + detect_gphoto_devices(); +} + +/* DG_CONTROL/DAT_IDENTITY/MSG_CLOSEDS */ +TW_UINT16 TWAIN_CloseDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) +{ + TW_UINT16 twRC = TWRC_SUCCESS; + pTW_IDENTITY pIdentity = (pTW_IDENTITY) pData; + activeDS *currentDS = NULL, *prevDS = NULL; + + TRACE ("DG_CONTROL/DAT_IDENTITY/MSG_CLOSEDS\n"); + + for (currentDS = activeSources; currentDS; currentDS = currentDS->next) { + if (currentDS->identity.Id == pIdentity->Id) + break; + prevDS = currentDS; + } + if (currentDS) { + /* Only valid to close a data source if it is in state 4 */ + if (currentDS->currentState == 4) { + switch (devices[currentDS->deviceIndex].type) { +#ifdef HAVE_SANE + case DEVTYPE_SANE: + sane_close (currentDS->deviceHandle); + break; +#endif +#ifdef HAVE_GPHOTO2 + case DEVTYPE_GPHOTO: + gp_camera_exit (currentDS->camera, NULL); + currentDS->camera = NULL; + break; #endif + default: + FIXME("Unknown devtype %d\n", devices[currentDS->deviceIndex].type); + break; + } + /* remove the data source from active data source list */ + if (prevDS) + prevDS->next = currentDS->next; + else + activeSources = currentDS->next; + HeapFree (GetProcessHeap(), 0, currentDS); + twRC = TWRC_SUCCESS; + DSM_twCC = TWCC_SUCCESS; + } else { + twRC = TWRC_FAILURE; + DSM_twCC = TWCC_SEQERROR; + } + } else { + twRC = TWRC_FAILURE; + DSM_twCC = TWCC_NODS; + } + return twRC; } /* Sane returns device names that are longer than the 32 bytes allowed @@ -118,229 +214,221 @@ } #endif +static int +_get_id(pTW_IDENTITY pSourceIdentity, int i) { + pSourceIdentity->Id = DSM_sourceId++; + pSourceIdentity->ProtocolMajor = TWON_PROTOCOLMAJOR; + pSourceIdentity->ProtocolMinor = TWON_PROTOCOLMINOR; + + /* FIXME: the default device is not necessarily the first device. * + * Users should be able to choose the default device */ + switch (devices[i].type) { +#ifdef HAVE_SANE + case DEVTYPE_SANE: { + copy_sane_short_name(devices[i].u.sane.dev->name, pSourceIdentity->ProductName, sizeof(pSourceIdentity->ProductName) - 1); + TRACE("got: %s (short [%s]), %s, %s\n", + devices[i].u.sane.dev->name, + pSourceIdentity->ProductName, + devices[i].u.sane.dev->vendor, + devices[i].u.sane.dev->model + ); + lstrcpynA (pSourceIdentity->Manufacturer, devices[i].u.sane.dev->vendor, sizeof(pSourceIdentity->Manufacturer) - 1); + lstrcpynA (pSourceIdentity->ProductFamily, devices[i].u.sane.dev->model, sizeof(pSourceIdentity->ProductFamily) - 1); + DSM_twCC = TWCC_SUCCESS; + return TWRC_SUCCESS; + } +#endif + case DEVTYPE_GPHOTO: { + TRACE ("return gphoto entry %s.%s\n", devices[i].u.gphoto.name, devices[i].u.gphoto.port); + lstrcpynA (pSourceIdentity->Manufacturer, devices[i].u.gphoto.name, sizeof(pSourceIdentity->Manufacturer) - 1); + lstrcpynA (pSourceIdentity->ProductFamily, "GPhoto Camera", sizeof(pSourceIdentity->ProductFamily) - 1); + lstrcpynA (pSourceIdentity->ProductName, devices[i].u.gphoto.port, sizeof(pSourceIdentity->ProductName) - 1); + DSM_twCC = TWCC_SUCCESS; + return TWRC_SUCCESS; + } + default: + TRACE("No TWAIN device available.\n"); + DSM_twCC = TWCC_NODS; + return TWRC_FAILURE; + } +} + /* DG_CONTROL/DAT_IDENTITY/MSG_GETDEFAULT */ TW_UINT16 TWAIN_IdentityGetDefault (pTW_IDENTITY pOrigin, TW_MEMREF pData) { -#ifndef HAVE_SANE - DSM_twCC = TWCC_NODS; - return TWRC_FAILURE; -#else - TW_UINT16 twRC = TWRC_SUCCESS; - pTW_IDENTITY pSourceIdentity = (pTW_IDENTITY) pData; - - TRACE("DG_CONTROL/DAT_IDENTITY/MSG_GETDEFAULT\n"); - - if (!device_list) - { - if ((sane_get_devices (&device_list, SANE_FALSE) != SANE_STATUS_GOOD)) - { - DSM_twCC = TWCC_NODS; - return TWRC_FAILURE; - } - } - - /* FIXME: the default device is not necessarily the first device. * - * Users should be able to choose the default device */ - if (device_list && device_list[0]) - { - pSourceIdentity->Id = DSM_sourceId ++; - copy_sane_short_name(device_list[0]->name, pSourceIdentity->ProductName, sizeof(pSourceIdentity->ProductName) - 1); - TRACE("got: %s (short [%s]), %s, %s\n", device_list[0]->name, pSourceIdentity->ProductName, device_list[0]->vendor, device_list[0]->model); - lstrcpynA (pSourceIdentity->Manufacturer, device_list[0]->vendor, sizeof(pSourceIdentity->Manufacturer) - 1); - lstrcpynA (pSourceIdentity->ProductFamily, device_list[0]->model, sizeof(pSourceIdentity->ProductFamily) - 1); - pSourceIdentity->ProtocolMajor = TWON_PROTOCOLMAJOR; - pSourceIdentity->ProtocolMinor = TWON_PROTOCOLMINOR; - - twRC = TWRC_SUCCESS; - DSM_twCC = TWCC_SUCCESS; - - } - else - { - twRC = TWRC_FAILURE; - DSM_twCC = TWCC_NODS; - } + pTW_IDENTITY pSourceIdentity = (pTW_IDENTITY) pData; - return twRC; -#endif + TRACE("DG_CONTROL/DAT_IDENTITY/MSG_GETDEFAULT\n"); + DSM_twCC = TWCC_NODS; + twain_autodetect(); + if (!nrdevices) + return TWRC_FAILURE; + return _get_id(pSourceIdentity,0); } /* DG_CONTROL/DAT_IDENTITY/MSG_GETFIRST */ TW_UINT16 TWAIN_IdentityGetFirst (pTW_IDENTITY pOrigin, TW_MEMREF pData) { -#ifndef HAVE_SANE - DSM_twCC = TWCC_NODS; - return TWRC_FAILURE; -#else - TW_UINT16 twRC = TWRC_SUCCESS; - pTW_IDENTITY pSourceIdentity = (pTW_IDENTITY) pData; - SANE_Status status; - - TRACE ("DG_CONTROL/DAT_IDENTITY/MSG_GETFIRST\n"); - - device_list = NULL; - status = sane_get_devices (&device_list, SANE_FALSE); - if (status == SANE_STATUS_GOOD) - { - if (device_list[0]) - { - pSourceIdentity->Id = DSM_sourceId ++; - copy_sane_short_name(device_list[0]->name, pSourceIdentity->ProductName, sizeof(pSourceIdentity->ProductName) - 1); - TRACE("got: %s (short [%s]), %s, %s\n", device_list[0]->name, pSourceIdentity->ProductName, device_list[0]->vendor, device_list[0]->model); - lstrcpynA (pSourceIdentity->Manufacturer, device_list[0]->vendor, sizeof(pSourceIdentity->Manufacturer) - 1); - lstrcpynA (pSourceIdentity->ProductFamily, device_list[0]->model, sizeof(pSourceIdentity->ProductFamily) - 1); - pSourceIdentity->ProtocolMajor = TWON_PROTOCOLMAJOR; - pSourceIdentity->ProtocolMinor = TWON_PROTOCOLMINOR; - - DSM_currentDevice = 1; - twRC = TWRC_SUCCESS; - DSM_twCC = TWCC_SUCCESS; - } - else - { - TRACE("got empty device list\n"); - twRC = TWRC_FAILURE; - DSM_twCC = TWCC_NODS; - } - } - else if (status == SANE_STATUS_NO_MEM) - { - twRC = TWRC_FAILURE; - DSM_twCC = TWCC_LOWMEMORY; - } - else - { - WARN("sane_get_devices() failed: %s\n", sane_strstatus (status)); - twRC = TWRC_FAILURE; - DSM_twCC = TWCC_NODS; - } + pTW_IDENTITY pSourceIdentity = (pTW_IDENTITY) pData; - return twRC; -#endif + TRACE ("DG_CONTROL/DAT_IDENTITY/MSG_GETFIRST\n"); + twain_autodetect(); + if (!nrdevices) { + TRACE ("no entries found.\n"); + DSM_twCC = TWCC_SUCCESS; + return TWRC_ENDOFLIST; + } + DSM_currentDevice = 0; + return _get_id(pSourceIdentity,DSM_currentDevice++); } /* DG_CONTROL/DAT_IDENTITY/MSG_GETNEXT */ TW_UINT16 TWAIN_IdentityGetNext (pTW_IDENTITY pOrigin, TW_MEMREF pData) { -#ifndef HAVE_SANE - DSM_twCC = TWCC_SUCCESS; - return TWRC_ENDOFLIST; -#else - TW_UINT16 twRC = TWRC_SUCCESS; - pTW_IDENTITY pSourceIdentity = (pTW_IDENTITY) pData; - - TRACE("DG_CONTROL/DAT_IDENTITY/MSG_GETNEXT\n"); - - if (device_list && device_list[DSM_currentDevice] && - device_list[DSM_currentDevice]->name && - device_list[DSM_currentDevice]->vendor && - device_list[DSM_currentDevice]->model) - { - pSourceIdentity->Id = DSM_sourceId ++; - copy_sane_short_name(device_list[DSM_currentDevice]->name, pSourceIdentity->ProductName, sizeof(pSourceIdentity->ProductName) - 1); - TRACE("got: %s (short [%s]), %s, %s\n", device_list[DSM_currentDevice]->name, pSourceIdentity->ProductName, device_list[DSM_currentDevice]->vendor, device_list[DSM_currentDevice]->model); - lstrcpynA (pSourceIdentity->Manufacturer, device_list[DSM_currentDevice]->vendor, sizeof(pSourceIdentity->Manufacturer) - 1); - lstrcpynA (pSourceIdentity->ProductFamily, device_list[DSM_currentDevice]->model, sizeof(pSourceIdentity->ProductFamily) - 1); - pSourceIdentity->ProtocolMajor = TWON_PROTOCOLMAJOR; - pSourceIdentity->ProtocolMinor = TWON_PROTOCOLMINOR; - DSM_currentDevice ++; - - twRC = TWRC_SUCCESS; - DSM_twCC = TWCC_SUCCESS; - } - else - { - DSM_twCC = TWCC_SUCCESS; - twRC = TWRC_ENDOFLIST; - } + pTW_IDENTITY pSourceIdentity = (pTW_IDENTITY) pData; - return twRC; -#endif + TRACE("DG_CONTROL/DAT_IDENTITY/MSG_GETNEXT\n"); + if (!nrdevices || (DSM_currentDevice == nrdevices)) { + DSM_twCC = TWCC_SUCCESS; + return TWRC_ENDOFLIST; + } + return _get_id(pSourceIdentity,DSM_currentDevice++); } /* DG_CONTROL/DAT_IDENTITY/MSG_OPENDS */ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) { -#ifndef HAVE_SANE - DSM_twCC = TWCC_NODS; - return TWRC_FAILURE; + TW_UINT16 i = 0; + pTW_IDENTITY pIdentity = (pTW_IDENTITY) pData; + TW_STR32 shortname; + activeDS *newSource; + + TRACE("DG_CONTROL/DAT_IDENTITY/MSG_OPENDS\n"); + + if (DSM_currentState != 3) { + DSM_twCC = TWCC_SEQERROR; + FIXME("sequence error\n"); + return TWRC_FAILURE; + } + twain_autodetect(); + if (!nrdevices) { + DSM_twCC = TWCC_NODS; + FIXME("No devices.\n"); + return TWRC_FAILURE; + } + + if (pIdentity->ProductName[0] != '\0') { + /* Make sure the source to be opened exists in the device list */ + for (i = 0; i<nrdevices; i++) { + int found = 0; + switch (devices[i].type) { +#ifdef HAVE_SANE + case DEVTYPE_SANE: + copy_sane_short_name(devices[i].u.sane.dev->name, shortname, sizeof(shortname) - 1); + if (strcmp (shortname, pIdentity->ProductName) == 0) + found = 1; + break; +#endif + case DEVTYPE_GPHOTO: + if (strcmp (devices[i].u.gphoto.port, pIdentity->ProductName) == 0) + found = 1; + break; + default:break; + } + if (found) + break; + } + if (i == nrdevices) + i=0; + } /* else use the first device */ + + /* the source is found in the device list */ + newSource = HeapAlloc (GetProcessHeap(), 0, sizeof (activeDS)); + if (!newSource) { + DSM_twCC = TWCC_LOWMEMORY; + FIXME("Out of memory.\n"); + return TWRC_FAILURE; + } + newSource->deviceIndex = i; + switch (devices[i].type) { +#ifdef HAVE_SANE + case DEVTYPE_SANE: { + SANE_Status status; + status = sane_open(devices[i].u.sane.dev->name,&newSource->deviceHandle); + if (status == SANE_STATUS_GOOD) { + /* Assign name and id for the opened data source */ + lstrcpynA (pIdentity->ProductName, shortname, sizeof(pIdentity->ProductName) - 1); + pIdentity->Id = DSM_sourceId ++; + /* add the data source to an internal active source list */ + newSource->next = activeSources; + newSource->identity.Id = pIdentity->Id; + strcpy (newSource->identity.ProductName, pIdentity->ProductName); + newSource->currentState = 4; /*transition into state 4*/ + newSource->twCC = TWCC_SUCCESS; + activeSources = newSource; + DSM_twCC = TWCC_SUCCESS; + return TWRC_SUCCESS; + } else { + DSM_twCC = TWCC_OPERATIONERROR; + return TWRC_FAILURE; + } + break; + } +#endif + case DEVTYPE_GPHOTO: { +#ifdef HAVE_GPHOTO2 + int ret, m; + CameraAbilities a; + CameraAbilitiesList *al = NULL; + + + DSM_twCC = TWCC_OPERATIONERROR; + ret = gp_camera_new (&newSource->camera); + if (ret < GP_OK) { + FIXME("failed to gp_camera_new\n"); + return TWRC_FAILURE; + } + + gp_abilities_list_new (&al); + gp_abilities_list_load (al, NULL); + m = gp_abilities_list_lookup_model (al, devices[i].u.gphoto.name); + if (m < GP_OK) { + FIXME("failed to gp_camera_list_lookup_model\n"); + return TWRC_FAILURE; + } + ret = gp_abilities_list_get_abilities (al, m, &a); + if (ret < GP_OK) { + FIXME("failed to gp_camera_list_get_abilities\n"); + return TWRC_FAILURE; + } + ret = gp_camera_set_abilities (newSource->camera, a); + if (ret < GP_OK) { + FIXME("failed to gp_camera_set_abilities\n"); + return TWRC_FAILURE; + } + gp_abilities_list_free (al); + /* Assign name and id for the opened data source */ + lstrcpynA (pIdentity->ProductName, shortname, sizeof(pIdentity->ProductName) - 1); + pIdentity->Id = DSM_sourceId ++; + /* add the data source to an internal active source list */ + newSource->next = activeSources; + newSource->identity.Id = pIdentity->Id; + strcpy (newSource->identity.ProductName, pIdentity->ProductName); + newSource->currentState = 4; /*transition into state 4*/ + newSource->twCC = TWCC_SUCCESS; + activeSources = newSource; + DSM_twCC = TWCC_SUCCESS; + TRACE("succeeded opening gphoto camera.\n"); + return TWRC_SUCCESS; #else - TW_UINT16 twRC = TWRC_SUCCESS, i = 0; - pTW_IDENTITY pIdentity = (pTW_IDENTITY) pData; - TW_STR32 shortname; - activeDS *newSource; - SANE_Status status; - - TRACE("DG_CONTROL/DAT_IDENTITY/MSG_OPENDS\n"); - - if (DSM_currentState != 3) - { - DSM_twCC = TWCC_SEQERROR; - return TWRC_FAILURE; - } - - if (!device_list && - (sane_get_devices (&device_list, SANE_FALSE) != SANE_STATUS_GOOD)) - { - DSM_twCC = TWCC_NODS; - return TWRC_FAILURE; - } - - if (pIdentity->ProductName[0] != '\0') - { - /* Make sure the source to be opened exists in the device list */ - for (i = 0; device_list[i]; i ++) - { - copy_sane_short_name(device_list[i]->name, shortname, sizeof(shortname) - 1); - if (strcmp (shortname, pIdentity->ProductName) == 0) - break; - } - - } - - if (device_list[i]) - { - /* the source is found in the device list */ - newSource = HeapAlloc (GetProcessHeap(), 0, sizeof (activeDS)); - if (newSource) - { - newSource->deviceIndex = i; - status = sane_open(device_list[i]->name,&newSource->deviceHandle); - if (status == SANE_STATUS_GOOD) - { - /* Assign name and id for the opened data source */ - lstrcpynA (pIdentity->ProductName, shortname, sizeof(pIdentity->ProductName) - 1); - pIdentity->Id = DSM_sourceId ++; - /* add the data source to an internal active source list */ - newSource->next = activeSources; - newSource->identity.Id = pIdentity->Id; - strcpy (newSource->identity.ProductName, pIdentity->ProductName); - newSource->currentState = 4; /*transition into state 4*/ - newSource->twCC = TWCC_SUCCESS; - activeSources = newSource; - twRC = TWRC_SUCCESS; - DSM_twCC = TWCC_SUCCESS; - } - else - { - twRC = TWRC_FAILURE; - DSM_twCC = TWCC_OPERATIONERROR; - } - } - else - { - twRC = TWRC_FAILURE; - DSM_twCC = TWCC_LOWMEMORY; - } - } - else - { - twRC = TWRC_FAILURE; - DSM_twCC = TWCC_NODS; - } - - return twRC; + ERR("No gphoto support?\n"); #endif + } + default: + FIXME("default case, device type %d?\n", devices[i].type); + DSM_twCC = TWCC_OPERATIONERROR; + return TWRC_FAILURE; + } } /* DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT */ @@ -351,7 +439,7 @@ #else TW_UINT16 twRC = TWRC_SUCCESS; - TRACE("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT\n"); + FIXME("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT\n"); /* FIXME: we should replace xscanimage with our own User Select UI */ system("xscanimage"); @@ -404,50 +492,40 @@ /* DG_CONTROL/DAT_PARENT/MSG_OPENDSM */ TW_UINT16 TWAIN_OpenDSM (pTW_IDENTITY pOrigin, TW_MEMREF pData) { -#ifndef HAVE_SANE - return TWRC_FAILURE; -#else - TW_UINT16 twRC = TWRC_SUCCESS; - SANE_Status status; - SANE_Int version_code; + TW_UINT16 twRC = TWRC_SUCCESS; - TRACE("DG_CONTROL/DAT_PARENT/MSG_OPENDSM\n"); - - if (DSM_currentState == 2) - { - if (!DSM_initialized) - { - DSM_initialized = TRUE; - status = sane_init (&version_code, NULL); - device_list = NULL; - DSM_currentDevice = 0; - DSM_sourceId = 0; - } - DSM_parentHWND = *(TW_HANDLE*)pData; - DSM_currentState = 3; /* transition to state 3 */ - DSM_twCC = TWCC_SUCCESS; - twRC = TWRC_SUCCESS; - } - else - { - /* operation invoked in invalid state */ - DSM_twCC = TWCC_SEQERROR; - twRC = TWRC_FAILURE; - } + TRACE("DG_CONTROL/DAT_PARENT/MSG_OPENDSM\n"); + if (DSM_currentState == 2) { + if (!DSM_initialized) { +#ifdef HAVE_SANE + SANE_Status status; + SANE_Int version_code; - return twRC; + status = sane_init (&version_code, NULL); #endif + DSM_currentDevice = 0; + DSM_initialized = TRUE; + } + DSM_parentHWND = *(TW_HANDLE*)pData; + DSM_currentState = 3; /* transition to state 3 */ + DSM_twCC = TWCC_SUCCESS; + twRC = TWRC_SUCCESS; + } else { + /* operation invoked in invalid state */ + DSM_twCC = TWCC_SEQERROR; + twRC = TWRC_FAILURE; + } + return twRC; } /* DG_CONTROL/DAT_STATUS/MSG_GET */ TW_UINT16 TWAIN_GetDSMStatus (pTW_IDENTITY pOrigin, TW_MEMREF pData) { - pTW_STATUS pSourceStatus = (pTW_STATUS) pData; + pTW_STATUS pSourceStatus = (pTW_STATUS) pData; - TRACE ("DG_CONTROL/DAT_STATUS/MSG_GET\n"); + TRACE ("DG_CONTROL/DAT_STATUS/MSG_GET\n"); - pSourceStatus->ConditionCode = DSM_twCC; - DSM_twCC = TWCC_SUCCESS; /* clear the condition code */ - - return TWRC_SUCCESS; + pSourceStatus->ConditionCode = DSM_twCC; + DSM_twCC = TWCC_SUCCESS; /* clear the condition code */ + return TWRC_SUCCESS; } Index: dlls/twain/twain_i.h =================================================================== RCS file: /home/wine/wine/dlls/twain/twain_i.h,v retrieving revision 1.8 diff -u -r1.8 twain_i.h --- dlls/twain/twain_i.h 28 Mar 2006 18:13:00 -0000 1.8 +++ dlls/twain/twain_i.h 9 Apr 2006 19:13:29 -0000 @@ -28,6 +28,13 @@ #endif #include <stdarg.h> +#ifdef HAVE_GPHOTO2 +/* Hack ... otherwise gphoto2 thinks its on Windows */ +# undef WIN32 +# include <gphoto2/gphoto2-camera.h> +# define WIN32 +#endif + #include "windef.h" #include "winbase.h" #include "twain.h" @@ -43,12 +50,15 @@ TW_UINT16 twCC; /* condition code */ HWND hwndOwner; /* window handle of the app */ HWND progressWnd; /* window handle of the scanning window */ + INT deviceIndex; /* index of the current device */ #ifdef HAVE_SANE SANE_Handle deviceHandle; /* device handle */ SANE_Parameters sane_param; /* parameters about the image transferred */ - BOOL sane_param_valid; /* true if valid sane_param*/ - INT deviceIndex; /* index of the current device */ + BOOL sane_param_valid; /* true if valid sane_param*/ +#endif +#ifdef HAVE_GPHOTO2 + Camera *camera; #endif /* Capabiblities */ TW_UINT16 capXferMech; /* ICAP_XFERMECH */ @@ -62,9 +72,33 @@ TW_UINT16 DSM_currentDevice; /* keep track of device during enumeration */ HINSTANCE DSM_instance; +enum twain_devtype { + DEVTYPE_SANE, + DEVTYPE_GPHOTO +}; + +struct sane_device { #ifdef HAVE_SANE -const SANE_Device **device_list;/* a list of all sane devices */ + const SANE_Device *dev; #endif +}; + +struct gphoto_device { + const char *name; + const char *port; +}; + +struct all_devices { + enum twain_devtype type; + union { + struct sane_device sane; + struct gphoto_device gphoto; + } u; +}; + +extern int nrdevices; +extern struct all_devices *devices; + activeDS *activeSources; /* list of active data sources */ /* Helper functions */ Index: dlls/twain/ui.c =================================================================== RCS file: /home/wine/wine/dlls/twain/ui.c,v retrieving revision 1.1 diff -u -r1.1 ui.c --- dlls/twain/ui.c 28 Mar 2006 18:13:00 -0000 1.1 +++ dlls/twain/ui.c 9 Apr 2006 19:13:30 -0000 @@ -574,15 +574,15 @@ index ++; } - len = lstrlenA(device_list[pSource->deviceIndex]->vendor) - + lstrlenA(device_list[pSource->deviceIndex]->model) + 2; + len = lstrlenA(devices[pSource->deviceIndex].u.sane.dev->vendor) + + lstrlenA(devices[pSource->deviceIndex].u.sane.dev->model) + 2; szCaption = HeapAlloc(GetProcessHeap(),0,len *sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP,0,device_list[pSource->deviceIndex]->vendor,-1, + MultiByteToWideChar(CP_ACP,0,devices[pSource->deviceIndex].u.sane.dev->vendor,-1, szCaption,len); - szCaption[lstrlenA(device_list[pSource->deviceIndex]->vendor)] = ' '; - MultiByteToWideChar(CP_ACP,0,device_list[pSource->deviceIndex]->model,-1, - &szCaption[lstrlenA(device_list[pSource->deviceIndex]->vendor)+1],len); + szCaption[lstrlenA(devices[pSource->deviceIndex].u.sane.dev->vendor)] = ' '; + MultiByteToWideChar(CP_ACP,0,devices[pSource->deviceIndex].u.sane.dev->model,-1, + &szCaption[lstrlenA(devices[pSource->deviceIndex].u.sane.dev->vendor)+1],len); psh.dwSize = sizeof(PROPSHEETHEADERW); psh.dwFlags = PSH_PROPSHEETPAGE|PSH_PROPTITLE|PSH_USECALLBACK;

3 3

Coverity and our conformance tests
by Paul Vriens April 18, 2006

April 18, 2006

Hi, our conformance tests are (of course) also testing several things that would be reported by the coverity checks. Should we just mark these as FALSE or how should we deal we these 'errors'? Cheers, Paul.

2 1

Re: AutoCAD in Linux
by Paul April 18, 2006

April 18, 2006

On Tue, 2006-04-18 at 19:14 +0200, "Alexander N. Sørnes" wrote: > Uwe Bonnes skrev: > > >>>>>>"Richardson" == Richardson <desdu(a)click21.com.br> writes: > >>>>>> > >>>>>> > > > > Richardson> Hello! > > > > Richardson> My name is Richardson and I am from Brazil and I am needing > > Richardson> to know how I can install the AutoCAD r14 and AutoCAD 2000 > > Richardson> in a machine turning Fedora 3. he/she would Like to know > > Richardson> which the versions of Wine and the links to lower, and also > > Richardson> as I will proceed with the installation of CAD's. I await > > Richardson> answers soon. > > > >Autocad is copy protexted software. There are no easy and legal ways to run > >those software in wine > > > > > Installing a crack is both easy and legal. I haven't checked if there > are any for AutoCAD, though. That depends on where you are and the local laws. Paul

3 2

Re: comctl32: header [3/6]: Add scratch buffers to HEADER_INFO
by Alexandre Julliard April 18, 2006

April 18, 2006

Mikołaj Zalewski <mikolaj(a)zalewski.pl> writes: > These patches tries to correct some bugs in header notification > messages. This patch adds some buffers that will be used for > ANSI/Unicode convertions. It seems a bit wasteful to always keep large buffers around, especially since in many cases they won't even get used. Allocating and freeing them as needed would be preferable IMO. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Preliminary CD-Rom support on Darwin
by Alexandre Julliard April 18, 2006

April 18, 2006

Emmanuel Maillard <mahanuu(a)opendarwin.org> writes: > Is there anything wrong with this patch? Lots of things I'm afraid. For one it has way too many #ifdefs; also you don't want to store device names in the server, you don't want to have drive symlinks point to dummy files, and you shouldn't need to store things in the registry. Look at my recent HAL patch in explorer, you should try to do things more or less the same way. -- Alexandre Julliard julliard(a)winehq.org

1 0

AutoCAD in Linux
by Richardson April 18, 2006

April 18, 2006

Hello! My name is Richardson and I am from Brazil and I am needing to know how I can install the AutoCAD r14 and AutoCAD 2000 in a machine turning Fedora 3. he/she would Like to know which the versions of Wine and the links to lower, and also as I will proceed with the installation of CAD's. I await answers soon. Thank you very much! ___________________________________________________________________________________ Click21 A Internet grátis com a qualidade Embratel Baixe agora o discador www.click21.com.br

3 2

X crash with latest git/cvs
by Paul Vriens April 18, 2006

April 18, 2006

Hi, I've just removed my .wine to get a clean start (wasn't much in there anyway). When I now start any program (regedit, iexplore) I get an X-crash. I did a WINEDEBUG=+all,+relay and the last X-related thing I see is : err:x11drv:error_handler X protocol error: serial=6892, request_code=146 - breaking into debugger Anybody experiencing the same? Didn't do any regression testing yet. I'm running FC5. Cheers, Paul.

1 1

Re: advpack: Add a missing forward declaration for get_parameter
by Alexandre Julliard April 18, 2006

April 18, 2006

"James Hawkins" <truiken(a)gmail.com> writes: > Changelog: > * Add a missing forward declaration for get_parameter. It would be better to create a header for all the prototypes. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: gdi: Add header for GetCharABCWidthI
by Alexandre Julliard April 18, 2006

April 18, 2006

Jeff L <lats(a)yless4u.com.au> writes: > Add headers for GetCharABCWidthsI and WineEngGetCharABCWidthsI. > > Jeff Latimer > Index: ../../include/wingdi.h > =================================================================== > RCS file: /home/wine/wine/include/wingdi.h,v > retrieving revision 1.131 > diff -u -r1.131 wingdi.h > --- ../../include/wingdi.h 3 Jan 2006 12:43:38 -0000 1.131 > +++ ../../include/wingdi.h 14 Apr 2006 05:00:36 -0000 Please generate patches from the top-level directory, otherwise they are a pain to apply. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ole32: Uncomment some code to make sure it is compiled, but don't run it.
by Dimi Paun April 18, 2006

April 18, 2006

On Tue, 2006-04-18 at 17:18 +0900, Mike McCormack wrote: > + /* doesn't pass with Win9x COM DLLs (even though Essential COM says it should) */ > + if (0) test_out_of_process_com(); Why not disable it for win9x then? -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

1 0

Re: SHDOCVW: Move IOleClientSite to new DocHost object to allow sharing code between WebBrowser and InternetExplorer.
by Alexandre Julliard April 18, 2006

April 18, 2006

Jacek Caban <jacek(a)codeweavers.com> writes: > ChangeLog: > Move IOleClientSite to new DocHost object to allow sharing code > between WebBrowser and InternetExplorer. Thanks for sending a series of small patches instead of a big one, but next time can you please number the patches? (git-format-patch -n can do it for you). You can't rely on the mail server to preserve the order, and since they all depend on each other I have to be able to apply them in the right sequence. Thanks. -- Alexandre Julliard julliard(a)winehq.org

2 1

PeekMessageW fixme spam in latest CVS
by Adam D. Moss April 18, 2006

April 18, 2006

Second Life causes a very recent CVS WINE to spit out one of these every frame: fixme:msg:PeekMessageW PM_QS_xxxx flags (0007) are not handled This started (approximately) yesterday (Monday). Regards, --adam

1 0

SOC Idea - native x86-64 port
by Steven Edwards April 18, 2006

April 18, 2006

Hi, I don't know how feasable this is but maybe we could have a google summer of code project to work on the x86-64 port. I have no idea if Winelib already works but maybe someone could look in to developing a thunking/emulation plugin that lets us run Win32 apps on Win64. Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

2 2

Re: [Fwd: Possible scanner bug]
by Mike Hearn April 18, 2006

April 18, 2006

[CCd wine-devel] Awesome, thanks Matthew. Full credit to James Hawkins who figured out what was tripped up the scanner anyway, I just forwarded the info on. So there we go guys! We are down 220 bugs overnight :) Matthew Hayward wrote: > Hello Mike, > Thanks for pointing out the WideCharToMultiByte function. I > have provided back end configuration indicating it is not an error to > send in parameter #4 as negative, and that eliminated around 220 > reports. We try to have a low false positive rate, but sometimes when > we misunderstand an interface like that we will see a bug report at each > invocation of the interface, fortunately most of the time, as in this > case, we can configure around it easily. > Thanks again for pointing this out to us! >

3 3

Re: regedit, wordpad hungarian translation (try 2)
by James Hawkins April 17, 2006

April 17, 2006

On 4/17/06, Kovács András <andras(a)csevego.net> wrote: > Hi, I splitted the last patch. This is a hungarian translation patch of > regedit, and wordpad. Best regards, Andras > Check out http://winehq.org/site/sending_patches. Only send one patch per email. -- James Hawkins

1 0

WoW crashes in 'wine_cp_mbstowcs' under certain circumstances.
by Tomas Carnecky April 17, 2006

April 17, 2006

These circumstances being if it tries to load an invalid lua file, more specifically a lua file which contains the invalid lua string (not character!) "\342\200\260". I don't know what this function does and there isn't a TRACE() in that function, so could someone please review if the function is implemented correctly (wrt the above char sequence) or give me more informations about the arguments so I could add a TRACE() to see what WoW passes to it? thanks tom

3 8

Re: [update] Add test for long float numbers in msvcrt printf test suite
by Jesse Allen April 17, 2006

April 17, 2006

On 4/17/06, Tomas Carnecky <tom(a)dbservice.com> wrote: > Changelog: > - Add test for long float numbers in msvcrt snprintf test suite > > update: snprintf() doesn't print the exact same number because it's a > double. > > together with my patch that is available in wine-devel wine passes the > msvcrt tests. > > tom > > > > > > > This test fails on Windows 2003.

1 0

Re: winebrowser: Use user's preferred browser
by Jeremy White April 17, 2006

April 17, 2006

> + "kfmclient exec,gnome-open,kmail,mozilla-thunderbird,thunderbird,evolution"; A Gnome user will be offended if you spool up the entire KDE environment just to launch a URL; a KDE user will be similarly offended by gnome-open. Further, if I'm a Gnome user, I may have KDE on my system, and kfmclient exec may work, but it's likely to not be the browser I *really* want used. The standard that's developing is that you don't invoke a KDE program unless KDE_FULL_DESKTOP is set and you don't invoke a Gnome session unless GNOME_DESKTOP_SESSION_ID is set. Cheers, Jeremy

5 5

Re: winspool/tests: fix broken test for GetPrinterDriver
by Dmitry Timoshkov April 17, 2006

April 17, 2006

"Detlef Riekenberg" <wine.dev(a)web.de> wrote: > @@ -939,36 +939,36 @@ static void test_GetPrinterDriver(void) > > for (level = -1; level <= 7; level++) > { > - SetLastError(0xdeadbeef); > + SetLastError(MAGIC_DEAD); Please don't change this, stick to the style used everywhere else, i.e. use 0xdeadbeef directly. > needed = (DWORD)-1; > ret = GetPrinterDriver(hprn, NULL, level, NULL, 0, &needed); > - ok(!ret, "level %d: GetPrinterDriver should fail\n", level); > - if (level >= 1 && level <= 6) > - { > - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %ld\n", GetLastError()); > - ok(needed > 0,"not expected needed buffer size %ld\n", needed); > - } > - else > - { > - ok(GetLastError() == ERROR_INVALID_LEVEL, "wrong error %ld\n", GetLastError()); > - ok(needed == (DWORD)-1,"not expected needed buffer size %ld\n", needed); > - continue; > - } > + ok(!ret && ((GetLastError() == ERROR_INVALID_LEVEL) || > + (GetLastError() == ERROR_INSUFFICIENT_BUFFER) || > + (GetLastError() == ERROR_OUTOFMEMORY)), "%d: returned %d with %ld " \ > + "(expected '0' with: ERROR_INVALID_LEVEL, ERROR_INSUFFICIENT_BUFFER" \ > + "or ERROR_OUTOFMEMORY)\n", level, ret, GetLastError()); > + > + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) continue; > + > + ok(needed > 0,"%d: returned size %ld\n", level, needed); > + if (needed == 0) continue; I object to this change. The test needs a clear indication whether it's an invalid or a not supported parameter. Do not remove if {} else {}, that's an essential part of the test. A comment explaining the change would be also nice. > ret = GetPrinterDriver(hprn, NULL, level, buf, needed, &filled); > - ok(ret, "level %d: GetPrinterDriver error %ld\n", level, GetLastError()); > - ok(needed == filled, "needed %ld != filled %ld\n", needed, filled); > + ok( ret, "%d: returned %d with %ld (expected '!= 0')\n", > + level, ret, GetLastError()); "expected '!= 0'" is wrong, ret is BOOL, so "expected TRUE" or better leave it as it is now, error message already implies that the API has failed. > - ok(di_2->cVersion >= 0 && di_2->cVersion <= 3, "di_2->cVersion = %ld\n", di_2->cVersion); > + ok((di_2->cVersion >= 0 && di_2->cVersion <= 3) || > + (di_2->cVersion == 0x0400), "di_2->cVersion = %ld\n", di_2->cVersion); A comment explaining which windows version returns 0x400 (which contradicts MSDN) would be helpful. > ok(di_2->pName != NULL, "not expected NULL ptr\n"); > ok(di_2->pEnvironment != NULL, "not expected NULL ptr\n"); > ok(di_2->pDriverPath != NULL, "not expected NULL ptr\n"); > @@ -977,15 +977,15 @@ static void test_GetPrinterDriver(void) > > trace("cVersion %ld\n", di_2->cVersion); > trace("pName %s\n", di_2->pName); > - calculated += strlen(di_2->pName) + 1; > + calculated += lstrlenA(di_2->pName) + 1; If you want to replace strlen by lstrlenA (why?) that should be a separate patch. Same for below changes. -- Dmitry.

1 0

Solaris: Rundll322 exercising
by Robert Lunnon April 16, 2006

April 16, 2006

I would like to exercise rundll32 or similar (IE accessing a unix lib via the link in in .wine). This didn't work before because LD.SO refused to load a lib via a link with a colon in it's name. I wrote some code to fix it, but now process.c has been rearranged and the patch doesn't apply. It may well be that the new code works now but I need to test.

1 0

Re: abort if WINEDEBUG requests functionality that was disabled at configure time
by Mike Hearn April 16, 2006

April 16, 2006

On Sat, 15 Apr 2006 23:37:17 -0400, Mike Frysinger wrote: > if wine is built with --disable-trace or --disable-debug, then using WINEDEBUG > will accept the respective options without complaining and without actually > showing any useful information Why would anybody build without tracing anyway? I would be *very* surprised if it led to any noticable/real world performance improvement. Rather than do this why not just restore your packages configure switches to the upstream defaults?

5 7

Wine missing from repositories?
by Dee Ayy April 16, 2006

April 16, 2006

1) I installed wine at work from kubunu breezy repositories (standard and maybe universe and multiverse repositories are added) on wednesday 4/12/2006, yet on thursday 4/13/2006 I installed ubuntu breezy at home and definitely had standard, universe, multiverse, and even the *deb http://wine.sourceforge.net/apt/ binary/* repository added, yet could not see wine available for installation. Is Wine missing from repositories? 2) I thought I might be able to build wine from source for my AMD64 using the info on this page http://www.winehq.com/site/download-deb , but I seem to be getting a ubuntu compiler problem. But I am posting the error in case it is a winehq problem and this helps you (and attaching config.log): root(a)ubuntu:/home/user1/apt_sources# apt-get --build source wine Reading package lists... Done Building dependency tree... Done Need to get 13.6MB of source archives. Get:1 http://wine.sourceforge.net source/ wine 0.9.11~winehq1-1 (dsc) [1209B] Get:2 http://wine.sourceforge.net source/ wine 0.9.11~winehq1-1 (tar) [ 13.5MB] Get:3 http://wine.sourceforge.net source/ wine 0.9.11~winehq1-1 (diff) [ 47.1kB] Fetched 3B in 0s (4B/s) Skipping unpack of already unpacked source in wine-0.9.11~winehq1 dpkg-buildpackage: source package is wine dpkg-buildpackage: source version is 0.9.11~winehq1-1 dpkg-buildpackage: source changed by Scott Ritchie <scott(a)open-vote.org> dpkg-buildpackage: host architecture amd64 debian/rules clean dh_testdir dh_testroot rm -f build-stamp # Add here commands to clean up after the build process. /usr/bin/make distclean make[1]: Entering directory `/home/user1/apt_sources/wine-0.9.11~winehq1' make[1]: *** No rule to make target `distclean'. Stop. make[1]: Leaving directory `/home/user1/apt_sources/wine-0.9.11~winehq1' make: [clean] Error 2 (ignored) #-/usr/bin/make -C documentation clean dh_clean debian/rules build dh_testdir # Add here commands to configure the package. CFLAGS="-Wall -g -O2" ./configure --host=x86_64-linux-gnu --build=x86_64-linux-gnu --prefix=/usr --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info checking build system type... x86_64-pc-linux-gnu checking host system type... x86_64-pc-linux-gnu checking whether make sets $(MAKE)... yes checking for x86_64-linux-gnu-gcc... gcc -m32 checking for C compiler default output file name... configure: error: C compiler cannot create executables See `config.log' for more details. make: *** [config.status] Error 77 Build command 'cd wine-0.9.11~winehq1 && dpkg-buildpackage -b -uc' failed. E: Child process failed Please advise. **

2 1

GPG test - ignore
by Stefan Dösinger April 15, 2006

April 15, 2006

I wonder why the gpg signatures of the mails I send to wine-patches are wrong when I receive them back, but not wine-devel. Trying to send a mail with a small attachment to here to test. I appologise for the spam. Stefan

1 0

Re: advpack: Perform install initialization in install_init
by James Hawkins April 15, 2006

April 15, 2006

On 4/13/06, James Hawkins <truiken(a)gmail.com> wrote: > Hi, > > Changelog: > * Add a structure to track the data for an install instance. > * Add install_init/release to perform install initialization. > Go ahead and trash all these advpack patches. There are a couple bugs, and some things I'm changing. I'll send the new patches next week. -- James Hawkins

1 0

re: Summer of Code Project: DirectPlay
by Dan Kegel April 15, 2006

April 15, 2006

Alex wrote: > This is a proposal for a Google Summer of Code Project. > > Improve Wine's DirectPlay implementation so that it can at least run a > simple demo app, and ideally end up enabling network play for a free > game demo. > A list of such demos is available here > http://wiki.winehq.org/DirectPlayGames I think Alex is suggesting a possible project idea -- he's not proposing to do it himself. - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 0

Re: Summer of Code Project: DirectPlay
by James Hawkins April 15, 2006

April 15, 2006

On 4/15/06, "Alexander N. Sørnes" <alex(a)thehandofagony.com> wrote: > This is a proposal for a Google Summer of Code Project. > > Improve Wine's DirectPlay implementation so that it can at least run a > simple demo app, and ideally end up enabling network play for a free > game demo. > A list of such demos is available here > http://wiki.winehq.org/DirectPlayGames > Do you mean this is a proposal for you to work on, or just throwing it out there as a suggestion? -- James Hawkins

1 0

Starcraft vs. fullscreen
by Molle Bestefich April 15, 2006

April 15, 2006

These lines could explain why Starcraft is unable to switch to fullscreen: err:xrandr:X11DRV_XRandR_GetCurrentMode In unknown mode, returning default fixme:xrandr:X11DRV_XRandR_SetCurrentMode Cannot change screen BPP from 16 to 8 fixme:xrandr:X11DRV_XRandR_SetCurrentMode Cannot change screen BPP from 16 to 8 I seem to remember that BPP cannot be changed _at all_ with XRandR, is this correct? If it is, then the obvious thing to do is to leave BPP alone and just change to the correct resolution. What needs fixing here?

10 21

New SetThreadPriority patch
by Mike Hearn April 15, 2006

April 15, 2006

This one uses POSIX capabilities to drop all root privs except for CAP_SYS_NICE, therefore, this is reasonably secure. There is one catch. For some reason a suid root app cannot read /proc/self/exe so relocatability isn't used, and anyway it'd be insecure even if it could as you could hard link wineserver then trick it into loading a malicious library relative to $ORIGIN. I think I will investigate this a bit more, but perhaps later. For now this is fine for RPMs and packages etc, which install to /usr, as they can simply "chmod +s wineserver" and have apps with solid audio. thanks -mike

1 0

Re: Implement THREAD_PRIORITY_TIME_CRITICAL
by Aneurin Price April 15, 2006

April 15, 2006

Mike Hearn wrote: >> I'm not convinced this is true. At least some (maybe most or all) of >> the games showing this problem work just fine if true OSS (ie. not >> ALSA-emulated OSS) is used as the sound driver. WoW and StarCraft >> spring to mind immediately. Plus apparently they work in Cedega >> without needing to be root, though I have no first-hand experience of >> this. > > Maybe for you, but this problem seems to be related to all kinds of > things ... system speed, kernel scheduler, driver combinations, what > Wine is doing at the time etc. All I know is that this works great for > me, and no, rebuilding my kernel and going back to OSS is not really an > option :) > > Cedega, IIRC, either has some awful hacks or has the wineserver acquire > the privs, I don't remember which .... it'd be nice to find out. > > IMHO the best way would be for wineserver to be suid root and then drop > privs. It works everywhere and is simple. I really ought to remember to use reply-all for wine-devel. I've quoted my first post since I meant to send it to the list. Anyway, surely the `best' way would be for the kernel to support user-level `real-time' priorities like the ck kernels. Anybody know why they don't like the idea of that kind of thing? More on topic, does this simply change Wine's priority or does it act on a per-thread level? Most of the issues I've seen have been caused by the audio thread being starved by the others, and is often semi-solved by running Wine at nice 19, which seems counter-intuitive but appears to get around some sheduling problems (priority inversions spring to mind). This has the side effect of course that you have to make sure no other process is going to steal the cpu time from under you. Am I talking about the same issue as everyone else or have I got the wrong end of the stick?

10 36

Knights and merchants (valgrind)
by Joris Huizer April 15, 2006

April 15, 2006

Hello, As suggested earlier on the list, I ran this game with valgrind (at last I tried again with svn, which works better than trying to patch 3.1.1) There are a few problems: valgrind comes with loads of errors, but only indicates which file (*.so) the errors come from (so I need to compile wine with gdb debugger support, without optimisations, I guess?) More serious, it seems wine uses some feature currently not supported by valgrind: ----- x86toIR: unimplemented feature vex: the `impossible' happened: x86 segment override (SEG=CS) prefix vex storage: T total 1908936388 bytes allocated valgrind: the 'impossible' happened: LibVEX called failure_exit(). ==14207== at 0xB00170DB: (within /usr/local/lib/valgrind/x86-linux/memcheck) sched status: running_tid=1 Thread 1: status = VgTs_Runnable ==14207== at 0x480D03: ??? Thread 3: status = VgTs_WaitSys ==14207== at 0x200546A1: (within /lib/tls/libpthread-0.60.so) ==14207== by 0x202E81B7: (within /usr/local/lib/wine/ntdll.dll.so) Thread 4: status = VgTs_WaitSys ==14207== at 0x20129523: poll (in /lib/tls/libc-2.3.2.so) ==14207== by 0x23F252EF: (within /usr/local/lib/wine/wineoss.drv.so) Thread 5: status = VgTs_Runnable ==14207== at 0x2011D347: sched_yield (in /lib/tls/libc-2.3.2.so) ==14207== by 0x23F252EF: (within /usr/local/lib/wine/wineoss.drv.so) Thread 6: status = VgTs_Runnable ==14207== at 0x219840BE: (within /usr/local/lib/wine/winex11.drv.so) ==14207== by 0x23F252EF: (within /usr/local/lib/wine/wineoss.drv.so) Note: see also the FAQ.txt in the source distribution. It contains workarounds to several common problems. If that doesn't help, please report this bug to: www.valgrind.org In the bug report, send all the above text, the valgrind version, and what Linux distro you are using. Thanks. ----- is there a patch for this one? at least I will recompile wine with gdb debugger support and look at the errors valgrind comes with regards, Joris

1 0

Re: Dmitry Timoshkov : winspool: Add a test for GetPrinterDriver, make it pass under Wine.
by Detlef Riekenberg April 15, 2006

April 15, 2006

Am Freitag, den 14.04.2006, 12:46 -0500 schrieb Alexandre Julliard: > Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> > Date: Fri Apr 14 22:34:57 2006 +0900 > > winspool: Add a test for GetPrinterDriver, make it pass under Wine. Thanks for working on winspool.drv, but i'm Sorry that I had not enough Time to look at the Patch before the commit. - Version 0x0400 was correct for win9x-Drivers (4.00). Version 3 is for Usermode-Drivers on w2k and above. (Version 2 is Kernelmode-Driver for NT4.0 and w2k) (Version 1 is NT3.5x and Version 0 is NT 3.1) Our Registry-Location is for win9x only (OpenDriverReg) - One Terminating Zero is is not enough for REG_MULTI_SZ http://bugs.winehq.org/show_bug.cgi?id=3589 - Why was (PDRIVER_INFO_3W) changed to (PDRIVER_INFO_2W)? (PDRIVER_INFO_3W) is an extended Version of (PDRIVER_INFO_2W) - Not all Levels are supported on all Windows-Versions http://msdn.microsoft.com/library/en-us/gdi/prntspol_7xo2.asp - The tests are not alphabetical sorted after this commit - Why was SetLastError(0xdeadbeef) used, when there is SetLastError(MAGIC_DEAD) in the other tests - 11 Tests are now failing on win95, 11 Tests on win98, 9 Tests on winme and 8 Tests on NT3.51. For NT4.0 (level 4, 5 and 6 as well as the Version-Test will fail) and w2k (version will fail, when an NT4.0-Driver is used), i can not test the exact number of failures atm. What's the preferred way to fix this? My Idea: 1. Move the Test without any Changes 2. Fix the Tests 3. Fix the Implementation I know, that you want a fast fix for your commercial Application and winspool.drv is very ugly. I'm on the way to fix winspool.drv, but my Direction is going from the Bottom-Layer to the High-Level API. "struct printerenv_t" was created (as requested by Alexandre) to handle the the different Printing-Environments for win9x-Drivers (Windows 4.0) and NT-Drivers (Windows NT x86). My fix for OpenDriverReg already need an Extension here, but DeleteMonitor comes first. You can Read more Infos here: http://wiki.winehq.org/Printing -- By By ... ... Detlef

2 1

re: user: Fix disabled menu item behavior
by Dan Kegel April 15, 2006

April 15, 2006

Tommy Kho wrote: >This patch changes the behavior of selecting greyed out menu items via >accelerator key. Wine currently keeps the menu open; Windows closes the menu. > ... > else >+ { > pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, hMenu, TRUE, wFlags); >+ return -1; >+ } > >- return -1; >+ return -2; > } Err, isn't the return -2 at the bottom dead code now? That seems wrong... - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

2 1

Summer of Code strategy
by Dan Kegel April 15, 2006

April 15, 2006

Hi everybody! There are two weeks before students can submit Summer of Code proposals. How can we use that time to maximize the number of successful projects this year? The students who already have their own good ideas (whoever they are) will probably succeed; we probably need to provide a set of prefab projects of sorts to give guidance to students who are new to Wine and haven't any idea what to work on. Ideally, each such prefab project would have an active developer (or a close approximation) as project leader and mentor. Are any developers willing and able to come up with a project idea and help mentor/supervise a student to work on it? - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 0

SETI@Home
by Tom Spear April 14, 2006

April 14, 2006

This is a lil bit off topic, but I thought I would bring it up, since we have users that are trying to run windows BOINC under wine. The wine project has a SETI(a)Home team (has had for some time), so if you run the windows or linux BOINC/SETI(a)Home client, you can join our team and apply your credits towards the project's total. Just go to http://setiathome.berkeley.edu/team_display.php?teamid=38091 and click the Join link. Tom

5 5

Summer of Code 2006 is on!
by Dan Kegel April 14, 2006

April 14, 2006

I've updated http://wiki.winehq.org/SummerOfCode, but it's a bit short on project ideas. (Somewhat on purpose -- last year, people just copied and pasted our detailed project ideas. This year, lets give fewer details and more ideas... if somebody's really interested, they'll ask for details on wine-devel, and that process will generate fewer boilerplate applications.) - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 0

Re: Change threading defaults on FreeBSD
by Alexandre Julliard April 14, 2006

April 14, 2006

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > ChangeLog: > On FreeBSD, build wine-pthread in addition to wine-kthread and make > the former the default. If you build both, then you need a way to decide which one will be used. That's not the sort of detail we want to have users worry about. -- Alexandre Julliard julliard(a)winehq.org

2 2

Fwd: [Bug 4051] winecfg crashes when clicking on Audio tab due to arts bugs
by Tom Spear April 14, 2006

April 14, 2006

---------- Forwarded message ---------- From: Wine Bugs <wine-bugs(a)winehq.org> Date: Apr 14, 2006 7:17 AM Subject: [Bug 4051] winecfg crashes when clicking on Audio tab due to arts bugs To: wine-bugs(a)winehq.org http://bugs.winehq.org/show_bug.cgi?id=4051 ------- Additional Comments From alexander.heinlein(a)web.de 2006-14-04 07:17 ------- Hi. I encounter the same issue. wine wants to access /tmp/ksocket-$USER, but i do not have KDE installed (only KDM) and do not use arts (arts isn't even installed, only some library headers which i can't uninstall because of SDL) or any other soundserver, but hardwaremixing. So i have to manually create the directory /tmp/ksocket-$USER to let the audio tab in winecfg not crash. I tested this with wine 0.9.10 and 0.9.11. -- Configure bugmail: http://bugs.winehq.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. --------------------------------- Notes from Tom: This should be a fairly trivial fix, all we need to do is check for the existence of the socket file before trying to connect to it, and if it is not there, then skip the arts probe.. Could someone whip up a patch for this? Tom

1 0

DllOverrides
by Rich Gilson April 14, 2006

April 14, 2006

I'm looking at what is done in Winetools (no, this is not another WineTools discussion ;-) ) as far as the DllOverrides and it has generated a few questions. Here are a couple of lines from the wt-config.reg file: "*"="native, builtin" "*autorun.exe"="native,builtin" "msi"="native, builtin" "odbc32"="native, builtin" Can somebody explain the lines with an *? Does the "*" mean that if the driver, dll, exe in question is not listed in the DllOverrides section, that it defaults to using the native version of the file and, if not available, then tries to find and run a builtin version? In the case of the "*autorun.exe", does it literally me that any .exe file with a name ending in autorun would use a native version first, like a normal wildcard would be used? That wouldn't make sense to me because there is no file that matches that description in my .wine directory,. In fact, the only copy of autorun that I can find on my system is the autorun.exe.so from cxoffice. I would appreciate all the enlightenment I can get on this subject. Thanks. -- -- In a world without fences, who needs Gates?

3 3

Hidden files
by Rich Gilson April 14, 2006

April 14, 2006

Here's another question that has been spawned by looking through the Winetools code. It touches two files: ~/.wine/.no_debug_window_flag ~/.wine/.no_prelaunch_window_flag Have these been depricated or completely removed, or are they still something that would be used by Wine? If they are still used, is there a list of all such hidden files and what they do? -- -- In a world without fences, who needs Gates?

2 2

Cups printer detection in pre-built packages
by J.R. Oldroyd April 14, 2006

April 14, 2006

I've been discussing this with the maintainer of the FreeBSD wine port. Right now, detection of libcups.so is done by the configure script at compile time. This means that pre-built packages must either pull in cups as a port dependency in order to always enable printer support, or they must do without printer support. Pulling in cups as a dependency is expensive for those that don't want it, and so cups is disabled for everyone using the FreeBSD binary packages. You need to compile the port if you want cups support. Wouldn't a better detection method be to check at runtime for the presence of a libcups.so (by means of a dlopen()) and enable printers if it's found, or disable them if it's not found? The significance of this would be that a cups dependency is required to build the binary package, but the dependency is optional at runtime. And this means that printers would always work, even from a binary package install. -jr

2 1

[gdi] bug reading/writing metafiles on sparc
by Eric Frias April 14, 2006

April 14, 2006

Due to little-endian/big-endian differences, winelib on Sparc can't read windows metafiles generated on a PC (or on Wine on x86), and conversely PCs can't read metafiles created on a Sparc. It looks like there are a few ways this could be fixed, and I wanted to make sure we don't go about it the wrong way (and that nobody else is working on it). I think the right thing to do is make the on-disk and in-memory formats always be little-endian. We would only convert the data to big-endian format when it is generated or used. GetMetaFileBitsEx and SetMetaFileBitsEx would return & take the raw data in little-endian format. The implementation we're considering involves: - in PlayMetaFileRecord(), convert endianness of paramters as they're used: LineTo(hdc, (SHORT)mr->rdParm[1], (SHORT)mr->rdParm[0]); becomes LineTo(hdc, (SHORT)convert_word_from_little_endian(mr->rdParm[1]), (SHORT)convert_word_from_little_endian(mr->rdParm[0])); - in MFDRV_MetaParam2(), convert endianness *(mr->rdParm) = param2; becomes *(mr->rdParm) = convert_word_to_little_endian(param2); - some similar conversions necessary for anything that reads/writes the header - anything that calls MFDRV_WriteRecord() would need special handling. These seem to be the functions that embed bitmaps or text in the METARECORD, so we'll have to be selective about what gets converted and what gets written as-is. Is this the right way to go about fixing the problem? Anything we should look out for? Thanks, Eric

2 5

Re: Eliminate dependency on Fontforge
by gslink April 14, 2006

April 14, 2006

As I see it, Fontforge was never the problem. The problem was that it was necessary to read the code to find out that there even was such a dependency. This was especially true of the Red Hat binaries. There was no notice or documentation that they would use Fontforge. I didn't find out until I started playing with Fontforge and had Wine crash as a result. It doesn't make any difference what the Wine dependencies are if: 1. They are documented. 2. I can find the dependent programs.

1 0