February 2020 - Wine-devel - list.winehq.org

[PATCH] ole32: Correct MkParseDisplayName spec entry.
by Dmitry Timoshkov 18 Feb '20

18 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ole32/ole32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index dd10d65b78..2c4428edf0 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -179,7 +179,7 @@ @ stdcall IsValidInterface(ptr) @ stub IsValidPtrIn @ stub IsValidPtrOut -@ stdcall MkParseDisplayName(ptr ptr ptr ptr) +@ stdcall MkParseDisplayName(ptr wstr ptr ptr) @ stdcall MonikerCommonPrefixWith(ptr ptr ptr) @ stub MonikerRelativePathTo @ stdcall OleBuildVersion() -- 2.20.1

2 1

[PATCH 1/2] activeds: Implement AllocADsStr and FreeADsStr.
by Dmitry Timoshkov 18 Feb '20

18 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/activeds/activeds_main.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index e8955ee815..c997cab912 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -237,8 +237,18 @@ LPVOID WINAPI ReallocADsMem(LPVOID pOldMem, DWORD cbOld, DWORD cbNew) */ LPWSTR WINAPI AllocADsStr(LPWSTR pStr) { - FIXME("(%p)!stub\n",pStr); - return NULL; + LPWSTR ret; + SIZE_T len; + + TRACE("(%p)\n", pStr); + + if (!pStr) return NULL; + + len = (wcslen(pStr) + 1) * sizeof(WCHAR); + ret = AllocADsMem(len); + if (ret) memcpy(ret, pStr, len); + + return ret; } /***************************************************** @@ -246,8 +256,9 @@ LPWSTR WINAPI AllocADsStr(LPWSTR pStr) */ BOOL WINAPI FreeADsStr(LPWSTR pStr) { - FIXME("(%p)!stub\n",pStr); - return FALSE; + TRACE("(%p)\n", pStr); + + return FreeADsMem(pStr); } /***************************************************** -- 2.20.1

1 0

[PATCH 1/2] activeds: Implement ReallocADsMem.
by Dmitry Timoshkov 18 Feb '20

18 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/activeds/activeds_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 72cfd4d83f..e8955ee815 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -229,8 +229,7 @@ BOOL WINAPI FreeADsMem(LPVOID pMem) */ LPVOID WINAPI ReallocADsMem(LPVOID pOldMem, DWORD cbOld, DWORD cbNew) { - FIXME("(%p,%d,%d)!stub\n", pOldMem, cbOld, cbNew); - return NULL; + return HeapReAlloc(GetProcessHeap(), 0, pOldMem, cbNew); } /***************************************************** -- 2.20.1

1 0

[PATCH] oledb32: Add Next button logic
by Alistair Leslie-Hughes 18 Feb '20

18 Feb '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/dslocator.c | 19 +++++++++++++++++-- dlls/oledb32/resource.h | 2 ++ dlls/oledb32/version.rc | 3 +++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 11ee76cddb..4835830cf3 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -278,8 +278,23 @@ static LRESULT CALLBACK data_link_properties_dlg_proc(HWND hwnd, UINT msg, WPARA { if (LOWORD(wp) == IDC_BTN_NEXT) { - /* TODO: Implement Connection dialog */ - MessageBoxA(hwnd, "Not implemented yet.", "Error", MB_OK | MB_ICONEXCLAMATION); + HWND lv = GetDlgItem(hwnd, IDC_LST_CONNECTIONS); + if (SendMessageW(lv, LVM_GETSELECTEDCOUNT, 0, 0)) + { + /* + * FIXME: This needs to replace the connection page based off the selection. + * We only care about the ODBC for now which is the default. + */ + SendMessageW(GetParent(hwnd), PSM_SETCURSEL, 1, 0); + } + else + { + WCHAR title[256], msg[256]; + + LoadStringW(instance, IDS_PROVIDER_TITLE, title, ARRAY_SIZE(title)); + LoadStringW(instance, IDS_PROVIDER_ERROR, msg, ARRAY_SIZE(msg)); + MessageBoxW(hwnd, msg, title, MB_OK | MB_ICONEXCLAMATION); + } } break; } diff --git a/dlls/oledb32/resource.h b/dlls/oledb32/resource.h index 3760a38487..dfedb34a54 100644 --- a/dlls/oledb32/resource.h +++ b/dlls/oledb32/resource.h @@ -19,6 +19,8 @@ #define IDD_PROVIDER 1000 #define IDC_BTN_NEXT 1001 #define IDC_LST_CONNECTIONS 1002 +#define IDS_PROVIDER_TITLE 1003 +#define IDS_PROVIDER_ERROR 1004 #define IDS_PROPSHEET_TITLE 2000 #define IDS_COL_PROVIDER 2001 diff --git a/dlls/oledb32/version.rc b/dlls/oledb32/version.rc index 97714086eb..080e444eb7 100644 --- a/dlls/oledb32/version.rc +++ b/dlls/oledb32/version.rc @@ -45,6 +45,9 @@ STRINGTABLE IDS_PERM_SHAREDENYWRITE "Share Deny Write" IDS_PERM_SHAREEXCLUSIVE "Share Exclusive" IDS_PERM_WRITE "Write" + + IDS_PROVIDER_TITLE "Data Link Error" + IDS_PROVIDER_ERROR "Please select a provider." } IDD_PROVIDER DIALOG 0, 0, 227, 225 -- 2.25.0

1 1

[PATCH v3 1/2] gdi32/tests: Add some more GetCharacterPlacement tests.
by Sven Baars 18 Feb '20

18 Feb '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- v3: Remove some tests that tested nothing. dlls/gdi32/tests/font.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ea1bb960df..c96d8b1b56 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4926,6 +4926,7 @@ static void test_GetCharacterPlacement(void) GCP_RESULTSA result; DWORD size, size2; WCHAR glyphs[20]; + int pos[20]; HDC hdc; hdc = CreateCompatibleDC(0); @@ -4933,11 +4934,26 @@ static void test_GetCharacterPlacement(void) memset(&result, 0, sizeof(result)); result.lStructSize = sizeof(result); + result.lpCaretPos = pos; result.lpGlyphs = glyphs; result.nGlyphs = 20; + pos[0] = -1; + glyphs[0] = '!'; size = GetCharacterPlacementA(hdc, "Wine Test", 9, 0, &result, 0); ok(size, "GetCharacterPlacementA failed!\n"); + ok(result.nGlyphs == 9, "Unexpected number of glyphs %u\n", result.nGlyphs); + ok(glyphs[0] == 'W', "Unexpected first glyph %s\n", wine_dbgstr_wn(glyphs, 1)); + ok(pos[0] == 0, "Unexpected caret position %d\n", pos[0]); + + pos[0] = -1; + glyphs[0] = '!'; + result.nGlyphs = 20; + size2 = GetCharacterPlacementA(hdc, "Wine Test", 0, 0, &result, 0); + ok(!size2, "Expected GetCharacterPlacementA to fail\n"); + todo_wine ok(result.nGlyphs == 20, "Unexpected number of glyphs %u\n", result.nGlyphs); + ok(glyphs[0] == '!', "Unexpected first glyph %s\n", wine_dbgstr_wn(glyphs, 1)); + todo_wine ok(pos[0] == -1, "Unexpected caret position %d\n", pos[0]); size2 = GetCharacterPlacementA(hdc, "Wine Test", 9, 0, NULL, 0); ok(size2, "GetCharacterPlacementA failed!\n"); @@ -4947,9 +4963,15 @@ static void test_GetCharacterPlacement(void) ok(size2, "GetCharacterPlacementA failed!\n"); ok(size == size2, "GetCharacterPlacementA returned different result: %u vs %u\n", size2, size); + pos[0] = -1; + glyphs[0] = '!'; + result.nGlyphs = 20; size = GetCharacterPlacementA(hdc, "Wine Test", 9, 1024, &result, GCP_REORDER); ok(size, "GetCharacterPlacementA failed!\n"); ok(size == size2, "GetCharacterPlacementA returned different result: %u vs %u\n", size2, size); + ok(result.nGlyphs == 9, "Unexpected number of glyphs %u\n", result.nGlyphs); + ok(glyphs[0] == 'W', "Unexpected first glyph %s\n", wine_dbgstr_wn(glyphs, 1)); + todo_wine ok(pos[0] == 0, "Unexpected caret position %d\n", pos[0]); DeleteDC(hdc); } -- 2.24.0

3 5

[PATCH v3] ole32: Avoid calling QueryContinueDrag recursively.
by Roman Pišl 18 Feb '20

18 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48569 v2: Moved barrier to OLEDD_TrackStateChange. v3: Improved tests show that the original solution is correct. Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/ole32/ole2.c | 11 ++++++++ dlls/ole32/tests/dragdrop.c | 53 +++++++++++++++++++++++++++++-------- 2 files changed, 53 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 757458ad20..6653fac342 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -62,6 +62,7 @@ typedef struct tagTrackerWindowInfo DWORD dwOKEffect; DWORD* pdwEffect; BOOL trackingDone; + BOOL inTrackCall; HRESULT returnValue; BOOL escPressed; @@ -766,6 +767,7 @@ HRESULT WINAPI DoDragDrop ( trackerInfo.dwOKEffect = dwOKEffect; trackerInfo.pdwEffect = pdwEffect; trackerInfo.trackingDone = FALSE; + trackerInfo.inTrackCall = FALSE; trackerInfo.escPressed = FALSE; trackerInfo.curTargetHWND = 0; trackerInfo.curDragTarget = 0; @@ -2284,6 +2286,13 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) HWND hwndNewTarget = 0; POINT pt; + /* + * This method may be called from QueryContinueDrag again, + * (i.e. by running message loop) so avoid recursive call chain. + */ + if (trackerInfo->inTrackCall) return; + trackerInfo->inTrackCall = TRUE; + /* * Get the handle of the window under the mouse */ @@ -2329,6 +2338,8 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) } else drag_end( trackerInfo ); + + trackerInfo->inTrackCall = FALSE; } /*** diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 77e47d723d..62ac15d8fc 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -260,6 +260,7 @@ struct method_call call_lists[][30] = }; static int droptarget_refs; +static int test_reentrance; /* helper macros to make tests a bit leaner */ #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -359,7 +360,34 @@ static HRESULT WINAPI DropSource_QueryContinueDrag( BOOL fEscapePressed, DWORD grfKeyState) { - return check_expect(DS_QueryContinueDrag, 0, NULL); + HRESULT hr = check_expect(DS_QueryContinueDrag, 0, NULL); + if (test_reentrance) + { + MSG msg; + BOOL r; + int num = 0; + + HWND hwnd = GetCapture(); + ok(hwnd != 0, "Expected capture window\n"); + + /* send some fake events that should be ignored */ + r = PostMessageA(hwnd, WM_MOUSEMOVE, 0, 0); + r &= PostMessageA(hwnd, WM_LBUTTONDOWN, 0, 0); + r &= PostMessageA(hwnd, WM_LBUTTONUP, 0, 0); + r &= PostMessageA(hwnd, WM_KEYDOWN, VK_ESCAPE, 0); + ok(r, "Unable to post messages\n"); + + /* run the message loop for this thread */ + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + num++; + } + + ok(num >= 4, "Expected at least 4 messages but %d were processed\n", num); + } + return hr; } static HRESULT WINAPI DropSource_GiveFeedback( @@ -701,17 +729,20 @@ static void test_DoDragDrop(void) GetWindowRect(hwnd, &rect); ok(SetCursorPos(rect.left+50, rect.top+50), "SetCursorPos failed\n"); - for (seq = 0; seq < ARRAY_SIZE(call_lists); seq++) + for (test_reentrance = 0; test_reentrance < 2; test_reentrance++) { - DWORD effect_in; - trace("%d\n", seq); - call_ptr = call_lists[seq]; - effect_in = call_ptr->set_param; - call_ptr++; - - hr = DoDragDrop(&DataObject, &DropSource, effect_in, &effect); - check_expect(DoDragDrop_ret, hr, NULL); - check_expect(DoDragDrop_effect_out, effect, NULL); + for (seq = 0; seq < ARRAY_SIZE(call_lists); seq++) + { + DWORD effect_in; + trace("%d\n", seq); + call_ptr = call_lists[seq]; + effect_in = call_ptr->set_param; + call_ptr++; + + hr = DoDragDrop(&DataObject, &DropSource, effect_in, &effect); + check_expect(DoDragDrop_ret, hr, NULL); + check_expect(DoDragDrop_effect_out, effect, NULL); + } } OleUninitialize(); -- 2.20.1

2 1

[PATCH 1/5] include: Add dmodshow.idl and IDMOWrapperFilter.
by Zebediah Figura 18 Feb '20

18 Feb '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/dmoguids/dmoguids.c | 1 + include/Makefile.in | 1 + include/dmodshow.idl | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 include/dmodshow.idl diff --git a/dlls/dmoguids/dmoguids.c b/dlls/dmoguids/dmoguids.c index b764c1f74f0..15a0540170d 100644 --- a/dlls/dmoguids/dmoguids.c +++ b/dlls/dmoguids/dmoguids.c @@ -25,3 +25,4 @@ #include "mediaobj.h" #include "dmoreg.h" +#include "dmodshow.h" diff --git a/include/Makefile.in b/include/Makefile.in index 0e5dd475e04..21b4233ecd9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -212,6 +212,7 @@ SOURCES = \ dmerror.h \ dmksctrl.h \ dmo.h \ + dmodshow.idl \ dmoreg.h \ dmort.h \ dmplugin.h \ diff --git a/include/dmodshow.idl b/include/dmodshow.idl new file mode 100644 index 00000000000..986b6c1ec33 --- /dev/null +++ b/include/dmodshow.idl @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "objidl.idl"; +import "mediaobj.idl"; + +cpp_quote("DEFINE_GUID(CLSID_DMOWrapperFilter, 0x94297043,0xbd82,0x4dfd,0xb0,0xde,0x81,0x77,0x73,0x9c,0x6d,0x20);") +cpp_quote("DEFINE_GUID(CLSID_DMOFilterCategory,0xbcd5796c,0xbd52,0x4d30,0xab,0x76,0x70,0xf9,0x75,0xb8,0x91,0x99);") + +[ + object, + uuid(52d6f586-9f0f-4824-8fc8-e32ca04930c2), +] +interface IDMOWrapperFilter : IUnknown +{ + HRESULT Init(REFCLSID clsid, REFCLSID category); +} -- 2.25.0

2 7

[PATCH] winevulkan: Fix two spelling errors in make_vulkan
by Liam Middlebrook 18 Feb '20

18 Feb '20

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Robert Morell <rmorell(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 52ef25948c..3593410041 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -296,7 +296,7 @@ class VkDefine(object): # Perform minimal parsing for Vulkan constants, which we don't need, but are referenced # elsewhere in vk.xml. # - VK_API_VERSION is a messy, deprecated constant and we don't want generate code for it. - # - AHardwareBuffer/ANativeWindow are forard declarations for Android types, which leaked + # - AHardwareBuffer/ANativeWindow are forward declarations for Android types, which leaked # into the define region. if name in ["VK_API_VERSION", "AHardwareBuffer", "ANativeWindow", "CAMetalLayer"]: return VkDefine(name, None) @@ -2729,7 +2729,7 @@ class VkRegistry(object): VkRegistry._require_type(member.type_info["data"]) def _parse_extensions(self, root): - """ Parse extensions section and pull in any types and commands for this extensioin. """ + """ Parse extensions section and pull in any types and commands for this extension. """ extensions = [] exts = root.findall("./extensions/extension") for ext in exts: -- 2.17.2

1 0

Wine staging 5.2 release
by Alistair Leslie-Hughes 18 Feb '20

18 Feb '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.2 (840 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * dsound: Use an SRW lock for buffer_list_lock. * ntdll: Block signals while executing system APCs. (v2) * ntdll: Stub for MemoryWorkingSetExInformation. * ntdll: Split logic for MemoryBasicInformation into a separate function. * d3d9: Return a stub interface from Direct3DShaderValidatorCreate9(). * comctl32: Switch to using a structure for extra storage. * comctl32: Paint 32-bpp bitmaps with an alpha channel using GdiAlphaBlend. * d3dx9_36: Recognize bump luminance X8L8V8U8 when loading dds file. * d3dx9_36: Implement D3DXCreateKeyframedAnimationSet. * include: Add adserr.h. * activeds: Implement ADsOpenObject. * adsldp: Add LDAPNamespace stubs. * adsldp: Add IADsOpenDSObject stubs. * adsldp/tests: Add some tests for LDAPNamespace. * setupapi: Implement SP_COPY_IN_USE_NEEDS_REBOOT. * dmime: Implement IDirectMusicPerformance8_PChannelInfo() Added: * None Updated: * ntdll-RtlIpv4StringToAddress * winebuild-Fake_Dlls * ntdll-User_shared_data_fields Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v6 0/2] Add emulation for UMIP instructions
by Brendan Shanks 17 Feb '20

17 Feb '20

This patch adds emulation for instructions protected by User-Mode Instruction Prevention (currently implemented by AMD Ryzen 3000 CPUs and some rare Intel CPUs). Changes from previous patch: - Fix calculation of RIP-relative addresses in INSTR_GetOperandAddr(), they are relative to the next instruction's RIP and not the current RIP. This was causing Ace Combat 7 to crash. - Call is_privileged_instr() before an exception stack frame is created. Wolfenstein: Youngblood calls sgdt with RSP not pointing to the stack, and the creation of the exception stack frame was overwriting data and causing a crash. Brendan Shanks (2): ntdll: Add emulation for UMIP instructions. ntdll/tests: Add tests for UMIP instructions. dlls/ntdll/signal_i386.c | 333 ++++++++++++++++++++++++++++++- dlls/ntdll/signal_x86_64.c | 374 +++++++++++++++++++++++++++++++++- dlls/ntdll/tests/exception.c | 375 +++++++++++++++++++++++++++++++++++ 3 files changed, 1066 insertions(+), 16 deletions(-) -- 2.24.1

2 3