September 2011 - Wine-commits

Alexandre Julliard : gdi32: Force colors to black and white for 1-bpp source in AlphaBlend.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 514b006df240441efc50be7c42680e423a80402d URL: http://source.winehq.org/git/wine.git/?a=commit;h=514b006df240441efc50be7c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 15:27:36 2011 +0200 gdi32: Force colors to black and white for 1-bpp source in AlphaBlend. --- dlls/gdi32/bitblt.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 98ced52..294901d 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -293,6 +293,20 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); if (err == ERROR_BAD_FORMAT) { + /* 1-bpp source without a color table uses black & white */ + if (src_info->bmiHeader.biBitCount == 1 && !src_info->bmiHeader.biClrUsed) + { + src_info->bmiColors[0].rgbRed = 0; + src_info->bmiColors[0].rgbGreen = 0; + src_info->bmiColors[0].rgbBlue = 0; + src_info->bmiColors[0].rgbReserved = 0; + src_info->bmiColors[1].rgbRed = 0xff; + src_info->bmiColors[1].rgbGreen = 0xff; + src_info->bmiColors[1].rgbBlue = 0xff; + src_info->bmiColors[1].rgbReserved = 0; + src_info->bmiHeader.biClrUsed = 2; + } + err = convert_bits( src_info, src, dst_info, &bits ); if (!err) err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); }

1 0

Austin English : urlmon: Add a stub for RegisterMediaTypes().
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 7c527199b6ccc8bffb72d72ddd9f2498e53ac19c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c527199b6ccc8bffb72d72dd… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Sep 19 14:24:02 2011 -0700 urlmon: Add a stub for RegisterMediaTypes(). --- dlls/urlmon/urlmon.spec | 2 +- dlls/urlmon/urlmon_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index d3867e1..14b1aba 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -72,7 +72,7 @@ @ stdcall RegisterBindStatusCallback(ptr ptr ptr long) @ stdcall RegisterFormatEnumerator(ptr ptr long) @ stub RegisterMediaTypeClass -@ stub RegisterMediaTypes +@ stdcall RegisterMediaTypes(long ptr ptr) @ stdcall ReleaseBindInfo(ptr) @ stdcall RevokeBindStatusCallback(ptr ptr) @ stdcall RevokeFormatEnumerator(ptr ptr) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 5ba9c00..4d60977 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -935,3 +935,13 @@ BOOL WINAPI URLMON_423(DWORD unknown1, DWORD unknown2, DWORD unknown3, DWORD unk FIXME("stub: %d %d %d %d\n", unknown1, unknown2, unknown3, unknown4); return FALSE; } + +/*********************************************************************** + * RegisterMediaTypes + * Added in IE3, registers known MIME-type strings. + */ +HRESULT WINAPI RegisterMediaTypes(UINT types, LPCSTR *szTypes, CLIPFORMAT *cfTypes) +{ + FIXME("stub: %u %p %p\n", types, szTypes, cfTypes); + return E_INVALIDARG; +}

1 0

Hans Leidekker : mscms: Fix OpenColorProfile to handle relative file names.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 7200072622dc14873bd0a9430c5dfd5949a6ebe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7200072622dc14873bd0a9430… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 20 11:31:13 2011 +0200 mscms: Fix OpenColorProfile to handle relative file names. --- dlls/mscms/Makefile.in | 2 +- dlls/mscms/profile.c | 21 ++++++++++++++++++++- dlls/mscms/tests/profile.c | 10 ++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in index 9a55cdb..6589598 100644 --- a/dlls/mscms/Makefile.in +++ b/dlls/mscms/Makefile.in @@ -1,6 +1,6 @@ MODULE = mscms.dll IMPORTLIB = mscms -IMPORTS = advapi32 +IMPORTS = shlwapi advapi32 EXTRALIBS = @LCMSLIBS@ C_SRCS = \ diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 7fc94be..c4eae9d 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -30,6 +30,7 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" +#include "shlwapi.h" #include "icm.h" #include "mscms_priv.h" @@ -1470,7 +1471,25 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing if (!flags) return NULL; if (!sharing) sharing = FILE_SHARE_READ; - handle = CreateFileW( profile->pProfileData, flags, sharing, NULL, creation, 0, NULL ); + if (!PathIsRelativeW( profile->pProfileData )) + handle = CreateFileW( profile->pProfileData, flags, sharing, NULL, creation, 0, NULL ); + else + { + DWORD size; + WCHAR *path; + + if (!GetColorDirectoryW( NULL, NULL, &size ) && GetLastError() == ERROR_MORE_DATA) + { + size += (strlenW( profile->pProfileData ) + 2) * sizeof(WCHAR); + if (!(path = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; + GetColorDirectoryW( NULL, path, &size ); + PathAddBackslashW( path ); + strcatW( path, profile->pProfileData ); + } + else return NULL; + handle = CreateFileW( path, flags, sharing, NULL, creation, 0, NULL ); + HeapFree( GetProcessHeap(), 0, path ); + } if (handle == INVALID_HANDLE_VALUE) { WARN( "Unable to open color profile %u\n", GetLastError() ); diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 7cbface..d4293ff 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -952,6 +952,16 @@ static void test_OpenColorProfileA(void) ret = pCloseColorProfile( handle ); ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = (void *)"sRGB Color Space Profile.icm"; + profile.cbDataSize = sizeof("sRGB Color Space Profile.icm"); + + handle = pOpenColorProfileA( &profile, PROFILE_READ, FILE_SHARE_READ, OPEN_EXISTING ); + ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + + ret = pCloseColorProfile( handle ); + ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); } }

1 0

Hans Leidekker : msi: Support TrueType font files in MsiGetFileVersion.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 2788a95c8eeae8ce9e03762ff9bdf1b7783d88a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2788a95c8eeae8ce9e03762ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 20 11:31:41 2011 +0200 msi: Support TrueType font files in MsiGetFileVersion. --- dlls/msi/action.c | 2 +- dlls/msi/files.c | 2 +- dlls/msi/font.c | 11 ++++- dlls/msi/msi.c | 134 ++++++++++++++++++++++++++-------------------------- dlls/msi/msipriv.h | 2 +- 5 files changed, 79 insertions(+), 72 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 478addd..d81c9b7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2196,7 +2196,7 @@ static UINT calculate_file_cost( MSIPACKAGE *package ) msi_free( file_version ); continue; } - else if ((font_version = font_version_from_file( file->TargetPath ))) + else if ((font_version = msi_font_version_from_file( file->TargetPath ))) { if (msi_compare_font_versions( font_version, file->Version ) < 0) { diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 9aa2098..210e012 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -103,7 +103,7 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil msi_free( file_version ); return state; } - else if ((font_version = font_version_from_file( file->TargetPath ))) + else if ((font_version = msi_font_version_from_file( file->TargetPath ))) { TRACE("new %s old %s\n", debugstr_w(file->Version), debugstr_w(font_version)); diff --git a/dlls/msi/font.c b/dlls/msi/font.c index df8b81f..df7b4e7 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -186,15 +186,22 @@ static WCHAR *font_name_from_file( const WCHAR *filename ) return ret; } -WCHAR *font_version_from_file( const WCHAR *filename ) +WCHAR *msi_font_version_from_file( const WCHAR *filename ) { + static const WCHAR dotzerodotzeroW[] = {'.','0','.','0',0}; WCHAR *version, *p, *ret = NULL; + int len; if ((p = version = load_ttf_name_id( filename, NAME_ID_VERSION ))) { while (*p && !isdigitW( *p )) p++; - ret = msi_alloc( (strlenW( p ) + 1) * sizeof(WCHAR) ); + len = strlenW( p ) + strlenW(dotzerodotzeroW) + 1; + ret = msi_alloc( len * sizeof(WCHAR) ); strcpyW( ret, p ); + if ((p = strchrW( p, '.' )) && !(p = strchrW( p + 1, '.' ))) + { + strcatW( ret, dotzerodotzeroW ); + } msi_free( version ); } return ret; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7506338..c1ebe17 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3017,11 +3017,8 @@ end: return ret; } -/****************************************************************** - * MsiGetFileVersionW [MSI.@] - */ -UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, - LPDWORD pcchVersionBuf, LPWSTR lpLangBuf, LPDWORD pcchLangBuf) +static UINT get_file_version( const WCHAR *path, WCHAR *verbuf, DWORD *verlen, + WCHAR *langbuf, DWORD *langlen ) { static const WCHAR szVersionResource[] = {'\\',0}; static const WCHAR szVersionFormat[] = { @@ -3030,91 +3027,94 @@ UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, '\\','V','a','r','F','i','l','e','I','n','f','o','\\', 'T','r','a','n','s','l','a','t','i','o','n',0}; static const WCHAR szLangFormat[] = {'%','d',0}; - UINT ret = 0; - DWORD dwVerLen, gle; - LPVOID lpVer = NULL; + UINT ret = ERROR_SUCCESS; + DWORD len, error; + LPVOID version; VS_FIXEDFILEINFO *ffi; USHORT *lang; - UINT puLen; WCHAR tmp[32]; - TRACE("%s %p %d %p %d\n", debugstr_w(szFilePath), - lpVersionBuf, pcchVersionBuf?*pcchVersionBuf:0, - lpLangBuf, pcchLangBuf?*pcchLangBuf:0); - - if ((lpVersionBuf && !pcchVersionBuf) || - (lpLangBuf && !pcchLangBuf)) - return ERROR_INVALID_PARAMETER; - - dwVerLen = GetFileVersionInfoSizeW(szFilePath, NULL); - if( !dwVerLen ) + if (!(len = GetFileVersionInfoSizeW( path, NULL ))) { - gle = GetLastError(); - if (gle == ERROR_BAD_PATHNAME) - return ERROR_FILE_NOT_FOUND; - else if (gle == ERROR_RESOURCE_DATA_NOT_FOUND) - return ERROR_FILE_INVALID; - - return gle; + error = GetLastError(); + if (error == ERROR_BAD_PATHNAME) return ERROR_FILE_NOT_FOUND; + return error; } - - lpVer = msi_alloc(dwVerLen); - if( !lpVer ) + if (!(version = msi_alloc( len ))) return ERROR_OUTOFMEMORY; + if (!GetFileVersionInfoW( path, 0, len, version )) { - ret = ERROR_OUTOFMEMORY; - goto end; + msi_free( version ); + return GetLastError(); } - - if( !GetFileVersionInfoW(szFilePath, 0, dwVerLen, lpVer) ) + if (verlen) { - ret = GetLastError(); - goto end; - } - - if (pcchVersionBuf) - { - if( VerQueryValueW(lpVer, szVersionResource, (LPVOID*)&ffi, &puLen) && - (puLen > 0) ) + if (VerQueryValueW( version, szVersionResource, (LPVOID *)&ffi, &len ) && len > 0) { - wsprintfW(tmp, szVersionFormat, - HIWORD(ffi->dwFileVersionMS), LOWORD(ffi->dwFileVersionMS), - HIWORD(ffi->dwFileVersionLS), LOWORD(ffi->dwFileVersionLS)); - if (lpVersionBuf) lstrcpynW(lpVersionBuf, tmp, *pcchVersionBuf); - - if (strlenW(tmp) >= *pcchVersionBuf) - ret = ERROR_MORE_DATA; - - *pcchVersionBuf = lstrlenW(tmp); + sprintfW( tmp, szVersionFormat, + HIWORD(ffi->dwFileVersionMS), LOWORD(ffi->dwFileVersionMS), + HIWORD(ffi->dwFileVersionLS), LOWORD(ffi->dwFileVersionLS) ); + if (verbuf) lstrcpynW( verbuf, tmp, *verlen ); + len = strlenW( tmp ); + if (len >= *verlen) ret = ERROR_MORE_DATA; + *verlen = len; } else { - if (lpVersionBuf) *lpVersionBuf = 0; - *pcchVersionBuf = 0; + if (verbuf) *verbuf = 0; + *verlen = 0; } } - - if (pcchLangBuf) + if (langlen) { - if (VerQueryValueW(lpVer, szLangResource, (LPVOID*)&lang, &puLen) && - (puLen > 0)) + if (VerQueryValueW( version, szLangResource, (LPVOID *)&lang, &len ) && len > 0) { - wsprintfW(tmp, szLangFormat, *lang); - if (lpLangBuf) lstrcpynW(lpLangBuf, tmp, *pcchLangBuf); - - if (strlenW(tmp) >= *pcchLangBuf) - ret = ERROR_MORE_DATA; - - *pcchLangBuf = lstrlenW(tmp); + sprintfW( tmp, szLangFormat, *lang ); + if (langbuf) lstrcpynW( langbuf, tmp, *langlen ); + len = strlenW( tmp ); + if (len >= *langlen) ret = ERROR_MORE_DATA; + *langlen = len; } else { - if (lpLangBuf) *lpLangBuf = 0; - *pcchLangBuf = 0; + if (langbuf) *langbuf = 0; + *langlen = 0; } } + msi_free( version ); + return ret; +} -end: - msi_free(lpVer); + +/****************************************************************** + * MsiGetFileVersionW [MSI.@] + */ +UINT WINAPI MsiGetFileVersionW( LPCWSTR path, LPWSTR verbuf, LPDWORD verlen, + LPWSTR langbuf, LPDWORD langlen ) +{ + UINT ret; + + TRACE("%s %p %u %p %u\n", debugstr_w(path), verbuf, verlen ? *verlen : 0, + langbuf, langlen ? *langlen : 0); + + if ((verbuf && !verlen) || (langbuf && !langlen)) + return ERROR_INVALID_PARAMETER; + + ret = get_file_version( path, verbuf, verlen, langbuf, langlen ); + if (ret == ERROR_RESOURCE_DATA_NOT_FOUND) + { + int len; + WCHAR *version = msi_font_version_from_file( path ); + if (!version) return ERROR_FILE_INVALID; + len = strlenW( version ); + if (*verlen > len) + { + strcpyW( verbuf, version ); + ret = ERROR_SUCCESS; + } + else ret = ERROR_MORE_DATA; + *verlen = len; + msi_free( version ); + } return ret; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 7fbab61..2c38d66 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1022,7 +1022,7 @@ extern MSIASSEMBLY *msi_load_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HID extern UINT msi_install_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; extern BOOL msi_init_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern void msi_destroy_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; -extern WCHAR *font_version_from_file(const WCHAR *) DECLSPEC_HIDDEN; +extern WCHAR *msi_font_version_from_file(const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR **msi_split_string(const WCHAR *, WCHAR) DECLSPEC_HIDDEN; /* media */

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 : 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 : 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 : 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 : po: Remove a couple more English strings from the Chinese (Taiwan) translation .
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 57c2f78d654d9c578a6e41ab28c997f795d47ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c2f78d654d9c578a6e41ab2… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 19 23:33:05 2011 +0200 po: Remove a couple more English strings from the Chinese (Taiwan) translation. --- po/zh_TW.po | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 2fa7174..084810d 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6392,7 +6392,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 @@ -6477,9 +6477,8 @@ msgid "New" msgstr "新建(&N)..." #: shell32.rc:66 -#, fuzzy msgid "New &Folder" -msgstr "New Folder" +msgstr "" #: shell32.rc:67 #, fuzzy

1 0

Francois Gouget : po: Remove an English string from the Chinese (PRC) translation.
by Alexandre Julliard 20 Sep '11

20 Sep '11

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