November 2016 - Wine-Commits

Henri Verbeet : gdi32: Add support for D3DDDIFMT_A4R4G4B4 and D3DDDIFMT_X4R4G4B4 to D3DKMTCreateDCFromMemory ().
by Alexandre Julliard Nov. 17, 2016

Nov. 17, 2016

Module: wine Branch: master Commit: d837b71557f92d3dfbcbe6ad231cda18ab653fdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d837b71557f92d3dfbcbe6ad2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 17 12:11:35 2016 +0100 gdi32: Add support for D3DDDIFMT_A4R4G4B4 and D3DDDIFMT_X4R4G4B4 to D3DKMTCreateDCFromMemory(). These are needed by wined3d to support DCs on WINED3DFMT_B4G4R4A4_UNORM and WINED3DFMT_B4G4R4X4_UNORM textures, as required by the Microsoft Motocross Madness demo. Note that these formats are not available on versions of Windows newer than Vista, and as far as I'm aware the application doesn't work on those versions. I don't expect exposing more formats to be an issue in practice, but these could be hidden behind a version check if needed. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 585d2ac..36a7b0f 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1606,6 +1606,8 @@ NTSTATUS WINAPI D3DKMTCreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ) { D3DDDIFMT_R5G6B5, 16, BI_BITFIELDS, 0, 0x0000f800, 0x000007e0, 0x0000001f }, { D3DDDIFMT_X1R5G5B5, 16, BI_BITFIELDS, 0, 0x00007c00, 0x000003e0, 0x0000001f }, { D3DDDIFMT_A1R5G5B5, 16, BI_BITFIELDS, 0, 0x00007c00, 0x000003e0, 0x0000001f }, + { D3DDDIFMT_A4R4G4B4, 16, BI_BITFIELDS, 0, 0x00000f00, 0x000000f0, 0x0000000f }, + { D3DDDIFMT_X4R4G4B4, 16, BI_BITFIELDS, 0, 0x00000f00, 0x000000f0, 0x0000000f }, { D3DDDIFMT_P8, 8, BI_RGB, 256, 0x00000000, 0x00000000, 0x00000000 }, };

1 0

Henri Verbeet : wined3d: Support wined3d_texture_get_dc() on WINED3DFMT_B4G4R4A4_UNORM and WINED3DFMT_B4G4R4X4_UNORM textures.
by Alexandre Julliard Nov. 17, 2016

Nov. 17, 2016

Module: wine Branch: master Commit: bf3c65c6d8ec21c59f257a10b53912e486b2e3ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf3c65c6d8ec21c59f257a10b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 17 12:11:36 2016 +0100 wined3d: Support wined3d_texture_get_dc() on WINED3DFMT_B4G4R4A4_UNORM and WINED3DFMT_B4G4R4X4_UNORM textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6d23388..1255a9a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -287,6 +287,8 @@ static const struct wined3d_format_ddi_info ddi_formats[] = {WINED3DFMT_B5G6R5_UNORM, D3DDDIFMT_R5G6B5}, {WINED3DFMT_B5G5R5X1_UNORM, D3DDDIFMT_X1R5G5B5}, {WINED3DFMT_B5G5R5A1_UNORM, D3DDDIFMT_A1R5G5B5}, + {WINED3DFMT_B4G4R4A4_UNORM, D3DDDIFMT_A4R4G4B4}, + {WINED3DFMT_B4G4R4X4_UNORM, D3DDDIFMT_X4R4G4B4}, {WINED3DFMT_P8_UINT, D3DDDIFMT_P8}, };

1 0

Hans Leidekker : wbemprox: Return a non-null UUID for Win32_ComputerSystemProduct.UUID if nothing better is available.
by Alexandre Julliard Nov. 17, 2016

Nov. 17, 2016

Module: wine Branch: master Commit: 9842bf333a646cfe62135767d8ea05ebc6faa897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9842bf333a646cfe62135767d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 17 13:07:34 2016 -0600 wbemprox: Return a non-null UUID for Win32_ComputerSystemProduct.UUID if nothing better is available. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 718b818..b0f5faa 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -714,8 +714,8 @@ static const WCHAR compsys_modelW[] = static const WCHAR compsysproduct_identifyingnumberW[] = {'0',0}; static const WCHAR compsysproduct_uuidW[] = - {'0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0','0','0','-','0','0','0','0','-', - '0','0','0','0','0','0','0','0','0','0','0','0',0}; + {'d','e','a','d','d','e','a','d','-','d','e','a','d','-','d','e','a','d','-','d','e','a','d','-', + 'd','e','a','d','d','e','a','d','d','e','a','d',0}; static const WCHAR diskdrive_interfacetypeW[] = {'I','D','E',0}; static const WCHAR diskdrive_manufacturerW[] =

1 0

Hans Leidekker : webservices: Fix calculation of the end of a UTF-8 sequence.
by Alexandre Julliard Nov. 17, 2016

Nov. 17, 2016

Module: wine Branch: master Commit: 43e213e24ca4a1571df8053431e748425a00a53a URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e213e24ca4a1571df805343… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 17 10:10:56 2016 -0600 webservices: Fix calculation of the end of a UTF-8 sequence. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 +- dlls/webservices/tests/reader.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 5b5dc69..d67c47a 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1035,7 +1035,7 @@ static inline unsigned int read_utf8_char( struct reader *reader, unsigned int * } len = utf8_length[ch - 0x80]; if (reader->read_pos + len >= reader->read_size) return 0; - end = reader->read_bufptr + reader->read_pos + len; + end = reader->read_bufptr + reader->read_pos + len + 1; res = ch & utf8_mask[len]; switch (len) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 23c3f10..b19bc8c 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1325,6 +1325,8 @@ static void test_WsReadType(void) static const WCHAR testW[] = {'t','e','s','t',0}; static const GUID guid1 = {0,0,0,{0,0,0,0,0,0,0,0}}; static const GUID guid2 = {0,0,0,{0,0,0,0,0,0,0,0xa1}}; + static const char utf8[] = {'<','t','>',0xe2,0x80,0x99,'<','/','t','>'}; + static const WCHAR utf8W[] = {0x2019,0}; HRESULT hr; WS_XML_READER *reader; WS_HEAP *heap; @@ -1636,6 +1638,14 @@ static void test_WsReadType(void) WS_READ_REQUIRED_VALUE, heap, &val_bytes, sizeof(val_bytes), NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + val_str = NULL; + prepare_type_test( reader, utf8, sizeof(utf8) ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_READ_REQUIRED_POINTER, heap, &val_str, sizeof(val_str), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val_str != NULL, "pointer not set\n" ); + if (val_str) ok( !lstrcmpW( val_str, utf8W ), "wrong data %s\n", wine_dbgstr_w(val_str) ); + WsFreeReader( reader ); WsFreeHeap( heap ); }

1 0

Nikolay Sivov : dwrite: Make it clear that wine_dbgstr_longlong() output is in hex.
by Alexandre Julliard Nov. 16, 2016

Nov. 16, 2016

Module: wine Branch: master Commit: 89565b5e1e41a89c4ad449b149c8fa49d7bd35f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89565b5e1e41a89c4ad449b14… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 19:57:00 2016 +0300 dwrite: Make it clear that wine_dbgstr_longlong() output is in hex. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 7672aa6..2e1eab0 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4373,11 +4373,12 @@ static ULONG WINAPI localfontfilestream_Release(IDWriteFontFileStream *iface) return ref; } -static HRESULT WINAPI localfontfilestream_ReadFileFragment(IDWriteFontFileStream *iface, void const **fragment_start, UINT64 offset, UINT64 fragment_size, void **fragment_context) +static HRESULT WINAPI localfontfilestream_ReadFileFragment(IDWriteFontFileStream *iface, void const **fragment_start, + UINT64 offset, UINT64 fragment_size, void **fragment_context) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - TRACE_(dwrite_file)("(%p)->(%p, %s, %s, %p)\n",This, fragment_start, + TRACE_(dwrite_file)("(%p)->(%p, 0x%s, 0x%s, %p)\n", This, fragment_start, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(fragment_size), fragment_context); *fragment_context = NULL; @@ -5744,7 +5745,7 @@ static HRESULT WINAPI fontfacereference_EnqueueFileFragmentDownloadRequest(IDWri { struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); - FIXME("(%p)->(%s %s): stub\n", This, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(size)); + FIXME("(%p)->(0x%s 0x%s): stub\n", This, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(size)); return E_NOTIMPL; }

1 0

Nikolay Sivov : oledb32: Implement GetErrorParameters().
by Alexandre Julliard Nov. 16, 2016

Nov. 16, 2016

Module: wine Branch: master Commit: 275790c767aad404a9b680dc783bc0578de158ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=275790c767aad404a9b680dc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 16:48:35 2016 +0300 oledb32: Implement GetErrorParameters(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/errorinfo.c | 51 +++++++++++++++++++++++++++++++++++++++---- dlls/oledb32/tests/database.c | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index 02939ed..e1c3204 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -113,8 +113,16 @@ static ULONG WINAPI errorrecords_Release(IErrorInfo* iface) for (i = 0; i < This->count; i++) { + DISPPARAMS *dispparams = &This->records[i].dispparams; + unsigned int j; + if (This->records[i].custom_error) IUnknown_Release(This->records[i].custom_error); + + for (j = 0; j < dispparams->cArgs && dispparams->rgvarg; j++) + VariantClear(&dispparams->rgvarg[i]); + CoTaskMemFree(dispparams->rgvarg); + CoTaskMemFree(dispparams->rgdispidNamedArgs); } heap_free(This->records); heap_free(This); @@ -222,11 +230,43 @@ static ULONG WINAPI WINAPI errorrec_Release(IErrorRecords *iface) return IErrorInfo_Release(&This->IErrorInfo_iface); } +static HRESULT dup_dispparams(DISPPARAMS *src, DISPPARAMS *dest) +{ + unsigned int i; + + if (!src) + { + memset(dest, 0, sizeof(*dest)); + return S_OK; + } + + *dest = *src; + + if (src->cArgs) + { + dest->rgvarg = CoTaskMemAlloc(dest->cArgs * sizeof(*dest->rgvarg)); + for (i = 0; i < src->cArgs; i++) + { + VariantInit(&dest->rgvarg[i]); + VariantCopy(&dest->rgvarg[i], &src->rgvarg[i]); + } + } + + if (src->cNamedArgs) + { + dest->rgdispidNamedArgs = CoTaskMemAlloc(dest->cNamedArgs * sizeof(*dest->rgdispidNamedArgs)); + memcpy(dest->rgdispidNamedArgs, src->rgdispidNamedArgs, dest->cNamedArgs * sizeof(*dest->rgdispidNamedArgs)); + } + + return S_OK; +} + static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *pErrorInfo, DWORD dwLookupID, DISPPARAMS *pdispparams, IUnknown *punkCustomError, DWORD dwDynamicErrorID) { errorrecords *This = impl_from_IErrorRecords(iface); struct ErrorEntry *entry; + HRESULT hr; TRACE("(%p)->(%p %d %p %p %d)\n", This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, dwDynamicErrorID); @@ -255,8 +295,10 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p entry = This->records + This->count; entry->info = *pErrorInfo; - if(pdispparams) - entry->dispparams = *pdispparams; + + if (FAILED(hr = dup_dispparams(pdispparams, &entry->dispparams))) + return hr; + entry->custom_error = punkCustomError; if (entry->custom_error) IUnknown_AddRef(entry->custom_error); @@ -326,7 +368,7 @@ static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG in { errorrecords *This = impl_from_IErrorRecords(iface); - FIXME("(%p)->(%u %p)\n", This, index, pdispparams); + TRACE("(%p)->(%u %p)\n", This, index, pdispparams); if (!pdispparams) return E_INVALIDARG; @@ -334,7 +376,8 @@ static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG in if (index >= This->count) return DB_E_BADRECORDNUM; - return E_NOTIMPL; + index = This->count - index - 1; + return dup_dispparams(&This->records[index].dispparams, pdispparams); } static HRESULT WINAPI errorrec_GetRecordCount(IErrorRecords *iface, ULONG *count) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index b45ef4d..44a2561 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -314,6 +314,16 @@ static void test_database(void) test_GetDataSource2(extended_prop); } +static void free_dispparams(DISPPARAMS *params) +{ + unsigned int i; + + for (i = 0; i < params->cArgs && params->rgvarg; i++) + VariantClear(&params->rgvarg[i]); + CoTaskMemFree(params->rgvarg); + CoTaskMemFree(params->rgdispidNamedArgs); +} + static void test_errorinfo(void) { ICreateErrorInfo *createerror; @@ -322,8 +332,10 @@ static void test_errorinfo(void) IErrorRecords *errrecs; IUnknown *unk = NULL, *unk2; DISPPARAMS dispparams; + DISPID dispid; DWORD context; ULONG cnt = 0; + VARIANT arg; HRESULT hr; GUID guid; BSTR str; @@ -437,6 +449,42 @@ static void test_errorinfo(void) ok(hr == S_OK, "got %08x\n", hr); ok(info3.dwMinor == 2, "expected 2 got %d\n", info3.dwMinor); + hr = IErrorRecords_GetErrorParameters(errrecs, 0, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + memset(&dispparams, 0xcc, sizeof(dispparams)); + hr = IErrorRecords_GetErrorParameters(errrecs, 0, &dispparams); + ok(hr == S_OK, "got %08x\n", hr); + ok(dispparams.rgvarg == NULL, "Got arguments %p\n", dispparams.rgvarg); + ok(dispparams.rgdispidNamedArgs == NULL, "Got named arguments %p\n", dispparams.rgdispidNamedArgs); + ok(dispparams.cArgs == 0, "Got argument count %u\n", dispparams.cArgs); + ok(dispparams.cNamedArgs == 0, "Got named argument count %u\n", dispparams.cNamedArgs); + + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = SysAllocStringLen(NULL, 0); + dispid = 0x123; + + dispparams.rgvarg = &arg; + dispparams.cArgs = 1; + dispparams.rgdispidNamedArgs = &dispid; + dispparams.cNamedArgs = 1; + hr = IErrorRecords_AddErrorRecord(errrecs, &info2, 0, &dispparams, NULL, 0); + ok(hr == S_OK, "got %08x\n", hr); + + memset(&dispparams, 0, sizeof(dispparams)); + hr = IErrorRecords_GetErrorParameters(errrecs, 0, &dispparams); + ok(hr == S_OK, "got %08x\n", hr); + + ok(V_VT(&dispparams.rgvarg[0]) == VT_BSTR, "Got arg type %d\n", V_VT(&dispparams.rgvarg[0])); + ok(V_BSTR(&dispparams.rgvarg[0]) != V_BSTR(&arg), "Got arg bstr %d\n", V_VT(&dispparams.rgvarg[0])); + + ok(dispparams.rgdispidNamedArgs[0] == 0x123, "Got named argument %d\n", dispparams.rgdispidNamedArgs[0]); + ok(dispparams.cArgs == 1, "Got argument count %u\n", dispparams.cArgs); + ok(dispparams.cNamedArgs == 1, "Got named argument count %u\n", dispparams.cNamedArgs); + + free_dispparams(&dispparams); + VariantClear(&arg); + IErrorRecords_Release(errrecs); IUnknown_Release(unk); }

1 0

Nikolay Sivov : oledb32: Use better naming for IErrorRecords implementation structure.
by Alexandre Julliard Nov. 16, 2016

Nov. 16, 2016

Module: wine Branch: master Commit: 9a084ab6d3d81cb26ccd88412cfd39733c9a9149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a084ab6d3d81cb26ccd88412… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 16:48:34 2016 +0300 oledb32: Use better naming for IErrorRecords implementation structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/errorinfo.c | 80 ++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index dd39173..02939ed 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -46,7 +46,7 @@ struct ErrorEntry DWORD lookupID; }; -typedef struct ErrorInfoImpl +typedef struct errorrecords { IErrorInfo IErrorInfo_iface; IErrorRecords IErrorRecords_iface; @@ -55,21 +55,21 @@ typedef struct ErrorInfoImpl struct ErrorEntry *records; unsigned int allocated; unsigned int count; -} ErrorInfoImpl; +} errorrecords; -static inline ErrorInfoImpl *impl_from_IErrorInfo( IErrorInfo *iface ) +static inline errorrecords *impl_from_IErrorInfo( IErrorInfo *iface ) { - return CONTAINING_RECORD(iface, ErrorInfoImpl, IErrorInfo_iface); + return CONTAINING_RECORD(iface, errorrecords, IErrorInfo_iface); } -static inline ErrorInfoImpl *impl_from_IErrorRecords( IErrorRecords *iface ) +static inline errorrecords *impl_from_IErrorRecords( IErrorRecords *iface ) { - return CONTAINING_RECORD(iface, ErrorInfoImpl, IErrorRecords_iface); + return CONTAINING_RECORD(iface, errorrecords, IErrorRecords_iface); } -static HRESULT WINAPI IErrorInfoImpl_QueryInterface(IErrorInfo* iface, REFIID riid, void **ppvoid) +static HRESULT WINAPI errorrecords_QueryInterface(IErrorInfo* iface, REFIID riid, void **ppvoid) { - ErrorInfoImpl *This = impl_from_IErrorInfo(iface); + errorrecords *This = impl_from_IErrorInfo(iface); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid),ppvoid); *ppvoid = NULL; @@ -93,16 +93,16 @@ static HRESULT WINAPI IErrorInfoImpl_QueryInterface(IErrorInfo* iface, REFIID ri return E_NOINTERFACE; } -static ULONG WINAPI IErrorInfoImpl_AddRef(IErrorInfo* iface) +static ULONG WINAPI errorrecords_AddRef(IErrorInfo* iface) { - ErrorInfoImpl *This = impl_from_IErrorInfo(iface); + errorrecords *This = impl_from_IErrorInfo(iface); TRACE("(%p)->%u\n",This,This->ref); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) +static ULONG WINAPI errorrecords_Release(IErrorInfo* iface) { - ErrorInfoImpl *This = impl_from_IErrorInfo(iface); + errorrecords *This = impl_from_IErrorInfo(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)->%u\n",This,ref+1); @@ -122,9 +122,9 @@ static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) return ref; } -static HRESULT WINAPI IErrorInfoImpl_GetGUID(IErrorInfo* iface, GUID *guid) +static HRESULT WINAPI errorrecords_GetGUID(IErrorInfo* iface, GUID *guid) { - ErrorInfoImpl *This = impl_from_IErrorInfo(iface); + errorrecords *This = impl_from_IErrorInfo(iface); TRACE("(%p)->(%p)\n", This, guid); @@ -136,9 +136,9 @@ static HRESULT WINAPI IErrorInfoImpl_GetGUID(IErrorInfo* iface, GUID *guid) return S_OK; } -static HRESULT WINAPI IErrorInfoImpl_GetSource(IErrorInfo* iface, BSTR *source) +static HRESULT WINAPI errorrecords_GetSource(IErrorInfo* iface, BSTR *source) { - ErrorInfoImpl *This = impl_from_IErrorInfo(iface); + errorrecords *This = impl_from_IErrorInfo(iface); TRACE("(%p)->(%p)\n", This, source); @@ -150,9 +150,9 @@ static HRESULT WINAPI IErrorInfoImpl_GetSource(IErrorInfo* iface, BSTR *source) return E_FAIL; } -static HRESULT WINAPI IErrorInfoImpl_GetDescription(IErrorInfo* iface, BSTR *description) +static HRESULT WINAPI errorrecords_GetDescription(IErrorInfo* iface, BSTR *description) { - ErrorInfoImpl *This = impl_from_IErrorInfo(iface); + errorrecords *This = impl_from_IErrorInfo(iface); TRACE("(%p)->(%p)\n", This, description); @@ -164,9 +164,9 @@ static HRESULT WINAPI IErrorInfoImpl_GetDescription(IErrorInfo* iface, BSTR *des return E_FAIL; } -static HRESULT WINAPI IErrorInfoImpl_GetHelpFile(IErrorInfo* iface, BSTR *helpfile) +static HRESULT WINAPI errorrecords_GetHelpFile(IErrorInfo* iface, BSTR *helpfile) { - ErrorInfoImpl *This = impl_from_IErrorInfo(iface); + errorrecords *This = impl_from_IErrorInfo(iface); TRACE("(%p)->(%p)\n", This, helpfile); @@ -178,9 +178,9 @@ static HRESULT WINAPI IErrorInfoImpl_GetHelpFile(IErrorInfo* iface, BSTR *helpfi return E_FAIL; } -static HRESULT WINAPI IErrorInfoImpl_GetHelpContext(IErrorInfo* iface, DWORD *context) +static HRESULT WINAPI errorrecords_GetHelpContext(IErrorInfo* iface, DWORD *context) { - ErrorInfoImpl *This = impl_from_IErrorInfo(iface); + errorrecords *This = impl_from_IErrorInfo(iface); TRACE("(%p)->(%p)\n", This, context); @@ -194,38 +194,38 @@ static HRESULT WINAPI IErrorInfoImpl_GetHelpContext(IErrorInfo* iface, DWORD *co static const IErrorInfoVtbl ErrorInfoVtbl = { - IErrorInfoImpl_QueryInterface, - IErrorInfoImpl_AddRef, - IErrorInfoImpl_Release, - IErrorInfoImpl_GetGUID, - IErrorInfoImpl_GetSource, - IErrorInfoImpl_GetDescription, - IErrorInfoImpl_GetHelpFile, - IErrorInfoImpl_GetHelpContext + errorrecords_QueryInterface, + errorrecords_AddRef, + errorrecords_Release, + errorrecords_GetGUID, + errorrecords_GetSource, + errorrecords_GetDescription, + errorrecords_GetHelpFile, + errorrecords_GetHelpContext }; static HRESULT WINAPI errorrec_QueryInterface(IErrorRecords *iface, REFIID riid, void **ppvObject) { - ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + errorrecords *This = impl_from_IErrorRecords(iface); return IErrorInfo_QueryInterface(&This->IErrorInfo_iface, riid, ppvObject); } static ULONG WINAPI WINAPI errorrec_AddRef(IErrorRecords *iface) { - ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + errorrecords *This = impl_from_IErrorRecords(iface); return IErrorInfo_AddRef(&This->IErrorInfo_iface); } static ULONG WINAPI WINAPI errorrec_Release(IErrorRecords *iface) { - ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + errorrecords *This = impl_from_IErrorRecords(iface); return IErrorInfo_Release(&This->IErrorInfo_iface); } static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *pErrorInfo, DWORD dwLookupID, DISPPARAMS *pdispparams, IUnknown *punkCustomError, DWORD dwDynamicErrorID) { - ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + errorrecords *This = impl_from_IErrorRecords(iface); struct ErrorEntry *entry; TRACE("(%p)->(%p %d %p %p %d)\n", This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, dwDynamicErrorID); @@ -269,7 +269,7 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p static HRESULT WINAPI errorrec_GetBasicErrorInfo(IErrorRecords *iface, ULONG index, ERRORINFO *info) { - ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + errorrecords *This = impl_from_IErrorRecords(iface); TRACE("(%p)->(%u %p)\n", This, index, info); @@ -287,7 +287,7 @@ static HRESULT WINAPI errorrec_GetBasicErrorInfo(IErrorRecords *iface, ULONG ind static HRESULT WINAPI errorrec_GetCustomErrorObject(IErrorRecords *iface, ULONG index, REFIID riid, IUnknown **object) { - ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + errorrecords *This = impl_from_IErrorRecords(iface); TRACE("(%p)->(%u %s %p)\n", This, index, debugstr_guid(riid), object); @@ -309,7 +309,7 @@ static HRESULT WINAPI errorrec_GetCustomErrorObject(IErrorRecords *iface, ULONG static HRESULT WINAPI errorrec_GetErrorInfo(IErrorRecords *iface, ULONG index, LCID lcid, IErrorInfo **ppErrorInfo) { - ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + errorrecords *This = impl_from_IErrorRecords(iface); FIXME("(%p)->(%u %d, %p)\n", This, index, lcid, ppErrorInfo); @@ -324,7 +324,7 @@ static HRESULT WINAPI errorrec_GetErrorInfo(IErrorRecords *iface, ULONG index, static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG index, DISPPARAMS *pdispparams) { - ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + errorrecords *This = impl_from_IErrorRecords(iface); FIXME("(%p)->(%u %p)\n", This, index, pdispparams); @@ -339,7 +339,7 @@ static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG in static HRESULT WINAPI errorrec_GetRecordCount(IErrorRecords *iface, ULONG *count) { - ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + errorrecords *This = impl_from_IErrorRecords(iface); TRACE("(%p)->(%p)\n", This, count); @@ -368,7 +368,7 @@ static const IErrorRecordsVtbl ErrorRecordsVtbl = HRESULT create_error_info(IUnknown *outer, void **obj) { - ErrorInfoImpl *This; + errorrecords *This; TRACE("(%p, %p)\n", outer, obj);

1 0

Hans Leidekker : winhttp/tests: Fix test failures on Windows XP.
by Alexandre Julliard Nov. 16, 2016

Nov. 16, 2016

Module: wine Branch: master Commit: bfa0e4b840075857e1c6850aa6a99b98e052e6cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa0e4b840075857e1c6850aa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 16 16:46:57 2016 -0600 winhttp/tests: Fix test failures on Windows XP. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index e5a8be3..61c4acf 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -995,7 +995,10 @@ static void test_secure_connection(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSetOption(req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, WINHTTP_NO_CLIENT_CERT_CONTEXT, 0); - ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "setting client cert context returned %x (%u)\n", ret, GetLastError()); + err = GetLastError(); + ok(!ret, "unexpected success\n"); + ok(err == ERROR_WINHTTP_INCORRECT_HANDLE_STATE || broken(err == ERROR_INVALID_PARAMETER) /* winxp */, + "setting client cert context returned %u\n", err); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); err = GetLastError(); @@ -1021,7 +1024,8 @@ static void test_secure_connection(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSetOption(req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, WINHTTP_NO_CLIENT_CERT_CONTEXT, 0); - ok(ret, "failed to set client cert context %u\n", GetLastError()); + err = GetLastError(); + ok(ret || broken(!ret && err == ERROR_INVALID_PARAMETER) /* winxp */, "failed to set client cert context %u\n", err); WinHttpSetStatusCallback(req, cert_error, WINHTTP_CALLBACK_STATUS_SECURE_FAILURE, 0);

1 0

Jacek Caban : mshtml: Added IHTMLDocument3::dir property implementation.
by Alexandre Julliard Nov. 16, 2016

Nov. 16, 2016

Module: wine Branch: master Commit: cb11d67035592bf4428656288e2e69a42421a236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb11d67035592bf4428656288… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 16 10:16:51 2016 -0600 mshtml: Added IHTMLDocument3::dir property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 35 +++++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 8fa3f52..47e087d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2173,15 +2173,42 @@ static HRESULT WINAPI HTMLDocument3_get_onpropertychange(IHTMLDocument3 *iface, static HRESULT WINAPI HTMLDocument3_put_dir(IHTMLDocument3 *iface, BSTR v) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString dir_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->doc_node->nsdoc) { + FIXME("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + nsAString_InitDepend(&dir_str, v); + nsres = nsIDOMHTMLDocument_SetDir(This->doc_node->nsdoc, &dir_str); + nsAString_Finish(&dir_str); + if(NS_FAILED(nsres)) { + ERR("SetDir failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLDocument3_get_dir(IHTMLDocument3 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString dir_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->doc_node->nsdoc) { + FIXME("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + nsres = nsIDOMHTMLDocument_GetDir(This->doc_node->nsdoc, &dir_str); + return return_nsstr(nsres, &dir_str, p); } static HRESULT WINAPI HTMLDocument3_put_oncontextmenu(IHTMLDocument3 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index be279cc..60e1bf8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6304,6 +6304,42 @@ static void test_default_selection(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); } +static void test_doc_dir(IHTMLDocument2 *doc2) +{ + IHTMLDocument3 *doc = get_doc3_iface(doc2); + BSTR dir; + HRESULT hres; + + dir = (BSTR)0xdeadbeef; + hres = IHTMLDocument3_get_dir(doc, &dir); + ok(hres == S_OK, "get_dir failed: %08x\n", hres); + ok(!dir, "dir = %s\n", wine_dbgstr_w(dir)); + + dir = a2bstr("rtl"); + hres = IHTMLDocument3_put_dir(doc, dir); + ok(hres == S_OK, "put_dir failed: %08x\n", hres); + SysFreeString(dir); + + dir = NULL; + hres = IHTMLDocument3_get_dir(doc, &dir); + ok(hres == S_OK, "get_dir failed: %08x\n", hres); + ok(!strcmp_wa(dir, "rtl"), "dir = %s\n", wine_dbgstr_w(dir)); + SysFreeString(dir); + + dir = a2bstr("ltr"); + hres = IHTMLDocument3_put_dir(doc, dir); + ok(hres == S_OK, "put_dir failed: %08x\n", hres); + SysFreeString(dir); + + dir = NULL; + hres = IHTMLDocument3_get_dir(doc, &dir); + ok(hres == S_OK, "get_dir failed: %08x\n", hres); + ok(!strcmp_wa(dir, "ltr"), "dir = %s\n", wine_dbgstr_w(dir)); + SysFreeString(dir); + + IHTMLDocument3_Release(doc); +} + static void test_unique_id(IHTMLDocument2 *doc, IHTMLElement *elem) { IHTMLDocument3 *doc3 = get_doc3_iface(doc); @@ -6393,6 +6429,7 @@ static void test_doc_elem(IHTMLDocument2 *doc) test_elem_client_rect((IUnknown*)elem); test_unique_id(doc, elem); + test_doc_dir(doc); IHTMLElement_Release(elem); }

1 0

Piotr Caban : ucrtbase: Add __intrinsic_setjmp implementation.
by Alexandre Julliard Nov. 16, 2016

Nov. 16, 2016

Module: wine Branch: master Commit: f8683fc8c42095f23e26a76b978e1180b60e1048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8683fc8c42095f23e26a76b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 16 15:31:01 2016 -0600 ucrtbase: Add __intrinsic_setjmp implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index e52b904..d1cd0b4 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -38,7 +38,7 @@ @ stub __dcrt_get_wide_environment_from_os @ stub __dcrt_initial_narrow_environment @ stub __intrinsic_abnormal_termination -@ stub __intrinsic_setjmp +@ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ stub __intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 83143b6..2aa0563 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -93,7 +93,7 @@ @ cdecl __fpecode() @ stub __initialize_lconv_for_unsigned_char @ stub __intrinsic_abnormal_termination -@ stub __intrinsic_setjmp +@ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp @ stub __intrinsic_setjmpex @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index b91d976..1b9f3f9 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -32,7 +32,7 @@ @ stub __TypeMatch @ stub __current_exception @ stub __current_exception_context -@ stub __intrinsic_setjmp +@ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ stub __intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure

1 0