February 2006 - Wine-devel - list.winehq.org

Re: [TWAIN] Reconcile sane's long names to TWAIN's 32 byte limit
by Robert Shearman 13 Feb '06

13 Feb '06

Jeremy White wrote: >libsane can return arbitrarily long names, but TWAIN supports only a maximum of 32. >Further, the name is a unique identifier, and so must be returned to libsane for processing. > >This algorithm tries to convert a long libsane name into a more reasonable short name, >but adds a crude signature process in an attempt to ensure a unique short identifier. > > > >------------------------------------------------------------------------ > > > dlls/twain/dsm_ctrl.c | 85 ++++++++++++++++++++++++++++++++++++++++++------- > 1 files changed, 73 insertions(+), 12 deletions(-) > >eabadf1c3584adda1a36b199f82bc6bbb17b71da >diff --git a/dlls/twain/dsm_ctrl.c b/dlls/twain/dsm_ctrl.c >index f744939..6d1318d 100644 >--- a/dlls/twain/dsm_ctrl.c >+++ b/dlls/twain/dsm_ctrl.c >@@ -22,6 +22,7 @@ > > #include <stdlib.h> > #include <stdarg.h> >+#include <stdio.h> > > #define NONAMELESSUNION > #define NONAMELESSSTRUCT >@@ -33,6 +34,14 @@ > > WINE_DEFAULT_DEBUG_CHANNEL(twain); > >+inline static LPSTR TWAIN_strdup( LPCSTR str ) >+{ >+ LPSTR ret = HeapAlloc( GetProcessHeap(), 0, strlen(str) + 1 ); >+ if (ret) strcpy( ret, str ); >+ return ret; >+} >+ >+ > /* DG_CONTROL/DAT_IDENTITY/MSG_CLOSEDS */ > TW_UINT16 TWAIN_CloseDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) > { >@@ -83,6 +92,38 @@ TW_UINT16 TWAIN_CloseDS (pTW_IDENTITY pO > #endif > } > >+/* Sane returns device names that are longer than the 32 bytes allowed >+ by TWAIN. However, it colon separates them, and the last bit is >+ the most interesting. So we use the last bit, and add a signature >+ to ensure uniqueness */ >+static char * get_sane_short_name(const char *in) >+{ >+ char *p; >+ LPSTR ret; >+ int signature = 0; >+ >+ if (strlen(in) <= 32) >+ return TWAIN_strdup((char *) in); >+ >+ for (p = (char *) in; *p; p++) >+ signature += *p; > > These casts from const char * to char * shouldn't be necessary. -- Rob Shearman

1 1

Direct3D Z order question
by Stefan Dösinger 13 Feb '06

13 Feb '06

Hello, I have written a small Direct3D7 test application which draws two overlapping triangles, a red one and a blue one. The red triangle has the z value 0.0 (closest to the viewer), the blue one 1.0(far away). Strangely, the blue triangle overlaps the red one on Windows. The same happens on the current ddraw implementation, but in WineD3D the red triangle overlaps the blue one, which is mathematically correct. I've studied the ddraw and wined3d drawing code over and over, but I couldn't find any difference. It seems that on Windows, the triangle that is drawn last overlaps the other one in the output, and the z value seems to be ignored completely. Can someone explain me what's going on here???? The reason for this is the Direct3D mode of Half-Life 1. I've got it working with WineD3D after a long struggle with IDirect3DVertexBuffer::ProcessVertices, except of the HUD, which is hidden. If I force the z value in the [0.0, 1.0] range, it is shown, but the rest is broken obviously. How to run my test program: I've attached a source file and a Makefile which builds a .exe with mingw, and a precompiled exe file. When you run it, it shows a black screen, and if you click anywhere, it draws the triangles. I've some bug in the flipping code, so you have to click two times actually. Pressing esc exits. Thanks, Stefan PS: If anyone needs the d3d7->wined3d code to look at, I can send patches. But it's quite messy now ;)

3 10

Re: GDI: Don't crash when copying to an EMF from a NULL bitmap.
by Alexandre Julliard 13 Feb '06

13 Feb '06

Mike McCormack <mike(a)codeweavers.com> writes: > @@ -84,9 +84,14 @@ static BOOL EMFDRV_BitBlockTransfer( > BITMAP BM; > WORD nBPP; > LPBITMAPINFOHEADER lpBmiH; > - EMFDRV_PDEVICE* physDevSrc = (EMFDRV_PDEVICE*)devSrc; > - HBITMAP hBitmap = GetCurrentObject(physDevSrc->hdc, OBJ_BITMAP); > + EMFDRV_PDEVICE* physDevSrc; > + HBITMAP hBitmap; > > + physDevSrc = (EMFDRV_PDEVICE*)devSrc; > + if (!devSrc) > + return TRUE; You still need to generate the EMF record, you can't just ignore it and return TRUE. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: usp10: [RESEND] Add ScriptItemize, ScriptShape and ScriptPlace functionality
by Robert Shearman 13 Feb '06

13 Feb '06

lats wrote: >Index: dlls/usp10/usp10.c >=================================================================== >RCS file: /home/wine/wine/dlls/usp10/usp10.c,v >retrieving revision 1.7 >diff -u -r1.7 usp10.c >--- dlls/usp10/usp10.c 9 Jan 2006 19:55:03 -0000 1.7 >+++ dlls/usp10/usp10.c 12 Feb 2006 05:25:09 -0000 >@@ -39,6 +39,42 @@ > > WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); > >+#define MAX_SCRIPTS 8 >+ >+/* Set up a default for ScriptGetProperties */ >+const SCRIPT_PROPERTIES Default_Script_0 = {0, 0, 0, 0, 0, 0, 0, 0, >+ 0, 0, 0, 0, 0, 0, 0}; > > This can be "static const" instead of just "const". >@@ -69,9 +108,13 @@ > */ > HRESULT WINAPI ScriptGetProperties(const SCRIPT_PROPERTIES ***ppSp, int *piNumScripts) > { >- FIXME("%p,%p\n",ppSp,piNumScripts); >+ FIXME("%p,%p,%p\n",ppSp, *ppSp, piNumScripts); > >- if (piNumScripts) *piNumScripts = 0; >+/* Set up a sensible default and intialise pointers */ >+ *piNumScripts = MAX_SCRIPTS; >+ *ppSp = (SCRIPT_PROPERTIES *)Global_Script; >+ TRACE("ppSp:%p, *ppSp:%p, **ppSp:%p, %d\n", ppSp, *ppSp, **ppSp, >+ *piNumScripts); > return 0; > } > > > The identation of the comment is unusual. >@@ -129,7 +172,60 @@ > if (!pwcInChars || !cInChars || !pItems || cMaxItems < 2) > return E_INVALIDARG; > >- *pcItems = 0; >+/* Set a sensible default */ >+/* Set SCRIPT_ITEM */ >+ pItems[0].iCharPos = 0; >+/* Set the SCRIPT_ANALYSIS */ >+// pItems[0].a.eScript = SCRIPT_UNDEFINED; >+ pItems[0].a.eScript = 2; > > Which is it, SCRIPT_UNDEFINED or 2? Decide this and remove the dead code. -- Rob Shearman

2 1

Czech language resources encoding fix
by Petr Tesarik 13 Feb '06

13 Feb '06

Hi everyone, On 8 Feb I sent a patch to fix the encoding of Czech resources in Wine (see wine-patches), but nothing seems to have happened. Is something wrong with the patch? Of course, I double-checked the "Sending patches" page: # Include a ChangeLog entry with your name, email address and a description of what your patch does. There is a ChangeLog entry and a (IMO concise) description of what the patch does. # Keep the patch small and the point of the change clear. # Submit one fix or group of related changes per patch. Well, OK, I could possibly break the patch into numerous smaller ones, each fixing only one of the resource files. Is that what you expect? # Generate your patch against the latest version of Wine from the WineHQ CVS (see below). It applies cleanly against latest CVS. # Test your patch, and if possible write a test case demonstrating it is correct. Umgh. Does changing a resource string need writing a test case? # Be careful to not corrupt the patch through line-wrapping. Not the case. # Avoid unnecessarily changing the formatting of the code. No. # Use standard C, avoid C++ comments and inline variable declarations. They'r resource files. No C/C++ comments at all. # Read the diff and make sure it contains only what you want in it. Done. Thanks for any clue, Petr Tesarik

2 2

Wine console windows vs. [x]terminal
by Segin 13 Feb '06

13 Feb '06

Hi, I notice that Wine opens a Windows-like console window for console apps if they are started using the 'winedbg' loader. Is it possible to get all console apps to run like this without using winedbg? There is a Windows console program using pdcurses that I am trying to check for compatability, and having to startup winedbg to get the program to function is a bit much. It should also be noted that I do not read the wine-users mailing list at this time, but I do read wine-devel.

3 2

bugzilla account
by Michael Jung 12 Feb '06

12 Feb '06

Hi, I would like to change the status of bug 4322 to FIXED, but I'm not 'empowered' to do it. Whom do I have to talk to? Bye, -- Michael Jung mjung(a)iss.tu-darmstadt.de

3 2

Representation of virtual hardware in desktop managers [Was Bug 4551]
by Tom Spear (Dustin Booker, Dustin Navea) 12 Feb '06

12 Feb '06

Forwarded from Bugzilla bug 4551. Nowadays on Linux you do not see your virtual wine hardware drives in KDE or GNOME because they are not recognized. You have to open "invisible" folder "$HOME/.wine". Many users will not be able to do this. Maybe one could work out some standard with freedesktop.org so that users can easily access their virtual drive C:\ ? Who's work would that be? I am not sure about that, so sorry if this is not the right "inbox". I would liek to suggest to extend this standard to other virtual machines like Xen or Vmware. Thilo Pfennig

1 0

Re: Small CVS-Update-Script
by Christian Lachner 12 Feb '06

12 Feb '06

I know that there is something like my script out there but i did (again) spend some time on rewriting my own one since i like it better ;). This one is compeltely different from my first one - it works the same, but does some checks before doing anything , the code is written nicer and cleaner and the output is also very nice now :D. Have fun with this piece of code! On 10/2/05, Andreas Schneider <andreas.schneider(a)linux-gamers.net> wrote: > Hi gladiac, > > take a look at > > http://winecvs.linux-gamers.net/ > > Cheers, > > -- andreas > > Gladiac Spark wrote: > > This is nothing special but may be useful for some people out there > > having problems updating their cvs-trees or being lazy writing some > > commands in their console. Copy the 'getwinecvs' to /usr/src or wherever > > you want (don't forget to edit the SRC=Variable if you're doing so) and > > chmod it to give you x-rights. (e.g.: 'chmod 750 getwinecvs' without quotes) > > > > By running it, it will search for an existing wine-tree... if there is > > one, it will be cleaned and then updated; if not, the complete tree will > > be downloaded. > > When using -c as parameter for getwinecvs, it will automatically begin > > to compile after getting all the updates and then install. > > To see what it exactly does, have a look at the source. > > > > Even if it is called General CVS-Updater by gladiac it has been written > > FOR wine. I hope it is helpful for others. I know it's not very nerdy > > but.... who cares ;). > > > > > > ------------------------------------------------------------------------ > > > > > > -- > http://www.linux-gamers.net - your online gaming resource > >

3 9

Re: WINED3D: Fix a couple of FIXMEs
by Alexandre Julliard 12 Feb '06

12 Feb '06

"H. Verbeet" <hverbeet(a)gmail.com> writes: > The output of glGetString(GL_PROGRAM_ERROR_STRING_ARB) can get too > large for a normal FIXME. Use fprintf to stderr instead. You should use debugstr_a. fprintf will mess up the output. -- Alexandre Julliard julliard(a)winehq.org

2 1