Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 74824: [NETAPI32_WINETEST] Sync with Wine Staging 2.9. CORE-13362
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 22:31:54 2017 New Revision: 74824 URL: http://svn.reactos.org/svn/reactos?rev=74824&view=rev Log: [NETAPI32_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/netapi32/access.c Modified: trunk/rostests/winetests/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/access… ============================================================================== --- trunk/rostests/winetests/netapi32/access.c [iso-8859-1] (original) +++ trunk/rostests/winetests/netapi32/access.c [iso-8859-1] Sat Jun 3 22:31:54 2017 @@ -66,6 +66,7 @@ static NET_API_STATUS (WINAPI *pNetLocalGroupGetInfo)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*); static NET_API_STATUS (WINAPI *pNetLocalGroupGetMembers)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,PDWORD_PTR); static DWORD (WINAPI *pDavGetHTTPFromUNCPath)(LPCWSTR,LPWSTR,LPDWORD); +static DWORD (WINAPI *pDavGetUNCFromHTTPPath)(LPCWSTR,LPWSTR,LPDWORD); static BOOL init_access_tests(void) { @@ -550,6 +551,156 @@ } } +static void test_DavGetUNCFromHTTPPath(void) +{ + static const WCHAR path[] = + {0}; + static const WCHAR path2[] = + {'h','t','t','p',':','/','/','s','e','r','v','e','r','/','p','a','t','h',0}; + static const WCHAR path3[] = + {'h','t','t','p','s',':','/','/','h','o','s','t','/','p','a','t','h',0}; + static const WCHAR path4[] = + {'\\','\\','s','e','r','v','e','r',0}; + static const WCHAR path5[] = + {'\\','\\','s','e','r','v','e','r','\\','p','a','t','h',0}; + static const WCHAR path6[] = + {'\\','\\','h','t','t','p',':','/','/','s','e','r','v','e','r','/','p','a','t','h',0}; + static const WCHAR path7[] = + {'h','t','t','p',':','/','/',0}; + static const WCHAR path8[] = + {'h','t','t','p',':',0}; + static const WCHAR path9[] = + {'h','t','t','p',0}; + static const WCHAR path10[] = + {'h','t','t','p',':','s','e','r','v','e','r',0}; + static const WCHAR path11[] = + {'h','t','t','p',':','/','/','s','e','r','v','e','r',':','8','0',0}; + static const WCHAR path12[] = + {'h','t','t','p',':','/','/','s','e','r','v','e','r',':','8','1',0}; + static const WCHAR path13[] = + {'h','t','t','p','s',':','/','/','s','e','r','v','e','r',':','8','0',0}; + static const WCHAR path14[] = + {'H','T','T','P',':','/','/','s','e','r','v','e','r','/','p','a','t','h',0}; + static const WCHAR path15[] = + {'h','t','t','p',':','/','/','s','e','r','v','e','r',':','6','5','5','3','7',0}; + static const WCHAR path16[] = + {'h','t','t','p',':','/','/','s','e','r','v','e','r','/','p','a','t','h','/',0}; + static const WCHAR path17[] = + {'h','t','t','p',':','/','/','s','e','r','v','e','r','/','p','a','t','h','/','/',0}; + static const WCHAR path18[] = + {'h','t','t','p',':','/','/','s','e','r','v','e','r',':','/','p','a','t','h',0}; + static const WCHAR path19[] = + {'h','t','t','p',':','/','/','s','e','r','v','e','r',0}; + static const WCHAR path20[] = + {'h','t','t','p','s',':','/','/','s','e','r','v','e','r',':','4','4','3',0}; + static const WCHAR path21[] = + {'h','t','t','p','s',':','/','/','s','e','r','v','e','r',':','8','0',0}; + static const WCHAR result[] = + {'\\','\\','s','e','r','v','e','r','\\','D','a','v','W','W','W','R','o','o','t','\\','p','a','t','h',0}; + static const WCHAR result2[] = + {'\\','\\','h','o','s','t','@','S','S','L','\\','D','a','v','W','W','W','R','o','o','t','\\', + 'p','a','t','h',0}; + static const WCHAR result3[] = + {'\\','\\','s','e','r','v','e','r','\\','D','a','v','W','W','W','R','o','o','t',0}; + static const WCHAR result4[] = + {'\\','\\','s','e','r','v','e','r','@','8','1','\\','D','a','v','W','W','W','R','o','o','t',0}; + static const WCHAR result5[] = + {'\\','\\','s','e','r','v','e','r','@','S','S','L','@','8','0','\\','D','a','v','W','W','W','R','o','o','t',0}; + static const WCHAR result6[] = + {'\\','\\','s','e','r','v','e','r','@','6','5','5','3','7','\\','D','a','v','W','W','W','R','o','o','t',0}; + static const WCHAR result7[] = + {'\\','\\','s','e','r','v','e','r','@','\\','D','a','v','W','W','W','R','o','o','t','\\','p','a','t','h',0}; + static const WCHAR result8[] = + {'\\','\\','s','e','r','v','e','r','@','S','S','L','\\','D','a','v','W','W','W','R','o','o','t',0}; + static const WCHAR result9[] = + {'\\','\\','s','e','r','v','e','r','@','S','S','L','@','8','0','\\','D','a','v','W','W','W','R','o','o','t',0}; + static const struct + { + const WCHAR *path; + DWORD size; + DWORD ret; + const WCHAR *ret_path; + DWORD ret_size; + } + tests[] = + { + { path, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, + { path2, MAX_PATH, ERROR_SUCCESS, result, 25 }, + { path3, MAX_PATH, ERROR_SUCCESS, result2, 27 }, + { path4, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, + { path5, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, + { path6, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, + { path7, MAX_PATH, ERROR_BAD_NET_NAME, NULL, MAX_PATH }, + { path8, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, + { path9, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, + { path10, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, + { path11, MAX_PATH, ERROR_SUCCESS, result3, 20 }, + { path12, MAX_PATH, ERROR_SUCCESS, result4, 23 }, + { path13, MAX_PATH, ERROR_SUCCESS, result5, 27 }, + { path14, MAX_PATH, ERROR_SUCCESS, result, 25 }, + { path15, MAX_PATH, ERROR_SUCCESS, result6, 26 }, + { path16, MAX_PATH, ERROR_SUCCESS, result, 25 }, + { path17, MAX_PATH, ERROR_BAD_NET_NAME, NULL, MAX_PATH }, + { path18, MAX_PATH, ERROR_SUCCESS, result7, 26 }, + { path19, MAX_PATH, ERROR_SUCCESS, result3, 20 }, + { path20, MAX_PATH, ERROR_SUCCESS, result8, 24 }, + { path21, MAX_PATH, ERROR_SUCCESS, result9, 27 }, + }; + WCHAR buf[MAX_PATH]; + DWORD i, ret, size; + + if (!pDavGetUNCFromHTTPPath) + { + win_skip( "DavGetUNCFromHTTPPath is missing\n" ); + return; + } + + if (0) { /* crash */ + ret = pDavGetUNCFromHTTPPath( NULL, NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + } + ret = pDavGetUNCFromHTTPPath( path, buf, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + size = 0; + ret = pDavGetUNCFromHTTPPath( path, NULL, &size ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + buf[0] = 0; + size = 0; + ret = pDavGetUNCFromHTTPPath( path, buf, &size ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + if (0) { /* crash */ + ret = pDavGetUNCFromHTTPPath( path2, buf, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + } + size = 0; + ret = pDavGetUNCFromHTTPPath( path2, NULL, &size ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + buf[0] = 0; + size = 0; + ret = pDavGetUNCFromHTTPPath( path2, buf, &size ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + ok( size == 25, "got %u\n", size ); + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + buf[0] = 0; + size = tests[i].size; + ret = pDavGetUNCFromHTTPPath( tests[i].path, buf, &size ); + ok( ret == tests[i].ret, "%u: expected %u got %u\n", i, tests[i].ret, ret ); + if (tests[i].ret_path) + { + ok( !lstrcmpW( buf, tests[i].ret_path ), "%u: expected %s got %s\n", + i, wine_dbgstr_w(tests[i].ret_path), wine_dbgstr_w(buf) ); + } + ok( size == tests[i].ret_size, "%u: expected %u got %u\n", i, tests[i].ret_size, size ); + } +} + + START_TEST(access) { HMODULE hnetapi32=LoadLibraryA("netapi32.dll"); @@ -564,6 +715,7 @@ pNetLocalGroupGetInfo=(void*)GetProcAddress(hnetapi32, "NetLocalGroupGetInfo"); pNetLocalGroupGetMembers=(void*)GetProcAddress(hnetapi32, "NetLocalGroupGetMembers"); pDavGetHTTPFromUNCPath = (void*)GetProcAddress(hnetapi32, "DavGetHTTPFromUNCPath"); + pDavGetUNCFromHTTPPath = (void*)GetProcAddress(hnetapi32, "DavGetUNCFromHTTPPath"); /* These functions were introduced with NT. It's safe to assume that * if one is not available, none are. @@ -583,5 +735,6 @@ } test_DavGetHTTPFromUNCPath(); + test_DavGetUNCFromHTTPPath(); FreeLibrary(hnetapi32); }

1 0

[akhaldi] 74823: [MSXML3_WINETEST] Sync with Wine Staging 2.9. CORE-13362
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 22:31:39 2017 New Revision: 74823 URL: http://svn.reactos.org/svn/reactos?rev=74823&view=rev Log: [MSXML3_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/msxml3/domdoc.c trunk/rostests/winetests/msxml3/saxreader.c trunk/rostests/winetests/msxml3/xmlview.c Modified: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… ============================================================================== --- trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] Sat Jun 3 22:31:39 2017 @@ -43,7 +43,8 @@ #include <msxml2did.h> #include <dispex.h> #include <objsafe.h> -//#include "initguid.h" +#include <initguid.h> +#include <asptlb.h> /* undef the #define in msxml2 so that we can access all versions */ #undef CLSID_DOMDocument @@ -353,6 +354,305 @@ }; static IStream savestream = { &StreamVtbl }; + +static HRESULT WINAPI response_QI(IResponse *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(&IID_IResponse, riid) || + IsEqualIID(&IID_IDispatch, riid) || + IsEqualIID(&IID_IUnknown, riid)) + { + *obj = iface; + return S_OK; + } + + if (!IsEqualIID(&IID_IStream, riid) && !IsEqualIID(&IID_ISequentialStream, riid)) + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI response_AddRef(IResponse *iface) +{ + return 2; +} + +static ULONG WINAPI response_Release(IResponse *iface) +{ + return 1; +} + +static HRESULT WINAPI response_GetTypeInfoCount(IResponse *iface, UINT *count) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_GetTypeInfo(IResponse *iface, UINT ti, LCID lcid, ITypeInfo **tinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_GetIDsOfNames(IResponse *iface, REFIID riid, LPOLESTR *names, + UINT cnames, LCID lcid, DISPID *rgDispId) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_Invoke(IResponse *iface, DISPID dispid, REFIID riid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *ei, UINT *argerr) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_Buffer(IResponse *iface, VARIANT_BOOL *fIsBuffering) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_put_Buffer(IResponse *iface, VARIANT_BOOL fIsBuffering) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_ContentType(IResponse *iface, BSTR *pbstrContentTypeRet) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_put_ContentType(IResponse *iface, BSTR bstrContentType) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_Expires(IResponse *iface, VARIANT *pvarExpiresMinutesRet) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_put_Expires(IResponse *iface, LONG lExpiresMinutes) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_ExpiresAbsolute(IResponse *iface, VARIANT *pvarExpiresRet) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_put_ExpiresAbsolute(IResponse *iface, DATE dtExpires) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_Cookies(IResponse *iface, IRequestDictionary **ppCookies) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_Status(IResponse *iface, BSTR *pbstrStatusRet) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_put_Status(IResponse *iface, BSTR bstrStatus) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_Add(IResponse *iface, BSTR bstrHeaderValue, BSTR bstrHeaderName) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_AddHeader(IResponse *iface, BSTR bstrHeaderName, BSTR bstrHeaderValue) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_AppendToLog(IResponse *iface, BSTR bstrLogEntry) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_BinaryWrite(IResponse *iface, VARIANT input) +{ + HRESULT hr; + LONG bound; + UINT dim; + + ok(V_VT(&input) == (VT_ARRAY | VT_UI1), "got wrong input type %x\n", V_VT(&input)); + + dim = SafeArrayGetDim(V_ARRAY(&input)); + ok(dim == 1, "got wrong array dimensions %u\n", dim); + + bound = 1; + hr = SafeArrayGetLBound(V_ARRAY(&input), 1, &bound); + ok(hr == S_OK, "got %#x\n", hr); + ok(bound == 0, "wrong array low bound %d\n", bound); + + bound = 0; + hr = SafeArrayGetUBound(V_ARRAY(&input), 1, &bound); + ok(hr == S_OK, "got %#x\n", hr); + ok(bound > 0, "wrong array high bound %d\n", bound); + + return E_NOTIMPL; +} + +static HRESULT WINAPI response_Clear(IResponse *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_End(IResponse *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_Flush(IResponse *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_Redirect(IResponse *iface, BSTR bstrURL) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_Write(IResponse *iface, VARIANT varText) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_WriteBlock(IResponse *iface, short iBlockNumber) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_IsClientConnected(IResponse *iface, VARIANT_BOOL *pfIsClientConnected) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_CharSet(IResponse *iface, BSTR *pbstrCharSetRet) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_put_CharSet(IResponse *iface, BSTR bstrCharSet) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_Pics(IResponse *iface, BSTR bstrHeaderValue) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_CacheControl(IResponse *iface, BSTR *pbstrCacheControl) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_put_CacheControl(IResponse *iface, BSTR bstrCacheControl) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_CodePage(IResponse *iface, LONG *plvar) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_put_CodePage(IResponse *iface, LONG codepage) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_get_LCID(IResponse *iface, LONG *lcid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI response_put_LCID(IResponse *iface, LONG lcid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IResponseVtbl testresponsevtbl = +{ + response_QI, + response_AddRef, + response_Release, + response_GetTypeInfoCount, + response_GetTypeInfo, + response_GetIDsOfNames, + response_Invoke, + response_get_Buffer, + response_put_Buffer, + response_get_ContentType, + response_put_ContentType, + response_get_Expires, + response_put_Expires, + response_get_ExpiresAbsolute, + response_put_ExpiresAbsolute, + response_get_Cookies, + response_get_Status, + response_put_Status, + response_Add, + response_AddHeader, + response_AppendToLog, + response_BinaryWrite, + response_Clear, + response_End, + response_Flush, + response_Redirect, + response_Write, + response_WriteBlock, + response_IsClientConnected, + response_get_CharSet, + response_put_CharSet, + response_Pics, + response_get_CacheControl, + response_put_CacheControl, + response_get_CodePage, + response_put_CodePage, + response_get_LCID, + response_put_LCID, +}; + +static IResponse testresponse = { &testresponsevtbl }; #define EXPECT_CHILDREN(node) _expect_children((IXMLDOMNode*)node, __LINE__) static void _expect_children(IXMLDOMNode *node, int line) @@ -1250,7 +1550,7 @@ ok( b == VARIANT_FALSE, "succeeded in loading XML string\n"); SysFreeString( str ); - str = (BSTR)0x1; + str = (void *)0xdeadbeef; hr = IXMLDOMDocument_get_url(doc, &str); ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(str == NULL, "got %p\n", str); @@ -1329,7 +1629,7 @@ r = IXMLDOMDocument_get_nodeName( doc, NULL ); ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code\n"); - str = (BSTR)0xdeadbeef; + str = (void *)0xdeadbeef; r = IXMLDOMDocument_get_baseName( doc, &str ); ok ( r == S_FALSE, "got 0x%08x\n", r); ok (str == NULL, "got %p\n", str); @@ -1451,25 +1751,25 @@ ok(r == E_INVALIDARG, "ret %08x\n", r ); /* test substringData - Invalid offset */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; r = IXMLDOMText_substringData(nodetext, -1, 4, &str); ok(r == E_INVALIDARG, "ret %08x\n", r ); ok( str == NULL, "incorrect string\n"); /* test substringData - Invalid offset */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; r = IXMLDOMText_substringData(nodetext, 30, 0, &str); ok(r == S_FALSE, "ret %08x\n", r ); ok( str == NULL, "incorrect string\n"); /* test substringData - Invalid size */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; r = IXMLDOMText_substringData(nodetext, 0, -1, &str); ok(r == E_INVALIDARG, "ret %08x\n", r ); ok( str == NULL, "incorrect string\n"); /* test substringData - Invalid size */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; r = IXMLDOMText_substringData(nodetext, 2, 0, &str); ok(r == S_FALSE, "ret %08x\n", r ); ok( str == NULL, "incorrect string\n"); @@ -1724,7 +2024,7 @@ /* empty comment */ r = IXMLDOMDocument_createComment(doc, _bstr_(""), &node_comment); ok( r == S_OK, "returns %08x\n", r ); - str = (BSTR)0x1; + str = NULL; r = IXMLDOMComment_get_data(node_comment, &str); ok( r == S_OK, "returns %08x\n", r ); ok( str && SysStringLen(str) == 0, "expected empty string data\n"); @@ -1733,7 +2033,7 @@ r = IXMLDOMDocument_createComment(doc, NULL, &node_comment); ok( r == S_OK, "returns %08x\n", r ); - str = (BSTR)0x1; + str = NULL; r = IXMLDOMComment_get_data(node_comment, &str); ok( r == S_OK, "returns %08x\n", r ); ok( str && (SysStringLen(str) == 0), "expected empty string data\n"); @@ -1756,7 +2056,7 @@ ok(nodeChild == NULL, "pLastChild not NULL\n"); /* baseName */ - str = (BSTR)0xdeadbeef; + str = (void *)0xdeadbeef; r = IXMLDOMComment_get_baseName(node_comment, &str); ok(r == S_FALSE, "ret %08x\n", r ); ok(str == NULL, "Expected NULL\n"); @@ -1803,7 +2103,7 @@ SysFreeString(str); /* test baseName */ - str = (BSTR)0x1; + str = NULL; r = IXMLDOMProcessingInstruction_get_baseName(nodePI, &str); ok(r == S_OK, "ret %08x\n", r ); ok( !lstrcmpW( str, _bstr_("xml") ), "incorrect nodeName string\n"); @@ -1847,12 +2147,15 @@ free_bstrs(); } -static void test_persiststreaminit(void) -{ +static void test_persiststream(void) +{ + IPersistStreamInit *streaminit; + IPersistStream *stream; IXMLDOMDocument *doc; - IPersistStreamInit *streaminit; ULARGE_INTEGER size; + IPersist *persist; HRESULT hr; + CLSID clsid; doc = create_document(&IID_IXMLDOMDocument); @@ -1865,6 +2168,26 @@ hr = IPersistStreamInit_GetSizeMax(streaminit, &size); ok(hr == E_NOTIMPL, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_QueryInterface(doc, &IID_IPersistStream, (void **)&stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((IUnknown *)stream == (IUnknown *)streaminit, "got %p, %p\n", stream, streaminit); + + hr = IPersistStream_QueryInterface(stream, &IID_IPersist, (void **)&persist); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_QueryInterface(doc, &IID_IPersist, (void **)&persist); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IPersistStreamInit_GetClassID(streaminit, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + memset(&clsid, 0, sizeof(clsid)); + hr = IPersistStreamInit_GetClassID(streaminit, &clsid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_DOMDocument2), "wrong clsid %s\n", wine_dbgstr_guid(&clsid)); + + IPersistStream_Release(stream); + IPersistStreamInit_Release(streaminit); IXMLDOMDocument_Release(doc); } @@ -2109,7 +2432,7 @@ ok( r == S_OK, "getNamedItem returned wrong code\n"); ok( type == NODE_TEXT, "node not text\n"); - str = (BSTR) 1; + str = (void *)0xdeadbeef; r = IXMLDOMNode_get_baseName( next, &str ); ok( r == S_FALSE, "get_baseName returned wrong code\n"); ok( str == NULL, "basename was wrong\n"); @@ -5173,25 +5496,25 @@ ok(hr == E_INVALIDARG, "ret %08x\n", hr ); /* test substringData - Invalid offset */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; hr = IXMLDOMComment_substringData(pComment, -1, 4, &str); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); ok( str == NULL, "incorrect string\n"); /* test substringData - Invalid offset */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; hr = IXMLDOMComment_substringData(pComment, 30, 0, &str); ok(hr == S_FALSE, "ret %08x\n", hr ); ok( str == NULL, "incorrect string\n"); /* test substringData - Invalid size */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; hr = IXMLDOMComment_substringData(pComment, 0, -1, &str); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); ok( str == NULL, "incorrect string\n"); /* test substringData - Invalid size */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; hr = IXMLDOMComment_substringData(pComment, 2, 0, &str); ok(hr == S_FALSE, "ret %08x\n", hr ); ok( str == NULL, "incorrect string\n"); @@ -5611,25 +5934,25 @@ ok(hr == E_INVALIDARG, "ret %08x\n", hr ); /* test substringData - Invalid offset */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; hr = IXMLDOMCDATASection_substringData(pCDataSec, -1, 4, &str); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); ok( str == NULL, "incorrect string\n"); /* test substringData - Invalid offset */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; hr = IXMLDOMCDATASection_substringData(pCDataSec, 30, 0, &str); ok(hr == S_FALSE, "ret %08x\n", hr ); ok( str == NULL, "incorrect string\n"); /* test substringData - Invalid size */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; hr = IXMLDOMCDATASection_substringData(pCDataSec, 0, -1, &str); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); ok( str == NULL, "incorrect string\n"); /* test substringData - Invalid size */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; hr = IXMLDOMCDATASection_substringData(pCDataSec, 2, 0, &str); ok(hr == S_FALSE, "ret %08x\n", hr ); ok( str == NULL, "incorrect string\n"); @@ -6351,7 +6674,7 @@ EXPECT_HR(hr, S_OK); ok(b == VARIANT_TRUE, "got %d\n", b); - str = (BSTR)0xdeadbeef; + str = (void *)0xdeadbeef; hr = IXMLDOMDocument_get_namespaceURI(doc, &str); EXPECT_HR(hr, S_FALSE); ok(str == NULL, "got %p\n", str); @@ -8511,14 +8834,15 @@ static void test_xsltemplate(void) { + IXMLDOMDocument *doc, *doc2, *doc3; IXSLTemplate *template; IXSLProcessor *processor; - IXMLDOMDocument *doc, *doc2; IStream *stream; VARIANT_BOOL b; HRESULT hr; ULONG ref1, ref2; VARIANT v; + BSTR str; if (!is_clsid_supported(&CLSID_XSLTemplate, &IID_IXSLTemplate)) return; template = create_xsltemplate(&IID_IXSLTemplate); @@ -8598,6 +8922,16 @@ hr = IXSLProcessor_put_output(processor, v); ok(hr == S_OK, "got 0x%08x\n", hr); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = NULL; + hr = IXSLProcessor_put_output(processor, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&v) = VT_UNKNOWN; + V_DISPATCH(&v) = NULL; + hr = IXSLProcessor_put_output(processor, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); EXPECT_REF(stream, 1); @@ -8634,7 +8968,7 @@ /* no output interface set, check output */ doc2 = create_document(&IID_IXMLDOMDocument); - b = VARIANT_TRUE; + b = VARIANT_FALSE; hr = IXMLDOMDocument_loadXML( doc2, _bstr_("<a>test</a>"), &b ); ok(hr == S_OK, "got 0x%08x\n", hr); ok( b == VARIANT_TRUE, "got %d\n", b); @@ -8652,10 +8986,62 @@ ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&v) == VT_BSTR, "got type %d\n", V_VT(&v)); ok(*V_BSTR(&v) == 0, "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + /* transform to document */ + b = VARIANT_FALSE; + hr = IXMLDOMDocument_loadXML(doc2, _bstr_(szTransformXML), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)doc2; + hr = IXSLProcessor_put_input(processor, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + doc3 = create_document(&IID_IXMLDOMDocument); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown *)doc3; + hr = IXSLProcessor_put_output(processor, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_xml(doc3, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!*str, "Expected empty document\n"); + SysFreeString(str); + + hr = IXSLProcessor_transform(processor, &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&v) = VT_EMPTY; + hr = IXSLProcessor_get_output(processor, &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&v) == VT_UNKNOWN, "got type %d\n", V_VT(&v)); + VariantClear(&v); + + hr = IXMLDOMDocument_get_xml(doc3, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!!*str, "Expected document\n"); + SysFreeString(str); + + /* transform to IResponse */ + V_VT(&v) = VT_EMPTY; + hr = IXSLProcessor_put_output(processor, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown *)&testresponse; + hr = IXSLProcessor_put_output(processor, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + b = VARIANT_FALSE; + hr = IXSLProcessor_transform(processor, &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "got %x\n", b); + + IXSLProcessor_Release(processor); IXMLDOMDocument_Release(doc2); - VariantClear(&v); - - IXSLProcessor_Release(processor); + IXMLDOMDocument_Release(doc3); /* drop reference */ hr = IXSLTemplate_putref_stylesheet(template, NULL); @@ -9889,7 +10275,7 @@ ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(b == VARIANT_FALSE, "got %d\n", b); - bstr1 = (BSTR)0x1; + bstr1 = (void *)0xdeadbeef; hr = IXMLDOMDocument_get_url(doc, &bstr1); ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(bstr1 == NULL, "got %p\n", bstr1); @@ -11738,6 +12124,7 @@ break; } default: + get_data = NULL; break; } @@ -12137,7 +12524,7 @@ hr = IXMLDOMDocument_get_url(doc, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - s = (BSTR)0x1; + s = (void *)0xdeadbeef; hr = IXMLDOMDocument_get_url(doc, &s); ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(s == NULL, "got %s\n", wine_dbgstr_w(s)); @@ -12227,7 +12614,7 @@ } test_domdoc(); - test_persiststreaminit(); + test_persiststream(); test_domnode(); test_refs(); test_create(); Modified: trunk/rostests/winetests/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/saxreade… ============================================================================== --- trunk/rostests/winetests/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/saxreader.c [iso-8859-1] Sat Jun 3 22:31:39 2017 @@ -1912,6 +1912,8 @@ { *ppvObject = NULL; + ok(!IsEqualGUID(riid, &IID_IPersistStream), "Did not expect QI for IPersistStream\n"); + if(IsEqualGUID(riid, &IID_IStream) || IsEqualGUID(riid, &IID_IUnknown)) *ppvObject = iface; else @@ -2222,6 +2224,16 @@ ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test 1: from safe array", FALSE); SafeArrayDestroy(sa); + + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = NULL; + hr = ISAXXMLReader_parse(reader, var); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = NULL; + hr = ISAXXMLReader_parse(reader, var); + ok(hr == E_INVALIDARG, "got %#x\n", hr); stream = create_test_stream(testXML, -1); V_VT(&var) = VT_UNKNOWN; Modified: trunk/rostests/winetests/msxml3/xmlview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/xmlview.… ============================================================================== --- trunk/rostests/winetests/msxml3/xmlview.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/xmlview.c [iso-8859-1] Sat Jun 3 22:31:39 2017 @@ -137,6 +137,7 @@ ok(hr == S_OK, "got 0x%08x\n", hr); if(!memcmp(state, completeW, sizeof(completeW))) loaded = TRUE; + SysFreeString(state); } return S_OK;

1 0

[akhaldi] 74822: [MSXML3] Sync with Wine Staging 2.9. CORE-13362 d7d5d93 msxml3: Improve error handling (Coverity). cebed39 msxml3: Added support for setting IResponse as xsl processor output. ea9b...
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 22:31:11 2017 New Revision: 74822 URL: http://svn.reactos.org/svn/reactos?rev=74822&view=rev Log: [MSXML3] Sync with Wine Staging 2.9. CORE-13362 d7d5d93 msxml3: Improve error handling (Coverity). cebed39 msxml3: Added support for setting IResponse as xsl processor output. ea9b797 msxml3: Support IPersistStream* as IXSLProcessor output. ba018b5 msxml3/saxreader: Handle NULL interface input in parse(). 8bc68f3 msxml3: Don't QI for IPersistStream in internal_parse. 135e98a msxml3: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. Modified: trunk/reactos/dll/win32/msxml3/msxml_private.h trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/saxreader.c trunk/reactos/dll/win32/msxml3/stylesheet.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msxml3/msxml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml_pri… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml_private.h [iso-8859-1] Sat Jun 3 22:31:11 2017 @@ -164,24 +164,24 @@ /* memory allocation functions */ -static inline void *heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void *heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline void *heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - -static inline void *heap_realloc_zero(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); +} + +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, size); +} + +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) +{ + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } static inline BOOL heap_free(void *mem) @@ -358,7 +358,8 @@ extern HRESULT node_select_nodes(const xmlnode*,BSTR,IXMLDOMNodeList**) DECLSPEC_HIDDEN; extern HRESULT node_select_singlenode(const xmlnode*,BSTR,IXMLDOMNode**) DECLSPEC_HIDDEN; extern HRESULT node_transform_node(const xmlnode*,IXMLDOMNode*,BSTR*) DECLSPEC_HIDDEN; -extern HRESULT node_transform_node_params(const xmlnode*,IXMLDOMNode*,BSTR*,IStream*,const struct xslprocessor_params*) DECLSPEC_HIDDEN; +extern HRESULT node_transform_node_params(const xmlnode*,IXMLDOMNode*,BSTR*,ISequentialStream*, + const struct xslprocessor_params*) DECLSPEC_HIDDEN; extern HRESULT node_create_supporterrorinfo(const tid_t*,void**) DECLSPEC_HIDDEN; extern HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Sat Jun 3 22:31:11 2017 @@ -1016,7 +1016,7 @@ static int XMLCALL transform_to_stream_write(void *context, const char *buffer, int len) { DWORD written; - HRESULT hr = IStream_Write((IStream*)context, buffer, len, &written); + HRESULT hr = ISequentialStream_Write((ISequentialStream *)context, buffer, len, &written); return hr == S_OK ? written : -1; } @@ -1261,7 +1261,7 @@ return *str ? hr : E_OUTOFMEMORY; } -static HRESULT node_transform_write_to_stream(xsltStylesheetPtr style, xmlDocPtr result, IStream *stream) +static HRESULT node_transform_write_to_stream(xsltStylesheetPtr style, xmlDocPtr result, ISequentialStream *stream) { static const xmlChar *utf16 = (const xmlChar*)"UTF-16"; xmlOutputBufferPtr output; @@ -1297,7 +1297,7 @@ #endif HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR *p, - IStream *stream, const struct xslprocessor_params *params) + ISequentialStream *stream, const struct xslprocessor_params *params) { #ifdef SONAME_LIBXSLT xsltStylesheetPtr xsltSS; Modified: trunk/reactos/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/saxreader… ============================================================================== --- trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] Sat Jun 3 22:31:11 2017 @@ -2639,9 +2639,11 @@ } case VT_UNKNOWN: case VT_DISPATCH: { - IPersistStream *persistStream; ISequentialStream *stream = NULL; IXMLDOMDocument *xmlDoc; + + if (!V_UNKNOWN(&varInput)) + return E_INVALIDARG; if(IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_IXMLDOMDocument, (void**)&xmlDoc) == S_OK) @@ -2656,34 +2658,11 @@ break; } - if(IUnknown_QueryInterface(V_UNKNOWN(&varInput), - &IID_IPersistStream, (void**)&persistStream) == S_OK) - { - IStream *stream_copy; - - hr = CreateStreamOnHGlobal(NULL, TRUE, &stream_copy); - if(hr != S_OK) - { - IPersistStream_Release(persistStream); - return hr; - } - - hr = IPersistStream_Save(persistStream, stream_copy, TRUE); - IPersistStream_Release(persistStream); - if(hr == S_OK) - IStream_QueryInterface(stream_copy, &IID_ISequentialStream, (void**)&stream); - - IStream_Release(stream_copy); - } - /* try base interface first */ - if(!stream) - { - IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_ISequentialStream, (void**)&stream); - if (!stream) - /* this should never happen if IStream is implemented properly, but just in case */ - IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_IStream, (void**)&stream); - } + IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_ISequentialStream, (void**)&stream); + if (!stream) + /* this should never happen if IStream is implemented properly, but just in case */ + IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_IStream, (void**)&stream); if(stream) { Modified: trunk/reactos/dll/win32/msxml3/stylesheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/styleshee… ============================================================================== --- trunk/reactos/dll/win32/msxml3/stylesheet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/stylesheet.c [iso-8859-1] Sat Jun 3 22:31:11 2017 @@ -20,6 +20,9 @@ #include "precomp.h" +#include <initguid.h> +#include <asptlb.h> + typedef struct { DispatchEx dispex; @@ -29,6 +32,14 @@ IXMLDOMNode *node; } xsltemplate; +enum output_type +{ + PROCESSOR_OUTPUT_NOT_SET, + PROCESSOR_OUTPUT_STREAM, /* IStream or ISequentialStream */ + PROCESSOR_OUTPUT_PERSISTSTREAM, /* IPersistStream or IPersistStreamInit */ + PROCESSOR_OUTPUT_RESPONSE, /* IResponse */ +}; + typedef struct { DispatchEx dispex; @@ -38,8 +49,15 @@ xsltemplate *stylesheet; IXMLDOMNode *input; - IStream *output; - BSTR outstr; + union + { + IUnknown *unk; + ISequentialStream *stream; + IPersistStream *persiststream; + IResponse *response; + } output; + enum output_type output_type; + BSTR outstr; struct xslprocessor_params params; } xslprocessor; @@ -298,7 +316,8 @@ struct xslprocessor_par *par, *par2; if (This->input) IXMLDOMNode_Release(This->input); - if (This->output) IStream_Release(This->output); + if (This->output.unk) + IUnknown_Release(This->output.unk); SysFreeString(This->outstr); LIST_FOR_EACH_ENTRY_SAFE(par, par2, &This->params.list, struct xslprocessor_par, entry) @@ -437,34 +456,57 @@ static HRESULT WINAPI xslprocessor_put_output( IXSLProcessor *iface, - VARIANT output) -{ - xslprocessor *This = impl_from_IXSLProcessor( iface ); - IStream *stream; - HRESULT hr; - - TRACE("(%p)->(%s)\n", This, debugstr_variant(&output)); - - switch (V_VT(&output)) - { - case VT_EMPTY: - stream = NULL; - hr = S_OK; + VARIANT var) +{ + xslprocessor *This = impl_from_IXSLProcessor( iface ); + enum output_type output_type = PROCESSOR_OUTPUT_NOT_SET; + IUnknown *output = NULL; + HRESULT hr = S_OK; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&var)); + + switch (V_VT(&var)) + { + case VT_EMPTY: break; - case VT_UNKNOWN: - hr = IUnknown_QueryInterface(V_UNKNOWN(&output), &IID_IStream, (void**)&stream); + case VT_UNKNOWN: + case VT_DISPATCH: + if (!V_UNKNOWN(&var)) + break; + + output_type = PROCESSOR_OUTPUT_STREAM; + hr = IUnknown_QueryInterface(V_UNKNOWN(&var), &IID_IStream, (void **)&output); if (FAILED(hr)) - WARN("failed to get IStream from output, 0x%08x\n", hr); + hr = IUnknown_QueryInterface(V_UNKNOWN(&var), &IID_ISequentialStream, (void **)&output); + if (FAILED(hr)) + { + output_type = PROCESSOR_OUTPUT_RESPONSE; + hr = IUnknown_QueryInterface(V_UNKNOWN(&var), &IID_IResponse, (void **)&output); + } + if (FAILED(hr)) + { + output_type = PROCESSOR_OUTPUT_PERSISTSTREAM; + hr = IUnknown_QueryInterface(V_UNKNOWN(&var), &IID_IPersistStream, (void **)&output); + } + if (FAILED(hr)) + hr = IUnknown_QueryInterface(V_UNKNOWN(&var), &IID_IPersistStreamInit, (void **)&output); + if (FAILED(hr)) + { + output_type = PROCESSOR_OUTPUT_NOT_SET; + WARN("failed to get output interface, 0x%08x\n", hr); + } break; - default: - FIXME("output type %d not handled\n", V_VT(&output)); + default: + FIXME("output type %d not handled\n", V_VT(&var)); hr = E_FAIL; } if (hr == S_OK) { - if (This->output) IStream_Release(This->output); - This->output = stream; + if (This->output.unk) + IUnknown_Release(This->output.unk); + This->output.unk = output; + This->output_type = output_type; } return hr; @@ -480,11 +522,11 @@ if (!output) return E_INVALIDARG; - if (This->output) + if (This->output.unk) { V_VT(output) = VT_UNKNOWN; - V_UNKNOWN(output) = (IUnknown*)This->output; - IStream_AddRef(This->output); + V_UNKNOWN(output) = This->output.unk; + IUnknown_AddRef(This->output.unk); } else if (This->outstr) { @@ -503,14 +545,89 @@ { #ifdef HAVE_LIBXML2 xslprocessor *This = impl_from_IXSLProcessor( iface ); + ISequentialStream *stream = NULL; HRESULT hr; TRACE("(%p)->(%p)\n", This, ret); - if (!ret) return E_INVALIDARG; + if (!ret) + return E_INVALIDARG; + + if (This->output_type == PROCESSOR_OUTPUT_STREAM) + { + stream = This->output.stream; + ISequentialStream_AddRef(stream); + } + else if (This->output_type == PROCESSOR_OUTPUT_PERSISTSTREAM || + This->output_type == PROCESSOR_OUTPUT_RESPONSE) + { + if (FAILED(hr = CreateStreamOnHGlobal(NULL, TRUE, (IStream **)&stream))) + return hr; + } SysFreeString(This->outstr); - hr = node_transform_node_params(get_node_obj(This->input), This->stylesheet->node, &This->outstr, This->output, &This->params); + + hr = node_transform_node_params(get_node_obj(This->input), This->stylesheet->node, + &This->outstr, stream, &This->params); + if (SUCCEEDED(hr)) + { + IStream *src = (IStream *)stream; + + switch (This->output_type) + { + case PROCESSOR_OUTPUT_PERSISTSTREAM: + { + LARGE_INTEGER zero; + + /* for IPersistStream* output seekable stream is used */ + zero.QuadPart = 0; + IStream_Seek(src, zero, STREAM_SEEK_SET, NULL); + hr = IPersistStream_Load(This->output.persiststream, src); + break; + } + case PROCESSOR_OUTPUT_RESPONSE: + { + SAFEARRAYBOUND bound; + SAFEARRAY *array; + HGLOBAL hglobal; + VARIANT bin; + DWORD size; + void *dest; + + if (FAILED(hr = GetHGlobalFromStream(src, &hglobal))) + break; + size = GlobalSize(hglobal); + + bound.lLbound = 0; + bound.cElements = size; + if (!(array = SafeArrayCreate(VT_UI1, 1, &bound))) + break; + + V_VT(&bin) = VT_ARRAY | VT_UI1; + V_ARRAY(&bin) = array; + + hr = SafeArrayAccessData(array, &dest); + if (hr == S_OK) + { + void *data = GlobalLock(hglobal); + memcpy(dest, data, size); + GlobalUnlock(hglobal); + SafeArrayUnaccessData(array); + + IResponse_BinaryWrite(This->output.response, bin); + } + + VariantClear(&bin); + break; + } + default: + ; + } + } + + if (stream) + ISequentialStream_Release(stream); + *ret = hr == S_OK ? VARIANT_TRUE : VARIANT_FALSE; return hr; #else @@ -689,7 +806,8 @@ This->IXSLProcessor_iface.lpVtbl = &XSLProcessorVtbl; This->ref = 1; This->input = NULL; - This->output = NULL; + This->output.unk = NULL; + This->output_type = PROCESSOR_OUTPUT_NOT_SET; This->outstr = NULL; list_init(&This->params.list); This->params.count = 0; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jun 3 22:31:11 2017 @@ -129,7 +129,7 @@ reactos/dll/win32/msvidc32 # Synced to WineStaging-1.9.11 reactos/dll/win32/msxml # Synced to WineStaging-1.9.11 reactos/dll/win32/msxml2 # Synced to WineStaging-1.9.11 -reactos/dll/win32/msxml3 # Synced to WineStaging-2.2 +reactos/dll/win32/msxml3 # Synced to WineStaging-2.9 reactos/dll/win32/msxml4 # Synced to WineStaging-1.9.11 reactos/dll/win32/msxml6 # Synced to WineStaging-1.9.11 reactos/dll/win32/nddeapi # Synced to WineStaging-1.9.11

1 0

[akhaldi] 74821: [MSVFW32_WINETEST] Sync with Wine Staging 2.9. CORE-13362
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 22:30:54 2017 New Revision: 74821 URL: http://svn.reactos.org/svn/reactos?rev=74821&view=rev Log: [MSVFW32_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/msvfw32/msvfw.c Modified: trunk/rostests/winetests/msvfw32/msvfw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvfw32/msvfw.c… ============================================================================== --- trunk/rostests/winetests/msvfw32/msvfw.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvfw32/msvfw.c [iso-8859-1] Sat Jun 3 22:30:54 2017 @@ -658,10 +658,45 @@ ICClose(ic); } +static void test_ICInfo(void) +{ + ICINFO info, info2; + DWORD i, found; + unsigned char *fcc; + + for (i = found = 0; ICInfo(0, i, &info); i++) + { + trace("Codec name: %s, fccHandler: 0x%08x\n", wine_dbgstr_w(info.szName), info.fccHandler); + + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x\n", info.fccHandler); + + fcc = (unsigned char *)&info.fccHandler; + if (!isalpha(fcc[0])) continue; + + found++; + /* Test getting info with a different case - bug 41602 */ + if (fcc[0] & 0x20) + { + fcc[0] &= ~0x20; + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x using lowercase fccHandler\n", info.fccHandler); + } + else + { + fcc[0] |= 0x20; + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n", info.fccHandler); + } + } + ok(found != 0, "expected at least one codec\n"); +} + START_TEST(msvfw) { test_OpenCase(); test_Locate(); test_ICSeqCompress(); test_ICGetDisplayFormat(); -} + test_ICInfo(); +}

1 0

[akhaldi] 74820: [MSTASK_WINETEST] Sync with Wine Staging 2.9. CORE-13362
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 22:30:32 2017 New Revision: 74820 URL: http://svn.reactos.org/svn/reactos?rev=74820&view=rev Log: [MSTASK_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/mstask/task_scheduler.c Modified: trunk/rostests/winetests/mstask/task_scheduler.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mstask/task_sch… ============================================================================== --- trunk/rostests/winetests/mstask/task_scheduler.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mstask/task_scheduler.c [iso-8859-1] Sat Jun 3 22:30:32 2017 @@ -184,6 +184,11 @@ /* the two backslashes are optional */ hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, oldname + 2); + if (hres == E_ACCESSDENIED) + { + skip("SetTargetComputer failed with E_ACCESSDENIED (needs admin rights)\n"); + goto done; + } ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); /* the case is ignored */ @@ -198,6 +203,7 @@ hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, oldname); ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); +done: CoTaskMemFree(oldname); ITaskScheduler_Release(test_task_scheduler); return;

1 0

[akhaldi] 74819: [MSI_WINETEST] Sync with Wine Staging 2.9. CORE-13362
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 22:30:19 2017 New Revision: 74819 URL: http://svn.reactos.org/svn/reactos?rev=74819&view=rev Log: [MSI_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/msi.c Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… ============================================================================== --- trunk/rostests/winetests/msi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/install.c [iso-8859-1] Sat Jun 3 22:30:19 2017 @@ -1220,6 +1220,69 @@ "PublishProduct\t\t1900\n" "InstallFinalize\t\t2000\n"; +static const char ft_file_dat[] = + "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "featuretree\tcomp\tfeaturetree.txt\t1000\t\t\t8192\t1\n"; + +static const char ft_comp_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "comp\t{12345678-1234-1234-1234-222222222222}\tTARGETDIR\t0\t\t\n" + "comp2\t{12345678-1234-1234-1234-333333333333}\tTARGETDIR\t0\t\tfeaturetree\n"; + +static const char ft_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "A\t\t\t\t2\t1\t\t0\n" + "C\tB\t\t\t2\t1\t\t0\n" + "B\tA\t\t\t4\t1\t\t0\n" + "D\t\t\t\t2\t1\t\t0\n"; + +static const char ft_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "C\tcomp\n" + "D\tcomp2\n"; + +static const char ft_condition_dat[] = + "Feature_\tLevel\tCondition\n" + "s38\ti2\tS255\n" + "Condition\tFeature_\tLevel\n" + "A\t0\t\"0\"<>INSTALLTYPE\n"; + +static const char ft_custom_action_dat[] = + "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "Run A\t19\t\tA\t\n" + "Run B\t19\t\tB\t\n" + "Run C\t19\t\tC\t\n"; + +static const char ft_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostInitialize\t\t100\n" + "FileCost\t\t200\n" + "CostFinalize\t\t300\n" + "InstallValidate\t\t400\n" + "InstallInitialize\t\t500\n" + "Run C\t3 = &C AND NOT Installed\t600\n" + "Run B\t3 = &B AND NOT Installed\t700\n" + "Run A\t3 = &A AND NOT Installed\t800\n" + "ProcessComponents\t\t900\n" + "RemoveFiles\t\t1000\n" + "InstallFiles\t\t1100\n" + "RegisterProduct\t\t1200\n" + "PublishFeatures\t\t1300\n" + "PublishProduct\t\t1400\n" + "InstallFinalize\t\t1500\n"; + typedef struct _msi_table { const CHAR *filename; @@ -1858,6 +1921,20 @@ ADD_TABLE(shc_custom_action), ADD_TABLE(shc_install_exec_seq), ADD_TABLE(shc2_property) +}; + +static const msi_table ft_tables[] = +{ + ADD_TABLE(media), + ADD_TABLE(directory), + ADD_TABLE(ft_file), + ADD_TABLE(ft_comp), + ADD_TABLE(ft_feature), + ADD_TABLE(ft_feature_comp), + ADD_TABLE(ft_condition), + ADD_TABLE(ft_custom_action), + ADD_TABLE(ft_install_exec_seq), + ADD_TABLE(property) }; /* cabinet definitions */ @@ -5937,6 +6014,35 @@ DeleteFileA( msifile ); } +static void test_feature_tree(void) +{ + UINT r; + + if (is_process_limited()) + { + skip( "process is limited\n" ); + return; + } + + create_file( "msitest\\featuretree.txt", 1000 ); + create_database( msifile, ft_tables, sizeof(ft_tables)/sizeof(ft_tables[0]) ); + + MsiSetInternalUI( INSTALLUILEVEL_NONE, NULL ); + + r = MsiInstallProductA( msifile, "INSTALLTYPE=\"0\"" ); + ok( r == ERROR_INSTALL_FAILURE, "got %u\n", r ); + + r = MsiInstallProductA( msifile, "INSTALLTYPE=\"1\"" ); + ok( r == ERROR_SUCCESS, "got %u\n", r ); + + r = MsiInstallProductA( msifile, "REMOVE=ALL" ); + ok( r == ERROR_SUCCESS, "got %u\n", r ); + + DeleteFileA( "msitest\\featuretree.txt" ); + RemoveDirectoryA( "msitest" ); + DeleteFileA( msifile ); +} + START_TEST(install) { DWORD len; @@ -6024,6 +6130,7 @@ test_volume_props(); test_shared_component(); test_remove_upgrade_code(); + test_feature_tree(); DeleteFileA(log_file); Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=7… ============================================================================== --- trunk/rostests/winetests/msi/msi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/msi.c [iso-8859-1] Sat Jun 3 22:30:19 2017 @@ -3427,6 +3427,327 @@ LocalFree(usersid); } +static void test_MsiGetComponentPathEx(void) +{ + HKEY key_comp, key_installprop, key_prod; + char prod[MAX_PATH], prod_squashed[MAX_PATH]; + char comp[MAX_PATH], comp_base85[MAX_PATH], comp_squashed[MAX_PATH]; + char path[MAX_PATH], path_key[MAX_PATH], *usersid; + INSTALLSTATE state; + DWORD size, val; + REGSAM access = KEY_ALL_ACCESS; + LONG res; + + if (!pMsiGetComponentPathExA) + { + win_skip( "MsiGetComponentPathExA not present\n" ); + return; + } + + if (is_wow64) access |= KEY_WOW64_64KEY; + + create_test_guid( prod, prod_squashed ); + compose_base85_guid( comp, comp_base85, comp_squashed ); + usersid = get_user_sid(); + + /* NULL product */ + size = MAX_PATH; + state = pMsiGetComponentPathExA( NULL, comp, NULL, MSIINSTALLCONTEXT_USERMANAGED, path, &size ); + ok( state == INSTALLSTATE_INVALIDARG, "got %d\n", state ); + todo_wine ok( !size, "got %u\n", size ); + + /* NULL component */ + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, NULL, NULL, MSIINSTALLCONTEXT_USERMANAGED, path, &size ); + ok( state == INSTALLSTATE_INVALIDARG, "got %d\n", state ); + todo_wine ok( !size, "got %u\n", size ); + + /* non-NULL usersid, MSIINSTALLCONTEXT_MACHINE */ + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, usersid, MSIINSTALLCONTEXT_MACHINE, path, &size); + ok( state == INSTALLSTATE_INVALIDARG, "got %d\n", state ); + todo_wine ok( !size, "got %u\n", size ); + + /* NULL buf */ + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, NULL, &size ); + ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state ); + todo_wine ok( size == MAX_PATH * 2, "got %u\n", size ); + + /* NULL buflen */ + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, NULL ); + ok( state == INSTALLSTATE_INVALIDARG, "got %d\n", state ); + ok( size == MAX_PATH, "got %u\n", size ); + + /* all params valid */ + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size ); + ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state ); + todo_wine ok( !size, "got %u\n", size ); + + lstrcpyA( path_key, "Software\\Microsoft\\Windows\\CurrentVersion\\" ); + lstrcatA( path_key, "Installer\\UserData\\S-1-5-18\\Components\\" ); + lstrcatA( path_key, comp_squashed ); + + res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, path_key, 0, NULL, 0, access, NULL, &key_comp, NULL ); + if (res == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + LocalFree( usersid ); + return; + } + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + /* local system component key exists */ + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size ); + ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state ); + + res = RegSetValueExA( key_comp, prod_squashed, 0, REG_SZ, (const BYTE *)"c:\\testcomponentpath", 20 ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + /* product value exists */ + path[0] = 0; + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size ); + ok( state == INSTALLSTATE_ABSENT, "got %d\n", state ); + ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path ); + ok( size == 20, "got %u\n", size ); + + lstrcpyA( path_key, "Software\\Microsoft\\Windows\\CurrentVersion\\" ); + lstrcatA( path_key, "Installer\\UserData\\S-1-5-18\\Products\\" ); + lstrcatA( path_key, prod_squashed ); + lstrcatA( path_key, "\\InstallProperties" ); + + res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, path_key, 0, NULL, 0, access, NULL, &key_installprop, NULL ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + val = 1; + res = RegSetValueExA( key_installprop, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&val, sizeof(val) ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + /* install properties key exists */ + path[0] = 0; + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size ); + ok( state == INSTALLSTATE_ABSENT, "got %d\n", state ); + ok( !lstrcmpA( path, "c:\\testcomponentpath"), "got %s\n", path ); + ok( size == 20, "got %u\n", size ); + + create_file( "c:\\testcomponentpath", "c:\\testcomponentpath", 21 ); + + /* file exists */ + path[0] = 0; + size = 0; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size ); + ok( state == INSTALLSTATE_MOREDATA, "got %d\n", state ); + ok( !path[0], "got %s\n", path ); + todo_wine ok( size == 40, "got %u\n", size ); + + path[0] = 0; + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size ); + ok( state == INSTALLSTATE_LOCAL, "got %d\n", state ); + ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path ); + ok( size == 20, "got %d\n", size ); + + RegDeleteValueA( key_comp, prod_squashed ); + delete_key( key_comp, "", access & KEY_WOW64_64KEY ); + RegDeleteValueA( key_installprop, "WindowsInstaller" ); + delete_key( key_installprop, "", access & KEY_WOW64_64KEY ); + RegCloseKey( key_comp ); + RegCloseKey( key_installprop ); + DeleteFileA( "c:\\testcomponentpath" ); + + lstrcpyA( path_key, "Software\\Microsoft\\Installer\\Products\\" ); + lstrcatA( path_key, prod_squashed ); + + res = RegCreateKeyA( HKEY_CURRENT_USER, path_key, &key_prod ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + /* user unmanaged product key exists */ + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, path, &size ); + ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state ); + todo_wine ok(!size, "got %u\n", size); + + lstrcpyA( path_key, "Software\\Microsoft\\Windows\\CurrentVersion\\" ); + lstrcatA( path_key, "Installer\\UserData\\" ); + lstrcatA( path_key, usersid ); + lstrcatA( path_key, "\\Components\\" ); + lstrcatA( path_key, comp_squashed ); + + res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, path_key, 0, NULL, 0, access, NULL, &key_comp, NULL ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + /* user unmanaged component key exists */ + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, path, &size ); + ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state ); + todo_wine ok(!size, "got %u\n", size); + + res = RegSetValueExA( key_comp, prod_squashed, 0, REG_SZ, (const BYTE *)"c:\\testcomponentpath", 20 ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + /* product value exists */ + path[0] = 0; + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, path, &size ); + ok( state == INSTALLSTATE_ABSENT, "got %d\n", state ); + ok( !lstrcmpA( path, "c:\\testcomponentpath"), "got %s\n", path ); + ok( size == 20, "got %u\n", size ); + + create_file( "c:\\testcomponentpath", "c:\\testcomponentpath", 21 ); + + /* file exists */ + path[0] = 0; + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, path, &size ); + ok( state == INSTALLSTATE_LOCAL, "got %d\n", state ); + ok( !lstrcmpA( path, "c:\\testcomponentpath"), "got %s\n", path ); + ok( size == 20, "got %u\n", size ); + + RegDeleteValueA( key_comp, prod_squashed ); + RegDeleteKeyA( key_prod, "" ); + delete_key( key_comp, "", access & KEY_WOW64_64KEY ); + RegCloseKey( key_prod ); + RegCloseKey( key_comp ); + DeleteFileA( "c:\\testcomponentpath" ); + + lstrcpyA( path_key, "Software\\Microsoft\\Windows\\CurrentVersion\\" ); + lstrcatA( path_key, "Installer\\Managed\\" ); + lstrcatA( path_key, usersid ); + lstrcatA( path_key, "\\Installer\\Products\\" ); + lstrcatA( path_key, prod_squashed ); + + res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, path_key, 0, NULL, 0, access, NULL, &key_prod, NULL ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + /* user managed product key exists */ + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_USERMANAGED, path, &size ); + ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state ); + + lstrcpyA( path_key, "Software\\Microsoft\\Windows\\CurrentVersion\\" ); + lstrcatA( path_key, "Installer\\UserData\\" ); + lstrcatA( path_key, usersid ); + lstrcatA( path_key, "\\Components\\" ); + lstrcatA( path_key, comp_squashed ); + + res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, path_key, 0, NULL, 0, access, NULL, &key_comp, NULL ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + /* user managed component key exists */ + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_USERMANAGED, path, &size ); + ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state ); + + res = RegSetValueExA( key_comp, prod_squashed, 0, REG_SZ, (const BYTE *)"c:\\testcomponentpath", 20 ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + /* product value exists */ + path[0] = 0; + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_USERMANAGED, path, &size ); + ok( state == INSTALLSTATE_ABSENT, "got %d\n", state ); + ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path ); + ok( size == 20, "got %u\n", size ); + + lstrcpyA( path_key, "Software\\Microsoft\\Windows\\CurrentVersion\\" ); + lstrcatA( path_key, "Installer\\UserData\\S-1-5-18\\Products\\" ); + lstrcatA( path_key, prod_squashed ); + lstrcatA( path_key, "\\InstallProperties" ); + + res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, path_key, 0, NULL, 0, access, NULL, &key_installprop, NULL ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + val = 1; + res = RegSetValueExA( key_installprop, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&val, sizeof(val) ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + /* install properties key exists */ + path[0] = 0; + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_USERMANAGED, path, &size ); + ok( state == INSTALLSTATE_ABSENT, "got %d\n", state ); + ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path ); + ok( size == 20, "got %u\n", size ); + + create_file( "c:\\testcomponentpath", "C:\\testcomponentpath", 21 ); + + /* file exists */ + path[0] = 0; + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_USERMANAGED, path, &size ); + ok( state == INSTALLSTATE_LOCAL, "got %d\n", state ); + ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path ); + ok( size == 20, "got %u\n", size ); + + RegDeleteValueA( key_comp, prod_squashed ); + delete_key( key_prod, "", access & KEY_WOW64_64KEY ); + delete_key( key_comp, "", access & KEY_WOW64_64KEY ); + RegDeleteValueA( key_installprop, "WindowsInstaller" ); + delete_key( key_installprop, "", access & KEY_WOW64_64KEY ); + RegCloseKey( key_prod ); + RegCloseKey( key_comp ); + RegCloseKey( key_installprop ); + DeleteFileA( "c:\\testcomponentpath" ); + lstrcpyA( path_key, "Software\\Classes\\Installer\\Products\\" ); + lstrcatA( path_key, prod_squashed ); + + res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, path_key, 0, NULL, 0, access, NULL, &key_prod, NULL ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + /* local classes product key exists */ + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size ); + ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state ); + todo_wine ok(!size, "got %u\n", size); + + lstrcpyA( path_key, "Software\\Microsoft\\Windows\\CurrentVersion\\" ); + lstrcatA( path_key, "Installer\\UserData\\S-1-5-18\\Components\\" ); + lstrcatA( path_key, comp_squashed ); + + res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, path_key, 0, NULL, 0, access, NULL, &key_comp, NULL ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + /* local user component key exists */ + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size ); + ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state ); + todo_wine ok(!size, "got %u\n", size); + + res = RegSetValueExA( key_comp, prod_squashed, 0, REG_SZ, (const BYTE *)"c:\\testcomponentpath", 20 ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + /* product value exists */ + path[0] = 0; + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size ); + ok( state == INSTALLSTATE_ABSENT, "got %d\n", state ); + ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path ); + ok( size == 20, "got %u\n", size ); + + create_file( "c:\\testcomponentpath", "c:\\testcomponentpath", 21 ); + + /* file exists */ + path[0] = 0; + size = MAX_PATH; + state = pMsiGetComponentPathExA( prod, comp, NULL, MSIINSTALLCONTEXT_MACHINE, path, &size ); + ok( state == INSTALLSTATE_LOCAL, "got %d\n", state ); + ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path ); + ok( size == 20, "got %u\n", size ); + + RegDeleteValueA( key_comp, prod_squashed ); + delete_key( key_prod, "", access & KEY_WOW64_64KEY ); + delete_key( key_comp, "", access & KEY_WOW64_64KEY ); + RegCloseKey( key_prod ); + RegCloseKey( key_comp ); + DeleteFileA( "c:\\testcomponentpath" ); + LocalFree( usersid ); +} + static void test_MsiProvideComponent(void) { static const WCHAR sourcedirW[] = @@ -10894,18 +11215,18 @@ ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); delete_key(hpatch, "", access & KEY_WOW64_64KEY); + RegDeleteValueA(hpatch, "State"); RegCloseKey(hpatch); delete_key(udpatch, "", access & KEY_WOW64_64KEY); RegCloseKey(udpatch); + delete_key(udprod, "", access & KEY_WOW64_64KEY); + RegCloseKey(udprod); done: RegDeleteValueA(patches, patch_squashed); RegDeleteValueA(patches, "Patches"); delete_key(patches, "", access & KEY_WOW64_64KEY); RegCloseKey(patches); - RegDeleteValueA(hpatch, "State"); - delete_key(udprod, "", access & KEY_WOW64_64KEY); - RegCloseKey(udprod); delete_key(prodkey, "", access & KEY_WOW64_64KEY); RegCloseKey(prodkey); } @@ -12352,7 +12673,22 @@ MSIINSTALLCONTEXT_USERMANAGED, INSTALLPROPERTY_PATCHSTATEA, val, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmpA(val, "1"), "Expected \"1\", got \"%s\"\n", val); + ok(!lstrcmpA(val, "1"), "Expected \"1\", got \"%s\"\n", val); + ok(size == 1, "Expected 1, got %d\n", size); + + size = 1; + res = RegSetValueExA(hpatch, "Uninstallable", 0, REG_DWORD, + (const BYTE *)&size, sizeof(DWORD)); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* Uninstallable value exists */ + size = MAX_PATH; + lstrcpyA(val, "apple"); + r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid, + MSIINSTALLCONTEXT_USERMANAGED, + INSTALLPROPERTY_UNINSTALLABLEA, val, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(val, "1"), "Expected \"1\", got \"%s\"\n", val); ok(size == 1, "Expected 1, got %d\n", size); res = RegSetValueExA(hpatch, "DisplayName", 0, REG_SZ, @@ -14566,6 +14902,7 @@ test_MsiQueryFeatureState(); test_MsiQueryComponentState(); test_MsiGetComponentPath(); + test_MsiGetComponentPathEx(); test_MsiProvideComponent(); test_MsiGetProductCode(); test_MsiEnumClients();

1 0

[akhaldi] 74818: [MSI] Sync with Wine Staging 2.9. CORE-13362 f6ced24 msi: Avoid using isspace()/isdigit() for WCHARs. 635457b msi: Add MsiGetPatchFileListA/W stubs. b956b1f msi: Set patch property...
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 22:29:55 2017 New Revision: 74818 URL: http://svn.reactos.org/svn/reactos?rev=74818&view=rev Log: [MSI] Sync with Wine Staging 2.9. CORE-13362 f6ced24 msi: Avoid using isspace()/isdigit() for WCHARs. 635457b msi: Add MsiGetPatchFileListA/W stubs. b956b1f msi: Set patch property Uninstallable. f3adb4a msi: Properly handle DWORD registry values in MsiGetPatchInfoEx. d94653d msi: Apply feature selection to the whole feature subtree. d12728a msi: Avoid zero size allocations (Valgrind). b53957d msi: Use the correct type when calculating feature cost. 64c0625 msi: Implement MsiGetComponentPathExA/W. 5aa2d48 msi: Fix some more spec file entries. Modified: trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/install.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi.spec trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/patch.c trunk/reactos/dll/win32/msi/table.c trunk/reactos/dll/win32/msi/tokenize.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/action.c [iso-8859-1] Sat Jun 3 22:29:55 2017 @@ -1756,6 +1756,45 @@ return ret; } +static void disable_children( MSIFEATURE *feature, int level ) +{ + FeatureList *fl; + + LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) + { + if (!is_feature_selected( feature, level )) + { + TRACE("child %s (level %d request %d) follows disabled parent %s (level %d request %d)\n", + debugstr_w(fl->feature->Feature), fl->feature->Level, fl->feature->ActionRequest, + debugstr_w(feature->Feature), feature->Level, feature->ActionRequest); + + fl->feature->Level = feature->Level; + fl->feature->Action = INSTALLSTATE_UNKNOWN; + fl->feature->ActionRequest = INSTALLSTATE_UNKNOWN; + } + disable_children( fl->feature, level ); + } +} + +static void follow_parent( MSIFEATURE *feature ) +{ + FeatureList *fl; + + LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) + { + if (fl->feature->Attributes & msidbFeatureAttributesFollowParent) + { + TRACE("child %s (level %d request %d) follows parent %s (level %d request %d)\n", + debugstr_w(fl->feature->Feature), fl->feature->Level, fl->feature->ActionRequest, + debugstr_w(feature->Feature), feature->Level, feature->ActionRequest); + + fl->feature->Action = feature->Action; + fl->feature->ActionRequest = feature->ActionRequest; + } + follow_parent( fl->feature ); + } +} + UINT MSI_SetFeatureStates(MSIPACKAGE *package) { int level; @@ -1794,24 +1833,9 @@ /* disable child features of unselected parent or follow parent */ LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - FeatureList *fl; - - LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) - { - if (!is_feature_selected( feature, level )) - { - fl->feature->Action = INSTALLSTATE_UNKNOWN; - fl->feature->ActionRequest = INSTALLSTATE_UNKNOWN; - } - else if (fl->feature->Attributes & msidbFeatureAttributesFollowParent) - { - TRACE("feature %s (level %d request %d) follows parent %s (level %d request %d)\n", - debugstr_w(fl->feature->Feature), fl->feature->Level, fl->feature->ActionRequest, - debugstr_w(feature->Feature), feature->Level, feature->ActionRequest); - fl->feature->Action = feature->Action; - fl->feature->ActionRequest = feature->ActionRequest; - } - } + if (feature->Feature_Parent) continue; + disable_children( feature, level ); + follow_parent( feature ); } } else /* preselected */ @@ -1836,22 +1860,9 @@ } LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - FeatureList *fl; - - if (!is_feature_selected( feature, level )) continue; - - LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) - { - if (fl->feature->Attributes & msidbFeatureAttributesFollowParent && - (!(feature->Attributes & msidbFeatureAttributesFavorAdvertise))) - { - TRACE("feature %s (level %d request %d) follows parent %s (level %d request %d)\n", - debugstr_w(fl->feature->Feature), fl->feature->Level, fl->feature->ActionRequest, - debugstr_w(feature->Feature), feature->Level, feature->ActionRequest); - fl->feature->Action = feature->Action; - fl->feature->ActionRequest = feature->ActionRequest; - } - } + if (feature->Feature_Parent) continue; + disable_children( feature, level ); + follow_parent( feature ); } } @@ -4404,7 +4415,16 @@ if (res != ERROR_SUCCESS) goto done; - res = RegSetValueExW( patch_key, szState, 0, REG_DWORD, (const BYTE *)&patch->state, sizeof(patch->state) ); + res = RegSetValueExW( patch_key, szState, 0, REG_DWORD, (const BYTE *)&patch->state, + sizeof(patch->state) ); + if (res != ERROR_SUCCESS) + { + RegCloseKey( patch_key ); + goto done; + } + + res = RegSetValueExW( patch_key, szUninstallable, 0, REG_DWORD, (const BYTE *)&patch->uninstallable, + sizeof(patch->uninstallable) ); RegCloseKey( patch_key ); if (res != ERROR_SUCCESS) goto done; Modified: trunk/reactos/dll/win32/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/install.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/install.c [iso-8859-1] Sat Jun 3 22:29:55 2017 @@ -1174,11 +1174,11 @@ static INT feature_cost( MSIFEATURE *feature ) { INT cost = 0; - MSICOMPONENT *comp; - - LIST_FOR_EACH_ENTRY( comp, &feature->Components, MSICOMPONENT, entry ) - { - cost += comp->Cost; + ComponentList *cl; + + LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) + { + cost += cl->component->Cost; } return cost; } Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=74… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] Sat Jun 3 22:29:55 2017 @@ -1051,26 +1051,26 @@ return rc; } -static LPWSTR msi_reg_get_value(HKEY hkey, LPCWSTR name, DWORD *type) -{ - DWORD dval; +static WCHAR *reg_get_value( HKEY hkey, const WCHAR *name, DWORD *type ) +{ LONG res; - WCHAR temp[20]; - - static const WCHAR format[] = {'%','d',0}; - - res = RegQueryValueExW(hkey, name, NULL, type, NULL, NULL); - if (res != ERROR_SUCCESS) - return NULL; - - if (*type == REG_SZ) - return msi_reg_get_val_str(hkey, name); - - if (!msi_reg_get_val_dword(hkey, name, &dval)) - return NULL; - - sprintfW(temp, format, dval); - return strdupW(temp); + + if ((res = RegQueryValueExW( hkey, name, NULL, type, NULL, NULL )) != ERROR_SUCCESS) return NULL; + + if (*type == REG_SZ) return msi_reg_get_val_str( hkey, name ); + if (*type == REG_DWORD) + { + static const WCHAR fmt[] = {'%','u',0}; + WCHAR temp[11]; + DWORD val; + + if (!msi_reg_get_val_dword( hkey, name, &val )) return NULL; + sprintfW( temp, fmt, val ); + return strdupW( temp ); + } + + ERR( "unhandled value type %u\n", *type ); + return NULL; } static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, @@ -1144,7 +1144,7 @@ else if (!strcmpW( szAttribute, INSTALLPROPERTY_VERSIONSTRINGW )) szAttribute = display_version; - val = msi_reg_get_value(userdata, szAttribute, &type); + val = reg_get_value(userdata, szAttribute, &type); if (!val) val = empty; RegCloseKey(userdata); @@ -1178,7 +1178,7 @@ goto done; } - val = msi_reg_get_value(source, szAttribute, &type); + val = reg_get_value(source, szAttribute, &type); if (!val) val = empty; @@ -1186,7 +1186,7 @@ } else { - val = msi_reg_get_value(prodkey, szAttribute, &type); + val = reg_get_value(prodkey, szAttribute, &type); if (!val) val = empty; } @@ -1468,7 +1468,7 @@ !strcmpW( szProperty, INSTALLPROPERTY_REGOWNERW ) || !strcmpW( szProperty, INSTALLPROPERTY_INSTANCETYPEW )) { - val = msi_reg_get_value(props, package, &type); + val = reg_get_value(props, package, &type); if (!val) { if (prod || classes) @@ -1484,7 +1484,7 @@ else if (!strcmpW( szProperty, INSTALLPROPERTY_VERSIONSTRINGW )) szProperty = displayversion; - val = msi_reg_get_value(props, szProperty, &type); + val = reg_get_value(props, szProperty, &type); if (!val) val = strdupW(szEmpty); @@ -1509,7 +1509,7 @@ else if (dwContext == MSIINSTALLCONTEXT_MACHINE) hkey = classes; - val = msi_reg_get_value(hkey, szProperty, &type); + val = reg_get_value(hkey, szProperty, &type); if (!val) val = strdupW(szEmpty); @@ -1521,7 +1521,7 @@ { if (props) { - val = msi_reg_get_value(props, package, &type); + val = reg_get_value(props, package, &type); if (!val) goto done; @@ -1534,7 +1534,7 @@ r = msi_copy_outval(val, szValue, pcchValue); goto done; } - else if (props && (val = msi_reg_get_value(props, package, &type))) + else if (props && (val = reg_get_value(props, package, &type))) { msi_free(val); val = strdupW(five); @@ -1569,6 +1569,22 @@ msi_free(val); return r; +} + +UINT WINAPI MsiGetPatchFileListA(LPCSTR szProductCode, LPCSTR szPatchList, + LPDWORD pcFiles, MSIHANDLE **pphFileRecords) +{ + FIXME("(%s, %s, %p, %p) stub!\n", debugstr_a(szProductCode), + debugstr_a(szPatchList), pcFiles, pphFileRecords); + return ERROR_FUNCTION_FAILED; +} + +UINT WINAPI MsiGetPatchFileListW(LPCWSTR szProductCode, LPCWSTR szPatchList, + LPDWORD pcFiles, MSIHANDLE **pphFileRecords) +{ + FIXME("(%s, %s, %p, %p) stub!\n", debugstr_w(szProductCode), + debugstr_w(szPatchList), pcFiles, pphFileRecords); + return ERROR_FUNCTION_FAILED; } UINT WINAPI MsiGetPatchInfoExA(LPCSTR szPatchCode, LPCSTR szProductCode, @@ -1650,7 +1666,7 @@ HKEY udpatch = 0, datakey = 0; HKEY prodpatches = 0; UINT r = ERROR_UNKNOWN_PRODUCT; - DWORD len; + DWORD len, type; LONG res; TRACE("(%s, %s, %s, %d, %s, %p, %p)\n", debugstr_w(szPatchCode), @@ -1742,7 +1758,7 @@ } } - val = msi_reg_get_val_str(datakey, szProperty); + val = reg_get_value(datakey, szProperty, &type); if (!val) val = strdupW(szEmpty); @@ -2754,8 +2770,28 @@ return r; } -static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, - awstring* lpPathBuf, LPDWORD pcchBuf) +static BOOL open_userdata_comp_key( const WCHAR *comp, const WCHAR *usersid, MSIINSTALLCONTEXT ctx, + HKEY *hkey ) +{ + if (ctx & MSIINSTALLCONTEXT_MACHINE) + { + if (!MSIREG_OpenUserDataComponentKey( comp, szLocalSid, hkey, FALSE )) return TRUE; + } + if (ctx & (MSIINSTALLCONTEXT_USERMANAGED|MSIINSTALLCONTEXT_USERUNMANAGED)) + { + if (usersid && !strcmpiW( usersid, szAllSid )) + { + FIXME( "only looking at the current user\n" ); + usersid = NULL; + } + if (!MSIREG_OpenUserDataComponentKey( comp, usersid, hkey, FALSE )) return TRUE; + } + return FALSE; +} + +static INSTALLSTATE MSI_GetComponentPath( const WCHAR *szProduct, const WCHAR *szComponent, + const WCHAR *szUserSid, MSIINSTALLCONTEXT ctx, + awstring *lpPathBuf, DWORD *pcchBuf ) { static const WCHAR wininstaller[] = {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; @@ -2773,20 +2809,20 @@ if (!squash_guid( szProduct, squashed_pc ) || !squash_guid( szComponent, squashed_comp )) return INSTALLSTATE_INVALIDARG; + if (szUserSid && ctx == MSIINSTALLCONTEXT_MACHINE) + return INSTALLSTATE_INVALIDARG; + state = INSTALLSTATE_UNKNOWN; - if (MSIREG_OpenUserDataComponentKey(szComponent, szLocalSid, &hkey, FALSE) == ERROR_SUCCESS || - MSIREG_OpenUserDataComponentKey(szComponent, NULL, &hkey, FALSE) == ERROR_SUCCESS) + if (open_userdata_comp_key( szComponent, szUserSid, ctx, &hkey )) { path = msi_reg_get_val_str( hkey, squashed_pc ); RegCloseKey(hkey); state = INSTALLSTATE_ABSENT; - if ((MSIREG_OpenInstallProps(szProduct, MSIINSTALLCONTEXT_MACHINE, NULL, - &hkey, FALSE) == ERROR_SUCCESS || - MSIREG_OpenUserDataProductKey(szProduct, MSIINSTALLCONTEXT_USERUNMANAGED, - NULL, &hkey, FALSE) == ERROR_SUCCESS) && + if ((!MSIREG_OpenInstallProps(szProduct, MSIINSTALLCONTEXT_MACHINE, NULL, &hkey, FALSE) || + !MSIREG_OpenUserDataProductKey(szProduct, MSIINSTALLCONTEXT_USERUNMANAGED, NULL, &hkey, FALSE)) && msi_reg_get_val_dword(hkey, wininstaller, &version) && GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES) { @@ -2796,16 +2832,12 @@ } if (state != INSTALLSTATE_LOCAL && - (MSIREG_OpenProductKey(szProduct, NULL, - MSIINSTALLCONTEXT_USERUNMANAGED, - &hkey, FALSE) == ERROR_SUCCESS || - MSIREG_OpenProductKey(szProduct, NULL, MSIINSTALLCONTEXT_MACHINE, - &hkey, FALSE) == ERROR_SUCCESS)) + (!MSIREG_OpenProductKey(szProduct, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, &hkey, FALSE) || + !MSIREG_OpenProductKey(szProduct, NULL, MSIINSTALLCONTEXT_MACHINE, &hkey, FALSE))) { RegCloseKey(hkey); - if (MSIREG_OpenUserDataComponentKey(szComponent, szLocalSid, &hkey, FALSE) == ERROR_SUCCESS || - MSIREG_OpenUserDataComponentKey(szComponent, NULL, &hkey, FALSE) == ERROR_SUCCESS) + if (open_userdata_comp_key( szComponent, szUserSid, ctx, &hkey )) { msi_free(path); path = msi_reg_get_val_str( hkey, squashed_pc ); @@ -2832,51 +2864,63 @@ } /****************************************************************** + * MsiGetComponentPathExW [MSI.@] + */ +INSTALLSTATE WINAPI MsiGetComponentPathExW( LPCWSTR product, LPCWSTR comp, LPCWSTR usersid, + MSIINSTALLCONTEXT ctx, LPWSTR buf, LPDWORD buflen ) +{ + awstring path; + + TRACE( "%s %s %s 0x%x %p %p\n", debugstr_w(product), debugstr_w(comp), debugstr_w(usersid), + ctx, buf, buflen ); + + path.unicode = TRUE; + path.str.w = buf; + + return MSI_GetComponentPath( product, comp, usersid, ctx, &path, buflen ); +} + +INSTALLSTATE WINAPI MsiGetComponentPathExA( LPCSTR product, LPCSTR comp, LPCSTR usersid, + MSIINSTALLCONTEXT ctx, LPSTR buf, LPDWORD buflen ) +{ + WCHAR *productW = NULL, *compW = NULL, *usersidW = NULL; + INSTALLSTATE r = INSTALLSTATE_UNKNOWN; + awstring path; + + TRACE( "%s %s %s 0x%x %p %p\n", debugstr_a(product), debugstr_a(comp), debugstr_a(usersid), + ctx, buf, buflen ); + + if (product && !(productW = strdupAtoW( product ))) return INSTALLSTATE_UNKNOWN; + if (comp && !(compW = strdupAtoW( comp ))) goto end; + if (usersid && !(usersidW = strdupAtoW( usersid ))) goto end; + + path.unicode = FALSE; + path.str.a = buf; + + r = MSI_GetComponentPath( productW, compW, usersidW, ctx, &path, buflen ); + +end: + msi_free( productW ); + msi_free( compW ); + msi_free( usersidW ); + + return r; +} + +/****************************************************************** * MsiGetComponentPathW [MSI.@] */ -INSTALLSTATE WINAPI MsiGetComponentPathW(LPCWSTR szProduct, LPCWSTR szComponent, - LPWSTR lpPathBuf, LPDWORD pcchBuf) -{ - awstring path; - - TRACE("%s %s %p %p\n", debugstr_w(szProduct), debugstr_w(szComponent), lpPathBuf, pcchBuf); - - path.unicode = TRUE; - path.str.w = lpPathBuf; - - return MSI_GetComponentPath( szProduct, szComponent, &path, pcchBuf ); +INSTALLSTATE WINAPI MsiGetComponentPathW( LPCWSTR product, LPCWSTR comp, LPWSTR buf, LPDWORD buflen ) +{ + return MsiGetComponentPathExW( product, comp, szAllSid, MSIINSTALLCONTEXT_ALL, buf, buflen ); } /****************************************************************** * MsiGetComponentPathA [MSI.@] */ -INSTALLSTATE WINAPI MsiGetComponentPathA(LPCSTR szProduct, LPCSTR szComponent, - LPSTR lpPathBuf, LPDWORD pcchBuf) -{ - LPWSTR szwProduct, szwComponent = NULL; - INSTALLSTATE r = INSTALLSTATE_UNKNOWN; - awstring path; - - TRACE("%s %s %p %p\n", debugstr_a(szProduct), debugstr_a(szComponent), lpPathBuf, pcchBuf); - - szwProduct = strdupAtoW( szProduct ); - if( szProduct && !szwProduct) - goto end; - - szwComponent = strdupAtoW( szComponent ); - if( szComponent && !szwComponent ) - goto end; - - path.unicode = FALSE; - path.str.a = lpPathBuf; - - r = MSI_GetComponentPath( szwProduct, szwComponent, &path, pcchBuf ); - -end: - msi_free( szwProduct ); - msi_free( szwComponent ); - - return r; +INSTALLSTATE WINAPI MsiGetComponentPathA( LPCSTR product, LPCSTR comp, LPSTR buf, LPDWORD buflen ) +{ + return MsiGetComponentPathExA( product, comp, "s-1-1-0", MSIINSTALLCONTEXT_ALL, buf, buflen ); } static UINT query_feature_state( const WCHAR *product, const WCHAR *squashed, const WCHAR *usersid, @@ -3398,7 +3442,7 @@ StringFromGUID2( &guid, comp, sizeof(comp)/sizeof(comp[0]) ); } - state = MSI_GetComponentPath( szProduct, comp, lpPathBuf, pcchPathBuf ); + state = MSI_GetComponentPath( szProduct, comp, szAllSid, MSIINSTALLCONTEXT_ALL, lpPathBuf, pcchPathBuf ); if (state == INSTALLSTATE_MOREDATA) return ERROR_MORE_DATA; if (state != INSTALLSTATE_LOCAL) return ERROR_FILE_NOT_FOUND; Modified: trunk/reactos/dll/win32/msi/msi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.spec [iso-8859-1] Sat Jun 3 22:29:55 2017 @@ -20,8 +20,8 @@ 24 stdcall MsiDatabaseGenerateTransformW(long long wstr long long) 25 stdcall MsiDatabaseGetPrimaryKeysA(long str ptr) 26 stdcall MsiDatabaseGetPrimaryKeysW(long wstr ptr) -27 stdcall MsiDatabaseImportA(str str long) -28 stdcall MsiDatabaseImportW(wstr wstr long) +27 stdcall MsiDatabaseImportA(str str str) +28 stdcall MsiDatabaseImportW(wstr wstr wstr) 29 stdcall MsiDatabaseMergeA(long long str) 30 stdcall MsiDatabaseMergeW(long long wstr) 31 stdcall MsiDatabaseOpenViewA(long str ptr) @@ -189,10 +189,10 @@ 193 stdcall MsiUseFeatureExW(wstr wstr long long) 194 stdcall MsiGetFileVersionA(str ptr ptr ptr ptr) 195 stdcall MsiGetFileVersionW(wstr ptr ptr ptr ptr) -196 stdcall MsiLoadStringA(long long long long long) -197 stdcall MsiLoadStringW(long long long long long) -198 stdcall MsiMessageBoxA(long long long long long long) -199 stdcall MsiMessageBoxW(long long long long long long) +196 stdcall MsiLoadStringA(long long ptr long long) +197 stdcall MsiLoadStringW(long long ptr long long) +198 stdcall MsiMessageBoxA(long str str long long long) +199 stdcall MsiMessageBoxW(long wstr wstr long long long) 200 stdcall MsiDecomposeDescriptorA(str ptr ptr ptr ptr) 201 stdcall MsiDecomposeDescriptorW(wstr ptr ptr ptr ptr) 202 stdcall MsiProvideQualifiedComponentExA(str str long str long long ptr ptr) @@ -275,8 +275,8 @@ 279 stdcall MsiMessageBoxExA(long str str long long long long) 280 stdcall MsiMessageBoxExW(long wstr wstr long long long long) 281 stdcall MsiSetExternalUIRecord(ptr long ptr ptr) -282 stub MsiGetPatchFileListA -283 stub MsiGetPatchFileListW +282 stdcall MsiGetPatchFileListA(str str ptr ptr) +283 stdcall MsiGetPatchFileListW(wstr wstr ptr ptr) 284 stdcall MsiBeginTransactionA(str long ptr ptr) 285 stdcall MsiBeginTransactionW(wstr long ptr ptr) 286 stdcall MsiEndTransaction(long) @@ -286,8 +286,8 @@ 290 stdcall MsiEnumComponentsExW(wstr long long ptr ptr ptr ptr) 291 stdcall MsiEnumClientsExA(str str long long ptr ptr ptr ptr) 292 stdcall MsiEnumClientsExW(wstr wstr long long ptr ptr ptr ptr) -293 stub MsiGetComponentPathExA -294 stub MsiGetComponentPathExW +293 stdcall MsiGetComponentPathExA(str str str long ptr ptr) +294 stdcall MsiGetComponentPathExW(wstr wstr wstr long ptr ptr) 295 stub QueryInstanceCount @ stdcall -private DllCanUnloadNow() Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… ============================================================================== --- trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] Sat Jun 3 22:29:55 2017 @@ -206,6 +206,7 @@ LPWSTR filename; LPWSTR localfile; MSIPATCHSTATE state; + DWORD uninstallable; BOOL delete_on_close; BOOL registered; UINT disk_id; @@ -1213,6 +1214,7 @@ static const WCHAR szLangResource[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n',0}; static const WCHAR szInstallLocation[] = {'I','n','s','t','a','l','l','L','o','c','a','t','i','o','n',0}; static const WCHAR szProperty[] = {'P','r','o','p','e','r','t','y',0}; +static const WCHAR szUninstallable[] = {'U','n','i','n','s','t','a','l','l','a','b','l','e',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1); Modified: trunk/reactos/dll/win32/msi/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/patch.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/patch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/patch.c [iso-8859-1] Sat Jun 3 22:29:55 2017 @@ -827,6 +827,38 @@ return r; } +static DWORD is_uninstallable( MSIDATABASE *db ) +{ + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','`','V','a','l','u','e','`',' ','F','R','O','M',' ', + '`','M','s','i','P','a','t','c','h','M','e','t','a','d','a','t','a','`',' ', + 'W','H','E','R','E',' ','`','C','o','m','p','a','n','y','`',' ','I','S',' ', + 'N','U','L','L',' ','A','N','D',' ','`','P','r','o','p','e','r','t','y','`','=', + '\'','A','l','l','o','w','R','e','m','o','v','a','l','\'',0}; + MSIQUERY *view; + MSIRECORD *rec; + DWORD ret = 0; + + if (MSI_DatabaseOpenViewW( db, query, &view ) != ERROR_SUCCESS) return 0; + if (MSI_ViewExecute( view, 0 ) != ERROR_SUCCESS) + { + msiobj_release( &view->hdr ); + return 0; + } + + if (MSI_ViewFetch( view, &rec ) == ERROR_SUCCESS) + { + const WCHAR *value = MSI_RecordGetString( rec, 1 ); + ret = atoiW( value ); + msiobj_release( &rec->hdr ); + } + + FIXME( "check other criteria\n" ); + + msiobj_release( &view->hdr ); + return ret; +} + static UINT msi_apply_patch_db( MSIPACKAGE *package, MSIDATABASE *patch_db, MSIPATCHINFO *patch ) { UINT i, r = ERROR_SUCCESS; @@ -852,7 +884,8 @@ if (r != ERROR_SUCCESS) return r; - patch->state = MSIPATCHSTATE_APPLIED; + patch->uninstallable = is_uninstallable( patch_db ); + patch->state = MSIPATCHSTATE_APPLIED; list_add_tail( &package->patches, &patch->entry ); return ERROR_SUCCESS; } Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/table.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/table.c [iso-8859-1] Sat Jun 3 22:29:55 2017 @@ -405,13 +405,11 @@ goto err; } - t->row_count = rawsize / row_size; - t->data = msi_alloc_zero( t->row_count * sizeof (USHORT*) ); - if( !t->data ) - goto err; - t->data_persistent = msi_alloc_zero( t->row_count * sizeof(BOOL)); - if ( !t->data_persistent ) - goto err; + if ((t->row_count = rawsize / row_size)) + { + if (!(t->data = msi_alloc_zero( t->row_count * sizeof(USHORT *) ))) goto err; + if (!(t->data_persistent = msi_alloc_zero( t->row_count * sizeof(BOOL) ))) goto err; + } /* transpose all the data */ TRACE("Transposing data from %d rows\n", t->row_count ); Modified: trunk/reactos/dll/win32/msi/tokenize.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/tokenize.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/tokenize.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/tokenize.c [iso-8859-1] Sat Jun 3 22:29:55 2017 @@ -180,6 +180,21 @@ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* Fx */ }; +/* +** WCHAR safe version of isdigit() +*/ +static inline int isDigit(WCHAR c) +{ + return c >= '0' && c <= '9'; +} + +/* +** WCHAR safe version of isspace(), except '\r' +*/ +static inline int isSpace(WCHAR c) +{ + return c == ' ' || c == '\t' || c == '\n' || c == '\f'; +} /* ** Return the length of the token that begins at z[0]. Return @@ -192,7 +207,7 @@ *skip = 0; switch( *z ){ case ' ': case '\t': case '\n': case '\f': - for(i=1; isspace(z[i]) && z[i] != '\r'; i++){} + for(i=1; isSpace(z[i]); i++){} *tokenType = TK_SPACE; return i; case '-': @@ -258,7 +273,7 @@ return i; } case '.': - if( !isdigit(z[1]) ){ + if( !isDigit(z[1]) ){ *tokenType = TK_DOT; return 1; } @@ -266,7 +281,7 @@ case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': *tokenType = TK_INTEGER; - for(i=1; isdigit(z[i]); i++){} + for(i=1; isDigit(z[i]); i++){} return i; case '[': for(i=1; z[i] && z[i-1]!=']'; i++){} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jun 3 22:29:55 2017 @@ -112,7 +112,7 @@ reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.9.11 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 -reactos/dll/win32/msi # Synced to WineStaging-2.2 +reactos/dll/win32/msi # Synced to WineStaging-2.9 reactos/dll/win32/msimg32 # Synced to WineStaging-1.9.11 reactos/dll/win32/msimtf # Synced to WineStaging-1.9.23 reactos/dll/win32/msisip # Synced to WineStaging-1.9.11

1 0

[akhaldi] 74817: [MSCTF_WINETEST] Sync with Wine Staging 2.9. CORE-13362
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 22:29:38 2017 New Revision: 74817 URL: http://svn.reactos.org/svn/reactos?rev=74817&view=rev Log: [MSCTF_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/msctf/inputprocessor.c Modified: trunk/rostests/winetests/msctf/inputprocessor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/inputproc… ============================================================================== --- trunk/rostests/winetests/msctf/inputprocessor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msctf/inputprocessor.c [iso-8859-1] Sat Jun 3 22:29:38 2017 @@ -1692,6 +1692,7 @@ ITfContext_Release(cxt); ITfContext_Release(cxt2); ITfContext_Release(cxt3); + ITextStoreACP_Release(ts); } static void test_endSession(void)

1 0

[akhaldi] 74816: [MSCMS] Sync with Wine Staging 2.9. CORE-13362 cd55d5d mscms: Fix some spec file entries.
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 22:29:30 2017 New Revision: 74816 URL: http://svn.reactos.org/svn/reactos?rev=74816&view=rev Log: [MSCMS] Sync with Wine Staging 2.9. CORE-13362 cd55d5d mscms: Fix some spec file entries. Modified: trunk/reactos/dll/win32/mscms/mscms.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mscms/mscms.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/mscms.spec… ============================================================================== --- trunk/reactos/dll/win32/mscms/mscms.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/mscms.spec [iso-8859-1] Sat Jun 3 22:29:30 2017 @@ -1,5 +1,5 @@ -@ stdcall AssociateColorProfileWithDeviceA(ptr ptr ptr) -@ stdcall AssociateColorProfileWithDeviceW(ptr ptr ptr) +@ stdcall AssociateColorProfileWithDeviceA(str str str) +@ stdcall AssociateColorProfileWithDeviceW(wstr wstr wstr) @ stdcall CheckBitmapBits(ptr ptr ptr long long long ptr ptr long) @ stdcall CheckColors(ptr ptr long long ptr) @ stdcall CloseColorProfile(ptr) @@ -12,14 +12,14 @@ @ stdcall CreateProfileFromLogColorSpaceA(ptr ptr) @ stdcall CreateProfileFromLogColorSpaceW(ptr ptr) @ stdcall DeleteColorTransform(ptr) -@ stdcall DisassociateColorProfileFromDeviceA(ptr ptr ptr) -@ stdcall DisassociateColorProfileFromDeviceW(ptr ptr ptr) -@ stdcall EnumColorProfilesA(ptr ptr ptr ptr ptr) -@ stdcall EnumColorProfilesW(ptr ptr ptr ptr ptr) +@ stdcall DisassociateColorProfileFromDeviceA(str str str) +@ stdcall DisassociateColorProfileFromDeviceW(wstr wstr wstr) +@ stdcall EnumColorProfilesA(str ptr ptr ptr ptr) +@ stdcall EnumColorProfilesW(wstr ptr ptr ptr ptr) @ stdcall GenerateCopyFilePaths(wstr wstr ptr long ptr ptr ptr ptr long) @ stdcall GetCMMInfo(ptr long) -@ stdcall GetColorDirectoryA(ptr ptr ptr) -@ stdcall GetColorDirectoryW(ptr ptr ptr) +@ stdcall GetColorDirectoryA(str ptr ptr) +@ stdcall GetColorDirectoryW(wstr ptr ptr) @ stdcall GetColorProfileElement(ptr long long ptr ptr ptr) @ stdcall GetColorProfileElementTag(ptr long ptr) @ stdcall GetColorProfileFromHandle(ptr ptr ptr) @@ -29,10 +29,10 @@ @ stdcall GetPS2ColorRenderingDictionary(ptr long ptr ptr ptr) @ stdcall GetPS2ColorRenderingIntent(ptr long ptr ptr) @ stdcall GetPS2ColorSpaceArray(ptr long long ptr ptr ptr) -@ stdcall GetStandardColorSpaceProfileA(ptr long ptr ptr) -@ stdcall GetStandardColorSpaceProfileW(ptr long ptr ptr) -@ stdcall InstallColorProfileA(ptr ptr) -@ stdcall InstallColorProfileW(ptr ptr) +@ stdcall GetStandardColorSpaceProfileA(str long ptr ptr) +@ stdcall GetStandardColorSpaceProfileW(wstr long ptr ptr) +@ stdcall InstallColorProfileA(str str) +@ stdcall InstallColorProfileW(wstr wstr) @ stub InternalGetDeviceConfig @ stub InternalGetPS2CSAFromLCS @ stub InternalGetPS2ColorRenderingDictionary @@ -43,19 +43,19 @@ @ stdcall IsColorProfileValid(ptr ptr) @ stdcall OpenColorProfileA(ptr long long long) @ stdcall OpenColorProfileW(ptr long long long) -@ stdcall RegisterCMMA(ptr long ptr) -@ stdcall RegisterCMMW(ptr long ptr) +@ stdcall RegisterCMMA(str long str) +@ stdcall RegisterCMMW(wstr long wstr) @ stdcall SelectCMM(long) @ stdcall SetColorProfileElement(ptr long long ptr ptr) @ stdcall SetColorProfileElementReference(ptr long long) @ stdcall SetColorProfileElementSize(ptr long long) @ stdcall SetColorProfileHeader(ptr ptr) -@ stdcall SetStandardColorSpaceProfileA(ptr long ptr) -@ stdcall SetStandardColorSpaceProfileW(ptr long ptr) +@ stdcall SetStandardColorSpaceProfileA(str long str) +@ stdcall SetStandardColorSpaceProfileW(wstr long wstr) @ stdcall SpoolerCopyFileEvent(wstr wstr long) @ stdcall TranslateBitmapBits(ptr ptr long long long long ptr long long ptr long) @ stdcall TranslateColors(ptr ptr long long ptr long) -@ stdcall UninstallColorProfileA(ptr ptr long) -@ stdcall UninstallColorProfileW(ptr ptr long) -@ stdcall UnregisterCMMA(ptr long) -@ stdcall UnregisterCMMW(ptr long) +@ stdcall UninstallColorProfileA(str str long) +@ stdcall UninstallColorProfileW(wstr wstr long) +@ stdcall UnregisterCMMA(str long) +@ stdcall UnregisterCMMW(wstr long) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jun 3 22:29:30 2017 @@ -104,7 +104,7 @@ reactos/dll/win32/msacm32.drv # Synced to WineStaging-1.9.11 reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.9.11 reactos/dll/win32/mscat32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/mscms # Synced to WineStaging-2.2 +reactos/dll/win32/mscms # Synced to WineStaging-2.9 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to WineStaging-2.2 reactos/dll/win32/msftedit # Synced to WineStaging-1.9.11

1 0

[akhaldi] 74815: [MPR_WINETEST] Sync with Wine Staging 2.9. CORE-13362
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 22:29:16 2017 New Revision: 74815 URL: http://svn.reactos.org/svn/reactos?rev=74815&view=rev Log: [MPR_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/mpr/mpr.c Modified: trunk/rostests/winetests/mpr/mpr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mpr/mpr.c?rev=7… ============================================================================== --- trunk/rostests/winetests/mpr/mpr.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mpr/mpr.c [iso-8859-1] Sat Jun 3 22:29:16 2017 @@ -259,54 +259,56 @@ static void test_WNetUseConnection(void) { - DWORD ret; - DWORD bufSize; - DWORD outRes; + DWORD ret, bufSize, outRes; LPNETRESOURCEA netRes; - CHAR outBuf[4]; - - if (pWNetUseConnectionA) + char outBuf[4], drive[] = "J:", letter; + + if (!pWNetUseConnectionA) { - netRes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NETRESOURCEA) + sizeof("\\\\127.0.0.1\\c$") + sizeof("J:")); - netRes->dwType = RESOURCETYPE_DISK; - netRes->dwDisplayType = RESOURCEDISPLAYTYPE_SHARE; - netRes->dwUsage = RESOURCEUSAGE_CONNECTABLE; - netRes->lpLocalName = (LPSTR)((LPBYTE)netRes + sizeof(NETRESOURCEA)); - netRes->lpRemoteName = (LPSTR)((LPBYTE)netRes + sizeof(NETRESOURCEA) + sizeof("J:")); - strcpy(netRes->lpLocalName, "J:"); + win_skip("WNetUseConnection() is not supported.\n"); + return; + } + netRes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NETRESOURCEA) + sizeof("\\\\127.0.0.1\\c$") + sizeof("J:")); + netRes->dwType = RESOURCETYPE_DISK; + netRes->dwDisplayType = RESOURCEDISPLAYTYPE_SHARE; + netRes->dwUsage = RESOURCEUSAGE_CONNECTABLE; + netRes->lpLocalName = (LPSTR)((LPBYTE)netRes + sizeof(NETRESOURCEA)); + netRes->lpRemoteName = (LPSTR)((LPBYTE)netRes + sizeof(NETRESOURCEA) + sizeof("J:")); + + for (letter = 'J'; letter <= 'Z'; letter++) + { + drive[0] = letter; + strcpy(netRes->lpLocalName, drive); strcpy(netRes->lpRemoteName, "\\\\127.0.0.1\\c$"); bufSize = 0; ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, NULL, &bufSize, &outRes); - todo_wine - ok(ret == WN_SUCCESS, "Unexpected return: %u\n", ret); - ok(bufSize == 0, "Unexpected buffer size: %u\n", bufSize); - if (ret == WN_SUCCESS) - WNetCancelConnectionA("J:", TRUE); - bufSize = 0; - ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); - todo_wine - ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return: %u\n", ret); - ok(bufSize == 0, "Unexpected buffer size: %u\n", bufSize); - if (ret == WN_SUCCESS) - WNetCancelConnectionA("J:", TRUE); - bufSize = 1; - todo_wine { - ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); - ok(ret == ERROR_MORE_DATA, "Unexpected return: %u\n", ret); - ok(bufSize == 3, "Unexpected buffer size: %u\n", bufSize); - if (ret == WN_SUCCESS) - WNetCancelConnectionA("J:", TRUE); - bufSize = 4; - ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); - ok(ret == WN_SUCCESS, "Unexpected return: %u\n", ret); - } - ok(bufSize == 4, "Unexpected buffer size: %u\n", bufSize); - if (ret == WN_SUCCESS) - WNetCancelConnectionA("J:", TRUE); - HeapFree(GetProcessHeap(), 0, netRes); - } else { - win_skip("WNetUseConnection() is not supported.\n"); - } + if (ret == ERROR_ALREADY_ASSIGNED) continue; + } + todo_wine ok(ret == WN_SUCCESS, "Unexpected return: %u\n", ret); + ok(bufSize == 0, "Unexpected buffer size: %u\n", bufSize); + if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); + + bufSize = 0; + ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); + todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return: %u\n", ret); + ok(bufSize == 0, "Unexpected buffer size: %u\n", bufSize); + if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); + + todo_wine { + bufSize = 1; + ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); + ok(ret == ERROR_MORE_DATA, "Unexpected return: %u\n", ret); + ok(bufSize == 3, "Unexpected buffer size: %u\n", bufSize); + if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); + + bufSize = 4; + ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); + ok(ret == WN_SUCCESS, "Unexpected return: %u\n", ret); + } + ok(bufSize == 4, "Unexpected buffer size: %u\n", bufSize); + if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); + + HeapFree(GetProcessHeap(), 0, netRes); } START_TEST(mpr)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs