December 2020 - Wine-commits

Jacek Caban : msvcrt: Use GCC-style assembly on Clang MSVC target.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: 05806e0edb05a2bc594201947d3637bcbf126d1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=05806e0edb05a2bc59420194… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 14 18:10:04 2020 +0100 msvcrt: Use GCC-style assembly on Clang MSVC target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 14 +++++++------- dlls/msvcrt/misc.c | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index e5dd9cb2b8a..e6e837e52c6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1297,7 +1297,7 @@ double CDECL tanh( double x ) } -#if defined(__GNUC__) && defined(__i386__) +#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) #define CREATE_FPU_FUNC1(name, call) \ __ASM_GLOBAL_FUNC(name, \ @@ -1411,7 +1411,7 @@ __ASM_GLOBAL_FUNC(_ftol, __ASM_CFI(".cfi_same_value %ebp\n\t") "ret") -#endif /* defined(__GNUC__) && defined(__i386__) */ +#endif /* (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) */ /********************************************************************* * _fpclass (MSVCRT.@) @@ -1638,7 +1638,7 @@ double CDECL modf( double x, double *iptr ) #if defined(__i386__) || defined(__x86_64__) void CDECL _statusfp2( unsigned int *x86_sw, unsigned int *sse2_sw ) { -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) unsigned int flags; unsigned long fpword; @@ -1710,7 +1710,7 @@ unsigned int CDECL _statusfp(void) unsigned int CDECL _clearfp(void) { unsigned int flags = 0; -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) unsigned long fpword; __asm__ __volatile__( "fnstsw %0; fnclex" : "=m" (fpword) ); @@ -1802,7 +1802,7 @@ double CDECL _chgsign(double num) int CDECL __control87_2( unsigned int newval, unsigned int mask, unsigned int *x86_cw, unsigned int *sse2_cw ) { -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) unsigned long fpword; unsigned int flags; unsigned int old_flags; @@ -2152,7 +2152,7 @@ int CDECL _finite(double num) */ void CDECL _fpreset(void) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) const unsigned int x86_cw = 0x27f; __asm__ __volatile__( "fninit; fldcw %0" : : "m" (x86_cw) ); if (sse2_supported) @@ -2171,7 +2171,7 @@ void CDECL _fpreset(void) */ int CDECL fesetenv(const fenv_t *env) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) struct { WORD control_word; WORD unused1; diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 17019e9f5a7..5ea1ddfc6c7 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -213,7 +213,7 @@ void* CDECL bsearch(const void *key, const void *base, size_t nmemb, */ #ifdef __i386__ -# ifdef __GNUC__ +# if defined(__GNUC__) || defined(__clang__) __ASM_GLOBAL_FUNC(_chkesp, "jnz 1f\n\t" @@ -242,7 +242,7 @@ void CDECL DECLSPEC_HIDDEN chkesp_fail(void) DebugBreak(); } -# else /* __GNUC__ */ +# else /* __GNUC__ || __clang__ */ /**********************************************************************/ @@ -250,7 +250,7 @@ void CDECL _chkesp(void) { } -# endif /* __GNUC__ */ +# endif /* __GNUC__ || __clang__ */ #endif /* __i386__ */

1 0

Jacek Caban : msvcrt: Use __ASM_USE_THISCALL_WRAPPER in cxx.h.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: df446b9c21f52b917a9c2a360bccaed35896a32e URL: https://source.winehq.org/git/wine.git/?a=commit;h=df446b9c21f52b917a9c2a36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 14 18:10:11 2020 +0100 msvcrt: Use __ASM_USE_THISCALL_WRAPPER in cxx.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cxx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index 42717f9d702..f8fe239b8aa 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -240,7 +240,7 @@ typedef struct #endif -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER #define CALL_VTBL_FUNC(this, off, ret, type, args) ((ret (WINAPI*)type)&vtbl_wrapper_##off)args

1 0

Jacek Caban : winapi: Use __alignof__ on clang.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: fcf545f449e286118c0d1b8ee8d620a81aa22114 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcf545f449e286118c0d1b8e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 14 18:10:26 2020 +0100 winapi: Use __alignof__ on clang. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/generated.c | 2 +- dlls/kernel32/tests/generated.c | 2 +- dlls/ntdll/tests/generated.c | 2 +- dlls/rpcrt4/tests/generated.c | 2 +- dlls/shell32/tests/generated.c | 2 +- dlls/shlwapi/tests/generated.c | 2 +- dlls/urlmon/tests/generated.c | 90 +---------------------------------------- dlls/user32/tests/generated.c | 2 +- dlls/wininet/tests/generated.c | 2 +- dlls/winmm/tests/generated.c | 2 +- tools/winapi/winapi_test | 2 +- 11 files changed, 11 insertions(+), 99 deletions(-) diff --git a/dlls/gdi32/tests/generated.c b/dlls/gdi32/tests/generated.c index 40c2b910b56..02898227b2b 100644 --- a/dlls/gdi32/tests/generated.c +++ b/dlls/gdi32/tests/generated.c @@ -25,7 +25,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c index 9c83ec69f6e..1b0489094ea 100644 --- a/dlls/kernel32/tests/generated.c +++ b/dlls/kernel32/tests/generated.c @@ -25,7 +25,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c index d1976e87678..995ffb90b57 100644 --- a/dlls/ntdll/tests/generated.c +++ b/dlls/ntdll/tests/generated.c @@ -25,7 +25,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index 3c143265fa7..53416566418 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -31,7 +31,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* diff --git a/dlls/shell32/tests/generated.c b/dlls/shell32/tests/generated.c index 86e8e549480..15e44f0e8ea 100644 --- a/dlls/shell32/tests/generated.c +++ b/dlls/shell32/tests/generated.c @@ -32,7 +32,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* diff --git a/dlls/shlwapi/tests/generated.c b/dlls/shlwapi/tests/generated.c index 0b9f109aa55..8465bf34475 100644 --- a/dlls/shlwapi/tests/generated.c +++ b/dlls/shlwapi/tests/generated.c @@ -30,7 +30,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* diff --git a/dlls/urlmon/tests/generated.c b/dlls/urlmon/tests/generated.c index 64959493181..578f722ad16 100644 --- a/dlls/urlmon/tests/generated.c +++ b/dlls/urlmon/tests/generated.c @@ -28,7 +28,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* @@ -92,81 +92,41 @@ static void test_pack_IBindHost(void) /* IBindHost */ } -static void test_pack_IBindHostVtbl(void) -{ - /* IBindHostVtbl */ -} - static void test_pack_IBindStatusCallback(void) { /* IBindStatusCallback */ } -static void test_pack_IBindStatusCallbackVtbl(void) -{ - /* IBindStatusCallbackVtbl */ -} - static void test_pack_IBinding(void) { /* IBinding */ } -static void test_pack_IBindingVtbl(void) -{ - /* IBindingVtbl */ -} - static void test_pack_IInternetProtocolInfo(void) { /* IInternetProtocolInfo */ } -static void test_pack_IInternetProtocolInfoVtbl(void) -{ - /* IInternetProtocolInfoVtbl */ -} - static void test_pack_IInternetSession(void) { /* IInternetSession */ } -static void test_pack_IInternetSessionVtbl(void) -{ - /* IInternetSessionVtbl */ -} - static void test_pack_IPersistMoniker(void) { /* IPersistMoniker */ } -static void test_pack_IPersistMonikerVtbl(void) -{ - /* IPersistMonikerVtbl */ -} - static void test_pack_IWinInetHttpInfo(void) { /* IWinInetHttpInfo */ } -static void test_pack_IWinInetHttpInfoVtbl(void) -{ - /* IWinInetHttpInfoVtbl */ -} - static void test_pack_IWinInetInfo(void) { /* IWinInetInfo */ } -static void test_pack_IWinInetInfoVtbl(void) -{ - /* IWinInetInfoVtbl */ -} - static void test_pack_LPBINDHOST(void) { /* LPBINDHOST */ @@ -346,81 +306,41 @@ static void test_pack_IBindHost(void) /* IBindHost */ } -static void test_pack_IBindHostVtbl(void) -{ - /* IBindHostVtbl */ -} - static void test_pack_IBindStatusCallback(void) { /* IBindStatusCallback */ } -static void test_pack_IBindStatusCallbackVtbl(void) -{ - /* IBindStatusCallbackVtbl */ -} - static void test_pack_IBinding(void) { /* IBinding */ } -static void test_pack_IBindingVtbl(void) -{ - /* IBindingVtbl */ -} - static void test_pack_IInternetProtocolInfo(void) { /* IInternetProtocolInfo */ } -static void test_pack_IInternetProtocolInfoVtbl(void) -{ - /* IInternetProtocolInfoVtbl */ -} - static void test_pack_IInternetSession(void) { /* IInternetSession */ } -static void test_pack_IInternetSessionVtbl(void) -{ - /* IInternetSessionVtbl */ -} - static void test_pack_IPersistMoniker(void) { /* IPersistMoniker */ } -static void test_pack_IPersistMonikerVtbl(void) -{ - /* IPersistMonikerVtbl */ -} - static void test_pack_IWinInetHttpInfo(void) { /* IWinInetHttpInfo */ } -static void test_pack_IWinInetHttpInfoVtbl(void) -{ - /* IWinInetHttpInfoVtbl */ -} - static void test_pack_IWinInetInfo(void) { /* IWinInetInfo */ } -static void test_pack_IWinInetInfoVtbl(void) -{ - /* IWinInetInfoVtbl */ -} - static void test_pack_LPBINDHOST(void) { /* LPBINDHOST */ @@ -588,21 +508,13 @@ static void test_pack(void) { test_pack_BINDINFO(); test_pack_IBindHost(); - test_pack_IBindHostVtbl(); test_pack_IBindStatusCallback(); - test_pack_IBindStatusCallbackVtbl(); test_pack_IBinding(); - test_pack_IBindingVtbl(); test_pack_IInternetProtocolInfo(); - test_pack_IInternetProtocolInfoVtbl(); test_pack_IInternetSession(); - test_pack_IInternetSessionVtbl(); test_pack_IPersistMoniker(); - test_pack_IPersistMonikerVtbl(); test_pack_IWinInetHttpInfo(); - test_pack_IWinInetHttpInfoVtbl(); test_pack_IWinInetInfo(); - test_pack_IWinInetInfoVtbl(); test_pack_LPBINDHOST(); test_pack_LPBINDING(); test_pack_LPBINDSTATUSCALLBACK(); diff --git a/dlls/user32/tests/generated.c b/dlls/user32/tests/generated.c index 7f6325fa2c9..6b80ad8d6f0 100644 --- a/dlls/user32/tests/generated.c +++ b/dlls/user32/tests/generated.c @@ -25,7 +25,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* diff --git a/dlls/wininet/tests/generated.c b/dlls/wininet/tests/generated.c index 39a34f778f4..c0d9c9bd97e 100644 --- a/dlls/wininet/tests/generated.c +++ b/dlls/wininet/tests/generated.c @@ -29,7 +29,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* diff --git a/dlls/winmm/tests/generated.c b/dlls/winmm/tests/generated.c index ae183afad22..5eaa6fb1cf1 100644 --- a/dlls/winmm/tests/generated.c +++ b/dlls/winmm/tests/generated.c @@ -27,7 +27,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define _TYPE_ALIGNMENT(type) __alignof(type) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) # define _TYPE_ALIGNMENT(type) __alignof__(type) #else /* diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index fd801572894..716bb30ac08 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -544,7 +544,7 @@ sub output_header($$$) { print OUT "\n"; print OUT "#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)\n"; print OUT "# define _TYPE_ALIGNMENT(type) __alignof(type)\n"; - print OUT "#elif defined(__GNUC__)\n"; + print OUT "#elif defined(__GNUC__) || defined(__clang__)\n"; print OUT "# define _TYPE_ALIGNMENT(type) __alignof__(type)\n"; print OUT "#else\n"; print OUT "/*\n";

1 0

Henri Verbeet : wined3d: Do not create Vulkan 2D (array) views for UAVs on 3D resources.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: afac4f09c70e7bde056f9618f5f05b40065df795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afac4f09c70e7bde056f9618… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 16 17:23:36 2020 +0330 wined3d: Do not create Vulkan 2D (array) views for UAVs on 3D resources. We should simply create 3D views. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50123 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f2c8ceab461..c3128c9ed4c 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -688,7 +688,7 @@ static VkBufferView wined3d_view_vk_create_buffer_view(struct wined3d_context_vk static VkImageView wined3d_view_vk_create_texture_view(struct wined3d_context_vk *context_vk, const struct wined3d_view_desc *desc, struct wined3d_texture_vk *texture_vk, - const struct wined3d_format_vk *view_format_vk, struct color_fixup_desc fixup, bool srv) + const struct wined3d_format_vk *view_format_vk, struct color_fixup_desc fixup, bool rtv) { const struct wined3d_resource *resource = &texture_vk->t.resource; const struct wined3d_vk_info *vk_info = context_vk->vk_info; @@ -730,7 +730,7 @@ static VkImageView wined3d_view_vk_create_texture_view(struct wined3d_context_vk create_info.flags = 0; create_info.image = texture_vk->vk_image; create_info.viewType = vk_image_view_type_from_wined3d(resource->type, desc->flags); - if (!srv && create_info.viewType == VK_IMAGE_VIEW_TYPE_3D) + if (rtv && create_info.viewType == VK_IMAGE_VIEW_TYPE_3D) { if (desc->u.texture.layer_count > 1) create_info.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY; @@ -823,7 +823,7 @@ static void wined3d_render_target_view_vk_cs_init(void *object) context = context_acquire(resource->device, NULL, 0); view_vk->vk_image_view = wined3d_view_vk_create_texture_view(wined3d_context_vk(context), - desc, texture_vk, format_vk, COLOR_FIXUP_IDENTITY, false); + desc, texture_vk, format_vk, COLOR_FIXUP_IDENTITY, true); context_release(context); if (!view_vk->vk_image_view) @@ -1098,7 +1098,7 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object) context = context_acquire(resource->device, NULL, 0); vk_image_view = wined3d_view_vk_create_texture_view(wined3d_context_vk(context), - desc, texture_vk, wined3d_format_vk(format), format->color_fixup, true); + desc, texture_vk, wined3d_format_vk(format), format->color_fixup, false); context_release(context); if (!vk_image_view)

1 0

Rémi Bernon : wintrust: Don't fail CryptCATOpen on empty file or invalid data.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: 0fb7ea91208b4e693f013e36e1a240e2b974f46c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fb7ea91208b4e693f013e36… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Dec 16 22:17:16 2020 +0100 wintrust: Don't fail CryptCATOpen on empty file or invalid data. Fixes a regression from 699e0a55ea71e2506917e38fc85cb4ae23a9cd1a, making "winetricks dotnet30sp1" fail. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49831 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/crypt.c | 14 ++++++++++++-- dlls/wintrust/tests/crypt.c | 12 ++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index be869ad8277..fcf419c76d1 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -908,6 +908,7 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, BYTE *buffer = NULL; DWORD size, open_mode = OPEN_ALWAYS; struct cryptcat *cc; + BOOL valid; TRACE("filename %s, flags %#x, provider %#lx, version %#x, type %#x\n", debugstr_w(filename), flags, hProv, dwPublicVersion, dwEncodingType); @@ -941,13 +942,15 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, HeapFree(GetProcessHeap(), 0, buffer); return INVALID_HANDLE_VALUE; } - if (!ReadFile(file, buffer, size, &size, NULL) || !CryptMsgUpdate(hmsg, buffer, size, TRUE)) + if (!size) valid = FALSE; + else if (!ReadFile(file, buffer, size, &size, NULL)) { CloseHandle(file); HeapFree(GetProcessHeap(), 0, buffer); CryptMsgClose(hmsg); return INVALID_HANDLE_VALUE; } + else valid = CryptMsgUpdate(hmsg, buffer, size, TRUE); HeapFree(GetProcessHeap(), 0, buffer); CloseHandle(file); @@ -961,7 +964,13 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, cc->msg = hmsg; cc->encoding = dwEncodingType; - if (CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_COUNT_PARAM, 0, &cc->attr_count, &size)) + if (!valid) + { + cc->magic = CRYPTCAT_MAGIC; + SetLastError(ERROR_SUCCESS); + return cc; + } + else if (CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_COUNT_PARAM, 0, &cc->attr_count, &size)) { DWORD i, sum = 0; BYTE *p; @@ -1012,6 +1021,7 @@ HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv, return INVALID_HANDLE_VALUE; } cc->magic = CRYPTCAT_MAGIC; + SetLastError(ERROR_SUCCESS); return cc; } HeapFree(GetProcessHeap(), 0, cc); diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 1b436e9f4ab..5f9c402e00f 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -429,10 +429,10 @@ static void test_CryptCATOpen(void) } else { - todo_wine ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); - todo_wine ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); + ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); + ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); ret = pCryptCATClose(cat); - todo_wine ok(ret, "flags %#x: failed to close file\n", flags); + ok(ret, "flags %#x: failed to close file\n", flags); ret = DeleteFileW(filename); ok(ret, "flags %#x: failed to delete file, error %u\n", flags, GetLastError()); } @@ -443,10 +443,10 @@ static void test_CryptCATOpen(void) SetLastError(0xdeadbeef); cat = pCryptCATOpen(filename, flags, 0, 0, 0); - todo_wine ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); - todo_wine ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); + ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); + ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); ret = pCryptCATClose(cat); - todo_wine ok(ret, "flags %#x: failed to close file\n", flags); + ok(ret, "flags %#x: failed to close file\n", flags); file = _wfopen(filename, L"r"); ret = fread(buffer, 1, sizeof(buffer), file);

1 0

Jacek Caban : conhost: Don't create bitmap for hidden windows.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: 9e62d7d2576bd8b1db89bfc9b4056b528faeda5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e62d7d2576bd8b1db89bfc9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 16 22:18:03 2020 +0100 conhost: Don't create bitmap for hidden windows. Fixes performance issues in ConEmu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index f5cf8e434c3..ed806c379d3 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -385,7 +385,7 @@ static void fill_mem_dc( struct console *console, const RECT *update ) INT *dx; RECT r; - if (!console->window->font) + if (!console->window->font || !console->window->bitmap) return; if (!(line = malloc( (update->right - update->left + 1) * sizeof(WCHAR))) ) return; @@ -479,7 +479,7 @@ static void update_window( struct console *console ) if (console->window->sb_width != console->active->width || console->window->sb_height != console->active->height || - !console->window->bitmap) + (!console->window->bitmap && IsWindowVisible( console->win ))) { console->window->sb_width = console->active->width; console->window->sb_height = console->active->height; @@ -2189,6 +2189,16 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp break; } + case WM_SHOWWINDOW: + if (wparam) + update_window( console ); + else + { + if (console->window->bitmap) DeleteObject( console->window->bitmap ); + console->window->bitmap = NULL; + } + break; + case WM_KEYDOWN: case WM_KEYUP: if (console->window->in_selection)

1 0

Jacek Caban : conhost: Improve get_output_info debug traces.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: ef876fc54e207344b5809f40a59e3d5d610a6fda URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef876fc54e207344b5809f40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 16 22:18:11 2020 +0100 conhost: Improve get_output_info debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 0548fcaafd3..4b156f21ea3 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1702,8 +1702,6 @@ static NTSTATUS get_output_info( struct screen_buffer *screen_buffer, size_t *ou { struct condrv_output_info *info; - TRACE( "%p\n", screen_buffer ); - *out_size = min( *out_size, sizeof(*info) + screen_buffer->font.face_len ); if (!(info = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; @@ -1727,6 +1725,12 @@ static NTSTATUS get_output_info( struct screen_buffer *screen_buffer, size_t *ou info->font_pitch_family = screen_buffer->font.pitch_family; memcpy( info->color_map, screen_buffer->color_map, sizeof(info->color_map) ); if (*out_size > sizeof(*info)) memcpy( info + 1, screen_buffer->font.face_name, *out_size - sizeof(*info) ); + + TRACE( "%p cursor_size=%u cursor_visible=%x cursor=(%u,%u) width=%u height=%u win=%s attr=%x popup_attr=%x" + " font_width=%u font_height=%u %s\n", screen_buffer, info->cursor_size, info->cursor_visible, + info->cursor_x, info->cursor_y, info->width, info->height, wine_dbgstr_rect(&screen_buffer->win), + info->attr, info->popup_attr, info->font_width, info->font_height, + debugstr_wn( (const WCHAR *)(info + 1), (*out_size - sizeof(*info)) / sizeof(WCHAR) ) ); return STATUS_SUCCESS; }

1 0

Jactry Zeng : po: Update Simplified Chinese translation.
by Alexandre Julliard 15 Dec '20

15 Dec '20

Module: wine Branch: master Commit: 25b6b2b7e8b49fb06c84122237ddd08d711c58c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25b6b2b7e8b49fb06c841222… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 15 17:00:50 2020 +0800 po: Update Simplified Chinese translation. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 228 +++++++++++++++++++----------------------------------------- 1 file changed, 70 insertions(+), 158 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=25b6b2b7e8b49fb06c84…

1 0

Can Taşan : po: Update Turkish translation.
by Alexandre Julliard 15 Dec '20

15 Dec '20

Module: wine Branch: master Commit: 6fd2ef8cd1efc86511365e6a2435b83a4be58bb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fd2ef8cd1efc86511365e6a… Author: Can Taşan <betax34(a)hotmail.com> Date: Tue Dec 15 15:35:47 2020 +0100 po: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 530 +++++++++++++++++++++++---------------------------------------- 1 file changed, 191 insertions(+), 339 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6fd2ef8cd1efc8651136…

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 15 Dec '20

15 Dec '20

Module: wine Branch: master Commit: 8a3a67efd4496d6dc711fece3900bda772b74f4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a3a67efd4496d6dc711fece… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Dec 15 22:31:29 2020 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/po/ja.po b/po/ja.po index 8955cb2ebe7..30005ba56ad 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-12-14 21:46+0900\n" +"PO-Revision-Date: 2020-12-15 21:26+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -580,7 +580,7 @@ msgstr "ページ設定(&P)" #: dlls/comdlg32/comdlg32.rc:213 dlls/comdlg32/comdlg32.rc:235 msgid "&Setup" -msgstr "プリンタの設定(&S)" +msgstr "プリンターの設定(&S)" #: dlls/comdlg32/comdlg32.rc:214 msgid "&From:" @@ -7316,7 +7316,7 @@ msgstr "サンプルがシンクに処理されませんでした。\n" #: dlls/mferror/mferror.mc:620 msgid "Sink was not provided with required headers.\n" -msgstr "シンクにて必須ヘッダが提供されませんでした。\n" +msgstr "シンクにて必須ヘッダーが提供されませんでした。\n" #: dlls/mferror/mferror.mc:627 msgid "Optional node is invalid.\n" @@ -11051,7 +11051,7 @@ msgstr "URL スキームを認識できなかったかサポートしていま #: dlls/wininet/winineterror.mc:46 msgid "The server name could not be resolved.\n" -msgstr "サーバー名をを解決できませんでした。\n" +msgstr "サーバー名を解決できませんでした。\n" #: dlls/wininet/winineterror.mc:51 msgid "The requested operation is invalid.\n" @@ -11169,15 +11169,15 @@ msgid "" "The wave header was not prepared. Use the Prepare function to prepare the " "header, and then try again." msgstr "" -"waveヘッダが準備されていません。Prepare関数を使用してヘッダを準備してやり直し" -"て下さい。" +"wave ヘッダーが準備されていません。Prepare 関数を使用してヘッダーを準備してや" +"り直して下さい。" #: dlls/winmm/winmm.rc:49 msgid "" "Cannot open the device without using the WAVE_ALLOWSYNC flag. Use the flag, " "and then try again." msgstr "" -"WAVE_ALLOWSYNCフラグなしではデバイスをオープンできません。フラグを指定してや" +"WAVE_ALLOWSYNC フラグなしではデバイスをオープンできません。フラグを指定してや" "り直して下さい。" #: dlls/winmm/winmm.rc:52 @@ -11185,16 +11185,16 @@ msgid "" "The MIDI header was not prepared. Use the Prepare function to prepare the " "header, and then try again." msgstr "" -"MIDIヘッダが準備されていません。Prepare関数を使用してヘッダを準備してやり直し" -"て下さい。" +"MIDI ヘッダーが準備されていません。Prepare 関数を使用してヘッダーを準備してや" +"り直して下さい。" #: dlls/winmm/winmm.rc:54 msgid "" "A MIDI map was not found. There may be a problem with the driver, or the " "MIDIMAP.CFG file may be corrupt or missing." msgstr "" -"MIDIマップが見つかりません。ドライバーの問題か、MIDIMAP.CFGファイルが破損して" -"いるか存在しない可能性があります。" +"MIDI マップが見つかりません。ドライバーの問題か、MIDIMAP.CFG ファイルが破損し" +"ているか存在しない可能性があります。" #: dlls/winmm/winmm.rc:55 msgid "" @@ -11332,7 +11332,7 @@ msgstr "" #: dlls/winmm/winmm.rc:80 msgid "Cannot use 'all' as the device name with the specified command." msgstr "" -"指定されたコマンドは「all」をデバイス名として使用することができません。" +"指定されたコマンドは 'all' をデバイス名として使用することができません。" #: dlls/winmm/winmm.rc:81 msgid "" @@ -11476,8 +11476,8 @@ msgid "" "The filename is invalid. Make sure the filename is not longer than 8 " "characters, followed by a period and an extension." msgstr "" -"ファイル名が無効です。ファイル名が半角8文字以内で、ピリオドに続いて拡張子が付" -"いていることを確認して下さい。" +"ファイル名が無効です。ファイル名が半角 8 文字以内で、ピリオドに続いて拡張子が" +"付いていることを確認して下さい。" #: dlls/winmm/winmm.rc:104 msgid "" @@ -12290,8 +12290,8 @@ msgstr "" "$q 等号 $t 現在の時刻 $v cmdのバージョン\n" "\n" "注意：PROMPTコマンドをプロンプト文字列なしで実行すると、既定値にリセット\n" -"されます。デフォルト値はカレントディレクトリ(ドライブ名を含みます)\n" -"に続いて大なり(>)記号です。\n" +"されます。既定値はカレントディレクトリ (ドライブ名を含みます) に続いて\n" +"大なり (>) 記号です。\n" "(PROMPT $p$g を実行した時と同様です)\n" "\n" "プロンプトはPROMPT環境変数を編集することでも変更できます。したがって、\n" @@ -13488,7 +13488,7 @@ msgstr "ページ設定" #: programs/notepad/notepad.rc:102 msgid "&Header:" -msgstr "ヘッダ(&H):" +msgstr "ヘッダー(&H):" #: programs/notepad/notepad.rc:104 msgid "&Footer:"

1 0