April 2022 - Wine-commits - list.winehq.org

Francois Gouget : testbot: The last GetTaskURL() parameter is in fact a log name.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: tools Branch: master Commit: a332ac13efd3a29bf305dc2048992a95b1233567 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a332ac13efd3a29bf305dc2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:14:25 2022 +0200 testbot: The last GetTaskURL() parameter is in fact a log name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Utils.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index d93a938..13529c3 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -34,6 +34,7 @@ our @EXPORT = qw(SecureConnection MakeSecureURL GetTaskURL GenerateRandomString BatchQuote ShQuote ShArgv2Cmd); use Fcntl qw(O_CREAT O_EXCL O_WRONLY); +use URI::Escape; use WineTestBot::Config; @@ -84,11 +85,11 @@ sub MakeSecureURL($) sub GetTaskURL($$$;$$) { - my ($JobId, $StepNo, $TaskNo, $ShowScreenshot, $ShowLog) = @_; + my ($JobId, $StepNo, $TaskNo, $ShowScreenshot, $LogName) = @_; my $StepTask = 100 * $StepNo + $TaskNo; my $URL = "/JobDetails.pl?Key=$JobId"; $URL .= "&s$StepTask=1" if ($ShowScreenshot); - $URL .= "&f$StepTask=$ShowLog" if ($ShowLog); + $URL .= "&f$StepTask=". uri_escape($LogName) if ($LogName); return "$URL#k$StepTask"; }

1 0

Francois Gouget : testbot/cgi: PageBase does not need Apache2::ServerRec.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: tools Branch: master Commit: f7d0771f1a9ab5efb2444a2c70ecdbe31095f1a2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f7d0771f1a9ab5efb2444a2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:14:36 2022 +0200 testbot/cgi: PageBase does not need Apache2::ServerRec. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index f76a15f..06dba89 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -39,7 +39,6 @@ use Exporter 'import'; our @EXPORT = qw(CreatePageBase); use Apache2::Const -compile => qw(REDIRECT); -use Apache2::ServerRec; use CGI::Cookie; use URI::Escape; use WineTestBot::CGI::Sessions;

1 0

Francois Gouget : testbot/cgi: Sessions does not need CGI::Cookie.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: tools Branch: master Commit: 5377631158b5723dfe18893c56cd84af82063fbb URL: https://source.winehq.org/git/tools.git/?a=commit;h=5377631158b5723dfe18893… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:14:41 2022 +0200 testbot/cgi: Sessions does not need CGI::Cookie. Getting and setting cookies is done through the PageBase class. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/Sessions.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 4ca62ba..39634e3 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -55,7 +55,6 @@ our @ISA = qw(WineTestBot::WineTestBotCollection); our @EXPORT = qw(CreateSessions DeleteSessions NewSession); use Bytes::Random::Secure; -use CGI::Cookie; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor;

1 0

Francois Gouget : testbot/web: Use SimpleCollectionPage for the users page.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: tools Branch: master Commit: 37c125fa262e4a9cdffc7b1388ab7d21299a7cb4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=37c125fa262e4a9cdffc7b1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:14:58 2022 +0200 testbot/web: Use SimpleCollectionPage for the users page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/UsersList.pl | 62 ++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index ae514e9..08ae5bf 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -2,7 +2,7 @@ # User list page # # Copyright 2009 Ge van Geldorp -# Copyright 2013 Francois Gouget +# Copyright 2013, 2022 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -20,45 +20,35 @@ use strict; -package UsersListPage; +package UsersBlock; -use ObjectModel::CGI::CollectionPage; -our @ISA = qw(ObjectModel::CGI::CollectionPage); +use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); use URI::Escape; use WineTestBot::CGI::Sessions; use WineTestBot::Config; -use WineTestBot::Users; - - -sub _initialize($$$) -{ - my ($self, $Request, $RequiredRole) = @_; - $self->SUPER::_initialize($Request, $RequiredRole, CreateUsers()); -} -sub SortKeys($$$) +sub Create($$) { - my ($self, $CollectionBlock, $Keys) = @_; + my ($Collection, $EnclosingPage) = @_; - my @SortedKeys = sort { $a cmp $b } @$Keys; - return \@SortedKeys; + return UsersBlock->new($Collection, $EnclosingPage); } -sub DisplayProperty($$$) +sub DisplayProperty($$) { - my ($self, $CollectionBlock, $PropertyDescriptor) = @_; + my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "EMail" || $PropertyName eq "Status" || $PropertyName eq "RealName"; } -sub GenerateDataCell($$$$$) +sub GenerateDataCell($$$$) { - my ($self, $CollectionBlock, $User, $PropertyDescriptor, $DetailsPage) = @_; + my ($self, $User, $PropertyDescriptor, $DetailsPage) = @_; my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Status") @@ -98,41 +88,47 @@ sub GenerateDataCell($$$$$) } else { - $self->SUPER::GenerateDataCell($CollectionBlock, $User, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataCell($User, $PropertyDescriptor, $DetailsPage); } } -sub GetItemActions($$) +sub GetItemActions($) { - my ($self, $CollectionBlock) = @_; + my ($self) = @_; # LDAP accounts cannot be deleted return defined $LDAPServer ? [] : ["Delete"]; } -sub OnItemAction($$$$) +sub OnItemAction($$$) { - my ($self, $CollectionBlock, $User, $Action) = @_; + my ($self, $User, $Action) = @_; if ($Action eq "Delete") { $User->Status('deleted'); - # Setting $self->{ErrField} is only useful on form pages - (my $_ErrProperty, $self->{ErrMessage}) = $User->Save(); - return 0 if (defined $self->{ErrMessage}); + my ($_ErrProperty, $ErrMessage) = $User->Save(); + if (defined $ErrMessage) + { + # Setting ErrField is only useful on form pages + $self->{EnclosingPage}->SetError(undef, $ErrMessage); + return 0; + } # Forcefully log out that user by deleting the web sessions DeleteSessions($User); return 1; } - return $self->SUPER::OnItemAction($CollectionBlock, $User, $Action); + return $self->SUPER::OnItemAction($User, $Action); } package main; -my $Request = shift; +use ObjectModel::CGI::SimpleCollectionPage; +use WineTestBot::Users; -my $UsersListPage = UsersListPage->new($Request, "admin"); -$UsersListPage->GeneratePage(); +my $Request = shift; +my $Page = ObjectModel::CGI::SimpleCollectionPage->new($Request, "admin", CreateUsers(), \&UsersBlock::Create); +$Page->GeneratePage();

1 0

Francois Gouget : testbot/web: Use SimpleCollectionPage for the VMs page.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: tools Branch: master Commit: b06fc8af3d41468e47ea7834f373fc61c27ccd80 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b06fc8af3d41468e47ea783… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:15:13 2022 +0200 testbot/web: Use SimpleCollectionPage for the VMs page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/VMsList.pl | 49 ++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 1895225..d957b44 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -2,6 +2,7 @@ # VM list page # # Copyright 2009 Ge van Geldorp +# Copyright 2022 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,58 +20,62 @@ use strict; -package VMsListPage; +package VMsBlock; -use ObjectModel::CGI::CollectionPage; -our @ISA = qw(ObjectModel::CGI::CollectionPage); - -use WineTestBot::VMs; +use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); -sub _initialize($$$) +sub Create($$) { - my ($self, $Request, $RequiredRole) = @_; + my ($Collection, $EnclosingPage) = @_; - $self->SUPER::_initialize($Request, $RequiredRole, CreateVMs()); + return VMsBlock->new($Collection, $EnclosingPage); } -sub DisplayProperty($$$) +sub DisplayProperty($$) { - my ($self, $CollectionBlock, $PropertyDescriptor) = @_; + my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "Type" || $PropertyName eq "Role" || $PropertyName eq "Status" || $PropertyName eq "Description"; } -sub SortKeys($$$) +sub SortKeys($$) { - my ($self, $CollectionBlock, $Keys) = @_; + my ($self, $Keys) = @_; return $self->{Collection}->SortKeysBySortOrder($Keys); } -sub OnItemAction($$$$) +sub OnItemAction($$$) { - my ($self, $CollectionBlock, $VM, $Action) = @_; + my ($self, $VM, $Action) = @_; if ($Action eq "Delete") { $VM->Role("deleted"); - # Setting $self->{ErrField} is only useful on form pages - (my $_ErrProperty, $self->{ErrMessage}) = $VM->Save(); - return !defined $self->{ErrMessage}; + my ($_ErrProperty, $ErrMessage) = $VM->Save(); + if (defined $ErrMessage) + { + # Setting ErrField is only useful on form pages + $self->{EnclosingPage}->SetError(undef, $ErrMessage); + return 0; + } + return 1; } - return $self->SUPER::OnItemAction($CollectionBlock, $VM, $Action); + return $self->SUPER::OnItemAction($VM, $Action); } package main; -my $Request = shift; +use ObjectModel::CGI::SimpleCollectionPage; +use WineTestBot::VMs; -my $VMsListPage = VMsListPage->new($Request, "admin"); -$VMsListPage->GeneratePage(); +my $Request = shift; +my $Page = ObjectModel::CGI::SimpleCollectionPage->new($Request, "admin", CreateVMs(), \&VMsBlock::Create); +$Page->GeneratePage();

1 0

Eric Pouech : winmm: Properly handle mmioRead/mmioWrite in case of errors.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 0de8d01b09b1cc7ca34f7ae3890b4a416ff801fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=0de8d01b09b1cc7ca34f7ae3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 30 14:57:44 2022 +0200 winmm: Properly handle mmioRead/mmioWrite in case of errors. In C, an inequality comparison between a signed and an unsigned integer ends up with an unsigned comparison. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52628 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/mmio.c | 4 ++-- dlls/winmm/playsound.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 352da62a215..d61b3c90c49 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -1234,7 +1234,7 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, LONG ix; ix = mmioRead(hmmio, (LPSTR)lpck, 3 * sizeof(DWORD)); - if (ix < 2*sizeof(DWORD)) + if (ix < 0 || ix < 2*sizeof(DWORD)) { mmioSeek(hmmio, dwOldPos, SEEK_SET); WARN("return ChunkNotFound\n"); @@ -1336,7 +1336,7 @@ MMRESULT WINAPI mmioCreateChunk(HMMIO hmmio, MMCKINFO* lpck, UINT uFlags) ix = mmioWrite(hmmio, (LPSTR)lpck, size); TRACE("after mmioWrite ix = %ld req = %ld, errno = %d\n", ix, size, errno); - if (ix < size) { + if (ix != size) { mmioSeek(hmmio, dwOldPos, SEEK_SET); WARN("return CannotWrite\n"); return MMIOERR_CANNOTWRITE; diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 0858f958583..d844bf9b0ab 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -262,6 +262,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) INT count, bufsize, left, index; struct playsound_data s; void* data; + LONG r; s.hEvent = 0; @@ -361,7 +362,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); if (!lpWaveFormat) goto errCleanUp; - if (mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < sizeof(PCMWAVEFORMAT)) + r = mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize); + if (r < 0 || r < sizeof(PCMWAVEFORMAT)) goto errCleanUp; TRACE("wFormatTag=%04X !\n", lpWaveFormat->wFormatTag);

1 0

Alexandre Julliard : wrc: Remove the verify translation mode.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 51d3369334c6050a13be7f0337863fd4ebf145d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51d3369334c6050a13be7f03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 12:57:57 2022 +0200 wrc: Remove the verify translation mode. It's no longer useful now that we support po files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/Makefile.in | 1 - tools/wrc/translation.c | 998 ------------------------------------------------ tools/wrc/wrc.c | 12 - tools/wrc/wrc.h | 1 - 4 files changed, 1012 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=51d3369334c6050a13be…

1 0

Alexandre Julliard : wrc: Remove resource dumping support.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 234710e8f7777796c1a2b0e0d182b68fe88aa0cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=234710e8f7777796c1a2b0e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 12:58:03 2022 +0200 wrc: Remove resource dumping support. winedump can be used to debug resource contents. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/Makefile.in | 1 - tools/wrc/dumpres.c | 924 -------------------------------------------------- tools/wrc/dumpres.h | 30 -- tools/wrc/parser.y | 3 - tools/wrc/utils.c | 10 + tools/wrc/utils.h | 1 + tools/wrc/wrc.c | 4 - 7 files changed, 11 insertions(+), 962 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=234710e8f7777796c1a2…

1 0

Alexandre Julliard : wrc: Store language as a simple integer.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 49bea92bdc1e71c9d05c84547dba11798c373ddf URL: https://source.winehq.org/git/wine.git/?a=commit;h=49bea92bdc1e71c9d05c8454… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 12:58:10 2022 +0200 wrc: Store language as a simple integer. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 47 ++++++++++++------------- tools/wrc/newstruc.c | 29 ++++------------ tools/wrc/newstruc.h | 4 +-- tools/wrc/parser.y | 63 ++++++++++++++------------------- tools/wrc/po.c | 98 ++++++++++++++++++++++++++-------------------------- tools/wrc/utils.c | 6 ++-- tools/wrc/utils.h | 2 +- tools/wrc/wrc.c | 23 ++++-------- tools/wrc/wrc.h | 2 +- tools/wrc/wrctypes.h | 11 ++---- 10 files changed, 120 insertions(+), 165 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=49bea92bdc1e71c9d05c…

1 0

Alexandre Julliard : wrc: Store version and characteristics as simple integers.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: d0b7fa9da7539847ebfc6960ff2aedc762218c1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0b7fa9da7539847ebfc6960… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 12:58:15 2022 +0200 wrc: Store version and characteristics as simple integers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 12 ++++++------ tools/wrc/newstruc.c | 26 -------------------------- tools/wrc/newstruc.h | 4 ---- tools/wrc/parser.y | 32 ++++++++++++++++---------------- tools/wrc/po.c | 4 ++-- tools/wrc/wrctypes.h | 8 ++++---- 6 files changed, 28 insertions(+), 58 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 5282c809f85..81e7a52c9a9 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -247,17 +247,17 @@ static void put_name_id(name_id_t *nid, int upcase, language_t lang) static void put_lvc(lvc_t *lvc) { if(lvc) + { put_word(lvc->language); + put_dword(lvc->version); + put_dword(lvc->characts); + } else + { put_word(0); /* Neutral */ - if(lvc && lvc->version) - put_dword(*lvc->version); - else put_dword(0); - if(lvc && lvc->characts) - put_dword(*lvc->characts); - else put_dword(0); + } } /* diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index b1cd9183640..9602cdfbf92 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -196,32 +196,6 @@ resource_t *new_resource(enum res_e t, void *res, int memopt, language_t lan) return r; } -version_t *new_version(unsigned int v) -{ - version_t *vp = xmalloc(sizeof(version_t)); - *vp = v; - return vp; -} - -characts_t *new_characts(unsigned int c) -{ - characts_t *cp = xmalloc(sizeof(characts_t)); - *cp = c; - return cp; -} - -version_t *dup_version(version_t *v) -{ - if(!v) return NULL; - return new_version(*v); -} - -characts_t *dup_characts(characts_t *c) -{ - if(!c) return NULL; - return new_characts(*c); -} - html_t *new_html(raw_data_t *rd, int *memopt) { html_t *html = xmalloc(sizeof(html_t)); diff --git a/tools/wrc/newstruc.h b/tools/wrc/newstruc.h index dd3215eba8d..7ed386916ab 100644 --- a/tools/wrc/newstruc.h +++ b/tools/wrc/newstruc.h @@ -43,10 +43,6 @@ string_t *new_string(void); toolbar_item_t *new_toolbar_item(void); ani_any_t *new_ani_any(void); resource_t *new_resource(enum res_e t, void *res, int memopt, language_t lan); -version_t *new_version(unsigned int v); -characts_t *new_characts(unsigned int c); -version_t *dup_version(version_t *v); -characts_t *dup_characts(characts_t *c); html_t *new_html(raw_data_t *rd, int *memopt); rcdata_t *new_rcdata(raw_data_t *rd, int *memopt); font_id_t *new_font_id(int size, string_t *face, int weight, int italic); diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index d13d89cdd41..6b362b06b6b 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -155,8 +155,8 @@ static int dont_want_id = 0; /* See language parsing for details */ /* Set to the current options of the currently scanning stringtable */ static int *tagstt_memopt; -static characts_t *tagstt_characts; -static version_t *tagstt_version; +static characts_t tagstt_characts; +static version_t tagstt_version; static const char riff[4] = "RIFF"; /* RIFF file magic for animated cursor/icon */ @@ -180,8 +180,8 @@ static event_t *add_string_event(string_t *key, int id, int flags, event_t *prev static event_t *add_event(int key, int id, int flags, event_t *prev); static name_id_t *convert_ctlclass(name_id_t *cls); static control_t *ins_ctrl(int type, int special_style, control_t *ctrl, control_t *prev); -static dialog_t *dialog_version(version_t *v, dialog_t *dlg); -static dialog_t *dialog_characteristics(characts_t *c, dialog_t *dlg); +static dialog_t *dialog_version(version_t v, dialog_t *dlg); +static dialog_t *dialog_characteristics(characts_t c, dialog_t *dlg); static dialog_t *dialog_language(language_t l, dialog_t *dlg); static dialog_t *dialog_menu(name_id_t *m, dialog_t *dlg); static dialog_t *dialog_class(name_id_t *n, dialog_t *dlg); @@ -228,8 +228,8 @@ static int rsrcid_to_token(int lookahead); name_id_t *nid; font_id_t *fntid; language_t lan; - version_t *ver; - characts_t *chars; + version_t ver; + characts_t chars; event_t *event; menu_item_t *menitm; itemex_opt_t *exopt; @@ -1727,11 +1727,11 @@ opt_language ; opt_characts - : tCHARACTERISTICS expr { $$ = new_characts($2); } + : tCHARACTERISTICS expr { $$ = $2; } ; opt_version - : tVERSION expr { $$ = new_version($2); } + : tVERSION expr { $$ = $2; } ; /* ------------------------------ Raw data handling ------------------------------ */ @@ -1895,7 +1895,7 @@ static dialog_t *dialog_language(language_t l, dialog_t *dlg) return dlg; } -static dialog_t *dialog_characteristics(characts_t *c, dialog_t *dlg) +static dialog_t *dialog_characteristics(characts_t c, dialog_t *dlg) { assert(dlg != NULL); if(dlg->lvc.characts) @@ -1904,7 +1904,7 @@ static dialog_t *dialog_characteristics(characts_t *c, dialog_t *dlg) return dlg; } -static dialog_t *dialog_version(version_t *v, dialog_t *dlg) +static dialog_t *dialog_version(version_t v, dialog_t *dlg) { assert(dlg != NULL); if(dlg->lvc.version) @@ -2369,8 +2369,8 @@ static resource_t *build_stt_resources(stringtable_t *stthead) int j; unsigned int andsum; unsigned int orsum; - characts_t *characts; - version_t *version; + characts_t characts; + version_t version; if(!stthead) return NULL; @@ -2401,8 +2401,8 @@ static resource_t *build_stt_resources(stringtable_t *stthead) } andsum = ~0; orsum = 0; - characts = NULL; - version = NULL; + characts = 0; + version = 0; /* Check individual memory options and get * the first characteristics/version */ @@ -2426,11 +2426,11 @@ static resource_t *build_stt_resources(stringtable_t *stthead) { if(characts && newstt->entries[j].characts - && *newstt->entries[j].characts != *characts) + && newstt->entries[j].characts != characts) warning("Stringtable's characteristics are not the same (idbase: %d)\n", newstt->idbase); if(version && newstt->entries[j].version - && *newstt->entries[j].version != *version) + && newstt->entries[j].version != version) warning("Stringtable's versions are not the same (idbase: %d)\n", newstt->idbase); } rsc = new_resource(res_stt, newstt, newstt->memopt, newstt->lvc.language); diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 4d472a12a64..266dd3ec2e4 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -86,10 +86,10 @@ static language_t get_default_sublang( language_t lan ) } } -static version_t *get_dup_version( language_t lang ) +static version_t get_dup_version( language_t lang ) { /* English "translations" take precedence over the original rc contents */ - return new_version( is_english( lang ) ? 1 : -1 ); + return is_english( lang ) ? 1 : -1; } static name_id_t *dup_name_id( name_id_t *id ) diff --git a/tools/wrc/wrctypes.h b/tools/wrc/wrctypes.h index 2415ce5f294..b453e2fdb08 100644 --- a/tools/wrc/wrctypes.h +++ b/tools/wrc/wrctypes.h @@ -108,8 +108,8 @@ typedef unsigned int version_t; typedef struct lvc { language_t language; - version_t *version; - characts_t *characts; + version_t version; + characts_t characts; } lvc_t; typedef struct font_id { @@ -428,8 +428,8 @@ typedef struct stt_entry { string_t *str; int id; unsigned int memopt; - characts_t *characts; - version_t *version; + characts_t characts; + version_t version; } stt_entry_t; typedef struct stringtable {

1 0