December 2010 - Wine-Commits

Sven Baars : cmd: Fix a typo in the English resource.
by Alexandre Julliard Dec. 27, 2010

Dec. 27, 2010

Module: wine Branch: master Commit: 03159ff8e265a0d38427bc2b919fb171e36cb191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03159ff8e265a0d38427bc2b9… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Dec 25 14:35:04 2010 +0100 cmd: Fix a typo in the English resource. --- programs/cmd/En.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/En.rc b/programs/cmd/En.rc index 87b0780..02a6c24 100644 --- a/programs/cmd/En.rc +++ b/programs/cmd/En.rc @@ -212,7 +212,7 @@ PUSHD.\n" WCMD_MORE, "MORE displays output of files or piped input in pages.\n" WCMD_CHOICE, "CHOICE displays a text and waits, until the User\n\ -press an allowed Key from a selectable list.\n\ +presses an allowed Key from a selectable list.\n\ CHOICE is mainly used to build a menu selection in a batch file.\n" WCMD_EXIT,

1 0

Sven Baars : cmd: Update the Dutch translation.
by Alexandre Julliard Dec. 27, 2010

Dec. 27, 2010

Module: wine Branch: master Commit: 4552cda4e8be1a7bf1a08418365cb2f242b6f7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4552cda4e8be1a7bf1a084183… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Dec 25 14:35:12 2010 +0100 cmd: Update the Dutch translation. --- programs/cmd/Nl.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/cmd/Nl.rc b/programs/cmd/Nl.rc index 531a6a5..bf3b3ca 100644 --- a/programs/cmd/Nl.rc +++ b/programs/cmd/Nl.rc @@ -226,6 +226,11 @@ op de stapel werd gezet met PUSHD.\n" WCMD_MORE, "MORE toont de uitvoer van programma's of herleidde invoer\n\ per bladzijde.\n" + WCMD_CHOICE, "CHOICE laat een tekst zien en wacht tot de Gebruiker\n\ +op een toegestane Toets uit een selecteerbare lijst drukt.\n\ +CHOICE wordt hoofdzakelijk gebruikt om een selectie uit een menu te maken\n\ +in een batch bestand.\n" + WCMD_EXIT, "EXIT beëindigt de lopende sessie en keert terug\n\ naar het besturingssysteem of de schil van waaruit cmd werd gestart.\n"

1 0

Alexandre Julliard : Wine release 1.3.10
by Alexandre Julliard Dec. 24, 2010

Dec. 24, 2010

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

Alexandre Julliard : Release 1.3.10.
by Alexandre Julliard Dec. 24, 2010

Dec. 24, 2010

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

Tag wine-1.3.10 : Alexandre Julliard : Release 1.3.10
by Alexandre Julliard Dec. 24, 2010

Dec. 24, 2010

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

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

Dec. 24, 2010

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

Hwang YunSong : localspl: Update Korean resource.
by Alexandre Julliard Dec. 24, 2010

Dec. 24, 2010

Module: wine Branch: master Commit: 0ac0955a98a6bd1f45f0309d9bfd3a9b06a9de81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ac0955a98a6bd1f45f0309d9… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Dec 24 11:41:04 2010 +0900 localspl: Update Korean resource. --- dlls/localspl/spl_Ko.rc | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/spl_Ko.rc b/dlls/localspl/spl_Ko.rc index 89c46c3..e98d586 100644 --- a/dlls/localspl/spl_Ko.rc +++ b/dlls/localspl/spl_Ko.rc @@ -1,9 +1,10 @@ + /* * Korean resources for localspl * * Copyright 2005 Huw Davies * Copyright 2006 Detlef Riekenberg - * Copyright 2006 YunSong Hwang + * Copyright 2006,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,10 +23,12 @@ #include "localspl_private.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_LOCALPORT "�� Ʈ" - IDS_LOCALMONITOR "�� " + IDS_LOCALPORT "지역 포트" + IDS_LOCALMONITOR "지역 모니터" }

1 0

Hwang YunSong : localui: Update Korean resource.
by Alexandre Julliard Dec. 24, 2010

Dec. 24, 2010

Module: wine Branch: master Commit: 2f9927b8abe8c16da06de042785bdf8216aa896e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f9927b8abe8c16da06de0427… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Dec 24 11:42:23 2010 +0900 localui: Update Korean resource. --- dlls/localui/ui_Ko.rc | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/localui/ui_Ko.rc b/dlls/localui/ui_Ko.rc index 718dca9..372cc93 100644 --- a/dlls/localui/ui_Ko.rc +++ b/dlls/localui/ui_Ko.rc @@ -2,7 +2,7 @@ * Korean resources for localui * * Copyright 2007 Detlef Riekenberg - * Copyright 2007 YunSong Hwang(Ȳ��)(hys545(a)dreamwiz.com) + * Copyright 2007,2010 YunSong Hwang(황윤성)(hys545(a)dreamwiz.com) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,37 +21,39 @@ #include "localui.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "�� Ʈ ��ϱ�" +CAPTION "지역 포트 더하기" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "�� Ʈ �̸� �Է�(&E):", -1, 7, 13, 194, 13, WS_VISIBLE + LTEXT "더할 포트 이름 입력(&E):", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "Ȯ��", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "��", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "확인", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "취소", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE END LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "LPT ��Ʈ ��" +CAPTION "LPT 포트 설정" FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX "�ð��ʰ�(��)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "�� Ƚ��(&T):", -1, 14, 22, 90, 13, WS_VISIBLE + GROUPBOX "시간초과(초)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "재 전송 횟수(&T):", -1, 14, 22, 90, 13, WS_VISIBLE EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "Ȯ��", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "��", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE + DEFPUSHBUTTON "확인", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "취소", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END STRINGTABLE { - IDS_LOCALPORT "�� Ʈ" - IDS_INVALIDNAME "'%s'�� ùٸ� ��Ʈ �̸�� ƴմϴ�" - IDS_PORTEXISTS "��Ʈ %s�� ̹� ��մϴ�" - IDS_NOTHINGTOCONFIG "�� Ʈ�� ɼ�� ϴ�" + IDS_LOCALPORT "지역 포트" + IDS_INVALIDNAME "'%s'는 올바른 포트 이름이 아닙니다" + IDS_PORTEXISTS "포트 %s는 이미 존재합니다" + IDS_NOTHINGTOCONFIG "이 포트는 설정할 옵션이 없습니다" }

1 0

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

Dec. 24, 2010

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: Use a function to determine if a feature is selected.
by Alexandre Julliard Dec. 24, 2010

Dec. 24, 2010

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