October 2017 - Wine-commits

André Hentschel : mpr/tests: Allow values from Win8+.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: 4981d7fb0a20d5657556204a2da4ee1140a39efe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4981d7fb0a20d5657556204a2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Oct 21 21:08:18 2017 +0200 mpr/tests: Allow values from Win8+. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/tests/mpr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 364ac2c..a6af1b5 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -55,7 +55,7 @@ static void test_WNetGetUniversalName(void) ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, buffer, &fail_size); if(drive_type == DRIVE_REMOTE) - todo_wine ok(ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret); + todo_wine ok(ret == WN_BAD_VALUE || ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameW gave wrong error: %u\n", driveA, ret); @@ -115,7 +115,7 @@ static void test_WNetGetRemoteName(void) buffer, &fail_size); todo_wine{ if(drive_type == DRIVE_REMOTE) - ok(ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret); + ok(ret == WN_BAD_VALUE || ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); @@ -129,7 +129,7 @@ static void test_WNetGetRemoteName(void) todo_wine { if(drive_type == DRIVE_REMOTE) - ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); + ok(ret == WN_BAD_POINTER || ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret);

1 0

Nikolay Sivov : ntdll: Added RtlDosPathNameToNtPathName_U_WithStatus().
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: 86370cc3452006466e4499443e3b34ba9c0e2d4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=86370cc3452006466e4499443… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 23 09:48:21 2017 +0300 ntdll: Added RtlDosPathNameToNtPathName_U_WithStatus(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/path.c | 43 +++++++++++++++++++++++++++---------------- dlls/ntdll/tests/path.c | 33 ++++++++++++++++++++++++++++++++- include/winternl.h | 1 + 4 files changed, 61 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 50f4acf..95581ec 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -560,6 +560,7 @@ @ stdcall RtlDoesFileExists_U(wstr) # @ stub RtlDosApplyFileIsolationRedirection_Ustr @ stdcall RtlDosPathNameToNtPathName_U(wstr ptr ptr ptr) +@ stdcall RtlDosPathNameToNtPathName_U_WithStatus(wstr ptr ptr ptr) @ stdcall RtlDosSearchPath_U(wstr wstr wstr long ptr ptr) # @ stub RtlDosSearchPath_Ustr @ stdcall RtlDowncaseUnicodeChar(long) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index e76ce3f..f3dc93f 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -325,9 +325,8 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name ) return 0; } - /************************************************************************** - * RtlDosPathNameToNtPathName_U [NTDLL.@] + * RtlDosPathNameToNtPathName_U_WithStatus [NTDLL.@] * * dos_path: a DOS path name (fully qualified or not) * ntpath: pointer to a UNICODE_STRING to hold the converted @@ -338,18 +337,15 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name ) * FIXME: * + fill the cd structure */ -BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR dos_path, - PUNICODE_STRING ntpath, - PWSTR* file_part, - CURDIR* cd) +NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, UNICODE_STRING *ntpath, + WCHAR **file_part, CURDIR *cd) { static const WCHAR LongFileNamePfxW[] = {'\\','\\','?','\\'}; ULONG sz, offset; WCHAR local[MAX_PATH]; LPWSTR ptr; - TRACE("(%s,%p,%p,%p)\n", - debugstr_w(dos_path), ntpath, file_part, cd); + TRACE("(%s,%p,%p,%p)\n", debugstr_w(dos_path), ntpath, file_part, cd); if (cd) { @@ -357,14 +353,15 @@ BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR dos_path, memset(cd, 0, sizeof(*cd)); } - if (!dos_path || !*dos_path) return FALSE; + if (!dos_path || !*dos_path) + return STATUS_OBJECT_NAME_INVALID; if (!strncmpW(dos_path, LongFileNamePfxW, 4)) { ntpath->Length = strlenW(dos_path) * sizeof(WCHAR); ntpath->MaximumLength = ntpath->Length + sizeof(WCHAR); ntpath->Buffer = RtlAllocateHeap(GetProcessHeap(), 0, ntpath->MaximumLength); - if (!ntpath->Buffer) return FALSE; + if (!ntpath->Buffer) return STATUS_NO_MEMORY; memcpy( ntpath->Buffer, dos_path, ntpath->MaximumLength ); ntpath->Buffer[1] = '?'; /* change \\?\ to \??\ */ if (file_part) @@ -372,22 +369,23 @@ BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR dos_path, if ((ptr = strrchrW( ntpath->Buffer, '\\' )) && ptr[1]) *file_part = ptr + 1; else *file_part = NULL; } - return TRUE; + return STATUS_SUCCESS; } ptr = local; sz = RtlGetFullPathName_U(dos_path, sizeof(local), ptr, file_part); - if (sz == 0) return FALSE; + if (sz == 0) return STATUS_OBJECT_NAME_INVALID; + if (sz > sizeof(local)) { - if (!(ptr = RtlAllocateHeap(GetProcessHeap(), 0, sz))) return FALSE; + if (!(ptr = RtlAllocateHeap(GetProcessHeap(), 0, sz))) return STATUS_NO_MEMORY; sz = RtlGetFullPathName_U(dos_path, sz, ptr, file_part); } sz += (1 /* NUL */ + 4 /* unc\ */ + 4 /* \??\ */) * sizeof(WCHAR); if (sz > MAXWORD) { if (ptr != local) RtlFreeHeap(GetProcessHeap(), 0, ptr); - return FALSE; + return STATUS_OBJECT_NAME_INVALID; } ntpath->MaximumLength = sz; @@ -395,7 +393,7 @@ BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR dos_path, if (!ntpath->Buffer) { if (ptr != local) RtlFreeHeap(GetProcessHeap(), 0, ptr); - return FALSE; + return STATUS_NO_MEMORY; } strcpyW(ntpath->Buffer, NTDosPrefixW); @@ -422,7 +420,20 @@ BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR dos_path, /* FIXME: cd filling */ if (ptr != local) RtlFreeHeap(GetProcessHeap(), 0, ptr); - return TRUE; + return STATUS_SUCCESS; +} + +/************************************************************************** + * RtlDosPathNameToNtPathName_U [NTDLL.@] + * + * See RtlDosPathNameToNtPathName_U_WithStatus + */ +BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR dos_path, + PUNICODE_STRING ntpath, + PWSTR* file_part, + CURDIR* cd) +{ + return RtlDosPathNameToNtPathName_U_WithStatus(dos_path, ntpath, file_part, cd) == STATUS_SUCCESS; } /****************************************************************** diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index c19189d..9369e1c 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -28,7 +28,7 @@ static ULONG (WINAPI *pRtlIsDosDeviceName_U)( PCWSTR dos_name ); static NTSTATUS (WINAPI *pRtlOemStringToUnicodeString)(UNICODE_STRING *, const STRING *, BOOLEAN ); static BOOLEAN (WINAPI *pRtlIsNameLegalDOS8Dot3)(const UNICODE_STRING*,POEM_STRING,PBOOLEAN); static DWORD (WINAPI *pRtlGetFullPathName_U)(const WCHAR*,ULONG,WCHAR*,WCHAR**); - +static NTSTATUS (WINAPI *pRtlDosPathNameToNtPathName_U_WithStatus)(const WCHAR*, UNICODE_STRING*, WCHAR**, CURDIR*); static void test_RtlDetermineDosPathNameType_U(void) { @@ -343,6 +343,35 @@ static void test_RtlGetFullPathName_U(void) } } +static void test_RtlDosPathNameToNtPathName_U_WithStatus(void) +{ + static const WCHAR emptyW[] = { 0 }; + WCHAR path[MAX_PATH]; + UNICODE_STRING nameW; + NTSTATUS status; + + if (!pRtlDosPathNameToNtPathName_U_WithStatus) + { + win_skip("RtlDosPathNameToNtPathName_U_WithStatus() is not supported.\n"); + return; + } + + GetCurrentDirectoryW( MAX_PATH, path ); + + status = pRtlDosPathNameToNtPathName_U_WithStatus( path, &nameW, NULL, NULL ); + ok(!status, "Failed convert to nt path, %#x.\n", status); + + status = pRtlDosPathNameToNtPathName_U_WithStatus( NULL, &nameW, NULL, NULL ); + ok(status == STATUS_OBJECT_NAME_INVALID || broken(status == STATUS_OBJECT_PATH_NOT_FOUND) /* W2k3 */, + "Unexpected status %#x.\n", status); + + status = pRtlDosPathNameToNtPathName_U_WithStatus( emptyW, &nameW, NULL, NULL ); + ok(status == STATUS_OBJECT_NAME_INVALID || broken(status == STATUS_OBJECT_PATH_NOT_FOUND) /* W2k3 */, + "Unexpected status %#x.\n", status); + + RtlFreeUnicodeString( &nameW ); +} + START_TEST(path) { HMODULE mod = GetModuleHandleA("ntdll.dll"); @@ -359,9 +388,11 @@ START_TEST(path) pRtlOemStringToUnicodeString = (void *)GetProcAddress(mod,"RtlOemStringToUnicodeString"); pRtlIsNameLegalDOS8Dot3 = (void *)GetProcAddress(mod,"RtlIsNameLegalDOS8Dot3"); pRtlGetFullPathName_U = (void *)GetProcAddress(mod,"RtlGetFullPathName_U"); + pRtlDosPathNameToNtPathName_U_WithStatus = (void *)GetProcAddress(mod, "RtlDosPathNameToNtPathName_U_WithStatus"); test_RtlDetermineDosPathNameType_U(); test_RtlIsDosDeviceName_U(); test_RtlIsNameLegalDOS8Dot3(); test_RtlGetFullPathName_U(); + test_RtlDosPathNameToNtPathName_U_WithStatus(); } diff --git a/include/winternl.h b/include/winternl.h index ec8b387..571296f 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2508,6 +2508,7 @@ NTSYSAPI DOS_PATHNAME_TYPE WINAPI RtlDetermineDosPathNameType_U(PCWSTR); NTSYSAPI BOOLEAN WINAPI RtlDllShutdownInProgress(void); NTSYSAPI BOOLEAN WINAPI RtlDoesFileExists_U(LPCWSTR); NTSYSAPI BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR,PUNICODE_STRING,PWSTR*,CURDIR*); +NTSYSAPI NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(PCWSTR,PUNICODE_STRING,PWSTR*,CURDIR*); NTSYSAPI ULONG WINAPI RtlDosSearchPath_U(LPCWSTR, LPCWSTR, LPCWSTR, ULONG, LPWSTR, LPWSTR*); NTSYSAPI WCHAR WINAPI RtlDowncaseUnicodeChar(WCHAR); NTSYSAPI NTSTATUS WINAPI RtlDowncaseUnicodeString(UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN);

1 0

Nikolay Sivov : ntdll: RtlGetCurrentDirectory_U() returns length, not status.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: 3a3392acc60e892f123f469b85c405437897d7fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a3392acc60e892f123f469b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 23 09:48:22 2017 +0300 ntdll: RtlGetCurrentDirectory_U() returns length, not status. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 2 +- include/winternl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index f3dc93f..3062787 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -924,7 +924,7 @@ BOOLEAN WINAPI RtlIsNameLegalDOS8Dot3( const UNICODE_STRING *unicode, * RtlGetCurrentDirectory_U (NTDLL.@) * */ -NTSTATUS WINAPI RtlGetCurrentDirectory_U(ULONG buflen, LPWSTR buf) +ULONG WINAPI RtlGetCurrentDirectory_U(ULONG buflen, LPWSTR buf) { UNICODE_STRING* us; ULONG len; diff --git a/include/winternl.h b/include/winternl.h index 571296f..322d111 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2560,7 +2560,7 @@ NTSYSAPI NTSTATUS WINAPI RtlGetAce(PACL,DWORD,LPVOID *); NTSYSAPI NTSTATUS WINAPI RtlGetActiveActivationContext(HANDLE*); NTSYSAPI NTSTATUS WINAPI RtlGetCompressionWorkSpaceSize(USHORT,PULONG,PULONG); NTSYSAPI NTSTATUS WINAPI RtlGetControlSecurityDescriptor(PSECURITY_DESCRIPTOR, PSECURITY_DESCRIPTOR_CONTROL,LPDWORD); -NTSYSAPI NTSTATUS WINAPI RtlGetCurrentDirectory_U(ULONG, LPWSTR); +NTSYSAPI ULONG WINAPI RtlGetCurrentDirectory_U(ULONG, LPWSTR); NTSYSAPI PEB * WINAPI RtlGetCurrentPeb(void); NTSYSAPI NTSTATUS WINAPI RtlGetDaclSecurityDescriptor(PSECURITY_DESCRIPTOR,PBOOLEAN,PACL *,PBOOLEAN); NTSYSAPI ULONG WINAPI RtlGetFullPathName_U(PCWSTR,ULONG,PWSTR,PWSTR*);

1 0

Nikolay Sivov : msxml3: Partially implement transformNodeToObject().
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: 41365ce72cbc09e04c2a9abf50d5ee179cec92bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=41365ce72cbc09e04c2a9abf5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 23 09:53:27 2017 +0300 msxml3: Partially implement transformNodeToObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 42 +++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 62b48fc..a40fac2 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1506,10 +1506,48 @@ static HRESULT WINAPI domdoc_get_baseName( static HRESULT WINAPI domdoc_transformNodeToObject( IXMLDOMDocument3 *iface, IXMLDOMNode* stylesheet, - VARIANT outputObject) + VARIANT output) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - FIXME("(%p)->(%p %s)\n", This, stylesheet, debugstr_variant(&outputObject)); + + TRACE("(%p)->(%p %s)\n", This, stylesheet, debugstr_variant(&output)); + + switch (V_VT(&output)) + { + case VT_UNKNOWN: + case VT_DISPATCH: + { + IXMLDOMDocument *doc; + HRESULT hr; + + if (!V_UNKNOWN(&output)) + return E_INVALIDARG; + + /* FIXME: we're not supposed to query for document interface, should use IStream + which we don't support currently. */ + if (IUnknown_QueryInterface(V_UNKNOWN(&output), &IID_IXMLDOMDocument, (void **)&doc) == S_OK) + { + VARIANT_BOOL b; + BSTR str; + + if (FAILED(hr = node_transform_node(&This->node, stylesheet, &str))) + return hr; + + hr = IXMLDOMDocument_loadXML(doc, str, &b); + SysFreeString(str); + return hr; + } + else + { + FIXME("Unsupported destination type.\n"); + return E_INVALIDARG; + } + } + default: + FIXME("Output type %d not handled.\n", V_VT(&output)); + return E_NOTIMPL; + } + return E_NOTIMPL; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index fa10a36..9a607e3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -36,6 +36,7 @@ #include "ole2.h" #include "dispex.h" #include "objsafe.h" +#include "mshtml.h" #include "initguid.h" #include "asptlb.h" @@ -45,6 +46,7 @@ #undef CLSID_DOMDocument DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +DEFINE_GUID(IID_transformdest_unknown,0xf5078f3a,0xc551,0x11d3,0x89,0xb9,0x00,0x00,0xf8,0x1f,0xe2,0x21); static int g_unexpectedcall, g_expectedcall; @@ -12559,6 +12561,81 @@ static void test_merging_text(void) free_bstrs(); } +static HRESULT WINAPI transformdest_QueryInterface(IUnknown *iface, REFIID riid, void **obj) +{ + BOOL known_iid = IsEqualIID(riid, &IID_IHTMLObjectElement) || + IsEqualIID(riid, &IID_transformdest_unknown) || + IsEqualIID(riid, &IID_IServiceProvider) || + IsEqualIID(riid, &IID_IStream) || + IsEqualIID(riid, &IID_ISequentialStream) || + IsEqualIID(riid, &IID_IRequestDictionary); + +todo_wine_if(IsEqualIID(riid, &IID_IXMLDOMDocument)) + ok(known_iid, "Unexpected riid %s\n", wine_dbgstr_guid(riid)); + + return E_NOINTERFACE; +} + +static ULONG WINAPI transformdest_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI transformdest_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl transformdestvtbl = +{ + transformdest_QueryInterface, + transformdest_AddRef, + transformdest_Release, +}; + +static void test_transformNodeToObject(void) +{ + IUnknown transformdest = { &transformdestvtbl }; + IXMLDOMDocument *doc, *doc2, *doc3; + VARIANT_BOOL b; + HRESULT hr; + VARIANT v; + + doc = create_document(&IID_IXMLDOMDocument); + doc2 = create_document(&IID_IXMLDOMDocument); + doc3 = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(szTransformXML), &b); + ok(hr == S_OK, "Failed to load document, hr %#x.\n", hr); + hr = IXMLDOMDocument_loadXML(doc2, _bstr_(szTransformSSXML), &b); + ok(hr == S_OK, "Failed to load document, hr %#x.\n", hr); + + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = &transformdest; + hr = IXMLDOMDocument_transformNodeToObject(doc, (IXMLDOMNode *)doc2, v); + ok(hr == E_INVALIDARG, "Failed to transform node, hr %#x.\n", hr); + + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = NULL; + hr = IXMLDOMDocument_transformNodeToObject(doc, (IXMLDOMNode *)doc2, v); + ok(hr == E_INVALIDARG, "Failed to transform node, hr %#x.\n", hr); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + hr = IXMLDOMDocument_transformNodeToObject(doc, (IXMLDOMNode *)doc2, v); + ok(hr == E_INVALIDARG, "Failed to transform node, hr %#x.\n", hr); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch *)doc3; + hr = IXMLDOMDocument_transformNodeToObject(doc, (IXMLDOMNode *)doc2, v); + ok(hr == S_OK, "Failed to transform node, hr %#x.\n", hr); + + IXMLDOMDocument_Release(doc3); + IXMLDOMDocument_Release(doc2); + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { HRESULT hr; @@ -12640,6 +12717,7 @@ START_TEST(domdoc) test_xmlns_attribute(); test_url(); test_merging_text(); + test_transformNodeToObject(); test_xsltemplate(); test_xsltext();

1 0

Piotr Caban : msi: Improve feature action value evaluation in conditions.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: b141a145c49f1ad6cb6eef1781e08e8aaaa393ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b141a145c49f1ad6cb6eef178… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 20 22:18:25 2017 +0200 msi: Improve feature action value evaluation in conditions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/cond.y | 9 ++++++--- dlls/msi/tests/package.c | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index fa55825..079bbd9 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -318,11 +318,14 @@ value_i: | COND_AMPER identifier { COND_input* cond = (COND_input*) info; - INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN; + INSTALLSTATE install, action; - MSI_GetFeatureStateW(cond->package, $2, &install, &action ); - if (action == INSTALLSTATE_UNKNOWN) + if (MSI_GetFeatureStateW(cond->package, $2, &install, &action ) != ERROR_SUCCESS) + { + FIXME("condition may be evaluated incorrectly\n"); + /* we should return empty string in this case */ $$ = MSICONDITION_FALSE; + } else $$ = action; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 1f04cef..0dafd7c 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2069,6 +2069,8 @@ static void test_condition(void) /* feature doesn't exist */ r = MsiEvaluateConditionA(hpkg, "&nofeature"); ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + r = MsiEvaluateConditionA(hpkg, "&nofeature=\"\""); + todo_wine ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); MsiSetPropertyA(hpkg, "A", "2"); MsiSetPropertyA(hpkg, "X", "50");

1 0

Piotr Caban : msi: Improve "full uninstall" detection code.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: c41b8ce5c360d2e602a7ad26e271e29c18759d5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41b8ce5c360d2e602a7ad26e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 20 22:18:33 2017 +0200 msi: Improve "full uninstall" detection code. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index da7af06..217d1dc 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5351,25 +5351,16 @@ static UINT ACTION_UnpublishProduct(MSIPACKAGE *package) static BOOL is_full_uninstall( MSIPACKAGE *package ) { - WCHAR **features, *remove = msi_dup_property( package->db, szRemove ); MSIFEATURE *feature; - BOOL ret = TRUE; - UINT i; LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - if (feature->Action == INSTALLSTATE_LOCAL || feature->Action == INSTALLSTATE_SOURCE) ret = FALSE; - } - - features = msi_split_string( remove, ',' ); - for (i = 0; features && features[i]; i++) - { - if (!strcmpW( features[i], szAll )) ret = TRUE; + if (feature->Action != INSTALLSTATE_ABSENT && + (feature->Installed != INSTALLSTATE_ABSENT || feature->Action != INSTALLSTATE_UNKNOWN)) + return FALSE; } - msi_free(features); - msi_free(remove); - return ret; + return TRUE; } static UINT ACTION_InstallFinalize(MSIPACKAGE *package)

1 0

Francois Gouget : testbot: Validate and adjust the VM limits on startup.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: tools Branch: master Commit: e01735f547e5af2492742217cc1feb9f44155fa7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e01735f547e5af2492742217… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 23 16:06:12 2017 +0200 testbot: Validate and adjust the VM limits on startup. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 15 +++++++++++++++ testbot/lib/WineTestBot/Jobs.pm | 5 ++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index fe16f17..4840449 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -700,6 +700,21 @@ sub main() $WineTestBot::Engine::Notify::RunningInEngine = 1; LogMsg "Starting the WineTestBot Engine\n"; + # Validate and adjust the configuration options + $MaxActiveVMs ||= 1; + $MaxRevertingVMs ||= $MaxActiveVMs; + if ($MaxRevertingVMs > $MaxActiveVMs) + { + $MaxRevertingVMs = $MaxActiveVMs; + LogMsg "Capping MaxRevertingVMs to MaxActiveVMs ($MaxRevertingVMs)\n"; + } + $MaxRevertsWhileRunningVMs ||= 0; + if ($MaxRevertsWhileRunningVMs > $MaxRevertingVMs) + { + $MaxRevertsWhileRunningVMs = $MaxRevertingVMs; + LogMsg "Capping MaxRevertsWhileRunningVMs to MaxRevertingVMs ($MaxRevertsWhileRunningVMs)\n"; + } + $MaxVMsWhenIdle ||= $MaxActiveVMs; Cleanup(); # Check for patches that arrived while the server was off. diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 3a3e517..3c7ce0d 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -691,15 +691,14 @@ sub ScheduleOnHost($$$) } # Finally, if we are otherwise idle, prepare some VMs for future jobs - my $MaxIdleVMs = defined $MaxVMsWhenIdle ? $MaxVMsWhenIdle : $MaxActiveVMs; - if ($ActiveCount - $IdleCount == 0 && $ActiveCount < $MaxIdleVMs) + if ($ActiveCount == $IdleCount && $ActiveCount < $MaxVMsWhenIdle) { # Sort from most important to least important my @SortedVMs = sort { $VMPriorities{$b} <=> $VMPriorities{$a} } keys %VMPriorities; foreach my $VMKey (@SortedVMs) { last if ($RevertingCount == $MaxReverts); - last if ($ActiveCount >= $MaxIdleVMs); + last if ($ActiveCount >= $MaxVMsWhenIdle); my $VM = $HostVMs->GetItem($VMKey); next if ($VM->Status ne "off");

1 0

Francois Gouget : testbot/LibvirtTool: PowerOff() no longer takes a NoStatus parameter.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: tools Branch: master Commit: 4962763b8f2996f415f880b3914d308cd19c255e URL: http://source.winehq.org/git/tools.git/?a=commit;h=4962763b8f2996f415f880b3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 23 16:35:13 2017 +0200 testbot/LibvirtTool: PowerOff() no longer takes a NoStatus parameter. NoStatus=1 has been made the default so this is a no-op. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 51f03b4..937821f 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -280,7 +280,7 @@ sub Monitor() my $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); if ($IsPoweredOn) { - my $ErrMessage = $VM->GetDomain()->PowerOff(1); + my $ErrMessage = $VM->GetDomain()->PowerOff(); if (defined $ErrMessage) { Error "$ErrMessage\n";

1 0

Francois Gouget : testbot: Set the task status to running when running.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: tools Branch: master Commit: 4a99b2677425e91add1bb5ae1d84ccd23415a2fa URL: http://source.winehq.org/git/tools.git/?a=commit;h=4a99b2677425e91add1bb5ae… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 23 16:35:28 2017 +0200 testbot: Set the task status to running when running. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Tasks.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index bbb5d56..32e41e4 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -110,6 +110,7 @@ sub Run($$) my $ErrMessage = $self->VM->Run("running", $Args, \&_SetupTask, $self); if (!$ErrMessage) { + $self->Status("running"); $self->Started(time()); my $_ErrProperty; ($_ErrProperty, $ErrMessage) = $self->Save();

1 0

Rosanne DiMesio : Update Downloads page
by Jeremy Newman 23 Oct '17

23 Oct '17

Module: website Branch: master Commit: 1c50b673f07c7ad046cdd3ab9949aef15ea36d59 URL: http://source.winehq.org/git/website.git/?a=commit;h=1c50b673f07c7ad046cdd3… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Sun Oct 22 16:51:22 2017 -0500 Update Downloads page Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/en/download.template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/en/download.template b/templates/en/download.template index d275068..27351b6 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -71,11 +71,13 @@ <div class="col-md-2 hidden-xs hidden-sm padding-lg"><img src="{$root}/images/winehq_logo_glass.png" alt="WineHQ" class="fill-width"></div> <div class="col-md-10"> <a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a> - - WineHQ binary packages for Ubuntu 14.04, 16.04, 16.10, and 17.04 + - WineHQ binary packages for Ubuntu 14.04, 16.04, 16.10, 17.04, and 17.10 <a href="https://wiki.winehq.org/Debian">Debian</a> - WineHQ binary packages for Debian Wheezy, Jessie, Stretch, Buster, and Sid <a href="https://wiki.winehq.org/Fedora">Fedora</a> - WineHQ binary packages for Fedora 24, 25, and 26 + <a href="https://wiki.winehq.org/Mageia">Mageia</a> + - WineHQ binary packages for Mageia 6 <a href="https://wiki.winehq.org/MacOSX">macOS</a> - WineHQ binary packages for macOS 10.8 and higher </div>

1 0