September 2020 - Wine-commits

Jacek Caban : kernel32: Use NtDeviceIoControlFile directly for IOCTL_CONDRV_READ_CONSOLE and IOCTL_CONDRV_WRITE_CONSOLE.
by Alexandre Julliard 15 Sep '20

15 Sep '20

Module: wine Branch: master Commit: 2fd27f0a04a54136acc0cf138e1a6a6b7a47a1e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fd27f0a04a54136acc0cf13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 15 17:07:38 2020 +0200 kernel32: Use NtDeviceIoControlFile directly for IOCTL_CONDRV_READ_CONSOLE and IOCTL_CONDRV_WRITE_CONSOLE. Avoids messing last error for non-conhost consoles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 47083b27af..55c6ce4417 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -526,6 +526,7 @@ BOOL WINAPI ReadConsoleA( HANDLE handle, LPVOID buffer, DWORD length, DWORD *ret BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfCharsToRead, LPDWORD lpNumberOfCharsRead, LPVOID lpReserved) { + IO_STATUS_BLOCK io; DWORD charsread; LPWSTR xbuf = lpBuffer; DWORD mode; @@ -541,10 +542,10 @@ BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, return FALSE; } - if (DeviceIoControl(hConsoleInput, IOCTL_CONDRV_READ_CONSOLE, NULL, 0, lpBuffer, - nNumberOfCharsToRead * sizeof(WCHAR), lpNumberOfCharsRead, NULL)) + if (!NtDeviceIoControlFile(hConsoleInput, NULL, NULL, NULL, &io, IOCTL_CONDRV_READ_CONSOLE, NULL, 0, lpBuffer, + nNumberOfCharsToRead * sizeof(WCHAR))) { - *lpNumberOfCharsRead /= sizeof(WCHAR); + if (lpNumberOfCharsRead) *lpNumberOfCharsRead = io.Information / sizeof(WCHAR); return TRUE; } @@ -794,6 +795,7 @@ BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber const WCHAR* psz = lpBuffer; CONSOLE_SCREEN_BUFFER_INFO csbi; int k, first = 0, fd; + IO_STATUS_BLOCK io; TRACE("%p %s %d %p %p\n", hConsoleOutput, debugstr_wn(lpBuffer, nNumberOfCharsToWrite), @@ -801,8 +803,8 @@ BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = 0; - if (DeviceIoControl(hConsoleOutput, IOCTL_CONDRV_WRITE_CONSOLE, (void *)lpBuffer, - nNumberOfCharsToWrite * sizeof(WCHAR), NULL, 0, NULL, NULL)) + if (!NtDeviceIoControlFile(hConsoleOutput, NULL, NULL, NULL, &io, IOCTL_CONDRV_WRITE_CONSOLE, (void *)lpBuffer, + nNumberOfCharsToWrite * sizeof(WCHAR), NULL, 0)) { if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = nNumberOfCharsToWrite; return TRUE;

1 0

Jacek Caban : conhost/tests: Improve handling slow conhost replies.
by Alexandre Julliard 15 Sep '20

15 Sep '20

Module: wine Branch: master Commit: 6f5872cbc58d5a6e26f651baa27412b010943de7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f5872cbc58d5a6e26f651ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 15 17:07:48 2020 +0200 conhost/tests: Improve handling slow conhost replies. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index f536ad03af..355a4cd7c7 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -44,10 +44,10 @@ static void fetch_console_output_(unsigned int line) { ok_(__FILE__,line)(GetLastError() == ERROR_IO_PENDING, "read failed: %u\n", GetLastError()); if (GetLastError() != ERROR_IO_PENDING) return; - WaitForSingleObject(o.hEvent, 1000); + WaitForSingleObject(o.hEvent, 5000); } ret = GetOverlappedResult(console_pipe, &o, &count, FALSE); - if (!ret && GetLastError() == ERROR_IO_PENDING) + if (!ret && GetLastError() == ERROR_IO_INCOMPLETE) CancelIoEx(console_pipe, &o); ok_(__FILE__,line)(ret, "Read file failed: %u\n", GetLastError());

1 0

Jacek Caban : conhost/tests: Allow clear screen on console exit.
by Alexandre Julliard 15 Sep '20

15 Sep '20

Module: wine Branch: master Commit: d36a1792259440ea88ab0a67271aa7c4e98da28a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d36a1792259440ea88ab0a67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 15 17:08:03 2020 +0200 conhost/tests: Allow clear screen on console exit. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 355a4cd7c7..0d02d2af8f 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -137,9 +137,9 @@ static BOOL expect_erase_line_(unsigned line, unsigned int cnt) if (skip_sequence("\x1b[K")) return FALSE; ok(broken(1), "expected erase line\n"); sprintf(buf, "\x1b[%uX", cnt); - expect_output_sequence(buf); /* erase the rest of the line */ + expect_output_sequence_(line, cnt, buf); /* erase the rest of the line */ sprintf(buf, "\x1b[%uC", cnt); - expect_output_sequence(buf); /* move cursor to the end of the line */ + expect_output_sequence_(line, cnt, buf); /* move cursor to the end of the line */ return TRUE; } @@ -1280,6 +1280,19 @@ static void test_pseudoconsole(void) CloseHandle(child_pipe); wait_child_process(child_process); CloseHandle(child_process); + + /* native sometimes clears the screen here */ + if (skip_sequence("\x1b[25l")) + { + unsigned int i; + skip_sequence("\x1b[H"); + for (i = 0; i < 40; i++) + { + expect_output_sequence("\x1b[K"); + if (i != 39) expect_output_sequence("\r\n"); + } + skip_sequence("\x1b[H\x1b[?25h"); + } expect_empty_output(); pClosePseudoConsole(console);

1 0

Nikolay Sivov : combase: Use public symbol for special PS context flag.
by Alexandre Julliard 15 Sep '20

15 Sep '20

Module: wine Branch: master Commit: 5466a3dccfea79f21879468e2a0d3cd86762c7e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5466a3dccfea79f21879468e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 14 17:30:24 2020 +0300 combase: Use public symbol for special PS context flag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/apartment.c | 4 ++-- dlls/combase/combase.c | 7 +++---- dlls/combase/combase_private.h | 3 +-- dlls/combase/marshal.c | 3 +-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 5fbec944eb..1181e393ad 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -1017,12 +1017,12 @@ static enum comclass_threadingmodel get_threading_model(const struct class_reg_d } HRESULT apartment_get_inproc_class_object(struct apartment *apt, const struct class_reg_data *regdata, - REFCLSID rclsid, REFIID riid, BOOL hostifnecessary, void **ppv) + REFCLSID rclsid, REFIID riid, DWORD class_context, void **ppv) { WCHAR dllpath[MAX_PATH+1]; BOOL apartment_threaded; - if (hostifnecessary) + if (!(class_context & CLSCTX_PS_DLL)) { enum comclass_threadingmodel model = get_threading_model(regdata); diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 66c99b5352..c66f0bbf8e 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -1589,8 +1589,7 @@ static HRESULT com_get_class_object(REFCLSID rclsid, DWORD clscontext, clsreg.u.actctx.threading_model = comclass->model; clsreg.origin = CLASS_REG_ACTCTX; - hr = apartment_get_inproc_class_object(apt, &clsreg, &comclass->clsid, riid, - !(clscontext & WINE_CLSCTX_DONT_HOST), obj); + hr = apartment_get_inproc_class_object(apt, &clsreg, &comclass->clsid, riid, clscontext, obj); ReleaseActCtx(data.hActCtx); apartment_release(apt); return hr; @@ -1631,7 +1630,7 @@ static HRESULT com_get_class_object(REFCLSID rclsid, DWORD clscontext, clsreg.u.hkey = hkey; clsreg.origin = CLASS_REG_REGISTRY; - hr = apartment_get_inproc_class_object(apt, &clsreg, rclsid, riid, !(clscontext & WINE_CLSCTX_DONT_HOST), obj); + hr = apartment_get_inproc_class_object(apt, &clsreg, rclsid, riid, clscontext, obj); RegCloseKey(hkey); } @@ -1666,7 +1665,7 @@ static HRESULT com_get_class_object(REFCLSID rclsid, DWORD clscontext, clsreg.u.hkey = hkey; clsreg.origin = CLASS_REG_REGISTRY; - hr = apartment_get_inproc_class_object(apt, &clsreg, rclsid, riid, !(clscontext & WINE_CLSCTX_DONT_HOST), obj); + hr = apartment_get_inproc_class_object(apt, &clsreg, rclsid, riid, clscontext, obj); RegCloseKey(hkey); } diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index ca8a994f4e..2c938e6ff4 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -61,7 +61,6 @@ HRESULT open_appidkey_from_clsid(REFCLSID clsid, REGSAM access, HKEY *subkey) DE #define DM_EXECUTERPC (WM_USER + 0) /* WPARAM = 0, LPARAM = (struct dispatch_params *) */ #define DM_HOSTOBJECT (WM_USER + 1) /* WPARAM = 0, LPARAM = (struct host_object_params *) */ -#define WINE_CLSCTX_DONT_HOST 0x80000000 #define CHARS_IN_GUID 39 /* this is what is stored in TEB->ReservedForOle */ @@ -156,7 +155,7 @@ HRESULT apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) DECLSPEC_HIDD void apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie) DECLSPEC_HIDDEN; struct apartment * apartment_get_mta(void) DECLSPEC_HIDDEN; HRESULT apartment_get_inproc_class_object(struct apartment *apt, const struct class_reg_data *regdata, - REFCLSID rclsid, REFIID riid, BOOL hostifnecessary, void **ppv) DECLSPEC_HIDDEN; + REFCLSID rclsid, REFIID riid, DWORD class_context, void **ppv) DECLSPEC_HIDDEN; HRESULT apartment_get_local_server_stream(struct apartment *apt, IStream **ret) DECLSPEC_HIDDEN; IUnknown *com_get_registered_class_object(const struct apartment *apartment, REFCLSID rclsid, DWORD clscontext) DECLSPEC_HIDDEN; diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index bdfb44bffa..51b4ce2411 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -881,8 +881,7 @@ static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf) hr = CoGetPSClsid(riid, &clsid); if (hr != S_OK) return hr; - return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER | WINE_CLSCTX_DONT_HOST, - NULL, &IID_IPSFactoryBuffer, (LPVOID*)facbuf); + return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER | CLSCTX_PS_DLL, NULL, &IID_IPSFactoryBuffer, (void **)facbuf); } /* marshals an object into a STDOBJREF structure */

1 0

Nikolay Sivov : ole32: Remove some leftovers from private header.
by Alexandre Julliard 15 Sep '20

15 Sep '20

Module: wine Branch: master Commit: ee54c594e9dbe121894ffbc60861ccc31493a57f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee54c594e9dbe121894ffbc6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 14 17:37:52 2020 +0300 ole32: Remove some leftovers from private header. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj_private.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 18b39d655f..f10b41907a 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -41,8 +41,6 @@ DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 ); -struct apartment; - /* this is what is stored in TEB->ReservedForOle */ struct oletls { @@ -95,14 +93,8 @@ static inline struct apartment * COM_CurrentApt(void) return COM_CurrentInfo()->apt; } -/* helpers for debugging */ -# define DEBUG_SET_CRITSEC_NAME(cs, name) (cs)->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": " name) -# define DEBUG_CLEAR_CRITSEC_NAME(cs) (cs)->DebugInfo->Spare[0] = 0 - #define CHARS_IN_GUID 39 /* including NULL */ -#define WINE_CLSCTX_DONT_HOST 0x80000000 - /* from dlldata.c */ extern HINSTANCE hProxyDll DECLSPEC_HIDDEN; extern HRESULT WINAPI OLE32_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) DECLSPEC_HIDDEN;

1 0

Alexandre Abgrall : msxml3: Fix value of 'fetched' in IEnumVARIANT::Next() for IXMLDOMSelection.
by Alexandre Julliard 15 Sep '20

15 Sep '20

Module: wine Branch: master Commit: 72f42516b2f324ef9b8f2427c514d9ea152a23b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72f42516b2f324ef9b8f2427… Author: Alexandre Abgrall <aabgrall98(a)gmail.com> Date: Sun Sep 13 14:18:17 2020 +0200 msxml3: Fix value of 'fetched' in IEnumVARIANT::Next() for IXMLDOMSelection. It must be the number of elements returned in 'var', as specified here: https://docs.microsoft.com/en-us/windows/win32/api/oaidl/nf-oaidl-ienumvari… Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40430 Signed-off-by: Alexandre Abgrall <aabgrall98(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/selection.c | 2 +- dlls/msxml3/tests/domdoc.c | 104 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 90 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 31be4d8f10..3698d036d4 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -519,7 +519,7 @@ static HRESULT WINAPI enumvariant_Next( ret_count++; } - if (fetched) (*fetched)++; + if (fetched) *fetched = ret_count; /* we need to advance one step more for some reason */ if (ret_count) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7f3b42d840..5bc32dfff1 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9976,9 +9976,9 @@ static void test_selection(void) IXMLDOMNode *node; IDispatch *disp; VARIANT_BOOL b; + VARIANT v[3]; HRESULT hr; DISPID did; - VARIANT v; BSTR name; ULONG ret; LONG len; @@ -10148,33 +10148,32 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); /* no-op if zero count */ - V_VT(&v) = VT_I2; - hr = IEnumVARIANT_Next(enum1, 0, &v, NULL); + V_VT(&v[0]) = VT_I2; + hr = IEnumVARIANT_Next(enum1, 0, &v[0], NULL); EXPECT_HR(hr, S_OK); - ok(V_VT(&v) == VT_I2, "got var type %d\n", V_VT(&v)); + ok(V_VT(&v[0]) == VT_I2, "got var type %d\n", V_VT(&v[0])); /* positive count, null array pointer */ hr = IEnumVARIANT_Next(enum1, 1, NULL, NULL); EXPECT_HR(hr, E_INVALIDARG); - ret = 1; hr = IEnumVARIANT_Next(enum1, 1, NULL, &ret); EXPECT_HR(hr, E_INVALIDARG); ok(ret == 0, "got %d\n", ret); - V_VT(&v) = VT_I2; - hr = IEnumVARIANT_Next(enum1, 1, &v, NULL); + V_VT(&v[0]) = VT_I2; + hr = IEnumVARIANT_Next(enum1, 1, &v[0], NULL); EXPECT_HR(hr, S_OK); - ok(V_VT(&v) == VT_DISPATCH, "got var type %d\n", V_VT(&v)); + ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0])); - hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IXMLDOMNode, (void**)&node); + hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node); EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &name); EXPECT_HR(hr, S_OK); ok(!lstrcmpW(name, L"a"), "got node name %s\n", wine_dbgstr_w(name)); SysFreeString(name); IXMLDOMNode_Release(node); - VariantClear(&v); + VariantClear(&v[0]); /* list cursor is updated */ hr = IXMLDOMSelection_nextNode(selection, &node); @@ -10185,18 +10184,18 @@ static void test_selection(void) IXMLDOMNode_Release(node); SysFreeString(name); - V_VT(&v) = VT_I2; - hr = IEnumVARIANT_Next(enum1, 1, &v, NULL); + V_VT(&v[0]) = VT_I2; + hr = IEnumVARIANT_Next(enum1, 1, &v[0], NULL); EXPECT_HR(hr, S_OK); - ok(V_VT(&v) == VT_DISPATCH, "got var type %d\n", V_VT(&v)); - hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IXMLDOMNode, (void**)&node); + ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0])); + hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node); EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &name); EXPECT_HR(hr, S_OK); ok(!lstrcmpW(name, L"b"), "got node name %s\n", wine_dbgstr_w(name)); SysFreeString(name); IXMLDOMNode_Release(node); - VariantClear(&v); + VariantClear(&v[0]); IEnumVARIANT_Release(enum1); hr = IXMLDOMSelection_nextNode(selection, &node); @@ -10207,6 +10206,81 @@ static void test_selection(void) IXMLDOMNode_Release(node); SysFreeString(name); + /* getting multiple elements */ + enum1 = NULL; + hr = IXMLDOMSelection_get__newEnum(selection, (IUnknown**)&enum1); + EXPECT_HR(hr, S_OK); + ok(enum1 != NULL, "got %p\n", enum1); + + V_VT(&v[1]) = VT_EMPTY; + V_VT(&v[0]) = VT_EMPTY; + hr = IEnumVARIANT_Next(enum1, 2, v, &ret); + EXPECT_HR(hr, S_OK); + ok(ret == 2, "got %d, expected 2\n", ret); + ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0])); + ok(V_VT(&v[1]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[1])); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, L"a"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v[1]), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + ok(!lstrcmpW(name, L"b"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + VariantClear(&v[1]); + VariantClear(&v[0]); + + /* IEnumVARIANT_Next makes the IXMLDOMSelection cursor advance one step more */ + hr = IXMLDOMSelection_nextNode(selection, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, L"d"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + /* The IEnumVARIANT cursor is still at position '2', */ + /* therefore attempting to fetch 4 elements yields 'c' and 'd' */ + V_VT(&v[2]) = VT_NULL; + V_VT(&v[1]) = VT_EMPTY; + V_VT(&v[0]) = VT_EMPTY; + hr = IEnumVARIANT_Next(enum1, 4, v, &ret); + EXPECT_HR(hr, S_FALSE); + ok(ret == 2, "got %d, expected 2\n", ret); + + ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0])); + hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, L"c"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + ok(V_VT(&v[1]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[1])); + hr = IDispatch_QueryInterface(V_DISPATCH(&v[1]), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, L"d"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + ok(V_VT(&v[2]) == VT_EMPTY, "got var type %d, expected %d (VT_EMPTY)\n", V_VT(&v[2]), VT_EMPTY); + + VariantClear(&v[1]); + VariantClear(&v[0]); + + IEnumVARIANT_Release(enum1); + IXMLDOMSelection_Release(selection); IXMLDOMNodeList_Release(list); IXMLDOMDocument_Release(doc);

1 0

Myah Caron : shell32: Add ShellLinkObject stubs.
by Alexandre Julliard 15 Sep '20

15 Sep '20

Module: wine Branch: master Commit: 1c26b3dc759e7784bf98a2484e4fb5959259e52b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c26b3dc759e7784bf98a248… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Mon Sep 14 20:52:16 2020 +0000 shell32: Add ShellLinkObject stubs. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.h | 1 + dlls/shell32/shelldispatch.c | 297 ++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shelldispatch.c | 149 +++++++++++++++++++ 3 files changed, 444 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1c26b3dc759e7784bf98…

1 0

Myah Caron : shell32: Implement ShellLinkObject::get_Path.
by Alexandre Julliard 15 Sep '20

15 Sep '20

Module: wine Branch: master Commit: 4c99e3ef341a6b4eda67dffa13a86829fa343bbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c99e3ef341a6b4eda67dffa… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Mon Sep 14 20:52:47 2020 +0000 shell32: Implement ShellLinkObject::get_Path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49591 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 53 ++++++++++++++++++++++++++++++++++---- dlls/shell32/tests/shelldispatch.c | 2 +- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 5eda5c76ee..de581dec42 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -106,6 +106,8 @@ typedef struct { typedef struct { IShellLinkDual2 IShellLinkDual2_iface; LONG ref; + + IShellLinkW *shell_link; } ShellLinkObjectImpl; static inline ShellDispatch *impl_from_IShellDispatch6(IShellDispatch6 *iface) @@ -671,6 +673,7 @@ static ULONG WINAPI ShellLinkObject_Release(IShellLinkDual2 *iface) if (!ref) { + if (This->shell_link) IShellLinkW_Release(This->shell_link); heap_free(This); } return ref; @@ -732,9 +735,20 @@ static HRESULT WINAPI ShellLinkObject_Invoke(IShellLinkDual2 *iface, DISPID disp static HRESULT WINAPI ShellLinkObject_get_Path(IShellLinkDual2 *iface, BSTR *pbs) { - FIXME("(%p, %p)\n", iface, pbs); + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + WCHAR path[MAX_PATH]; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %p)\n", iface, pbs); + + *pbs = NULL; + + hr = IShellLinkW_GetPath(This->shell_link, path, MAX_PATH, NULL, 0); + if (hr != S_OK) + return hr; + + *pbs = SysAllocString(path); + return hr; } static HRESULT WINAPI ShellLinkObject_put_Path(IShellLinkDual2 *iface, BSTR bs) @@ -878,11 +892,13 @@ static const IShellLinkDual2Vtbl ShellLinkObjectVtbl = { ShellLinkObject_get_Target, }; -static HRESULT ShellLinkObject_Constructor(IShellLinkDual2 **link) +static HRESULT ShellLinkObject_Constructor(FolderItemImpl *item, IShellLinkDual2 **link) { + HRESULT hr; + IPersistFile *persist_file = NULL; ShellLinkObjectImpl *This; - FIXME("(%p)\n", link); + TRACE("(%p, %p)\n", item, link); *link = NULL; @@ -891,6 +907,33 @@ static HRESULT ShellLinkObject_Constructor(IShellLinkDual2 **link) This->IShellLinkDual2_iface.lpVtbl = &ShellLinkObjectVtbl; This->ref = 1; + This->shell_link = NULL; + hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, (LPVOID*)&This->shell_link); + if (FAILED(hr)) + { + heap_free(This); + return hr; + } + + hr = IShellLinkW_QueryInterface(This->shell_link, &IID_IPersistFile, + (LPVOID*)&persist_file); + if (FAILED(hr)) + { + IShellLinkW_Release(This->shell_link); + heap_free(This); + return hr; + } + + hr = IPersistFile_Load(persist_file, item->path, STGM_READ); + IPersistFile_Release(persist_file); + if (FAILED(hr)) + { + IShellLinkW_Release(This->shell_link); + heap_free(This); + return hr; + } + *link = (IShellLinkDual2 *)&This->IShellLinkDual2_iface; return S_OK; } @@ -1092,7 +1135,7 @@ static HRESULT WINAPI FolderItemImpl_get_GetLink(FolderItem2 *iface, if (!(This->attributes & SFGAO_LINK)) return E_NOTIMPL; - hr = ShellLinkObject_Constructor(&link); + hr = ShellLinkObject_Constructor(This, &link); if (hr != S_OK) return hr; diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index ae1cf08627..33ada2d80c 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1500,7 +1500,7 @@ static void test_ShellLinkObject(void) str = NULL; hr = IShellLinkDual2_get_Path(sld, &str); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { ok(!wcscmp(str, empty_path), "got %s (wanted %s)\n", wine_dbgstr_w(str), wine_dbgstr_w(empty_path));

1 0

Robert Wilhelm : vbscript: Parse decimal literals between -1 and 1 without 0 in front.
by Alexandre Julliard 15 Sep '20

15 Sep '20

Module: wine Branch: master Commit: a31023a67812714f503250dc25abbc086439790a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a31023a67812714f503250dc… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Sep 15 13:33:38 2020 +0200 vbscript: Parse decimal literals between -1 and 1 without 0 in front. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49820 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 11 +++++++++-- dlls/vbscript/tests/lang.vbs | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 5b93739d02..251374d90e 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -393,11 +393,18 @@ static int parse_next_token(void *lval, unsigned *loc, parser_ctx_t *ctx) /* * We need to distinguish between '.' used as part of a member expression and * a beginning of a dot expression (a member expression accessing with statement - * expression). + * expression) and a floating point number like ".2" . */ c = ctx->ptr > ctx->code ? ctx->ptr[-1] : '\n'; + if (is_identifier_char(c) || c == ')') { + ctx->ptr++; + return '.'; + } + c = ctx->ptr[1]; + if('0' <= c && c <= '9') + return parse_numeric_literal(ctx, lval); ctx->ptr++; - return is_identifier_char(c) || c == ')' ? '.' : tDOT; + return tDOT; case '-': if(ctx->is_html && ctx->ptr[1] == '-' && ctx->ptr[2] == '>') return comment_line(ctx); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 0d752121b2..621b390523 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -47,6 +47,8 @@ Call ok(56.789e-2 = 0.56789, "56.789e-2 <> 0.56789") Call ok(1e-94938484 = 0, "1e-... <> 0") Call ok(34e0 = 34, "34e0 <> 34") Call ok(34E1 = 340, "34E0 <> 340") +Call ok(.5 = 0.5, ".5 <> 0.5") +Call ok(.5e1 = 5, ".5e1 <> 5") Call ok(--1 = 1, "--1 = " & --1) Call ok(-empty = 0, "-empty = " & (-empty)) Call ok(true = -1, "! true = -1") @@ -86,6 +88,7 @@ Call ok(getVT(null) = "VT_NULL", "getVT(null) is not VT_NULL") Call ok(getVT(0) = "VT_I2", "getVT(0) is not VT_I2") Call ok(getVT(1) = "VT_I2", "getVT(1) is not VT_I2") Call ok(getVT(0.5) = "VT_R8", "getVT(0.5) is not VT_R8") +Call ok(getVT(.5) = "VT_R8", "getVT(.5) is not VT_R8") Call ok(getVT(0.0) = "VT_R8", "getVT(0.0) is not VT_R8") Call ok(getVT(2147483647) = "VT_I4", "getVT(2147483647) is not VT_I4") Call ok(getVT(2147483648) = "VT_R8", "getVT(2147483648) is not VT_R8")

1 0

Alexandre Julliard : winetest: Fix winetest.exe make command for non-recursive makefile.
by Alexandre Julliard 15 Sep '20

15 Sep '20

Module: tools Branch: master Commit: a73364b2c50fa4916e0926d0836b1f507fe8200d URL: https://source.winehq.org/git/tools.git/?a=commit;h=a73364b2c50fa4916e0926d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 14 22:08:12 2020 +0200 winetest: Fix winetest.exe make command for non-recursive makefile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/make-winetest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/make-winetest b/winetest/make-winetest index 13c97c5..8f099a5 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -99,7 +99,7 @@ umask 022 # then cross-compile the tests - (cd build64 && make programs/winetest) || exit + (cd build64 && make programs/winetest/winetest.exe) || exit test -d build32 || (mkdir build32 && @@ -108,7 +108,7 @@ umask 022 (cd build32 && make depend && - make programs/winetest && + make programs/winetest/winetest.exe && upx -9 -qq programs/winetest/winetest.exe) || exit # install everything

1 0