Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[cfinck] 28000: My modifications for Bugzilla 3.0 These should work with both our Login system and Deskzilla This is still not final as some things still need to be done, which depend on the server configuration

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Jul 29 17:08:23 2007 New Revision: 28000 URL: http://svn.reactos.org/svn/reactos?rev=28000&view=rev Log: My modifications for Bugzilla 3.0 These should work with both our Login system and Deskzilla This is still not final as some things still need to be done, which depend on the server configuration Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Login/ROSCMS.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Persist/ROSCMS.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Verify/ROSCMS.pm Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Config/Auth.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Config/Common.pm trunk/web/reactos.org/htdocs/bugzilla/skins/standard/global.css trunk/web/reactos.org/htdocs/bugzilla/skins/standard/index.css trunk/web/reactos.org/htdocs/bugzilla/template/en/default/account/prefs/acc… trunk/web/reactos.org/htdocs/bugzilla/template/en/default/account/prefs/pre… trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/footer.htm… trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/header.htm… trunk/web/reactos.org/htdocs/bugzilla/template/en/default/index.html.tmpl trunk/web/reactos.org/htdocs/bugzilla/userprefs.cgi Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth.pm Sun Jul 29 17:08:23 2007 @@ -34,7 +34,7 @@ use Bugzilla::Error; use Bugzilla::Auth::Login::Stack; use Bugzilla::Auth::Verify::Stack; -use Bugzilla::Auth::Persist::Cookie; +use Bugzilla::Auth::Persist::ROSCMS; sub new { my ($class, $params) = @_; @@ -48,7 +48,7 @@ $self->{_verifier} = new Bugzilla::Auth::Verify::Stack($params->{Verify}); # If we ever have any other login persistence methods besides cookies, # this could become more configurable. - $self->{_persister} = new Bugzilla::Auth::Persist::Cookie(); + $self->{_persister} = new Bugzilla::Auth::Persist::ROSCMS(); return $self; } Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Login/ROSCMS.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Login/ROSCMS.pm (added) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Login/ROSCMS.pm Sun Jul 29 17:08:23 2007 @@ -1,0 +1,135 @@ +# -*- 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> +# Erik Stambaugh <erik(a)dasbistro.com> +# Max Kanat-Alexander <mkanat(a)bugzilla.org> + +# Auth::Login class for RosCMS +# based on the former class for Bugzilla 2.x by Gé van Geldorp and Michael Wirth and the Auth::Login::CGI class +# improved and made compatible with Bugzilla 3.x and Deskzilla by Colin Finck (2007-07-29) + +package Bugzilla::Auth::Login::ROSCMS; +use strict; +use base qw(Bugzilla::Auth::Login); +use constant can_logout => 0; # The Bugzilla Logout feature has to be disabled, so the user can only log out with the RosCMS Logout feature + +use URI; +use URI::Escape; + +use Bugzilla::Constants; +use Bugzilla::WebService::Constants; +use Bugzilla::User; +use Bugzilla::Util; +use Bugzilla::Error; + +my $session_cookie_name = "roscmsusrkey"; +my $roscms_db_name = "roscms"; +my $roscms_login_page = "/roscms/?page=login&target="; + +sub get_login_info { + my ($self) = @_; + my $cgi = Bugzilla->cgi; + + # Check if we have username and password given (usual CGI method for apps like Deskzilla) + my $username = trim($cgi->param("Bugzilla_login")); + my $password = $cgi->param("Bugzilla_password"); + $cgi->delete('Bugzilla_login', 'Bugzilla_password'); + + if(defined $username && defined $password) { + return { username => $username, password => $password }; + } + + # No, then check for the RosCMS Login cookie + my $dbh = Bugzilla->dbh; + my $user_id; + my $session_id = $cgi->cookie($session_cookie_name); + if ( defined $session_id ) { + my $session_id_clean = $session_id; + trick_taint($session_id_clean); + my $remote_addr_clean; + if ($ENV{'REMOTE_ADDR'} =~ m/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/) { + $remote_addr_clean = $1; + } else { + $remote_addr_clean = 'invalid'; + } + my $browser_agent_clean = $ENV{'HTTP_USER_AGENT'}; + trick_taint($browser_agent_clean); + my $query = "SELECT m.map_subsys_userid " . + " FROM $roscms_db_name.user_sessions s, " . + " $roscms_db_name.users u, " . + " $roscms_db_name.subsys_mappings m " . + " WHERE s.usersession_id = ? " . + " AND (s.usersession_expires IS NULL OR " . + " NOW() <= s.usersession_expires) " . + " AND u.user_id = s.usersession_user_id " . + " AND (u.user_setting_ipaddress = 'false' OR " . + " s.usersession_ipaddress = ?) " . + " AND (u.user_setting_browseragent = 'false' OR " . + " s.usersession_browseragent = ?) " . + " AND m.map_roscms_userid = s.usersession_user_id " . + " AND m.map_subsys_name = 'bugzilla'"; + my @params = ($session_id_clean, $remote_addr_clean, $browser_agent_clean); + ($user_id) = $dbh->selectrow_array($query, undef, @params); + if ($user_id) { + # Update time of last session use + $query = "UPDATE $roscms_db_name.user_sessions " . + " SET usersession_expires = DATE_ADD(NOW(), INTERVAL 30 MINUTE) " . + " WHERE usersession_id = ? " . + " AND usersession_expires IS NOT NULL"; + @params = ($session_id_clean); + $dbh->do($query, undef, @params); + + # Get the user name and the crypted password from the database + my $username = user_id_to_login($user_id); + my $crypted_password = $dbh->selectrow_array("SELECT cryptpassword FROM profiles WHERE userid = ?", undef, $user_id); + + # We need to set a parameter for the Auth::Persist::ROSCMS module + $cgi->param('ROSCMS_login', 1); + + return { username => $username, crypted_password => $crypted_password }; + } + } + + return { failure => AUTH_NODATA }; +} + +sub fail_nodata { + my ($self) = @_; + my $cgi = Bugzilla->cgi; + + # Throw up the login page + my $this_uri = uri_escape($cgi->url(-absolute=>1, -path_info=>1, -query=>1)); + print $cgi->redirect($roscms_login_page . $this_uri); + exit; +} + +sub requires_persistence { + # Persistence is handled by RosCMS + return 1; +} + +1; Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Persist/ROSCMS.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Persist/ROSCMS.pm (added) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Persist/ROSCMS.pm Sun Jul 29 17:08:23 2007 @@ -1,0 +1,159 @@ +# -*- 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> +# Erik Stambaugh <erik(a)dasbistro.com> +# Max Kanat-Alexander <mkanat(a)bugzilla.org> + +# Auth::Persist class for RosCMS +# developed by Colin Finck based on the Auth::Persist::Cookie class (2007-07-29) + +package Bugzilla::Auth::Persist::ROSCMS; +use strict; +use fields qw(); + +use Bugzilla::Constants; +use Bugzilla::Util; +use Bugzilla::Token; + +use List::Util qw(first); + +sub new { + my ($class) = @_; + my $self = fields::new($class); + return $self; +} + +sub persist_login { + my ($self, $user) = @_; + my $dbh = Bugzilla->dbh; + my $cgi = Bugzilla->cgi; + + # When we log in using RosCMS, it handles the persistence itself + if( defined $cgi->param('ROSCMS_login') ) { + return; + } + + my $ip_addr = $cgi->remote_addr; + unless ($cgi->param('Bugzilla_restrictlogin') || + Bugzilla->params->{'loginnetmask'} == 32) + { + $ip_addr = get_netaddr($ip_addr); + } + + # The IP address is valid, at least for comparing with itself in a + # subsequent login + trick_taint($ip_addr); + + my $login_cookie = + Bugzilla::Token::GenerateUniqueToken('logincookies', 'cookie'); + + $dbh->do("INSERT INTO logincookies (cookie, userid, ipaddr, lastused) + VALUES (?, ?, ?, NOW())", + undef, $login_cookie, $user->id, $ip_addr); + + # Remember cookie only if admin has told so + # or admin didn't forbid it and user told to remember. + if ( Bugzilla->params->{'rememberlogin'} eq 'on' || + (Bugzilla->params->{'rememberlogin'} ne 'off' && + $cgi->param('Bugzilla_remember') && + $cgi->param('Bugzilla_remember') eq 'on') ) + { + $cgi->send_cookie(-name => 'Bugzilla_login', + -value => $user->id, + -expires => 'Fri, 01-Jan-2038 00:00:00 GMT'); + $cgi->send_cookie(-name => 'Bugzilla_logincookie', + -value => $login_cookie, + -expires => 'Fri, 01-Jan-2038 00:00:00 GMT'); + + } + else { + $cgi->send_cookie(-name => 'Bugzilla_login', + -value => $user->id); + $cgi->send_cookie(-name => 'Bugzilla_logincookie', + -value => $login_cookie); + } +} + +sub logout { + my ($self, $param) = @_; + + my $dbh = Bugzilla->dbh; + my $cgi = Bugzilla->cgi; + $param = {} unless $param; + my $user = $param->{user} || Bugzilla->user; + my $type = $param->{type} || LOGOUT_ALL; + + if ($type == LOGOUT_ALL) { + $dbh->do("DELETE FROM logincookies WHERE userid = ?", + undef, $user->id); + return; + } + + # The LOGOUT_*_CURRENT options require the current login cookie. + # If a new cookie has been issued during this run, that's the current one. + # If not, it's the one we've received. + my $cookie = first {$_->name eq 'Bugzilla_logincookie'} + @{$cgi->{'Bugzilla_cookie_list'}}; + my $login_cookie; + if ($cookie) { + $login_cookie = $cookie->value; + } + else { + $login_cookie = $cgi->cookie("Bugzilla_logincookie"); + } + trick_taint($login_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 ($type == LOGOUT_KEEP_CURRENT) { + $dbh->do("DELETE FROM logincookies WHERE cookie != ? AND userid = ?", + undef, $login_cookie, $user->id); + } elsif ($type == LOGOUT_CURRENT) { + $dbh->do("DELETE FROM logincookies WHERE cookie = ? AND userid = ?", + undef, $login_cookie, $user->id); + } else { + die("Invalid type $type supplied to logout()"); + } + + if ($type != LOGOUT_KEEP_CURRENT) { + clear_browser_cookies(); + } + +} + +sub clear_browser_cookies { + my $cgi = Bugzilla->cgi; + $cgi->remove_cookie('Bugzilla_login'); + $cgi->remove_cookie('Bugzilla_logincookie'); +} + +1; Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Verify/ROSCMS.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Verify/ROSCMS.pm (added) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Verify/ROSCMS.pm Sun Jul 29 17:08:23 2007 @@ -1,0 +1,75 @@ +# -*- 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> +# Erik Stambaugh <erik(a)dasbistro.com> + +# Auth::Verify class for RosCMS +# developed by Colin Finck based on the Auth::Verify::DB class (2007-07-29) + +package Bugzilla::Auth::Verify::ROSCMS; +use strict; +use base qw(Bugzilla::Auth::Verify); +use constant can_change_password => 0; # Password has to be changed at myReactOS + +use Bugzilla::Constants; +use Bugzilla::Token; +use Bugzilla::Util; +use Bugzilla::User; + +sub check_credentials { + my ($self, $login_data) = @_; + my $dbh = Bugzilla->dbh; + + my $username = $login_data->{username}; + my $user_id = login_to_id($username); + + return { failure => AUTH_NO_SUCH_USER } unless $user_id; + + $login_data->{bz_username} = $username; + + my ($real_password_crypted) = $dbh->selectrow_array("SELECT cryptpassword FROM profiles WHERE userid = ?", undef, $user_id); + my $entered_password_crypted = $login_data->{crypted_password}; + + if( !defined $entered_password_crypted ) { + my $password = $login_data->{password}; + + # Using the internal crypted password as the salt, + # crypt the password the user entered. + $entered_password_crypted = crypt($password, $real_password_crypted); + } + + return { failure => AUTH_LOGINFAILED } + if $entered_password_crypted ne $real_password_crypted; + + # The user's credentials are okay, so delete any outstanding + # password tokens they may have generated. + Bugzilla::Token::DeletePasswordTokens($user_id, "user_logged_in"); + + return $login_data; +} + +1; Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Config/Auth.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Config/Auth.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Config/Auth.pm Sun Jul 29 17:08:23 2007 @@ -1,4 +1,4 @@ -# -*- Mode: perl; indent-tabs-mode: nil -*- +ï»¿# -*- 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 @@ -69,7 +69,7 @@ { name => 'user_info_class', type => 's', - choices => [ 'CGI', 'Env', 'Env,CGI' ], + choices => [ 'CGI', 'Env', 'Env,CGI', 'ROSCMS' ], default => 'CGI', checker => \&check_multi }, @@ -77,7 +77,7 @@ { name => 'user_verify_class', type => 's', - choices => [ 'DB', 'LDAP', 'DB,LDAP', 'LDAP,DB' ], + choices => [ 'DB', 'LDAP', 'DB,LDAP', 'LDAP,DB', 'ROSCMS' ], default => 'DB', checker => \&check_user_verify_class }, Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Config/Common.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Config/Common.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Config/Common.pm Sun Jul 29 17:08:23 2007 @@ -1,4 +1,4 @@ -# -*- Mode: perl; indent-tabs-mode: nil -*- +ï»¿# -*- 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 @@ -268,6 +268,8 @@ return "Error requiring Net::LDAP: '$@'" if $@; return "LDAP servername is missing" unless Bugzilla->params->{"LDAPserver"}; return "LDAPBaseDN is empty" unless Bugzilla->params->{"LDAPBaseDN"}; + } elsif ($class eq 'ROSCMS') { + # No params } else { return "Unknown user_verify_class '$class' in check_user_verify_class"; } Modified: trunk/web/reactos.org/htdocs/bugzilla/skins/standard/global.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/sk… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/skins/standard/global.css (original) +++ trunk/web/reactos.org/htdocs/bugzilla/skins/standard/global.css Sun Jul 29 17:08:23 2007 @@ -22,14 +22,6 @@ * Marc Schumann <wurblzap(a)gmail.com> */ -/* global (begin) */ - body { - font-family: sans-serif; - color: #000; - background: #fff url("global/body-back.gif") repeat-x; - } -/* global (end) */ - /* header (begin) */ #header { margin-bottom: 1em; @@ -37,17 +29,15 @@ } #header form { - font-size: 85%; display: inline; } #header .btn, #header .txt { - font-size: 80%; + font-size: 9pt; } #header .links { - font-size: 85%; border-left: 1px solid silver; border-right: 1px solid silver; border-bottom: 1px solid silver; @@ -128,7 +118,7 @@ #footer .btn, #footer .txt { - font-size: 80%; + font-size: 9pt; } #footer #useful-links { @@ -284,7 +274,7 @@ /* Style of the attachment table */ #attachment_table { border-collapse: collapse; - width: 40em; + width: 47em; border: 1px solid #333333; } Modified: trunk/web/reactos.org/htdocs/bugzilla/skins/standard/index.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/sk… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/skins/standard/index.css (original) +++ trunk/web/reactos.org/htdocs/bugzilla/skins/standard/index.css Sun Jul 29 17:08:23 2007 @@ -48,8 +48,8 @@ width: 250px; height: 200px; - margin-top: 2.3em; - margin-right: 2.3em; + margin-top: -15px; + margin-right: 5px; float: right; background: transparent no-repeat url(index/front.png); } Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/account/prefs/acc… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/account/prefs/acc… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/account/prefs/acc… Sun Jul 29 17:08:23 2007 @@ -25,75 +25,5 @@ # new_login_name: string. The user's new Bugzilla login whilst not confirmed. (optional) #%] -<table> - <tr> - <td colspan="3"> - Please enter your existing password to confirm account changes. - </td> - </tr> - <tr> - <th align="right">Password:</th> - <td> - <input type="hidden" name="Bugzilla_login" - value="[% user.login FILTER html %]"> - <input type="password" name="Bugzilla_password"> - </td> - </tr> - <tr> - <td colspan="2"><hr></td> - </tr> - [% IF user.authorizer.can_change_password %] - <tr> - <th align="right">New password:</th> - <td> - <input type="password" name="new_password1"> - </td> - </tr> - - <tr> - <th align="right">Re-enter new password:</th> - <td> - <input type="password" name="new_password2"> - </td> - </tr> - [% END %] - - <tr> - <th align="right">Your real name (optional, but encouraged):</th> - <td> - <input size="35" name="realname" value="[% realname FILTER html %]"> - </td> - </tr> - - [% IF user.authorizer.can_change_email && Param('allowemailchange') %] - [% IF login_change_date %] - [% IF new_login_name %] - <tr> - <th align="right">Pending email address:</th> - <td>[% new_login_name FILTER html %]</td> - </tr> - <tr> - <th align="right">Change request expires:</th> - <td>[% login_change_date FILTER time %]</td> - </tr> - [% ELSE %] - <tr> - <th align="right">Confirmed email address:</th> - <td>[% user.login FILTER html %]</td> - </tr> - <tr> - <th align="right">Completion date:</th> - <td>[% login_change_date FILTER time %]</td> - </tr> - [% END %] - [% ELSE %] - <tr> - <th align="right">New email address:</th> - <td> - <input size="35" name="new_login_name"> - </td> - </tr> - [% END %] - [% END %] - -</table> +You can change your account settings (password, email address etc.) in +<a href="/roscms/?page=user">myReactOS</a><br><br> Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/account/prefs/pre… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/account/prefs/pre… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/account/prefs/pre… Sun Jul 29 17:08:23 2007 @@ -1,4 +1,4 @@ -[%# 1.0(a)bugzilla.org %] +ï»¿[%# 1.0(a)bugzilla.org %] [%# 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 @@ -50,7 +50,7 @@ { name => "saved-searches", label => "Saved Searches", link => "userprefs.cgi?tab=saved-searches", saveable => "1" }, { name => "account", label => "Name and Password", - link => "userprefs.cgi?tab=account", saveable => "1" }, + link => "userprefs.cgi?tab=account", saveable => "0" }, { name => "permissions", label => "Permissions", link => "userprefs.cgi?tab=permissions", saveable => "0" } ] %] Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/footer.htm… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/footer.htm… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/footer.htm… Sun Jul 29 17:08:23 2007 @@ -45,6 +45,23 @@ <div class="outro"></div> </div> +</div> +</td> +</tr> +</table> + + +<hr size="1"> + +<address> + <p align="center"> + ReactOS is a trademark of ReactOS Foundation in the United States and other countries. + </p> +</address> + </body> </html> Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/header.htm… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/header.htm… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/header.htm… Sun Jul 29 17:08:23 2007 @@ -62,7 +62,7 @@ "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> - <title>[% title %]</title> + <title>ReactOS Homepage - [% title %]</title> [%# Migration note: contents of the old Param 'headerhtml' would go here %] @@ -84,6 +84,8 @@ [%+ INCLUDE "global/help-header.html.tmpl" %] + <link href="/style.css" type="text/css" rel="stylesheet"> + [%# Set up the skin CSS cascade: # 1. Standard Bugzilla stylesheet set (persistent) # 2. Standard Bugzilla stylesheet set (selectable) @@ -229,31 +231,93 @@ # 'bannerhtml' #%] +<div id="top"> + <div id="topMenu"> +  + <p align="center"> + <a href="/?page=index">Home</a> <font color="#ffffff">|</font> + <a href="/?page=about">Info</a> <font color="#ffffff">|</font> + <a href="/?page=community">Community</a> <font color="#ffffff">|</font> + <a href="/?page=dev">Development</a> <font color="#ffffff">|</font> + <a href="/roscms/?page=user">myReactOS</a> </p> + </div> + </div> + +<table style="border:0" width="100%" cellpadding="0" cellspacing="0"> + <tr valign="top"> + <td style="width:147px" id="leftNav"> + <div class="navTitle">Navigation</div> + <ol> + <li><a href="/?page=index">Home</a></li> + <li><a href="/?page=about">Info</a></li> + <li><a href="/?page=community">Community</a></li> + <li><a href="/?page=dev">Development</a></li> + <li><a href="/roscms/?page=user">myReactOS</a></li> + </ol> + <p></p> + +<div class="navTitle">Bugzilla</div> + <ol> + <li><a href="/bugzilla">Main Page</a></li> + <li><a href="/bugzilla/enter_bug.cgi">New</a></li> + <li><a href="/bugzilla/query.cgi">Search</a></li> + <li><a href="/bugzilla/report.cgi">Reports</a></li> + <li><a href="/bugzilla/request.cgi">Requests</a></li> + </ol> + <p></p> + +[%# TODO we don't support switching languages yet +<div class="navTitle">Language</div> + <ol> + <li> + <div align="center"> + <select id="select" size="1" name="select" class="selectbox" onchange="window.open(this.options[this.selectedIndex].value,'_main')"> + <optgroup label="current language"> + <option value="#" selected="selected">English</option> + </optgroup> + <optgroup label="most popular"> + <option value="http://www.reactos.org/./[#inc_path_lang]../en/developer.htm">English</option> + <option value="http://www.reactos.org/./[#inc_path_lang]../de/developer.htm">Deutsch</option> + <option value="http://www.reactos.org/./[#inc_path_lang]../fr/developer.htm">Français</option> + </optgroup> + <optgroup label="other languages"> + <option value="#"><placeholder></option> + </optgroup> + </select> + </div> + </li> + </ol> + <p></p> +%] + +<div class="navTitle">Account</div> + <ol> +[% IF user.id %] + <li><a href="/roscms/?page=logout">Logout [% user.name %]</a></li> +[% ELSE %] + <li><a href="/roscms/?page=login&target=%2Fbugzilla">Login</a></li> +[% END %] + <li><a href="/roscms/?page=register&target=%2Fbugzilla">Register</a></li> + </ol> + <p></p> +</div> +</td> + +<td id="bugzillaContent"> +<div class="contentSmall"> +[% INCLUDE global/banner.html.tmpl %] +<span class="contentSmallTitle">ReactOS bug tracking and reporting - [% title %]</span> + +[%# Migration note: the following file corresponds to the old Param + # 'bannerhtml' + #%] <div id="header"> [% INCLUDE global/banner.html.tmpl %] - -<table border="0" cellspacing="0" cellpadding="0" id="titles"> -<tr> - <td id="title"> - <p>[% terms.Bugzilla %] - [% " – $header" IF header %]</p> - </td> - - [% IF subheader %] - <td id="subtitle"> - <p class="subheader">[% subheader %]</p> - </td> - [% END %] - - [% IF header_addl_info %] - <td id="information"> - <p class="header_addl_info">[% header_addl_info %]</p> - </td> - [% END %] -</tr> -</table> [% PROCESS "global/common-links.html.tmpl" btn_id = "find_top" %] Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/index.html.tmpl URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/index.html.tmpl (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/index.html.tmpl Sun Jul 29 17:08:23 2007 @@ -114,29 +114,15 @@ <li id="query"><a href="query.cgi">Search existing [% terms.bug %] reports</a></li> <li id="enter-bug"><a href="enter_bug.cgi">Enter a new [% terms.bug %] report</a></li> <li id="report"><a href="report.cgi">Summary reports and charts</a></li> -[% IF user.id %] - <li id="userprefs"><a href="userprefs.cgi">Change password or user preferences</a></li> - [% IF user.authorizer.can_logout %] - <li id="logout"><a href="relogin.cgi">Log out [% user.login FILTER html %]</a></li> - [% END %] -[% ELSIF user.authorizer.can_login %] - </ul> - [% PROCESS "account/auth/login-small.html.tmpl" %] - <ul> - [% IF Param('createemailregexp') && user.authorizer.user_can_create_account %] - <li id="account"><a href="createaccount.cgi">Open a new [% terms.Bugzilla %] account</a></li> - [% END %] +[% IF NOT user.id %] + <li id="login"><a href="/roscms/?page=login&target=%2Fbugzilla">Log in to an existing account</a></li> + <li id="register"><a href="/roscms/?page=register&target=%2Fbugzilla">Register a new account</a></li> [% END %] <li id="sidebar"><a href="javascript:addSidebar()">Add to Sidebar</a> (requires a Mozilla browser like Mozilla Firefox)</li> <li id="quick_search_plugin"> <a href="javascript:window.external.AddSearchProvider('[% Param('urlbase') %]search_plugin.cgi')">Install the Quick Search plugin</a> (requires Firefox 2 or Internet Explorer 7) </li> - - - [%# List items of links to more things users can do on this installation. %] - [% Hook.process("links") %] - </ul> <form id="f" name="f" action="buglist.cgi" method="get" Modified: trunk/web/reactos.org/htdocs/bugzilla/userprefs.cgi URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/us… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/userprefs.cgi (original) +++ trunk/web/reactos.org/htdocs/bugzilla/userprefs.cgi Sun Jul 29 17:08:23 2007 @@ -70,81 +70,6 @@ } } -sub SaveAccount { - my $cgi = Bugzilla->cgi; - my $dbh = Bugzilla->dbh; - my $user = Bugzilla->user; - - my $pwd1 = $cgi->param('new_password1'); - my $pwd2 = $cgi->param('new_password2'); - - if ($cgi->param('Bugzilla_password') ne "" || - $pwd1 ne "" || $pwd2 ne "") - { - my ($oldcryptedpwd) = $dbh->selectrow_array( - q{SELECT cryptpassword FROM profiles WHERE userid = ?}, - undef, $user->id); - $oldcryptedpwd || ThrowCodeError("unable_to_retrieve_password"); - - if (crypt(scalar($cgi->param('Bugzilla_password')), $oldcryptedpwd) ne - $oldcryptedpwd) - { - ThrowUserError("old_password_incorrect"); - } - - if ($pwd1 ne "" || $pwd2 ne "") - { - $cgi->param('new_password1') - || ThrowUserError("new_password_missing"); - validate_password($pwd1, $pwd2); - - if ($cgi->param('Bugzilla_password') ne $pwd1) { - my $cryptedpassword = bz_crypt($pwd1); - $dbh->do(q{UPDATE profiles - SET cryptpassword = ? - WHERE userid = ?}, - undef, ($cryptedpassword, $user->id)); - - # Invalidate all logins except for the current one - Bugzilla->logout(LOGOUT_KEEP_CURRENT); - } - } - } - - if(Bugzilla->params->{"allowemailchange"} && $cgi->param('new_login_name')) { - my $old_login_name = $cgi->param('Bugzilla_login'); - my $new_login_name = trim($cgi->param('new_login_name')); - - if($old_login_name ne $new_login_name) { - $cgi->param('Bugzilla_password') - || ThrowUserError("old_password_required"); - - use Bugzilla::Token; - # Block multiple email changes for the same user. - if (Bugzilla::Token::HasEmailChangeToken($user->id)) { - ThrowUserError("email_change_in_progress"); - } - - # Before changing an email address, confirm one does not exist. - validate_email_syntax($new_login_name) - || ThrowUserError('illegal_email_address', {addr => $new_login_name}); - is_available_username($new_login_name) - || ThrowUserError("account_exists", {email => $new_login_name}); - - Bugzilla::Token::IssueEmailChangeToken($user->id, $old_login_name, - $new_login_name); - - $vars->{'email_changes_saved'} = 1; - } - } - - my $realname = trim($cgi->param('realname')); - trick_taint($realname); # Only used in a placeholder - $dbh->do("UPDATE profiles SET realname = ? WHERE userid = ?", - undef, ($realname, $user->id)); -} - - sub DoSettings { my $user = Bugzilla->user; @@ -516,7 +441,7 @@ # Do any saving, and then display the current tab. SWITCH: for ($current_tab_name) { /^account$/ && do { - SaveAccount() if $cgi->param('dosave'); + #SaveAccount() if $cgi->param('dosave'); DoAccount(); last SWITCH; };

18 years, 1 month

[cfinck] 27999: Bugzilla 3.0 This is an unmodified Bugzilla, I will commit my modifications in the next commit, so you can easily see what I changed

by cfinck＠svn.reactos.org

18 years, 1 month

[cfinck] 27998: Delete old Bugzilla files

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Jul 29 17:02:58 2007 New Revision: 27998 URL: http://svn.reactos.org/svn/reactos?rev=27998&view=rev Log: Delete old Bugzilla files Removed: trunk/web/reactos.org/htdocs/bugzilla/

18 years, 1 month

[cwittich] 27996: Fix warnings patch by Heis Spiter (heis_spiter at hotmail dot com) See issue #2138 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jul 29 16:08:15 2007 New Revision: 27996 URL: http://svn.reactos.org/svn/reactos?rev=27996&view=rev Log: Fix warnings patch by Heis Spiter (heis_spiter at hotmail dot com) See issue #2138 for more details. Modified: trunk/reactos/dll/directx/dsound/dsound_private.h trunk/reactos/dll/directx/dsound/dxroslayer/dxros_layer.h trunk/reactos/dll/directx/dsound/dxroslayer/dxroslayer.c Modified: trunk/reactos/dll/directx/dsound/dsound_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound_… ============================================================================== --- trunk/reactos/dll/directx/dsound/dsound_private.h (original) +++ trunk/reactos/dll/directx/dsound/dsound_private.h Sun Jul 29 16:08:15 2007 @@ -18,6 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#include "dxroslayer/dxros_layer.h" /* Linux does not support better timing than 10ms */ #define DS_TIME_RES 10 /* Resolution of multimedia timer */ Modified: trunk/reactos/dll/directx/dsound/dxroslayer/dxros_layer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dxrosla… ============================================================================== --- trunk/reactos/dll/directx/dsound/dxroslayer/dxros_layer.h (original) +++ trunk/reactos/dll/directx/dsound/dxroslayer/dxros_layer.h Sun Jul 29 16:08:15 2007 @@ -55,8 +55,8 @@ /* dxroslayers prototypes */ void dxGetGuidFromString( char *in_str, GUID *guid ); -DWORD dxrosdrv_drv_querydsounddesc(int type, HWAVEOUT hwo_out,HWAVEIN hwo_in, PDSDRIVERDESC pDESC); +DWORD dxrosdrv_drv_querydsounddescss(int type, HWAVEOUT hwo_out,HWAVEIN hwo_in, PDSDRIVERDESC pDESC); DWORD dxrosdrv_drv_querydsoundiface(HWAVEIN wDevID, PIDSDRIVER* drv); -DWORD RosWineWineWaveOutMessage(HWAVEOUT hwo, UINT , DWORD_PTR , DWORD_PTR ); -DWORD RosWineWineWaveInMessage(HWAVEIN , UINT , DWORD_PTR , DWORD_PTR ); +DWORD RosWineWaveOutMessage(HWAVEOUT hwo, UINT, DWORD_PTR, DWORD_PTR); +DWORD RosWineWaveInMessage(HWAVEIN, UINT, DWORD_PTR, DWORD_PTR); Modified: trunk/reactos/dll/directx/dsound/dxroslayer/dxroslayer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dxrosla… ============================================================================== --- trunk/reactos/dll/directx/dsound/dxroslayer/dxroslayer.c (original) +++ trunk/reactos/dll/directx/dsound/dxroslayer/dxroslayer.c Sun Jul 29 16:08:15 2007 @@ -85,7 +85,7 @@ break; case DRV_QUERYDSOUNDIFACE: - msg = dxrosdrv_drv_querydsoundiface((HWAVEIN)hwo, (PIDSDRIVER)dwParam1); + msg = dxrosdrv_drv_querydsoundiface((HWAVEIN)hwo, (PIDSDRIVER*)dwParam1); break; default : @@ -104,7 +104,7 @@ break; case DRV_QUERYDSOUNDIFACE: - msg = dxrosdrv_drv_querydsoundiface(hwo, (PIDSDRIVER)dwParam1); + msg = dxrosdrv_drv_querydsoundiface(hwo, (PIDSDRIVER*)dwParam1); break; default :

18 years, 1 month

[cfinck] 27995: Fix fontview build See issue #2477 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Jul 29 14:56:23 2007 New Revision: 27995 URL: http://svn.reactos.org/svn/reactos?rev=27995&view=rev Log: Fix fontview build See issue #2477 for more details. Modified: trunk/rosapps/fontview/fontview.rc trunk/rosapps/fontview/lang/de-DE.rc trunk/rosapps/fontview/lang/en-US.rc trunk/rosapps/fontview/lang/fr-FR.rc trunk/rosapps/fontview/lang/ru-RU.rc trunk/rosapps/fontview/lang/uk-UA.rc Modified: trunk/rosapps/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.rc?rev=2… ============================================================================== --- trunk/rosapps/fontview/fontview.rc (original) +++ trunk/rosapps/fontview/fontview.rc Sun Jul 29 14:56:23 2007 @@ -1,3 +1,6 @@ +#include <windows.h> +#include "resource.h" + LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE Modified: trunk/rosapps/fontview/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/de-DE.rc?rev… ============================================================================== --- trunk/rosapps/fontview/lang/de-DE.rc (original) +++ trunk/rosapps/fontview/lang/de-DE.rc Sun Jul 29 14:56:23 2007 @@ -1,7 +1,3 @@ - -#include "windows.h" -#include "../resource.h" - LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE Modified: trunk/rosapps/fontview/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/en-US.rc?rev… ============================================================================== --- trunk/rosapps/fontview/lang/en-US.rc (original) +++ trunk/rosapps/fontview/lang/en-US.rc Sun Jul 29 14:56:23 2007 @@ -1,7 +1,3 @@ - -#include "windows.h" -#include "../resource.h" - LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE DISCARDABLE Modified: trunk/rosapps/fontview/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/fr-FR.rc?rev… ============================================================================== --- trunk/rosapps/fontview/lang/fr-FR.rc (original) +++ trunk/rosapps/fontview/lang/fr-FR.rc Sun Jul 29 14:56:23 2007 @@ -1,7 +1,3 @@ - -#include "windows.h" -#include "../resource.h" - LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE Modified: trunk/rosapps/fontview/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/ru-RU.rc?rev… ============================================================================== --- trunk/rosapps/fontview/lang/ru-RU.rc (original) +++ trunk/rosapps/fontview/lang/ru-RU.rc Sun Jul 29 14:56:23 2007 @@ -1,7 +1,4 @@ // Russian language resource file (Dmitry Chapyshev, 2007-06-21) - -#include "windows.h" -#include "../resource.h" LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT Modified: trunk/rosapps/fontview/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/uk-UA.rc?rev… ============================================================================== --- trunk/rosapps/fontview/lang/uk-UA.rc (original) +++ trunk/rosapps/fontview/lang/uk-UA.rc Sun Jul 29 14:56:23 2007 @@ -5,9 +5,6 @@ * PURPOSE: Ukraianian Language File for fontview * TRANSLATOR: Artem Reznikov */ - -#include "windows.h" -#include "../resource.h" LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT

18 years, 1 month

[cwittich] 27994: fix bug "Regedit will let you create two identical keys." See issue #2496 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jul 29 14:33:17 2007 New Revision: 27994 URL: http://svn.reactos.org/svn/reactos?rev=27994&view=rev Log: fix bug "Regedit will let you create two identical keys." See issue #2496 for more details. Modified: trunk/reactos/base/applications/regedit/childwnd.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c (original) +++ trunk/reactos/base/applications/regedit/childwnd.c Sun Jul 29 14:33:17 2007 @@ -510,6 +510,7 @@ { LPCTSTR keyPath; HKEY hRootKey; + HKEY hKey = NULL; LPNMTVDISPINFO ptvdi; LONG lResult; @@ -517,9 +518,18 @@ if (ptvdi->item.pszText) { keyPath = GetItemPath(pChildWnd->hTreeWnd, ptvdi->item.hItem, &hRootKey); - lResult = RegRenameKey(hRootKey, keyPath, ptvdi->item.pszText); + if (RegOpenKeyEx(hRootKey, keyPath, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + lResult = REG_OPENED_EXISTING_KEY; + RegCloseKey(hKey); + (void)TreeView_EditLabel(pChildWnd->hTreeWnd, ptvdi->item.hItem); + } + else + { + lResult = RegRenameKey(hRootKey, keyPath, ptvdi->item.pszText); + } return lResult == ERROR_SUCCESS; - } + } } default: return 0;

18 years, 1 month

[greatlrd] 27993: fixing swedish rc syntax fault

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jul 29 14:12:04 2007 New Revision: 27993 URL: http://svn.reactos.org/svn/reactos?rev=27993&view=rev Log: fixing swedish rc syntax fault Modified: trunk/reactos/dll/win32/shdocvw/Sv.rc Modified: trunk/reactos/dll/win32/shdocvw/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Sv.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Sv.rc (original) +++ trunk/reactos/dll/win32/shdocvw/Sv.rc Sun Jul 29 14:12:04 2007 @@ -30,6 +30,5 @@ STRINGTABLE BEGIN - 1001 "Programmet kräver en ActiveX-komponent som inte är tillgänglig.\n" - "Vill du ladda ner och installera Mozillas ActiveX-komponent?" + 1001 "Programmet kräver en ActiveX-komponent som inte är tillgänglig.\nVill du ladda ner och installera Mozillas ActiveX-komponent?" END

18 years, 1 month

[cwittich] 27992: greek translations by Apal (grad0621 at di dot uoa dot gr) See issue #2483 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jul 29 13:53:59 2007 New Revision: 27992 URL: http://svn.reactos.org/svn/reactos?rev=27992&view=rev Log: greek translations by Apal (grad0621 at di dot uoa dot gr) See issue #2483 for more details. Added: trunk/reactos/base/setup/vmwinst/lang/el-GR.rc trunk/reactos/base/system/winlogon/lang/el-GR.rc trunk/reactos/dll/win32/newdev/lang/el-GR.rc Modified: trunk/reactos/base/setup/vmwinst/rsrc.rc trunk/reactos/base/system/winlogon/rsrc.rc trunk/reactos/dll/win32/newdev/rsrc.rc Added: trunk/reactos/base/setup/vmwinst/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/el… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/el-GR.rc (added) +++ trunk/reactos/base/setup/vmwinst/lang/el-GR.rc Sun Jul 29 13:53:59 2007 @@ -1,0 +1,131 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÅãêáôÜóôáóç Ïäçãïý Âßíôåï" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ç åãêáôÜóôáóç ôïõ ReactOS áíß÷íåõóå üôé ôñÝ÷åôå ôï ReactOS ìÝóá áðü ôï VMware(r).", -1, 100, 8, 160, 24 + LTEXT "Áí èÝëåôå íá åãêáôáóôÞóåôå ôçí VMware(r) SVGA driver ðáôÞóôå 'Åðüìåíï', áëëéþò ðáôÞóôå 'Áêýñùóç'.", -1, 100, 140, 160, 24 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÅãêáôÜóôáóç Ïäçãïý Âßíôåï" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ç åãêáôÜóôáóç ôïõ ReactOS äå óõìðåñéëáìâÜíåé ôïí ïäçãü ôçò VMware(r) SVGA.\n\nÐñÝðåé ëïéðüí íá ðÜôå óôçí åðéëïãÞ 'VM' óôï VMware(r) workstation menu bar óáò êáé íá åðéëÝîåôå 'Install VMware tools...'\n\n\nÐáôÞóôå 'Åðüìåíï' ãéá íá óõíå÷ßóåôå Þ 'Áêýñùóç' ãéá íá ðñïóðåñÜóåôå ôçí åãêáôÜóôáóç ôïõ ïäçïý ôçò SVGA.",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÅãêáôÜóôáóç Ïäçãïý Âßíôåï" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÅãêáôÜóôáóç Ïäçãïý Âßíôåï" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ï ïäçãüò ôçò VMware(r) SVGA åãêáôáóôÜèçêå åðéôõ÷þò. Ðáñáêáëþ åðéëÝîôå ôçí áãáðçìÝíç óáò áíÜëõóç ïèüíçò:",-1,25,5,225,20 + PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT "Ðáñáêáëþ åðéëÝîôå ôçí áãáðçìÝíç óáò ðïéüôçôá ÷ñþìáôïò:", -1, 25, 93, 225, 12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÅãêáôÜóôáóç Ïäçãïý Âßíôåï" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ç åãêáôÜóôáóç ôïõ ReactOS äå ìðüñåóå íá åãêáôáóôÞóåé ôïí ïäçãü ôçò VMware(r) SVGA.\n\n\nÐáôÞóôå 'ÏëïêëÞñùóç' ãéá íá óõíå÷ßóåôå ôç äéáäéêáóßá åãêáôÜóôáóçò.",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÅãêáôÜóôáóç Ïäçãïý Âßíôåï" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ï ïäçãüò ôçò VMware(r) SVGA åßíáé Þäç åãêáôåóôÞìÝíïò.\n\nÐáñáêáëþ åðéëÝîôå ôé èÝëåôå íá êÜíåôå:",-1,25,5,225,30 + PUSHBUTTON "Ñýèìéóç ôçò ïèüíçò", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "×ñÞóç Üëëïõ ïäçãïý ãñáöéêþí", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ÁðåãêáôÜóôáóç ôïõ ïäçãïý ôçò VMware(r) SVGA", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "ÐáôÞóôå 'Åðüìåíï' ãéá íá óõíå÷ßóåôå Þ 'Áêýñùóç' ãéá íá êëåßóåôå ôï âïçèü.", -1, 25, 93, 225, 19 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÅãêáôÜóôáóç Ïäçãïý Âßíôåï" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ðáñáêáëþ åðéëÝîôå ôïí ïäçãü ãñáöéêþí ðïõ èÝëåôå íá ÷ñçóéìïðïéÞóåôå:",-1,25,25,225,15 + PUSHBUTTON "Ïäçãüò ReactOS VGA", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Ïäçãüò ReactOS VBE (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "ÐáôÞóôå 'ÏëïêëÞñùóç' ãéá íá ïëïêëçñþóåôå ôç äéáäéêáóßá Þ 'Áêýñùóç' ãéá íá áðï÷ùñÞóåôå áðü ôçí åãêáôÜóôáóç ÷ùñßò áëëáãÝò.", -1, 25, 93, 225, 20 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÅãêáôÜóôáóç Ïäçãïý Âßíôåï" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ç åãêáôÜóôáóç ôïõ ReactOS åßíáé Ýôïéìç íá áðåãêáôáóôÞóåé ôïí ïäçãü ôçò VMware(r) SVGA!!!\n\n\nÐáôÞóôå 'ÏëïêëÞñùóç' ãéá íá áðåãêáôáóôÞóåôå ôïí ïäçãü Þ 'Áêýñùóç' ãéá íá ôïí áöÞóåôå üðùò åßíáé.",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "Áíé÷íåýèçêå VMware(r)" + IDS_FAILEDTOLOCATEDRIVERS "Ç åãêáôÜóôáóç ôïõ ReactOS äå ìðüñåóå íá âñåé ôá áðáéôïýìåíá áñ÷åßá.\nÐáñáêáëþ âåâáéùèåßôå üôé ôï VMware(r) tools CD-ROM åßíáé ìÝóá." + IDS_FAILEDTOCOPYFILES "Ç åãêáôÜóôáóç ôïõ ReactOS áðÝôõ÷å íá áíôéãñÜøåé ôá áðáéôïýìåíá áñ÷åßá.\nÐáñáêáëþ âåâáéùèåßôå üôé ôï VMware(r) tools CD-ROM åßíáé ìÝóá.\n" + IDS_FAILEDTOACTIVATEDRIVER "Áðïôõ÷ßá åíåñãïðïßçóçò ôïõ ïäçãïý VMware(r) SVGA!" + IDS_FAILEDTOSELVGADRIVER "Áðïôõ÷ßá åíåñãïðïßçóçò ôïõ ïäçãïý ReactOS VGA!" + IDS_FAILEDTOSELVBEDRIVER "Áðïôõ÷ßá åíåñãïðïßçóçò ôïõ ïäçãïý ReactOS VBE!" + IDS_UNINSTNOTICE "Ôá áñ÷åßá ôïõ ïäçãïý ôçò VMware(r) SVGA äåí Ý÷ïõí äéáãñáöåß áêüìá.\nÐáñáêáëþ äéáãñÜøôå ôá ÷åéñïêßíçôá ìåôÜ áðü ìéá åðáíåêêßíçóç ôïõ õðïëïãéóôÞ." + IDS_FAILEDTOADDREGENTRIES "Áðïôõ÷ßá äçìéïõñãßáò êëåéäéþí óôç registry ãéá ôïí ïäçãü ôçò VMware(r) SVGA!" +END + +STRINGTABLE +BEGIN + 10001 "Êáôþôáôç (8BPP)" + 10002 "ÌÝôñéá (16BPP)" + 10003 "ÕøçëÞ (32BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "ÁíáæÞôçóç ãéá ôï VMware(r) Tools CD-ROM..." + IDS_COPYINGFILES "ÁíôéãñáöÞ áñ÷åßùí..." + IDS_ENABLINGDRIVER "Ãßíåôáé åíåñãïðïßçóç ôïõ ïäçãïý ôçò VMware(r) SVGA..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "Âïçèüò åãêáôÜóôáóçò ôïõ ïäçãïý ôçò VMware (r) SVGA" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "Ðáñáêáëþ åéóÜãåôå ôï VMware tool CD-Rom." + IDD_INSTALLING_VMWARE_TOOLSTITLE "Âïçèüò åãêáôÜóôáóçò ôïõ ïäçãïý ôçò VMware (r) SVGA" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "ÁíáæÞôçóç êáé áíôéãñáöÞ ôïõ ïäçãïý ôçò VMware (r) SVGA." + IDD_CONFIGTITLE "Âïçèüò åãêáôÜóôáóçò ôïõ ïäçãïý ôçò VMware (r) SVGA" + IDD_CONFIGSUBTITLE "ÅðéëÝîôå ôçí åðéèõìçôÞ áíÜëõóç ïèüíçò." + IDD_INSTALLATION_FAILEDTITLE "Âïçèüò åãêáôÜóôáóçò ôïõ ïäçãïý ôçò VMware (r) SVGA" + IDD_INSTALLATION_FAILEDSUBTITLE "Ç åãêáôÜóôáóç ôïõ ïäçãïý ôçò VMware (r) SVGA áðÝôõ÷å." + IDD_CHOOSEACTIONTITLE "Âïçèüò åãêáôÜóôáóçò ôïõ ïäçãïý ôçò VMware (r) SVGA" + IDD_CHOOSEACTIONSUBTITLE "ÅðéëÝîôå ôé èÝëåôå íá êÜíåôå." + IDD_SELECTDRIVERTITLE "Âïçèüò åãêáôÜóôáóçò ôïõ ïäçãïý ôçò VMware (r) SVGA" + IDD_SELECTDRIVERSUBTITLE "ÅðéëÝîôå Ýíáí ïäçãü." + IDD_DOUNINSTALLTITLE "Âïçèüò åãêáôÜóôáóçò ôïõ ïäçãïý ôçò VMware (r) SVGA" + IDD_DOUNINSTALLSUBTITLE "ÁðåãêáôÜóôáóç ôïõ ïäçãïý." +END Modified: trunk/reactos/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/vmwinst/rsrc.rc (original) +++ trunk/reactos/base/setup/vmwinst/rsrc.rc Sun Jul 29 13:53:59 2007 @@ -17,6 +17,7 @@ #include "lang/cs-CZ.rc" #include "lang/da-DK.rc" #include "lang/de-DE.rc" +#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" Added: trunk/reactos/base/system/winlogon/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… ============================================================================== --- trunk/reactos/base/system/winlogon/lang/el-GR.rc (added) +++ trunk/reactos/base/system/winlogon/lang/el-GR.rc Sun Jul 29 13:53:59 2007 @@ -1,0 +1,44 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ôåñìáôéóìüò ÕðïëïãéóôÞ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ôþñá åßíáé áóöáëÝò íá êëåßóåôå ôïí õðïëïãéóôÞ óáò.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 + DEFPUSHBUTTON "&Åðáíåêêßíçóç", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 +END + +IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Áðïôõ÷ßá ÄéåðáöÞò ×ñÞóôç" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ç Logon ÄéåðáöÞ ×ñÞóôç DLL %s áðÝôõ÷å íá öïñôùèåß.", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Åðéêïéíùíåßóôå ìå ôïí äéá÷åéñéóôÞ ôïõ óõóôÞìáôüò óáò ãéá íá áíôéêáôáóôÞóåé ôï DLL, Þ íá åðáíáöÝñåé ôï áñ÷éêü DLL.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 +END + +STRINGTABLE +BEGIN + IDS_PREPARENETWORKCONNECTIONS "Ãßíåôáé ðñïåôïéìáóßá ôùí óõíäÝóåùí äéêôýïõ..." + IDS_APPLYINGCOMPUTERSETTINGS "Ãßíåôáé åöáñìïãÞ ôùí ñõèìßóåùí ôïõ õðïëïãéóôÞ..." + IDS_RUNNINGSTARTUPSCRIPTS "Running startup scripts..." + IDS_RUNNINGSHUTDOWNSCRIPTS "Running shutdown scripts..." + IDS_APPLYINGYOURPERSONALSETTINGS "Ãßíåôáé åöáñìïãÞ ôùí ðñïóùðéêþí óáò ñõèìßóåùí..." + IDS_RUNNINGLOGOFFSCRIPTS "Running logoff scripts..." + IDS_RUNNINGLOGONSCRIPTS "Running logon scripts..." + IDS_LOADINGYOURPERSONALSETTINGS "Ãßíåôáé öüñôùóç ôùí ñõèìßóåþí óáò..." + IDS_CLOSINGNETWORKCONNECTIONS "Closing network connections..." + IDS_REACTOSISSHUTTINGDOWN "Ôï ReactOS ôåñìáôßæåé..." + IDS_PREPARETOSTANDBY "Ãßíåôáé ðñïåôïéìáóßá ãéá áíáìïíÞ..." + IDS_PREPARETOHIBERNATE "Preparing to Hibernate..." + IDS_SAVEYOURSETTINGS "Ãßíåôáé áðïèÞêåõóç ôùí ñõèìßóåþí óáò..." + IDS_REACTOSISSTARTINGUP "Ôï ReactOS îåêéíÜ..." +END + +STRINGTABLE +BEGIN + IDS_FAILEDACTIVATEUSERSHELL "Winlogon failed to activate user shell!" +END Modified: trunk/reactos/base/system/winlogon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/rsrc.… ============================================================================== --- trunk/reactos/base/system/winlogon/rsrc.rc (original) +++ trunk/reactos/base/system/winlogon/rsrc.rc Sun Jul 29 13:53:59 2007 @@ -8,6 +8,7 @@ #include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/el-GR.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" Added: trunk/reactos/dll/win32/newdev/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/el-G… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/el-GR.rc (added) +++ trunk/reactos/dll/win32/newdev/lang/el-GR.rc Sun Jul 29 13:53:59 2007 @@ -1,0 +1,108 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "ÅãêáôÜóôáóç Óõóêåõþí" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Êáëþò Þëèáôå",IDC_WELCOMETITLE,120,8,195,24 + LTEXT "Áõôüò ï âïçèüò åãêáèéóôÜ Ýíáí ïäçãü óõóêåõÞò ãéá ôï:", + IDC_STATIC,120,21,195,16 + LTEXT "ÐáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå.",IDC_STATIC,120,169,195,17 + LTEXT "ÁÃÍÙÓÔÇ ÓÕÓÊÅÕÇ",IDC_DEVICE,134,36,164,11 + LTEXT "ÐÑÏÅÉÄÏÐÏÉÇÓÇ! INSTALLING A CUSTOM DEVICE MAY FREEZE YOUR COMPUTER OR RENDER IT UNBOOTABLE!",IDC_STATIC,120,59,195,16 + CONTROL "Áõôüáìôç åãêáôÜóôáóç ïäçãïý",IDC_RADIO_AUTO,"Button", + BS_AUTORADIOBUTTON,120,112,178,13 + CONTROL "ÅãêáôÜóôáóç ïäçãïý áðü óõãêåêñéìÝíç ôïðïèåóßá",IDC_RADIO_MANUAL, + "Button",BS_AUTORADIOBUTTON,120,133,164,14 +END + +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "ÅãêáôÜóôáóç Óõóêåõþí" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ç åãêáôÜóôáóç áðÝôõ÷å",IDC_FINISHTITLE,120,8,195,24 + LTEXT "Ç óõóêåõÞ äåí Þôáí äõíáôüí íá åãêáôáóôáèåß åðåéäÞ ï ïäçãüò äå âñÝèçêå.", + IDC_STATIC,120,40,195,19 + LTEXT "Click on Back if you have a driver disk or know the path to the driver.", + IDC_STATIC,120,98,181,24 + CONTROL "Íá ìçí åìöáíéóôåß áõôü ôï ðáñÜèõñï îáíÜ",IDC_DONOTSHOWDLG,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 +END + +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "ÅãêáôÜóôáóç Óõóêåõþí" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ç åãêáôÜóôáóç áðÝôõ÷å",IDC_FINISHTITLE,120,8,195,24 + LTEXT "Ç óõóêåõÞ äåí Þôáí äõíáôüí íá åãêáôáóôáèåß ãéáôß óõíÝâç Ýíá áðñüóìåíï ëÜèïò.", + IDC_STATIC,120,40,195,19 + LTEXT "ÁÃÍÙÓÔÇ ÓÕÓÊÅÕÇ",IDC_DEVICE,134,55,164,11 +END + +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ÅãêáôÜóôáóç Óõóêåõþí" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "¸ñåõíá óå áõôÝò ôéò ôïðïèåóßåò",IDC_RADIO_SEARCHHERE,"Button", + BS_AUTORADIOBUTTON,27,11,239,13 + CONTROL "ÅðéëïãÞ ôïõ ïäçãïý ÷åéñïêßíçôá",IDC_RADIO_CHOOSE,"Button", + BS_AUTORADIOBUTTON,27,98,171,12 + CONTROL "¸ñåõíá óå áöáéñïýìåíåò óõóêåõÝò",IDC_CHECK_MEDIA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9 + CONTROL "Íá óõìðåñéëçöèåß êáé áõôü ôï ìïíïðÜôé",IDC_CHECK_PATH,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,47,54,162,10 + PUSHBUTTON "ÁíáæÞôçóç",IDC_BROWSE,248,69,50,14 + COMBOBOX IDC_COMBO_PATH,61,71,176,12,CBS_DROPDOWN | CBS_SORT | + WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL +END + +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ÅãêáôÜóôáóç Óõóêåõþí" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÁÃÍÙÓÔÇ ÓÕÓÊÅÕÇ",IDC_DEVICE,51,20,169,16 +END + +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ÅãêáôÜóôáóç Óõóêåõþí" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÁÃÍÙÓÔÇ ÓÕÓÊÅÕÇ",IDC_DEVICE,51,20,169,16 +END + +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "ÅãêáôÜóôáóç Óõóêåõþí" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ç åãêáôÜóôáóç ïëïêëçñþèçêå",IDC_FINISHTITLE,120,8,195,11 + LTEXT "ÐñÝðåé íá åðáíåêêéíÞóåôå ôïí õðïëïãéóôÞ óáò ãéá íá ïëïêëçñþóåôå ôçí åãêáôÜóôáóç ôïõ:", + IDC_STATIC,120,32,195,19 + LTEXT "ÐáôÞóôå ÏëïêëÞñùóç ãéá íá êëåßóåôå ôïí âïçèü.",IDC_STATIC,120,174, + 179,11 + LTEXT "ÁÃÍÙÓÔÇ ÓÕÓÊÅÕÇ",IDC_DEVICE,148,53,147,12 +END + +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "ÅãêáôÜóôáóç Óõóêåõþí" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ç åãêáôÜóôáóç ïëïêëçñþèçêå",IDC_FINISHTITLE,120,8,195,11 + LTEXT "Ï âïçèüò ïëïêëÞñùóå ôçí åãêáôÜóôáóç ïäçãïý ãéá ôï:", + IDC_STATIC,120,32,195,19 + LTEXT "ÐáôÞóôå ÏëïêëÞñùóç ãéá íá êëåßóåôå ôïí âïçèü.",IDC_STATIC,120,174, + 179,11 + LTEXT "ÁÃÍÙÓÔÇ ÓÕÓÊÅÕÇ",IDC_DEVICE,148,53,147,12 +END Modified: trunk/reactos/dll/win32/newdev/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/newdev/rsrc.rc (original) +++ trunk/reactos/dll/win32/newdev/rsrc.rc Sun Jul 29 13:53:59 2007 @@ -18,3 +18,4 @@ #include "lang/ru-RU.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" +#include "lang/el-GR.rc"

18 years, 1 month

[greatlrd] 27991: fixing the langues show right, no more wrong langues show ; )

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jul 29 13:06:41 2007 New Revision: 27991 URL: http://svn.reactos.org/svn/reactos?rev=27991&view=rev Log: fixing the langues show right, no more wrong langues show ;) Modified: trunk/rosapps/winver/winver.rbuild Modified: trunk/rosapps/winver/winver.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winver/winver.rbuild?rev=2… ============================================================================== --- trunk/rosapps/winver/winver.rbuild (original) +++ trunk/rosapps/winver/winver.rbuild Sun Jul 29 13:06:41 2007 @@ -1,4 +1,4 @@ -<module name="winver" type="win32gui" installbase="system32" installname="winver.exe" usewrc="false"> +<module name="winver" type="win32gui" installbase="system32" installname="winver.exe" > <include base="winver">.</include> <define name="__USE_W32API" /> <define name="UNICODE" />

18 years, 1 month

[greatlrd] 27990: fixing the langues show right, no more wrong langues show ; )

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jul 29 13:05:42 2007 New Revision: 27990 URL: http://svn.reactos.org/svn/reactos?rev=27990&view=rev Log: fixing the langues show right, no more wrong langues show ;) Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild (original) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild Sun Jul 29 13:05:42 2007 @@ -1,4 +1,4 @@ -<module name="odbccp32i" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.cpl" usewrc="false"> +<module name="odbccp32i" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.cpl" > <importlibrary definition="odbccp32.def" /> <include base="odbccp32">.</include> <define name="UNICODE" />

18 years, 1 month

← Newer
1
...
4
5
6
7
8
9
10
...
71
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 July 2007