September 2011 - Wine-Commits

Dmitry Timoshkov : kernel32: Add a test to show that uninitialized sections are not special regarding protection flags .
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: 0f500eac9881a6a49b925b560983f5f6388aa786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f500eac9881a6a49b925b560… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 20 17:48:12 2011 +0900 kernel32: Add a test to show that uninitialized sections are not special regarding protection flags. --- dlls/kernel32/tests/loader.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 866daba..ce59843 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -567,7 +567,25 @@ static void test_section_access(void) { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, { IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, - { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY } + { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, + + { IMAGE_SCN_CNT_INITIALIZED_DATA, PAGE_NOACCESS }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ, PAGE_READONLY }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, + + { IMAGE_SCN_CNT_UNINITIALIZED_DATA, PAGE_NOACCESS }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ, PAGE_READONLY }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY } }; static const char filler[0x1000]; static const char section_data[0x10] = "section data"; @@ -651,6 +669,11 @@ static void test_section_access(void) "%d: VirtualQuery error %d\n", i, GetLastError()); ok(info.BaseAddress == (char *)hlib + section.VirtualAddress, "%d: got %p != expected %p\n", i, info.BaseAddress, (char *)hlib + section.VirtualAddress); ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + /* FIXME: remove the condition below once Wine is fixed */ + if ((td[i].scn_file_access & IMAGE_SCN_MEM_WRITE) && + (td[i].scn_file_access & IMAGE_SCN_CNT_UNINITIALIZED_DATA)) + todo_wine ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); + else ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); ok(info.AllocationBase == hlib, "%d: %p != %p\n", i, info.AllocationBase, hlib); ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect);

1 0

Piotr Caban : msvcr90: Fix _vswprintf_p implementation.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: af6fd252ef8d630be82b9dba3199d5990c80e2b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6fd252ef8d630be82b9dba3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 20 10:32:29 2011 +0200 msvcr90: Fix _vswprintf_p implementation. --- dlls/msvcr90/msvcr90.c | 8 ++++++++ dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/wcs.c | 2 +- include/msvcrt/stdio.h | 1 + include/msvcrt/wchar.h | 1 + 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index fd24f11..6b97e2f 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -358,3 +358,11 @@ void* CDECL _CRT_RTC_INITW(void *unk1, void *unk2, int unk3, int unk4, int unk5) TRACE("%p %p %x %x %x\n", unk1, unk2, unk3, unk4, unk5); return NULL; } + +/********************************************************************* + * _vswprintf_p (MSVCR90.@) + */ +int CDECL MSVCR90__vswprintf_p(wchar_t *buffer, size_t length, const wchar_t *format, __ms_va_list args) +{ + return _vswprintf_p_l(buffer, length, format, NULL, args); +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ffdc931..c93efdd 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1107,7 +1107,7 @@ @ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c @ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l @ cdecl _vswprintf_l(ptr wstr ptr ptr) msvcrt._vswprintf_l -@ cdecl _vswprintf_p(ptr long wstr ptr) msvcrt._vswprintf +@ cdecl _vswprintf_p(ptr long wstr ptr) MSVCR90__vswprintf_p @ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) msvcrt._vswprintf_p_l @ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) msvcrt._vswprintf_s_l @ stub _vwprintf_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index d771d4f..0327ccb 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -709,7 +709,7 @@ int CDECL MSVCRT_vswprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, *MSVCRT__errno() = MSVCRT_EINVAL; return ret; } else if(ret == 0) - ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, TRUE, TRUE, + ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, FALSE, TRUE, arg_clbk_valist, NULL, &args); else ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, TRUE, TRUE, diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 4e43635..e2c1669 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -191,6 +191,7 @@ int __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); +int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*); errno_t __cdecl _wfopen_s(FILE**,const wchar_t*,const wchar_t*); diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index eab28b7..4c26624 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -322,6 +322,7 @@ int __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); +int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*); errno_t __cdecl _wfopen_s(FILE**,const wchar_t*,const wchar_t*);

1 0

Alexandre Julliard : gdi32: Force colors to black and white for 1-bpp source in AlphaBlend.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

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

Hans Leidekker : mscms: Fix OpenColorProfile to handle relative file names.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

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

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

Sept. 20, 2011

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

Sept. 20, 2011

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

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

Sept. 20, 2011

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

Sept. 20, 2011

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

Sept. 20, 2011

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 Sept. 20, 2011

Sept. 20, 2011

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