November 2009 - Wine-commits

Piotr Caban : jscript: Throw URIError in encodeURI function.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 7d5c16b64e5134617c03c610cf1bb94f5b19d1f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d5c16b64e5134617c03c610c… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Nov 8 11:36:28 2009 +0100 jscript: Throw URIError in encodeURI function. --- dlls/jscript/global.c | 3 +-- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 18bff55..8f6080d 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -811,8 +811,7 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags i = WideCharToMultiByte(CP_UTF8, 0, ptr, 1, NULL, 0, NULL, NULL)*3; if(!i) { SysFreeString(str); - FIXME("throw URIError\n"); - return E_FAIL; + return throw_uri_error(ctx, ei, IDS_URI_INVALID_CHAR, NULL); } len += i; diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 14be9bd..bd3c09d 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -41,6 +41,7 @@ STRINGTABLE DISCARDABLE IDS_NOT_BOOL "Boolean object expected" IDS_JSCRIPT_EXPECTED "JScript object expected" IDS_REGEXP_SYNTAX_ERROR "Syntax error in regular expression" + IDS_URI_INVALID_CHAR "URI to be encoded contains invalid characters" IDS_INVALID_LENGTH "Array length must be a finite positive integer" IDS_ARRAY_EXPECTED "Array object expected" } diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 17c0df0..b88621f 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -37,5 +37,6 @@ #define IDS_NOT_BOOL 0x1392 #define IDS_JSCRIPT_EXPECTED 0x1396 #define IDS_REGEXP_SYNTAX_ERROR 0x1399 +#define IDS_URI_INVALID_CHAR 0x13A0 #define IDS_INVALID_LENGTH 0x13A5 #define IDS_ARRAY_EXPECTED 0x13A7 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index ed795cf..1fb2f6d 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1705,6 +1705,7 @@ exception_test(function() {eval("if(")}, "SyntaxError", -2146827286); exception_test(function() {eval("'unterminated")}, "SyntaxError", -2146827273); exception_test(function() {eval("nonexistingfunc()")}, "TypeError", -2146823281); exception_test(function() {RegExp(/a/, "g");}, "RegExpError", -2146823271); +exception_test(function() {encodeURI('\udcaa');}, "URIError", -2146823264); function testThisExcept(func, number) { exception_test(function() {func.call(new Object())}, "TypeError", number);

1 0

Maarten Lankhorst : winealsa.drv: Fix underrun recovery.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 3a9ea794e1a96e72f36af1a96184a5299512fe50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9ea794e1a96e72f36af1a96… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Nov 8 11:12:16 2009 +0100 winealsa.drv: Fix underrun recovery. --- dlls/winealsa.drv/waveout.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 25a1618..3476f59 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -110,6 +110,7 @@ static BOOL wodUpdatePlayedTotal(WINE_WAVEDEV* wwo, snd_pcm_status_t* ps) if (state != SND_PCM_STATE_RUNNING && state != SND_PCM_STATE_PREPARED) { WARN("Unexpected state (%d) while updating Total Played, resetting\n", state); + snd_pcm_recover(wwo->pcm, -EPIPE, 0); delay=0; }

1 0

Rob Shearman : msi: Improve stub for MsiGetFeatureCost{A, W} and hook the stub into the VolumeCostList dialog control.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: b960b967c997915cb4f3a415b8b2dfbd09c4cdc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b960b967c997915cb4f3a415b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 8 13:34:43 2009 +0100 msi: Improve stub for MsiGetFeatureCost{A, W} and hook the stub into the VolumeCostList dialog control. --- dlls/msi/dialog.c | 41 +++++++++++++++++++++++++++ dlls/msi/install.c | 73 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/msi/msipriv.h | 1 + dlls/msi/msiserver.idl | 1 + dlls/msi/package.c | 9 ++++++ 5 files changed, 120 insertions(+), 5 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 59ef8c3..a22091f 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2614,15 +2614,44 @@ static void msi_dialog_vcl_add_columns( msi_dialog *dialog, msi_control *control } } +static LONGLONG msi_vcl_get_cost( msi_dialog *dialog ) +{ + MSIFEATURE *feature; + INT each_cost; + LONGLONG total_cost = 0; + + LIST_FOR_EACH_ENTRY( feature, &dialog->package->features, MSIFEATURE, entry ) + { + if (ERROR_SUCCESS == (MSI_GetFeatureCost(dialog->package, feature, + MSICOSTTREE_SELFONLY, INSTALLSTATE_LOCAL, &each_cost))) + { + /* each_cost is in 512-byte units */ + total_cost += each_cost * 512; + } + if (ERROR_SUCCESS == (MSI_GetFeatureCost(dialog->package, feature, + MSICOSTTREE_SELFONLY, INSTALLSTATE_ABSENT, &each_cost))) + { + /* each_cost is in 512-byte units */ + total_cost -= each_cost * 512; + } + } + return total_cost; +} + static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control ) { ULARGE_INTEGER total, free; + LONGLONG difference, cost; WCHAR size_text[MAX_PATH]; + WCHAR cost_text[MAX_PATH]; LPWSTR drives, ptr; LVITEMW lvitem; DWORD size; int i = 0; + cost = msi_vcl_get_cost(dialog); + StrFormatByteSizeW(cost, cost_text, MAX_PATH); + size = GetLogicalDriveStringsW( 0, NULL ); if ( !size ) return; @@ -2642,6 +2671,7 @@ static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control SendMessageW( control->hwnd, LVM_INSERTITEMW, 0, (LPARAM)&lvitem ); GetDiskFreeSpaceExW(ptr, &free, &total, NULL); + difference = free.QuadPart - cost; StrFormatByteSizeW(total.QuadPart, size_text, MAX_PATH); lvitem.iSubItem = 1; @@ -2655,6 +2685,17 @@ static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control lvitem.cchTextMax = lstrlenW(size_text) + 1; SendMessageW( control->hwnd, LVM_SETITEMW, 0, (LPARAM)&lvitem ); + lvitem.iSubItem = 3; + lvitem.pszText = cost_text; + lvitem.cchTextMax = lstrlenW(cost_text) + 1; + SendMessageW( control->hwnd, LVM_SETITEMW, 0, (LPARAM)&lvitem ); + + StrFormatByteSizeW(difference, size_text, MAX_PATH); + lvitem.iSubItem = 4; + lvitem.pszText = size_text; + lvitem.cchTextMax = lstrlenW(size_text) + 1; + SendMessageW( control->hwnd, LVM_SETITEMW, 0, (LPARAM)&lvitem ); + ptr += lstrlenW(ptr) + 1; i++; } diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 606caba..1a535eb 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -934,8 +934,24 @@ UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature, UINT WINAPI MsiGetFeatureCostA(MSIHANDLE hInstall, LPCSTR szFeature, MSICOSTTREE iCostTree, INSTALLSTATE iState, LPINT piCost) { - FIXME("(%d %s %i %i %p): stub\n", hInstall, debugstr_a(szFeature), - iCostTree, iState, piCost); + LPWSTR szwFeature = NULL; + UINT rc; + + szwFeature = strdupAtoW(szFeature); + + rc = MsiGetFeatureCostW(hInstall, szwFeature, iCostTree, iState, piCost); + + msi_free(szwFeature); + + return rc; +} + +UINT MSI_GetFeatureCost(MSIPACKAGE *package, MSIFEATURE *feature, + MSICOSTTREE iCostTree, INSTALLSTATE iState, + LPINT piCost) +{ + FIXME("(%s %i %i %p): not implemented yet\n", + debugstr_w(feature->Feature), iCostTree, iState, piCost); if (piCost) *piCost = 0; return ERROR_SUCCESS; } @@ -946,10 +962,57 @@ UINT WINAPI MsiGetFeatureCostA(MSIHANDLE hInstall, LPCSTR szFeature, UINT WINAPI MsiGetFeatureCostW(MSIHANDLE hInstall, LPCWSTR szFeature, MSICOSTTREE iCostTree, INSTALLSTATE iState, LPINT piCost) { - FIXME("(%d %s %i %i %p): stub\n", hInstall, debugstr_w(szFeature), + MSIPACKAGE *package; + MSIFEATURE *feature; + UINT ret; + + TRACE("(%d %s %i %i %p)\n", hInstall, debugstr_w(szFeature), iCostTree, iState, piCost); - if (piCost) *piCost = 0; - return ERROR_SUCCESS; + + package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); + if (!package) + { + HRESULT hr; + BSTR feature; + IWineMsiRemotePackage *remote_package; + + remote_package = (IWineMsiRemotePackage *)msi_get_remote(hInstall); + if (!remote_package) + return ERROR_INVALID_HANDLE; + + feature = SysAllocString(szFeature); + if (!feature) + { + IWineMsiRemotePackage_Release(remote_package); + return ERROR_OUTOFMEMORY; + } + + hr = IWineMsiRemotePackage_GetFeatureCost(remote_package, feature, + iCostTree, iState, piCost); + + SysFreeString(feature); + IWineMsiRemotePackage_Release(remote_package); + + if (FAILED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + return HRESULT_CODE(hr); + + return ERROR_FUNCTION_FAILED; + } + + return ERROR_SUCCESS; + } + + feature = get_loaded_feature(package, szFeature); + + if (feature) + ret = MSI_GetFeatureCost(package, feature, iCostTree, iState, piCost); + else + ret = ERROR_UNKNOWN_FEATURE; + + msiobj_release( &package->hdr ); + return ret; } /*********************************************************************** diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 38103d8..5b23f55 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -759,6 +759,7 @@ extern LPCWSTR msi_download_file( LPCWSTR szUrl, LPWSTR filename ); extern UINT msi_package_add_info(MSIPACKAGE *, DWORD, DWORD, LPCWSTR, LPWSTR); extern UINT msi_package_add_media_disk(MSIPACKAGE *, DWORD, DWORD, DWORD, LPWSTR, LPWSTR); extern UINT msi_clone_properties(MSIPACKAGE *); +extern UINT MSI_GetFeatureCost(MSIPACKAGE *, MSIFEATURE *, MSICOSTTREE, INSTALLSTATE, LPINT); /* for deformating */ extern UINT MSI_FormatRecordW( MSIPACKAGE *, MSIRECORD *, LPWSTR, LPDWORD ); diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 2189fc4..753cbb0 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -71,6 +71,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT SetInstallLevel( [in] int level ); HRESULT FormatRecord( [in] MSIHANDLE record, [out] BSTR *value ); HRESULT EvaluateCondition( [in] BSTR condition ); + HRESULT GetFeatureCost( [in] BSTR feature, [in] INT cost_tree, [in] INSTALLSTATE state, [out] INT *cost); } [ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7f13633..87f1092 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1898,6 +1898,14 @@ static HRESULT WINAPI mrp_EvaluateCondition( IWineMsiRemotePackage *iface, BSTR return HRESULT_FROM_WIN32(r); } +static HRESULT WINAPI mrp_GetFeatureCost( IWineMsiRemotePackage *iface, BSTR feature, + INT cost_tree, INSTALLSTATE state, INT *cost ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + UINT r = MsiGetFeatureCostW(This->package, feature, cost_tree, state, cost); + return HRESULT_FROM_WIN32(r); +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -1922,6 +1930,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_SetInstallLevel, mrp_FormatRecord, mrp_EvaluateCondition, + mrp_GetFeatureCost, }; HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )

1 0

Rob Shearman : winhlp32: Restore the original window proc for the richedit control before freeing the winhelp window memory .
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: dd4804c413a54a9c26eb4320c7178604b6a55a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd4804c413a54a9c26eb4320c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 8 14:07:50 2009 +0100 winhlp32: Restore the original window proc for the richedit control before freeing the winhelp window memory. --- programs/winhlp32/winhelp.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index ae7d58d..fb05aeb 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -541,6 +541,7 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) { WINHELP_WINDOW** w; BOOL bExit; + HWND hTextWnd; for (w = &Globals.win_list; *w; w = &(*w)->next) { @@ -562,6 +563,10 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) if (win == Globals.active_popup) Globals.active_popup = NULL; + hTextWnd = GetDlgItem(win->hMainWnd, CTL_ID_TEXT); + SetWindowLongPtr(hTextWnd, GWLP_WNDPROC, + (LONG_PTR)win->origRicheditWndProc); + WINHELP_DeleteButtons(win); if (win->page) WINHELP_DeletePageLinks(win->page);

1 0

Rob Shearman : secur32: Output extra data in NTLM sign & seal test to diagnose failures seen on some Windows machines .
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: f6c9c72e21dd9f70fe9901aa32b19741cbc4c386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c9c72e21dd9f70fe9901aa3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Nov 7 12:23:28 2009 +0100 secur32: Output extra data in NTLM sign & seal test to diagnose failures seen on some Windows machines. --- dlls/secur32/tests/ntlm.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 2a66cf6..db00d73 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1056,8 +1056,32 @@ static void testSignSeal(void) ok(!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, crypt.pBuffers[0].cbBuffer), "Crypt trailer not as expected.\n"); + if (memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, + crypt.pBuffers[0].cbBuffer)) + { + int i; + for (i = 0; i < crypt.pBuffers[0].cbBuffer; i++) + { + if (i % 8 == 0) printf(" "); + printf("0x%02x,", ((unsigned char *)crypt.pBuffers[0].pvBuffer)[i]); + if (i % 8 == 7) printf("\n"); + } + printf("\n"); + } ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, crypt.pBuffers[1].cbBuffer), "Crypt message not as expected.\n"); + if (memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, + crypt.pBuffers[1].cbBuffer)) + { + int i; + for (i = 0; i < crypt.pBuffers[1].cbBuffer; i++) + { + if (i % 8 == 0) printf(" "); + printf("0x%02x,", ((unsigned char *)crypt.pBuffers[1].pvBuffer)[i]); + if (i % 8 == 7) printf("\n"); + } + printf("\n"); + } data[0].cbBuffer = sizeof(crypt_trailer_server); data[1].cbBuffer = sizeof(crypt_message_server); @@ -1113,9 +1137,33 @@ static void testSignSeal(void) ok(!memcmp(crypt.pBuffers[3].pvBuffer, crypt_trailer_client2, crypt.pBuffers[3].cbBuffer), "Crypt trailer not as expected.\n"); + if (memcmp(crypt.pBuffers[3].pvBuffer, crypt_trailer_client2, + crypt.pBuffers[3].cbBuffer)) + { + int i; + for (i = 0; i < crypt.pBuffers[3].cbBuffer; i++) + { + if (i % 8 == 0) printf(" "); + printf("0x%02x,", ((unsigned char *)crypt.pBuffers[3].pvBuffer)[i]); + if (i % 8 == 7) printf("\n"); + } + printf("\n"); + } ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client2, crypt.pBuffers[1].cbBuffer), "Crypt message not as expected.\n"); + if (memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client2, + crypt.pBuffers[1].cbBuffer)) + { + int i; + for (i = 0; i < crypt.pBuffers[1].cbBuffer; i++) + { + if (i % 8 == 0) printf(" "); + printf("0x%02x,", ((unsigned char *)crypt.pBuffers[1].pvBuffer)[i]); + if (i % 8 == 7) printf("\n"); + } + printf("\n"); + } memcpy(complex_data[1].pvBuffer, crypt_message_server2, complex_data[1].cbBuffer); memcpy(complex_data[3].pvBuffer, crypt_trailer_server2, complex_data[3].cbBuffer);

1 0

Luca Bennati : cmd: Add Italian translation.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 79bb4bd5490fbb9fb95c0828d5d6ea80cfc58902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79bb4bd5490fbb9fb95c0828d… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Nov 7 21:07:33 2009 +0100 cmd: Add Italian translation. --- programs/cmd/It.rc | 282 ++++++++++++++++++++++++++++++++++++++++++++++ programs/cmd/Makefile.in | 1 + 2 files changed, 283 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79bb4bd5490fbb9fb95c0…

1 0

Luca Bennati : start: Update Italian translation.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 8977e5b46e5c18d8847f5f157f6b1667094bec95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8977e5b46e5c18d8847f5f157… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun Nov 8 11:45:20 2009 +0100 start: Update Italian translation. --- programs/start/It.rc | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/programs/start/It.rc b/programs/start/It.rc index e550ac5..1e1c47b 100644 --- a/programs/start/It.rc +++ b/programs/start/It.rc @@ -5,6 +5,7 @@ * Copyright 2003 Dan Kegel * Copyright 2003 Ivan Leo Puoti * Copyright 2006 Antonio Codazzi + * Copyright 2009 Luca Bennati * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,38 +24,41 @@ #include "resources.h" +#pragma code_page(65001) /* UTF-8 */ + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { STRING_USAGE, "Avvia un programma, o apri un documento con il programma normalmente usato per i files con quell'estensione\n\ Usage:\n\ -start [options] nome_programma [...]\n\ -start [options] nome_documento\n\ +start [opzioni] nome_programma [...]\n\ +start [opzioni] nome_documento\n\ \n\ Options:\n\ /M[inimized] Avvia il programma minimizzato.\n\ /MAX[imized] Avvia il programma massimizato.\n\ -/R[estored] Avvia il programma normalmente (n� minimizzato n� massimizato).\n\ +/R[estored] Avvia il programma normalmente (né minimizzato né massimizzato).\n\ /W[ait] Attendi l'uscita del programma, poi esci con il suo codice di uscita.\n\ -/ProgIDOpen Open a document using the following progID.\n\ +/Unix Usa un nome file Unix e apre il file come windows explorer.\n\ +/ProgIDOpen Apri un documento usando il seguente progID.\n\ /L Mostra l'accordo di licenza con l'utente finale.\n\ \n\ start.exe versione 0.2 Copyright (C) 2003, Dan Kegel\n\ -Start � fornito SENZA GARANZIA di alcun tipo; per ulteriori informazioni eseguire start con l'opzione /L.\n\ -Questo � software libero, e lo potete redistribuire\n\ +Start è fornito SENZA GARANZIA di alcun tipo; per ulteriori informazioni eseguire start con l'opzione /L.\n\ +Questo è software libero, e lo potete redistribuire\n\ sotto alcune condizioni; eseguire 'start' con l'opzione /L per ulteriori infomazioni.\n\ " STRING_LICENSE, "start.exe versione 0.2 Copyright (C) 2003, Dan Kegel\n\ -Questo programma � software libero; puoi redistribuirlo e/o\n\ +Questo programma è software libero; puoi redistribuirlo e/o\n\ modificarlo sotto i termini della GNU Lesser Public License\n\ -cos� come pubblicata dalla Free Software Foundation; sia la versione 2.1\n\ +così come pubblicata dalla Free Software Foundation; sia la versione 2.1\n\ della Licenza, o (a tua scelta) ogni altra versione successiva.\n\ \n\ -Questo programma � distribuito nella speranza che sia utile,\n\ +Questo programma è distribuito nella speranza che sia utile,\n\ ma SENZA ALCUNA GARANZIA; senza neppure la garanzia implicita di\n\ -COMMERCIABILIT� o IDONEIT� PER UN PARTICOLARE SCOPO. Consulta la\n\ +COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Consulta la\n\ GNU Lesser Public License per ulteriori dettagli.\n\ \n\ Dovresti aver ricevuto una copia della GNU Lesser Public License\n\ @@ -64,7 +68,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n\ Consulta il file COPYING.LIB per informazioni sulla licenza.\n\ " -STRING_EXECFAIL "Non � stato possibile eseguire l'applicazione, o nessuna applicazione � associata con il file specificato.\nShellExecuteEx fallito" +STRING_EXECFAIL "Non è stato possibile eseguire l'applicazione, o nessuna applicazione è associata con il file specificato.\nShellExecuteEx fallito" -STRING_UNIXFAIL "Non � stato possibile tradurre il nome file Unix in un nome file DOS." +STRING_UNIXFAIL "Non è stato possibile tradurre il nome file Unix in un nome file DOS." }

1 0

Luca Bennati : clock: Update Italian translation.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: bef35afba82da5a7aea7ee3ff6a2945a48806b28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bef35afba82da5a7aea7ee3ff… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Nov 5 19:19:48 2009 +0100 clock: Update Italian translation. --- programs/clock/It.rc | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/programs/clock/It.rc b/programs/clock/It.rc index f8f01a6..ad12b9c 100644 --- a/programs/clock/It.rc +++ b/programs/clock/It.rc @@ -4,6 +4,7 @@ * Copyright 1998 Marcel Baur <mbaur(a)g26.ethz.ch> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2003 Ivan Leo Puoti + * Copiright 2009 Luca Bennati * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,11 +23,14 @@ #include "clock_res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL MAIN_MENU MENU { - POPUP "&Propriet�" { + POPUP "&Proprietà" { MENUITEM "Ana&logico", IDM_ANALOG MENUITEM "Digi&tale", IDM_DIGITAL MENUITEM SEPARATOR @@ -50,3 +54,27 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "Orologio" } + +STRINGTABLE DISCARDABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +{ +IDS_LICENSE_CAPTION, "LICENSE" +IDS_LICENSE, +"Questo programma è software libero; puoi redistribuirlo e/o \ +modificarlo sotto i termini della GNU Lesser General Public \ +License come pubblicata dalla Free Software Foundation; sia \ +la versione 2.1 della Licenza, o (a tua scelta) qualunque altra versione più recente.\n\ +Questo programma è distribuito nella speranza che sia utile, \ +ma SENZA ALCUNA GARANZIA; anche senza la garanzia implicita di \ +COMMERCIABILITÀ o IDONEITÀ PER UNO SCOPO PARTICOLARE. Leggere la GNU \ +Lesser General Public License per maggiori dettagli.\n\ +Dovresti aver ricevuto una copia della GNU Lesser General Public \ +License insieme a questo programma; altrimenti, scrivi alla Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" + +IDS_WARRANTY_CAPTION, "NESSUNA GARANZIA" +IDS_WARRANTY, +"Questo programma è distribuito nella speranza che sia utile, \ +ma SENZA ALCUNA GARANZIA; anche senza la garanzia implicita di \ +COMMERCIABILITÀ o IDONEITÀ PER UNO SCOPO PARTICOLARE. Leggere la GNU \ +Lesser General Public License per maggiori dettagli." +}

1 0

Francois Gouget : msi/tests: Make the handler_xxx() functions static.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 97619affe5592ddbc2d96e92e02042cc46d8a45c URL: http://source.winehq.org/git/wine.git/?a=commit;h=97619affe5592ddbc2d96e92e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 8 10:52:58 2009 +0100 msi/tests: Make the handler_xxx() functions static. Also remove extraneous semi-colons. --- dlls/msi/tests/install.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ccadc63..6efd290 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6874,9 +6874,20 @@ static void test_file_in_use_cab(void) delete_test_files(); } -INT CALLBACK handler_a(LPVOID context, UINT type, LPCSTR msg) { return IDOK; }; -INT CALLBACK handler_w(LPVOID context, UINT type, LPCWSTR msg) { return IDOK; }; -INT CALLBACK handler_record(LPVOID context, UINT type, MSIHANDLE record) { return IDOK; }; +static INT CALLBACK handler_a(LPVOID context, UINT type, LPCSTR msg) +{ + return IDOK; +} + +static INT CALLBACK handler_w(LPVOID context, UINT type, LPCWSTR msg) +{ + return IDOK; +} + +static INT CALLBACK handler_record(LPVOID context, UINT type, MSIHANDLE record) +{ + return IDOK; +} static void test_MsiSetExternalUI(void) {

1 0

Francois Gouget : cryptui: Remove WINAPI on the cert_mgr_sort_by_text() static function that does not need it.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 9bcd9a7eb2151af721cc5a716cd2c1f5aebcc633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bcd9a7eb2151af721cc5a716… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 8 10:53:06 2009 +0100 cryptui: Remove WINAPI on the cert_mgr_sort_by_text() static function that does not need it. --- dlls/cryptui/main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 117257e..aefae3e 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1070,8 +1070,7 @@ static void cert_mgr_do_export(HWND hwnd) } } -static int CALLBACK cert_mgr_sort_by_text(HWND lv, int col, int index1, - int index2) +static int cert_mgr_sort_by_text(HWND lv, int col, int index1, int index2) { LVITEMW item; WCHAR buf1[MAX_STRING_LEN];

1 0