wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

André Hentschel : winelib: Use winecfg to set a DllOverride.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: docs Branch: master Commit: 50b65515fd7f8c42bd046450413d66f9ec5ee8d1 URL: http://source.winehq.org/git/docs.git/?a=commit;h=50b65515fd7f8c42bd0464504… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 4 02:44:49 2013 +0200 winelib: Use winecfg to set a DllOverride. --- en/winelib-bindlls.sgml | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/en/winelib-bindlls.sgml b/en/winelib-bindlls.sgml index 54fb63a..f978780 100644 --- a/en/winelib-bindlls.sgml +++ b/en/winelib-bindlls.sgml @@ -255,13 +255,8 @@ signed short WINAPI MyProxyWinFunc (unsigned short a, void *b, void *c, If you have both a Windows DLL and a Linux DLL/proxy pair then you will have to ensure that the correct one gets called. The easiest way is probably simply to rename the windows version so that it doesn't get - detected. Alternatively you could specify in the DllOverrides section - (or the AppDefaults\\myprog.exe\\DllOverrides section) of the config - file (in your .wine directory) that the built-in version be used. Note - that if the Windows version Dll is present and is in the same - directory as the executable (as opposed to being in the Windows - directory) then you will currently need to specify the whole path to - the dll, not merely its name. + detected. Alternatively you could set a DLL override with winecfg, + so that the built-in version is used. </para> <para> Once you have done this you should be using the Linux Shared Object

1 0

Francois Gouget : testbot/Users: Add a 'Reject' button for accounts waiting for approval.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: tools Branch: master Commit: e92578b7804177c3af9b9954781eb685d3c8bcc8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e92578b7804177c3af9b9954… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 4 12:29:44 2013 +0200 testbot/Users: Add a 'Reject' button for accounts waiting for approval. --- testbot/README | 4 ++-- testbot/web/admin/UserDetails.pl | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/testbot/README b/testbot/README index 7ddaba9..3977c5d 100644 --- a/testbot/README +++ b/testbot/README @@ -78,8 +78,8 @@ but has to be 'activated' before it can be used. Also an email is sent to the WineTestBot administrators. If the request is considered to be illegitimate / spam, the administrator -should directly delete the provisional account. Otherwise the account should -be approved. +should directly delete / reject the provisional account. Otherwise the account +should be approved. Approving the account will generate a 'password reset code' and send an email to the user with a URL to visit to set the account password. That will activate diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index f9c1bea..faf8bbd 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -57,7 +57,8 @@ sub GetActions my @Actions; if (!defined $LDAPServer and $self->{Item}->WaitingForApproval()) { - $Actions[0] = "Approve"; + push @Actions, "Approve"; + push @Actions, "Reject" if ($self->{Item}->Name); } push(@Actions, @{$self->SUPER::GetActions()}); @@ -76,6 +77,19 @@ sub OnApprove($) exit; } +sub OnReject($) +{ + my $self = shift; + + $self->{Item}->Status('deleted'); + ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save(); + return !1 if (defined $self->{ErrMessage}); + # Forcefully log out that user by deleting his web sessions + DeleteSessions($self->{Item}); + $self->RedirectToList(); + exit; +} + sub OnOK($) { my $self = shift; @@ -99,6 +113,10 @@ sub OnAction { return $self->OnApprove(); } + elsif ($Action eq "Reject") + { + return $self->OnReject(); + } elsif ($Action eq "OK") { return $self->OnOK();

1 0

Francois Gouget : testbot/Users: Forcefully log out the user as soon as the account is disabled or deleted.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: tools Branch: master Commit: 77129d2e16eaa902fcbb86a09bbd00d63634a053 URL: http://source.winehq.org/git/tools.git/?a=commit;h=77129d2e16eaa902fcbb86a0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 4 12:14:34 2013 +0200 testbot/Users: Forcefully log out the user as soon as the account is disabled or deleted. Still delete any left-over session in Janitor.pl just in case. --- testbot/web/admin/UserDetails.pl | 19 +++++++++++++++++++ testbot/web/admin/UsersList.pl | 29 +++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index bc56eec..f9c1bea 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -22,6 +22,7 @@ use strict; package UserDetailsPage; use ObjectModel::CGI::ItemPage; +use WineTestBot::CGI::Sessions; use WineTestBot::Config; use WineTestBot::Users; @@ -75,6 +76,20 @@ sub OnApprove($) exit; } +sub OnOK($) +{ + my $self = shift; + + return !1 if (!$self->Save()); + if ($self->{Item}->Status ne 'active') + { + # Forcefully log out that user by deleting his web sessions + DeleteSessions($self->{Item}); + } + $self->RedirectToList(); + exit; +} + sub OnAction { my $self = shift; @@ -84,6 +99,10 @@ sub OnAction { return $self->OnApprove(); } + elsif ($Action eq "OK") + { + return $self->OnOK(); + } return $self->SUPER::OnAction(@_); } diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 4971f99..5148394 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -23,6 +23,7 @@ package UsersListPage; use ObjectModel::PropertyDescriptor; use ObjectModel::CGI::CollectionPage; +use WineTestBot::CGI::Sessions; use WineTestBot::Config; use WineTestBot::Users; @@ -69,6 +70,34 @@ sub GetActions return $self->SUPER::GetActions(@_); } +sub OnAction +{ + my $self = shift; + my ($CollectionBlock, $Action) = @_; + + if ($Action eq "Delete") + { + foreach my $UserName (@{$self->{Collection}->GetKeys()}) + { + next if (!defined $self->GetParam($CollectionBlock->SelName($UserName))); + my $User = $self->{Collection}->GetItem($UserName); + $User->Status('deleted'); + my ($ErrProperty, $ErrMessage) = $User->Save(); + if (defined $ErrMessage) + { + $self->{ErrMessage} = $ErrMessage; + return !1; + } + # Forcefully log out that user by deleting his web sessions + DeleteSessions($User); + } + return 1; + } + + return $self->SUPER::OnAction(@_); +} + + package main; my $Request = shift;

1 0

Francois Gouget : testbot/Users: Fix the deletion of user accounts.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: tools Branch: master Commit: 2411c853ce53830a32569c22a3b7ec4f08e094b3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2411c853ce53830a32569c22… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 4 12:14:10 2013 +0200 testbot/Users: Fix the deletion of user accounts. Users cannot be deleted directly because the Jobs table hold references to them. So mark the accounts as deleted and let the Janitor.pl script delete them when they are not referenced anymore. To do so, transform the 'Active' boolean field into a 'Status' enumeration that can be 'active' (previously Active=Y), 'disabled' (Active=N) or 'deleted'. The Sessions table also contains references to the Users, but these should be deleted together with the user account, which will forcefully log out the user as a side effect. --- testbot/README | 4 +- testbot/bin/Janitor.pl | 63 +++++++++++++++++++++++++------ testbot/ddl/update25.sql | 17 ++++++++ testbot/ddl/winetestbot.sql | 6 +- testbot/doc/winetestbot-schema.dia | 4 +- testbot/lib/WineTestBot/CGI/Sessions.pm | 11 +++++- testbot/lib/WineTestBot/Users.pm | 17 ++++---- testbot/web/Register.pl | 2 +- testbot/web/admin/UsersList.pl | 4 +- 9 files changed, 98 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=2411c853ce53830a3256…

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: a62b7679356abde12a0d4c86926d010099d1393b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62b7679356abde12a0d4c869… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 16:24:00 2013 +0200 msvcp: Sync spec files. --- dlls/msvcp110/msvcp110.spec | 1804 +++++++++++++++++++++--------------------- dlls/msvcp70/msvcp70.spec | 48 +- dlls/msvcp80/msvcp80.spec | 52 +- 3 files changed, 952 insertions(+), 952 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a62b7679356abde12a0d4…

1 0

Piotr Caban : msvcp100: Add arm exports.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 991efb93c975e8a85a8c787022596f9362c73106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=991efb93c975e8a85a8c78702… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 16:23:47 2013 +0200 msvcp100: Add arm exports. --- dlls/msvcp100/msvcp100.spec | 101 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=991efb93c975e8a85a8c7…

1 0

Piotr Caban : msvcp90: Add arm exports.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 96761461d83de9f50bc0bb1abdcf5e187ad05214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96761461d83de9f50bc0bb1ab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 16:23:12 2013 +0200 msvcp90: Add arm exports. --- dlls/msvcp90/msvcp90.spec | 745 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 745 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96761461d83de9f50bc0b…

1 0

Piotr Caban : msvcp: Change architecture of more thiscall functions.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 1f2aceb5beff2804c06d665677f5929e57fd4f59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2aceb5beff2804c06d66567… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 16:23:00 2013 +0200 msvcp: Change architecture of more thiscall functions. --- dlls/msvcp100/msvcp100.spec | 64 +++++++++++++++++++++--------------------- dlls/msvcp90/msvcp90.spec | 52 +++++++++++++++++----------------- 2 files changed, 58 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f2aceb5beff2804c06d6…

1 0

André Hentschel : kernel32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: b815548cf07a343fae3afa470ef669de86c8f6e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b815548cf07a343fae3afa470… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 3 17:26:22 2013 +0200 kernel32/tests: Don't test function directly when reporting GetLastError(). --- dlls/msvcrt/tests/locale.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 257e3c8..63f8a59 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -713,8 +713,9 @@ static void test__Gettnames(void) ok(!strcmp(ret->str[39], "PM"), "ret->str[39] = %s\n", ret->str[39]); ok(!strcmp(ret->str[40], "M/d/yyyy") || broken(!strcmp(ret->str[40], "M/d/yy"))/*NT*/, "ret->str[40] = %s\n", ret->str[40]); - ok(GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), LOCALE_SLONGDATE|LOCALE_NOUSEROVERRIDE, - buf, sizeof(buf)) != 0, "GetLocaleInfo failed: %x\n", GetLastError()); + size = GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), + LOCALE_SLONGDATE|LOCALE_NOUSEROVERRIDE, buf, sizeof(buf)); + ok(size, "GetLocaleInfo failed: %x\n", GetLastError()); ok(!strcmp(ret->str[41], buf), "ret->str[41] = %s, expected %s\n", ret->str[41], buf); free(ret);

1 0

Francois Gouget : ieframe: Make dump_travellog() static.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: a5d61eef629358c879f760e3694660ea74f0afb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d61eef629358c879f760e36… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 3 16:07:44 2013 +0200 ieframe: Make dump_travellog() static. --- dlls/ieframe/dochost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 7522c38..c717d8b 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -363,7 +363,7 @@ static IStream *get_travellog_stream(DocHost *This) return stream; } -void dump_travellog(DocHost *This) +static void dump_travellog(DocHost *This) { unsigned i;

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
58
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

2003

2002

2001

wine-commits April 2013