wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

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

20 Sep '11

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 : shell32: Fix printing NULL strings.
by Alexandre Julliard 20 Sep '11

20 Sep '11

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 : version: Fix printing NULL strings.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 6a8ba3616c7eebd2ea42deba2ce087d583d83320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8ba3616c7eebd2ea42deba2… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 19 23:28:54 2011 +0200 version: Fix printing NULL strings. --- dlls/version/version.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index f636c62..bc90dcc 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1344,8 +1344,9 @@ DWORD WINAPI VerInstallFileA( OFSTRUCT ofs; TRACE("(%x,%s,%s,%s,%s,%s,%p,%d)\n", - flags,srcfilename,destfilename,srcdir,destdir,curdir,tmpfile,*tmpfilelen - ); + flags,debugstr_a(srcfilename),debugstr_a(destfilename), + debugstr_a(srcdir),debugstr_a(destdir),debugstr_a(curdir), + tmpfile,*tmpfilelen); xret = 0; if (!srcdir || !srcfilename) return VIF_CANNOTREADSRC; sprintf(srcfn,"%s\\%s",srcdir,srcfilename);

1 0

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

20 Sep '11

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 : 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

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 : 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 : 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

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

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011