September 2011 - Wine-Commits

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_texture() const.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

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

Francois Gouget : po: Remove an English string from the Hungarian translation.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

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: Remove an English string from the Chinese (PRC) translation.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: fe6c8dc16d2cffde231512f807567c203dcfeff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe6c8dc16d2cffde231512f80… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 19 23:33:10 2011 +0200 po: Remove an English string from the Chinese (PRC) translation. --- po/zh_CN.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index acbec7d..6fe15e6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6389,7 +6389,7 @@ msgstr "Wine Internet Explorer" #: shdoclc.rc:30 msgid "&w&bPage &p" -msgstr "&w&bPage &p" +msgstr "" #: shell32.rc:27 shell32.rc:42 shell32.rc:119 shell32.rc:159 taskmgr.rc:65 #: taskmgr.rc:110 taskmgr.rc:252

1 0

Francois Gouget : shell32: Fix printing NULL strings.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: ff23498e3f9d90c6f46ff5e6af1e9529537b6959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff23498e3f9d90c6f46ff5e6a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 19 23:29:29 2011 +0200 shell32: Fix printing NULL strings. --- dlls/shell32/shelllink.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 07fe7aa..7d97f97 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -1472,7 +1472,7 @@ static HRESULT WINAPI IShellLinkA_fnSetDescription(IShellLinkA *iface, LPCSTR ps { IShellLinkImpl *This = impl_from_IShellLinkA(iface); - TRACE("(%p)->(pName=%s)\n", This, pszName); + TRACE("(%p)->(pName=%s)\n", This, debugstr_a(pszName)); HeapFree(GetProcessHeap(), 0, This->sDescription); if (pszName) @@ -1540,7 +1540,7 @@ static HRESULT WINAPI IShellLinkA_fnSetArguments(IShellLinkA *iface, LPCSTR pszA { IShellLinkImpl *This = impl_from_IShellLinkA(iface); - TRACE("(%p)->(args=%s)\n",This, pszArgs); + TRACE("(%p)->(args=%s)\n",This, debugstr_a(pszArgs)); HeapFree(GetProcessHeap(), 0, This->sArgs); if (pszArgs) @@ -1664,7 +1664,7 @@ static HRESULT WINAPI IShellLinkA_fnSetPath(IShellLinkA *iface, LPCSTR pszFile) HRESULT r; LPWSTR str; - TRACE("(%p)->(path=%s)\n",This, pszFile); + TRACE("(%p)->(path=%s)\n",This, debugstr_a(pszFile)); if (!pszFile) return E_INVALIDARG;

1 0

Francois Gouget : winex11: Fix printing NULL strings.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: 076f67844624fdde6c27616808ba8b275b30649c URL: http://source.winehq.org/git/wine.git/?a=commit;h=076f67844624fdde6c2761680… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 19 23:28:30 2011 +0200 winex11: Fix printing NULL strings. --- dlls/winex11.drv/keyboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 423921a..47317e6 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2301,7 +2301,7 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) name = XKeysymToString(keys); wine_tsx11_unlock(); TRACE("found scan=%04x keyc=%u keysym=%04x string=%s\n", - scanCode, keyc, (int)keys, name); + scanCode, keyc, (int)keys, debugstr_a(name)); if (lpBuffer && nSize && name) return MultiByteToWideChar(CP_UNIXCP, 0, name, -1, lpBuffer, nSize); }

1 0

Francois Gouget : ntdll: Fix printing NULL strings.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

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 : po: Remove a couple more English strings from the Norwegian Bokmål translation.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

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 : msvcrt: Fix printing NULL strings.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: 7da4305aec6b77bd1857e0d637e551e8c1589002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7da4305aec6b77bd1857e0d63… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 19 23:29:47 2011 +0200 msvcrt: Fix printing NULL strings. --- dlls/msvcrt/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 31ba8d4..608401d 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -842,7 +842,7 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR BOOL negative = FALSE; __int64 ret = 0; - TRACE("(%s %p %d %p)\n", nptr, endptr, base, locale); + TRACE("(%s %p %d %p)\n", debugstr_a(nptr), endptr, base, locale); if (!MSVCRT_CHECK_PMT(nptr != NULL) || !MSVCRT_CHECK_PMT(base == 0 || base >= 2) || !MSVCRT_CHECK_PMT(base <= 36)) { @@ -922,7 +922,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b BOOL negative = FALSE; unsigned __int64 ret = 0; - TRACE("(%s %p %d %p)\n", nptr, endptr, base, locale); + TRACE("(%s %p %d %p)\n", debugstr_a(nptr), endptr, base, locale); if (!MSVCRT_CHECK_PMT(nptr != NULL) || !MSVCRT_CHECK_PMT(base == 0 || base >= 2) || !MSVCRT_CHECK_PMT(base <= 36)) {

1 0

Francois Gouget : wininet: Fix printing NULL strings.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

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

Francois Gouget : po: Mark a few partially translated strings as fuzzy in the German translation .
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

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