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

Opengl states in wined3d
by Stefan Dösinger 27 Jun '06

27 Jun '06

Hello, The way opengl states are managed in wined3d at the moment is a bit messy and inefficient. Basically it is a mixture of modifying the opengl settings when the application modifies the d3d settings and brute-force applying the rest in drawprim. The situation has got worse with the addition of the DirectDraw blitting code and it is time to clean that up and make it more efficient. Basically during primitive drawing the opengl setup must equal the one requested by the application. Some things can be translated 1:1, e.g. WINED3DRS_LIGHTINGENABLE to glEnable(GL_LIGHTING). Other things like fog or texture stage states are more complex. Some operations in wined3d, for example unlocking a render target or doing a 2D blt require special opengl settings. At the moment we have the following situation: * Some things are applied when the app requests a change * Some parts are applied by brute force in drawPrimitive * BltOverride and unlockRect read the old gl states, modify it the way they need it and restore the old states back. This has some problems: * Setting some things during each drawprim call wastes quite a few resources, due to the loops that and gl calls. * If an application performs only blts(e.g. 2D only app) or only locks the render target(playing a movie) storing and restoring the gl state is a waste of resources * Brute force applying opengl states is likely to re-set the old state unnecessarily. Opengl does not assure that redundant calls are cheap. * if an application sets and resets a state for some reason between 2 drawprim calls that involves 2 not really necessary opengl state switches * Anything else I didn't think of? I can think of a few ways to solve this: * Do not do any opengl changes in SetRenderState, and apply all states in drawprim. This way UnlockRect and Blt don't have to care for resetting the things they changed and redundant changes can be catched nicely * Apply everything when the app requests to do so, and take as much things out of drawprim. This keeps drawprim small and efficient. * Use a mixed style like it is done with transformed vs untransformed vertex drawing with last_was_rhw. That makes it easy to find out if reapplying anything is needed and frees other functions from resetting everything. To avoid re-setting an old setting again the current opengl state could be stored in the d3ddevice. I think this should be done in any case, and depending on the nature of some parameters the opengl state or the d3d state should be kept in there(or both). So we shouldn't use a d3d stateblock but instead our own structure where we can add the stuff we need. I also think we should try to get rid of as much things as possible in drawprim. I do not mean entirely removing it, but having a simple flag which tells if a bigger number of states needs attention, like last_was_rhw does. I think about adding a last_was_blit flag which is set in BltOverride and UnlockRect. I'm not sure about the texture stage states and sampler states. In d3d the settings seem to be per-stage, while in opengl I think they are per texture. If so we could store the last d3d settings that the texture was used with in the texture too see if we have to reapply them. A partially related sidenote about drawStridedSlow: It has a loop which iterates through the vertices to draw, and in this loop there are if statements checking which data the vertex contains. So if some data isn't there this is at worst a comparison + a jump. I had a look at the vertex data 3DMark2000 uses and removed checks and handling for the things it didn't use for testing. 3DMark2000 doesn't need drawStridedSlow a lot, but yet the score increased from 4879 to 5013 3DMarks. As a comparison forcing drawStridedFast gets about 5500 3dmarks. The fps in the low detail helicopter test increased from 95.6 to 99.2(105 with drawStridedFast). Cheers, Stefan

2 1

Wine, Darwine, CodeWeavers-- Intel MacOS X
by William Knop 27 Jun '06

27 Jun '06

Hello all, What's the story with wine on intel os x? It's barely mentioned in the wine wiki and on the darwine website (not at all on winehq). I'm under the impression darwine is concentrating on running wine on ppc/ darwin. I know codeweavers is working specifically on making wine on intel/darwin happen, however there is no status page anywhere. Just from keeping up with the mailing list, I've gleaned that Quartz and Core Audio are being worked on, in addition to a stack alignment patch. They seem to be pretty far along, but I don't really know. Are there any other intel/darwin areas that require attention or are being worked on? I'd like to add this info to the wine wiki. It seems odd that intel os x is sort of not officially recognized by wine, what with there being no mention of it on the download page, to do lists, or bugzilla... I know there're some politics involved, but it really should have more attention. Its existence is practically not even recognized by wine. At the least, that's turning away potential wine developers, and the thing is, the mac community could be all about wine with a little effort. Thanks, Will

3 5

Re: [AppDB] - user class cleanup and implement user class unit test
by Jonathan Ernst 27 Jun '06

27 Jun '06

Le lundi 26 juin 2006 à 15:33 -0400, Chris Morgan a écrit : [...] > Comments? Questions? > Index: index.php =================================================================== RCS file: /opt/cvs-commit/appdb/index.php,v retrieving revision 1.33 diff -u -r1.33 index.php --- index.php 21 Jun 2006 01:04:12 -0000 1.33 +++ index.php 26 Jun 2006 19:26:39 -0000 @@ -7,7 +7,7 @@ * application environment */ include("path.php"); -require(BASE."include/incl.php"); +require_once(BASE."include/incl.php"); Why use require_once ? It is slower and is bad unless you intend to include index.php in another file where incl.php is also included... Index: include/image.php =================================================================== RCS file: /opt/cvs-commit/appdb/include/image.php,v retrieving revision 1.5 diff -u -r1.5 image.php --- include/image.php 21 Sep 2005 14:16:40 -0000 1.5 +++ include/image.php 26 Jun 2006 19:26:40 -0000 @@ -3,6 +3,8 @@ /* image and image_resource classes */ /*************************************/ +include_once(BASE."include/incl.php"); + This time you use include once, we should use require everywhere if incl.php is required (and including a file in another include is not so pretty IMHO). + /* NOTE: we can't update the users password like we can update other */ + /* fields such as their email or username because the password is hashed */ + /* in the database so we can't keep the users password in a class member variable */ + /* and use update() because we can't check if the password changed without hashing */ + /* the newly supplied one */ + function update_password($sPassword) Should updatePassword according to our coding standards (method names).

2 1

cvs compile broken
by James Hawkins 26 Jun '06

26 Jun '06

Hey, CVS compile is broken on my machine: make[2]: Entering directory `/home/jhawkins/wine/dlls/wined3d' gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o arb_program_shader.o arb_program_shader.c gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o baseshader.o baseshader.c gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o basetexture.o basetexture.c gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o cubetexture.o cubetexture.c gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o device.o device.c device.c: In function `process_vertices_strided': device.c:5015: `GL_READ_ONLY' undeclared (first use in this function) device.c:5015: (Each undeclared identifier is reported only once device.c:5015: for each function it appears in.) device.c:5033: `GL_WRITE_ONLY' undeclared (first use in this function) device.c: In function `IWineD3DDeviceImpl_ProcessVertices': device.c:5352: `GL_READ_ONLY' undeclared (first use in this function) make[2]: *** [device.o] Error 1 make[2]: Leaving directory `/home/jhawkins/wine/dlls/wined3d' make[1]: *** [wined3d] Error 2 make[1]: Leaving directory `/home/jhawkins/wine/dlls' make: *** [dlls] Error 2 -- James Hawkins

4 6

How are we doing?&In-Reply-To=44802036.6030100@codeweavers.com
by john＠opensoftcorp.com 26 Jun '06

26 Jun '06

On Friday, June 02, 2006 07:25, Mike McCormack wrote: > >> lack of comments in the code > > > > +1, I think it's horrifying. > > void the_function_that_adds_one_to_i(int i) > { > /* this adds one to i */ > i = i + 1; > > /* this returns i to the caller */ > return i; > } > > Horrifying, yes :) > > Mike I'm not opposed to having bug number in the comments ;) ---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program.

2 1

Build on kubuntu 6.06,amd_64 works
by Amaury 26 Jun '06

26 Jun '06

Hi, Sorry if I'm ask a stupid question, but I'm a newbie to Linux, trying to learn... I've been trying to install wine through the package manager but it said it was not possible (error message: "Depends: wine-dev but it is not installable"). I kind of knew it cos i'm running under Ubuntu 6.06-LTS for amd 64 and I had read somewhere that wine didn't run on such system. My investigations led me to your post on http://www.winehq.com/pipermail/wine-devel/2006-June/048637.html Could you please detail step by step how the installation works cos the command lines don't make much sense to me MT A.

1 0

New dlls/ddraw/device.c warnings
by Gerald Pfeifer 26 Jun '06

26 Jun '06

After the recent sets of changes, I found that GCC 3.4 issues the following warnings (on FreeBSD 5.4. I checked and depending on how a compiler implements assert(), the warnings are valid, insofar as the compiler doesn't have a way to automatically determine that all code paths are covered: device.c: In function `Thunk_IDirect3DDeviceImpl_2_Begin': device.c:1826: warning: 'FVF' might be used uninitialized in this function device.c: In function `Thunk_IDirect3DDeviceImpl_2_BeginIndexed': device.c:1886: warning: 'FVF' might be used uninitialized in this function device.c: In function `Thunk_IDirect3DDeviceImpl_2_DrawPrimitive': device.c:2752: warning: 'FVF' might be used uninitialized in this function device.c: In function `Thunk_IDirect3DDeviceImpl_2_DrawIndexedPrimitive': device.c:2891: warning: 'FVF' might be used uninitialized in this function Could you have a look into this, Stefan? If someone has a hint on the preferred approach to address this, I can give it a try as well. Thanks, Gerald -- Gerald (Jerry) Pfeifer gerald(a)pfeifer.com http://www.pfeifer.com/gerald/

2 1

Re: [AppDb] [2/3] safe functions
by Chris Morgan 26 Jun '06

26 Jun '06

Hi Jonathan. You'll want to talk to EA about the filtering changes. The plan is to filter using the same syntax and flags that the php filter extension is going to use so we can easily switch over to this extension in the future. Also, I've submitted a patch for review to appdb(a)winehq.com and wine-patches(a)winehq.com that removes all of our get_magic_quotes_gpc() use and adds a check in include/incl.php that warns and prevents appdb from running if magic quotes is enabled. So you shouldn't need to have any get_magic_quotes_gpc() checks anymore. I also noticed your quote_smart_sql() call. This call isn't used anywhere, we shouldn't add calls to functions that aren't called. We also already have a function that will make sql calls safe called query_paramters() in include/db.php. Also, do we want to strip tags from sql? Won't that remove all tags from things like app/version descriptions, comments and notes? Chris On 6/25/06, Jonathan Ernst <jonathan(a)ernstfamily.ch> wrote: > Hi, > > The code I made is not dependent on magic_quote value and shouldn't > allow anybody to mess with the values read or written from/to the > database. Also it doesn't require to make copies of every single string the user > passes to us. > > It is based on php manual's best practices for avoiding injection. > > I'd be very glad if we'll use such mechanism for the rest of the > queries and get rid of compile_whatever, makeSafe & co. > > Changelog: > - functions to avoid sql/html injection without having issues with addslashes/magic_quotes_gpc > > Files changed: > - include/util.php > > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.2.2 (GNU/Linux) > > iD8DBQBEnt7SIW5mR/h6b38RAii/AKCB26o0DAM978gQz8baVz6VuubW3ACgqBoJ > Or4cDg49YqCUD3dughsW1oY= > =keDV > -----END PGP SIGNATURE----- > > > > > > >

3 4

Re: Wine, Darwine, CodeWeavers-- Intel MacOS X
by William Knop 26 Jun '06

26 Jun '06

On 6/26/06, Alexandre Julliard <julliard(a)winehq.org> wrote: > There's no quartz driver in WineHQ. There are some patches floating > around but it's very far from working. Oops, I realized that just after I hit send. I'll make sure to state that it has rudimentary support.

1 0

How do I get the unix filename for a wine handle?
by Christoph Probst 26 Jun '06

26 Jun '06

Hi, I'm one of the Google Summer of Code students and I'm working on the ClamAV integration in wine. Today I was discussing an issue with my mentor and he suggested to post it here. Currently I'm working on a scan-after-write functionality: Whenever a file was changed the virusscanner checks the file. My plan is to hook in NtWriteFile() (dlls/ntdll/file.c), because whenever a windows program writes to a file this function is called. Within this function the file is accessed using its unix_handle. The problem is that I need to know the unix filename for clamAV to access the file, but I see no proper way or function to get it as long as I just know the unix_handle or fd. Possible solutions so far: 1. searching /proc/self/fd/%d for the name. This would be an easy but very ugly solution. 2. maintaining a table mapping unix_handles to filenames from within NtCreateFile(). Hence I don't have the feeling that this is a good solution. 3. storing the unix filename in the wineserver handle object when it's created. This is probably the right place to keep this information but it would require some changes to the wineserver. If I understand it right it is already planned to implement something like this ("lookup_name" in server/object.c) But maybe I just missed an even better approach. What would you recommend to do? Any comment is appreciated. Cheers, Chris -- Kontakt-Details: http://www.christoph-probst.com/kontakt/ PGP-FP: B171 7EA4 988C DD90 1601 D21C 5279 2FAF 9978 AF86

5 8