June 2009 - Wine-Commits - list.winehq.org

Damjan Jovanovic : wine.inf: Run winemenubuilder to delete menus on startup .
by Alexandre Julliard June 26, 2009

June 26, 2009

Module: wine Branch: master Commit: fe1cc3272149503323d7bcb99c5bb26cfc1fde96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1cc3272149503323d7bcb99… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 25 21:04:06 2009 +0200 wine.inf: Run winemenubuilder to delete menus on startup. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 4d2999e..7e6ae73 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -403,7 +403,7 @@ HKLM,%CurrentVersion%,"RegisteredOwner",2,"" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMax",,"3600" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMin",,"3" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"LastID",,"5" -HKLM,%CurrentVersion%\Run,"winemenubuilder",2,"winemenubuilder -a" +HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"winemenubuilder -a -r" HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%" HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" HKLM,%CurrentVersion%\Uninstall,,,""

1 0

Damjan Jovanovic : winemenubuilder: Allow multiple options.
by Alexandre Julliard June 26, 2009

June 26, 2009

Module: wine Branch: master Commit: 420d64291876130c49255d42982a1b0ae0d1d861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=420d64291876130c49255d429… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 25 21:01:59 2009 +0200 winemenubuilder: Allow multiple options. --- programs/winemenubuilder/winemenubuilder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index fa74411..0549eb5 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2714,12 +2714,12 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show if( !lstrcmpA( token, "-a" ) ) { RefreshFileTypeAssociations(); - break; + continue; } if( !lstrcmpA( token, "-r" ) ) { cleanup_menus(); - break; + continue; } if( !lstrcmpA( token, "-w" ) ) bWait = TRUE;

1 0

Matej Spindler : wordpad: Update Slovenian translation.
by Alexandre Julliard June 26, 2009

June 26, 2009

Module: wine Branch: master Commit: ab750ba2049267f82769a979b88d2290edb77d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab750ba2049267f82769a979b… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Thu Jun 25 21:49:10 2009 +0200 wordpad: Update Slovenian translation. --- programs/wordpad/Si.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/Si.rc b/programs/wordpad/Si.rc index 3be81b8..5e34958 100644 --- a/programs/wordpad/Si.rc +++ b/programs/wordpad/Si.rc @@ -242,7 +242,8 @@ BEGIN STRING_WRITE_ACCESS_DENIED, "Nimate pravic za shranjevanje te datoteke." STRING_OPEN_FAILED, "Napaka pri odpiranju datoteke." STRING_OPEN_ACCESS_DENIED, "Nimate pravic za odpiranje te datoteke." - STRING_PRINTING_NOT_IMPLEMENTED, "Tiskanje (še) ni na voljo" + STRING_PRINTING_NOT_IMPLEMENTED, "Tiskanje (še) ni na voljo" + STRING_MAX_TAB_STOPS, "Ne morem vstaviti več kot 32 položajev tabulatorja." END #pragma code_page(default)

1 0

Aurimas Fišeras : cryptdlg: Add Lithuanian translation .
by Alexandre Julliard June 26, 2009

June 26, 2009

Module: wine Branch: master Commit: c952a34178dc136336f551bb2d0b4bd211ce656f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c952a34178dc136336f551bb2… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jun 25 16:36:07 2009 +0300 cryptdlg: Add Lithuanian translation. --- dlls/cryptdlg/cryptdlg.rc | 1 + dlls/cryptdlg/cryptdlg_Lt.rc | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/cryptdlg/cryptdlg.rc b/dlls/cryptdlg/cryptdlg.rc index e99e280..ac5ce11 100644 --- a/dlls/cryptdlg/cryptdlg.rc +++ b/dlls/cryptdlg/cryptdlg.rc @@ -26,5 +26,6 @@ #include "cryptdlg_En.rc" #include "cryptdlg_Fr.rc" #include "cryptdlg_Ko.rc" +#include "cryptdlg_Lt.rc" #include "cryptdlg_Nl.rc" #include "cryptdlg_Ro.rc" diff --git a/dlls/cryptdlg/cryptdlg_Lt.rc b/dlls/cryptdlg/cryptdlg_Lt.rc new file mode 100644 index 0000000..d239dbc --- /dev/null +++ b/dlls/cryptdlg/cryptdlg_Lt.rc @@ -0,0 +1,41 @@ +/* + * cryptdlg dll Lithuanian resources + * + * Copyright 2009 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_CERT_POLICY "Liudijimo politika" + IDS_POLICY_ID "Politikos identifikatorius: " + IDS_POLICY_QUALIFIER_INFO "Politikos kvalifikatoriaus informacija" + IDS_POLICY_QUALIFIER_ID "Politikos kvalifikatoriaus identifikatorius=" + IDS_CPS "CPS" + IDS_USER_NOTICE "Naudotojo pranešimas" + IDS_QUALIFIER "Kvalifikatorius" + IDS_NOTICE_REF "Pranešimo nuoroda" + IDS_ORGANIZATION "Organizacija=" + IDS_NOTICE_NUM "Pranešimo numeris=" + IDS_NOTICE_TEXT "Pranešimo tekstas=" +} + +#pragma code_page(default)

1 0

Matej Spindler : reg: Update Slovenian translation.
by Alexandre Julliard June 26, 2009

June 26, 2009

Module: wine Branch: master Commit: 3ee43b9597f98efa4a6f5d5c538f8e59f3e20b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ee43b9597f98efa4a6f5d5c5… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Thu Jun 25 19:42:20 2009 +0200 reg: Update Slovenian translation. --- programs/reg/Si.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/reg/Si.rc b/programs/reg/Si.rc index 284dcbb..84a339a 100644 --- a/programs/reg/Si.rc +++ b/programs/reg/Si.rc @@ -29,6 +29,11 @@ STRINGTABLE STRING_ADD_USAGE, "REG ADD ime_ključa [/v ime_vrednosti | /ve] [/t vrsta] [/s ločilo] [/d podatki] [/f]\n" STRING_DELETE_USAGE, "REG DELETE ime_ključa [/v ime_vrednosti | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY ime_ključa [/v ime_vrednosti | /ve] [/s]\n" + STRING_SUCCESS, "Operacija se je uspešno izvedla\n" + STRING_INVALID_KEY, "Napaka: Napačno ime ključa\n" + STRING_INVALID_CMDLINE, "Napaka: Napačen parameter v ukazni vrstici\n" + STRING_NO_REMOTE, "Napaka: Na morem dodati ključa na oddaljen računalnik\n" + STRING_CANNOT_FIND, "Napaka: Sistem ni našel zahtevanega ključa ali vrednosti\n" } #pragma code_page(default)

1 0

Huw Davies : ole32: Implement OleCreateEmbeddingHelper.
by Alexandre Julliard June 26, 2009

June 26, 2009

Module: wine Branch: master Commit: e67da1171661660bd73403d03c86be1117d4289c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67da1171661660bd73403d03… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 25 15:15:50 2009 +0100 ole32: Implement OleCreateEmbeddingHelper. Based on a patch by Rob Shearman. --- dlls/ole32/defaulthandler.c | 69 +++++++++++++++++++++++++++++++++++++++--- dlls/ole32/ole32.spec | 2 +- 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index b85002a..4102d50 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -137,6 +137,11 @@ struct DefaultHandler /* storage passed to Load or InitNew */ IStorage *storage; enum storage_state storage_state; + + /* optional class factory for object */ + IClassFactory *pCFObject; + /* TRUE if acting as an inproc server instead of an inproc handler */ + BOOL inproc_server; }; typedef struct DefaultHandler DefaultHandler; @@ -223,6 +228,12 @@ static HRESULT WINAPI DefaultHandler_NDIUnknown_QueryInterface( if (FAILED(hr)) FIXME("interface %s not implemented by data cache\n", debugstr_guid(riid)); return hr; } + else if (This->inproc_server && This->pOleDelegate) + { + HRESULT hr = IUnknown_QueryInterface(This->pOleDelegate, riid, ppvObject); + if (SUCCEEDED(hr)) + return hr; + } /* Check that we obtained an interface. */ if (*ppvObject == NULL) @@ -1901,7 +1912,9 @@ static const IPersistStorageVtbl DefaultHandler_IPersistStorage_VTable = */ static DefaultHandler* DefaultHandler_Construct( REFCLSID clsid, - LPUNKNOWN pUnkOuter) + LPUNKNOWN pUnkOuter, + DWORD flags, + IClassFactory *pCF) { DefaultHandler* This = NULL; HRESULT hr; @@ -1918,6 +1931,8 @@ static DefaultHandler* DefaultHandler_Construct( This->lpvtblIAdviseSink = &DefaultHandler_IAdviseSink_VTable; This->lpvtblIPersistStorage = &DefaultHandler_IPersistStorage_VTable; + This->inproc_server = (flags & EMBDHLP_INPROC_SERVER) ? TRUE : FALSE; + /* * Start with one reference count. The caller of this function * must release the interface pointer when it is done. @@ -1964,6 +1979,30 @@ static DefaultHandler* DefaultHandler_Construct( This->storage = NULL; This->storage_state = storage_state_uninitialised; + if (This->inproc_server && !(flags & EMBDHLP_DELAYCREATE)) + { + HRESULT hr; + This->pCFObject = NULL; + if (pCF) + hr = IClassFactory_CreateInstance(pCF, NULL, &IID_IOleObject, (void **)&This->pOleDelegate); + else + hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IOleObject, (void **)&This->pOleDelegate); + if (SUCCEEDED(hr)) + hr = IOleObject_QueryInterface(This->pOleDelegate, &IID_IPersistStorage, (void **)&This->pPSDelegate); + if (SUCCEEDED(hr)) + hr = IOleObject_QueryInterface(This->pOleDelegate, &IID_IDataObject, (void **)&This->pDataDelegate); + if (SUCCEEDED(hr)) + This->object_state = object_state_running; + if (FAILED(hr)) + WARN("object creation failed with error %08x\n", hr); + } + else + { + This->pCFObject = pCF; + if (pCF) IClassFactory_AddRef(pCF); + } + return This; } @@ -2011,22 +2050,30 @@ static void DefaultHandler_Destroy( This->storage = NULL; } + if (This->pCFObject) + { + IClassFactory_Release(This->pCFObject); + This->pCFObject = NULL; + } + HeapFree(GetProcessHeap(), 0, This); } /****************************************************************************** - * OleCreateDefaultHandler [OLE32.@] + * OleCreateEmbeddingHelper [OLE32.@] */ -HRESULT WINAPI OleCreateDefaultHandler( +HRESULT WINAPI OleCreateEmbeddingHelper( REFCLSID clsid, LPUNKNOWN pUnkOuter, + DWORD flags, + IClassFactory *pCF, REFIID riid, LPVOID* ppvObj) { DefaultHandler* newHandler = NULL; HRESULT hr = S_OK; - TRACE("(%s, %p, %s, %p)\n", debugstr_guid(clsid), pUnkOuter, debugstr_guid(riid), ppvObj); + TRACE("(%s, %p, %08x, %p, %s, %p)\n", debugstr_guid(clsid), pUnkOuter, flags, pCF, debugstr_guid(riid), ppvObj); if (!ppvObj) return E_POINTER; @@ -2045,7 +2092,7 @@ HRESULT WINAPI OleCreateDefaultHandler( /* * Try to construct a new instance of the class. */ - newHandler = DefaultHandler_Construct(clsid, pUnkOuter); + newHandler = DefaultHandler_Construct(clsid, pUnkOuter, flags, pCF); if (!newHandler) return E_OUTOFMEMORY; @@ -2063,3 +2110,15 @@ HRESULT WINAPI OleCreateDefaultHandler( return hr; } + + +/****************************************************************************** + * OleCreateDefaultHandler [OLE32.@] + */ +HRESULT WINAPI OleCreateDefaultHandler(REFCLSID clsid, LPUNKNOWN pUnkOuter, + REFIID riid, LPVOID* ppvObj) +{ + TRACE("(%s, %p, %s, %p)\n", debugstr_guid(clsid), pUnkOuter,debugstr_guid(riid), ppvObj); + return OleCreateEmbeddingHelper(clsid, pUnkOuter, EMBDHLP_INPROC_HANDLER | EMBDHLP_CREATENOW, + NULL, riid, ppvObj); +} diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index b9e5c4c..97f2f3d 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -180,7 +180,7 @@ @ stub OleConvertOLESTREAMToIStorageEx @ stdcall OleCreate(ptr ptr long ptr ptr ptr ptr) @ stdcall OleCreateDefaultHandler(ptr ptr ptr ptr) -@ stub OleCreateEmbeddingHelper +@ stdcall OleCreateEmbeddingHelper(ptr ptr long ptr ptr ptr) @ stub OleCreateEx @ stdcall OleCreateFromData(ptr ptr long ptr ptr ptr ptr) @ stdcall OleCreateFromDataEx(ptr ptr long long long ptr ptr ptr ptr ptr ptr ptr)

1 0

Matej Spindler : shell32: Update Slovenian translation.
by Alexandre Julliard June 26, 2009

June 26, 2009

Module: wine Branch: master Commit: 47aed6dcec56eb83709a437291ad1be21d9016ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=47aed6dcec56eb83709a43729… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Thu Jun 25 20:55:38 2009 +0200 shell32: Update Slovenian translation. --- dlls/shell32/shell32_Si.rc | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_Si.rc b/dlls/shell32/shell32_Si.rc index 24db7ee..24c36c3 100644 --- a/dlls/shell32/shell32_Si.rc +++ b/dlls/shell32/shell32_Si.rc @@ -280,9 +280,11 @@ STRINGTABLE IDS_NEWFOLDER "Nova mapa" - IDS_CPANEL_TITLE "Wine Control Panel" - IDS_CPANEL_NAME "Name" - IDS_CPANEL_DESCRIPTION "Description" + IDS_CPANEL_TITLE "Wine Nadzorna Plošča" + IDS_CPANEL_NAME "Ime" + IDS_CPANEL_DESCRIPTION "Opis" + + IDS_SHLEXEC_NOASSOC "Noben Okenski program ni nastavljen, da bi odpiral ta tip datotek." } STRINGTABLE

1 0

Matej Spindler : notepad: Update Slovenian translation.
by Alexandre Julliard June 26, 2009

June 26, 2009

Module: wine Branch: master Commit: adcc8cb3477c36e26e1bb06bf3a7f2541d108abf URL: http://source.winehq.org/git/wine.git/?a=commit;h=adcc8cb3477c36e26e1bb06bf… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Thu Jun 25 19:41:49 2009 +0200 notepad: Update Slovenian translation. --- programs/notepad/Si.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Si.rc b/programs/notepad/Si.rc index 533bfd6..6ef38ee 100644 --- a/programs/notepad/Si.rc +++ b/programs/notepad/Si.rc @@ -53,6 +53,7 @@ POPUP "&Urejanje" { POPUP "&Iskanje" { MENUITEM "&Najdi ...\tCtrl+F", CMD_SEARCH MENUITEM "Najdi na&slednje\tF3", CMD_SEARCH_NEXT + MENUITEM "&Zamenjaj...\tCtrl+H", CMD_REPLACE } POPUP "&Pomoč" { MENUITEM "&Teme pomoči", CMD_HELP_CONTENTS

1 0

Matej Spindler : appwiz.cpl: Update Slovenian translation.
by Alexandre Julliard June 26, 2009

June 26, 2009

Module: wine Branch: master Commit: 160f4ca33857e2ab02f37b38311a1f9d18ae82cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=160f4ca33857e2ab02f37b383… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Thu Jun 25 19:40:55 2009 +0200 appwiz.cpl: Update Slovenian translation. --- dlls/appwiz.cpl/Si.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Si.rc b/dlls/appwiz.cpl/Si.rc index 83f2d4b..5b61861 100644 --- a/dlls/appwiz.cpl/Si.rc +++ b/dlls/appwiz.cpl/Si.rc @@ -35,6 +35,7 @@ STRINGTABLE IDS_COLUMN_NAME, "Ime" IDS_COLUMN_PUBLISHER, "Založnik" IDS_COLUMN_VERSION, "Različica" + IDS_INSTALL_FILTER, "Instalacijski programi\0*instal*.exe;*setup*.exe;*.msi\0Programi (*.exe)\0*.exe\0Vse datoteke (*.*)\0*.*\0\0" } IDD_MAIN DIALOG 0, 0, 320, 220

1 0

Matej Spindler : regedit: Update Slovenian translation.
by Alexandre Julliard June 26, 2009

June 26, 2009

Module: wine Branch: master Commit: 8d9c0ec231efddb38c04bb996ef3ae1d2da173b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9c0ec231efddb38c04bb996… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Thu Jun 25 19:42:40 2009 +0200 regedit: Update Slovenian translation. --- programs/regedit/Si.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Si.rc b/programs/regedit/Si.rc index 9c6cf32..ce04db1 100644 --- a/programs/regedit/Si.rc +++ b/programs/regedit/Si.rc @@ -283,6 +283,7 @@ BEGIN ID_EDIT_COPYKEYNAME "Kopira ime izbranega ključa na odložišče" ID_EDIT_FIND "Poišče znakovni niz v ključu, vrednosti ali vsebini vrednosti" ID_EDIT_FINDNEXT "Poišče naslednjo ponovitev iskanega besedila" + ID_EDIT_EXPORT "Izvozi izbrano vejo registra v tekstovno datoteko" END STRINGTABLE DISCARDABLE

1 0