wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Aurimas Fišeras : cmd: Update Lithuanian translation.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 2af275cedfb39e05a94f92743e3a5b43ba764f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af275cedfb39e05a94f92743… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Dec 23 18:52:45 2010 +0000 cmd: Update Lithuanian translation. --- programs/cmd/Lt.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/cmd/Lt.rc b/programs/cmd/Lt.rc index 27a04fc..17062a2 100644 --- a/programs/cmd/Lt.rc +++ b/programs/cmd/Lt.rc @@ -208,6 +208,10 @@ o po to pakeičia dabartinį katalogą į nurodytą.\n" WCMD_MORE, "MORE parodo failo išvedimą ar kanalo įvedimą puslapiais.\n" + WCMD_CHOICE, "CHOICE parodo tekstą ir laukia, kol naudotojas\n\ +paspaus leidžiamą klavišą iš pasirinkimų sąrašo.\n\ +CHOICE dažniausiai naudojama pasirinkimo meniu konstravimui komandų faile.\n" + WCMD_EXIT, "EXIT baigia dabartinį komandų seansą ir grįžta į operacinę sistemą\n\ ar apvalkalą iš kur CMD buvo iškviestas.\n" @@ -216,6 +220,7 @@ ar apvalkalą iš kur CMD buvo iškviestas.\n" ATTRIB\t\tRodyti ar keisti DOS failo požymius\n\ CALL\t\tKviesti komandų failą iš kito komandų failo\n\ CD (CHDIR)\tPakeisti dabartinį numatytą katalogą\n\ +CHOICE\t\tLaukti klavišo paspaudimo iš pasirinkimų sąrašo\n\ CLS\t\tIšvalyti pulto ekraną\n\ COPY\t\tKopijuoti failą\n\ CTTY\t\tPakeisti įvedimo/išvedimo įrenginį\n\

1 0

Aurimas Fišeras : wininet: Update Lithuanian translation.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 088fffec944004d41675bb32ec33151945b6d6b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=088fffec944004d41675bb32e… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Dec 23 18:42:22 2010 +0000 wininet: Update Lithuanian translation. --- dlls/wininet/wininet_Lt.rc | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/wininet_Lt.rc b/dlls/wininet/wininet_Lt.rc index 77bb966..bc0749a 100644 --- a/dlls/wininet/wininet_Lt.rc +++ b/dlls/wininet/wininet_Lt.rc @@ -1,5 +1,5 @@ /* - * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * Copyright 2009-2010 Aurimas Fišeras <aurimas(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -63,7 +63,23 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Atsisakyti", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_INVCERTDLG DIALOG 3, 24, 250, 86 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Įspėjimas apie saugumą" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Yra nesklandumų su šios svetainės liudijimu.", -1, 40, 6, 200, 20 + LTEXT "", IDC_CERT_ERROR, 40, 26, 200, 20 + LTEXT "Ar vistiek norite tęsti?", -1, 40, 46, 200, 20 + PUSHBUTTON "Taip", IDOK, 40, 66, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Ne", IDCANCEL, 100, 66, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE { IDS_LANCONNECTION "Vietinio tinklo ryšys" + IDS_CERT_CA_INVALID "Liudijimas yra išduotas nežinomo arba nepatikimo leidėjo." + IDS_CERT_DATE_INVALID "Liudijimo data yra neteisinga." + IDS_CERT_CN_INVALID "Liudijimo pavadinimas neatitinka svetainės." + IDS_CERT_ERRORS "Yra mažiausiai viena nenustatyta saugumo problema su šiuo liudijimu." }

1 0

Alexandre Julliard : Wine release 1.3.10
by Alexandre Julliard 24 Dec '10

24 Dec '10

Module: website Branch: master Commit: 9d4c82dd7401d8cb80bf015cebc8fd11432111d3 URL: http://source.winehq.org/git/website.git/?a=commit;h=9d4c82dd7401d8cb80bf01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 24 20:12:34 2010 +0100 Wine release 1.3.10 --- news/en/2010122401.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2010122401.xml b/news/en/2010122401.xml new file mode 100644 index 0000000..5104482 --- /dev/null +++ b/news/en/2010122401.xml @@ -0,0 +1,18 @@ +<news> +<date>December 24, 2010</date> +<title>Wine 1.3.10 Released</title> +<body> + The Wine development release 1.3.10 is now available. + <a href="{$root}/announce/1.3.10">What's new</a> in this release: +<ul> + <li>Support for notification balloons in system tray.</li> + <li>Obsolete AudioIO sound driver removed.</li> + <li>More work on ActiveX support.</li> + <li>Various MSI fixes.</li> + <li>Preloader now used for 64-bit too. </li> + <li>Translation updates.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.10.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.3.10 : Alexandre Julliard : Release 1.3.10
by Alexandre Julliard 24 Dec '10

24 Dec '10

Module: wine Branch: refs/tags/wine-1.3.10 Tag: 0446646d2e1c6673134e2a065b7131af8b96267e URL: http://source.winehq.org/git/wine.git/?a=tag;h=0446646d2e1c6673134e2a065b71… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 24 20:02:45 2010 +0100 Release 1.3.10

1 0

Alexandre Julliard : Release 1.3.10.
by Alexandre Julliard 24 Dec '10

24 Dec '10

Module: wine Branch: master Commit: 7ac4f05122608836055491f614cce9d18a52b359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ac4f05122608836055491f61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 24 20:02:43 2010 +0100 Release 1.3.10. --- ANNOUNCE | 1085 ++++++++++++++++++++++++++----------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 477 insertions(+), 628 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ac4f0512260883605549…

1 0

Hans Leidekker : msi: Change ACTION_UpdateComponentStates to take a feature pointer.
by Alexandre Julliard 24 Dec '10

24 Dec '10

Module: wine Branch: master Commit: 6d102168919c46c69e7620b5ada6994866dd552c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d102168919c46c69e7620b5a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 24 15:32:01 2010 +0100 msi: Change ACTION_UpdateComponentStates to take a feature pointer. --- dlls/msi/dialog.c | 2 +- dlls/msi/helpers.c | 7 +------ dlls/msi/install.c | 2 +- dlls/msi/msipriv.h | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index b833070..ce90418 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2127,7 +2127,7 @@ msi_seltree_update_feature_installstate( HWND hwnd, HTREEITEM hItem, { msi_feature_set_state( package, feature, state ); msi_seltree_sync_item_state( hwnd, feature, hItem ); - ACTION_UpdateComponentStates( package, feature->Feature ); + ACTION_UpdateComponentStates( package, feature ); } static void diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index ec8db47..df5d448 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -639,16 +639,11 @@ LPWSTR create_component_advertise_string(MSIPACKAGE* package, } /* update component state based on a feature change */ -void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature) +void ACTION_UpdateComponentStates( MSIPACKAGE *package, MSIFEATURE *feature ) { INSTALLSTATE newstate; - MSIFEATURE *feature; ComponentList *cl; - feature = get_loaded_feature(package,szFeature); - if (!feature) - return; - newstate = feature->ActionRequest; if (newstate == INSTALLSTATE_ABSENT) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index d34de8c..338ef0a 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -827,7 +827,7 @@ UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE* package, LPCWSTR szFeature, feature->ActionRequest = iState; - ACTION_UpdateComponentStates(package,szFeature); + ACTION_UpdateComponentStates( package, feature ); /* update all the features that are children of this feature */ LIST_FOR_EACH_ENTRY( child, &package->features, MSIFEATURE, entry ) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 4429fc1..10ddb4e 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -945,7 +945,7 @@ extern LPWSTR build_directory_name(DWORD , ...); extern BOOL create_full_pathW(const WCHAR *path); extern void reduce_to_longfilename(WCHAR*); extern LPWSTR create_component_advertise_string(MSIPACKAGE*, MSICOMPONENT*, LPCWSTR); -extern void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature); +extern void ACTION_UpdateComponentStates(MSIPACKAGE *package, MSIFEATURE *feature); extern UINT register_unique_action(MSIPACKAGE *, LPCWSTR); extern BOOL check_unique_action(const MSIPACKAGE *, LPCWSTR); extern WCHAR* generate_error_string(MSIPACKAGE *, UINT, DWORD, ... );

1 0

Hans Leidekker : msi: Use a function to determine if a feature is selected.
by Alexandre Julliard 24 Dec '10

24 Dec '10

Module: wine Branch: master Commit: 706b54daa75330df9f52f6f57e53b3e411cc95aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=706b54daa75330df9f52f6f57… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 24 15:31:43 2010 +0100 msi: Use a function to determine if a feature is selected. --- dlls/msi/action.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index db3eda8..c5661c0 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1877,6 +1877,11 @@ static void ACTION_GetFeatureInstallStates(MSIPACKAGE *package) } } +static inline BOOL is_feature_selected( MSIFEATURE *feature, INT level ) +{ + return (feature->Level > 0 && feature->Level <= level); +} + static BOOL process_state_property(MSIPACKAGE* package, int level, LPCWSTR property, INSTALLSTATE state) { @@ -1889,8 +1894,7 @@ static BOOL process_state_property(MSIPACKAGE* package, int level, LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - if (strcmpW( property, szRemove ) && - (feature->Level <= 0 || feature->Level > level)) + if (strcmpW( property, szRemove ) && !is_feature_selected( feature, level )) continue; if (!strcmpW(property, szReinstall)) state = feature->Installed; @@ -1981,10 +1985,9 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - BOOL feature_state = ((feature->Level > 0) && - (feature->Level <= level)); + if (!is_feature_selected( feature, level )) continue; - if (feature_state && feature->ActionRequest == INSTALLSTATE_UNKNOWN) + if (feature->ActionRequest == INSTALLSTATE_UNKNOWN) { if (feature->Attributes & msidbFeatureAttributesFavorSource) msi_feature_set_state(package, feature, INSTALLSTATE_SOURCE); @@ -2000,20 +2003,19 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) { FeatureList *fl; - if (feature->Level > 0 && feature->Level <= level) - continue; + if (is_feature_selected( feature, level )) continue; LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) msi_feature_set_state(package, fl->feature, INSTALLSTATE_UNKNOWN); } } - else + else /* preselected */ { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - BOOL selected = feature->Level > 0 && feature->Level <= level; + if (!is_feature_selected( feature, level )) continue; - if (selected && feature->ActionRequest == INSTALLSTATE_UNKNOWN) + if (feature->ActionRequest == INSTALLSTATE_UNKNOWN) { msi_feature_set_state(package, feature, feature->Installed); } @@ -2031,8 +2033,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) debugstr_w(feature->Feature), feature->Level, feature->Installed, feature->ActionRequest, feature->Action); - if (!feature->Level) - continue; + if (!is_feature_selected( feature, level )) continue; /* features with components that have compressed files are made local */ LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry )

1 0

Hans Leidekker : msi: Set the install level to the maximum if the requested install state is not the default .
by Alexandre Julliard 24 Dec '10

24 Dec '10

Module: wine Branch: master Commit: 03a3292ffed984b1e5d4f367c2aa1b2c643ec554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03a3292ffed984b1e5d4f367c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 24 15:31:26 2010 +0100 msi: Set the install level to the maximum if the requested install state is not the default. --- dlls/msi/msi.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index e66585c..266bd89 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -684,6 +684,8 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, static const WCHAR szInstalled[] = { ' ','I','n','s','t','a','l','l','e','d','=','1',0}; + static const WCHAR szInstallLevel[] = { + ' ','I','N','S','T','A','L','L','L','E','V','E','L','=','3','2','7','6','7',0}; static const WCHAR szRemoveAll[] = { ' ','R','E','M','O','V','E','=','A','L','L',0}; static const WCHAR szMachine[] = { @@ -715,6 +717,9 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, if (szCommandLine) sz += lstrlenW(szCommandLine); + if (eInstallState != INSTALLSTATE_DEFAULT) + sz += lstrlenW(szInstallLevel); + if (eInstallState == INSTALLSTATE_ABSENT) sz += lstrlenW(szRemoveAll); @@ -732,6 +737,9 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, if (szCommandLine) lstrcpyW(commandline,szCommandLine); + if (eInstallState != INSTALLSTATE_DEFAULT) + lstrcatW(commandline, szInstallLevel); + if (eInstallState == INSTALLSTATE_ABSENT) lstrcatW(commandline, szRemoveAll);

1 0

Hans Leidekker : msi: Set the Preselected property if the default feature selection is modified in a dialog .
by Alexandre Julliard 24 Dec '10

24 Dec '10

Module: wine Branch: master Commit: cbf7a1e86eb7dceae3295ebe7b62f70eff4672e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf7a1e86eb7dceae3295ebe7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 24 15:31:02 2010 +0100 msi: Set the Preselected property if the default feature selection is modified in a dialog. --- dlls/msi/events.c | 62 +++++++++++++++++++++++----------------------------- 1 files changed, 27 insertions(+), 35 deletions(-) diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 96fc677..b888c1c 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -163,58 +163,50 @@ static UINT ControlEvent_DoAction(MSIPACKAGE* package, LPCWSTR argument, return ERROR_SUCCESS; } -static UINT ControlEvent_AddLocal(MSIPACKAGE* package, LPCWSTR argument, - msi_dialog* dialog) +static UINT ControlEvent_AddLocal( MSIPACKAGE *package, LPCWSTR argument, msi_dialog *dialog ) { - MSIFEATURE *feature = NULL; + MSIFEATURE *feature; - if (strcmpW( szAll, argument )) + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - MSI_SetFeatureStateW(package,argument,INSTALLSTATE_LOCAL); - } - else - { - LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - msi_feature_set_state(package, feature, INSTALLSTATE_LOCAL); - - ACTION_UpdateComponentStates(package,argument); + if (!strcmpW( argument, feature->Feature ) || !strcmpW( argument, szAll )) + { + if (feature->ActionRequest != INSTALLSTATE_LOCAL) + msi_set_property( package->db, szPreselected, szOne ); + MSI_SetFeatureStateW( package, feature->Feature, INSTALLSTATE_LOCAL ); + } } return ERROR_SUCCESS; } -static UINT ControlEvent_Remove(MSIPACKAGE* package, LPCWSTR argument, - msi_dialog* dialog) +static UINT ControlEvent_Remove( MSIPACKAGE *package, LPCWSTR argument, msi_dialog *dialog ) { - MSIFEATURE *feature = NULL; + MSIFEATURE *feature; - if (strcmpW( szAll, argument )) - { - MSI_SetFeatureStateW(package,argument,INSTALLSTATE_ABSENT); - } - else + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - msi_feature_set_state(package, feature, INSTALLSTATE_ABSENT); - - ACTION_UpdateComponentStates(package,argument); + if (!strcmpW( argument, feature->Feature ) || !strcmpW( argument, szAll )) + { + if (feature->ActionRequest != INSTALLSTATE_ABSENT) + msi_set_property( package->db, szPreselected, szOne ); + MSI_SetFeatureStateW( package, feature->Feature, INSTALLSTATE_ABSENT ); + } } return ERROR_SUCCESS; } -static UINT ControlEvent_AddSource(MSIPACKAGE* package, LPCWSTR argument, - msi_dialog* dialog) +static UINT ControlEvent_AddSource( MSIPACKAGE *package, LPCWSTR argument, msi_dialog *dialog ) { - MSIFEATURE *feature = NULL; + MSIFEATURE *feature; - if (strcmpW( szAll, argument )) + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - MSI_SetFeatureStateW(package,argument,INSTALLSTATE_SOURCE); - } - else - { - LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - msi_feature_set_state(package, feature, INSTALLSTATE_SOURCE); - ACTION_UpdateComponentStates(package,argument); + if (!strcmpW( argument, feature->Feature ) || !strcmpW( argument, szAll )) + { + if (feature->ActionRequest != INSTALLSTATE_SOURCE) + msi_set_property( package->db, szPreselected, szOne ); + MSI_SetFeatureStateW( package, feature->Feature, INSTALLSTATE_SOURCE ); + } } return ERROR_SUCCESS; }

1 0

Alexandre Julliard : appwiz.cpl: Convert the application list to a standard Wine list.
by Alexandre Julliard 24 Dec '10

24 Dec '10

Module: wine Branch: master Commit: 7a041d520969330baeeb59579c26e283b60cec67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a041d520969330baeeb59579… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 24 14:51:03 2010 +0100 appwiz.cpl: Convert the application list to a standard Wine list. --- dlls/appwiz.cpl/appwiz.c | 133 +++++++++++++++++++--------------------------- 1 files changed, 54 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a041d520969330baeeb5…

1 0

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 December 2010