December 2020 - Wine-Commits

Akihiro Sagawa : quartz/vmr9: Allow the aspect ratio parameters to be NULL in IVMRWindowlessControl::GetNativeVideoSize().
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: c387df07397ce9060d8a191fda6489f5ddfe6ea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c387df07397ce9060d8a191f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Dec 4 21:13:59 2020 +0900 quartz/vmr9: Allow the aspect ratio parameters to be NULL in IVMRWindowlessControl::GetNativeVideoSize(). Please refer to the commit 45789e00dad69a2609b6a104b71731fe483428b0 which fixes IVMRWindowlessControl9::GetNativeVideoSize(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 6 +++--- dlls/quartz/vmr9.c | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 676bc56712d..ba2a98cb69d 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2858,9 +2858,9 @@ static void test_windowless_size(void) width = height = 0xdeadbeef; hr = IVMRWindowlessControl_GetNativeVideoSize(windowless_control, &width, &height, NULL, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(width == 32, "Got width %d.\n", width); - todo_wine ok(height == 16, "Got height %d.\n", height); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(width == 32, "Got width %d.\n", width); + ok(height == 16, "Got height %d.\n", height); aspect_width = aspect_height = 0xdeadbeef; hr = IVMRWindowlessControl_GetNativeVideoSize(windowless_control, &width, &height, &aspect_width, &aspect_height); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 3ddef8dbed5..a664d5109c3 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1462,22 +1462,22 @@ static ULONG WINAPI VMR7WindowlessControl_Release(IVMRWindowlessControl *iface) } static HRESULT WINAPI VMR7WindowlessControl_GetNativeVideoSize(IVMRWindowlessControl *iface, - LONG *width, LONG *height, - LONG *arwidth, LONG *arheight) + LONG *width, LONG *height, LONG *aspect_width, LONG *aspect_height) { - struct quartz_vmr *This = impl_from_IVMRWindowlessControl(iface); - TRACE("(%p/%p)->(%p, %p, %p, %p)\n", iface, This, width, height, arwidth, arheight); + struct quartz_vmr *filter = impl_from_IVMRWindowlessControl(iface); - if (!width || !height || !arwidth || !arheight) - { - ERR("Got no pointer\n"); + TRACE("filter %p, width %p, height %p, aspect_width %p, aspect_height %p.\n", + filter, width, height, aspect_width, aspect_height); + + if (!width || !height) return E_POINTER; - } - *width = This->bmiheader.biWidth; - *height = This->bmiheader.biHeight; - *arwidth = This->bmiheader.biWidth; - *arheight = This->bmiheader.biHeight; + *width = filter->bmiheader.biWidth; + *height = filter->bmiheader.biHeight; + if (aspect_width) + *aspect_width = filter->bmiheader.biWidth; + if (aspect_height) + *aspect_height = filter->bmiheader.biHeight; return S_OK; }

1 0

Matteo Bruni : d3d9/tests: Accept new WARP test failure in test_updatetexture().
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: b7eeab900f38ae67e7a63c0f46c61201a3753215 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7eeab900f38ae67e7a63c0f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Dec 3 17:58:56 2020 +0100 d3d9/tests: Accept new WARP test failure in test_updatetexture(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 99896b8c624..40585d5257d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -21754,7 +21754,7 @@ static void test_updatetexture(void) UINT dst_width, dst_height; UINT src_levels, dst_levels; D3DFORMAT src_format, dst_format; - BOOL broken; + BOOL broken_result, broken_updatetex; } tests[] = { @@ -21772,7 +21772,8 @@ static void test_updatetexture(void) * one or something like that). */ /* {8, 8, 7, 7, 4, 2, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, */ {8, 8, 8, 8, 1, 4, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, /* 8 */ - {4, 4, 8, 8, 1, 1, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, /* 9 */ + /* For this one UpdateTexture() returns failure on WARP on > Win 10 1709. */ + {4, 4, 8, 8, 1, 1, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE, TRUE}, /* 9 */ /* This one causes weird behavior on Windows (it probably writes out * of the texture memory). */ /* {8, 8, 4, 4, 1, 1, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, */ @@ -22015,7 +22016,8 @@ static void test_updatetexture(void) hr = IDirect3DDevice9_UpdateTexture(device, src, dst); if (FAILED(hr)) { - todo_wine ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u, %u.\n", hr, t, i); + todo_wine ok(SUCCEEDED(hr) || broken(tests[i].broken_updatetex), + "Failed to update texture, hr %#x, case %u, %u.\n", hr, t, i); IDirect3DBaseTexture9_Release(src); IDirect3DBaseTexture9_Release(dst); continue; @@ -22039,7 +22041,7 @@ static void test_updatetexture(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - ok (color_match(color, 0x007f7f00, 3) || broken(tests[i].broken) + ok (color_match(color, 0x007f7f00, 3) || broken(tests[i].broken_result) || broken(color == 0x00adbeef), /* WARP device often just breaks down. */ "Got unexpected color 0x%08x, case %u, %u.\n", color, t, i); }

1 0

Piotr Caban : msvcrt: Remove non-needed function declarations from msvcrt.h.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 79e950bb7989809f62573e3209f2cb1bc0852d6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=79e950bb7989809f62573e32… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:22 2020 +0100 msvcrt: Remove non-needed function declarations from msvcrt.h. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 1 + dlls/msvcrt/exit.c | 1 + dlls/msvcrt/mbcs.c | 3 ++- dlls/msvcrt/msvcrt.h | 48 ----------------------------------------------- dlls/msvcrt/scanf.c | 1 + include/msvcrt/mbctype.h | 1 + include/msvcrt/mbstring.h | 1 + 7 files changed, 7 insertions(+), 49 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 53b97914cda..91aaaf5ff18 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -22,6 +22,7 @@ */ #include <corecrt_io.h> +#include <mbctype.h> #include <stdarg.h> #include <stdlib.h> #include <direct.h> diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 492bcbf7b21..323d205b1bd 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <conio.h> #include <process.h> #include <signal.h> #include <stdio.h> diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index cef67e71d47..03af50d8b01 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <limits.h> #include <mbctype.h> +#include <mbstring.h> #include "msvcrt.h" #include "mtdll.h" @@ -577,7 +578,7 @@ unsigned char* CDECL _mbsdec(const unsigned char* start, const unsigned char* cu /********************************************************************* * _mbclen(MSVCRT.@) */ -unsigned int CDECL _mbclen(const unsigned char* str) +size_t CDECL _mbclen(const unsigned char* str) { return _ismbblead(*str) ? 2 : 1; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index cdb35456ecb..28feb7d90df 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -296,27 +296,6 @@ extern FILE MSVCRT__iob[]; #define _MAX__TIME64_T (((__time64_t)0x00000007 << 32) | 0x93406FFF) -int __cdecl MSVCRT_iswdigit(wint_t); - -int __cdecl MSVCRT__fgetc_nolock(FILE*); -int __cdecl MSVCRT__fputc_nolock(int,FILE*); -int __cdecl MSVCRT__ungetc_nolock(int,FILE*); -wint_t __cdecl MSVCRT__fgetwc_nolock(FILE*); -wint_t __cdecl MSVCRT__fputwc_nolock(wint_t,FILE*); -wint_t __cdecl MSVCRT__ungetwc_nolock(wint_t, FILE*); -int __cdecl MSVCRT__fseeki64_nolock(FILE*,__int64,int); -__int64 __cdecl MSVCRT__ftelli64(FILE* file); -__int64 __cdecl MSVCRT__ftelli64_nolock(FILE*); -size_t __cdecl MSVCRT__fread_nolock(void*,size_t,size_t,FILE*); -size_t __cdecl MSVCRT__fread_nolock_s(void*,size_t,size_t,size_t,FILE*); -size_t __cdecl MSVCRT__fwrite_nolock(const void*,size_t,size_t,FILE*); -int __cdecl MSVCRT__fclose_nolock(FILE*); -int __cdecl MSVCRT__fflush_nolock(FILE*); -FILE* __cdecl MSVCRT__iob_func(void); -__time32_t __cdecl MSVCRT__time32(__time32_t*); -__time64_t __cdecl MSVCRT__time64(__time64_t*); -FILE* __cdecl MSVCRT__fdopen(int, const char *); - #define MSVCRT__ENABLE_PER_THREAD_LOCALE 1 #define MSVCRT__DISABLE_PER_THREAD_LOCALE 2 @@ -329,33 +308,6 @@ void free_locinfo(pthreadlocinfo) DECLSPEC_HIDDEN; void free_mbcinfo(pthreadmbcinfo) DECLSPEC_HIDDEN; int __cdecl __crtLCMapStringA(LCID, DWORD, const char*, int, char*, int, unsigned int, int) DECLSPEC_HIDDEN; -int __cdecl _getch(void); -int __cdecl _ismbblead(unsigned int); -int __cdecl _ismbblead_l(unsigned int, _locale_t); -int __cdecl _ismbclegal(unsigned int c); -int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); -void __cdecl MSVCRT__searchenv(const char*,const char*,char*); -char* __cdecl _strset(char*,int); -int __cdecl _ungetch(int); -int __cdecl _cputs(const char*); -int WINAPIV _cprintf(const char*,...); -int WINAPIV _cwprintf(const wchar_t*,...); -char*** __cdecl MSVCRT___p__environ(void); -int* __cdecl __p___mb_cur_max(void); -wchar_t*** __cdecl MSVCRT___p__wenviron(void); -char* __cdecl MSVCRT__strdate(char* date); -char* __cdecl MSVCRT__strtime(char* date); -int __cdecl _setmbcp(int); -void __cdecl MSVCRT__wsearchenv(const wchar_t*, const wchar_t*, wchar_t*); -int __cdecl MSVCRT__towupper_l(wint_t,_locale_t); -int __cdecl MSVCRT__towlower_l(wint_t,_locale_t); -int __cdecl MSVCRT_strcmp(const char*, const char*); -char* __cdecl MSVCRT__itoa(int, char*, int); - -float __cdecl MSVCRT_floorf( float x ); -double __cdecl MSVCRT_sqrt( double x ); -float __cdecl MSVCRT_sqrtf( float x ); - enum fpmod { FP_ROUND_ZERO, /* only used when dropped part contains only zeros */ FP_ROUND_DOWN, diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 8ada1cccfa5..988cbd0920d 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -23,6 +23,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <conio.h> #include <stdarg.h> #include <limits.h> #include <math.h> diff --git a/include/msvcrt/mbctype.h b/include/msvcrt/mbctype.h index d821041ea16..a7a85135133 100644 --- a/include/msvcrt/mbctype.h +++ b/include/msvcrt/mbctype.h @@ -68,6 +68,7 @@ _ACRTIMP int __cdecl _setmbcp(int); #ifndef _MBLEADTRAIL_DEFINED #define _MBLEADTRAIL_DEFINED _ACRTIMP int __cdecl _ismbblead(unsigned int); +_ACRTIMP int __cdecl _ismbblead_l(unsigned int,_locale_t); _ACRTIMP int __cdecl _ismbbtrail(unsigned int); _ACRTIMP int __cdecl _ismbslead(const unsigned char*,const unsigned char*); _ACRTIMP int __cdecl _ismbstrail(const unsigned char*,const unsigned char*); diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index fa35fcd1e42..1de3307326f 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -113,6 +113,7 @@ _ACRTIMP errno_t __cdecl _mbsupr_s(unsigned char*, size_t); #ifndef _MBLEADTRAIL_DEFINED #define _MBLEADTRAIL_DEFINED _ACRTIMP int __cdecl _ismbblead(unsigned int); +_ACRTIMP int __cdecl _ismbblead_l(unsigned int,_locale_t); _ACRTIMP int __cdecl _ismbbtrail(unsigned int); _ACRTIMP int __cdecl _ismbslead(const unsigned char*,const unsigned char*); _ACRTIMP int __cdecl _ismbstrail(const unsigned char*,const unsigned char*);

1 0

Alexandre Julliard : msvcrt: Fix _wstat() spec entry.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: d44f54340570c699a17dbbee55021c6ba0ea1bbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d44f54340570c699a17dbbee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 16:45:45 2020 +0100 msvcrt: Fix _wstat() spec entry. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 26f02721ede..2851c42d7c8 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -665,7 +665,7 @@ @ cdecl _wspawnvp(long wstr ptr) @ cdecl _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) -@ cdecl _wstat(str ptr) +@ cdecl _wstat(wstr ptr) @ cdecl _wstat64(wstr ptr) @ cdecl _wstati64(wstr ptr) @ cdecl _wstrdate(ptr) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 579fda550f4..6a60a7d5827 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -661,7 +661,7 @@ @ cdecl _wspawnvp(long wstr ptr) @ cdecl _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) -@ cdecl _wstat(str ptr) +@ cdecl _wstat(wstr ptr) @ cdecl _wstat64(wstr ptr) @ cdecl _wstati64(wstr ptr) @ cdecl _wstrdate(ptr) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e2b61403321..6f256a2d58e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1218,7 +1218,7 @@ @ cdecl _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) -@ cdecl _wstat(str ptr) +@ cdecl _wstat(wstr ptr) @ cdecl _wstati64(wstr ptr) @ cdecl _wstat64(wstr ptr) @ cdecl _wstrdate(ptr) diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index c3d7a338b1b..503a13180ba 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -620,7 +620,7 @@ @ cdecl _wspawnvp(long wstr ptr) @ cdecl _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) -@ cdecl _wstat(str ptr) +@ cdecl _wstat(wstr ptr) @ cdecl _wstati64(wstr ptr) @ cdecl _wstrdate(ptr) @ cdecl _wstrtime(ptr)

1 0

Dmitry Timoshkov : crypt32/tests: Add some tests for CRYPT_KEY_PROV_INFO certificate property.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: cd9a510bcebb24b06936a242e7f7a8f125c7ae2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd9a510bcebb24b06936a242… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 3 19:40:54 2020 +0300 crypt32/tests: Add some tests for CRYPT_KEY_PROV_INFO certificate property. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50024 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/cert.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index d9f839c72d2..745770f0095 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -4142,6 +4142,101 @@ static void testGetPublicKeyLength(void) "Expected length 56, got %d\n", ret); } +static void testKeyProvInfo(void) +{ + static WCHAR containerW[] = L"Wine Test Container"; + static WCHAR providerW[] = L"Hello World CSP"; + static CRYPT_KEY_PROV_PARAM param[2] = { { 0x4444, (BYTE *)"param", 6, 0x5555 }, { 0x7777, (BYTE *)"param2", 7, 0x8888 } }; + HCERTSTORE store; + const CERT_CONTEXT *cert; + CERT_NAME_BLOB name; + CRYPT_KEY_PROV_INFO *info, info2; + BOOL ret; + DWORD size; + + store = CertOpenStore(CERT_STORE_PROV_SYSTEM_A, 0, 0, + CERT_SYSTEM_STORE_CURRENT_USER, "My"); + ok(store != NULL, "CertOpenStore error %u\n", GetLastError()); + + cert = CertCreateCertificateContext(X509_ASN_ENCODING, selfSignedCert, sizeof(selfSignedCert)); + ok(cert != NULL, "CertCreateCertificateContext error %#x\n", GetLastError()); + + info2.pwszContainerName = containerW; + info2.pwszProvName = providerW; + info2.dwProvType = 0x12345678; + info2.dwFlags = 0x87654321; + info2.cProvParam = ARRAY_SIZE(param); + info2.rgProvParam = param; + info2.dwKeySpec = 0x11223344; + ret = CertSetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, 0, &info2); + ok(ret, "CertSetCertificateContextProperty error %#x\n", GetLastError()); + + ret = CertGetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, NULL, &size); + ok(ret, "CertGetCertificateContextProperty error %#x\n", GetLastError()); + info = HeapAlloc(GetProcessHeap(), 0, size); + ret = CertGetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, info, &size); + ok(ret, "CertGetCertificateContextProperty error %#x\n", GetLastError()); + ok(!lstrcmpW(info->pwszContainerName, containerW), "got %s\n", wine_dbgstr_w(info->pwszContainerName)); + ok(!lstrcmpW(info->pwszProvName, providerW), "got %s\n", wine_dbgstr_w(info->pwszProvName)); + ok(info->dwProvType == 0x12345678, "got %#x\n", info->dwProvType); + ok(info->dwFlags == 0x87654321, "got %#x\n", info->dwFlags); + ok(info->dwKeySpec == 0x11223344, "got %#x\n", info->dwKeySpec); + ok(info->cProvParam == 2, "got %#x\n", info->cProvParam); + ok(info->rgProvParam != NULL, "got %p\n", info->rgProvParam); + ok(info->rgProvParam[0].dwParam == param[0].dwParam, "got %#x\n", info->rgProvParam[0].dwParam); + ok(info->rgProvParam[0].cbData == param[0].cbData, "got %#x\n", info->rgProvParam[0].cbData); + ok(!memcmp(info->rgProvParam[0].pbData, param[0].pbData, param[0].cbData), "param1 mismatch\n"); + ok(info->rgProvParam[0].dwFlags == param[0].dwFlags, "got %#x\n", info->rgProvParam[1].dwFlags); + ok(info->rgProvParam[1].dwParam == param[1].dwParam, "got %#x\n", info->rgProvParam[1].dwParam); + ok(info->rgProvParam[1].cbData == param[1].cbData, "got %#x\n", info->rgProvParam[1].cbData); + ok(!memcmp(info->rgProvParam[1].pbData, param[1].pbData, param[1].cbData), "param2 mismatch\n"); + ok(info->rgProvParam[1].dwFlags == param[1].dwFlags, "got %#x\n", info->rgProvParam[1].dwFlags); + HeapFree(GetProcessHeap(), 0, info); + + ret = CertAddCertificateContextToStore(store, cert, CERT_STORE_ADD_NEW, NULL); + ok(ret, "CertAddCertificateContextToStore error %#x\n", GetLastError()); + + CertFreeCertificateContext(cert); + CertCloseStore(store, 0); + + store = CertOpenStore(CERT_STORE_PROV_SYSTEM_A, 0, 0, + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, "My"); + ok(store != NULL, "CertOpenStore error %u\n", GetLastError()); + + name.pbData = subjectName; + name.cbData = sizeof(subjectName); + cert = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, CERT_FIND_SUBJECT_NAME, &name, NULL); + ok(cert != NULL, "certificate should exist in My store\n"); + + ret = CertGetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, NULL, &size); + ok(ret, "CertGetCertificateContextProperty error %#x\n", GetLastError()); + info = HeapAlloc(GetProcessHeap(), 0, size); + ret = CertGetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, info, &size); + ok(ret, "CertGetCertificateContextProperty error %#x\n", GetLastError()); + ok(!lstrcmpW(info->pwszContainerName, containerW), "got %s\n", wine_dbgstr_w(info->pwszContainerName)); + ok(!lstrcmpW(info->pwszProvName, providerW), "got %s\n", wine_dbgstr_w(info->pwszProvName)); + ok(info->dwProvType == 0x12345678, "got %#x\n", info->dwProvType); + ok(info->dwFlags == 0x87654321, "got %#x\n", info->dwFlags); + ok(info->dwKeySpec == 0x11223344, "got %#x\n", info->dwKeySpec); + ok(info->cProvParam == 2, "got %#x\n", info->cProvParam); + ok(info->rgProvParam != NULL, "got %p\n", info->rgProvParam); + ok(info->rgProvParam[0].dwParam == param[0].dwParam, "got %#x\n", info->rgProvParam[0].dwParam); + ok(info->rgProvParam[0].cbData == param[0].cbData, "got %#x\n", info->rgProvParam[0].cbData); + ok(!memcmp(info->rgProvParam[0].pbData, param[0].pbData, param[0].cbData), "param1 mismatch\n"); + ok(info->rgProvParam[0].dwFlags == param[0].dwFlags, "got %#x\n", info->rgProvParam[1].dwFlags); + ok(info->rgProvParam[1].dwParam == param[1].dwParam, "got %#x\n", info->rgProvParam[1].dwParam); + ok(info->rgProvParam[1].cbData == param[1].cbData, "got %#x\n", info->rgProvParam[1].cbData); + ok(!memcmp(info->rgProvParam[1].pbData, param[1].pbData, param[1].cbData), "param2 mismatch\n"); + ok(info->rgProvParam[1].dwFlags == param[1].dwFlags, "got %#x\n", info->rgProvParam[1].dwFlags); + HeapFree(GetProcessHeap(), 0, info); + + ret = CertDeleteCertificateFromStore(cert); + ok(ret, "CertDeleteCertificateFromStore error %#x\n", GetLastError()); + + CertFreeCertificateContext(cert); + CertCloseStore(store, 0); +} + START_TEST(cert) { init_function_pointers(); @@ -4154,6 +4249,7 @@ START_TEST(cert) testGetSubjectCert(); testGetIssuerCert(); testLinkCert(); + testKeyProvInfo(); testCryptHashCert(); testCryptHashCert2();

1 0

Arkadiusz Hiler : plugplay: Send WM_DEVICECHANGE with DBT_DEVNODES_CHANGED with each event.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 743c266e6496345d0a55c83b0cfc741b0f381d4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=743c266e6496345d0a55c83b… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed Nov 25 17:04:15 2020 +0200 plugplay: Send WM_DEVICECHANGE with DBT_DEVNODES_CHANGED with each event. Windows sends *a lot* of those messages whenever there's a device / drive / etc. appearing or disappearing. This fixes controller hotplug in Doom (2016). Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/plugplay/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c index 2c4054de3e4..19e02286312 100644 --- a/programs/plugplay/main.c +++ b/programs/plugplay/main.c @@ -19,6 +19,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> +#include <dbt.h> #include "winsvc.h" #include "wine/debug.h" #include "wine/list.h" @@ -142,6 +143,7 @@ void __cdecl plugplay_send_event( DWORD code, const BYTE *data, unsigned int siz struct event *event; BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, code, (LPARAM)data ); + BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0 ); EnterCriticalSection( &plugplay_cs );

1 0

Michael Stefaniuc : localspl: Use wide-char string literals.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: b1e6ce917145cf30cc8f495ce9ba34b7c79ea1da URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1e6ce917145cf30cc8f495c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 3 00:32:53 2020 +0100 localspl: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/localmon.c | 90 ++++++----------------- dlls/localspl/provider.c | 183 +++++++++++++++++------------------------------ 2 files changed, 89 insertions(+), 184 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b1e6ce917145cf30cc8f…

1 0

Dmitry Timoshkov : crypt32: Fix reading and writing CRYPT_KEY_PROV_INFO certificate property.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 01d79531894f14b99b15ac62f661fdfcd585da1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=01d79531894f14b99b15ac62… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 3 19:40:45 2020 +0300 crypt32: Fix reading and writing CRYPT_KEY_PROV_INFO certificate property. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50024 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 251 ++++++++++++++++------------------------- dlls/crypt32/crypt32_private.h | 8 -- dlls/crypt32/serialize.c | 187 +++++++++++++++++++++++++++++- 3 files changed, 279 insertions(+), 167 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01d79531894f14b99b15…

1 0

Piotr Caban : msvcrt: Remove separate long double math funtions.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 93cdf1ada01248185c323332a90b3747e08d46cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=93cdf1ada01248185c323332… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:29 2020 +0100 msvcrt: Remove separate long double math funtions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 50 ++++++------ dlls/msvcrt/math.c | 195 -------------------------------------------- dlls/ucrtbase/ucrtbase.spec | 92 ++++++++++----------- 3 files changed, 71 insertions(+), 266 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=93cdf1ada01248185c32…

1 0

Rémi Bernon : dbghelp: Read process memory using target addresses, not debugger.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 8ec843e77b3b921a9b9be1397af6ba77b3ba797d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ec843e77b3b921a9b9be139… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 4 17:34:08 2020 +0100 dbghelp: Read process memory using target addresses, not debugger. This fixes "wine winedbg --gdb winecfg" not working anymore. There was a regression since f40195cd9206, but the environment read was broken before. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index e38687412eb..00d7b61fbd8 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -311,8 +311,8 @@ static BOOL check_live_target(struct process* pcs) { PEB peb; if (!ReadProcessMemory(pcs->handle, pbi.PebBaseAddress, &peb, sizeof(peb), NULL)) return FALSE; - if (!ReadProcessMemory(pcs->handle, &peb.CloudFileFlags, &base, sizeof(base), NULL)) return FALSE; - ReadProcessMemory(pcs->handle, &peb.ProcessParameters->Environment, &env, sizeof(env), NULL); + if (!ReadProcessMemory(pcs->handle, (char *)pbi.PebBaseAddress + FIELD_OFFSET(PEB, CloudFileFlags), &base, sizeof(base), NULL)) return FALSE; + ReadProcessMemory(pcs->handle, (char *)peb.ProcessParameters + FIELD_OFFSET(RTL_USER_PROCESS_PARAMETERS, Environment), &env, sizeof(env), NULL); } /* read debuggee environment block */

1 0