May 2008 - Wine-commits - list.winehq.org

Hans Leidekker : wininet: Don' t add the user agent header until HttpSendRequest is called.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: e2f690a0acf90c335c098e427fc5c2a58ba41c51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f690a0acf90c335c098e427… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri May 2 21:59:24 2008 +0200 wininet: Don't add the user agent header until HttpSendRequest is called. --- dlls/wininet/http.c | 27 ++++++++++----------- dlls/wininet/tests/http.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 0f7df63..3155ac1 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1965,20 +1965,6 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, if (NULL != hIC->lpszProxy && hIC->lpszProxy[0] != 0) HTTP_DealWithProxy( hIC, lpwhs, lpwhr ); - if (hIC->lpszAgent) - { - WCHAR *agent_header; - static const WCHAR user_agent[] = {'U','s','e','r','-','A','g','e','n','t',':',' ','%','s','\r','\n',0 }; - - len = strlenW(hIC->lpszAgent) + strlenW(user_agent); - agent_header = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); - sprintfW(agent_header, user_agent, hIC->lpszAgent ); - - HTTP_HttpAddRequestHeadersW(lpwhr, agent_header, strlenW(agent_header), - HTTP_ADDREQ_FLAG_ADD); - HeapFree(GetProcessHeap(), 0, agent_header); - } - Host = HTTP_GetHeader(lpwhr,szHost); len = lstrlenW(Host->lpszValue) + strlenW(szUrlForm); @@ -3175,6 +3161,19 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, sprintfW(contentLengthStr, szContentLength, dwContentLength); HTTP_HttpAddRequestHeadersW(lpwhr, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE); } + if (lpwhr->lpHttpSession->lpAppInfo->lpszAgent) + { + WCHAR *agent_header; + static const WCHAR user_agent[] = {'U','s','e','r','-','A','g','e','n','t',':',' ','%','s','\r','\n',0}; + int len; + + len = strlenW(lpwhr->lpHttpSession->lpAppInfo->lpszAgent) + strlenW(user_agent); + agent_header = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + sprintfW(agent_header, user_agent, lpwhr->lpHttpSession->lpAppInfo->lpszAgent); + + HTTP_HttpAddRequestHeadersW(lpwhr, agent_header, strlenW(agent_header), HTTP_ADDREQ_FLAG_ADD_IF_NEW); + HeapFree(GetProcessHeap(), 0, agent_header); + } do { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index d87fb5e..8e29dac 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1686,6 +1686,62 @@ static void test_http_connection(void) CloseHandle(hThread); } +static void test_user_agent_header(void) +{ + HINTERNET ses, con, req; + DWORD size, err; + char buffer[64]; + BOOL ret; + + ses = InternetOpen("Gizmo5", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnect(ses, "www.winehq.org", 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequest(con, "GET", "/", "HTTP/1.0", NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + size = sizeof(buffer); + ret = HttpQueryInfo(req, HTTP_QUERY_USER_AGENT | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + err = GetLastError(); + ok(!ret, "HttpQueryInfo succeeded\n"); + ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "expected ERROR_HTTP_HEADER_NOT_FOUND, got %u\n", err); + + ret = HttpAddRequestHeaders(req, "User-Agent: Gizmo Project\r\n", ~0UL, HTTP_ADDREQ_FLAG_ADD_IF_NEW); + ok(ret, "HttpAddRequestHeaders succeeded\n"); + + size = sizeof(buffer); + ret = HttpQueryInfo(req, HTTP_QUERY_USER_AGENT | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + err = GetLastError(); + ok(ret, "HttpQueryInfo failed\n"); + ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "expected ERROR_HTTP_HEADER_NOT_FOUND, got %u\n", err); + + InternetCloseHandle(req); + + req = HttpOpenRequest(con, "GET", "/", "HTTP/1.0", NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + size = sizeof(buffer); + ret = HttpQueryInfo(req, HTTP_QUERY_ACCEPT | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + err = GetLastError(); + ok(!ret, "HttpQueryInfo succeeded\n"); + ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "expected ERROR_HTTP_HEADER_NOT_FOUND, got %u\n", err); + + ret = HttpAddRequestHeaders(req, "Accept: audio/*, image/*, text/*\r\nUser-Agent: Gizmo Project\r\n", ~0UL, HTTP_ADDREQ_FLAG_ADD_IF_NEW); + ok(ret, "HttpAddRequestHeaders failed\n"); + + buffer[0] = 0; + size = sizeof(buffer); + ret = HttpQueryInfo(req, HTTP_QUERY_ACCEPT | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + ok(ret, "HttpQueryInfo failed: %u\n", GetLastError()); + ok(!strcmp(buffer, "audio/*, image/*, text/*"), "got '%s' expected 'audio/*, image/*, text/*'\n", buffer); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + #define STATUS_STRING(status) \ memcpy(status_string[status], #status, sizeof(CHAR) * \ (strlen(#status) < MAX_STATUS_NAME ? \ @@ -1759,4 +1815,5 @@ START_TEST(http) HttpSendRequestEx_test(); HttpHeaders_test(); test_http_connection(); + test_user_agent_header(); }

1 0

Jeff Zaroyko : modify wording on gold rating to say 'third party software' instead of 'cracks' which is a grey area
by Chris Morgan 04 May '08

04 May '08

Module: appdb Branch: master Commit: 2b92c0a858a4db4b259033d058db96df52f6203b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2b92c0a858a4db4b259033d0… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Sun May 4 22:14:38 2008 +1000 modify wording on gold rating to say 'third party software' instead of 'cracks' which is a grey area --- browse_by_rating.php | 2 +- help/maintainer_ratings.help | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/browse_by_rating.php b/browse_by_rating.php index a7cbbb0..ee15ada 100644 --- a/browse_by_rating.php +++ b/browse_by_rating.php @@ -55,7 +55,7 @@ if (empty($aClean['sRating'])) $aRating = array(PLATINUM_RATING, GOLD_RATING, SILVER_RATING, BRONZE_RATING, GARBAGE_RATING); $aRatingText = array("Applications that install and run out of the box", - "Applications that work flawlessly with some DLL overrides or other settings, crack etc.", + "Applications that work flawlessly with some DLL overrides, other settings or third party software.", "Applications that work excellently for 'normal use'", "Applications that work but have some issues, even for 'normal use'", "Applications that don't work as intended, there should be at least one bug report if an app gets this rating"); diff --git a/help/maintainer_ratings.help b/help/maintainer_ratings.help index fded0ad..e2bdfdc 100644 --- a/help/maintainer_ratings.help +++ b/help/maintainer_ratings.help @@ -19,7 +19,7 @@ An application can be rated as Platinum if it installs and runs flawlessly &#821 <li class="gold">Gold</li> -Application works flawlessly with some DLL overrides or other settings, crack etc. +Application works flawlessly with some DLL overrides, other settings or third party software. <li class="silver">Silver</li>

1 0

Jeff Zaroyko : Remove link to the website "Frank's Corner" the information and howtos on the appdb are a much more up to date source of information .
by Chris Morgan 03 May '08

03 May '08

Module: appdb Branch: master Commit: 5665241fca21f40b17657577215b1c2ab102547e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5665241fca21f40b17657577… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Sat May 3 11:21:35 2008 +1000 Remove link to the website "Frank's Corner" the information and howtos on the appdb are a much more up to date source of information. --- index.php | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index cdd1759..89af5f5 100644 --- a/index.php +++ b/index.php @@ -149,8 +149,6 @@ if(!$_SESSION['current']->isLoggedIn()) <h2>Other Wine Application Compatibility Sites</h2> -<a href="http://frankscorner.org">Frank's Corner</a>: Frank has a fantastic Wine -application site, with tips and how-to's on getting listed apps to run. <a href="http://wine-review.blogspot.com/">Wine-Review</a>: Is a Wine application and game Blog, with tips and how-to's on getting listed applications and games to run.

1 0

Maarten Lankhorst : Add code freeze announcement
by Jeremy Newman 02 May '08

02 May '08

Module: website Branch: master Commit: 21ef38658b7d6a217b479da5409e5184a0d67e89 URL: http://source.winehq.org/git/website.git/?a=commit;h=21ef38658b7d6a217b479d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri May 2 13:44:35 2008 -0700 Add code freeze announcement Based on Dan Kegel's mail. >From 19826b5f7630203e3ba7c9eb9677ac7555ab149e Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst <crumb(a)virgo23.smo.corp.google.com> Date: Fri, 2 May 2008 13:39:31 -0700 Subject: [PATCH] Add code freeze announcement --- news/2008050202.xml | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/news/2008050202.xml b/news/2008050202.xml new file mode 100644 index 0000000..bc477cd --- /dev/null +++ b/news/2008050202.xml @@ -0,0 +1,32 @@ +<news> +<date>May 2, 2008</date> +<title>Code freeze in effect, on towards wine 1.0!</title> +<body> +Wine is finally in code freeze in preparation for releasing wine 1.0, and +we need your help! + +If you are a user, now would be the time to help us find regressions and +file them at <a href="http://bugs.winehq.org">bugzilla</a> so we know what +we have to fix. + +According to <a href="http://wiki.winehq.org/WineReleasePlan">Wine's +release plan</a>, wine-1.0.0-rc1, will be the first release candidate for 1.0. +It is expected to be released at 09th of May 2008. + +The code freeze will be less rigid at first, but we're serious about not +destabilizing Wine at this point. So go ahead and post your patches, but make +sure you've got your ducks in a row, and don't be surprised if Alexandre +pushes back. + +During the code freeze, patches that are simple, come with a conformance +test, fix a regression and/or are low risk are more likely to get in than +other patches. This has always been true, but it's even more true during a +code freeze. We will actively discourage patches that might endanger a June +1.0 release. + +There are <a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_s…"> +45 open 1.0 bugs</a> as of 2 May. Most of these will simply be rolled over +to be fixed for a later release; we only have time to fix a few, and much +as we'd like to fix the rest, most are not showstoppers. +</body> +</news>

1 0

Alexandre Julliard : Wine release 0.9.61
by Alexandre Julliard 02 May '08

02 May '08

Module: website Branch: master Commit: 8ad82a5ac7d6e384e1346ced51820715de19a569 URL: http://source.winehq.org/git/website.git/?a=commit;h=8ad82a5ac7d6e384e1346c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 2 19:14:15 2008 +0200 Wine release 0.9.61 --- news/2008050201.xml | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/news/2008050201.xml b/news/2008050201.xml new file mode 100644 index 0000000..1828aec --- /dev/null +++ b/news/2008050201.xml @@ -0,0 +1,27 @@ +<news> +<date>May 2, 2008</date> +<title>Wine 0.9.61 Released</title> +<body> +Wine 0.9.61 was released today, with the following main changes: + +<ul> +<li>Automatic updating of the WINEPREFIX directory.</li> +<li>Winhelp now uses Richedit as display engine.</li> +<li>Many RichEdit fixes.</li> +<li>More improvements to IME support.</li> +<li>More quartz fixes.</li> +<li>Implementation for many more Gdiplus functions.</li> +<li>Lots of bug fixes.</li> +</ul> + + +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.61.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.61">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. + +</body> +</news>

1 0

Tag wine-0.9.61 : Alexandre Julliard : Release 0.9.61
by Alexandre Julliard 02 May '08

02 May '08

Module: wine Branch: refs/tags/wine-0.9.61 Tag: ffc01eeb4a334331a07200f9f8c4f4ad941b7ca4 URL: http://source.winehq.org/git/wine.git/?a=tag;h=ffc01eeb4a334331a07200f9f8c4… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 2 19:01:52 2008 +0200 Release 0.9.61

1 0

Alexandre Julliard : Release 0.9.61.
by Alexandre Julliard 02 May '08

02 May '08

Module: wine Branch: master Commit: c6da2a0b9daa8bdba045559b057ccf43ea2209c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6da2a0b9daa8bdba045559b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 2 19:01:51 2008 +0200 Release 0.9.61. --- ANNOUNCE | 1632 ++++++++++++++++++----------------- ChangeLog | 2892 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 3741 insertions(+), 803 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6da2a0b9daa8bdba0455…

1 0

Alexandre Julliard : Updated the authors list.
by Alexandre Julliard 02 May '08

02 May '08

Module: wine Branch: master Commit: b93eb2c86703fecf5f76abd2eb5aef43378e2210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93eb2c86703fecf5f76abd2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 2 17:09:00 2008 +0200 Updated the authors list. --- AUTHORS | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 74 insertions(+), 1 deletions(-) diff --git a/AUTHORS b/AUTHORS index b72bfe8..0365196 100644 --- a/AUTHORS +++ b/AUTHORS @@ -10,6 +10,7 @@ Bruno Afonso Farshad Agah Samir Al-Battran Guy Albertelli +Jens Albretsen Apostolos Alexiadis Jesse Allen Stewart Allen @@ -29,12 +30,15 @@ Benjamin Arai Pedro Araujo Chaves Jr Alex Arazi Augusto Arcoverde da Rocha +Alam Arias Aaron Arvey +Matthew D'Asaro Dag Asheim Fatih Aşıcı Rémi Assailly Jim Aston Zimler Attila +Christian Authmann Martin Ayotte Viktor Babrian Karl Backström @@ -44,10 +48,12 @@ Warren Baird Peter Bajusz Tijs van Bakel Nerijus Baliunas +Alexandru Balut Scott Bambrough Andre Malafaya Baptista Justin Santa Barbara Aaron Barnes +Guido Barzini Jean-Claude Batista Jacek Bator Marcel Baur @@ -57,16 +63,20 @@ Tom Bech David Beck Ralf Beck Matthew Becker +Nathan Beckmann Dave Belanger Ken Belleau Yvon Belleau Maxime Bellengé +Elias Benali Leo van den Berg Anders Bergh +Christopher Berner Vincent Béron Alec Berryman Molle Bestefich Joris Beugnies +Eric van Beurden Peter Beutner Stephan Beuze Georg Beyerle @@ -110,13 +120,17 @@ Nicolas Brouard Alban Browaeys Marcus R. Brown Philip Brown +Zac Brown +Gregor Brunmar Stefan Brüns +Tom Brus Przemyslaw Bruski Gabriel Buades Rubio Vitaly Budovski Jan Van Buggenhout Andrew Bulhak Christoph Bumiller +Divan Burger Tobias Burnus Nick Burns John Burton @@ -135,16 +149,20 @@ Tomas Carnecky Eddie Carpenter Niels de Carpentier Mike Castle +Erik de Castro Lopo Julien Cegarra Ron Cemer Fabian Cenedese Gordon Chaffee Gael de Chalendar +Royal Chan +Hervé Chanal +Brian Chang Matt Chapman Peter Chapman -Brian Chang Antoine Chavasse Mauro Carvalho Chehab +Ethan Chen Jau-Horng Chen Tisheng Chen Rustam Chernotkach @@ -199,6 +217,7 @@ Bryan DeGrendel Moses DeJong Nicolas Delcros Sam Dennis +Matthias Derer Raul Dias Robert Dickenson Darryl Dixon @@ -217,6 +236,7 @@ EA Durbin Zoran Dzelajlija Jason Edmeades Steven Edwards +Christian Eggers Rikhardur Egilsson Karsten Elfenbein John Elliot @@ -224,10 +244,12 @@ David Elliott Steven Elliott Dan Engel Ralf S. Engelschall +Austin English Morten Eriksen Jakob Eriksson Jonathan Ernst Nicolas Escuder +Andrey Esin Phillip Ezolt Chris Faherty Carsten Fallesen @@ -240,7 +262,9 @@ Matthias Fechner Tim Ferguson Raul Fernandes Wesley Filardo +Colin Finck Matt Finnicum +Aurimas Fischer Claus Fischer Thomas Fitzsimmons Olaf Flebbe @@ -250,6 +274,7 @@ Krzysztof Foltman Chad Fraleigh Matthew Francis Kolbjørn Fredheim +Lars-Ake Fredlund Eric Frias Christoph Frick Klemens Friedl @@ -268,6 +293,7 @@ Gabriel Gambetta Peter Ganten Gabriel Garcia Ramon Garcia +Johan Gardell Michael Gardiner Martin Garton Jeff Garzik @@ -283,10 +309,12 @@ Brian Gerst Matthew Ghio Johan Gill John Gilmore +Denver Gingerich Gabriele Giorgetti Kristoffer Gleditsch Christian Gmeiner Jody Goldberg +Zach Goldberg David Golding Markus Gömmel Julio E. Gonzalez P @@ -294,6 +322,7 @@ Bob Goodwin Eugeny Gorelov Zach Gorman Florian Goth +Mathias Gottschlag Alexander Gottwald François Gouget George Gov @@ -326,9 +355,11 @@ David Hammerton Noomen Hamza Anssi Hannula Charles M. Hannum +Vincent Hardy Yorick Hardy Boaz Harrosh Adrian Harvey +Christopher Harvey John Harvey James Hatheway Geoffrey Hausheer @@ -358,7 +389,9 @@ Ben Hodgetts Jochen Hoenicke Henning Hoffmann Jens Hoffmann +Michael Hoffman Erik Hofman +Jörg Höhle John K. Hohm Kevin Holbrook Nick Holloway @@ -371,9 +404,11 @@ Olivier Houchard Onno Hovers David Howells Vit Hrachovy +Sin-ta Hsiea Jeffrey Hsu Zhangrong Huang Edgar Hucek +Sean Huckins Stefan Huehner Andrew John Hughes Tom Hughes @@ -390,6 +425,7 @@ Hiroshi Inoue Kostya Ivanov Serge Ivanov Peter Ivanyi +Lance Jackson Michael Jacobsen Francois Jacques Lee Jaekil @@ -401,6 +437,7 @@ Jerry Jenkins Niels Kristian Bech Jensen Ron Jensen Byeong-Sik Jeon +Tomasz Jezierski Rajeev Jhangiani Jerry Ji Antonio Larrosa Jiménez @@ -425,6 +462,7 @@ Srivatsa Kanchi, R Jukka Kangas Thorsten Kani Pavel Kankovsky +Lauris Kaplinski Michael Karcher Reinhard Karcher Niclas Karlsson @@ -437,6 +475,7 @@ Dan Kegel Matthew Kehrer Don Kelly Thomas Kho +Sergey Khodych Vijay Kiran Kamuju Andreas Kirschbaum Simon Kissane @@ -452,6 +491,7 @@ Kevin Koltzau Konstantin Kondratyuk Jon Konrath Ilya Konstantinov +Frans Kool Oleg Korda Ilya Korniyko Alex Korobka @@ -490,6 +530,7 @@ Stephen Langasek Sean Langley Dan Langlois Maarten Lankhorst +Jared Lapsley Peter Berg Larsen Thomas Brix Larsen Alexander Larsson @@ -498,6 +539,7 @@ Alex Villacís Lasso David Lassonde Jeff Latimer Paul Laufer +Klaus Layer Albert Lee Jaekil Lee Sander van Leeuwen @@ -507,8 +549,10 @@ Peter Lemenkov Kristiaan Lenaerts Louis Lenders Crestez Leonard +Alistair Leslie-Hughes Karl Lessard Pascal Lessard +Hin-Tak Leung Blake Leverett Wim Lewis Andrew Lewycky @@ -578,6 +622,7 @@ Davin McCall Rob McClinton Michael McCormack David McCullough +Rhys McGuckin Alastair McKinstry Jason McMullan Harry McNally @@ -590,6 +635,7 @@ Josef Meixner Américo José Melo Fabrice Ménard Graham Menhennitt +Luis Javier Merino Thomas Mertes Johann Messner David Metcalfe @@ -616,16 +662,20 @@ Todd Mokros Slava Monich James Moody David Moore +Patrick Moran Chris Morgan Kai Morich Elie Morisse +Alexander Morozov John Morris Shaun Morris Richard Mortimer Adam D. Moss +Michael Moss Julien Muchembled Jeff Muizelaar Vasudev Mulchandani +Gregor Münch Krishna Murthy Rick Mutzke Philippe De Muyter @@ -637,6 +687,7 @@ Filip Navara Dustin Navea Felix Nawothnig Jonathan Naylor +Jens Nestler Nathan Neulinger Christian Neumair Jeremy Newman @@ -650,6 +701,7 @@ Nix N. Nix Sami Nopanen Leonard Norrgård Robert North +Tomasz Nowiński Oleh R. Nykyforchyn Daniel Nylander Per Nystrom @@ -672,6 +724,7 @@ Won Kyu Park Joel Parker Evan G. Parry Jon Parshall +Marcel Partap Alex Pasadyn Sven Paschukat Michal Pasternak @@ -685,6 +738,8 @@ Bernd Paysan Vincent Pelletier Victor Pelt Brad Pepers +Ted Percival +Vitaly Perov James Perry Ori Pessach Nemeth Peter @@ -757,6 +812,7 @@ Chris Robinson Vedran Rodic Wino Rojo Troy Rollo +Paul Romanyszyn Drew Ronneberg Andreas Rosenberg Bernhard Rosenkraenzer @@ -793,6 +849,8 @@ Ingo Schneider Victor Schneider Kees Schoenmakers Glenn Schrader +Rico Schüller +Marco Schuster Waldeck Schutzer Tim Schwartz Federico Schwindt @@ -815,9 +873,11 @@ Yngvi Sigurjonsson Gustavo Noronha Silva Stephen Simmons Alasdair Sinclair +Andrej Sinicyn Ivan Sinitsin Dmitrij Sinukov Willie Sippel +Nikolay Sivov Daniel Skorka Jesper Skov Neil Skrypuch @@ -826,6 +886,7 @@ Sasha Slijepcevic Kirill Smelkov Kirill K. Smirnov David Smith +Dylan Smith Jeff Smith William Smith Juris Smotrovs @@ -833,6 +894,7 @@ Ed Snow Jaroslaw Piotr Sobieszek Carl Sopchak Alexander Nicolaysen Sørnes +Pablo Spallanzani Thomas Spear Chris Spencer Liu Spider @@ -852,6 +914,7 @@ Igor Stepin Keith Stevens Norman Stevens Aric Stewart +Johannes Stezenbach Oliver Stieber Clinton Stimpson William Stinson @@ -863,10 +926,12 @@ Bertho Stultiens John F Sturtz Michal Suchanek Abraham Sudhakar +Petr Sumbera Supphachoke Suntiwichaya Charles Suprin James Sutherland Erik Svendsen +Artur Szymiec Dylan Taft Yoshiro Takeno Hidenori Takeshima @@ -910,6 +975,7 @@ Andrey Turkin Gregory M. Turner Peter Dons Tychsen Lionel Ulmer +Peter Urbanec Moshe Vainer Hleb Valoska Hannu Valtonen @@ -940,12 +1006,14 @@ Martin Walker Simon Walton Owen Wang Eric Warnke +Tony Wasserka Andrew Webb Leigh Wedding Randy Weems Manfred Weichel Thomas Weidenmueller Ulrich Weigand +Markus Weiland David Welch Morten Welinder Marcelo Welter @@ -962,6 +1030,8 @@ Carl Williams Eric Williams Grant Williamson Jed Wing +Andre Wisplinghoff +Christoph von Wittich Dan Wolf Erwin Wolff Philipp Wollermann @@ -972,7 +1042,9 @@ Cliff Wright Chia-I Wu Gerold Jens Wucherpfennig Karl Guenter Wuensch +Chris Wulff Glenn Wurster +Jon Yang Mehmet Yasar Alexander Yaworsky Sean Young @@ -982,6 +1054,7 @@ Nikita V. Youshchenko Hwang YunSong Mikołaj Zalewski Simen Zamecnik +Jeff Zaroyko Steve Zellers Jan Zerebecki John Zero

1 0

Andrew Talbot : winex11.drv: Remove unused variables.
by Alexandre Julliard 02 May '08

02 May '08

Module: wine Branch: master Commit: 5156219a1c966a3459519f74ba15aa0838a07c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5156219a1c966a3459519f74b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri May 2 12:50:13 2008 +0100 winex11.drv: Remove unused variables. --- dlls/winex11.drv/dib.c | 3 --- dlls/winex11.drv/dib_dst_swap.c | 4 ---- dlls/winex11.drv/event.c | 2 -- dlls/winex11.drv/mouse.c | 6 ++---- dlls/winex11.drv/opengl.c | 2 -- dlls/winex11.drv/systray.c | 3 +-- dlls/winex11.drv/window.c | 7 +------ dlls/winex11.drv/xfont.c | 2 -- 8 files changed, 4 insertions(+), 25 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 81345a9..4b287ea 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -2899,7 +2899,6 @@ static void X11DRV_DIB_SetImageBits_32(int lines, const BYTE *srcbits, DWORD linebytes) { DWORD x; - const DWORD *ptr; int h, width = min(srcwidth, dstwidth); const dib_conversions *convs = (bmpImage->byte_order == LSBFirst) ? &dib_normal : &dib_dst_byteswap; @@ -2910,8 +2909,6 @@ static void X11DRV_DIB_SetImageBits_32(int lines, const BYTE *srcbits, linebytes = -linebytes; } - ptr = (const DWORD *) srcbits + left; - switch (bmpImage->depth) { case 24: diff --git a/dlls/winex11.drv/dib_dst_swap.c b/dlls/winex11.drv/dib_dst_swap.c index 66b77e6..cf0aa41 100644 --- a/dlls/winex11.drv/dib_dst_swap.c +++ b/dlls/winex11.drv/dib_dst_swap.c @@ -1369,9 +1369,7 @@ static void convert_0888_to_888_asis_dst_byteswap(int width, int height, const DWORD* srcpixel; DWORD* dstpixel; int x,y; - int oddwidth; - oddwidth=width & 3; width=width/4; for (y=0; y<height; y++) { srcpixel=srcbits; @@ -1423,9 +1421,7 @@ static void convert_0888_to_888_reverse_dst_byteswap(int width, int height, const DWORD* srcpixel; DWORD* dstpixel; int x,y; - int oddwidth; - oddwidth=width & 3; width=width/4; for (y=0; y<height; y++) { srcpixel=srcbits; diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 36aa088..764e4da 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1012,7 +1012,6 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event ) int x, y, dummy; BOOL bAccept; Window win, w_aux_root, w_aux_child; - HWND hScope = hWnd; win = X11DRV_get_whole_window(hWnd); wine_tsx11_lock(); @@ -1041,7 +1040,6 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event ) { x = pt.x; y = pt.y; - hScope = hwndDrop; bAccept = TRUE; } else diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 8e8d5f5..5ab9ea8 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -406,7 +406,7 @@ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) { int x, xmax; int y, ymax; - int and_size, xor_size; + int and_size; unsigned char *and_bits, *and_ptr, *xor_bits, *xor_ptr; int and_width_bytes, xor_width_bytes; XcursorPixel *pixel_ptr; @@ -422,7 +422,6 @@ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) and_size = ptr->nWidth * ptr->nHeight / 8; and_ptr = and_bits = (unsigned char *)(ptr + 1); - xor_size = xor_width_bytes * ptr->nHeight; xor_ptr = xor_bits = and_ptr + and_size; image = pXcursorImageCreate( xmax, ymax ); @@ -664,7 +663,7 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) int rbits, gbits, bbits, red, green, blue; int rfg, gfg, bfg, rbg, gbg, bbg; int rscale, gscale, bscale; - int x, y, xmax, ymax, bitIndex, byteIndex, xorIndex; + int x, y, xmax, ymax, byteIndex, xorIndex; unsigned char *theMask, *theImage, theChar; int threshold, fgBits, bgBits, bitShifted; BYTE pXorBits[128]; /* Up to 32x32 icons */ @@ -703,7 +702,6 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) */ theImage = &theMask[ptr->nWidth/8 * ptr->nHeight]; rfg = gfg = bfg = rbg = gbg = bbg = 0; - bitIndex = 0; byteIndex = 0; xorIndex = 0; fgBits = 0; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index dbe66f1..f92f943 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1047,7 +1047,6 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEVICE *physDev, int bestDepth = -1; int bestStencil = -1; int bestAux = -1; - int score; if (!has_opengl()) { ERR("No libGL on this box - disabling OpenGL support !\n"); @@ -1069,7 +1068,6 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEVICE *physDev, int alpha=0, color=0, depth=0, stencil=0, aux=0; fmt = ConvertPixelFormatWGLtoGLX(gdi_display, i+1 /* 1-based index */, FALSE /* offscreen */, &value); - score = 0; /* Pixel type */ pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_RENDER_TYPE, &value); diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index a6cf182..d2a07fc 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -419,12 +419,11 @@ BOOL wine_notify_icon( DWORD msg, NOTIFYICONDATAW *data ) { BOOL ret = FALSE; struct tray_icon *icon; - Window owner; switch (msg) { case NIM_ADD: - if ((owner = get_systray_selection_owner( thread_display() ))) ret = add_icon( data ); + if (get_systray_selection_owner( thread_display() )) ret = add_icon( data ); break; case NIM_DELETE: if ((icon = get_icon( data->hWnd, data->uID ))) ret = delete_icon( icon ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f4eb82e..0b20338 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1564,12 +1564,8 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) static struct x11drv_win_data *create_desktop_win_data( Display *display, HWND hwnd ) { struct x11drv_win_data *data; - VisualID visualid; if (!(data = alloc_win_data( display, hwnd ))) return NULL; - wine_tsx11_lock(); - visualid = XVisualIDFromVisual(visual); - wine_tsx11_unlock(); data->whole_window = data->client_window = root_window; data->managed = TRUE; SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); @@ -1926,7 +1922,7 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, Display *display = thread_data->display; struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); DWORD new_style = GetWindowLongW( hwnd, GWL_STYLE ); - RECT old_window_rect, old_whole_rect, old_client_rect; + RECT old_whole_rect, old_client_rect; int event_type; if (!data) @@ -1945,7 +1941,6 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, SetPropA( hwnd, managed_prop, (HANDLE)1 ); } - old_window_rect = data->window_rect; old_whole_rect = data->whole_rect; old_client_rect = data->client_rect; data->window_rect = *rectWindow; diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 8ab323d..6d8ff78 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -1366,7 +1366,6 @@ static void XFONT_WindowsNames(void) for( fr = fontList; fr ; fr = fr->next ) { fontResource* pfr; - char* lpch; if( fr->fr_flags & FR_NAMESET ) continue; /* skip already assigned */ @@ -1377,7 +1376,6 @@ static void XFONT_WindowsNames(void) break; } - lpch = fr->lfFaceName; snprintf( fr->lfFaceName, sizeof(fr->lfFaceName), "%s %s", /* prepend vendor name */ (pfr==fr) ? "" : fr->resource->foundry,

1 0

Paul Vriens : kernel32/tests: Skip some tests on win98.
by Alexandre Julliard 02 May '08

02 May '08

Module: wine Branch: master Commit: 1cfad7f07fe6ab5b014ddf48a346b678373d5a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cfad7f07fe6ab5b014ddf48a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri May 2 13:28:10 2008 +0200 kernel32/tests: Skip some tests on win98. --- dlls/kernel32/tests/console.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 2885aaa..aacae9c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -618,7 +618,14 @@ static void testScreenBuffer(HANDLE hConOut) /* In the beginning set output codepage to 866 */ oldcp = GetConsoleOutputCP(); - ok(SetConsoleOutputCP(866), "Cannot set output codepage to 866\n"); + SetLastError(0xdeadbeef); + ret = SetConsoleOutputCP(866); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("SetConsoleOutputCP is not implemented\n"); + return; + } + ok(ret, "Cannot set output codepage to 866\n"); hConOutRW = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,

1 0