November 2017 - Wine-Devel - list.winehq.org

[PATCH] mshtml: Make sure actual host length matches returned BSTR length
by Nikolay Sivov Nov. 22, 2017

Nov. 22, 2017

The issue our jscript gets confused by embedded NULs, something like --- var a = "prefix://" + document.location.host + "suffix"; --- can give "prefix://host:80\0\0\0suffix". Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/htmllocation.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index de66ff5670..59b20f614d 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -351,13 +351,16 @@ static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p) if(url.nPort) { /* <hostname>:<port> */ const WCHAR format[] = {'%','u',0}; - DWORD len = url.dwHostNameLength + 1 + 5; + DWORD len, port_len; + WCHAR portW[6]; WCHAR *buf; + port_len = snprintfW(portW, sizeof(portW)/sizeof(portW[0]), format, url.nPort); + len = url.dwHostNameLength + 1 /* ':' */ + port_len; buf = *p = SysAllocStringLen(NULL, len); memcpy(buf, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); buf[url.dwHostNameLength] = ':'; - snprintfW(buf + url.dwHostNameLength + 1, 6, format, url.nPort); + memcpy(buf + url.dwHostNameLength + 1, portW, port_len * sizeof(WCHAR)); }else *p = SysAllocStringLen(url.lpszHostName, url.dwHostNameLength); -- 2.15.0

2 1

[PATCH] wintrust: Version to 6.1.7601.23769.
by Jactry Zeng Nov. 22, 2017

Nov. 22, 2017

Installer of Google drive will check wintrust's version to make sure Windows security update was installed. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/wintrust/version.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH] ole32: Rename structure member to target device size.
by Huw Davies Nov. 22, 2017

Nov. 22, 2017

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 5 +++-- dlls/ole32/tests/ole2.c | 13 +++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 48453b4d52..0256957419 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -79,7 +79,8 @@ typedef struct PresentationDataHeader * DWORD length; * CHAR format_name[length]; (null-terminated) */ - DWORD unknown3; /* 4, possibly TYMED_ISTREAM */ + DWORD tdSize; /* This is actually a truncated DVTARGETDEVICE, if tdSize > sizeof(DWORD) + then there are tdSize - sizeof(DWORD) more bytes before dvAspect */ DVASPECT dvAspect; DWORD lindex; DWORD advf; @@ -808,7 +809,7 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag if (cache_entry->fmtetc.ptd) FIXME("ptd not serialized\n"); - header.unknown3 = 4; + header.tdSize = sizeof(header.tdSize); header.dvAspect = cache_entry->fmtetc.dwAspect; header.lindex = cache_entry->fmtetc.lindex; header.advf = cache_entry->advise_flags; diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 07157a7dd6..a72985e239 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -143,7 +143,8 @@ typedef struct PresentationDataHeader * DWORD length; * CHAR format_name[length]; (null-terminated) */ - DWORD unknown3; /* 4, possibly TYMED_ISTREAM */ + DWORD tdSize; /* This is actually a truncated DVTARGETDEVICE, if tdSize > sizeof(DWORD) + then there are tdSize - sizeof(DWORD) more bytes before dvAspect */ DVASPECT dvAspect; DWORD lindex; DWORD advf; @@ -1279,7 +1280,7 @@ static void test_OleLoad(IStorage *pStorage) break; } - header.unknown3 = 4; + header.tdSize = sizeof(header.tdSize); header.dvAspect = DVASPECT_CONTENT; header.lindex = -1; header.advf = 1 << i; @@ -3691,7 +3692,7 @@ static void test_data_cache_save(void) hr = IStream_Write(stm, clipformat, sizeof(clipformat), NULL); ok(hr == S_OK, "unexpected %#x\n", hr); - hdr.unknown3 = 4; + hdr.tdSize = sizeof(hdr.tdSize); hdr.dvAspect = DVASPECT_CONTENT; hdr.lindex = -1; hdr.advf = ADVF_PRIMEFIRST; @@ -3966,8 +3967,8 @@ static void check_storage_contents(IStorage *stg, const struct storage_def *stg_ ok(bytes >= 24, "read %u bytes\n", bytes); if (winetest_debug > 1) - trace("header: unknown3 %#x, dvAspect %#x, lindex %#x, advf %#x, unknown7 %#x, dwObjectExtentX %#x, dwObjectExtentY %#x, dwSize %#x\n", - header.unknown3, header.dvAspect, header.lindex, header.advf, header.unknown7, + trace("header: tdSize %#x, dvAspect %#x, lindex %#x, advf %#x, unknown7 %#x, dwObjectExtentX %#x, dwObjectExtentY %#x, dwSize %#x\n", + header.tdSize, header.dvAspect, header.lindex, header.advf, header.unknown7, header.dwObjectExtentX, header.dwObjectExtentY, header.dwSize); } @@ -4049,7 +4050,7 @@ static IStorage *create_storage_from_def(const struct storage_def *stg_def) } ok(hr == S_OK, "unexpected %#x\n", hr); - hdr.unknown3 = 4; + hdr.tdSize = sizeof(hdr.tdSize); hdr.dvAspect = stg_def->stream[i].dvAspect; hdr.lindex = -1; hdr.advf = stg_def->stream[i].advf; -- 2.12.0

1 0

Wine Vulkan ICD repository
by Roderick Colenbrander Nov. 22, 2017

Nov. 22, 2017

Hi all, I have created a temporary Wine fork containing my Vulkan ICD work at: https://github.com/roderickc/wine-vulkan The repo is meant to show the current design without having to spam wine-devel with a ton of patches. I rebased all my code and split it up well. There are a few hacky patches like x11 window support just for me to get some actual applications to work to test the ICD design. The last 3 or so patches contain a proof-of-concept for some of the 32-bit struct handling support. I have 32-bit support mostly working, but it required some changes to my script which I need to cleanup before I share it. Obviously the 32-bit work will be rebased across earlier patches in the series. The patches also include the Vulkan generation script I wrote. Parsing Vulkan is quite a pain due to all the structures and its object design. For this reason my parser is quite stateful, which made it more work to write, but now it is easy to generate code and do awful things like the 32-bit generation. Feel free to play around with the code. I added some instructions to the project. Currently 64-bit applications such as cube.exe, vulkaninfo.exe and vkquake.exe are known to work. 32-bit support is in progress, vulkaninfo.exe kind of works, but anything needing structure conversion will currently fail. Let me know your thoughts. Thanks, Roderick

2 3

[PATCH 7/7] wsdapi: Add body elements to Hello message.
by Owen Rudge Nov. 21, 2017

Nov. 21, 2017

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-)

1 0

[PATCH 6/7] wsdapi: Add support for building types, scopes and xaddrs lists.
by Owen Rudge Nov. 21, 2017

Nov. 21, 2017

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+)

1 0

[PATCH 5/7] wsdapi: Add support for duplicating XML elements passed into PublishEx function.
by Owen Rudge Nov. 21, 2017

Nov. 21, 2017

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 114 ++++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/wsdapi_internal.h | 5 ++ dlls/wsdapi/xml.c | 4 +- 3 files changed, 121 insertions(+), 2 deletions(-)

1 0

[PATCH 4/7] wsdapi: Build up SOAP message elements for Hello message.
by Owen Rudge Nov. 21, 2017

Nov. 21, 2017

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-)

1 0

[PATCH 3/7] wsdapi: Populate SOAP header structure.
by Owen Rudge Nov. 21, 2017

Nov. 21, 2017

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/Makefile.in | 2 +- dlls/wsdapi/soap.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 2 deletions(-)

1 0

[PATCH 2/7] wsdapi: Add stub implementation of IWSDiscoveryPublisher_PublishEx.
by Owen Rudge Nov. 21, 2017

Nov. 21, 2017

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/Makefile.in | 1 + dlls/wsdapi/discovery.c | 64 ++++++++++++++++++------------------------- dlls/wsdapi/soap.c | 38 +++++++++++++++++++++++++ dlls/wsdapi/wsdapi_internal.h | 24 ++++++++++++++++ 4 files changed, 89 insertions(+), 38 deletions(-) create mode 100644 dlls/wsdapi/soap.c

1 0