Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[gvg] 18769: Tag 2.18.3
by gvg＠svn.reactos.com 25 Oct '05

25 Oct '05

Tag 2.18.3 Added: vendor/bugzilla/2.18.3/ _____ Copied: vendor/bugzilla/2.18.3 (from rev 18768, vendor/bugzilla/current)

1 0

[gvg] 18768: Bugzilla 2.18.3 vendor drop
by gvg＠svn.reactos.com 25 Oct '05

25 Oct '05

Bugzilla 2.18.3 vendor drop Added: vendor/bugzilla/ Added: vendor/bugzilla/current/ Added: vendor/bugzilla/current/1x1.gif Added: vendor/bugzilla/current/Bugzilla/ Added: vendor/bugzilla/current/Bugzilla/.cvsignore Added: vendor/bugzilla/current/Bugzilla/Attachment.pm Added: vendor/bugzilla/current/Bugzilla/Auth/ Added: vendor/bugzilla/current/Bugzilla/Auth/CGI.pm Added: vendor/bugzilla/current/Bugzilla/Auth/Cookie.pm Added: vendor/bugzilla/current/Bugzilla/Auth/DB.pm Added: vendor/bugzilla/current/Bugzilla/Auth/LDAP.pm Added: vendor/bugzilla/current/Bugzilla/Auth.pm Added: vendor/bugzilla/current/Bugzilla/Bug.pm Added: vendor/bugzilla/current/Bugzilla/BugMail.pm Added: vendor/bugzilla/current/Bugzilla/CGI.pm Added: vendor/bugzilla/current/Bugzilla/Chart.pm Added: vendor/bugzilla/current/Bugzilla/Config.pm Added: vendor/bugzilla/current/Bugzilla/Constants.pm Added: vendor/bugzilla/current/Bugzilla/DB.pm Added: vendor/bugzilla/current/Bugzilla/Error.pm Added: vendor/bugzilla/current/Bugzilla/Flag.pm Added: vendor/bugzilla/current/Bugzilla/FlagType.pm Added: vendor/bugzilla/current/Bugzilla/RelationSet.pm Added: vendor/bugzilla/current/Bugzilla/Search.pm Added: vendor/bugzilla/current/Bugzilla/Series.pm Added: vendor/bugzilla/current/Bugzilla/Template/ Added: vendor/bugzilla/current/Bugzilla/Template/Plugin/ Added: vendor/bugzilla/current/Bugzilla/Template/Plugin/Bugzilla.pm Added: vendor/bugzilla/current/Bugzilla/Template/Plugin/Hook.pm Added: vendor/bugzilla/current/Bugzilla/Template.pm Added: vendor/bugzilla/current/Bugzilla/Token.pm Added: vendor/bugzilla/current/Bugzilla/User.pm Added: vendor/bugzilla/current/Bugzilla/Util.pm Added: vendor/bugzilla/current/Bugzilla.pm Added: vendor/bugzilla/current/CGI.pl Added: vendor/bugzilla/current/QUICKSTART Added: vendor/bugzilla/current/README Added: vendor/bugzilla/current/UPGRADING Added: vendor/bugzilla/current/UPGRADING-pre-2.8 Added: vendor/bugzilla/current/ant.jpg Added: vendor/bugzilla/current/attachment.cgi Added: vendor/bugzilla/current/buglist.cgi Added: vendor/bugzilla/current/bugzilla.dtd Added: vendor/bugzilla/current/chart.cgi Added: vendor/bugzilla/current/checksetup.pl Added: vendor/bugzilla/current/colchange.cgi Added: vendor/bugzilla/current/collectstats.pl Added: vendor/bugzilla/current/config.cgi Added: vendor/bugzilla/current/contrib/ Added: vendor/bugzilla/current/contrib/BugzillaEmail.pm Added: vendor/bugzilla/current/contrib/README Added: vendor/bugzilla/current/contrib/README.Mailif Added: vendor/bugzilla/current/contrib/bug_email.pl Added: vendor/bugzilla/current/contrib/bugmail_help.html Added: vendor/bugzilla/current/contrib/bugzilla-submit/ Added: vendor/bugzilla/current/contrib/bugzilla-submit/README Added: vendor/bugzilla/current/contrib/bugzilla-submit/bugdata.txt Added: vendor/bugzilla/current/contrib/bugzilla-submit/bugzilla-submit Added: vendor/bugzilla/current/contrib/bugzilla-submit/bugzilla-submit.xml Added: vendor/bugzilla/current/contrib/bugzilla.procmailrc Added: vendor/bugzilla/current/contrib/bugzilla_email_append.pl Added: vendor/bugzilla/current/contrib/bugzilla_ldapsync.rb Added: vendor/bugzilla/current/contrib/cmdline/ Added: vendor/bugzilla/current/contrib/cmdline/bugcount Added: vendor/bugzilla/current/contrib/cmdline/bugids Added: vendor/bugzilla/current/contrib/cmdline/buglist Added: vendor/bugzilla/current/contrib/cmdline/bugs Added: vendor/bugzilla/current/contrib/cmdline/bugslink Added: vendor/bugzilla/current/contrib/cmdline/makequery Added: vendor/bugzilla/current/contrib/cmdline/query.conf Added: vendor/bugzilla/current/contrib/cvs-update.pl Added: vendor/bugzilla/current/contrib/gnats2bz.pl Added: vendor/bugzilla/current/contrib/gnatsparse/ Added: vendor/bugzilla/current/contrib/gnatsparse/README Added: vendor/bugzilla/current/contrib/gnatsparse/gnatsparse.py Added: vendor/bugzilla/current/contrib/gnatsparse/magic.py Added: vendor/bugzilla/current/contrib/gnatsparse/specialuu.py Added: vendor/bugzilla/current/contrib/jb2bz.py Added: vendor/bugzilla/current/contrib/mysqld-watcher.pl Added: vendor/bugzilla/current/contrib/sendbugmail.pl Added: vendor/bugzilla/current/contrib/sendunsentbugmail.pl Added: vendor/bugzilla/current/contrib/syncLDAP.pl Added: vendor/bugzilla/current/contrib/yp_nomail.sh Added: vendor/bugzilla/current/createaccount.cgi Added: vendor/bugzilla/current/css/ Added: vendor/bugzilla/current/css/buglist.css Added: vendor/bugzilla/current/css/duplicates.css Added: vendor/bugzilla/current/css/global.css Added: vendor/bugzilla/current/css/panel.css Added: vendor/bugzilla/current/css/show_multiple.css Added: vendor/bugzilla/current/defparams.pl Added: vendor/bugzilla/current/describecomponents.cgi Added: vendor/bugzilla/current/describekeywords.cgi Added: vendor/bugzilla/current/docs/ Added: vendor/bugzilla/current/docs/.cvsignore Added: vendor/bugzilla/current/docs/README.docs Added: vendor/bugzilla/current/docs/html/ Added: vendor/bugzilla/current/docs/html/Bugzilla-Guide.html Added: vendor/bugzilla/current/docs/html/about.html Added: vendor/bugzilla/current/docs/html/administration.html [truncated at 100 lines; 364 more skipped] _____ Added: vendor/bugzilla/current/1x1.gif (Binary files differ) Property changes on: vendor/bugzilla/current/1x1.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: vendor/bugzilla/current/Bugzilla/.cvsignore --- vendor/bugzilla/current/Bugzilla/.cvsignore 2005-10-25 14:03:20 UTC (rev 18767) +++ vendor/bugzilla/current/Bugzilla/.cvsignore 2005-10-25 15:05:06 UTC (rev 18768) @@ -0,0 +1 @@ +.htaccess Property changes on: vendor/bugzilla/current/Bugzilla/.cvsignore ___________________________________________________________________ Name: svn:eol-style + native _____ Added: vendor/bugzilla/current/Bugzilla/Attachment.pm --- vendor/bugzilla/current/Bugzilla/Attachment.pm 2005-10-25 14:03:20 UTC (rev 18767) +++ vendor/bugzilla/current/Bugzilla/Attachment.pm 2005-10-25 15:05:06 UTC (rev 18768) @@ -0,0 +1,108 @@ +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Terry Weissman <terry(a)mozilla.org> +# Myk Melez <myk(a)mozilla.org> + +####################################################################### ##### +# Module Initialization +####################################################################### ##### + +use strict; + +package Bugzilla::Attachment; + +# This module requires that its caller have said "require CGI.pl" to import +# relevant functions from that script and its companion globals.pl. + +# Use the Flag module to handle flags. +use Bugzilla::Flag; + +####################################################################### ##### +# Functions +####################################################################### ##### + +sub new { + # Returns a hash of information about the attachment with the given ID. + + my ($invocant, $id) = @_; + return undef if !$id; + my $self = { 'id' => $id }; + my $class = ref($invocant) || $invocant; + bless($self, $class); + + &::PushGlobalSQLState(); + &::SendSQL("SELECT 1, description, bug_id, isprivate FROM attachments " . + "WHERE attach_id = $id"); + ($self->{'exists'}, + $self->{'summary'}, + $self->{'bug_id'}, + $self->{'isprivate'}) = &::FetchSQLData(); + &::PopGlobalSQLState(); + + return $self; +} + +sub query +{ + # Retrieves and returns an array of attachment records for a given bug. + # This data should be given to attachment/list.atml in an + # "attachments" variable. + my ($bugid) = @_; + + my $in_editbugs = &::UserInGroup("editbugs"); + &::SendSQL("SELECT product_id + FROM bugs + WHERE bug_id = $bugid"); + my $productid = &::FetchOneColumn(); + my $caneditproduct = &::CanEditProductId($productid); + + # Retrieve a list of attachments for this bug and write them into an array + # of hashes in which each hash represents a single attachment. + &::SendSQL(" + SELECT attach_id, DATE_FORMAT(creation_ts, '%Y.%m.%d %H:%i'), + mimetype, description, ispatch, isobsolete, isprivate, + submitter_id, LENGTH(thedata) + FROM attachments WHERE bug_id = $bugid ORDER BY attach_id + "); + my @attachments = (); + while (&::MoreSQLData()) { + my %a; + my $submitter_id; + ($a{'attachid'}, $a{'date'}, $a{'contenttype'}, $a{'description'}, + $a{'ispatch'}, $a{'isobsolete'}, $a{'isprivate'}, $submitter_id, + $a{'datasize'}) = &::FetchSQLData(); + + # Retrieve a list of flags for this attachment. + $a{'flags'} = Bugzilla::Flag::match({ 'attach_id' => $a{'attachid'}, + 'is_active' => 1 }); + + # We will display the edit link if the user can edit the attachment; + # ie the are the submitter, or they have canedit. + # Also show the link if the user is not logged in - in that cae, + # They'll be prompted later + $a{'canedit'} = ($::userid == 0 || (($submitter_id == $::userid || + $in_editbugs) && $caneditproduct)); + push @attachments, \%a; + } + + return \@attachments; +} + +1; Property changes on: vendor/bugzilla/current/Bugzilla/Attachment.pm ___________________________________________________________________ Name: svn:eol-style + native _____ Added: vendor/bugzilla/current/Bugzilla/Auth/CGI.pm --- vendor/bugzilla/current/Bugzilla/Auth/CGI.pm 2005-10-25 14:03:20 UTC (rev 18767) +++ vendor/bugzilla/current/Bugzilla/Auth/CGI.pm 2005-10-25 15:05:06 UTC (rev 18768) @@ -0,0 +1,247 @@ +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Terry Weissman <terry(a)mozilla.org> +# Dan Mosedale <dmose(a)mozilla.org> +# Joe Robins <jmrobins(a)tgix.com> +# Dave Miller <justdave(a)syndicomm.com> +# Christopher Aillon <christopher(a)aillon.com> +# Gervase Markham <gerv(a)gerv.net> +# Christian Reis <kiko(a)async.com.br> +# Bradley Baetz <bbaetz(a)acm.org> + +package Bugzilla::Auth::CGI; + +use strict; + +use Bugzilla::Config; +use Bugzilla::Constants; +use Bugzilla::Error; +use Bugzilla::Util; + +sub login { + my ($class, $type) = @_; + + # 'NORMAL' logins depend on the 'requirelogin' param + if ($type == LOGIN_NORMAL) { + $type = Param('requirelogin') ? LOGIN_REQUIRED : LOGIN_OPTIONAL; + } + + my $cgi = Bugzilla->cgi; + + # First, try the actual login method against form variables + my $username = $cgi->param("Bugzilla_login"); + my $passwd = $cgi->param("Bugzilla_password"); + + $cgi->delete('Bugzilla_login', 'Bugzilla_password'); + + my $authmethod = Param("loginmethod"); + my ($authres, $userid, $extra, $info) = + Bugzilla::Auth->authenticate($username, $passwd); + + if ($authres == AUTH_OK) { + # Login via username/password was correct and valid, so create + # and send out the login cookies + my $ipaddr = $cgi->remote_addr; + unless ($cgi->param('Bugzilla_restrictlogin') || + Param('loginnetmask') == 32) { + $ipaddr = Bugzilla::Auth::get_netaddr($ipaddr); + } + + # The IP address is valid, at least for comparing with itself in a + # subsequent login + trick_taint($ipaddr); + + my $dbh = Bugzilla->dbh; + $dbh->do("INSERT INTO logincookies (userid, ipaddr) VALUES (?, ?)", + undef, + $userid, $ipaddr); + my $logincookie = $dbh->selectrow_array("SELECT LAST_INSERT_ID()"); + + # Remember cookie only if admin has told so + # or admin didn't forbid it and user told to remember. + if ((Param('rememberlogin') eq 'on') || + ((Param('rememberlogin') ne 'off') && + ($cgi->param('Bugzilla_remember') eq 'on'))) { + $cgi->send_cookie(-name => 'Bugzilla_login', + -value => $userid, + -expires => 'Fri, 01-Jan-2038 00:00:00 GMT'); + $cgi->send_cookie(-name => 'Bugzilla_logincookie', + -value => $logincookie, + -expires => 'Fri, 01-Jan-2038 00:00:00 GMT'); + + } + else { + $cgi->send_cookie(-name => 'Bugzilla_login', + -value => $userid); + $cgi->send_cookie(-name => 'Bugzilla_logincookie', + -value => $logincookie); + + } + } + elsif ($authres == AUTH_NODATA) { + # No data from the form, so try to login via cookies + $username = $cgi->cookie("Bugzilla_login"); + $passwd = $cgi->cookie("Bugzilla_logincookie"); + + require Bugzilla::Auth::Cookie; + my $authmethod = "Cookie"; + + ($authres, $userid, $extra) = + Bugzilla::Auth::Cookie->authenticate($username, $passwd); + + # If the data for the cookie was incorrect, then treat that as + # NODATA. This could occur if the user's IP changed, for example. + # Give them un-loggedin access if allowed (checked below) + $authres = AUTH_NODATA if $authres == AUTH_LOGINFAILED; + } + + # Now check the result + + # An error may have occurred with the login mechanism + if ($authres == AUTH_ERROR) { + ThrowCodeError("auth_err", + { authmethod => lc($authmethod), + userid => $userid, + auth_err_tag => $extra, + info => $info + }); + } + + # We can load the page if the login was ok, or there was no data + # but a login wasn't required + if ($authres == AUTH_OK || + ($authres == AUTH_NODATA && $type == LOGIN_OPTIONAL)) { + + # login succeded, so we're done + return $userid; + } + + # No login details were given, but we require a login if the + # page does + if ($authres == AUTH_NODATA && $type == LOGIN_REQUIRED) { + # Throw up the login page + + print Bugzilla->cgi->header(); + + my $template = Bugzilla->template; + $template->process("account/auth/login.html.tmpl", + { 'target' => $cgi->url(-relative=>1), + 'form' => \%::FORM, + 'mform' => \%::MFORM, + 'caneditaccount' => Bugzilla::Auth->can_edit, + } + ) + || ThrowTemplateError($template->error()); + + # This seems like as good as time as any to get rid of old + # crufty junk in the logincookies table. Get rid of any entry + # that hasn't been used in a month. + Bugzilla->dbh->do("DELETE FROM logincookies " . + "WHERE TO_DAYS(NOW()) - TO_DAYS(lastused) > 30"); + + exit; + } + + # The username/password may be wrong + # Don't let the user know whether the username exists or whether + # the password was just wrong. (This makes it harder for a cracker + # to find account names by brute force) + if ($authres == AUTH_LOGINFAILED) { + ThrowUserError("invalid_username_or_password"); + } + + # The account may be disabled + if ($authres == AUTH_DISABLED) { + clear_browser_cookies(); + # and throw a user error + ThrowUserError("account_disabled", + {'disabled_reason' => $extra}); + } + + # If we get here, then we've run out of options, which shouldn't happen + ThrowCodeError("authres_unhandled", { authres => $authres, + type => $type, }); +} + +# Logs user out, according to the option provided; this consists of +# removing entries from logincookies for the specified $user. +sub logout { + my ($class, $user, $option) = @_; + my $dbh = Bugzilla->dbh; + $option = LOGOUT_ALL unless defined $option; + + if ($option == LOGOUT_ALL) { + $dbh->do("DELETE FROM logincookies WHERE userid = ?", + undef, $user->id); + return; + } + + # The LOGOUT_*_CURRENT options require a cookie + my $cookie = Bugzilla->cgi->cookie("Bugzilla_logincookie"); + detaint_natural($cookie); + + # These queries use both the cookie ID and the user ID as keys. Even + # though we know the userid must match, we still check it in the SQL + # as a sanity check, since there is no locking here, and if the user + # logged out from two machines simultaneously, while someone else + # logged in and got the same cookie, we could be logging the other + # user out here. Yes, this is very very very unlikely, but why take + # chances? - bbaetz + if ($option == LOGOUT_KEEP_CURRENT) { + $dbh->do("DELETE FROM logincookies WHERE cookie != ? AND userid = ?", + undef, $cookie, $user->id); + } elsif ($option == LOGOUT_CURRENT) { + $dbh->do("DELETE FROM logincookies WHERE cookie = ? AND userid = ?", + undef, $cookie, $user->id); + } else { + die("Invalid option $option supplied to logout()"); + } +} + +sub clear_browser_cookies { + my $cgi = Bugzilla->cgi; + $cgi->remove_cookie('Bugzilla_login'); + $cgi->remove_cookie('Bugzilla_logincookie'); +} + +1; + +__END__ + +=head1 NAME + +Bugzilla::Auth::CGI - CGI-based logins for Bugzilla + +=head1 SUMMARY + +This is a L<login module|Bugzilla::Auth/"LOGIN"> for Bugzilla. Users connecting +from a CGI script use this module to authenticate. Logouts are also handled here. + +=head1 BEHAVIOUR + +Users are first authenticated against the default authentication handler, +using the CGI parameters I<Bugzilla_login> and I<Bugzilla_password>. + +If no data is present for that, then cookies are tried, using +L<Bugzilla::Auth::Cookie>. + +=head1 SEE ALSO + +L<Bugzilla::Auth> Property changes on: vendor/bugzilla/current/Bugzilla/Auth/CGI.pm ___________________________________________________________________ Name: svn:eol-style + native _____ Added: vendor/bugzilla/current/Bugzilla/Auth/Cookie.pm --- vendor/bugzilla/current/Bugzilla/Auth/Cookie.pm 2005-10-25 14:03:20 UTC (rev 18767) +++ vendor/bugzilla/current/Bugzilla/Auth/Cookie.pm 2005-10-25 15:05:06 UTC (rev 18768) @@ -0,0 +1,113 @@ +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Terry Weissman <terry(a)mozilla.org> +# Dan Mosedale <dmose(a)mozilla.org> +# Joe Robins <jmrobins(a)tgix.com> +# Dave Miller <justdave(a)syndicomm.com> +# Christopher Aillon <christopher(a)aillon.com> +# Gervase Markham <gerv(a)gerv.net> +# Christian Reis <kiko(a)async.com.br> +# Bradley Baetz <bbaetz(a)acm.org> + +package Bugzilla::Auth::Cookie; + +use strict; + +use Bugzilla::Auth; +use Bugzilla::Config; +use Bugzilla::Constants; +use Bugzilla::Util; + +sub authenticate { + my ($class, $login, $login_cookie) = @_; + + return (AUTH_NODATA) unless defined $login && defined $login_cookie; + + my $cgi = Bugzilla->cgi; + + my $ipaddr = $cgi->remote_addr(); + my $netaddr = Bugzilla::Auth::get_netaddr($ipaddr); + + # Anything goes for these params - they're just strings which + # we're going to verify against the db + trick_taint($login); + trick_taint($login_cookie); + trick_taint($ipaddr); + + my $query = "SELECT profiles.userid, profiles.disabledtext " . + "FROM logincookies, profiles " . + "WHERE logincookies.cookie=? AND " . + " logincookies.userid=profiles.userid AND " . + " logincookies.userid=? AND " . + " (logincookies.ipaddr=?"; + my @params = ($login_cookie, $login, $ipaddr); + if (defined $netaddr) { + trick_taint($netaddr); + $query .= " OR logincookies.ipaddr=?"; + push(@params, $netaddr); + } + $query .= ")"; + + my $dbh = Bugzilla->dbh; + my ($userid, $disabledtext) = $dbh->selectrow_array($query, undef, @params); + + return (AUTH_DISABLED, $userid, $disabledtext) + if ($disabledtext); + + if ($userid) { + # If we logged in successfully, then update the lastused time on the + # login cookie + $dbh->do("UPDATE logincookies SET lastused=NULL WHERE cookie=?", + undef, + $login_cookie); + + return (AUTH_OK, $userid); + } + + # If we get here, then the login failed. + return (AUTH_LOGINFAILED); +} + +1; + +__END__ + +=head1 NAME + +Bugzilla::Cookie - cookie authentication for Bugzilla + +=head1 SUMMARY + +This is an L<authentication module|Bugzilla::Auth/"AUTHENTICATION"> for +Bugzilla, which logs the user in using a persistent cookie stored in the +C<logincookies> table. + +The actual password is not stored in the cookie; only the userid and a +I<logincookie> (which is used to reverify the login without requiring the +password to be sent over the network) are. These I<logincookies> are +restricted to certain IP addresses as a security meaure. The exact +restriction can be specified by the admin via the C<loginnetmask> parameter. + +This module does not ever send a cookie (It has no way of knowing when a user +is successfully logged in). Instead L<Bugzilla::Auth::CGI> handles this. + +=head1 SEE ALSO + +L<Bugzilla::Auth>, L<Bugzilla::Auth::CGI> Property changes on: vendor/bugzilla/current/Bugzilla/Auth/Cookie.pm ___________________________________________________________________ Name: svn:eol-style + native _____ Added: vendor/bugzilla/current/Bugzilla/Auth/DB.pm --- vendor/bugzilla/current/Bugzilla/Auth/DB.pm 2005-10-25 14:03:20 UTC (rev 18767) +++ vendor/bugzilla/current/Bugzilla/Auth/DB.pm 2005-10-25 15:05:06 UTC (rev 18768) @@ -0,0 +1,124 @@ +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Terry Weissman <terry(a)mozilla.org> +# Dan Mosedale <dmose(a)mozilla.org> +# Joe Robins <jmrobins(a)tgix.com> +# Dave Miller <justdave(a)syndicomm.com> +# Christopher Aillon <christopher(a)aillon.com> +# Gervase Markham <gerv(a)gerv.net> +# Christian Reis <kiko(a)async.com.br> +# Bradley Baetz <bbaetz(a)acm.org> + +package Bugzilla::Auth::DB; + +use strict; + +use Bugzilla::Config; +use Bugzilla::Constants; +use Bugzilla::Util; + +sub authenticate { + my ($class, $username, $passwd) = @_; + + return (AUTH_NODATA) unless defined $username && defined $passwd; + + # We're just testing against the db: any value is ok + trick_taint($username); + + my $userid = $class->get_id_from_username($username); + return (AUTH_LOGINFAILED) unless defined $userid; + + return (AUTH_LOGINFAILED, $userid) + unless $class->check_password($userid, $passwd); + + # The user's credentials are okay, so delete any outstanding + # password tokens they may have generated. + require Bugzilla::Token; + Bugzilla::Token::DeletePasswordTokens($userid, "user_logged_in"); + + # Account may have been disabled + my $disabledtext = $class->get_disabled($userid); + return (AUTH_DISABLED, $userid, $disabledtext) + if $disabledtext ne ''; + + return (AUTH_OK, $userid); +} + +sub can_edit { return 1; } + +sub get_id_from_username { + my ($class, $username) = @_; + my $dbh = Bugzilla->dbh; + my $sth = $dbh->prepare_cached("SELECT userid FROM profiles " . + "WHERE login_name=?"); + my ($userid) = $dbh->selectrow_array($sth, undef, $username); + return $userid; +} + +sub get_disabled { + my ($class, $userid) = @_; + my $dbh = Bugzilla->dbh; + my $sth = $dbh->prepare_cached("SELECT disabledtext FROM profiles " . + "WHERE userid=?"); + my ($text) = $dbh->selectrow_array($sth, undef, $userid); + return $text; +} + +sub check_password { + my ($class, $userid, $passwd) = @_; + my $dbh = Bugzilla->dbh; + my $sth = $dbh->prepare_cached("SELECT cryptpassword FROM profiles " . + "WHERE userid=?"); + my ($realcryptpwd) = $dbh->selectrow_array($sth, undef, $userid); + + # Get the salt from the user's crypted password. + my $salt = $realcryptpwd; + + # Using the salt, crypt the password the user entered. + my $enteredCryptedPassword = crypt($passwd, $salt); + + return $enteredCryptedPassword eq $realcryptpwd; +} + +sub change_password { + my ($class, $userid, $password) = @_; + my $dbh = Bugzilla->dbh; + my $cryptpassword = Crypt($password); + $dbh->do("UPDATE profiles SET cryptpassword = ? WHERE userid = ?", + undef, $cryptpassword, $userid); +} + +1; + +__END__ + +=head1 NAME + +Bugzilla::Auth::DB - database authentication for Bugzilla + +=head1 SUMMARY + +This is an L<authentication module|Bugzilla::Auth/"AUTHENTICATION"> for +Bugzilla, which logs the user in using the password stored in the C<profiles> +table. This is the most commonly used authentication module. + +=head1 SEE ALSO + +L<Bugzilla::Auth> Property changes on: vendor/bugzilla/current/Bugzilla/Auth/DB.pm ___________________________________________________________________ Name: svn:eol-style + native _____ Added: vendor/bugzilla/current/Bugzilla/Auth/LDAP.pm --- vendor/bugzilla/current/Bugzilla/Auth/LDAP.pm 2005-10-25 14:03:20 UTC (rev 18767) +++ vendor/bugzilla/current/Bugzilla/Auth/LDAP.pm 2005-10-25 15:05:06 UTC (rev 18768) @@ -0,0 +1,185 @@ +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Terry Weissman <terry(a)mozilla.org> +# Dan Mosedale <dmose(a)mozilla.org> +# Joe Robins <jmrobins(a)tgix.com> +# Dave Miller <justdave(a)syndicomm.com> +# Christopher Aillon <christopher(a)aillon.com> +# Gervase Markham <gerv(a)gerv.net> +# Christian Reis <kiko(a)async.com.br> +# Bradley Baetz <bbaetz(a)acm.org> + +package Bugzilla::Auth::LDAP; + +use strict; + +use Bugzilla::Config; +use Bugzilla::Constants; + +use Net::LDAP; + +sub authenticate { + my ($class, $username, $passwd) = @_; + + # If no password was provided, then fail the authentication. + # While it may be valid to not have an LDAP password, when you + # bind without a password (regardless of the binddn value), you + # will get an anonymous bind. I do not know of a way to determine + # whether a bind is anonymous or not without making changes to the + # LDAP access control settings + return (AUTH_NODATA) unless $username && $passwd; + + # We need to bind anonymously to the LDAP server. This is + # because we need to get the Distinguished Name of the user trying + # to log in. Some servers (such as iPlanet) allow you to have unique + # uids spread out over a subtree of an area (such as "People"), so + # just appending the Base DN to the uid isn't sufficient to get the + # user's DN. For servers which don't work this way, there will still + # be no harm done. + my $LDAPserver = Param("LDAPserver"); + if ($LDAPserver eq "") { + return (AUTH_ERROR, undef, "server_not_defined"); + } + + my $LDAPport = "389"; # default LDAP port + if($LDAPserver =~ /:/) { + ($LDAPserver, $LDAPport) = split(":",$LDAPserver); + } + my $LDAPconn = Net::LDAP->new($LDAPserver, port => $LDAPport, version => 3); + if(!$LDAPconn) { + return (AUTH_ERROR, undef, "connect_failed"); + } + + my $mesg; + if (Param("LDAPbinddn")) { + my ($LDAPbinddn,$LDAPbindpass) = split(":",Param("LDAPbinddn")); + $mesg = $LDAPconn->bind($LDAPbinddn, password => $LDAPbindpass); + } + else { + $mesg = $LDAPconn->bind(); + } + if($mesg->code) { + return (AUTH_ERROR, undef, + "connect_failed", + { errstr => $mesg->error }); + } + + # We've got our anonymous bind; let's look up this user. + $mesg = $LDAPconn->search( base => Param("LDAPBaseDN"), + scope => "sub", + filter => '(&(' . Param("LDAPuidattribute") . "=$username)" . Param("LDAPfilter") . ')', + attrs => ['dn'], + ); + return (AUTH_LOGINFAILED, undef, "lookup_failure") + unless $mesg->count; + + # Now we get the DN from this search. + my $userDN = $mesg->shift_entry->dn; + + # Now we attempt to bind as the specified user. + $mesg = $LDAPconn->bind( $userDN, password => $passwd); + + return (AUTH_LOGINFAILED) if $mesg->code; + + # And now we're going to repeat the search, so that we can get the + # mail attribute for this user. + $mesg = $LDAPconn->search( base => Param("LDAPBaseDN"), + scope => "sub", + filter => '(&(' . Param("LDAPuidattribute") . "=$username)" . Param("LDAPfilter") . ')', + ); + my $user_entry = $mesg->shift_entry if !$mesg->code && $mesg->count; + if(!$user_entry || !$user_entry->exists(Param("LDAPmailattribute"))) { + return (AUTH_ERROR, undef, + "cannot_retreive_attr", + { attr => Param("LDAPmailattribute") }); + } + + # get the mail attribute + $username = $user_entry->get_value(Param("LDAPmailattribute")); + # OK, so now we know that the user is valid. Lets try finding them in the + # Bugzilla database + + # XXX - should this part be made more generic, and placed in + # Bugzilla::Auth? Lots of login mechanisms may have to do this, although + # until we actually get some more, its hard to know - BB + + my $dbh = Bugzilla->dbh; + my $sth = $dbh->prepare_cached("SELECT userid, disabledtext " . + "FROM profiles " . + "WHERE login_name=?"); + my ($userid, $disabledtext) = + $dbh->selectrow_array($sth, + undef, + $username); + + # If the user doesn't exist, then they need to be added + unless ($userid) { + # We'll want the user's name for this. + my $userRealName = $user_entry->get_value("displayName"); + if($userRealName eq "") { + $userRealName = $user_entry->get_value("cn"); + } + &::InsertNewUser($username, $userRealName); + + ($userid, $disabledtext) = $dbh->selectrow_array($sth, + undef, + $username); + return (AUTH_ERROR, $userid, "no_userid") + unless $userid; + } + + # we're done, so disconnect + $LDAPconn->unbind; + + # Test for disabled account + return (AUTH_DISABLED, $userid, $disabledtext) + if $disabledtext ne ''; + + # If we get to here, then the user is allowed to login, so we're done! + return (AUTH_OK, $userid); +} + +sub can_edit { return 0; } + +1; + +__END__ + +=head1 NAME + +Bugzilla::Auth::LDAP - LDAP based authentication for Bugzilla + +This is an L<authentication module|Bugzilla::Auth/"AUTHENTICATION"> for +Bugzilla, which logs the user in using an LDAP directory. + +=head1 DISCLAIMER + +B<This module is experimental>. It is poorly documented, and not very flexible. +Search L<http://bugzilla.mozilla.org/> for a list of known LDAP bugs. + +None of the core Bugzilla developers, nor any of the large installations, use +this module, and so it has received less testing. (In fact, this iteration +hasn't been tested at all) + +Patches are accepted. + +=head1 SEE ALSO + +L<Bugzilla::Auth> Property changes on: vendor/bugzilla/current/Bugzilla/Auth/LDAP.pm ___________________________________________________________________ Name: svn:eol-style + native _____ Added: vendor/bugzilla/current/Bugzilla/Auth.pm --- vendor/bugzilla/current/Bugzilla/Auth.pm 2005-10-25 14:03:20 UTC (rev 18767) +++ vendor/bugzilla/current/Bugzilla/Auth.pm 2005-10-25 15:05:06 UTC (rev 18768) @@ -0,0 +1,254 @@ +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Bradley Baetz <bbaetz(a)acm.org> + +package Bugzilla::Auth; + +use strict; + +use Bugzilla::Config; +use Bugzilla::Constants; + +# 'inherit' from the main loginmethod +BEGIN { + my $loginmethod = Param("loginmethod"); + if ($loginmethod =~ /^([A-Za-z0-9_\.\-]+)$/) { + $loginmethod = $1; + } + else { + die "Badly-named loginmethod '$loginmethod'"; + } + require "Bugzilla/Auth/" . $loginmethod . ".pm"; + + our @ISA; + push (@ISA, "Bugzilla::Auth::" . $loginmethod); +} + +# PRIVATE + +# Returns the network address for a given ip +sub get_netaddr { + my $ipaddr = shift; + + # Check for a valid IPv4 addr which we know how to parse + if (!$ipaddr || $ipaddr !~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) { + return undef; + } + + my $addr = unpack("N", pack("CCCC", split(/\./, $ipaddr))); + + my $maskbits = Param('loginnetmask'); + + $addr >>= (32-$maskbits); + $addr <<= (32-$maskbits); + return join(".", unpack("CCCC", pack("N", $addr))); +} + +1; + +__END__ + +=head1 NAME + +Bugzilla::Auth - Authentication handling for Bugzilla users + +=head1 DESCRIPTION + +Handles authentication for Bugzilla users. + +Authentication from Bugzilla involves two sets of modules. One set is +used to obtain the data (from CGI, email, etc), and the other set uses +this data to authenticate against the datasource (the Bugzilla DB, LDAP, +cookies, etc). + +The handlers for the various types of authentication +(DB/LDAP/cookies/etc) provide the actual code for each specific method +of authentication. + +The source modules (currently, only +L<Bugzilla::Auth::CGI|Bugzilla::Auth::CGI>) then use those methods to do +the authentication. + +I<Bugzilla::Auth> itself inherits from the default authentication handler, +identified by the I<loginmethod> param. + +=head1 METHODS + +C<Bugzilla::Auth> contains several helper methods to be used by +authentication or login modules. + +=over 4 + +=item C<Bugzilla::Auth::get_netaddr($ipaddr)> + +Given an ip address, this returns the associated network address, using +C<Param('loginnetmask')> as the netmask. This can be used to obtain data +in order to restrict weak authentication methods (such as cookies) to +only some addresses. + +=back + +=head1 AUTHENTICATION + +Authentication modules check a user's credentials (username, password, +etc) to verify who the user is. + +=head2 METHODS + +=over 4 + +=item C<authenticate($username, $pass)> + +This method is passed a username and a password, and returns a list +containing up to four return values, depending on the results of the +authentication. + +The first return value is one of the status codes defined in +L<Bugzilla::Constants|Bugzilla::Constants> and described below. The +rest of the return values are status code-specific and are explained in +the status code descriptions. + +=over 4 + +=item C<AUTH_OK> + +Authentication succeeded. The second variable is the userid of the new +user. + +=item C<AUTH_NODATA> + +Insufficient login data was provided by the user. This may happen in several +cases, such as cookie authentication when the cookie is not present. + +=item C<AUTH_ERROR> + +An error occurred when trying to use the login mechanism. The second return +value may contain the Bugzilla userid, but will probably be C<undef>, +signifiying that the userid is unknown. The third value is a tag describing +the error used by the authentication error templates to print a description +to the user. The optional fourth argument is a hashref of values used as part +of the tag's error descriptions. + +This error template must have a name/location of +I<account/auth/C<lc(authentication-type)>-error.html.tmpl>. + +=item C<AUTH_LOGINFAILED> + +An incorrect username or password was given. Note that for security reasons, +both cases return the same error code. However, in the case of a valid +username, the second argument may be the userid. The authentication [truncated at 1000 lines; 163053 more skipped]

1 0

[mbosma] 18767: Implement some COM-related functions.
by mbosma＠svn.reactos.com 25 Oct '05

25 Oct '05

Implement some COM-related functions. Modified: trunk/reactos/lib/ddraw/main/clipper.c Modified: trunk/reactos/lib/ddraw/main/color.c Modified: trunk/reactos/lib/ddraw/main/ddraw.c Modified: trunk/reactos/lib/ddraw/main/gamma.c Modified: trunk/reactos/lib/ddraw/main/palette.c Modified: trunk/reactos/lib/ddraw/main.c _____ Modified: trunk/reactos/lib/ddraw/main/clipper.c --- trunk/reactos/lib/ddraw/main/clipper.c 2005-10-24 23:46:55 UTC (rev 18766) +++ trunk/reactos/lib/ddraw/main/clipper.c 2005-10-25 14:03:20 UTC (rev 18767) @@ -11,14 +11,34 @@ #include "rosdraw.h" -HRESULT WINAPI Main_DirectDrawClipper_SetHwnd( - LPDIRECTDRAWCLIPPER iface, DWORD dwFlags, HWND hWnd) +ULONG WINAPI Main_DirectDrawClipper_Release(LPDIRECTDRAWCLIPPER iface) { - DX_STUB; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; } -ULONG WINAPI Main_DirectDrawClipper_Release(LPDIRECTDRAWCLIPPER iface) +ULONG WINAPI Main_DirectDrawClipper_AddRef (LPDIRECTDRAWCLIPPER iface) { + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + ULONG ref = InterlockedIncrement((PLONG)&This->DirectDrawGlobal.dwRefCnt); + + return ref; +} + +HRESULT WINAPI Main_DirectDrawClipper_Initialize( + LPDIRECTDRAWCLIPPER iface, LPDIRECTDRAW lpDD, DWORD dwFlags) +{ + return DD_OK; +} + +HRESULT WINAPI Main_DirectDrawClipper_SetHwnd( + LPDIRECTDRAWCLIPPER iface, DWORD dwFlags, HWND hWnd) +{ DX_STUB; } @@ -41,23 +61,12 @@ DX_STUB; } -ULONG WINAPI Main_DirectDrawClipper_AddRef (LPDIRECTDRAWCLIPPER iface) -{ - DX_STUB; -} - HRESULT WINAPI Main_DirectDrawClipper_GetHWnd( LPDIRECTDRAWCLIPPER iface, HWND* hWndPtr) { DX_STUB; } -HRESULT WINAPI Main_DirectDrawClipper_Initialize( - LPDIRECTDRAWCLIPPER iface, LPDIRECTDRAW lpDD, DWORD dwFlags) -{ - DX_STUB; -} - HRESULT WINAPI Main_DirectDrawClipper_IsClipListChanged( LPDIRECTDRAWCLIPPER iface, BOOL* lpbChanged) { _____ Modified: trunk/reactos/lib/ddraw/main/color.c --- trunk/reactos/lib/ddraw/main/color.c 2005-10-24 23:46:55 UTC (rev 18766) +++ trunk/reactos/lib/ddraw/main/color.c 2005-10-25 14:03:20 UTC (rev 18767) @@ -10,22 +10,31 @@ #include "rosdraw.h" -HRESULT WINAPI -Main_DirectDrawColorControl_QueryInterface(LPDIRECTDRAWCOLORCONTROL iface, - REFIID riid, LPVOID* ppvObj) -{ - DX_STUB; -} - ULONG WINAPI Main_DirectDrawColorControl_AddRef(LPDIRECTDRAWCOLORCONTROL iface) { - DX_STUB; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + ULONG ref = InterlockedIncrement((PLONG)&This->DirectDrawGlobal.dwRefCnt); + + return ref; } ULONG WINAPI Main_DirectDrawColorControl_Release(LPDIRECTDRAWCOLORCONTROL iface) { + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +HRESULT WINAPI +Main_DirectDrawColorControl_QueryInterface(LPDIRECTDRAWCOLORCONTROL iface, + REFIID riid, LPVOID* ppvObj) +{ DX_STUB; } _____ Modified: trunk/reactos/lib/ddraw/main/ddraw.c --- trunk/reactos/lib/ddraw/main/ddraw.c 2005-10-24 23:46:55 UTC (rev 18766) +++ trunk/reactos/lib/ddraw/main/ddraw.c 2005-10-25 14:03:20 UTC (rev 18767) @@ -125,33 +125,6 @@ return DD_OK; } -HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, - LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) -{ - if (pUnkOuter!=NULL) - return DDERR_INVALIDPARAMS; - - if(sizeof(DDSURFACEDESC2)!=pDDSD->dwSize) - return DDERR_UNSUPPORTED; - - // the nasty com stuff - IDirectDrawSurfaceImpl* That; - - That = (IDirectDrawSurfaceImpl*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectDrawSurfaceImpl)); - - if (That == NULL) - return E_OUTOFMEMORY; - - That->lpVtbl = &DirectDrawSurface7_Vtable; - That->lpVtbl_v3 = &DDRAW_IDDS3_Thunk_VTable; - - That->ref = 1; - *ppSurf = (LPDIRECTDRAWSURFACE7)That; - - // the real surface object creation - return That->lpVtbl->Initialize (*ppSurf, (LPDIRECTDRAW)iface, pDDSD); -} - ULONG WINAPI Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface) { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; @@ -208,24 +181,91 @@ return S_OK; } -/**** Stubs ****/ +HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, + LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) +{ + if (pUnkOuter!=NULL) + return DDERR_INVALIDPARAMS; -HRESULT WINAPI Main_DirectDraw_Compact(LPDIRECTDRAW7 iface) -{ - DX_STUB; + if(sizeof(DDSURFACEDESC2)!=pDDSD->dwSize) + return DDERR_UNSUPPORTED; + + // the nasty com stuff + IDirectDrawSurfaceImpl* That; + + That = (IDirectDrawSurfaceImpl*)HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectDrawSurfaceImpl)); + + if (That == NULL) + return E_OUTOFMEMORY; + + ZeroMemory(That, sizeof(IDirectDrawSurfaceImpl)); + + That->lpVtbl = &DirectDrawSurface7_Vtable; + That->lpVtbl_v3 = &DDRAW_IDDS3_Thunk_VTable; + That->ref = 1; + + *ppSurf = (LPDIRECTDRAWSURFACE7)That; + + // the real surface object creation + return That->lpVtbl->Initialize (*ppSurf, (LPDIRECTDRAW)iface, pDDSD); } HRESULT WINAPI Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface, DWORD dwFlags, LPDIRECTDRAWCLIPPER *ppClipper, IUnknown *pUnkOuter) { - DX_STUB; + if (pUnkOuter!=NULL) + return DDERR_INVALIDPARAMS; + + IDirectDrawClipperImpl* That; + That = (IDirectDrawClipperImpl*)HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectDrawClipperImpl)); + + if (That == NULL) + return E_OUTOFMEMORY; + + ZeroMemory(That, sizeof(IDirectDrawClipperImpl)); + + That->lpVtbl = &DirectDrawClipper_Vtable; + That->ref = 1; + *ppClipper = (LPDIRECTDRAWCLIPPER)That; + + return That->lpVtbl->Initialize (*ppClipper, (LPDIRECTDRAW)iface, dwFlags); } + +// This function is exported by the dll +HRESULT WINAPI DirectDrawCreateClipper (DWORD dwFlags, + LPDIRECTDRAWCLIPPER* lplpDDClipper, LPUNKNOWN pUnkOuter) +{ + return Main_DirectDraw_CreateClipper(NULL, dwFlags, lplpDDClipper, pUnkOuter); +} + HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags, - LPPALETTEENTRY palent,LPDIRECTDRAWPALETTE* ppPalette,LPUNKNOWN pUnknown) + LPPALETTEENTRY palent, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN pUnkOuter) { - DX_STUB; + if (pUnkOuter!=NULL) + return DDERR_INVALIDPARAMS; + + IDirectDrawPaletteImpl* That; + That = (IDirectDrawPaletteImpl*)HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectDrawPaletteImpl)); + + if (That == NULL) + return E_OUTOFMEMORY; + + ZeroMemory(That, sizeof(IDirectDrawPaletteImpl)); + + That->lpVtbl = &DirectDrawPalette_Vtable; + That->ref = 1; + *ppPalette = (LPDIRECTDRAWPALETTE)That; + + return That->lpVtbl->Initialize (*ppPalette, (LPDIRECTDRAW)iface, dwFlags, palent); } +/**** Stubs ****/ + +HRESULT WINAPI Main_DirectDraw_Compact(LPDIRECTDRAW7 iface) +{ + DX_STUB; +} + HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 src, LPDIRECTDRAWSURFACE7* dst) { _____ Modified: trunk/reactos/lib/ddraw/main/gamma.c --- trunk/reactos/lib/ddraw/main/gamma.c 2005-10-24 23:46:55 UTC (rev 18766) +++ trunk/reactos/lib/ddraw/main/gamma.c 2005-10-25 14:03:20 UTC (rev 18767) @@ -10,23 +10,31 @@ #include "rosdraw.h" - -HRESULT WINAPI -Main_DirectDrawGammaControl_QueryInterface(LPDIRECTDRAWGAMMACONTROL iface, REFIID riid, - LPVOID *ppObj) -{ - DX_STUB; -} - ULONG WINAPI Main_DirectDrawGammaControl_AddRef(LPDIRECTDRAWGAMMACONTROL iface) { - DX_STUB; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + ULONG ref = InterlockedIncrement((PLONG)&This->DirectDrawGlobal.dwRefCnt); + + return ref; } ULONG WINAPI Main_DirectDrawGammaControl_Release(LPDIRECTDRAWGAMMACONTROL iface) { + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +HRESULT WINAPI +Main_DirectDrawGammaControl_QueryInterface(LPDIRECTDRAWGAMMACONTROL iface, REFIID riid, + LPVOID *ppObj) +{ DX_STUB; } _____ Modified: trunk/reactos/lib/ddraw/main/palette.c --- trunk/reactos/lib/ddraw/main/palette.c 2005-10-24 23:46:55 UTC (rev 18766) +++ trunk/reactos/lib/ddraw/main/palette.c 2005-10-25 14:03:20 UTC (rev 18767) @@ -10,42 +10,49 @@ #include "rosdraw.h" +ULONG WINAPI +Main_DirectDrawPalette_Release(LPDIRECTDRAWPALETTE iface) +{ + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + ULONG ref = InterlockedIncrement((PLONG)&This->DirectDrawGlobal.dwRefCnt); + return ref; +} + +ULONG WINAPI Main_DirectDrawPalette_AddRef(LPDIRECTDRAWPALETTE iface) +{ + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + HRESULT WINAPI -Main_DirectDrawPalette_GetEntries(LPDIRECTDRAWPALETTE iface, DWORD dwFlags, - DWORD dwStart, DWORD dwCount, +Main_DirectDrawPalette_Initialize(LPDIRECTDRAWPALETTE iface, + LPDIRECTDRAW ddraw, DWORD dwFlags, LPPALETTEENTRY palent) { - DX_STUB; + return DD_OK; } HRESULT WINAPI -Main_DirectDrawPalette_SetEntries(LPDIRECTDRAWPALETTE iface, DWORD dwFlags, +Main_DirectDrawPalette_GetEntries(LPDIRECTDRAWPALETTE iface, DWORD dwFlags, DWORD dwStart, DWORD dwCount, LPPALETTEENTRY palent) { DX_STUB; } -ULONG WINAPI -Main_DirectDrawPalette_Release(LPDIRECTDRAWPALETTE iface) -{ - DX_STUB; -} - -ULONG WINAPI Main_DirectDrawPalette_AddRef(LPDIRECTDRAWPALETTE iface) -{ - DX_STUB; -} - HRESULT WINAPI -Main_DirectDrawPalette_Initialize(LPDIRECTDRAWPALETTE iface, - LPDIRECTDRAW ddraw, DWORD dwFlags, +Main_DirectDrawPalette_SetEntries(LPDIRECTDRAWPALETTE iface, DWORD dwFlags, + DWORD dwStart, DWORD dwCount, LPPALETTEENTRY palent) { DX_STUB; } - HRESULT WINAPI Main_DirectDrawPalette_GetCaps(LPDIRECTDRAWPALETTE iface, LPDWORD lpdwCaps) { _____ Modified: trunk/reactos/lib/ddraw/main.c --- trunk/reactos/lib/ddraw/main.c 2005-10-24 23:46:55 UTC (rev 18766) +++ trunk/reactos/lib/ddraw/main.c 2005-10-25 14:03:20 UTC (rev 18767) @@ -101,11 +101,3 @@ DX_STUB; } -HRESULT WINAPI DirectDrawCreateClipper( - DWORD dwFlags, - LPDIRECTDRAWCLIPPER* lplpDDClipper, - LPUNKNOWN pUnkOuter -) -{ - DX_STUB; -}

1 0

[npwoods] 18766: Regedit fix and enhancement
by npwoods＠svn.reactos.com 24 Oct '05

24 Oct '05

Regedit fix and enhancement 1. Fixed a bug in suggestions if the selected key cycles 2. Implemented "Copy Key Name" Modified: trunk/reactos/subsys/system/regedit/En.rc Modified: trunk/reactos/subsys/system/regedit/childwnd.c Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/main.h _____ Modified: trunk/reactos/subsys/system/regedit/En.rc --- trunk/reactos/subsys/system/regedit/En.rc 2005-10-24 23:44:07 UTC (rev 18765) +++ trunk/reactos/subsys/system/regedit/En.rc 2005-10-24 23:46:55 UTC (rev 18766) @@ -138,7 +138,7 @@ MENUITEM "&Delete", ID_TREE_DELETE MENUITEM "&Rename", ID_TREE_RENAME MENUITEM SEPARATOR - MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME, GRAYED + MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END END _____ Modified: trunk/reactos/subsys/system/regedit/childwnd.c --- trunk/reactos/subsys/system/regedit/childwnd.c 2005-10-24 23:44:07 UTC (rev 18765) +++ trunk/reactos/subsys/system/regedit/childwnd.c 2005-10-24 23:46:55 UTC (rev 18766) @@ -143,6 +143,11 @@ TreeView_DeleteItem(pChildWnd->hTreeWnd, hSelection); } break; + case ID_EDIT_COPYKEYNAME: + hSelection = TreeView_GetSelection(pChildWnd->hTreeWnd); + keyPath = GetItemPath(pChildWnd->hTreeWnd, hSelection, &hRootKey); + CopyKeyName(hWnd, hRootKey, keyPath); + break; case ID_EDIT_NEW_KEY: CreateNewKey(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd)); break; @@ -178,6 +183,8 @@ * Key suggestion */ +#define MIN(a,b) ((a < b) ? (a) : (b)) + static void SuggestKeys(HKEY hRootKey, LPCTSTR pszKeyPath, LPTSTR pszSuggestions, size_t iSuggestionsLength) { @@ -201,7 +208,9 @@ if (RegQueryStringValue(hRootKey, pszKeyPath, NULL, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])) == ERROR_SUCCESS) { - if (szBuffer[0] != '\0') + /* Sanity check this key; it cannot be empty, nor can it be a + * loop back */ + if ((szBuffer[0] != '\0') && _tcsicmp(szBuffer, pszKeyPath)) { if (RegOpenKey(hRootKey, szBuffer, &hOtherKey) == ERROR_SUCCESS) { @@ -211,7 +220,7 @@ iSuggestionsLength -= i; lstrcpyn(pszSuggestions, szBuffer, iSuggestionsLength); - i = _tcslen(pszSuggestions) + 1; + i = MIN(_tcslen(pszSuggestions) + 1, iSuggestionsLength); pszSuggestions += i; iSuggestionsLength -= i; RegCloseKey(hOtherKey); @@ -223,7 +232,7 @@ } } } - while(bFound); + while(bFound && (iSuggestionsLength > 0)); /* Check CLSID key */ if (RegOpenKey(hRootKey, pszKeyPath, &hSubKey) == ERROR_SUCCESS) @@ -237,7 +246,7 @@ iSuggestionsLength -= i; lstrcpyn(pszSuggestions, szBuffer, iSuggestionsLength); - i = _tcslen(pszSuggestions) + 1; + i = MIN(_tcslen(pszSuggestions) + 1, iSuggestionsLength); pszSuggestions += i; iSuggestionsLength -= i; } _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-10-24 23:44:07 UTC (rev 18765) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-10-24 23:46:55 UTC (rev 18766) @@ -470,34 +470,43 @@ return TRUE; } -static BOOL CopyKeyName(HWND hWnd, LPCTSTR keyName) +BOOL CopyKeyName(HWND hWnd, HKEY hRootKey, LPCTSTR keyName) { - BOOL result; + BOOL bClipboardOpened = FALSE; + BOOL bSuccess = FALSE; + TCHAR szBuffer[512]; + HGLOBAL hGlobal; + LPTSTR s; - result = OpenClipboard(hWnd); - if (result) { - result = EmptyClipboard(); - if (result) { + if (!OpenClipboard(hWnd)) + goto done; + bClipboardOpened = TRUE; - /*HANDLE hClipData;*/ - /*hClipData = SetClipboardData(UINT uFormat, HANDLE hMem);*/ + if (!EmptyClipboard()) + goto done; - } else { - /* error emptying clipboard*/ - /* DWORD dwError = GetLastError(); */ - ; - } - if (!CloseClipboard()) { - /* error closing clipboard*/ - /* DWORD dwError = GetLastError(); */ - ; - } - } else { - /* error opening clipboard*/ - /* DWORD dwError = GetLastError(); */ - ; - } - return result; + if (!RegKeyGetName(szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]), hRootKey, keyName)) + goto done; + + hGlobal = GlobalAlloc(GMEM_MOVEABLE, (_tcslen(szBuffer) + 1) * sizeof(TCHAR)); + if (!hGlobal) + goto done; + + s = GlobalLock(hGlobal); + _tcscpy(s, szBuffer); + GlobalUnlock(hGlobal); + +#ifdef UNICODE + SetClipboardData(CF_UNICODETEXT, hGlobal); +#else + SetClipboardData(CF_TEXT, hGlobal); +#endif + bSuccess = TRUE; + +done: + if (bClipboardOpened) + CloseClipboard(); + return bSuccess; } static BOOL CreateNewValue(HKEY hRootKey, LPCTSTR pszKeyPath, DWORD dwType) @@ -860,7 +869,7 @@ break; } case ID_EDIT_COPYKEYNAME: - CopyKeyName(hWnd, _T("")); + CopyKeyName(hWnd, hKeyRoot, keyPath); break; case ID_EDIT_PERMISSIONS: if(keyPath != NULL && _tcslen(keyPath) > 0) _____ Modified: trunk/reactos/subsys/system/regedit/main.h --- trunk/reactos/subsys/system/regedit/main.h 2005-10-24 23:44:07 UTC (rev 18765) +++ trunk/reactos/subsys/system/regedit/main.h 2005-10-24 23:46:55 UTC (rev 18766) @@ -89,6 +89,7 @@ extern LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM); extern void SetupStatusBar(HWND hWnd, BOOL bResize); extern void UpdateStatusBar(void); +extern BOOL CopyKeyName(HWND hWnd, HKEY hRootKey, LPCTSTR keyName); /* listview.c */ extern HWND CreateListView(HWND hwndParent, int id);

1 0

[npwoods] 18765: Notepad will no longer add .txt if you invoke it specifying a file that does not exist, but has a file extension
by npwoods＠svn.reactos.com 24 Oct '05

24 Oct '05

Notepad will no longer add .txt if you invoke it specifying a file that does not exist, but has a file extension Modified: trunk/reactos/subsys/system/notepad/dialog.c Modified: trunk/reactos/subsys/system/notepad/dialog.h Modified: trunk/reactos/subsys/system/notepad/main.c _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2005-10-24 22:02:39 UTC (rev 18764) +++ trunk/reactos/subsys/system/notepad/dialog.c 2005-10-24 23:44:07 UTC (rev 18765) @@ -139,6 +139,17 @@ } +BOOL HasFileExtension(LPCWSTR szFilename) +{ + LPCWSTR s; + + s = wcsrchr(szFilename, '\\'); + if (s) + szFilename = s; + return wcsrchr(szFilename, '.') != NULL; +} + + static VOID DoSaveFile(VOID) { HANDLE hFile; _____ Modified: trunk/reactos/subsys/system/notepad/dialog.h --- trunk/reactos/subsys/system/notepad/dialog.h 2005-10-24 22:02:39 UTC (rev 18764) +++ trunk/reactos/subsys/system/notepad/dialog.h 2005-10-24 23:44:07 UTC (rev 18765) @@ -55,5 +55,6 @@ /* utility functions */ VOID ShowLastError(void); BOOL FileExists(LPCWSTR szFilename); +BOOL HasFileExtension(LPCWSTR szFilename); BOOL DoCloseFile(void); void DoOpenFile(LPCWSTR szFileName); _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2005-10-24 22:02:39 UTC (rev 18764) +++ trunk/reactos/subsys/system/notepad/main.c 2005-10-24 23:44:07 UTC (rev 18765) @@ -440,8 +440,8 @@ if (*cmdline) { /* file name is passed in the command line */ - LPCWSTR file_name; - BOOL file_exists; + LPCWSTR file_name = NULL; + BOOL file_exists = FALSE; WCHAR buf[MAX_PATH]; if (cmdline[0] == '"') @@ -455,7 +455,7 @@ file_exists = TRUE; file_name = cmdline; } - else + else if (!HasFileExtension(cmdline)) { static const WCHAR txtW[] = { '.','t','x','t',0 }; @@ -463,7 +463,6 @@ if (!lstrcmp(txtW, cmdline + lstrlen(cmdline) - lstrlen(txtW))) { file_exists = FALSE; - file_name = cmdline; } else { @@ -476,6 +475,7 @@ if (file_exists) { + file_name = cmdline; DoOpenFile(file_name); InvalidateRect(Globals.hMainWnd, NULL, FALSE); if (opt_print)

1 0

[gvg] 18764: Synthesize a small icon if none given
by gvg＠svn.reactos.com 24 Oct '05

24 Oct '05

Synthesize a small icon if none given Modified: trunk/reactos/lib/user32/windows/class.c _____ Modified: trunk/reactos/lib/user32/windows/class.c --- trunk/reactos/lib/user32/windows/class.c 2005-10-24 21:57:32 UTC (rev 18763) +++ trunk/reactos/lib/user32/windows/class.c 2005-10-24 22:02:39 UTC (rev 18764) @@ -401,6 +401,170 @@ } /* + * Create a small icon based on a standard icon + */ +static HICON +CreateSmallIcon(HICON StdIcon) +{ + HICON SmallIcon = NULL; + ICONINFO StdInfo; + int SmallIconWidth; + int SmallIconHeight; + BITMAP StdBitmapInfo; + HDC hInfoDc = NULL; + HDC hSourceDc = NULL; + HDC hDestDc = NULL; + ICONINFO SmallInfo; + HBITMAP OldSourceBitmap = NULL; + HBITMAP OldDestBitmap = NULL; + + SmallInfo.hbmColor = NULL; + SmallInfo.hbmMask = NULL; + + /* We need something to work with... */ + if (NULL == StdIcon) + { + goto cleanup; + } + + SmallIconWidth = GetSystemMetrics(SM_CXSMICON); + SmallIconHeight = GetSystemMetrics(SM_CYSMICON); + if (! GetIconInfo(StdIcon, &StdInfo)) + { + DPRINT1("Failed to get icon info for icon 0x%x\n", StdIcon); + goto cleanup; + } + if (! GetObjectW(StdInfo.hbmMask, sizeof(BITMAP), &StdBitmapInfo)) + { + DPRINT1("Failed to get bitmap info for icon 0x%x bitmap 0x%x\n", + StdIcon, StdInfo.hbmColor); + goto cleanup; + } + if (StdBitmapInfo.bmWidth == SmallIconWidth && + StdBitmapInfo.bmHeight == SmallIconHeight) + { + /* Icon already has the correct dimensions */ + return StdIcon; + } + + /* Get a handle to a info DC and handles to DCs which can be used to + select a bitmap into. This is done to avoid triggering a switch to + graphics mode (if we're currently in text/blue screen mode) */ + hInfoDc = CreateICW(NULL, NULL, NULL, NULL); + if (NULL == hInfoDc) + { + DPRINT1("Failed to create info DC\n"); + goto cleanup; + } + hSourceDc = CreateCompatibleDC(NULL); + if (NULL == hSourceDc) + { + DPRINT1("Failed to create source DC\n"); + goto cleanup; + } + hDestDc = CreateCompatibleDC(NULL); + if (NULL == hDestDc) + { + DPRINT1("Failed to create dest DC\n"); + goto cleanup; + } + + OldSourceBitmap = SelectObject(hSourceDc, StdInfo.hbmColor); + if (NULL == OldSourceBitmap) + { + DPRINT1("Failed to select source color bitmap\n"); + goto cleanup; + } + SmallInfo.hbmColor = CreateCompatibleBitmap(hInfoDc, SmallIconWidth, + SmallIconHeight); + if (NULL == SmallInfo.hbmColor) + { + DPRINT1("Failed to create color bitmap\n"); + goto cleanup; + } + OldDestBitmap = SelectObject(hDestDc, SmallInfo.hbmColor); + if (NULL == OldDestBitmap) + { + DPRINT1("Failed to select dest color bitmap\n"); + goto cleanup; + } + if (! StretchBlt(hDestDc, 0, 0, SmallIconWidth, SmallIconHeight, + hSourceDc, 0, 0, StdBitmapInfo.bmWidth, + StdBitmapInfo.bmHeight, SRCCOPY)) + { + DPRINT1("Failed to stretch color bitmap\n"); + goto cleanup; + } + + if (NULL == SelectObject(hSourceDc, StdInfo.hbmMask)) + { + DPRINT1("Failed to select source mask bitmap\n"); + goto cleanup; + } + SmallInfo.hbmMask = CreateBitmap(SmallIconWidth, SmallIconHeight, 1, 1, + NULL); + if (NULL == SmallInfo.hbmMask) + { + DPRINT1("Failed to create mask bitmap\n"); + goto cleanup; + } + if (NULL == SelectObject(hDestDc, SmallInfo.hbmMask)) + { + DPRINT1("Failed to select dest mask bitmap\n"); + goto cleanup; + } + if (! StretchBlt(hDestDc, 0, 0, SmallIconWidth, SmallIconHeight, + hSourceDc, 0, 0, StdBitmapInfo.bmWidth, + StdBitmapInfo.bmHeight, SRCCOPY)) + { + DPRINT1("Failed to stretch mask bitmap\n"); + goto cleanup; + } + + SmallInfo.fIcon = TRUE; + SmallInfo.xHotspot = SmallIconWidth / 2; + SmallInfo.yHotspot = SmallIconHeight / 2; + SmallIcon = CreateIconIndirect(&SmallInfo); + if (NULL == SmallIcon) + { + DPRINT1("Failed to create icon\n"); + goto cleanup; + } + +cleanup: + if (NULL != SmallInfo.hbmMask) + { + DeleteObject(SmallInfo.hbmMask); + } + if (NULL != OldDestBitmap) + { + SelectObject(hDestDc, OldDestBitmap); + } + if (NULL != SmallInfo.hbmColor) + { + DeleteObject(SmallInfo.hbmColor); + } + if (NULL != hDestDc) + { + DeleteDC(hDestDc); + } + if (NULL != OldSourceBitmap) + { + SelectObject(hSourceDc, OldSourceBitmap); + } + if (NULL != hSourceDc) + { + DeleteDC(hSourceDc); + } + if (NULL != hInfoDc) + { + DeleteDC(hInfoDc); + } + + return SmallIcon; +} + +/* * @implemented */ ATOM STDCALL @@ -439,6 +603,11 @@ RtlCopyMemory(&WndClass, lpwcx, sizeof(WNDCLASSEXW)); + if (NULL == WndClass.hIconSm) + { + WndClass.hIconSm = CreateSmallIcon(WndClass.hIcon); + } + if (IS_ATOM(lpwcx->lpszMenuName) || lpwcx->lpszMenuName == 0) { MenuName.Length = @@ -514,6 +683,11 @@ RtlCopyMemory(&WndClass, lpwcx, sizeof(WNDCLASSEXW)); + if (NULL == WndClass.hIconSm) + { + WndClass.hIconSm = CreateSmallIcon(WndClass.hIcon); + } + if (IS_ATOM(lpwcx->lpszMenuName)) { MenuName.Length =

1 0

[gvg] 18763: Workaround for icon stretching. Makes icons in title bar and taskbar display
by gvg＠svn.reactos.com 24 Oct '05

24 Oct '05

Workaround for icon stretching. Makes icons in title bar and taskbar display properly. Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-10-24 21:54:26 UTC (rev 18762) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-10-24 21:57:32 UTC (rev 18763) @@ -1269,7 +1269,82 @@ } -#define CANSTRETCHBLT 0 +#define STRETCH_CAN_SRCCOPY_ONLY + +#ifdef STRETCH_CAN_SRCCOPY_ONLY +void +FASTCALL +DoStretchBlt(HDC DcDest, int XDest, int YDest, int WidthDest, int HeightDest, + HDC DcSrc, int XSrc, int YSrc, int WidthSrc, int HeightSrc, + DWORD Rop3, BOOL Color) +{ + HDC DcStretched; + HBITMAP BitmapStretched; + HBITMAP OldBitmap; + + if (WidthDest == WidthSrc && HeightDest == HeightSrc) + { + NtGdiBitBlt(DcDest, XDest, YDest, WidthDest, HeightDest, + DcSrc, XSrc, YSrc, Rop3); + } + else if (SRCCOPY == Rop3) + { + NtGdiStretchBlt(DcDest, XDest, YDest, WidthDest, HeightDest, + DcSrc, XSrc, YSrc, WidthSrc, HeightSrc, + Rop3); + } + else + { + DcStretched = NtGdiCreateCompatibleDC(DcSrc); + if (NULL == DcStretched) + { + DPRINT1("Failed to create compatible DC\n"); + return; + } + if (Color) + { + BitmapStretched = NtGdiCreateCompatibleBitmap(DcDest, WidthDest, + HeightDest); + } + else + { + BitmapStretched = NtGdiCreateBitmap(WidthDest, HeightDest, 1, 1, NULL); + } + if (NULL == BitmapStretched) + { + NtGdiDeleteDC(DcStretched); + DPRINT1("Failed to create temporary bitmap\n"); + return; + } + OldBitmap = NtGdiSelectObject(DcStretched, BitmapStretched); + if (NULL == OldBitmap) + { + NtGdiDeleteObject(BitmapStretched); + NtGdiDeleteDC(DcStretched); + DPRINT1("Failed to create temporary bitmap\n"); + return; + } + if (! NtGdiStretchBlt(DcStretched, 0, 0, WidthDest, HeightDest, + DcSrc, XSrc, YSrc, WidthSrc, HeightSrc, + SRCCOPY) || + ! NtGdiBitBlt(DcDest, XDest, YDest, WidthDest, HeightDest, + DcStretched, 0, 0, Rop3)) + { + DPRINT1("Failed to blt\n"); + } + NtGdiSelectObject(DcStretched, OldBitmap); + NtGdiDeleteObject(BitmapStretched); + NtGdiDeleteDC(DcStretched); + } +} +#else +#define DoStretchBlt(DcDest, XDest, YDest, WidthDest, HeightDest, \ + DcSrc, XSrc, YSrc, WidthSrc, HeightSrc, Rop3, Color) \ + NtGdiStretchBlt((DcDest), (XDest), (YDest), (WidthDest), (HeightDest), \ + (DcSrc), (XSrc), (YSrc), (WidthSrc), (HeightSrc), \ + (Rop3)) +#endif /* STRETCH_CAN_SRCCOPY_ONLY */ + /* * @implemented */ @@ -1281,7 +1356,7 @@ int yTop, HICON hIcon, int cxWidth, - int cyWidth, + int cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags, @@ -1299,10 +1374,7 @@ HBITMAP hbmOff = (HBITMAP)0; HGDIOBJ hOldOffBrush = 0, hOldOffBmp = 0, hOldMem; BOOL Ret = FALSE; -#if CANSTRETCHBLT - INT nStretchMode; -#endif DECLARE_RETURN(BOOL); @@ -1349,8 +1421,8 @@ if(!cxWidth) cxWidth = ((diFlags & DI_DEFAULTSIZE) ? UserGetSystemMetrics(SM_CXICON) : IconSize.cx); - if(!cyWidth) - cyWidth = ((diFlags & DI_DEFAULTSIZE) ? UserGetSystemMetrics(SM_CYICON) : IconSize.cy); + if(!cyHeight) + cyHeight = ((diFlags & DI_DEFAULTSIZE) ? UserGetSystemMetrics(SM_CYICON) : IconSize.cy); DoFlickerFree = (hbrFlickerFreeDraw && (NtGdiGetObjectType(hbrFlickerFreeDraw) == OBJ_BRUSH)); @@ -1358,13 +1430,13 @@ { RECT r; r.right = cxWidth; - r.bottom = cyWidth; + r.bottom = cyHeight; hdcOff = NtGdiCreateCompatibleDC(hdc); if(!hdcOff) goto done; - hbmOff = NtGdiCreateCompatibleBitmap(hdc, cxWidth, cyWidth); + hbmOff = NtGdiCreateCompatibleBitmap(hdc, cxWidth, cyHeight); if(!hbmOff) { NtGdiDeleteDC(hdcOff); @@ -1383,10 +1455,7 @@ if(!DoFlickerFree) hdcOff = hdc; -#if CANSTRETCHBLT - nStretchMode = NtGdiSetStretchBltMode(hdcOff, STRETCH_DELETESCANS); -#endif oldFg = NtGdiSetTextColor(hdcOff, RGB(0, 0, 0)); oldBg = NtGdiSetBkColor(hdcOff, RGB(255, 255, 255)); @@ -1394,28 +1463,19 @@ if(diFlags & DI_MASK) { hOldMem = NtGdiSelectObject(hdcMem, hbmMask); -#if CANSTRETCHBLT - NtGdiStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), (DoFlickerFree ? 0 : yTop), - cxWidth, cyWidth, hdcMem, 0, 0, IconSize.cx, IconSize.cy, - ((diFlags & DI_IMAGE) ? SRCAND : SRCCOPY)); -#else + DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), + (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, + 0, 0, IconSize.cx, IconSize.cy, + ((diFlags & DI_IMAGE) ? SRCAND : SRCCOPY), FALSE); - NtGdiBitBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), (DoFlickerFree ? 0 : yTop), - cxWidth, cyWidth, hdcMem, 0, 0, ((diFlags & DI_IMAGE) ? SRCAND : SRCCOPY)); -#endif - if(!hbmColor && (bmpMask.bmHeight == 2 * bmpMask.bmWidth) && (diFlags & DI_IMAGE)) { -#if CANSTRETCHBLT - NtGdiStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), (DoFlickerFree ? 0 : yTop), - cxWidth, cyWidth, hdcMem, 0, IconSize.cy, IconSize.cx, IconSize.cy, SRCINVERT); -#else + DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), + (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, + 0, IconSize.cy, IconSize.cx, IconSize.cy, SRCINVERT, + FALSE); - NtGdiBitBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), (DoFlickerFree ? 0 : yTop), - cxWidth, cyWidth, hdcMem, 0, IconSize.cy, SRCINVERT); -#endif - diFlags &= ~DI_IMAGE; } NtGdiSelectObject(hdcMem, hOldMem); @@ -1424,30 +1484,23 @@ if(diFlags & DI_IMAGE) { hOldMem = NtGdiSelectObject(hdcMem, (hbmColor ? hbmColor : hbmMask)); -#if CANSTRETCHBLT - NtGdiStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), (DoFlickerFree ? 0 : yTop), - cxWidth, cyWidth, hdcMem, 0, (hbmColor ? 0 : IconSize.cy), - IconSize.cx, IconSize.cy, ((diFlags & DI_MASK) ? SRCINVERT : SRCCOPY)); -#else + DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), + (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, + 0, (hbmColor ? 0 : IconSize.cy), IconSize.cx, IconSize.cy, + ((diFlags & DI_MASK) ? SRCINVERT : SRCCOPY), + NULL != hbmColor); - NtGdiBitBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), (DoFlickerFree ? 0 : yTop), - cxWidth, cyWidth, hdcMem, 0, (hbmColor ? 0 : IconSize.cy), - ((diFlags & DI_MASK) ? SRCINVERT : SRCCOPY)); -#endif - NtGdiSelectObject(hdcMem, hOldMem); } if(DoFlickerFree) - NtGdiBitBlt(hdc, xLeft, yTop, cxWidth, cyWidth, hdcOff, 0, 0, SRCCOPY); + NtGdiBitBlt(hdc, xLeft, yTop, cxWidth, cyHeight, hdcOff, 0, 0, SRCCOPY); NtGdiSetTextColor(hdcOff, oldFg); NtGdiSetBkColor(hdcOff, oldBg); -#if CANSTRETCHBLT - SetStretchBltMode(hdcOff, nStretchMode); -#endif + NtGdiSetStretchBltMode(hdcOff, nStretchMode); Ret = TRUE;

1 0

[gvg] 18762: Small fixes to 1bpp->1bpp stretching
by gvg＠svn.reactos.com 24 Oct '05

24 Oct '05

Small fixes to 1bpp->1bpp stretching Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-10-24 21:42:24 UTC (rev 18761) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-10-24 21:54:26 UTC (rev 18762) @@ -642,9 +642,9 @@ for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) { if (DesIsBiggerY) + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + else sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); if (sy > SourceRect->bottom) break; @@ -652,14 +652,14 @@ for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); if (sx > SourceRect->right) break; color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, count, color); } }

1 0

[turner] 18761: Changed to RC2
by turner＠svn.reactos.com 24 Oct '05

24 Oct '05

Changed to RC2 Modified: branches/ros-branch-0_2_8/reactos/include/reactos/version.h _____ Modified: branches/ros-branch-0_2_8/reactos/include/reactos/version.h --- branches/ros-branch-0_2_8/reactos/include/reactos/version.h 2005-10-24 21:08:08 UTC (rev 18760) +++ branches/ros-branch-0_2_8/reactos/include/reactos/version.h 2005-10-24 21:42:24 UTC (rev 18761) @@ -22,7 +22,7 @@ #define KERNEL_VERSION_PATCH_LEVEL 8 /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"RELEASE" */ -#define KERNEL_VERSION_BUILD_TYPE L"RC1" +#define KERNEL_VERSION_BUILD_TYPE L"RC2" #endif

1 0

[chorns] 18760: Fix linker script parameter location. Spotted by Hartmut Birr.
by chorns＠svn.reactos.com 24 Oct '05

24 Oct '05

Fix linker script parameter location. Spotted by Hartmut Birr. Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-10-24 20:00:48 UTC (rev 18759) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-10-24 21:08:08 UTC (rev 18760) @@ -1448,7 +1448,7 @@ killAt.c_str () ); fprintf ( fMakefile, - "\t%s %s %s -o %s %s %s %s %s\n", + "\t%s %s %s %s -o %s %s %s %s\n", linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), @@ -1470,7 +1470,7 @@ else { fprintf ( fMakefile, - "\t%s %s -o %s %s %s %s %s\n", + "\t%s %s %s -o %s %s %s %s\n", linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (),

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005