December 2014 - Wine-Commits

Austin English : kernel32: Add a stub for GetUserPreferredUILanguages.
by Alexandre Julliard Dec. 10, 2014

Dec. 10, 2014

Module: wine Branch: master Commit: 76dc45aa1aaa75d271c70fe1f8da9918217e26f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76dc45aa1aaa75d271c70fe1f… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Dec 8 20:29:47 2014 -0600 kernel32: Add a stub for GetUserPreferredUILanguages. --- .../api-ms-win-core-localization-l1-2-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 10 ++++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec index 7b3c86f..e2a7bed 100644 --- a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec +++ b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec @@ -32,7 +32,7 @@ @ stdcall GetUserDefaultLangID() kernel32.GetUserDefaultLangID @ stdcall GetUserDefaultLocaleName(ptr long) kernel32.GetUserDefaultLocaleName @ stdcall GetUserGeoID(long) kernel32.GetUserGeoID -@ stub GetUserPreferredUILanguages +@ stdcall GetUserPreferredUILanguages(long ptr ptr ptr) kernel32.GetUserPreferredUILanguages @ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii @ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode @ stdcall IsDBCSLeadByte(long) kernel32.IsDBCSLeadByte diff --git a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec index ccba739..32d2c76 100644 --- a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec +++ b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec @@ -33,7 +33,7 @@ @ stdcall GetUserDefaultLangID() kernel32.GetUserDefaultLangID @ stdcall GetUserDefaultLocaleName(ptr long) kernel32.GetUserDefaultLocaleName @ stdcall GetUserGeoID(long) kernel32.GetUserGeoID -@ stub GetUserPreferredUILanguages +@ stdcall GetUserPreferredUILanguages(long ptr ptr ptr) kernel32.GetUserPreferredUILanguages @ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii @ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode @ stdcall IsDBCSLeadByte(long) kernel32.IsDBCSLeadByte diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 80c7a87..886eb42 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -595,6 +595,7 @@ @ stdcall GetNumberOfConsoleMouseButtons(ptr) @ stdcall GetOEMCP() @ stdcall GetOverlappedResult(long ptr ptr long) +@ stdcall GetUserPreferredUILanguages(long ptr ptr ptr) @ stdcall GetPriorityClass(long) @ stdcall GetPrivateProfileIntA(str str long str) @ stdcall GetPrivateProfileIntW(wstr wstr long wstr) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 171f14c..5fee723 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -5035,3 +5035,13 @@ INT WINAPI IdnToUnicode(DWORD dwFlags, LPCWSTR lpASCIICharStr, INT cchASCIIChar, return out; } + + +/****************************************************************************** + * GetUserPreferredUILanguages (KERNEL32.@) + */ +BOOL WINAPI GetUserPreferredUILanguages(DWORD flags, PULONG numlangs, PZZWSTR langbuffer, PULONG bufferlen) +{ + FIXME( "stub: %u %p %p %p\n", flags, numlangs, langbuffer, bufferlen ); + return FALSE; +}

1 0

Henri Verbeet : d3d10core: Calculate the texture level count before texture creation.
by Alexandre Julliard Dec. 10, 2014

Dec. 10, 2014

Module: wine Branch: master Commit: c0cb43311b92c5745d940665d0b3c76abbecc368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0cb43311b92c5745d940665d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 10 13:26:38 2014 +0100 d3d10core: Calculate the texture level count before texture creation. --- dlls/d3d10core/texture.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 5e112dd..d9354ee 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -251,6 +251,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic const D3D10_TEXTURE2D_DESC *desc) { struct wined3d_resource_desc wined3d_desc; + unsigned int levels; HRESULT hr; texture->ID3D10Texture2D_iface.lpVtbl = &d3d10_texture2d_vtbl; @@ -300,7 +301,9 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic wined3d_desc.depth = 1; wined3d_desc.size = 0; - if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &wined3d_desc, desc->MipLevels, + levels = desc->MipLevels ? desc->MipLevels : wined3d_log2i(max(desc->Width, desc->Height)) + 1; + + if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &wined3d_desc, levels, 0, texture, &d3d10_texture2d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#x.\n", hr); @@ -308,7 +311,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic IUnknown_Release(texture->dxgi_surface); return hr; } - texture->desc.MipLevels = wined3d_texture_get_level_count(texture->wined3d_texture); + texture->desc.MipLevels = levels; texture->device = &device->ID3D10Device1_iface; ID3D10Device1_AddRef(texture->device); @@ -517,6 +520,7 @@ HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_devic const D3D10_TEXTURE3D_DESC *desc) { struct wined3d_resource_desc wined3d_desc; + unsigned int levels; HRESULT hr; texture->ID3D10Texture3D_iface.lpVtbl = &d3d10_texture3d_vtbl; @@ -534,13 +538,15 @@ HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_devic wined3d_desc.depth = desc->Depth; wined3d_desc.size = 0; - if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &wined3d_desc, desc->MipLevels, + levels = desc->MipLevels ? desc->MipLevels : wined3d_log2i(max(max(desc->Width, desc->Height), desc->Depth)) + 1; + + if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &wined3d_desc, levels, 0, texture, &d3d10_texture3d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#x.\n", hr); return hr; } - texture->desc.MipLevels = wined3d_texture_get_level_count(texture->wined3d_texture); + texture->desc.MipLevels = levels; texture->device = &device->ID3D10Device1_iface; ID3D10Device1_AddRef(texture->device);

1 0

Henri Verbeet : d3d8: Calculate texture levels in d3d8 instead of wined3d.
by Alexandre Julliard Dec. 10, 2014

Dec. 10, 2014

Module: wine Branch: master Commit: 1a28c7c5cc2e4bc4719e3bcc28ba0a5b25c5b61e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a28c7c5cc2e4bc4719e3bcc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 10 13:26:36 2014 +0100 d3d8: Calculate texture levels in d3d8 instead of wined3d. --- dlls/d3d8/texture.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 54944ac..24c0b28 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1172,6 +1172,9 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) surface_flags |= WINED3D_SURFACE_MAPPABLE; + if (!levels) + levels = wined3d_log2i(max(width, height)) + 1; + wined3d_mutex_lock(); hr = wined3d_texture_create(device->wined3d_device, &desc, levels, surface_flags, texture, &d3d8_texture_wined3d_parent_ops, &texture->wined3d_texture); @@ -1214,6 +1217,9 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) surface_flags |= WINED3D_SURFACE_MAPPABLE; + if (!levels) + levels = wined3d_log2i(edge_length) + 1; + wined3d_mutex_lock(); hr = wined3d_texture_create(device->wined3d_device, &desc, levels, surface_flags, texture, &d3d8_texture_wined3d_parent_ops, &texture->wined3d_texture); @@ -1252,6 +1258,9 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev desc.depth = depth; desc.size = 0; + if (!levels) + levels = wined3d_log2i(max(max(width, height), depth)) + 1; + wined3d_mutex_lock(); hr = wined3d_texture_create(device->wined3d_device, &desc, levels, 0, texture, &d3d8_texture_wined3d_parent_ops, &texture->wined3d_texture);

1 0

André Hentschel : widl: Fix compiler warnings with flag -Wunused-macros.
by Alexandre Julliard Dec. 10, 2014

Dec. 10, 2014

Module: wine Branch: master Commit: 900e7c5d6559eddfc14518f203fb36bc97881cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=900e7c5d6559eddfc14518f20… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 9 23:29:18 2014 +0100 widl: Fix compiler warnings with flag -Wunused-macros. --- tools/widl/proxy.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 0c0d7ce..f4fe6f5 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -37,14 +37,6 @@ #include "typegen.h" #include "expr.h" -#define END_OF_LIST(list) \ - do { \ - if (list) { \ - while (NEXT_LINK(list)) \ - list = NEXT_LINK(list); \ - } \ - } while(0) - static FILE* proxy; static int indent = 0;

1 0

André Hentschel : atl: Fix compiler warnings with flag -Wunused-macros.
by Alexandre Julliard Dec. 10, 2014

Dec. 10, 2014

Module: wine Branch: master Commit: 76c24c80c379106c7417f12b5910700bd431cf78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c24c80c379106c7417f12b5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 9 23:30:55 2014 +0100 atl: Fix compiler warnings with flag -Wunused-macros. --- dlls/atl/atl_ax.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 5bafbf1..d7cf074 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1137,7 +1137,6 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl) #define GET_DWORD(x) (*(const DWORD *)(x)) #define PUT_BLOCK(x,y) do {if (!advance_array(&output, &allocated, &filled, (x), (y))) return NULL;} while (0) #define PUT_WORD(x) do {WORD w = (x);PUT_BLOCK(&w, 1);} while(0) -#define PUT_DWORD(x) do {DWORD w = (x);PUT_BLOCK(&w, 2);} while(0) const WORD *tmp, *src = (const WORD *)src_tmpl; WORD *output; DWORD allocated, filled; /* in WORDs */

1 0

Nikolay Sivov : dwrite: Implement GetDesignGlyphAdvances().
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

Module: wine Branch: master Commit: 415e0b3f54968017014060a0cddab6f639f63def URL: http://source.winehq.org/git/wine.git/?a=commit;h=415e0b3f54968017014060a0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 9 10:00:45 2014 +0300 dwrite: Implement GetDesignGlyphAdvances(). --- dlls/dwrite/font.c | 20 +++++++++++++++--- dlls/dwrite/tests/font.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ef4c32c..ebea17d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -500,11 +500,25 @@ static BOOL WINAPI dwritefontface1_IsMonospacedFont(IDWriteFontFace2 *iface) } static HRESULT WINAPI dwritefontface1_GetDesignGlyphAdvances(IDWriteFontFace2 *iface, - UINT32 glyph_count, UINT16 const *indices, INT32 *advances, BOOL is_sideways) + UINT32 glyph_count, UINT16 const *glyphs, INT32 *advances, BOOL is_sideways) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p)->(%u %p %p %d): stub\n", This, glyph_count, indices, advances, is_sideways); - return E_NOTIMPL; + UINT32 i; + + TRACE("(%p)->(%u %p %p %d)\n", This, glyph_count, glyphs, advances, is_sideways); + + for (i = 0; i < glyph_count; i++) { + DWRITE_GLYPH_METRICS metrics = { 0 }; + HRESULT hr; + + hr = IDWriteFontFace2_GetDesignGlyphMetrics(iface, glyphs + i, 1, &metrics, is_sideways); + if (FAILED(hr)) + return hr; + + advances[i] = is_sideways ? metrics.advanceHeight : metrics.advanceWidth; + } + + return S_OK; } static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontFace2 *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index db554eb..b8bf75c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2636,6 +2636,58 @@ static void test_IsMonospacedFont(void) IDWriteFontCollection_Release(collection); } +static void test_GetDesignGlyphAdvances(void) +{ + IDWriteFontFace1 *fontface1; + IDWriteFontFace *fontface; + IDWriteFactory *factory; + IDWriteFontFile *file; + HRESULT hr; + + factory = create_factory(); + + create_testfontfile(test_fontfile); + + hr = IDWriteFactory_CreateFontFileReference(factory, test_fontfile, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_TRUETYPE, 1, &file, + 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFile_Release(file); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); + if (hr == S_OK) { + UINT32 codepoint; + UINT16 index; + INT32 advance; + + codepoint = 'A'; + index = 0; + hr = IDWriteFontFace1_GetGlyphIndices(fontface1, &codepoint, 1, &index); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(index > 0, "got %u\n", index); + + advance = 0; + hr = IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, &index, &advance, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(advance == 1000, "got %i\n", advance); + + advance = 0; + hr = IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, &index, &advance, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(advance == 2048, "got %i\n", advance); + + IDWriteFontFace1_Release(fontface1); + } + else + win_skip("GetDesignGlyphAdvances() is not supported.\n"); + + IDWriteFontFace_Release(fontface); + IDWriteFactory_Release(factory); + DeleteFileW(test_fontfile); +} + START_TEST(font) { IDWriteFactory *factory; @@ -2670,6 +2722,7 @@ START_TEST(font) test_CreateStreamFromKey(); test_ReadFileFragment(); test_GetDesignGlyphMetrics(); + test_GetDesignGlyphAdvances(); test_IsMonospacedFont(); IDWriteFactory_Release(factory);

1 0

Martin Storsjo : include: Add a roapi.h header.
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

Module: wine Branch: master Commit: f185af6e8294db3a12a443a1de6d2b151249e612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f185af6e8294db3a12a443a1d… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Dec 9 10:36:44 2014 +0200 include: Add a roapi.h header. --- dlls/api-ms-win-core-winrt-l1-1-0/main.c | 7 +----- include/Makefile.in | 1 + include/roapi.h | 41 ++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/main.c b/dlls/api-ms-win-core-winrt-l1-1-0/main.c index 4cf1105..674d21d 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/main.c +++ b/dlls/api-ms-win-core-winrt-l1-1-0/main.c @@ -16,17 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "objbase.h" +#include "roapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winrt); -typedef enum -{ - RO_INIT_SINGLETHREADED = 0, - RO_INIT_MULTITHREADED = 1, -} RO_INIT_TYPE; - /*********************************************************************** * RoInitialize (api-ms-win-core-winrt-l1-1-0.@) */ diff --git a/include/Makefile.in b/include/Makefile.in index a952964..5b1f3ab 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -506,6 +506,7 @@ SRCDIR_INCLUDES = \ restartmanager.h \ richedit.h \ rmxfguid.h \ + roapi.h \ row.idl \ rowchg.idl \ rowpos.idl \ diff --git a/include/roapi.h b/include/roapi.h new file mode 100644 index 0000000..0421fe9 --- /dev/null +++ b/include/roapi.h @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2014 Martin Storsjo + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_ROAPI_H +#define __WINE_ROAPI_H + +#include <windef.h> + +typedef enum +{ + RO_INIT_SINGLETHREADED = 0, + RO_INIT_MULTITHREADED = 1, +} RO_INIT_TYPE; + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI RoInitialize(RO_INIT_TYPE type); +void WINAPI RoUninitialize(void); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_ROAPI_H */

1 0

Martin Storsjo : combase: Add stub dll.
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

Module: wine Branch: master Commit: 3923c550b73a1abc952c2cee9c3697a37844fef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3923c550b73a1abc952c2cee9… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Dec 9 10:36:45 2014 +0200 combase: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/combase/Makefile.in | 1 + dlls/combase/combase.spec | 308 ++++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 313 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3923c550b73a1abc952c2…

1 0

Bruno Jesus : ws2_32: Implement getsockopt(SO_BSP_STATE).
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

Module: wine Branch: master Commit: 1c4cb6303647901affac8320bf49c388e34e515d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c4cb6303647901affac8320b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Dec 8 20:55:45 2014 -0200 ws2_32: Implement getsockopt(SO_BSP_STATE). --- dlls/ws2_32/socket.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 21 ++++++++++++-- include/winsock.h | 1 + 3 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1864dfd..b6aad67 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3095,6 +3095,79 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } release_sock_fd( s, fd ); return ret; + case WS_SO_BSP_STATE: + { + int req_size, addr_size; + WSAPROTOCOL_INFOW infow; + CSADDR_INFO *csinfo; + + ret = ws_protocol_info(s, TRUE, &infow, &addr_size); + if (ret) + { + if (infow.iAddressFamily == WS_AF_INET) + addr_size = sizeof(struct sockaddr_in); + else if (infow.iAddressFamily == WS_AF_INET6) + addr_size = sizeof(struct sockaddr_in6); + else + { + FIXME("Family %d is unsupported for SO_BSP_STATE", infow.iAddressFamily); + SetLastError(WSAEAFNOSUPPORT); + return SOCKET_ERROR; + } + + req_size = sizeof(CSADDR_INFO) + addr_size * 2; + if (*optlen < req_size) + { + ret = 0; + SetLastError(WSAEFAULT); + } + else + { + union generic_unix_sockaddr uaddr; + socklen_t uaddrlen = sizeof(uaddr); + + if ( (fd = get_sock_fd( s, 0, NULL )) == -1) + return SOCKET_ERROR; + + csinfo = (CSADDR_INFO*) optval; + + /* Check if the sock is bound */ + if (!getsockname(fd, &uaddr.addr, &uaddrlen) && + is_sockaddr_bound(&uaddr.addr, uaddrlen)) + { + csinfo->LocalAddr.lpSockaddr = + (LPSOCKADDR) (optval + sizeof(CSADDR_INFO)); + ws_sockaddr_u2ws(&uaddr.addr, csinfo->LocalAddr.lpSockaddr, &addr_size); + csinfo->LocalAddr.iSockaddrLength = addr_size; + } + else + { + csinfo->LocalAddr.lpSockaddr = NULL; + csinfo->LocalAddr.iSockaddrLength = 0; + } + + /* Check if the sock is connected */ + if (!getpeername(fd, &uaddr.addr, &uaddrlen) && + is_sockaddr_bound(&uaddr.addr, uaddrlen)) + { + csinfo->RemoteAddr.lpSockaddr = + (LPSOCKADDR) (optval + sizeof(CSADDR_INFO) + addr_size); + ws_sockaddr_u2ws(&uaddr.addr, csinfo->RemoteAddr.lpSockaddr, &addr_size); + csinfo->RemoteAddr.iSockaddrLength = addr_size; + } + else + { + csinfo->RemoteAddr.lpSockaddr = NULL; + csinfo->RemoteAddr.iSockaddrLength = 0; + } + + csinfo->iSocketType = infow.iSocketType; + csinfo->iProtocol = infow.iProtocol; + release_sock_fd( s, fd ); + } + } + return ret ? 0 : SOCKET_ERROR; + } case WS_SO_DONTLINGER: { struct linger lingval; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f0946c9..49ebbf5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1486,9 +1486,9 @@ todo_wine } /* Test SO_BSP_STATE - Present only in >= Win 2008 */ - s = socket(AF_INET, SOCK_STREAM, 0); + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(s != INVALID_SOCKET, "Failed to create socket\n"); - s2 = socket(AF_INET, SOCK_STREAM, 0); + s2 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(s2 != INVALID_SOCKET, "Failed to create socket\n"); SetLastError(0xdeadbeef); @@ -1571,6 +1571,23 @@ todo_wine ok(!err, "Expected 0, got %d\n", err); ok(!memcmp(&saddr, csinfoB.cs.LocalAddr.lpSockaddr, size), "Expected matching addresses\n"); ok(!memcmp(&saddr, csinfoA.cs.RemoteAddr.lpSockaddr, size), "Expected matching addresses\n"); + + SetLastError(0xdeadbeef); + size = sizeof(CSADDR_INFO); + err = getsockopt(s, SOL_SOCKET, SO_BSP_STATE, (char *) &csinfoA, &size); + ok(err, "Expected non-zero\n"); + ok(size == sizeof(CSADDR_INFO), "Got %d\n", size); + ok(GetLastError() == WSAEFAULT, "Expected 10014, got %d\n", GetLastError()); + + /* At least for IPv4 the size is exactly 56 bytes */ + size = sizeof(*csinfoA.cs.LocalAddr.lpSockaddr) * 2 + sizeof(csinfoA.cs); + err = getsockopt(s, SOL_SOCKET, SO_BSP_STATE, (char *) &csinfoA, &size); + ok(!err, "Expected 0, got %d\n", err); + size--; + SetLastError(0xdeadbeef); + err = getsockopt(s, SOL_SOCKET, SO_BSP_STATE, (char *) &csinfoA, &size); + ok(err, "Expected non-zero\n"); + ok(GetLastError() == WSAEFAULT, "Expected 10014, got %d\n", GetLastError()); } else ok(GetLastError() == WSAENOPROTOOPT, "Expected 10042, got %d\n", GetLastError()); diff --git a/include/winsock.h b/include/winsock.h index 21e984c..50237e8 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -697,6 +697,7 @@ typedef struct WS(WSAData) #define WS_SO_RCVTIMEO 0x1006 #define WS_SO_ERROR 0x1007 #define WS_SO_TYPE 0x1008 +#define WS_SO_BSP_STATE 0x1009 #define WS_IOCPARM_MASK 0x7f #define WS_IOC_VOID 0x20000000

1 0

Nikolay Sivov : dwrite: Update to IDWriteFactory2.
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

Module: wine Branch: master Commit: de741ffe52f3d49ff867e1ed87c81dd4259f67f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de741ffe52f3d49ff867e1ed8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 9 16:31:00 2014 +0300 dwrite: Update to IDWriteFactory2. --- dlls/dwrite/dwrite_private.h | 6 +- dlls/dwrite/font.c | 28 ++--- dlls/dwrite/gdiinterop.c | 10 +- dlls/dwrite/main.c | 238 +++++++++++++++++++++++++++++-------------- 4 files changed, 182 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de741ffe52f3d49ff867e…

1 0