November 2011 - Wine-Commits

André Hentschel : po: Update German translation.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 32664381fb59bb47ca972b92b428dcba23c392a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32664381fb59bb47ca972b92b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 13 17:24:46 2011 +0100 po: Update German translation. --- po/de.po | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/po/de.po b/po/de.po index 89cc6e0..1803b0c 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-11-01 14:03+0100\n" +"PO-Revision-Date: 2011-11-12 17:21+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -2034,73 +2034,71 @@ msgstr "%uMB benutzt, %uMB verfügbar" #: gdi32.rc:25 msgid "Western" -msgstr "" +msgstr "Westlich" #: gdi32.rc:26 msgid "Central European" -msgstr "" +msgstr "Mitteleuropäisch" #: gdi32.rc:27 msgid "Cyrillic" -msgstr "" +msgstr "Kyrillisch" #: gdi32.rc:28 -#, fuzzy msgid "Greek" -msgstr "Grün" +msgstr "Griechisch" #: gdi32.rc:29 msgid "Turkish" -msgstr "" +msgstr "Türkisch" #: gdi32.rc:30 msgid "Hebrew" -msgstr "" +msgstr "Hebräisch" #: gdi32.rc:31 msgid "Arabic" -msgstr "" +msgstr "Arabisch" #: gdi32.rc:32 msgid "Baltic" -msgstr "" +msgstr "Baltisch" #: gdi32.rc:33 msgid "Vietnamese" -msgstr "" +msgstr "Vietnamesisch" #: gdi32.rc:34 msgid "Thai" -msgstr "" +msgstr "Thailändisch" #: gdi32.rc:35 -#, fuzzy msgid "Japanese" -msgstr "Ausschnitt" +msgstr "Japanisch" #: gdi32.rc:36 msgid "CHINESE_GB2312" -msgstr "" +msgstr "CHINESE_GB2312" #: gdi32.rc:37 msgid "Hangul" -msgstr "" +msgstr "Koreanisch" #: gdi32.rc:38 msgid "CHINESE_BIG5" -msgstr "" +msgstr "CHINESE_BIG5" #: gdi32.rc:39 msgid "Hangul(Johab)" -msgstr "" +msgstr "Koreanisch(Johab)" #: gdi32.rc:40 msgid "Symbol" -msgstr "" +msgstr "Symbol" #: gdi32.rc:41 msgid "OEM/DOS" -msgstr "" +msgstr "OEM/DOS" #: hhctrl.rc:56 msgid "S&ync" @@ -11013,7 +11011,7 @@ msgstr "Festplattenreset fehlgeschlagen!" #: winecfg.rc:91 msgid "(System default)" -msgstr "(System Ordner)" +msgstr "(System Standard)" #: winecfg.rc:51 msgid ""

1 0

Jacek Caban : urlmon: Improved IUri debug traces.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 64b94ebffcbe1c115433a01b150c1915959a31df URL: http://source.winehq.org/git/wine.git/?a=commit;h=64b94ebffcbe1c115433a01b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 12 15:00:32 2011 +0100 urlmon: Improved IUri debug traces. --- dlls/urlmon/uri.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 2b0b9ad..9fd0fe0 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4206,7 +4206,7 @@ static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BST { Uri *This = impl_from_IUri(iface); HRESULT hres; - TRACE("(%p)->(%d %p %x)\n", This, uriProp, pbstrProperty, dwFlags); + TRACE("(%p %s)->(%d %p %x)\n", This, debugstr_w(This->canon_uri), uriProp, pbstrProperty, dwFlags); if(!pbstrProperty) return E_POINTER; @@ -4496,7 +4496,7 @@ static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, D { Uri *This = impl_from_IUri(iface); HRESULT hres; - TRACE("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + TRACE("(%p %s)->(%d %p %x)\n", This, debugstr_w(This->canon_uri), uriProp, pcchProperty, dwFlags); if(!pcchProperty) return E_INVALIDARG; @@ -4631,7 +4631,7 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW Uri *This = impl_from_IUri(iface); HRESULT hres; - TRACE("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + TRACE("(%p %s)->(%d %p %x)\n", This, debugstr_w(This->canon_uri), uriProp, pcchProperty, dwFlags); if(!pcchProperty) return E_INVALIDARG; @@ -4681,7 +4681,8 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW static HRESULT WINAPI Uri_HasProperty(IUri *iface, Uri_PROPERTY uriProp, BOOL *pfHasProperty) { Uri *This = impl_from_IUri(iface); - TRACE("(%p)->(%d %p)\n", This, uriProp, pfHasProperty); + + TRACE("(%p %s)->(%d %p)\n", This, debugstr_w(This->canon_uri), uriProp, pfHasProperty); if(!pfHasProperty) return E_INVALIDARG; @@ -4872,7 +4873,7 @@ static HRESULT WINAPI Uri_GetZone(IUri *iface, DWORD *pdwZone) static HRESULT WINAPI Uri_GetProperties(IUri *iface, DWORD *pdwProperties) { Uri *This = impl_from_IUri(iface); - TRACE("(%p)->(%p)\n", This, pdwProperties); + TRACE("(%p %s)->(%p)\n", This, debugstr_w(This->canon_uri), pdwProperties); if(!pdwProperties) return E_INVALIDARG; @@ -4922,7 +4923,7 @@ static HRESULT WINAPI Uri_IsEqual(IUri *iface, IUri *pUri, BOOL *pfEqual) Uri *This = impl_from_IUri(iface); Uri *other; - TRACE("(%p)->(%p %p)\n", This, pUri, pfEqual); + TRACE("(%p %s)->(%p %p)\n", This, debugstr_w(This->canon_uri), pUri, pfEqual); if(!pfEqual) return E_POINTER; @@ -4935,9 +4936,10 @@ static HRESULT WINAPI Uri_IsEqual(IUri *iface, IUri *pUri, BOOL *pfEqual) } /* Try to convert it to a Uri (allows for a more simple comparison). */ - if((other = get_uri_obj(pUri))) + if((other = get_uri_obj(pUri))) { + TRACE("comparing to %s\n", debugstr_w(other->canon_uri)); *pfEqual = are_equal_simple(This, other); - else { + }else { /* Do it the hard way. */ FIXME("(%p)->(%p %p) No support for unknown IUri's yet.\n", iface, pUri, pfEqual); return E_NOTIMPL;

1 0

Marcus Meissner : gdi32: Fixed loop end setting (Coverity).
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 4222ccf1cf50618fb804fc3dcc492b6db0d3dff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4222ccf1cf50618fb804fc3dc… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Nov 12 12:09:33 2011 +0100 gdi32: Fixed loop end setting (Coverity). --- dlls/gdi32/freetype.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9137322..06350be 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4588,7 +4588,7 @@ static BOOL enum_face_charsets(Face *face, struct enum_charset_list *list, if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */ elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; load_script_name( IDS_OEM_DOS, elf.elfScript ); - i = 32; /* break out of loop */ + i = list->total; /* break out of loop after enumeration */ } else if(!(face->fs.fsCsb[0] & list->element[i].mask)) continue; else { @@ -4600,7 +4600,7 @@ static BOOL enum_face_charsets(Face *face, struct enum_charset_list *list, TRACE("enuming face %s full %s style %s charset = %d type %d script %s it %d weight %d ntmflags %08x\n", debugstr_w(elf.elfLogFont.lfFaceName), debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle), - list->element[i].charset, type, debugstr_w(elf.elfScript), + elf.elfLogFont.lfCharSet, type, debugstr_w(elf.elfScript), elf.elfLogFont.lfItalic, elf.elfLogFont.lfWeight, ntm.ntmTm.ntmFlags); /* release section before callback (FIXME) */

1 0

Andrew Talbot : appwiz.cpl: Remove an unused function.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: cedeac3191eaab0fc53471fdfc8fb949ac459ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cedeac3191eaab0fc53471fdf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 10 22:11:24 2011 +0000 appwiz.cpl: Remove an unused function. --- dlls/appwiz.cpl/addons.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 3099ec8..0e3591b 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -74,19 +74,6 @@ static const WCHAR mshtml_keyW[] = static HWND install_dialog = NULL; static LPWSTR url = NULL; -static inline char *heap_strdupWtoA(LPCWSTR str) -{ - char *ret = NULL; - - if(str) { - DWORD size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); - ret = heap_alloc(size); - WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); - } - - return ret; -} - /* SHA definitions are copied from advapi32. They aren't available in headers. */ typedef struct {

1 0

André Hentschel : unicows: Add GetRoleTextW from oleacc.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: ebde184b4c268a73a89b0593bd94b9637896f42c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebde184b4c268a73a89b0593b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 11 19:13:26 2011 +0100 unicows: Add GetRoleTextW from oleacc. --- dlls/unicows/Makefile.in | 2 +- dlls/unicows/unicows.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/unicows/Makefile.in b/dlls/unicows/Makefile.in index d368636..aa61da4 100644 --- a/dlls/unicows/Makefile.in +++ b/dlls/unicows/Makefile.in @@ -1,6 +1,6 @@ MODULE = unicows.dll IMPORTLIB = unicows IMPORTS = avicap32 msvfw32 oledlg comdlg32 shell32 winmm winspool \ - rasapi32 secur32 sensapi version user32 mpr gdi32 advapi32 + rasapi32 secur32 sensapi version oleacc user32 mpr gdi32 advapi32 @MAKE_DLL_RULES@ diff --git a/dlls/unicows/unicows.spec b/dlls/unicows/unicows.spec index 47ba26f..c008ea7 100644 --- a/dlls/unicows/unicows.spec +++ b/dlls/unicows/unicows.spec @@ -227,7 +227,7 @@ @ stdcall GetProfileStringW(wstr wstr wstr ptr long) @ stdcall GetPropA(long str) @ stdcall GetPropW(long wstr) -@ stub GetRoleTextW +@ stdcall GetRoleTextW(long ptr long) @ stdcall GetSaveFileNamePreviewW(ptr) @ stdcall GetSaveFileNameW(ptr) @ stdcall GetShortPathNameW(wstr ptr long)

1 0

Andrew Talbot : advapi32: Remove an unused variable.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 8a1539ac98e31c629d30e454eddee6fe8ebf49bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a1539ac98e31c629d30e454e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 10 22:10:50 2011 +0000 advapi32: Remove an unused variable. --- dlls/advapi32/service.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 2fc3d71..bb5e49c 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -45,10 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(service); -static const WCHAR szServiceManagerKey[] = { 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'S','e','r','v','i','c','e','s',0 }; - void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len) { return HeapAlloc(GetProcessHeap(), 0, len);

1 0

Marcus Meissner : wmc: Increate allocated size to match \0 (Coverity).
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: af14cb60f7af67472cf7494eb5d0395cb7bd068e URL: http://source.winehq.org/git/wine.git/?a=commit;h=af14cb60f7af67472cf7494eb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Nov 12 09:04:51 2011 +0100 wmc: Increate allocated size to match \0 (Coverity). --- tools/wmc/wmc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 837cfa6..c9ad9c4 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -164,7 +164,7 @@ int main(int argc,char *argv[]) /* First rebuild the commandline to put in destination */ /* Could be done through env[], but not all OS-es support it */ - cmdlen = 4; /* for "wmc " */ + cmdlen = 5; /* for "wmc " and \0 */ for(i = 1; i < argc; i++) cmdlen += strlen(argv[i]) + 1; cmdline = xmalloc(cmdlen);

1 0

Andrew Talbot : atl: Remove an unused variable.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: a41cbc1423e7317f51d6a3fc65552f0c3af502aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41cbc1423e7317f51d6a3fc6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 10 22:11:48 2011 +0000 atl: Remove an unused variable. --- dlls/atl/registrar.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 7edd739..4fcf28d 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -844,8 +844,6 @@ HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR return do_register_dll_server(pReg, module_name, lpszRes, bRegister, pMapEntries); } -static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; - /*********************************************************************** * DllRegisterServer (ATL.@) */

1 0

Jacek Caban : mshtml: Fixed memory leak in nsIURL:: GetDirectory implementation.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 734050f5c57cba6dfafe36a15c27a6dee1120152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=734050f5c57cba6dfafe36a15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 10 14:35:59 2011 +0100 mshtml: Fixed memory leak in nsIURL::GetDirectory implementation. --- dlls/mshtml/nsio.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index bf41f35..d266ddf 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2427,6 +2427,7 @@ static nsresult NSAPI nsURL_GetDirectory(nsIURL *iface, nsACString *aDirectory) SysFreeString(path); TRACE("ret %s\n", debugstr_a(dir)); nsACString_SetData(aDirectory, dir ? dir : ""); + heap_free(dir); return NS_OK; }

1 0

Hans Leidekker : msi: Trace the exit code from custom action processes.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: a1005503830a65f2f53080d8906baebd30c78127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1005503830a65f2f53080d89… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 10 11:38:47 2011 +0100 msi: Trace the exit code from custom action processes. --- dlls/msi/custom.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 16a44c3..3b8e677 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -308,6 +308,7 @@ static UINT custom_get_process_return( HANDLE process ) DWORD rc = 0; GetExitCodeProcess( process, &rc ); + TRACE("exit code is %u\n", rc); if (rc != 0) return ERROR_FUNCTION_FAILED; return ERROR_SUCCESS;

1 0