December 2004 - Wine-devel - list.winehq.org

winsock:WS_setsockopt
by MediaHost (TM) 12 Dec '04

12 Dec '04

Hi Wine-Devel, Is here anybody which knows what the following function is supposed to do and what needs to get implemented? I'm referring to this: fixme:winsock:convert_sockopt Unimplemented or unknown socket level err:winsock:WS_setsockopt Invalid level (65407) or optname (128) Many thanks.... -- Regards Signer: Eddy Nigg Company: StartCom Linux at www.startcom.org <http://www.startcom.org/> MediaHost^(TM) at www.mediahost.org <http://www.mediahost.org/> Skype: startcom <callto://startcom/>

2 1

Re: msacm: pcm compatibility patch
by Christian Costa 11 Dec '04

11 Dec '04

Hi Robert, Robert Reif wrote: > Makes the PCM conversion routines of msacm produce identical results > to the native dll. > Allow any PCM to PCM conversion, not just advertised ones. > > The algorithms used by Microsoft in this dll are very crude and > produce an output of much poorer quality than what is currently > in wine. This is unfortunate but unavoidable if we are to be compatible. I don't see how improving the quality of the conversion could cause problems. Is there an app out there that refuses to run or crashes because of that? The algorithms may have slightly changed across all versions of this dll. And if we can do better job than Microsoft, I think we should do it. > > I have a test program that was used to verify compatibility and can > make it available by request. I hope to integrate some of it into > the regression tests someday. > Bye, Christian

4 4

BeginPaint not called on WM_PAINT
by James Hawkins 11 Dec '04

11 Dec '04

I'm trying to get a program running called BZEdit. Under the latest cvs, the program shows a scrambled mess over the whole screen (I think that is a result of this patch http://cvs.winehq.org/patch.py?id=14725) but when I went back in time to 2004-10-12, the only part of the screen I cant see is the part of the screen where the map you're editing is shown. See http://www.artemisgames.com/BZEdit/ for screenshots. This is the error output I'm getting. err:msg:DispatchMessageA BeginPaint not called on WM_PAINT for hwnd 0x1002a! This message happens every time the editor needs a repaint like when it gets covered by another window. Any ideas about what's going on here? -- James Hawkins

4 7

Re: include file cleanup : another step
by Robert Shearman 11 Dec '04

11 Dec '04

Rémi Assailly wrote: > I moved some defines, ttydrv will not use gdi.h any longer. > I notice that some headers are declared twice, I removed useless > declarations. > > Changelog: > * moved some defines from gdi.h > >------------------------------------------------------------------------ > >--- dlls/gdi/palette.c~ 2004-10-18 23:18:58.000000000 +0200 >+++ dlls/gdi/palette.c 2004-12-09 14:14:52.000000000 +0100 >@@ -37,6 +37,11 @@ > #include "wine/debug.h" > #include "winerror.h" > >+/* palette object */ >+#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ >+ >+#define PC_SYS_USED 0x80 /* palentry is used (both system and logical) */ >+ > WINE_DEFAULT_DEBUG_CHANNEL(palette); > > static INT PALETTE_GetObject( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); > >--- include/gdi.h~ 2004-03-04 21:41:13.000000000 +0100 >+++ include/gdi.h 2004-12-09 19:01:20.154559672 +0100 >@@ -83,14 +83,6 @@ > SEGPTR segptr_bits; /* segptr to DIB bits */ > } BITMAPOBJ; > >-/* palette object */ >- >-#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ >- >-#define PC_SYS_USED 0x80 /* palentry is used (both system and logical) */ >-#define PC_SYS_RESERVED 0x40 /* system palentry is not to be mapped to */ >-#define PC_SYS_MAPPED 0x10 /* logical palentry is a direct alias for system palentry */ >- > typedef struct tagPALETTEOBJ > { > GDIOBJHDR header; > >--- dlls/ttydrv/palette.c~ 2004-12-09 18:57:42.835597176 +0100 >+++ dlls/ttydrv/palette.c 2004-12-09 14:27:48.000000000 +0100 >@@ -22,10 +22,14 @@ > > #include <stdlib.h> > >-#include "gdi.h" >-#include "winbase.h" > #include "ttydrv.h" > #include "wine/debug.h" >+#include "wine/wingdi16.h" >+ >+/* palette object */ >+#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ >+ >+#define PC_SYS_USED 0x80 /* palentry is used (both system and logical) */ > > WINE_DEFAULT_DEBUG_CHANNEL(ttydrv); > >--- dlls/x11drv/palette.c~ 2004-12-01 12:32:11.000000000 +0100 >+++ dlls/x11drv/palette.c 2004-12-09 19:03:03.933782832 +0100 >@@ -24,11 +24,16 @@ > #include <string.h> > > #include "gdi.h" >-#include "windef.h" > #include "winreg.h" > #include "x11drv.h" > #include "wine/debug.h" > >+/* palette object */ >+#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ >+ >+#define PC_SYS_USED 0x80 /* palentry is used (both system and logical) */ >+#define PC_SYS_RESERVED 0x40 /* system palentry is not to be mapped to */ >+ > WINE_DEFAULT_DEBUG_CHANNEL(palette); > > /* Palette indexed mode: > > Nice try, but I don't think we want three copies of the same defines. That's just asking for trouble with them getting out of sync. Rob

2 1

questionable code
by Eric Pouech 11 Dec '04

11 Dec '04

still toying with various compilers, here's two new questions (to whom it may concern): **** dlls/gdi/freetype.c line 1467 the test for "(offset < 0)" is always false. I'm not sure changing it into "offset == -1" is the right solution. *** dlls/ole32/hglobalstream.c line 602 the test "if (newPosition.QuadPart < 0)" is always false as QuadPart is unsigned A+

2 2

Re: [AppDB] TODO patch
by tony_lambregts＠telusplanet.net 11 Dec '04

11 Dec '04

Jonathan Ernst wrote: [snip] > Index: CODING_STANDARD > =================================================================== > RCS file: /home/wine/appdb/CODING_STANDARD,v > retrieving revision 1.1 > diff -u -r1.1 CODING_STANDARD > --- CODING_STANDARD 11 Dec 2004 03:42:43 -0000 1.1 > +++ CODING_STANDARD 11 Dec 2004 18:56:07 -0000 > @@ -62,4 +62,11 @@ > } > } > > +- use long php tags (<?php ?>) instead of short ones (<? ?>) as : > + 1) it could be removed from future versions of php > + 2) if conflicts with tags like <?xml version=1.0 ?> that are used in xhtml [snip] Should be it not if oops//: + 2) it conflicts with tags like <?xml version=1.0 ?> that are used in xhtml

1 0

Re: IME fixes
by Aric Stewart 11 Dec '04

11 Dec '04

You have a few places where variable declaration has moved from the top of the function to under your block. That should be fixed. It is hard to read through the whitespace changes for me. I though general convention was that you did not change whitespace (i seems to remember a small war over that) other than that things look ok. Have you tested this by setting your locale to ja_JP or zh_CN or ko_KR to make sure the fixme come back and such? thanks -aric Ivan Leo Puoti wrote: > We have 2 space, 4 space and 5 space indentation in ime.c, so fix that. > Also behave like windows if we're on a locale that doesn't support, by returning 0 > after setting last error to 120. > > Ivan.

3 2

Re: Includes [1] ntdll
by Andreas Mohr 11 Dec '04

11 Dec '04

Hi, On Tue, Dec 07, 2004 at 06:15:39AM -0800, Jon Griffiths wrote: > Hi, > > On the suspicion that my hacking on header files was causing too many > files to be rebuilt, I whipped up a quick perl script to identify > unneeded header files. This series of patches is the result. Nice stuff, but... where is it? The most important part, I mean: the perl script ;-) Note that some removed include files might be needed for different systems, so some breakage might/may/will follow this patch. (Gerald Pfeifer will *love* your "nice" work, I'm sure ;-) But I'd still vote strongly for including it, since it will remove lots of cruft. Thanks, Andreas Mohr

6 8

[AppDB] First step to integrating the AppDB with Bugzilla
by Tony Lambregts 11 Dec '04

11 Dec '04

Over two years ago this was disccused and the concensus at the time was that integrating the AppDB and Bugzilla would be a Good Idea (TM). This patch is my attempt to get it started. I am submitting this to wine devel first because I KNOW this patch can be controversial. I have tried to make this patch as small as possible but it still covers quite a few files. I am useing Globals and that should be improved. and I am sure there are other things that are wrong with it. ;^) Also the code in preferences.php does not do anything except show that this works. Finally in order for it to work Jeremy Newman will need to set up the include/config.php in the appdb directory. Please try it out and get back to me.. Change Log: Integrate AppDB with Bugzilla to use the versions table from Buzilla. Files changed: preferences.php include/config.php.sample include/util.php Files Added: tables/bugzilla_tables.sql tables/create_bugzilla_tables Index: preferences.php =================================================================== RCS file: /home/wine/appdb/preferences.php,v retrieving revision 1.2 diff -u -r1.2 preferences.php --- preferences.php 10 Dec 2004 01:07:45 -0000 1.2 +++ preferences.php 11 Dec 2004 04:45:44 -0000 @@ -50,6 +50,16 @@ $ext_email = $user->lookup_email($_SESSION['current']->userid); include(BASE."include/"."form_edit.php"); + $version = "unspecified"; + echo "<tr><td>  wine version </td><td>"; + make_bugzilla_version_list("version", $version); + echo "</td></tr>"; +/* <tr> + <td>   Email Address </td> + <td> <input type="text" name="ext_email" value="<?=$ext_email;?>"> </td> + </tr> +*/ + } if($HTTP_POST_VARS) Index: include/config.php.sample =================================================================== RCS file: /home/wine/appdb/include/config.php.sample,v retrieving revision 1.2 diff -u -r1.2 config.php.sample --- include/config.php.sample 24 Mar 2004 15:51:49 -0000 1.2 +++ include/config.php.sample 11 Dec 2004 04:45:45 -0000 @@ -24,4 +24,14 @@ $userdb_dbhost = "localhost"; $userdb_db = "apidb"; +/* + * Bugzilla database info + */ +$bugzilla_dbuser = "root"; +$bugzilla_dbpass = ""; +$bugzilla_dbhost = "localhost"; +$bugzilla_db = "bugs"; +/* $bugzilla_db_port = 3306; is this needed? I dont think so.*/ +$bugzilla_product_id = 1; + ?> Index: include/util.php =================================================================== RCS file: /home/wine/appdb/include/util.php,v retrieving revision 1.7 diff -u -r1.7 util.php --- include/util.php 10 Dec 2004 01:07:45 -0000 1.7 +++ include/util.php 11 Dec 2004 04:45:45 -0000 @@ -171,6 +171,69 @@ } } +/* bugzilla functions */ + +function openbugzilladb() +{ + global $bugzilla_dbuser, $bugzilla_dbpass, $bugzilla_dbhost, $bugzilla_db, $bugzilla_product_id; + global $dbcon, $dbref; + + $dbref++; + + if($dbcon) + return $dbcon; + + $dbcon = mysql_connect($bugzilla_dbhost, $bugzilla_dbuser, $bugzilla_dbpass); + if(!$dbcon) + { + echo "An error occurred: ".mysql_error()."<p>\n"; + exit; + } + mysql_select_db($bugzilla_db); + return $dbcon; +} + +function closebugzilladb() +{ + global $dbcon, $dbref; + + if(--$dbref) + return; + + mysql_close($adbcon); +} + +function make_bugzilla_version_list($varname, $cvalue) +{ + global $bugzilla_db, $bugzilla_product_id; + + $table = $bugzilla_db.".versions"; + $where = "WHERE product_id=".$bugzilla_product_id; + $query = "SELECT value FROM $table $where ORDER BY value"; + + openbugzilladb(); + + $result = mysql_query($query); + + if(!$result) + { + closebugzilladb(); + + return; // Oops + } + echo "<select name='$varname'>\n"; + echo "<option value=0>Choose ...</option>\n"; + while(list($value) = mysql_fetch_row($result)) + { + if($id == $cvalue) + echo "<option value=$value selected>$value\n"; + else + echo "<option value=$value>$value\n"; + } + echo "</select>\n"; + closebugzilladb(); +} + /* get the number of applications in the appQueue table */ function getQueuedAppCount() { --- /dev/null 2003-01-30 03:24:37.000000000 -0700 +++ tables/create_bugzilla_tables 2004-12-10 13:41:28.000000000 -0700 @@ -0,0 +1,4 @@ +#! /bin/sh + +echo Creating fake Bugzilla tables +mysql -u root < bugzilla_tables.sql --- /dev/null 2003-01-30 03:24:37.000000000 -0700 +++ tables/bugzilla_tables.sql 2004-12-10 14:10:49.000000000 -0700 @@ -0,0 +1,62 @@ +create database if not exists bugs; + +use bugs; + +drop table if exists versions; + + +/* + * versions information + */ +create table versions ( + value tinytext, + product_id smallint not null +); + +INSERT INTO versions VALUES ('unspecified', 1 ); +INSERT INTO versions VALUES ('20010112', 1 ); +INSERT INTO versions VALUES ('20010216', 1 ); +INSERT INTO versions VALUES ('20010305', 1 ); +INSERT INTO versions VALUES ('20010326', 1 ); +INSERT INTO versions VALUES ('20010418', 1 ); +INSERT INTO versions VALUES ('20010510', 1 ); +INSERT INTO versions VALUES ('20010629', 1 ); +INSERT INTO versions VALUES ('20010824', 1 ); +INSERT INTO versions VALUES ('20011004', 1 ); +INSERT INTO versions VALUES ('20011108', 1 ); +INSERT INTO versions VALUES ('20020228', 1 ); +INSERT INTO versions VALUES ('20020310', 1 ); +INSERT INTO versions VALUES ('20020411', 1 ); +INSERT INTO versions VALUES ('20020509', 1 ); +INSERT INTO versions VALUES ('20020605', 1 ); +INSERT INTO versions VALUES ('20020710', 1 ); +INSERT INTO versions VALUES ('20020804', 1 ); +INSERT INTO versions VALUES ('20020904', 1 ); +INSERT INTO versions VALUES ('20021007', 1 ); +INSERT INTO versions VALUES ('20021031', 1 ); +INSERT INTO versions VALUES ('20021125', 1 ); +INSERT INTO versions VALUES ('20021219', 1 ); +INSERT INTO versions VALUES ('20030115', 1 ); +INSERT INTO versions VALUES ('20030219', 1 ); +INSERT INTO versions VALUES ('20030318', 1 ); +INSERT INTO versions VALUES ('20030408', 1 ); +INSERT INTO versions VALUES ('20030508', 1 ); +INSERT INTO versions VALUES ('20030618', 1 ); +INSERT INTO versions VALUES ('20030709', 1 ); +INSERT INTO versions VALUES ('20030813', 1 ); +INSERT INTO versions VALUES ('20030911', 1 ); +INSERT INTO versions VALUES ('20031016', 1 ); +INSERT INTO versions VALUES ('20031118', 1 ); +INSERT INTO versions VALUES ('20031212', 1 ); +INSERT INTO versions VALUES ('20040121', 1 ); +INSERT INTO versions VALUES ('20040213', 1 ); +INSERT INTO versions VALUES ('20040309', 1 ); +INSERT INTO versions VALUES ('20040408', 1 ); +INSERT INTO versions VALUES ('20040505', 1 ); +INSERT INTO versions VALUES ('20040615', 1 ); +INSERT INTO versions VALUES ('20040716', 1 ); +INSERT INTO versions VALUES ('20040813', 1 ); +INSERT INTO versions VALUES ('20040914', 1 ); +INSERT INTO versions VALUES ('20041019', 1 ); +INSERT INTO versions VALUES ('20041201', 1 ); +INSERT INTO versions VALUES ('CVS', 1 ); Index: README =================================================================== RCS file: /home/wine/appdb/README,v retrieving revision 1.3 diff -u -r1.3 README --- README 25 Mar 2004 16:29:47 -0000 1.3 +++ README 11 Dec 2004 05:10:49 -0000 @@ -1,32 +1,70 @@ -WineHQ Application Database ------------------------------------------------------------------------- -Authors: - Jeremy Newman <jnewman(a)codeweavers.com> - Charles Leop <charles(a)codeweavers.com> - -Contributors: - Paul van Schayck <info(a)wwwdesign.tmfweb.nl> - Chris Morgan <cmorgan(a)alum.wpi.edu> +WineHQ Application Database +------------------------------------------------------------------------ +Authors: + Jeremy Newman <jnewman(a)codeweavers.com> + Charles Leop <charles(a)codeweavers.com> + +Contributors: + Paul van Schayck <info(a)wwwdesign.tmfweb.nl> + Chris Morgan <cmorgan(a)alum.wpi.edu> + + +To install locally for testing/hacking: +------------------------------------------------------------------------ + +- Symlink from /var/www to the appdb directory + +- Copy include/config.php.sample to include/config.php + +- Edit include/config.php as you see fit, the default name of the database + used in the table creation step below is "apidb", you'll have to modify + these files if you change this in config.php + +- cd tables, run ./create_tables to create the database tables + +- Try to open up localhost/appdb, if you get a directory listing + Edit your /etc/apache/httpd.conf "DirectoryIndex" to include index.php + so apache will open index.php after not finding index.html/index.htm etc + +- Check your /etc/php/php.ini to ensure that + 'register_globals = On' (variables won't get passed) + 'magic_quotes_gpc = Off' (you would end up with \ everywhere) + 'session.bug_compat_42' = On' (Problem with auto-globals and session variables) +------------------------------------------------------------------------ +You can create ether set up a real bugzilla database or a fake one + +- cd tables, run ./create_bugzilla_tables to create the fake bugzilla tables -To install locally for testing/hacking: ------------------------------------------------------------------------- +- installing a real bugzilla database (hope this helps) -- Symlink from /var/www to the appdb directory +# download buzilla (password for cvs is cvs) -- Copy include/config.php.sample to include/config.php +cd /var/www/html +export CVSROOT=:pserver:cvs(a)cvs.winehq.org:/home/wine +cvs login +cvs -z 0 checkout bugzilla -- Edit include/config.php as you see fit, the default name of the database - used in the table creation step below is "apidb", you'll have to modify - these files if you change this in config.php +# change directory to bugzilla and change the group ownership to apache. -- cd tables, run ./create_tables to create the database tables +cd bugzilla +chgrp -R apache . +chmod -R g+rX . -- Try to open up localhost/appdb, if you get a directory listing - Edit your /etc/apache/httpd.conf "DirectoryIndex" to include index.php - so apache will open index.php after not finding index.html/index.htm etc -- Check your /etc/php/php.ini to ensure that - 'register_globals = On' (variables won't get passed) - 'magic_quotes_gpc = Off' (you would end up with \ everywhere) - 'session.bug_compat_42' = On' (Problem with auto-globals and session variables) +# change to su and run ./checksetup.pl and fix up what it finds wrong. +# this may take several runs + +su +./checksetup.pl + +# in the /etc/httpd/conf/hppt.conf file find "AddHandler cgi-script .cgi" and add the following. + +<Directory "/var/www/html/bugzilla"> +Options ExecCGI +AllowOverride Limit +Order allow,deny +Allow from all +</Directory> + +# edit local config as nessary to allow access.

3 2

Re: Allow output in winedbg to be redirected to a file
by Eric Pouech 11 Dec '04

11 Dec '04

Jeremy White a écrit : > Changelog: > Allow > and >> output redirection on winedbg commands to capture > output to a file. again (it's my bad day for Jer), I think we should stick to gdb commands: see 'set logging' and friends. A+

2 2