September 2011 - Wine-commits

Francois Gouget : po: Remove an English string from the Hungarian translation.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 1795a27622e394d40c5f8f69396ca53164d37ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=1795a27622e394d40c5f8f693… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 19 23:33:18 2011 +0200 po: Remove an English string from the Hungarian translation. --- po/hu.po | 30 ------------------------------ 1 files changed, 0 insertions(+), 30 deletions(-) diff --git a/po/hu.po b/po/hu.po index a42e01e..bd0de18 100644 --- a/po/hu.po +++ b/po/hu.po @@ -5741,7 +5741,6 @@ msgid "insert disk %s" msgstr "helyezze be a lemezt: %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -5773,35 +5772,6 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" -"\n" -"Usage:\n" -"msiexec command {required parameter} [optional parammeter]\n" -"\n" -"Install a product:\n" -"\t/i {package|productcode} [property]\n" -"\t/package {package|productcode} [property]\n" -"\t/a package [property]\n" -"Repair an installation:\n" -"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" -"Uninstall a product:\n" -"\t/uninstall {package|productcode} [property]\n" -"\t/x {package|productcode} [property]\n" -"Advertise a product:\n" -"\t/j[u|m] package [/t transform] [/g languageid]\n" -"Apply a patch:\n" -"\t/p patchpackage [property]\n" -"\t/p patchpackage /a package [property]\n" -"Log and UI Modifiers for above commands:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -"\t/q{|n|b|r|f|n+|b+|b-}\n" -"Register MSI Service:\n" -"\t/y\n" -"Unregister MSI Service:\n" -"\t/z\n" -"Display this help:\n" -"\t/help\n" -"\t/?\n" #: msi.rc:57 msgid "enter which folder contains %s"

1 0

Francois Gouget : po: Mark a few partially translated strings as fuzzy in the German translation .
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 2cc6fb485d55a1ce57b34780178269b5159f76ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc6fb485d55a1ce57b347801… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 19 23:35:13 2011 +0200 po: Mark a few partially translated strings as fuzzy in the German translation. --- po/de.po | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/po/de.po b/po/de.po index 1575ff1..d594607 100644 --- a/po/de.po +++ b/po/de.po @@ -9695,6 +9695,7 @@ msgstr "" "Bedingungen weiter zu verbreiten; führe 'start /L' für mehr Details aus.\n" #: start.rc:64 +#, fuzzy msgid "" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" "This program is free software; you can redistribute it and/or\n" @@ -10921,7 +10922,7 @@ msgstr "&Nebeneinander\tUmschalt+F4" #: winefile.rc:87 #, fuzzy msgid "&About Wine File Manager" -msgstr "Winefile" +msgstr "&Info über Wine File Manager" #: winefile.rc:93 msgid "Applying font settings" @@ -10932,6 +10933,7 @@ msgid "Error while selecting new font." msgstr "Fehler während der Schriftart-Auswahl." #: winefile.rc:99 +#, fuzzy msgid "Wine File Manager" msgstr "Winefile"

1 0

Francois Gouget : po: Remove a couple more English strings from the Norwegian Bokmål translation.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: e43cd44bff30282b0a15ce5faa0c3d012cc76127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e43cd44bff30282b0a15ce5fa… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 19 23:33:23 2011 +0200 po: Remove a couple more English strings from the Norwegian Bokmål translation. --- po/nb_NO.po | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index af199fc..82e6237 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -7951,13 +7951,10 @@ msgid "" "Not Yet Implemented\n" "\n" msgstr "" -"Not Yet Implemented\n" -"\n" #: attrib.rc:28 cmd.rc:301 -#, fuzzy msgid "%s: File Not Found\n" -msgstr "%s : File Not Found\n" +msgstr "" #: attrib.rc:47 msgid ""

1 0

Francois Gouget : po: Remove an English string from the Italian translation .
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: b1f7c084d72e4634c033b5226e65470f729d0659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1f7c084d72e4634c033b5226… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 19 23:33:15 2011 +0200 po: Remove an English string from the Italian translation. --- po/it.po | 30 ------------------------------ 1 files changed, 0 insertions(+), 30 deletions(-) diff --git a/po/it.po b/po/it.po index 2352087..59aaec5 100644 --- a/po/it.po +++ b/po/it.po @@ -5638,7 +5638,6 @@ msgid "insert disk %s" msgstr "inserire disco %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -5670,35 +5669,6 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" -"\n" -"Usage:\n" -"msiexec command {required parameter} [optional parammeter]\n" -"\n" -"Install a product:\n" -"\t/i {package|productcode} [property]\n" -"\t/package {package|productcode} [property]\n" -"\t/a package [property]\n" -"Repair an installation:\n" -"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" -"Uninstall a product:\n" -"\t/uninstall {package|productcode} [property]\n" -"\t/x {package|productcode} [property]\n" -"Advertise a product:\n" -"\t/j[u|m] package [/t transform] [/g languageid]\n" -"Apply a patch:\n" -"\t/p patchpackage [property]\n" -"\t/p patchpackage /a package [property]\n" -"Log and UI Modifiers for above commands:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -"\t/q{|n|b|r|f|n+|b+|b-}\n" -"Register MSI Service:\n" -"\t/y\n" -"Unregister MSI Service:\n" -"\t/z\n" -"Display this help:\n" -"\t/help\n" -"\t/?\n" #: msi.rc:57 msgid "enter which folder contains %s"

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_texture() const.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 11323b4416f32b39f9ce3f234dc2cc6aa7bfd9d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11323b4416f32b39f9ce3f234… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 19 21:50:26 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_texture() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fe1b8a4..6d6f85d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3863,7 +3863,7 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_texture(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_texture(const struct wined3d_device *device, UINT stage, struct wined3d_texture **texture) { TRACE("device %p, stage %u, texture %p.\n", device, stage, texture); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ed62b08..3edbfde 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2256,7 +2256,7 @@ HRESULT __cdecl wined3d_device_get_surface_from_dc(struct wined3d_device *device HRESULT __cdecl wined3d_device_get_swapchain(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_swapchain **swapchain); UINT __cdecl wined3d_device_get_swapchain_count(const struct wined3d_device *device); -HRESULT __cdecl wined3d_device_get_texture(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_texture(const struct wined3d_device *device, UINT stage, struct wined3d_texture **texture); HRESULT __cdecl wined3d_device_get_texture_stage_state(const struct wined3d_device *device, UINT stage, WINED3DTEXTURESTAGESTATETYPE state, DWORD *value);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_back_buffer() const.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 5177a5f68676ee745fb0de1246250dec678497bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5177a5f68676ee745fb0de124… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 19 21:50:27 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_back_buffer() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6d6f85d..f598ea3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3886,7 +3886,7 @@ HRESULT CDECL wined3d_device_get_texture(const struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_back_buffer(struct wined3d_device *device, UINT swapchain_idx, +HRESULT CDECL wined3d_device_get_back_buffer(const struct wined3d_device *device, UINT swapchain_idx, UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer) { struct wined3d_swapchain *swapchain; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3edbfde..a6071ea 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2205,7 +2205,7 @@ HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); -HRESULT __cdecl wined3d_device_get_back_buffer(struct wined3d_device *device, UINT swapchain_idx, +HRESULT __cdecl wined3d_device_get_back_buffer(const struct wined3d_device *device, UINT swapchain_idx, UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer); INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, float *plane);

1 0

Francois Gouget : crypt32: Fix printing NULL strings.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 6efd90510b87ad6ce1a6b89b93d9ae675a157c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6efd90510b87ad6ce1a6b89b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 19 23:26:49 2011 +0200 crypt32: Fix printing NULL strings. --- dlls/crypt32/chain.c | 2 +- dlls/crypt32/oid.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 2c6732d..c5f6742 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1668,7 +1668,7 @@ static LPCSTR filetime_to_str(const FILETIME *time) char dateFmt[80]; /* sufficient for all versions of LOCALE_SSHORTDATE */ SYSTEMTIME sysTime; - if (!time) return NULL; + if (!time) return "(null)"; GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, sizeof(dateFmt) / sizeof(dateFmt[0])); diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 9f998d9..d6b26f7 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -614,8 +614,8 @@ BOOL WINAPI CryptRegisterOIDFunction(DWORD dwEncodingType, LPCSTR pszFuncName, HKEY hKey; LPSTR szKey; - TRACE("(%x, %s, %s, %s, %s)\n", dwEncodingType, pszFuncName, - debugstr_a(pszOID), debugstr_w(pwszDll), pszOverrideFuncName); + TRACE("(%x, %s, %s, %s, %s)\n", dwEncodingType, debugstr_a(pszFuncName), + debugstr_a(pszOID), debugstr_w(pwszDll), debugstr_a(pszOverrideFuncName)); /* Native does nothing pwszDll is NULL */ if (!pwszDll)

1 0

Francois Gouget : advapi32: Fix printing NULL strings.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: ada3d57e8396b583691a69aeee477ab3454992de URL: http://source.winehq.org/git/wine.git/?a=commit;h=ada3d57e8396b583691a69aee… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 19 23:27:06 2011 +0200 advapi32: Fix printing NULL strings. --- dlls/advapi32/crypt.c | 4 ++-- dlls/advapi32/registry.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index f0f19ee..31260a8 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -545,8 +545,8 @@ BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer, PWSTR pProvider = NULL, pContainer = NULL; BOOL ret = FALSE; - TRACE("(%p, %s, %s, %d, %08x)\n", phProv, pszContainer, - pszProvider, dwProvType, dwFlags); + TRACE("(%p, %s, %s, %d, %08x)\n", phProv, debugstr_a(pszContainer), + debugstr_a(pszProvider), dwProvType, dwFlags); if ( !CRYPT_ANSIToUnicode(pszContainer, &pContainer, -1) ) { diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index d5c4164..758ba08 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1739,8 +1739,8 @@ LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, LONG ret; TRACE("(%p,%s,%s,%d,%p,%p,%p=%d)\n", - hKey, pszSubKey, pszValue, dwFlags, pdwType, pvData, pcbData, - cbData); + hKey, debugstr_a(pszSubKey), debugstr_a(pszValue), dwFlags, + pdwType, pvData, pcbData, cbData); if (pvData && !pcbData) return ERROR_INVALID_PARAMETER;

1 0

Francois Gouget : ntdll: Fix printing NULL strings.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 17e62a5603d35c6338e88c308cb75150fd6abcf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17e62a5603d35c6338e88c308… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 19 23:27:48 2011 +0200 ntdll: Fix printing NULL strings. --- dlls/ntdll/atom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/atom.c b/dlls/ntdll/atom.c index 3789567..304b7f6 100644 --- a/dlls/ntdll/atom.c +++ b/dlls/ntdll/atom.c @@ -164,7 +164,7 @@ NTSTATUS WINAPI RtlQueryAtomInAtomTable( RTL_ATOM_TABLE table, RTL_ATOM atom, UL } TRACE( "%p %x -> %s (%x)\n", - table, atom, len ? debugstr_wn(name, wlen / sizeof(WCHAR)) : NULL, status ); + table, atom, len ? debugstr_wn(name, wlen / sizeof(WCHAR)) : "(null)", status ); return status; }

1 0

Francois Gouget : wininet: Fix printing NULL strings.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 843e97eb1f37b8114864223c6bdc235b10376ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=843e97eb1f37b8114864223c6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 19 23:28:03 2011 +0200 wininet: Fix printing NULL strings. --- dlls/wininet/ftp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 1b0a46b..74316b9 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2651,7 +2651,7 @@ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam, int nRC = 0; DWORD dwParamLen; - TRACE("%d: (%s) %d\n", ftpCmd, lpszParam, nSocket); + TRACE("%d: (%s) %d\n", ftpCmd, debugstr_a(lpszParam), nSocket); if (lpfnStatusCB) {

1 0