August 2007 - Wine-Commits - list.winehq.org

appdb/. index.php
by WineHQ Aug. 9, 2007

Aug. 9, 2007

ChangeSet ID: 31323 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/08 21:12:32 Modified files: . : index.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add a request for application maintainers to the main page of the appdb site. We can't keep up with the number of test results we are receiving and we need to get a handle on the existing queues. Patch: http://cvs.winehq.org/patch.py?id=31323 Old revision New revision Changes Path 1.53 1.54 +33 -5 appdb/index.php Index: appdb/index.php diff -u -p appdb/index.php:1.53 appdb/index.php:1.54 --- appdb/index.php:1.53 9 Aug 2007 2:12:32 -0000 +++ appdb/index.php 9 Aug 2007 2:12:32 -0000 @@ -13,20 +13,21 @@ require(BASE."include/incl.php"); apidb_header("Wine Application Database"); ?> - <img src="images/appdb_montage.jpg" width=391 height=266 align=right alt="Wine AppDB"> + <img style="float:right;" src="images/appdb_montage.jpg" width=391 height=266 alt="Wine AppDB"> <div class='default_container'> <h1>Welcome</h1> -<p>This is the Wine Application Database (AppDB). From here you get info on application +<p>This is the Wine Application Database (AppDB). Here you can get information on application compatibility with Wine.</p> <?php $str_benefits=" <ul> - <li>Ability to <a href=\"".BASE."help/?sTopic=voting\" title=\"help on voting\" style=\"cursor: help\">vote</a> on your favourite applications</li> - <li>Ability to customize the layout and behaviour of the AppDB and comments system</li> + <li>Ability to <a href=\"".BASE."help/?sTopic=voting\" title=\"help on voting\" style=\"cursor: help\">vote</a> on your favorite applications</li> + <li>Ability to customize the layout and behavior of the AppDB and comments system</li> <li>Take credit for your witty posts</li> - <li>Ability to sign up to be an <a href=\"".BASE."help/?sTopic=maintainer_guidelines\" title=\"informations about application maintainers\" style=\"cursor: help\">application maintainer</a>.</li> + <li>Ability to sign up to be an <a href=\"".BASE."help/?sTopic=maintainer_guidelines\" + title=\"information about application maintainers\" style=\"cursor: help\">application maintainer</a>.</li> <li>Submit new applications and versions.</li> <li>Submit new screenshots.</li> </ul> @@ -53,6 +54,33 @@ if(!$_SESSION['current']->isLoggedIn()) stomping out Wine issues will be greatly appreciated.</p>"; } + +echo "<div style='clear:both; border: 2px solid; background-color: #d7d7d7; font-weight: bold; padding:4px;'>"; +echo "<p style='font-size:large;'>Do you use Wine regularly? Interested in helping other users and". + " keeping information about your favorite applications up-to-date?</p>"; +echo "<p style='font-size: medium;'>Consider". + " becoming an <a href=\"".BASE."help/?sTopic=maintainer_guidelines\"". + " title=\"information about application maintainers\" style=\"cursor: help\">application maintainer</a>". + " for the applications that you use under Wine.</p>"; +echo "<p style='font-size:medium;'>As an application maintainer you'll get to post HOWTOs to help other users". + " run the application. You'll be able to review and process user submitted screenshots". + " and test results.</p>"; +echo "<p style='font-size:medium;'>Dozens of new test results and screenshots are submitted each day and we can". + " use your help to keep user contributed information reviewed and processed in a timely fashion.". + " Please consider becoming an application maintainer."; +echo "<p style='font-size:medium;'>- The Appdb Admins<br/> <a href=\"mailto:".APPDB_OWNER_EMAIL."\">".APPDB_OWNER_EMAIL."</a></p>"; + +if(!$_SESSION['current']->isLoggedIn()) +{ + echo "<p style='font-size: medium;'>To become a maintainer, [<a href=\"".login_url()."\">log in</a>]". + " or [<a href=\"account.php?sCmd=new\">register</a>] and on the application or version page". + ", depending on whether you want to maintain all versions of an application or a specific version,". + " click on the <i>'Become a super maintainer of this app'</i> or <i>'Be a maintainer for this version'</i>". + " button. We'll process your request within a day or so.</p>"; +} + +echo "</div>"; + ?> <?php

1 0

appdb/include maintainer.php
by WineHQ Aug. 8, 2007

Aug. 8, 2007

ChangeSet ID: 31322 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/08 18:40:34 Modified files: include : maintainer.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix formatting issue with 2nd notification email where we didn't specify that the duration was in days and we were missing a space after the day interval. Patch: http://cvs.winehq.org/patch.py?id=31322 Old revision New revision Changes Path 1.54 1.55 +2 -2 appdb/include/maintainer.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.54 appdb/include/maintainer.php:1.55 --- appdb/include/maintainer.php:1.54 8 Aug 2007 23:40:34 -0000 +++ appdb/include/maintainer.php 8 Aug 2007 23:40:34 -0000 @@ -1131,8 +1131,8 @@ class maintainer // so a more active person can fill the spot $oNotificationUpdate->sMsg.= "\nThis your second notification of queued entries."; $oNotificationUpdate->sMsg.= " If the queued entries are not processsed within"; - $oNotificationUpdate->sMsg.= " the next ".iNotificationIntervalDays. "we will remove"; - $oNotificationUpdate->sMsg.= " your maintainership for this application/version"; + $oNotificationUpdate->sMsg.= " the next ".iNotificationIntervalDays. " days we will"; + $oNotificationUpdate->sMsg.= " remove your maintainership for this application/version"; $oNotificationUpdate->sMsg.= " so a more active person can fill the spot."; break; case 3: // remove their maintainership and notify the maintainer why we are doing so

1 0

tools/winetest dissect gather winetest.cgi win ...
by Jeremy Newman Aug. 8, 2007

Aug. 8, 2007

ChangeSet ID: 31321 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/08/08 16:43:02 Modified files: winetest : dissect gather winetest.cgi winetest.conf Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Make a distinction between a real winetest crash and a partial report file Patch: http://cvs.winehq.org/patch.py?id=31321 Old revision New revision Changes Path 1.23 1.24 +10 -2 tools/winetest/dissect 1.24 1.25 +17 -4 tools/winetest/gather 1.8 1.9 +3 -3 tools/winetest/winetest.cgi 1.4 1.5 +5 -1 tools/winetest/winetest.conf Index: tools/winetest/dissect diff -u -p tools/winetest/dissect:1.23 tools/winetest/dissect:1.24 --- tools/winetest/dissect:1.23 8 Aug 2007 21:43: 2 -0000 +++ tools/winetest/dissect 8 Aug 2007 21:43: 2 -0000 @@ -29,7 +29,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA use strict; -use vars qw/$builds $queuedir $datadir $maxmult $fileversion/; +use vars qw/$builds $queuedir $datadir $maxmult $fileversion $maxfilesize/; require "winetest.conf"; use File::Temp qw/tempdir/; @@ -56,6 +56,9 @@ my $tmpfile = "$tmpdir/dissect.tmp"; open IN, "<:raw", $report or mydie "can't read $report: $!"; open SUM, ">$tmpdir/summary.txt" or mydie "can't write $tmpdir/summary.txt: $!"; +# Get the size of the report file +my $filesize = -s "$report"; + $_ = <IN>; /^Version (\d+)\r?$/ or mydie "no version header: $_"; $1 eq $fileversion or mydie "illegal version: $1\n"; @@ -184,8 +187,13 @@ while (<IN>) { } } if (defined $unit) { + # Either winetest crashed or the report file was cut off $_=""; - $result = "failed - - -"; + if ($filesize == $maxfilesize) { + $result = "failed filelimit - -"; + } else { + $result = "failed crash - -"; + } goto FINISH; } close SUM or mydie "error writing $tmpdir/summary.txt: $!"; Index: tools/winetest/gather diff -u -p tools/winetest/gather:1.24 tools/winetest/gather:1.25 --- tools/winetest/gather:1.24 8 Aug 2007 21:43: 2 -0000 +++ tools/winetest/gather 8 Aug 2007 21:43: 2 -0000 @@ -112,8 +112,10 @@ foreach my $file (glob "$datadir/$build/ } else { $group->{extrema}->{$testname} = [$error, $error]; } - } elsif ($todo eq "-") { + } elsif ($todo eq "crash") { $testref->{crash} = $testname; + } elsif ($todo eq "filelimit") { + $testref->{filelimit} = $testname; } my $prevdigest = \$group->{digests}->{$testname}; $$prevdigest = ($count eq "failed" || $error || $skipped || @@ -135,13 +137,16 @@ foreach my $group (@groups) { $group->{digests}->{$testname} = "differ"; my ($dll, $subtest) = split(/:/, $testname); my $crash = $test->{crash}; + my $filelimit = $test->{filelimit}; if (exists $test->{dllmissing}->{$dll}) { # Mark this test as missing because of a missing dll $test->{results}->{$testname} = ["dll missing", "-", "-", "-"]; } elsif (defined $crash && $testname gt $crash) { - # Mark this test as missing because of what looks like a winetest crash. - # The cause of that is most likely a partial report file. + # Mark this test as missing because of a winetest crash. $test->{results}->{$testname} = ["winetest crash", "-", "-", "-"]; + } elsif (defined $filelimit && $testname gt $filelimit) { + # Mark this test as missing because of a partial report file. + $test->{results}->{$testname} = ["file limit", "-", "-", "-"]; } else { # Mark this test as missing for an unknown reason $test->{results}->{$testname} = ["test missing", "-", "-", "-"]; @@ -234,7 +239,8 @@ sub singletest { my $file = "$test->{dir}/$testname.txt"; my ($count, $todo, $error, $skipped) = @{$test->{results}->{$testname}}; if ($count eq "failed") { - my $msg = $todo eq "-"?"crash": + my $msg = $todo eq "crash"?"crash": + $todo eq "filelimit"?"file limit": $todo == 258?"timeout":"failed"; my $fail = -r "$datadir/$build/$file"?"<a href=\"$file\">$msg</a>":$msg; print OUT " <td class=\"note\">$fail</td>\n"; @@ -253,6 +259,13 @@ EOF onMouseOver="Test did not run as winetest crashed"; >.</a></td> EOF + } elsif ($count eq "file limit") { + print OUT <<"EOF"; + <td class="skip_fail"><a + title="Test is missing because of a partial report file" + onMouseOver="Test is missing because of a partial report file"; + >.</a></td> +EOF } elsif ($count eq "test missing") { print OUT <<"EOF"; <td class="skip_fail"><a Index: tools/winetest/winetest.cgi diff -u -p tools/winetest/winetest.cgi:1.8 tools/winetest/winetest.cgi:1.9 --- tools/winetest/winetest.cgi:1.8 8 Aug 2007 21:43: 2 -0000 +++ tools/winetest/winetest.cgi 8 Aug 2007 21:43: 2 -0000 @@ -17,7 +17,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA use strict; -use vars qw/$queuedir/; +use vars qw/$queuedir $maxfilesize/; BEGIN { require "winetest.conf"; @@ -26,8 +26,8 @@ BEGIN { use File::Temp qw(tempdir); use CGI qw(:standard); -# This should be in line with programs\winetest\send.c -$CGI::POST_MAX = 1.5 * 1024 * 1025; +# Cater for some overhead +$CGI::POST_MAX = $maxfilesize + 1024; my $name = param ("reportfile"); my $error = cgi_error (); Index: tools/winetest/winetest.conf diff -u -p tools/winetest/winetest.conf:1.4 tools/winetest/winetest.conf:1.5 --- tools/winetest/winetest.conf:1.4 8 Aug 2007 21:43: 2 -0000 +++ tools/winetest/winetest.conf 8 Aug 2007 21:43: 2 -0000 @@ -1,6 +1,6 @@ # Hey Emacs! This is a -*-cperl-*- file! -$root = "/home/laxdragon/wine/tools/winetest"; +$root = "/wine/winetest"; $builds = "$root/winetest.builds"; # These two below should be on the same filesystem $queuedir = "$root/queue"; @@ -12,4 +12,8 @@ $maxmult = 10; # File version number $fileversion = 4; +# Maximum size of the report file +# This should be in line with programs\winetest\send.c +$maxfilesize = 1.5 * 1024 * 1024; + 1; # keep require happy

1 0

Luis C. Busquets Pérez : dpnlobby: Add dpnlobby that forwards to dpnet.dll.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 5996c1324a8764f7f46dc1bcff27632201d67fc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5996c1324a8764f7f46dc1bcf… Author: Luis C. Busquets Pérez <luis.busquets(a)ilidium.com> Date: Thu Aug 2 11:04:50 2007 +0200 dpnlobby: Add dpnlobby that forwards to dpnet.dll. --- .gitignore | 1 + Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/dpnlobby/Makefile.in | 12 ++++++++++++ dlls/dpnlobby/dpnlobby.spec | 1 + dlls/dpnlobby/version.rc | 26 ++++++++++++++++++++++++++ 8 files changed, 47 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 94a13c9..e141f2d 100644 --- a/.gitignore +++ b/.gitignore @@ -226,6 +226,7 @@ dlls/dpnaddr/version.res dlls/dpnet/libdpnet.def dlls/dpnet/version.res dlls/dpnhpast/version.res +dlls/dpnlobby/version.res dlls/dsound/libdsound.def dlls/dsound/tests/*.ok dlls/dsound/tests/dsound_crosstest.exe diff --git a/Makefile.in b/Makefile.in index 774249c..4c8b99e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -225,6 +225,7 @@ ALL_MAKEFILES = \ dlls/dpnaddr/Makefile \ dlls/dpnet/Makefile \ dlls/dpnhpast/Makefile \ + dlls/dpnlobby/Makefile \ dlls/dsound/Makefile \ dlls/dsound/tests/Makefile \ dlls/dswave/Makefile \ @@ -591,6 +592,7 @@ dlls/dplayx/tests/Makefile: dlls/dplayx/tests/Makefile.in dlls/Maketest.rules dlls/dpnaddr/Makefile: dlls/dpnaddr/Makefile.in dlls/Makedll.rules dlls/dpnet/Makefile: dlls/dpnet/Makefile.in dlls/Makedll.rules dlls/dpnhpast/Makefile: dlls/dpnhpast/Makefile.in dlls/Makedll.rules +dlls/dpnlobby/Makefile: dlls/dpnlobby/Makefile.in dlls/Makedll.rules dlls/dsound/Makefile: dlls/dsound/Makefile.in dlls/Makedll.rules dlls/dsound/tests/Makefile: dlls/dsound/tests/Makefile.in dlls/Maketest.rules dlls/dswave/Makefile: dlls/dswave/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 23dfa4b..2175a09 100755 --- a/configure +++ b/configure @@ -20400,6 +20400,8 @@ ac_config_files="$ac_config_files dlls/dpnet/Makefile" ac_config_files="$ac_config_files dlls/dpnhpast/Makefile" +ac_config_files="$ac_config_files dlls/dpnlobby/Makefile" + ac_config_files="$ac_config_files dlls/dsound/Makefile" ac_config_files="$ac_config_files dlls/dsound/tests/Makefile" @@ -21601,6 +21603,7 @@ do "dlls/dpnaddr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnaddr/Makefile" ;; "dlls/dpnet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnet/Makefile" ;; "dlls/dpnhpast/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnhpast/Makefile" ;; + "dlls/dpnlobby/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnlobby/Makefile" ;; "dlls/dsound/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dsound/Makefile" ;; "dlls/dsound/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dsound/tests/Makefile" ;; "dlls/dswave/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dswave/Makefile" ;; diff --git a/configure.ac b/configure.ac index ec6ff71..6adff61 100644 --- a/configure.ac +++ b/configure.ac @@ -1626,6 +1626,7 @@ AC_CONFIG_FILES([dlls/dplayx/tests/Makefile]) AC_CONFIG_FILES([dlls/dpnaddr/Makefile]) AC_CONFIG_FILES([dlls/dpnet/Makefile]) AC_CONFIG_FILES([dlls/dpnhpast/Makefile]) +AC_CONFIG_FILES([dlls/dpnlobby/Makefile]) AC_CONFIG_FILES([dlls/dsound/Makefile]) AC_CONFIG_FILES([dlls/dsound/tests/Makefile]) AC_CONFIG_FILES([dlls/dswave/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 2a7b7b8..d51f783 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -69,6 +69,7 @@ BASEDIRS = \ dpnaddr \ dpnet \ dpnhpast \ + dpnlobby \ dsound \ dswave \ dwmapi \ diff --git a/dlls/dpnlobby/Makefile.in b/dlls/dpnlobby/Makefile.in new file mode 100644 index 0000000..d8a5f50 --- /dev/null +++ b/dlls/dpnlobby/Makefile.in @@ -0,0 +1,12 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = dpnlobby.dll +IMPORTS = dpnet kernel32 + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/dpnlobby/dpnlobby.spec b/dlls/dpnlobby/dpnlobby.spec new file mode 100644 index 0000000..8ff8e0c --- /dev/null +++ b/dlls/dpnlobby/dpnlobby.spec @@ -0,0 +1 @@ +@ stdcall DirectPlay8LobbyCreate(ptr ptr ptr) dpnet.DirectPlay8Create diff --git a/dlls/dpnlobby/version.rc b/dlls/dpnlobby/version.rc new file mode 100644 index 0000000..d91ebaa --- /dev/null +++ b/dlls/dpnlobby/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2004 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine DpnLobby dll" +#define WINE_FILENAME_STR "dpnlobby.dll" +#define WINE_FILEVERSION 5,3,2600,2180 +#define WINE_FILEVERSION_STR "5.3.2600.2180" +#define WINE_PRODUCTVERSION 5,3,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.3.2600.2180" + +#include "wine/wine_common_ver.rc"

1 0

Peter Dons Tychsen : dinput: Allow the use of the standard Joystick GUID when calling CreateDevice.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 2cea950e9930a7d22a6467758a758c16d46e718f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cea950e9930a7d22a6467758… Author: Peter Dons Tychsen <donpedro(a)dhcppc2> Date: Sun Jul 29 21:21:17 2007 +0200 dinput: Allow the use of the standard Joystick GUID when calling CreateDevice. --- dlls/dinput/joystick_linux.c | 35 +++++++++++++------ dlls/dinput/joystick_linuxinput.c | 69 ++++++++++++++++++++++--------------- 2 files changed, 65 insertions(+), 39 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 4b1165f..f155f18 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -159,7 +159,6 @@ static INT find_joystick_devices(void) return joystick_devices_count; } -#undef MAX_JOYSTICKS static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { @@ -400,7 +399,8 @@ static HRESULT setup_dinput_options(JoystickImpl * device) return DI_OK; } -static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *dinput, LPDIRECTINPUTDEVICEA* pdev) +static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *dinput, + LPDIRECTINPUTDEVICEA* pdev, unsigned short index) { DWORD i; JoystickImpl* newDevice; @@ -416,7 +416,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di return DIERR_OUTOFMEMORY; } - if (!lstrcpynA(newDevice->dev, joystick_devices[rguid->Data3], sizeof(newDevice->dev)) || + if (!lstrcpynA(newDevice->dev, joystick_devices[index], sizeof(newDevice->dev)) || (newDevice->joyfd = open(newDevice->dev, O_RDONLY)) < 0) { WARN("open(%s, O_RDONLY) failed: %s\n", newDevice->dev, strerror(errno)); @@ -561,7 +561,10 @@ FAILED1: return hr; } -static BOOL IsJoystickGUID(REFGUID guid) +/****************************************************************************** + * get_joystick_index : Get the joystick index from a given GUID + */ +static unsigned short get_joystick_index(REFGUID guid) { GUID wine_joystick = DInput_Wine_Joystick_GUID; GUID dev_guid = *guid; @@ -569,19 +572,26 @@ static BOOL IsJoystickGUID(REFGUID guid) wine_joystick.Data3 = 0; dev_guid.Data3 = 0; - return IsEqualGUID(&wine_joystick, &dev_guid); + /* for the standard joystick GUID use index 0 */ + if(IsEqualGUID(&GUID_Joystick,guid)) return 0; + + /* for the wine joystick GUIDs use the index stored in Data3 */ + if(IsEqualGUID(&wine_joystick, &dev_guid)) return guid->Data3; + + return MAX_JOYSTICKS; } static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEA* pdev) { - if ((IsEqualGUID(&GUID_Joystick,rguid)) || - (IsJoystickGUID(rguid))) { + unsigned short index; + + if ((index = get_joystick_index(rguid)) < MAX_JOYSTICKS) { if ((riid == NULL) || IsEqualGUID(&IID_IDirectInputDeviceA,riid) || IsEqualGUID(&IID_IDirectInputDevice2A,riid) || IsEqualGUID(&IID_IDirectInputDevice7A,riid) || IsEqualGUID(&IID_IDirectInputDevice8A,riid)) { - return alloc_device(rguid, &JoystickAvt, dinput, pdev); + return alloc_device(rguid, &JoystickAvt, dinput, pdev, index); } else { WARN("no interface\n"); *pdev = 0; @@ -596,14 +606,15 @@ static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, RE static HRESULT joydev_create_deviceW(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEW* pdev) { - if ((IsEqualGUID(&GUID_Joystick,rguid)) || - (IsJoystickGUID(rguid))) { + unsigned short index; + + if ((index = get_joystick_index(rguid)) < MAX_JOYSTICKS) { if ((riid == NULL) || IsEqualGUID(&IID_IDirectInputDeviceW,riid) || IsEqualGUID(&IID_IDirectInputDevice2W,riid) || IsEqualGUID(&IID_IDirectInputDevice7W,riid) || IsEqualGUID(&IID_IDirectInputDevice8W,riid)) { - return alloc_device(rguid, &JoystickWvt, dinput, (LPDIRECTINPUTDEVICEA *)pdev); + return alloc_device(rguid, &JoystickWvt, dinput, (LPDIRECTINPUTDEVICEA *)pdev, index); } else { WARN("no interface\n"); *pdev = 0; @@ -616,6 +627,8 @@ static HRESULT joydev_create_deviceW(IDirectInputImpl *dinput, REFGUID rguid, RE return DIERR_DEVICENOTREG; } +#undef MAX_JOYSTICKS + const struct dinput_device joystick_linux_device = { "Wine Linux joystick driver", joydev_enum_deviceA, diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 5ef0ea7..21b77d6 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -239,6 +239,7 @@ static void find_joydevs(void) } if (fd!=-1) { + if ((-1==ioctl(fd,EVIOCGBIT(0,sizeof(joydev.evbits)),joydev.evbits))) { perror("EVIOCGBIT 0"); close(fd); @@ -391,7 +392,7 @@ static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN return FALSE; } -static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *dinput, struct JoyDev *joydev) +static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *dinput, unsigned short index) { JoystickImpl* newDevice; LPDIDATAFORMAT df = NULL; @@ -407,7 +408,7 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->base.crit"); newDevice->joyfd = -1; newDevice->base.dinput = dinput; - newDevice->joydev = joydev; + newDevice->joydev = &joydevs[index]; #ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION newDevice->ff_state = FF_STATUS_STOPPED; #endif @@ -475,22 +476,39 @@ failed: return NULL; } +/****************************************************************************** + * get_joystick_index : Get the joystick index from a given GUID + */ +static unsigned short get_joystick_index(REFGUID guid) +{ + GUID wine_joystick = DInput_Wine_Joystick_Base_GUID; + GUID dev_guid = *guid; + + wine_joystick.Data3 = 0; + dev_guid.Data3 = 0; + + /* for the standard joystick GUID use index 0 */ + if(IsEqualGUID(&GUID_Joystick,guid)) return 0; + + /* for the wine joystick GUIDs use the index stored in Data3 */ + if(IsEqualGUID(&wine_joystick, &dev_guid)) return guid->Data3 - DInput_Wine_Joystick_Base_GUID.Data3; + + return MAX_JOYDEV; +} + static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEA* pdev) { - int i; + unsigned short index; - find_joydevs(); + find_joydevs(); - for (i=0; i<have_joydevs; i++) { - if (IsEqualGUID(&GUID_Joystick,rguid) || - IsEqualGUID(&joydevs[i].guid,rguid) - ) { + if ((index = get_joystick_index(rguid)) < MAX_JOYDEV) { if ((riid == NULL) || - IsEqualGUID(&IID_IDirectInputDeviceA,riid) || - IsEqualGUID(&IID_IDirectInputDevice2A,riid) || - IsEqualGUID(&IID_IDirectInputDevice7A,riid) || - IsEqualGUID(&IID_IDirectInputDevice8A,riid)) { - *pdev = (IDirectInputDeviceA*) alloc_device(rguid, &JoystickAvt, dinput, &joydevs[i]); + IsEqualGUID(&IID_IDirectInputDeviceA,riid) || + IsEqualGUID(&IID_IDirectInputDevice2A,riid) || + IsEqualGUID(&IID_IDirectInputDevice7A,riid) || + IsEqualGUID(&IID_IDirectInputDevice8A,riid)) { + *pdev = (IDirectInputDeviceA*) alloc_device(rguid, &JoystickAvt, dinput, index); TRACE("Creating a Joystick device (%p)\n", *pdev); if (*pdev==0) { ERR("out of memory\n"); @@ -501,28 +519,24 @@ static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, RE return DIERR_NOINTERFACE; } } - } - return DIERR_DEVICENOTREG; + return DIERR_DEVICENOTREG; } static HRESULT joydev_create_deviceW(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEW* pdev) { - int i; + unsigned short index; - find_joydevs(); + find_joydevs(); - for (i=0; i<have_joydevs; i++) { - if (IsEqualGUID(&GUID_Joystick,rguid) || - IsEqualGUID(&joydevs[i].guid,rguid) - ) { + if ((index = get_joystick_index(rguid)) < MAX_JOYDEV) { if ((riid == NULL) || - IsEqualGUID(&IID_IDirectInputDeviceW,riid) || - IsEqualGUID(&IID_IDirectInputDevice2W,riid) || - IsEqualGUID(&IID_IDirectInputDevice7W,riid) || - IsEqualGUID(&IID_IDirectInputDevice8W,riid)) { - *pdev = (IDirectInputDeviceW*) alloc_device(rguid, &JoystickWvt, dinput, &joydevs[i]); + IsEqualGUID(&IID_IDirectInputDeviceW,riid) || + IsEqualGUID(&IID_IDirectInputDevice2W,riid) || + IsEqualGUID(&IID_IDirectInputDevice7W,riid) || + IsEqualGUID(&IID_IDirectInputDevice8W,riid)) { + *pdev = (IDirectInputDeviceW*) alloc_device(rguid, &JoystickWvt, dinput, index); TRACE("Creating a Joystick device (%p)\n", *pdev); if (*pdev==0) { ERR("out of memory\n"); @@ -533,9 +547,8 @@ static HRESULT joydev_create_deviceW(IDirectInputImpl *dinput, REFGUID rguid, RE return DIERR_NOINTERFACE; } } - } - return DIERR_DEVICENOTREG; + return DIERR_DEVICENOTREG; } const struct dinput_device joystick_linuxinput_device = {

1 0

Luis C. Busquets Pérez : kernel32: Export RestoreLastError.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: a02ccd9a15ef6749be04cc6803ab905886a1de87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a02ccd9a15ef6749be04cc680… Author: Luis C. Busquets Pérez <luis.busquets(a)ilidium.com> Date: Thu Aug 2 12:37:22 2007 +0200 kernel32: Export RestoreLastError. --- dlls/kernel32/kernel32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d30ec36..1032b01 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -901,7 +901,7 @@ @ stdcall RequestWakeupLatency(long) @ stdcall ResetEvent(long) @ stub ResetWriteWatch -# @ stub RestoreLastError ( -> ntdll.RtlRestoreLastWin32Error) +@ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) # @ stub RtlCaptureContext ( -> ntdll.RtlCaptureContext) # @ stub RtlCaptureStackBackTrace ( -> ntdll.RtlCaptureStackBackTrace)

1 0

Rob Shearman : urlmon: Implement URLOpenBlockingStreamA/ W and URLOpenStreamA/W.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 9debcb8f49a97d5db3a4d24e5f3eb13c367590d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9debcb8f49a97d5db3a4d24e5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Aug 3 22:11:31 2007 +0100 urlmon: Implement URLOpenBlockingStreamA/W and URLOpenStreamA/W. --- dlls/urlmon/umstream.c | 241 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 227 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index ec2b306..9ebf232 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -379,6 +379,173 @@ static const IStreamVtbl stvt = }; +typedef struct ProxyBindStatusCallback +{ + const IBindStatusCallbackVtbl *lpVtbl; + + IBindStatusCallback *pBSC; +} ProxyBindStatusCallback; + +static HRESULT WINAPI ProxyBindStatusCallback_QueryInterface(IBindStatusCallback *iface, REFIID riid, void **ppv) +{ + if (IsEqualGUID(&IID_IBindStatusCallback, riid) || + IsEqualGUID(&IID_IUnknown, riid)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ProxyBindStatusCallback_AddRef(IBindStatusCallback *iface) +{ + return 2; +} + +static ULONG WINAPI ProxyBindStatusCallback_Release(IBindStatusCallback *iface) +{ + return 1; +} + +static HRESULT WINAPI ProxyBindStatusCallback_OnStartBinding(IBindStatusCallback *iface, DWORD dwReserved, + IBinding *pib) +{ + ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + return IBindStatusCallback_OnStartBinding(This->pBSC, dwReserved, pib); +} + +static HRESULT WINAPI ProxyBindStatusCallback_GetPriority(IBindStatusCallback *iface, LONG *pnPriority) +{ + ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + return IBindStatusCallback_GetPriority(This->pBSC, pnPriority); +} + +static HRESULT WINAPI ProxyBindStatusCallback_OnLowResource(IBindStatusCallback *iface, DWORD reserved) +{ + ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + return IBindStatusCallback_OnLowResource(This->pBSC, reserved); +} + +static HRESULT WINAPI ProxyBindStatusCallback_OnProgress(IBindStatusCallback *iface, ULONG ulProgress, + ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) +{ + ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + return IBindStatusCallback_OnProgress(This->pBSC, ulProgress, + ulProgressMax, ulStatusCode, + szStatusText); +} + +static HRESULT WINAPI ProxyBindStatusCallback_OnStopBinding(IBindStatusCallback *iface, HRESULT hresult, LPCWSTR szError) +{ + ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + return IBindStatusCallback_OnStopBinding(This->pBSC, hresult, szError); +} + +static HRESULT WINAPI ProxyBindStatusCallback_GetBindInfo(IBindStatusCallback *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) +{ + ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + return IBindStatusCallback_GetBindInfo(This->pBSC, grfBINDF, pbindinfo); +} + +static HRESULT WINAPI ProxyBindStatusCallback_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF, + DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) +{ + ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + return IBindStatusCallback_OnDataAvailable(This->pBSC, grfBSCF, dwSize, + pformatetc, pstgmed); +} + +static HRESULT WINAPI ProxyBindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface, REFIID riid, IUnknown *punk) +{ + ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + return IBindStatusCallback_OnObjectAvailable(This->pBSC, riid, punk); +} + +static HRESULT WINAPI BlockingBindStatusCallback_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF, + DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) +{ + return S_OK; +} + +static const IBindStatusCallbackVtbl BlockingBindStatusCallbackVtbl = +{ + ProxyBindStatusCallback_QueryInterface, + ProxyBindStatusCallback_AddRef, + ProxyBindStatusCallback_Release, + ProxyBindStatusCallback_OnStartBinding, + ProxyBindStatusCallback_GetPriority, + ProxyBindStatusCallback_OnLowResource, + ProxyBindStatusCallback_OnProgress, + ProxyBindStatusCallback_OnStopBinding, + ProxyBindStatusCallback_GetBindInfo, + BlockingBindStatusCallback_OnDataAvailable, + ProxyBindStatusCallback_OnObjectAvailable +}; + +static HRESULT WINAPI AsyncBindStatusCallback_GetBindInfo(IBindStatusCallback *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) +{ + ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + HRESULT hr = IBindStatusCallback_GetBindInfo(This->pBSC, grfBINDF, pbindinfo); + *grfBINDF |= BINDF_PULLDATA | BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE; + return hr; +} + +static const IBindStatusCallbackVtbl AsyncBindStatusCallbackVtbl = +{ + ProxyBindStatusCallback_QueryInterface, + ProxyBindStatusCallback_AddRef, + ProxyBindStatusCallback_Release, + ProxyBindStatusCallback_OnStartBinding, + ProxyBindStatusCallback_GetPriority, + ProxyBindStatusCallback_OnLowResource, + ProxyBindStatusCallback_OnProgress, + ProxyBindStatusCallback_OnStopBinding, + AsyncBindStatusCallback_GetBindInfo, + ProxyBindStatusCallback_OnDataAvailable, + ProxyBindStatusCallback_OnObjectAvailable +}; + +static HRESULT URLStartDownload(LPCWSTR szURL, LPSTREAM *ppStream, IBindStatusCallback *pBSC) +{ + HRESULT hr; + IMoniker *pMoniker; + IBindCtx *pbc; + + *ppStream = NULL; + + hr = CreateURLMoniker(NULL, szURL, &pMoniker); + if (FAILED(hr)) + return hr; + + hr = CreateBindCtx(0, &pbc); + if (FAILED(hr)) + { + IMoniker_Release(pMoniker); + return hr; + } + + hr = RegisterBindStatusCallback(pbc, pBSC, NULL, 0); + if (FAILED(hr)) + { + IBindCtx_Release(pbc); + IMoniker_Release(pMoniker); + return hr; + } + + hr = IMoniker_BindToStorage(pMoniker, pbc, NULL, &IID_IStream, (void **)ppStream); + + /* BindToStorage returning E_PENDING because it's asynchronous is not an error */ + if (hr == E_PENDING) hr = S_OK; + + IBindCtx_Release(pbc); + IMoniker_Release(pMoniker); + + return hr; +} + /*********************************************************************** * URLOpenBlockingStreamA (URLMON.@) */ @@ -386,9 +553,23 @@ HRESULT WINAPI URLOpenBlockingStreamA(LPUNKNOWN pCaller, LPCSTR szURL, LPSTREAM *ppStream, DWORD dwReserved, LPBINDSTATUSCALLBACK lpfnCB) { - FIXME("(%p, %s, %p, 0x%x, %p): stub\n", pCaller, szURL, ppStream, dwReserved, lpfnCB); - *ppStream = NULL; - return E_NOTIMPL; + LPWSTR szURLW; + int len; + HRESULT hr; + + TRACE("(%p, %s, %p, 0x%x, %p)\n", pCaller, szURL, ppStream, dwReserved, lpfnCB); + + len = MultiByteToWideChar(CP_ACP, 0, szURL, -1, NULL, 0); + szURLW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!szURLW) + return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, szURL, -1, szURLW, len); + + hr = URLOpenBlockingStreamW(pCaller, szURLW, ppStream, dwReserved, lpfnCB); + + HeapFree(GetProcessHeap(), 0, szURLW); + + return hr; } /*********************************************************************** @@ -398,29 +579,61 @@ HRESULT WINAPI URLOpenBlockingStreamW(LPUNKNOWN pCaller, LPCWSTR szURL, LPSTREAM *ppStream, DWORD dwReserved, LPBINDSTATUSCALLBACK lpfnCB) { - FIXME("(%p, %s, %p, 0x%x, %p): stub\n", pCaller, debugstr_w(szURL), ppStream, + ProxyBindStatusCallback blocking_bsc; + + TRACE("(%p, %s, %p, 0x%x, %p)\n", pCaller, debugstr_w(szURL), ppStream, dwReserved, lpfnCB); - *ppStream = NULL; - return E_NOTIMPL; + + blocking_bsc.lpVtbl = &BlockingBindStatusCallbackVtbl; + blocking_bsc.pBSC = lpfnCB; + + return URLStartDownload(szURL, ppStream, (IBindStatusCallback *)&blocking_bsc); } /*********************************************************************** -* URLOpenStreamA (URLMON.@) -*/ + * URLOpenStreamA (URLMON.@) + */ HRESULT WINAPI URLOpenStreamA(LPUNKNOWN pCaller, LPCSTR szURL, DWORD dwReserved, LPBINDSTATUSCALLBACK lpfnCB) { - FIXME("(%p, %s, 0x%x, %p): stub\n", pCaller, szURL, dwReserved, lpfnCB); - return E_NOTIMPL; + LPWSTR szURLW; + int len; + HRESULT hr; + + TRACE("(%p, %s, 0x%x, %p)\n", pCaller, szURL, dwReserved, lpfnCB); + + len = MultiByteToWideChar(CP_ACP, 0, szURL, -1, NULL, 0); + szURLW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!szURLW) + return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, szURL, -1, szURLW, len); + + hr = URLOpenStreamW(pCaller, szURLW, dwReserved, lpfnCB); + + HeapFree(GetProcessHeap(), 0, szURLW); + + return hr; } /*********************************************************************** -* URLOpenStreamW (URLMON.@) -*/ + * URLOpenStreamW (URLMON.@) + */ HRESULT WINAPI URLOpenStreamW(LPUNKNOWN pCaller, LPCWSTR szURL, DWORD dwReserved, LPBINDSTATUSCALLBACK lpfnCB) { - FIXME("(%p, %s, 0x%x, %p): stub\n", pCaller, debugstr_w(szURL), dwReserved, + HRESULT hr; + ProxyBindStatusCallback async_bsc; + IStream *pStream; + + TRACE("(%p, %s, 0x%x, %p)\n", pCaller, debugstr_w(szURL), dwReserved, lpfnCB); - return E_NOTIMPL; + + async_bsc.lpVtbl = &AsyncBindStatusCallbackVtbl; + async_bsc.pBSC = lpfnCB; + + hr = URLStartDownload(szURL, &pStream, (IBindStatusCallback *)&async_bsc); + if (SUCCEEDED(hr) && pStream) + IStream_Release(pStream); + + return hr; }

1 0

Paul Vriens : advapi32/tests: Fix typo.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: a5aab7fae69f818f4c90c372ebc332e1ce9930ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5aab7fae69f818f4c90c372e… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Aug 8 11:28:06 2007 +0200 advapi32/tests: Fix typo. --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a30faf2..1595930 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1431,7 +1431,7 @@ static void test_granted_access(HANDLE handle, ACCESS_MASK access, int line) status = pNtQueryObject( handle, ObjectBasicInformation, &obj_info, sizeof(obj_info), NULL ); ok_(__FILE__, line)(!status, "NtQueryObject with err: %08x\n", status); - ok_(__FILE__, line)(obj_info.GrantedAccess == access, "Gratned access should " + ok_(__FILE__, line)(obj_info.GrantedAccess == access, "Granted access should " "be 0x%08x, instead of 0x%08x\n", access, obj_info.GrantedAccess); }

1 0

Rob Shearman : urlmon: Add tests for URLOpenStreamW and URLOpenBlockingStreamW.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: a5da813f5a2f9ba7ebe3a3adb2123f2deb22861e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5da813f5a2f9ba7ebe3a3adb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Aug 3 22:13:12 2007 +0100 urlmon: Add tests for URLOpenStreamW and URLOpenBlockingStreamW. --- dlls/urlmon/tests/Makefile.in | 1 + dlls/urlmon/tests/stream.c | 364 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 365 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5da813f5a2f9ba7ebe3a…

1 0

Rob Shearman : urlmon: Check some of the input parameters to URLOpenStreamA /W & URLOpenBlockingStreamA/W for NULL.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 086a91facf5cf6e3ad1939a3023210de830c2916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=086a91facf5cf6e3ad1939a30… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Aug 3 22:14:15 2007 +0100 urlmon: Check some of the input parameters to URLOpenStreamA/W & URLOpenBlockingStreamA/W for NULL. Add tests for these. --- dlls/urlmon/tests/stream.c | 8 ++++++++ dlls/urlmon/umstream.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/stream.c b/dlls/urlmon/tests/stream.c index fd2a720..12133f9 100644 --- a/dlls/urlmon/tests/stream.c +++ b/dlls/urlmon/tests/stream.c @@ -297,6 +297,11 @@ static void test_URLOpenBlockingStreamW(void) IStream *pStream; char buffer[256]; + hr = URLOpenBlockingStreamW(NULL, NULL, &pStream, 0, &BindStatusCallback); + ok(hr == E_INVALIDARG, "URLOpenBlockingStreamW should have failed with E_INVALIDARG instead of 0x%08x\n", hr); + hr = URLOpenBlockingStreamW(NULL, INDEX_HTML, NULL, 0, &BindStatusCallback); + ok(hr == E_INVALIDARG, "URLOpenBlockingStreamW should have failed with E_INVALIDARG instead of 0x%08x\n", hr); + SET_EXPECT(GetBindInfo); SET_EXPECT(QueryInterface_IServiceProvider); SET_EXPECT(OnStartBinding); @@ -331,6 +336,9 @@ static void test_URLOpenStreamW(void) { HRESULT hr; + hr = URLOpenStreamW(NULL, NULL, 0, &BindStatusCallback); + ok(hr == E_INVALIDARG, "URLOpenStreamW should have failed with E_INVALIDARG instead of 0x%08x\n", hr); + SET_EXPECT(GetBindInfo); SET_EXPECT(QueryInterface_IServiceProvider); SET_EXPECT(OnStartBinding); diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index 9ebf232..213608f 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -559,10 +559,16 @@ HRESULT WINAPI URLOpenBlockingStreamA(LPUNKNOWN pCaller, LPCSTR szURL, TRACE("(%p, %s, %p, 0x%x, %p)\n", pCaller, szURL, ppStream, dwReserved, lpfnCB); + if (!szURL || !ppStream) + return E_INVALIDARG; + len = MultiByteToWideChar(CP_ACP, 0, szURL, -1, NULL, 0); szURLW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!szURLW) + { + *ppStream = NULL; return E_OUTOFMEMORY; + } MultiByteToWideChar(CP_ACP, 0, szURL, -1, szURLW, len); hr = URLOpenBlockingStreamW(pCaller, szURLW, ppStream, dwReserved, lpfnCB); @@ -584,6 +590,9 @@ HRESULT WINAPI URLOpenBlockingStreamW(LPUNKNOWN pCaller, LPCWSTR szURL, TRACE("(%p, %s, %p, 0x%x, %p)\n", pCaller, debugstr_w(szURL), ppStream, dwReserved, lpfnCB); + if (!szURL || !ppStream) + return E_INVALIDARG; + blocking_bsc.lpVtbl = &BlockingBindStatusCallbackVtbl; blocking_bsc.pBSC = lpfnCB; @@ -602,6 +611,9 @@ HRESULT WINAPI URLOpenStreamA(LPUNKNOWN pCaller, LPCSTR szURL, DWORD dwReserved, TRACE("(%p, %s, 0x%x, %p)\n", pCaller, szURL, dwReserved, lpfnCB); + if (!szURL) + return E_INVALIDARG; + len = MultiByteToWideChar(CP_ACP, 0, szURL, -1, NULL, 0); szURLW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!szURLW) @@ -628,6 +640,9 @@ HRESULT WINAPI URLOpenStreamW(LPUNKNOWN pCaller, LPCWSTR szURL, DWORD dwReserved TRACE("(%p, %s, 0x%x, %p)\n", pCaller, debugstr_w(szURL), dwReserved, lpfnCB); + if (!szURL) + return E_INVALIDARG; + async_bsc.lpVtbl = &AsyncBindStatusCallbackVtbl; async_bsc.pBSC = lpfnCB;

1 0