September 2020 - Wine-commits

Paul Gofman : d3d11: Avoid crash in _CopySubresourceRegion[1]() on NULL resources.
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: wine Branch: master Commit: 962e939a4da3f73814ce82e693585a8371ae4502 URL: https://source.winehq.org/git/wine.git/?a=commit;h=962e939a4da3f73814ce82e6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 16 15:19:23 2020 +0300 d3d11: Avoid crash in _CopySubresourceRegion[1]() on NULL resources. Marvel's Avengers randomly hits this case. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 9 +++++++++ dlls/d3d11/tests/d3d11.c | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0508fa3f7b..2a68e02585 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -965,6 +965,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion(ID3D iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box); + if (!dst_resource || !src_resource) + return; + if (src_box) wined3d_box_set(&wined3d_src_box, src_box->left, src_box->top, src_box->right, src_box->bottom, src_box->front, src_box->back); @@ -2438,6 +2441,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3 iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box, flags); + if (!dst_resource || !src_resource) + return; + if (src_box) wined3d_box_set(&wined3d_src_box, src_box->left, src_box->top, src_box->right, src_box->bottom, src_box->front, src_box->back); @@ -4507,6 +4513,9 @@ static void STDMETHODCALLTYPE d3d10_device_CopySubresourceRegion(ID3D10Device1 * iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box); + if (!dst_resource || !src_resource) + return; + if (src_box) wined3d_box_set(&wined3d_src_box, src_box->left, src_box->top, src_box->right, src_box->bottom, src_box->front, src_box->back); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3099d22d27..208b0b20a9 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12689,6 +12689,11 @@ static void test_copy_subresource_region(void) ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, + 1, 1, 0, NULL, 0, &box); + ID3D11DeviceContext_CopySubresourceRegion(context, NULL, 0, + 1, 1, 0, (ID3D11Resource *)src_texture, 0, &box); + set_box(&box, 0, 0, 0, 2, 2, 1); ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, 1, 1, 0, (ID3D11Resource *)src_texture, 0, &box);

1 0

Dmitry Timoshkov : setupapi/tests: Add explicit field for inf contents size.
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: wine Branch: master Commit: 43115a74f94293994904c9857996e9576dc3a8eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=43115a74f94293994904c985… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 17 12:16:31 2020 +0300 setupapi/tests: Add explicit field for inf contents size. To make testing embedded NULs possible. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/parser.c | 234 +++++++++++++++++++++++-------------------- 1 file changed, 123 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43115a74f94293994904…

1 0

Dmitry Timoshkov : setupapi: Treat trailing \0 in field values same way as trailing spaces.
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: wine Branch: master Commit: 5b7fac05d95fd2cd0c274f1342fb96d0f7152848 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b7fac05d95fd2cd0c274f13… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 17 12:16:35 2020 +0300 setupapi: Treat trailing \0 in field values same way as trailing spaces. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/parser.c | 4 ++-- dlls/setupapi/tests/parser.c | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 560c2401b8..c81a712ad8 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -724,7 +724,7 @@ static const WCHAR *value_name_state( struct parser *parser, const WCHAR *pos ) set_state( parser, EOL_BACKSLASH ); return p; default: - if (!iswspace(*p)) token_end = p + 1; + if (*p && !iswspace(*p)) token_end = p + 1; else { push_token( parser, p ); @@ -838,7 +838,7 @@ static const WCHAR *trailing_spaces_state( struct parser *parser, const WCHAR *p set_state( parser, EOL_BACKSLASH ); return p; } - if (!iswspace(*p)) break; + if (*p && !iswspace(*p)) break; } pop_state( parser ); return p; diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 8cde35b9de..c18063fbe3 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -370,6 +370,9 @@ static const struct { C("ab\032=cd"), "ab", { "ab" } }, /* nulls */ { C("abcd=ef\x0gh"), "abcd", { "ef gh" } }, + { C("foo=%bar%\n[Strings]\nbar=bbb\0\n"), "foo", { "bbb" } }, + { C("foo=%bar%\n[Strings]\nbar=bbb \0\n"), "foo", { "bbb" } }, + { C("foo=%bar%\n[Strings]\nbar=aaa\0bbb \0\n"), "foo", { "aaa bbb" } }, /* multiple sections with same name */ { C("[Test2]\nab\n[Test]\nee=ff\n"), "ee", { "ff" } }, /* string substitution */ @@ -470,12 +473,12 @@ static void test_key_names(void) ok( err == 0, "line %u: bad error %u\n", i, err ); if (key_names[i].fields[index]) { - if (i == 49) + if (i == 52) ok( !strcmp( field, key_names[i].fields[index] ) || !strcmp( field, A1200), /* Vista, W2K8 */ "line %u: bad field %s/%s\n", i, field, key_names[i].fields[index] ); - else if (i == 52) + else if (i == 55) ok( !strcmp( field, key_names[i].fields[index] ) || !strcmp( field, A4096), /* Win10 >= 1709 */ "line %u: bad field %s/%s\n",

1 0

Martin Storsjo : ntdll: Implement __C_specific_handler and _local_unwind for arm64.
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: wine Branch: master Commit: 2693e6662d73bd774edc5d018092b0318e49b1b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2693e6662d73bd774edc5d01… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Sep 17 11:04:48 2020 +0300 ntdll: Implement __C_specific_handler and _local_unwind for arm64. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 4 +- dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/signal_arm64.c | 174 +++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 +- dlls/vcruntime140/vcruntime140.spec | 4 +- 5 files changed, 182 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2693e6662d73bd774edc…

1 0

Nikolay Sivov : ole32/clipboard: Use wide string constants.
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: wine Branch: master Commit: d26ad6db7d5a70c49d051af403d9befe2be7c8f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d26ad6db7d5a70c49d051af4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 17 11:20:23 2020 +0300 ole32/clipboard: Use wide string constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 53 +++++++++++++++----------------------------------- 1 file changed, 16 insertions(+), 37 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index cb6770c05b..01cfda831f 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1743,35 +1743,19 @@ static snapshot *snapshot_construct(DWORD seq_no) */ static void register_clipboard_formats(void) { - static const WCHAR OwnerLink[] = {'O','w','n','e','r','L','i','n','k',0}; - static const WCHAR FileName[] = {'F','i','l','e','N','a','m','e',0}; - static const WCHAR FileNameW[] = {'F','i','l','e','N','a','m','e','W',0}; - static const WCHAR DataObject[] = {'D','a','t','a','O','b','j','e','c','t',0}; - static const WCHAR EmbeddedObject[] = {'E','m','b','e','d','d','e','d',' ','O','b','j','e','c','t',0}; - static const WCHAR EmbedSource[] = {'E','m','b','e','d',' ','S','o','u','r','c','e',0}; - static const WCHAR CustomLinkSource[] = {'C','u','s','t','o','m',' ','L','i','n','k',' ','S','o','u','r','c','e',0}; - static const WCHAR LinkSource[] = {'L','i','n','k',' ','S','o','u','r','c','e',0}; - static const WCHAR ObjectDescriptor[] = {'O','b','j','e','c','t',' ','D','e','s','c','r','i','p','t','o','r',0}; - static const WCHAR LinkSourceDescriptor[] = {'L','i','n','k',' ','S','o','u','r','c','e',' ', - 'D','e','s','c','r','i','p','t','o','r',0}; - static const WCHAR OlePrivateData[] = {'O','l','e',' ','P','r','i','v','a','t','e',' ','D','a','t','a',0}; - - static const WCHAR WineMarshalledDataObject[] = {'W','i','n','e',' ','M','a','r','s','h','a','l','l','e','d',' ', - 'D','a','t','a','O','b','j','e','c','t',0}; - - ownerlink_clipboard_format = RegisterClipboardFormatW(OwnerLink); - filename_clipboard_format = RegisterClipboardFormatW(FileName); - filenameW_clipboard_format = RegisterClipboardFormatW(FileNameW); - dataobject_clipboard_format = RegisterClipboardFormatW(DataObject); - embedded_object_clipboard_format = RegisterClipboardFormatW(EmbeddedObject); - embed_source_clipboard_format = RegisterClipboardFormatW(EmbedSource); - custom_link_source_clipboard_format = RegisterClipboardFormatW(CustomLinkSource); - link_source_clipboard_format = RegisterClipboardFormatW(LinkSource); - object_descriptor_clipboard_format = RegisterClipboardFormatW(ObjectDescriptor); - link_source_descriptor_clipboard_format = RegisterClipboardFormatW(LinkSourceDescriptor); - ole_private_data_clipboard_format = RegisterClipboardFormatW(OlePrivateData); - - wine_marshal_clipboard_format = RegisterClipboardFormatW(WineMarshalledDataObject); + ownerlink_clipboard_format = RegisterClipboardFormatW(L"OwnerLink"); + filename_clipboard_format = RegisterClipboardFormatW(L"FileName"); + filenameW_clipboard_format = RegisterClipboardFormatW(L"FileNameW"); + dataobject_clipboard_format = RegisterClipboardFormatW(L"DataObject"); + embedded_object_clipboard_format = RegisterClipboardFormatW(L"Embedded Object"); + embed_source_clipboard_format = RegisterClipboardFormatW(L"Embed Source"); + custom_link_source_clipboard_format = RegisterClipboardFormatW(L"Custom Link Source"); + link_source_clipboard_format = RegisterClipboardFormatW(L"Link Source"); + object_descriptor_clipboard_format = RegisterClipboardFormatW(L"Object Descriptor"); + link_source_descriptor_clipboard_format = RegisterClipboardFormatW(L"Link Source Descriptor"); + ole_private_data_clipboard_format = RegisterClipboardFormatW(L"Ole Private Data"); + + wine_marshal_clipboard_format = RegisterClipboardFormatW(L"Wine Marshalled DataObject"); } /*********************************************************************** @@ -2026,9 +2010,6 @@ void OLEClipbrd_UnInitialize(void) if ( clipbrd ) { - static const WCHAR ole32W[] = {'o','l','e','3','2',0}; - HINSTANCE hinst = GetModuleHandleW(ole32W); - /* OleUninitialize() does not release the reference to the dataobject, so take an additional reference here. This reference is then leaked. */ if (clipbrd->src_data) @@ -2040,7 +2021,7 @@ void OLEClipbrd_UnInitialize(void) if ( clipbrd->window ) { DestroyWindow(clipbrd->window); - UnregisterClassW( clipbrd_wndclass, hinst ); + UnregisterClassW( clipbrd_wndclass, GetModuleHandleW(L"ole32") ); } IStream_Release(clipbrd->marshal_data); @@ -2115,9 +2096,7 @@ static LRESULT CALLBACK clipbrd_wndproc(HWND hwnd, UINT message, WPARAM wparam, static HWND create_clipbrd_window(void) { WNDCLASSEXW class; - static const WCHAR ole32W[] = {'o','l','e','3','2',0}; - static const WCHAR title[] = {'C','l','i','p','b','o','a','r','d','W','i','n','d','o','w',0}; - HINSTANCE hinst = GetModuleHandleW(ole32W); + HINSTANCE hinst = GetModuleHandleW(L"ole32"); class.cbSize = sizeof(class); class.style = 0; @@ -2134,7 +2113,7 @@ static HWND create_clipbrd_window(void) RegisterClassExW(&class); - return CreateWindowW(clipbrd_wndclass, title, WS_POPUP | WS_CLIPSIBLINGS | WS_OVERLAPPED, + return CreateWindowW(clipbrd_wndclass, L"ClipboardWindow", WS_POPUP | WS_CLIPSIBLINGS | WS_OVERLAPPED, 0, 0, 0, 0, HWND_MESSAGE, NULL, hinst, 0); }

1 0

Nikolay Sivov : ole32/comcat: Use wide string constants.
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: wine Branch: master Commit: b68b58e604ae84964999ff3546e672d68a5a8342 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b68b58e604ae84964999ff35… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 17 11:20:24 2020 +0300 ole32/comcat: Use wide string constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/comcat.c | 51 +++++++++++++++------------------------------------ 1 file changed, 15 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index 467724c5ba..e258f8835b 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -67,14 +67,9 @@ static HRESULT CATIDEnumGUID_Construct(REFCLSID rclsid, LPCWSTR impl_req, IEnumC /********************************************************************** * File-scope string constants */ -static const WCHAR comcat_keyname[] = { - 'C','o','m','p','o','n','e','n','t',' ','C','a','t','e','g','o','r','i','e','s',0 }; -static const WCHAR impl_keyname[] = { - 'I','m','p','l','e','m','e','n','t','e','d',' ','C','a','t','e','g','o','r','i','e','s',0 }; -static const WCHAR req_keyname[] = { - 'R','e','q','u','i','r','e','d',' ','C','a','t','e','g','o','r','i','e','s',0 }; -static const WCHAR clsid_keyname[] = { 'C','L','S','I','D',0 }; - +static const WCHAR comcat_keyname[] = L"Component Categories"; +static const WCHAR impl_keyname[] = L"Implemented Categories"; +static const WCHAR req_keyname[] = L"Required Categories"; /********************************************************************** * COMCAT_RegisterClassCategories @@ -96,7 +91,7 @@ static HRESULT COMCAT_RegisterClassCategories( if (FAILED(res)) return res; /* Create (or open) the CLSID key. */ - res = create_classes_key(HKEY_CLASSES_ROOT, clsid_keyname, KEY_READ|KEY_WRITE, &clsid_key); + res = create_classes_key(HKEY_CLASSES_ROOT, L"CLSID", KEY_READ|KEY_WRITE, &clsid_key); if (res != ERROR_SUCCESS) return E_FAIL; /* Create (or open) the class key. */ @@ -169,7 +164,6 @@ static HRESULT COMCAT_UnRegisterClassCategories( static HRESULT COMCAT_GetCategoryDesc(HKEY key, LCID lcid, PWCHAR pszDesc, ULONG buf_wchars) { - static const WCHAR fmt[] = { '%', 'l', 'X', 0 }; WCHAR valname[5]; HRESULT res; DWORD type, size = (buf_wchars - 1) * sizeof(WCHAR); @@ -177,7 +171,7 @@ static HRESULT COMCAT_GetCategoryDesc(HKEY key, LCID lcid, PWCHAR pszDesc, if (pszDesc == NULL) return E_INVALIDARG; /* FIXME: lcid comparisons are more complex than this! */ - wsprintfW(valname, fmt, lcid); + wsprintfW(valname, L"%lX", lcid); res = RegQueryValueExW(key, valname, 0, &type, (LPBYTE)pszDesc, &size); if (res != ERROR_SUCCESS || type != REG_SZ) { FIXME("Simplified lcid comparison\n"); @@ -341,8 +335,8 @@ static HRESULT WINAPI COMCAT_ICatRegister_RegisterCategories( res = create_classes_key(HKEY_CLASSES_ROOT, comcat_keyname, KEY_READ|KEY_WRITE, &comcat_key); if (res != ERROR_SUCCESS) return E_FAIL; - for (; cCategories; --cCategories, ++rgci) { - static const WCHAR fmt[] = { '%', 'l', 'X', 0 }; + for (; cCategories; --cCategories, ++rgci) + { WCHAR keyname[CHARS_IN_GUID]; WCHAR valname[9]; HKEY cat_key; @@ -353,7 +347,7 @@ static HRESULT WINAPI COMCAT_ICatRegister_RegisterCategories( if (res != ERROR_SUCCESS) continue; /* Set the value for this locale's description. */ - wsprintfW(valname, fmt, rgci->lcid); + wsprintfW(valname, L"%lX", rgci->lcid); RegSetValueExW(cat_key, valname, 0, REG_SZ, (const BYTE*)rgci->szDescription, (lstrlenW(rgci->szDescription) + 1) * sizeof(WCHAR)); @@ -634,16 +628,12 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumImplCategoriesOfClass( REFCLSID rclsid, LPENUMCATID *ppenumCATID) { - static const WCHAR postfix[] = { '\\', 'I', 'm', 'p', 'l', 'e', 'm', 'e', - 'n', 't', 'e', 'd', ' ', 'C', 'a', 't', - 'e', 'g', 'o', 'r', 'i', 'e', 's', 0 }; - TRACE("%s\n",debugstr_guid(rclsid)); if (rclsid == NULL || ppenumCATID == NULL) return E_POINTER; - return CATIDEnumGUID_Construct(rclsid, postfix, ppenumCATID); + return CATIDEnumGUID_Construct(rclsid, L"\\Implemented Categories", ppenumCATID); } /********************************************************************** @@ -654,16 +644,12 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumReqCategoriesOfClass( REFCLSID rclsid, LPENUMCATID *ppenumCATID) { - static const WCHAR postfix[] = { '\\', 'R', 'e', 'q', 'u', 'i', 'r', 'e', - 'd', ' ', 'C', 'a', 't', 'e', 'g', 'o', - 'r', 'i', 'e', 's', 0 }; - TRACE("%s\n",debugstr_guid(rclsid)); if (rclsid == NULL || ppenumCATID == NULL) return E_POINTER; - return CATIDEnumGUID_Construct(rclsid, postfix, ppenumCATID); + return CATIDEnumGUID_Construct(rclsid, L"\\Required Categories", ppenumCATID); } /********************************************************************** @@ -855,9 +841,6 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Clone( IEnumCATEGORYINFO **ppenum) { IEnumCATEGORYINFOImpl *This = impl_from_IEnumCATEGORYINFO(iface); - static const WCHAR keyname[] = { 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', - 't', ' ', 'C', 'a', 't', 'e', 'g', 'o', - 'r', 'i', 'e', 's', 0 }; IEnumCATEGORYINFOImpl *new_this; TRACE("\n"); @@ -871,7 +854,7 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Clone( new_this->ref = 1; new_this->lcid = This->lcid; /* FIXME: could we more efficiently use DuplicateHandle? */ - open_classes_key(HKEY_CLASSES_ROOT, keyname, KEY_READ, &new_this->key); + open_classes_key(HKEY_CLASSES_ROOT, comcat_keyname, KEY_READ, &new_this->key); new_this->next_index = This->next_index; *ppenum = &new_this->IEnumCATEGORYINFO_iface; @@ -891,7 +874,6 @@ static const IEnumCATEGORYINFOVtbl COMCAT_IEnumCATEGORYINFO_Vtbl = static HRESULT EnumCATEGORYINFO_Construct(LCID lcid, IEnumCATEGORYINFO **ret) { - static const WCHAR keyname[] = {'C','o','m','p','o','n','e','n','t',' ','C','a','t','e','g','o','r','i','e','s',0}; IEnumCATEGORYINFOImpl *This; *ret = NULL; @@ -902,7 +884,7 @@ static HRESULT EnumCATEGORYINFO_Construct(LCID lcid, IEnumCATEGORYINFO **ret) This->IEnumCATEGORYINFO_iface.lpVtbl = &COMCAT_IEnumCATEGORYINFO_Vtbl; This->ref = 1; This->lcid = lcid; - open_classes_key(HKEY_CLASSES_ROOT, keyname, KEY_READ, &This->key); + open_classes_key(HKEY_CLASSES_ROOT, comcat_keyname, KEY_READ, &This->key); *ret = &This->IEnumCATEGORYINFO_iface; return S_OK; @@ -1043,7 +1025,6 @@ static HRESULT WINAPI CLSIDEnumGUID_Clone( IEnumGUID *iface, IEnumGUID **ppenum) { - static const WCHAR keynameW[] = {'C','L','S','I','D',0}; CLSID_IEnumGUIDImpl *This = impl_from_IEnumCLSID(iface); CLSID_IEnumGUIDImpl *cloned; @@ -1067,7 +1048,7 @@ static HRESULT WINAPI CLSIDEnumGUID_Clone( memcpy(cloned->categories, This->categories, This->categories->size); cloned->key = NULL; - open_classes_key(HKEY_CLASSES_ROOT, keynameW, KEY_READ, &cloned->key); + open_classes_key(HKEY_CLASSES_ROOT, L"CLSID", KEY_READ, &cloned->key); cloned->next_index = This->next_index; *ppenum = &cloned->IEnumGUID_iface; @@ -1087,7 +1068,6 @@ static const IEnumGUIDVtbl CLSIDEnumGUIDVtbl = static HRESULT CLSIDEnumGUID_Construct(struct class_categories *categories, IEnumCLSID **ret) { - static const WCHAR keyname[] = {'C','L','S','I','D',0}; CLSID_IEnumGUIDImpl *This; *ret = NULL; @@ -1098,7 +1078,7 @@ static HRESULT CLSIDEnumGUID_Construct(struct class_categories *categories, IEnu This->IEnumGUID_iface.lpVtbl = &CLSIDEnumGUIDVtbl; This->ref = 1; This->categories = categories; - open_classes_key(HKEY_CLASSES_ROOT, keyname, KEY_READ, &This->key); + open_classes_key(HKEY_CLASSES_ROOT, L"CLSID", KEY_READ, &This->key); *ret = &This->IEnumGUID_iface; @@ -1265,7 +1245,6 @@ static const IEnumGUIDVtbl CATIDEnumGUIDVtbl = static HRESULT CATIDEnumGUID_Construct(REFCLSID rclsid, LPCWSTR postfix, IEnumGUID **ret) { - static const WCHAR prefixW[] = {'C','L','S','I','D','\\',0}; WCHAR keyname[100], clsidW[CHARS_IN_GUID]; CATID_IEnumGUIDImpl *This; @@ -1278,7 +1257,7 @@ static HRESULT CATIDEnumGUID_Construct(REFCLSID rclsid, LPCWSTR postfix, IEnumGU This->IEnumGUID_iface.lpVtbl = &CATIDEnumGUIDVtbl; This->ref = 1; - lstrcpyW(keyname, prefixW); + lstrcpyW(keyname, L"CLSID\\"); lstrcatW(keyname, clsidW); lstrcatW(keyname, postfix);

1 0

Hans Leidekker : crypt32: Set key context if PKCS12_NO_PERSIST_KEY is passed, otherwise set key provider info.
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: wine Branch: master Commit: 4e11e6e045edd514d553d32ef797cecf98d9a203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e11e6e045edd514d553d32e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 17 15:48:16 2020 +0200 crypt32: Set key context if PKCS12_NO_PERSIST_KEY is passed, otherwise set key provider info. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/pfx.c | 89 ++++++++++++++++++++++++++++++++++++++++++---- dlls/crypt32/tests/store.c | 26 +++++++++++--- 2 files changed, 104 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index 711cf76de2..475ec0369e 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -256,6 +256,77 @@ static char *password_to_ascii( const WCHAR *str ) #endif +static BOOL set_key_context( const void *ctx, HCRYPTPROV prov ) +{ + CERT_KEY_CONTEXT key_ctx; + key_ctx.cbSize = sizeof(key_ctx); + key_ctx.hCryptProv = prov; + key_ctx.dwKeySpec = AT_KEYEXCHANGE; + return CertSetCertificateContextProperty( ctx, CERT_KEY_CONTEXT_PROP_ID, 0, &key_ctx ); +} + +static WCHAR *get_provider_property( HCRYPTPROV prov, DWORD prop_id, DWORD *len ) +{ + DWORD size = 0; + WCHAR *ret; + char *str; + + CryptGetProvParam( prov, prop_id, NULL, &size, 0 ); + if (!size) return NULL; + if (!(str = CryptMemAlloc( size ))) return NULL; + CryptGetProvParam( prov, prop_id, (BYTE *)str, &size, 0 ); + + *len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + if ((ret = CryptMemAlloc( *len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, str, -1, ret, *len ); + CryptMemFree( str ); + return ret; +} + +static BOOL set_key_prov_info( const void *ctx, HCRYPTPROV prov ) +{ + CRYPT_KEY_PROV_INFO *prov_info; + DWORD size, len_container, len_name; + WCHAR *ptr, *container, *name; + BOOL ret; + + if (!(container = get_provider_property( prov, PP_CONTAINER, &len_container ))) return FALSE; + if (!(name = get_provider_property( prov, PP_NAME, &len_name ))) + { + CryptMemFree( container ); + return FALSE; + } + if (!(prov_info = CryptMemAlloc( sizeof(*prov_info) + (len_container + len_name) * sizeof(WCHAR) ))) + { + CryptMemFree( container ); + CryptMemFree( name ); + return FALSE; + } + + ptr = (WCHAR *)(prov_info + 1); + prov_info->pwszContainerName = ptr; + strcpyW( prov_info->pwszContainerName, container ); + + ptr += len_container; + prov_info->pwszProvName = ptr; + strcpyW( prov_info->pwszProvName, name ); + + size = sizeof(prov_info->dwProvType); + CryptGetProvParam( prov, PP_PROVTYPE, (BYTE *)&prov_info->dwProvType, &size, 0 ); + + prov_info->dwFlags = 0; + prov_info->cProvParam = 0; + prov_info->rgProvParam = NULL; + size = sizeof(prov_info->dwKeySpec); + CryptGetProvParam( prov, PP_KEYSPEC, (BYTE *)&prov_info->dwKeySpec, &size, 0 ); + + ret = CertSetCertificateContextProperty( ctx, CERT_KEY_PROV_INFO_PROP_ID, 0, prov_info ); + + CryptMemFree( prov_info ); + CryptMemFree( name ); + CryptMemFree( container ); + return ret; +} + HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *password, DWORD flags ) { #ifdef SONAME_LIBGNUTLS @@ -265,7 +336,6 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor gnutls_x509_crt_t *chain; unsigned int chain_len, i; HCERTSTORE store = NULL; - CERT_KEY_CONTEXT key_ctx; HCRYPTPROV prov = 0; char *pwd = NULL; int ret; @@ -339,16 +409,21 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor } heap_free( crt_data ); - key_ctx.cbSize = sizeof(key_ctx); - key_ctx.hCryptProv = prov; - key_ctx.dwKeySpec = AT_KEYEXCHANGE; - if (!CertSetCertificateContextProperty( ctx, CERT_KEY_CONTEXT_PROP_ID, 0, &key_ctx )) + if (flags & PKCS12_NO_PERSIST_KEY) { - WARN( "CertSetCertificateContextProperty failed %08x\n", GetLastError() ); + if (!set_key_context( ctx, prov )) + { + WARN( "failed to set context property %08x\n", GetLastError() ); + CertFreeCertificateContext( ctx ); + goto error; + } + } + else if (!set_key_prov_info( ctx, prov )) + { + WARN( "failed to set provider info property %08x\n", GetLastError() ); CertFreeCertificateContext( ctx ); goto error; } - if (!CertAddCertificateContextToStore( store, ctx, CERT_STORE_ADD_ALWAYS, NULL )) { WARN( "CertAddCertificateContextToStore failed %08x\n", GetLastError() ); diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index b8d0ad6666..b2d5c7cb7e 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -3286,7 +3286,8 @@ static void test_PFXImportCertStore(void) CRYPT_DATA_BLOB pfx; const CERT_CONTEXT *cert; CERT_KEY_CONTEXT key; - CRYPT_KEY_PROV_INFO keyprov; + char buf[512]; + CRYPT_KEY_PROV_INFO *keyprov = (CRYPT_KEY_PROV_INFO *)buf; CERT_INFO *info; DWORD count, size; BOOL ret; @@ -3299,7 +3300,7 @@ static void test_PFXImportCertStore(void) pfx.pbData = (BYTE *)pfxdata; pfx.cbData = sizeof(pfxdata); store = PFXImportCertStore( &pfx, NULL, CRYPT_EXPORTABLE|CRYPT_USER_KEYSET|PKCS12_NO_PERSIST_KEY ); - ok( store != NULL || broken(store == NULL) /* winxp */, "got %p\n", store ); + ok( store != NULL || broken(store == NULL) /* winxp */, "got %u\n", GetLastError() ); if (!store) return; count = countCertsInStore( store ); ok( count == 1, "got %u\n", count ); @@ -3324,11 +3325,28 @@ static void test_PFXImportCertStore(void) ok( key.hCryptProv, "hCryptProv not set\n" ); ok( key.dwKeySpec == AT_KEYEXCHANGE, "got %u\n", key.dwKeySpec ); - size = sizeof(keyprov); + size = sizeof(buf); SetLastError( 0xdeadbeef ); - ret = CertGetCertificateContextProperty( cert, CERT_KEY_PROV_INFO_PROP_ID, &keyprov, &size ); + ret = CertGetCertificateContextProperty( cert, CERT_KEY_PROV_INFO_PROP_ID, keyprov, &size ); + ok( !ret && GetLastError() == CRYPT_E_NOT_FOUND, "got %08x\n", GetLastError() ); + CertFreeCertificateContext( cert ); + CertCloseStore( store, 0 ); + + /* without PKCS12_NO_PERSIST_KEY */ + store = PFXImportCertStore( &pfx, NULL, CRYPT_EXPORTABLE|CRYPT_USER_KEYSET ); + ok( store != NULL, "got %u\n", GetLastError() ); + + cert = CertFindCertificateInStore( store, X509_ASN_ENCODING, 0, CERT_FIND_ANY, NULL, NULL ); + ok( cert != NULL, "got %08x\n", GetLastError() ); + + size = sizeof(key); + ret = CertGetCertificateContextProperty( cert, CERT_KEY_CONTEXT_PROP_ID, &key, &size ); ok( !ret && GetLastError() == CRYPT_E_NOT_FOUND, "got %08x\n", GetLastError() ); + size = sizeof(buf); + ret = CertGetCertificateContextProperty( cert, CERT_KEY_PROV_INFO_PROP_ID, buf, &size ); + ok(ret, "got %u\n", GetLastError()); + CertFreeCertificateContext( cert ); CertCloseStore( store, 0 ); }

1 0

Myah Caron : dmstyle: Return S_FALSE for IDirectMusicStyle8::GetMotif.
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: wine Branch: master Commit: d28c7938c704fe4dcfc8920db494a7175a46fe6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d28c7938c704fe4dcfc8920d… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Thu Sep 17 09:04:02 2020 +0000 dmstyle: Return S_FALSE for IDirectMusicStyle8::GetMotif. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49850 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/style.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 5a97dac079..6eaedb1fbd 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -201,8 +201,8 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetMotif(IDirectMusicStyle8 *iface, IDirectMusicSegment **ppSegment) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - FIXME("(%p, %p, %p): stub\n", This, pwszName, ppSegment); - return S_OK; + FIXME("(%p, %s, %p): stub\n", This, debugstr_w(pwszName), ppSegment); + return S_FALSE; } static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultChordMap(IDirectMusicStyle8 *iface,

1 0

Myah Caron : dmband: Avoid cloning stream in parse_bands_list.
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: wine Branch: master Commit: 2cf69bb5a5b43951abb251f415ccb81e809bd32e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cf69bb5a5b43951abb251f4… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Thu Sep 17 05:18:08 2020 -0700 dmband: Avoid cloning stream in parse_bands_list. A stream that doesn't implement ::Clone can be passed, causing IStream_Seek to crash. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/bandtrack.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 14d2c7a571..612be063e1 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -425,21 +425,22 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK StreamSize = Chunk.dwSize - sizeof(FOURCC); switch (Chunk.fccID) { case DMUS_FOURCC_BAND_FORM: { - LPSTREAM pClonedStream = NULL; + ULARGE_INTEGER liOrigPos; TRACE_(dmfile)(": BAND RIFF\n"); - - IStream_Clone (pStm, &pClonedStream); - + liMove.QuadPart = 0; + IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, &liOrigPos); + liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); - IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); + IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - hr = load_band(This, pClonedStream, &pBand, &header); + hr = load_band(This, pStm, &pBand, &header); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; } - IStream_Release (pClonedStream); + liMove.QuadPart = (LONGLONG)liOrigPos.QuadPart; + IStream_Seek (pStm, liMove, STREAM_SEEK_SET, NULL); IDirectMusicTrack_Release(pBand); pBand = NULL; /* now we can release at as it inserted */

1 0

Isabella Bosia : vkd3d-shader: Always print swizzle except for immediates or samplers.
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: vkd3d Branch: master Commit: d93d76079c81e5faac2b6b501642f08e7eed8ff1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d93d76079c81e5faac2b6b5… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Wed Sep 16 12:45:40 2020 +0100 vkd3d-shader: Always print swizzle except for immediates or samplers. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index f32bdfa..68a90fd 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1051,7 +1051,7 @@ static void shader_dump_src_param(struct vkd3d_string_buffer *buffer, default: shader_addline(buffer, "_unknown_modifier(%#x)", src_modifier); } - if (swizzle != VKD3D_SHADER_NO_SWIZZLE) + if (param->reg.type != VKD3DSPR_IMMCONST && param->reg.type != VKD3DSPR_SAMPLER) { static const char swizzle_chars[] = "xyzw"; DWORD swizzle_x = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(0)) & VKD3D_SHADER_SWIZZLE_MASK;

1 0