September 2020 - Wine-Devel

[PATCH 1/2] ole32/clipboard: Use wide string constants.
by Nikolay Sivov Sept. 17, 2020

Sept. 17, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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 cb6770c05b3..01cfda831f5 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); } -- 2.28.0

1 1

[PATCH vkd3d-shader 1/5] vkd3d-shader: Print "domain" in tessellator domains.
by Isabella Bosia Sept. 17, 2020

Sept. 17, 2020

Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 68a90fd..3a17c22 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -420,6 +420,7 @@ static void shader_dump_uav_flags(struct vkd3d_string_buffer *buffer, DWORD uav_ static void shader_dump_tessellator_domain(struct vkd3d_string_buffer *buffer, enum vkd3d_tessellator_domain domain) { + shader_addline(buffer, "domain_"); switch (domain) { case VKD3D_TESSELLATOR_DOMAIN_LINE: -- 2.25.1

2 9

[PATCH vkd3d 1/6] vkd3d-shader: Remove [ ] from x registers in dcl_indexabletemp.
by Isabella Bosia Sept. 17, 2020

Sept. 17, 2020

Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> --- 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 3571de8..7553724 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1330,7 +1330,7 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, break; case VKD3DSIH_DCL_INDEXABLE_TEMP: - shader_addline(buffer, "%s x[%u][%u], %u", shader_opcode_names[ins->handler_idx], + shader_addline(buffer, "%s x%u[%u], %u", shader_opcode_names[ins->handler_idx], ins->declaration.indexable_temp.register_idx, ins->declaration.indexable_temp.register_size, ins->declaration.indexable_temp.component_count); -- 2.25.1

2 11

[PATCH 1/2] oleacc: Use wide string constants.
by Nikolay Sivov Sept. 17, 2020

Sept. 17, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleacc/client.c | 3 +-- dlls/oleacc/main.c | 28 +++++++++------------------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 1d43ec31063..3b33be55a21 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -274,7 +274,6 @@ static HRESULT WINAPI Client_get_accHelpTopic(IAccessible *iface, static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, VARIANT varID, BSTR *pszKeyboardShortcut) { - static const WCHAR shortcut_fmt[] = {'A','l','t','+','!',0}; Client *This = impl_from_Client(iface); WCHAR name[1024]; UINT i, len; @@ -293,7 +292,7 @@ static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, if(i+1 >= len) return S_FALSE; - *pszKeyboardShortcut = SysAllocString(shortcut_fmt); + *pszKeyboardShortcut = SysAllocString(L"Alt+!"); if(!*pszKeyboardShortcut) return E_OUTOFMEMORY; diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index f26abbd117c..f6b66a8bcab 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -37,15 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); static const WCHAR lresult_atom_prefix[] = {'w','i','n','e','_','o','l','e','a','c','c',':'}; -static const WCHAR menuW[] = {'#','3','2','7','6','8',0}; -static const WCHAR desktopW[] = {'#','3','2','7','6','9',0}; -static const WCHAR dialogW[] = {'#','3','2','7','7','0',0}; -static const WCHAR winswitchW[] = {'#','3','2','7','7','1',0}; -static const WCHAR mdi_clientW[] = {'M','D','I','C','l','i','e','n','t',0}; -static const WCHAR richeditW[] = {'R','I','C','H','E','D','I','T',0}; -static const WCHAR richedit20aW[] = {'R','i','c','h','E','d','i','t','2','0','A',0}; -static const WCHAR richedit20wW[] = {'R','i','c','h','E','d','i','t','2','0','W',0}; - typedef HRESULT (WINAPI *accessible_create)(HWND, const IID*, void**); extern HRESULT WINAPI OLEACC_DllGetClassObject(REFCLSID, REFIID, void**) DECLSPEC_HIDDEN; @@ -60,15 +51,15 @@ static struct { accessible_create create_window; } builtin_classes[] = { {WC_LISTBOXW, 0x10000, NULL, NULL}, - {menuW, 0x10001, NULL, NULL}, + {L"#32768", 0x10001, NULL, NULL}, /* menu */ {WC_BUTTONW, 0x10002, NULL, NULL}, {WC_STATICW, 0x10003, NULL, NULL}, {WC_EDITW, 0x10004, NULL, NULL}, {WC_COMBOBOXW, 0x10005, NULL, NULL}, - {dialogW, 0x10006, NULL, NULL}, - {winswitchW, 0x10007, NULL, NULL}, - {mdi_clientW, 0x10008, NULL, NULL}, - {desktopW, 0x10009, NULL, NULL}, + {L"#32770", 0x10006, NULL, NULL}, /* dialog */ + {L"#32771", 0x10007, NULL, NULL}, /* winswitcher */ + {L"MDIClient", 0x10008, NULL, NULL}, + {L"#32769", 0x10009, NULL, NULL}, /* desktop */ {WC_SCROLLBARW, 0x1000a, NULL, NULL}, {STATUSCLASSNAMEW, 0x1000b, NULL, NULL}, {TOOLBARCLASSNAMEW, 0x1000c, NULL, NULL}, @@ -85,9 +76,9 @@ static struct { {MONTHCAL_CLASSW, 0, NULL, NULL}, {DATETIMEPICK_CLASSW, 0, NULL, NULL}, {WC_IPADDRESSW, 0, NULL, NULL}, - {richeditW, 0x1001c, NULL, NULL}, - {richedit20aW, 0, NULL, NULL}, - {richedit20wW, 0, NULL, NULL}, + {L"RICHEDIT", 0x1001c, NULL, NULL}, + {L"RichEdit20A", 0, NULL, NULL}, + {L"RichEdit20W", 0, NULL, NULL}, }; static HINSTANCE oleacc_handle = 0; @@ -243,7 +234,6 @@ HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, vo LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) { - static const WCHAR atom_fmt[] = {'%','0','8','x',':','%','0','8','x',':','%','0','8','x',0}; static const LARGE_INTEGER seek_zero = {{0}}; WCHAR atom_str[ARRAY_SIZE(lresult_atom_prefix)+3*8+3]; @@ -319,7 +309,7 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) } memcpy(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix)); - swprintf(atom_str+ARRAY_SIZE(lresult_atom_prefix), 3*8 + 3, atom_fmt, GetCurrentProcessId(), + swprintf(atom_str+ARRAY_SIZE(lresult_atom_prefix), 3*8 + 3, L"%08x:%08x:%08x", GetCurrentProcessId(), HandleToUlong(mapping), stat.cbSize.u.LowPart); atom = GlobalAddAtomW(atom_str); if(!atom) { -- 2.28.0

1 1

Kernel32 resource test job takes a long time on 3 win10 test machines.
by Ziqing Hui Sept. 17, 2020

Sept. 17, 2020

Hi, Does any one have idea why this test job takes a very very long time (about 2 minutes) on w10pro64, w10pro64_2scr and w10pro64_ar test machines? It takes few seconds on other test machines including other win10 machines. Test job link: https://testbot.winehq.org/JobDetails.pl?Key=78782 Patch related to this test job: https://source.winehq.org/patches/data/192735 A test job same to the one above but includes some performance test: https://testbot.winehq.org/JobDetails.pl?Key=78817 Thanks, Ziqing

1 0

[PATCH] gdiplus/tests: Don't test point type array padding.
by Esme Povirk Sept. 16, 2020

Sept. 16, 2020

Since the point types are an array of bytes, padded to a DWORD boundary, some of the bytes at the end are undefined, and there's no good reason to test them. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- This should fix the recent failures on Windows 10. dlls/gdiplus/tests/region.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index d69f09db602..04c388bf5a7 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -641,8 +641,8 @@ static void test_getregiondata(void) expect_float(buf + 25, 50.0); expect_float(buf + 26, 70.2); expect_dword(buf + 27, 0x01010100); - ok(*(buf + 28) == 0x00000101 || *(buf + 28) == 0x43050101 /* Win 7 */, - "expected 00000101 or 43050101 got %08x\n", *(buf + 28)); + ok((*(buf + 28) & 0xffff) == 0x0101, + "expected ????0101 got %08x\n", *(buf + 28)); expect_dword(buf + 29, 0xeeeeeeee); test_region_data(buf, needed, __LINE__); @@ -791,9 +791,8 @@ static void test_getregiondata(void) expect_float(buf + 30, 789.799561); expect_dword(buf + 31, 0x03030300); expect_dword(buf + 32, 0x03030301); - ok(*(buf + 33) == 0x00030303 /* before win7 */ || - *(buf + 33) == 0x43030303 /* 32-bit win7 */ || *(buf + 33) == 0x4c030303 /* 64-bit win7 */, - "expected 0x00030303 or 0x43030303 or 0x4c030303 got %08x\n", *(buf + 33)); + ok((*(buf + 33) & 0xffffff) == 0x030303, + "expected 0x??030303 got %08x\n", *(buf + 33)); expect_dword(buf + 34, 0xeeeeeeee); test_region_data(buf, needed, __LINE__); -- 2.17.1

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras Sept. 16, 2020

Sept. 16, 2020

1 0

[PATCH v2] vbscript: Support non-Latin 1 characters in Asc.
by Akihiro Sagawa Sept. 16, 2020

Sept. 16, 2020

In v2, reflect Jacek's comments except WC_ERR_INVALID_CHARS. Wine-Bugs: https://bugs.winehq.org/show_bug.cgi?id=49309 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/vbscript/global.c | 23 ++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 5 +++++ 2 files changed, 25 insertions(+), 3 deletions(-)

2 1

[PATCH 7/7] server: Remove no longer used attach_console request.
by Jacek Caban Sept. 16, 2020

Sept. 16, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 29 ----------------------------- server/protocol.def | 6 ------ 2 files changed, 35 deletions(-)

1 0

[PATCH 6/7] kernelbase: Use console connection object in AttachConsole.
by Jacek Caban Sept. 16, 2020

Sept. 16, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)

1 0