October 2014 - Wine-Commits

André Hentschel : winedump: Update minidump output.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: fdc7728219835e0223ea46543e8dad19e41b6777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdc7728219835e0223ea46543… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 7 21:54:38 2014 +0200 winedump: Update minidump output. --- tools/winedump/minidump.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 321264b..2641868 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -342,10 +342,19 @@ void mdmp_dump(void) break; case 1: if (msi->u.s.ProductType == 1) str = "Win7"; - else if (msi->u.s.ProductType == 3) str = "Server 2008"; + else if (msi->u.s.ProductType == 3) str = "Server 2008 R2"; + else str = "6-????"; + break; + case 2: + if (msi->u.s.ProductType == 1) str = "Win8"; + else if (msi->u.s.ProductType == 3) str = "Server 2012"; + else str = "6-????"; + break; + case 3: + if (msi->u.s.ProductType == 1) str = "Win8.1"; + else if (msi->u.s.ProductType == 3) str = "Server 2012 R2"; else str = "6-????"; break; - case 2: str = "Win8"; break; default: str = "6-????"; break; } break;

1 0

André Hentschel : winetest: Add Windows 8.1 to group Win8.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: tools Branch: master Commit: 83d9d7a28fe40a2e148301217430dd13fbde1041 URL: http://source.winehq.org/git/tools.git/?a=commit;h=83d9d7a28fe40a2e14830121… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 7 21:41:36 2014 +0200 winetest: Add Windows 8.1 to group Win8. --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index 676f089..61e85ca 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -203,7 +203,7 @@ if ($plid==1 && $major==4) { } elsif ($product==3) { $version = "2008"; } - } elsif ($minor == 2) { + } elsif ($minor == 2 || $minor == 3) { $version = "win8"; } }

1 0

Michael Müller : ntdll: Wait until builtin dlls are unloaded before releasing the virtual view.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 15d013067d7cacaa8f127586b5d03336c8c2fd1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d013067d7cacaa8f127586b… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Oct 4 02:51:51 2014 +0200 ntdll: Wait until builtin dlls are unloaded before releasing the virtual view. --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3c2fc56..e1444d2 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2642,8 +2642,8 @@ static void free_modref( WINE_MODREF *wm ) free_tls_slot( &wm->ldr ); RtlReleaseActivationContext( wm->ldr.ActivationContext ); - NtUnmapViewOfSection( NtCurrentProcess(), wm->ldr.BaseAddress ); if (wm->ldr.Flags & LDR_WINE_INTERNAL) wine_dll_unload( wm->ldr.SectionHandle ); + NtUnmapViewOfSection( NtCurrentProcess(), wm->ldr.BaseAddress ); if (cached_modref == wm) cached_modref = NULL; RtlFreeUnicodeString( &wm->ldr.FullDllName ); RtlFreeHeap( GetProcessHeap(), 0, wm->deps );

1 0

André Hentschel : winhttp/tests: Fix potential crash on BSD.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 6e4d52a752c319855546e4851f40c7077af6c3c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4d52a752c319855546e4851… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 2 00:33:11 2014 +0200 winhttp/tests: Fix potential crash on BSD. --- dlls/winhttp/tests/winhttp.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 27fb212..cf2312f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -876,12 +876,15 @@ static void test_secure_connection(void) ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT, &info, &size ); ok(ret, "failed to retrieve certificate info %u\n", GetLastError()); - trace("lpszSubjectInfo %s\n", wine_dbgstr_w(info.lpszSubjectInfo)); - trace("lpszIssuerInfo %s\n", wine_dbgstr_w(info.lpszIssuerInfo)); - trace("lpszProtocolName %s\n", wine_dbgstr_w(info.lpszProtocolName)); - trace("lpszSignatureAlgName %s\n", wine_dbgstr_w(info.lpszSignatureAlgName)); - trace("lpszEncryptionAlgName %s\n", wine_dbgstr_w(info.lpszEncryptionAlgName)); - trace("dwKeySize %u\n", info.dwKeySize); + if (!ret) + { + trace("lpszSubjectInfo %s\n", wine_dbgstr_w(info.lpszSubjectInfo)); + trace("lpszIssuerInfo %s\n", wine_dbgstr_w(info.lpszIssuerInfo)); + trace("lpszProtocolName %s\n", wine_dbgstr_w(info.lpszProtocolName)); + trace("lpszSignatureAlgName %s\n", wine_dbgstr_w(info.lpszSignatureAlgName)); + trace("lpszEncryptionAlgName %s\n", wine_dbgstr_w(info.lpszEncryptionAlgName)); + trace("dwKeySize %u\n", info.dwKeySize); + } ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError());

1 0

Sebastian Lackner : ntdll: Set ldr.EntryPoint for main executable.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 5272ca241b78cec4884d3dd7edca496b302b4508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5272ca241b78cec4884d3dd7e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Aug 2 18:27:20 2014 +0200 ntdll: Set ldr.EntryPoint for main executable. --- dlls/kernel32/tests/module.c | 1 - dlls/ntdll/loader.c | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index b54b4e3..bb22c24 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -729,7 +729,6 @@ static void testK32GetModuleInformation(void) ret = pK32GetModuleInformation(GetCurrentProcess(), mod, &info, sizeof(info)); ok(ret, "K32GetModuleInformation failed for main module\n"); ok(info.lpBaseOfDll == mod, "Wrong info.lpBaseOfDll = %p, expected %p\n", info.lpBaseOfDll, mod); - todo_wine ok(info.EntryPoint != NULL, "Expected nonzero entrypoint\n"); mod = GetModuleHandleA("kernel32.dll"); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 18ae29c..3c2fc56 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -934,9 +934,10 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) else p = wm->ldr.FullDllName.Buffer; RtlInitUnicodeString( &wm->ldr.BaseDllName, p ); - if ((nt->FileHeader.Characteristics & IMAGE_FILE_DLL) && !is_dll_native_subsystem( hModule, nt, p )) + if (!(nt->FileHeader.Characteristics & IMAGE_FILE_DLL) || !is_dll_native_subsystem( hModule, nt, p )) { - wm->ldr.Flags |= LDR_IMAGE_IS_DLL; + if (nt->FileHeader.Characteristics & IMAGE_FILE_DLL) + wm->ldr.Flags |= LDR_IMAGE_IS_DLL; if (nt->OptionalHeader.AddressOfEntryPoint) wm->ldr.EntryPoint = (char *)hModule + nt->OptionalHeader.AddressOfEntryPoint; } @@ -1062,7 +1063,7 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.BaseAddress, reason ); - if (!entry) return STATUS_SUCCESS; + if (!entry || !(wm->ldr.Flags & LDR_IMAGE_IS_DLL)) return STATUS_SUCCESS; if (TRACE_ON(relay)) {

1 0

Francois Gouget : d2d1: Make the IDWriteTextRenderer methods static.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 9f8d22186934f1db3ff1ac2ea3b652da6fbf14a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f8d22186934f1db3ff1ac2ea… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 7 18:34:27 2014 +0200 d2d1: Make the IDWriteTextRenderer methods static. --- dlls/d2d1/render_target.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index f730e64..a50f473 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -905,7 +905,7 @@ static inline struct d2d_d3d_render_target *impl_from_IDWriteTextRenderer(IDWrit return CONTAINING_RECORD(iface, struct d2d_d3d_render_target, IDWriteTextRenderer_iface); } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_QueryInterface(IDWriteTextRenderer *iface, REFIID iid, void **out) +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_QueryInterface(IDWriteTextRenderer *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -924,7 +924,7 @@ HRESULT STDMETHODCALLTYPE d2d_text_renderer_QueryInterface(IDWriteTextRenderer * return E_NOINTERFACE; } -ULONG STDMETHODCALLTYPE d2d_text_renderer_AddRef(IDWriteTextRenderer *iface) +static ULONG STDMETHODCALLTYPE d2d_text_renderer_AddRef(IDWriteTextRenderer *iface) { struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); @@ -933,7 +933,7 @@ ULONG STDMETHODCALLTYPE d2d_text_renderer_AddRef(IDWriteTextRenderer *iface) return d2d_d3d_render_target_AddRef(&render_target->ID2D1RenderTarget_iface); } -ULONG STDMETHODCALLTYPE d2d_text_renderer_Release(IDWriteTextRenderer *iface) +static ULONG STDMETHODCALLTYPE d2d_text_renderer_Release(IDWriteTextRenderer *iface) { struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); @@ -942,7 +942,7 @@ ULONG STDMETHODCALLTYPE d2d_text_renderer_Release(IDWriteTextRenderer *iface) return d2d_d3d_render_target_Release(&render_target->ID2D1RenderTarget_iface); } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_IsPixelSnappingDisabled(IDWriteTextRenderer *iface, +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_IsPixelSnappingDisabled(IDWriteTextRenderer *iface, void *ctx, BOOL *disabled) { FIXME("iface %p, ctx %p, disabled %p stub!\n", iface, ctx, disabled); @@ -950,7 +950,7 @@ HRESULT STDMETHODCALLTYPE d2d_text_renderer_IsPixelSnappingDisabled(IDWriteTextR return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetCurrentTransform(IDWriteTextRenderer *iface, +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetCurrentTransform(IDWriteTextRenderer *iface, void *ctx, DWRITE_MATRIX *transform) { FIXME("iface %p, ctx %p, transform %p stub!\n", iface, ctx, transform); @@ -958,14 +958,14 @@ HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetCurrentTransform(IDWriteTextRende return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetPixelsPerDip(IDWriteTextRenderer *iface, void *ctx, float *ppd) +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetPixelsPerDip(IDWriteTextRenderer *iface, void *ctx, float *ppd) { FIXME("iface %p, ctx %p, ppd %p stub!\n", iface, ctx, ppd); return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRenderer *iface, void *ctx, +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRenderer *iface, void *ctx, float baseline_origin_x, float baseline_origin_y, DWRITE_MEASURING_MODE measuring_mode, const DWRITE_GLYPH_RUN *glyph_run, const DWRITE_GLYPH_RUN_DESCRIPTION *desc, IUnknown *effect) { @@ -977,7 +977,7 @@ HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRenderer *if return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRenderer *iface, void *ctx, +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRenderer *iface, void *ctx, float baseline_origin_x, float baseline_origin_y, const DWRITE_UNDERLINE *underline, IUnknown *effect) { FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, underline %p, effect %p stub!\n", @@ -986,7 +986,7 @@ HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRenderer *i return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteTextRenderer *iface, void *ctx, +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteTextRenderer *iface, void *ctx, float baseline_origin_x, float baseline_origin_y, const DWRITE_STRIKETHROUGH *strikethrough, IUnknown *effect) { FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, strikethrough %p, effect %p stub!\n", @@ -995,7 +995,7 @@ HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteTextRendere return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawInlineObject(IDWriteTextRenderer *iface, void *ctx, +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawInlineObject(IDWriteTextRenderer *iface, void *ctx, float origin_x, float origin_y, IDWriteInlineObject *object, BOOL is_sideways, BOOL is_rtl, IUnknown *effect) { FIXME("iface %p, ctx %p, origin_x %.8e, origin_y %.8e, object %p, is_sideways %#x, is_rtl %#x, effect %p stub!\n",

1 0

Nikolay Sivov : msxml3: Implement 'name' and 'nodeName' properties for doctype node.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: d7eec962e2280f4cc3d11343f738ea3cac328db6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7eec962e2280f4cc3d11343f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 7 18:15:42 2014 +0400 msxml3: Implement 'name' and 'nodeName' properties for doctype node. --- dlls/msxml3/doctype.c | 8 ++++---- dlls/msxml3/tests/domdoc.c | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c index c045c79..322b6c2 100644 --- a/dlls/msxml3/doctype.c +++ b/dlls/msxml3/doctype.c @@ -155,8 +155,8 @@ static HRESULT WINAPI domdoctype_get_nodeName( BSTR* p ) { domdoctype *This = impl_from_IXMLDOMDocumentType( iface ); - FIXME("(%p)->(%p): stub\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI domdoctype_get_nodeValue( @@ -489,8 +489,8 @@ static HRESULT WINAPI domdoctype_get_name( BSTR *p) { domdoctype *This = impl_from_IXMLDOMDocumentType( iface ); - FIXME("(%p)->(%p): stub\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI domdoctype_get_entities( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 881679e..038df04 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8912,9 +8912,12 @@ static void test_appendChild(void) static void test_get_doctype(void) { + static const WCHAR emailW[] = {'e','m','a','i','l',0}; IXMLDOMDocumentType *doctype; IXMLDOMDocument *doc; + VARIANT_BOOL b; HRESULT hr; + BSTR s; doc = create_document(&IID_IXMLDOMDocument); @@ -8926,6 +8929,28 @@ static void test_get_doctype(void) ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(doctype == NULL, "got %p\n", doctype); + hr = IXMLDOMDocument_loadXML(doc, _bstr_(szEmailXML), &b); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + doctype = NULL; + hr = IXMLDOMDocument_get_doctype(doc, &doctype); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(doctype != NULL, "got %p\n", doctype); + + hr = IXMLDOMDocumentType_get_name(doctype, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLDOMDocumentType_get_name(doctype, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(emailW, s), "got name %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocumentType_get_nodeName(doctype, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(emailW, s), "got name %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + IXMLDOMDocumentType_Release(doctype); IXMLDOMDocument_Release(doc); }

1 0

Jacek Caban : ieframe: Don' t crash if output parameter is NULL in WebBrowser:: get_RegisterAsDropTarget.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 379b9f67758b9236317b902357aa474b30ba927e URL: http://source.winehq.org/git/wine.git/?a=commit;h=379b9f67758b9236317b90235… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 7 10:22:51 2014 +0200 ieframe: Don't crash if output parameter is NULL in WebBrowser::get_RegisterAsDropTarget. --- dlls/ieframe/tests/webbrowser.c | 4 ++++ dlls/ieframe/webbrowser.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 5973900..fa37169 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2321,6 +2321,10 @@ static void test_ie_funcs(IWebBrowser2 *wb) ok(sName!=NULL, "get_Name return a NULL string.\n"); SysFreeString(sName); + /* RegisterAsDropTarget */ + hres = IWebBrowser2_get_RegisterAsDropTarget(wb, NULL); + ok(hres == E_INVALIDARG, "get_RegisterAsDropTarget returned: %08x\n", hres); + /* Quit */ hres = IWebBrowser2_Quit(wb); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index a3233e1..1f58bbb 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -943,7 +943,12 @@ static HRESULT WINAPI WebBrowser_get_RegisterAsDropTarget(IWebBrowser2 *iface, VARIANT_BOOL *pbRegister) { WebBrowser *This = impl_from_IWebBrowser2(iface); + FIXME("(%p)->(%p)\n", This, pbRegister); + + if(!pbRegister) + return E_INVALIDARG; + *pbRegister=0; return S_OK; }

1 0

Henri Verbeet : ws2_32: Simplify some address calculations for SIO_ADDRESS_LIST_QUERY.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: c0e49c5c40c064e4a7a4ddaeaf039ca0813b7d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e49c5c40c064e4a7a4ddaea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 7 08:41:13 2014 +0200 ws2_32: Simplify some address calculations for SIO_ADDRESS_LIST_QUERY. --- dlls/ws2_32/socket.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index aba7d3f..8b60fb3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3963,9 +3963,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID for (p = table, num = 0; p; p = p->Next) if (p->IpAddressList.IpAddress.String[0]) num++; - total = sizeof(SOCKET_ADDRESS_LIST) + sizeof(SOCKET_ADDRESS) * (num - 1); - total += sizeof(SOCKADDR) * num; - + total = FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[num]) + num * sizeof(*sockaddr); if (total > out_size || !out_buff) { *ret_size = total; @@ -3976,7 +3974,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID sa_list = out_buff; sa = sa_list->Address; - sockaddr = (SOCKADDR_IN *)((char *)sa + num * sizeof(SOCKET_ADDRESS)); + sockaddr = (SOCKADDR_IN *)&sa[num]; sa_list->iAddressCount = num; for (p = table, i = 0; p; p = p->Next)

1 0

Nikolay Sivov : dwrite: Use public macro to define OpenType tags.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 3b1e8bf824b7506ad718271f2dbbac084b1e2c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b1e8bf824b7506ad718271f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 7 09:23:26 2014 +0400 dwrite: Use public macro to define OpenType tags. --- dlls/dwrite/dwrite_private.h | 4 ---- dlls/dwrite/font.c | 12 ++++-------- include/dwrite.idl | 6 ++++++ 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 5a2b5a3..736292e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -19,10 +19,6 @@ #include "wine/debug.h" #include "wine/unicode.h" -#define DWRITE_MAKE_OPENTYPE_TAG(ch0, ch1, ch2, ch3) \ - ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ - ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) - static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 923996b..def64ce 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -25,14 +25,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); -#define MS_MAKE_TAG(ch0, ch1, ch2, ch3) \ - ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ - ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) - -#define MS_HEAD_TAG MS_MAKE_TAG('h','e','a','d') -#define MS_OS2_TAG MS_MAKE_TAG('O','S','/','2') -#define MS_POST_TAG MS_MAKE_TAG('p','o','s','t') -#define MS_CMAP_TAG MS_MAKE_TAG('c','m','a','p') +#define MS_HEAD_TAG DWRITE_MAKE_OPENTYPE_TAG('h','e','a','d') +#define MS_OS2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') +#define MS_POST_TAG DWRITE_MAKE_OPENTYPE_TAG('p','o','s','t') +#define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') struct dwrite_fontface_data { LONG ref; diff --git a/include/dwrite.idl b/include/dwrite.idl index bc530fc..1888215 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -222,6 +222,12 @@ typedef enum DWRITE_LINE_SPACING_METHOD DWRITE_LINE_SPACING_METHOD_UNIFORM } DWRITE_LINE_SPACING_METHOD; +cpp_quote("#define DWRITE_MAKE_OPENTYPE_TAG(a,b,c,d) ( \\") +cpp_quote(" ((UINT32)(UINT8)(d) << 24) | \\") +cpp_quote(" ((UINT32)(UINT8)(c) << 16) | \\") +cpp_quote(" ((UINT32)(UINT8)(b) << 8) | \\") +cpp_quote(" (UINT32)(UINT8)(a))") + typedef enum DWRITE_FONT_FEATURE_TAG { DWRITE_FONT_FEATURE_TAG_ALTERNATIVE_FRACTIONS = 0x63726661, /* 'afrc' */

1 0