April 2016 - Wine-Commits - list.winehq.org

Hans Leidekker : webservices: Implement WsCreateChannel and WsFreeChannel.
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: 8d9bf5375879ab3c220029966faffa4c74d4793c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9bf5375879ab3c220029966… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 13 13:49:44 2016 +0200 webservices: Implement WsCreateChannel and WsFreeChannel. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 + dlls/webservices/channel.c | 158 +++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 4 +- dlls/webservices/webservices_private.h | 12 +++ 4 files changed, 173 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/Makefile.in b/dlls/webservices/Makefile.in index d48e3c6..c052252 100644 --- a/dlls/webservices/Makefile.in +++ b/dlls/webservices/Makefile.in @@ -3,6 +3,7 @@ IMPORTLIB = webservices IMPORTS = user32 C_SRCS = \ + channel.c \ main.c \ reader.c \ writer.c diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c new file mode 100644 index 0000000..c8a920d --- /dev/null +++ b/dlls/webservices/channel.c @@ -0,0 +1,158 @@ +/* + * Copyright 2016 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "webservices.h" + +#include "wine/debug.h" +#include "wine/list.h" +#include "webservices_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(webservices); + +static const struct +{ + ULONG size; + BOOL readonly; +} +channel_props[] = +{ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE */ + { sizeof(UINT64), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_STREAMED_MESSAGE_SIZE */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_STREAMED_START_SIZE */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_STREAMED_FLUSH_SIZE */ + { sizeof(WS_ENCODING), FALSE }, /* WS_CHANNEL_PROPERTY_ENCODING */ + { sizeof(WS_ENVELOPE_VERSION), FALSE }, /* WS_CHANNEL_PROPERTY_ENVELOPE_VERSION */ + { sizeof(WS_ADDRESSING_VERSION), FALSE }, /* WS_CHANNEL_PROPERTY_ADDRESSING_VERSION */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_SESSION_DICTIONARY_SIZE */ + { sizeof(WS_CHANNEL_STATE), TRUE }, /* WS_CHANNEL_PROPERTY_STATE */ +}; + +static struct channel *alloc_channel(void) +{ + static const ULONG count = sizeof(channel_props)/sizeof(channel_props[0]); + struct channel *ret; + ULONG i, size = sizeof(*ret) + count * sizeof(WS_CHANNEL_PROPERTY); + char *ptr; + + for (i = 0; i < count; i++) size += channel_props[i].size; + if (!(ret = heap_alloc_zero( size ))) return NULL; + + ptr = (char *)&ret->prop[count]; + for (i = 0; i < count; i++) + { + ret->prop[i].value = ptr; + ret->prop[i].valueSize = channel_props[i].size; + ptr += ret->prop[i].valueSize; + } + ret->prop_count = count; + return ret; +} + +static HRESULT set_channel_prop( struct channel *channel, WS_CHANNEL_PROPERTY_ID id, const void *value, + ULONG size ) +{ + if (id >= channel->prop_count || size != channel_props[id].size || channel_props[id].readonly) + return E_INVALIDARG; + + memcpy( channel->prop[id].value, value, size ); + return S_OK; +} + +void free_channel( struct channel *channel ) +{ + heap_free( channel ); +} + +HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, + const WS_CHANNEL_PROPERTY *properties, ULONG count, struct channel **ret ) +{ + struct channel *channel; + ULONG i, msg_size = 65536; + HRESULT hr; + + if (!(channel = alloc_channel())) return E_OUTOFMEMORY; + + set_channel_prop( channel, WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE, &msg_size, sizeof(msg_size) ); + + for (i = 0; i < count; i++) + { + hr = set_channel_prop( channel, properties[i].id, properties[i].value, properties[i].valueSize ); + if (hr != S_OK) + { + free_channel( channel ); + return hr; + } + } + + channel->type = type; + channel->binding = binding; + + *ret = channel; + return S_OK; +} + +/************************************************************************** + * WsCreateChannel [webservices.@] + */ +HRESULT WINAPI WsCreateChannel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, + const WS_CHANNEL_PROPERTY *properties, ULONG count, + const WS_SECURITY_DESCRIPTION *desc, WS_CHANNEL **handle, + WS_ERROR *error ) +{ + struct channel *channel; + HRESULT hr; + + TRACE( "%u %u %p %u %p %p %p\n", type, binding, properties, count, desc, handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (desc) FIXME( "ignoring security description\n" ); + + if (!handle) return E_INVALIDARG; + + if (type != WS_CHANNEL_TYPE_REQUEST) + { + FIXME( "channel type %u not implemented\n", type ); + return E_NOTIMPL; + } + if (binding != WS_HTTP_CHANNEL_BINDING) + { + FIXME( "channel binding %u not implemented\n", binding ); + return E_NOTIMPL; + } + + if ((hr = create_channel( type, binding, properties, count, &channel )) != S_OK) + return hr; + + *handle = (WS_CHANNEL *)channel; + return S_OK; +} + +/************************************************************************** + * WsFreeChannel [webservices.@] + */ +void WINAPI WsFreeChannel( WS_CHANNEL *handle ) +{ + struct channel *channel = (struct channel *)handle; + + TRACE( "%p\n", handle ); + free_channel( channel ); +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 9c0b3c7..2ddda72 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -20,7 +20,7 @@ @ stub WsCombineUrl @ stub WsCopyError @ stub WsCopyNode -@ stub WsCreateChannel +@ stdcall WsCreateChannel(long long ptr long ptr ptr ptr) @ stub WsCreateChannelForListener @ stdcall WsCreateError(ptr long ptr) @ stub WsCreateFaultFromError @@ -48,7 +48,7 @@ @ stdcall WsFindAttribute(ptr ptr ptr long ptr ptr) @ stub WsFlushBody @ stub WsFlushWriter -@ stub WsFreeChannel +@ stdcall WsFreeChannel(ptr) @ stdcall WsFreeError(ptr) @ stdcall WsFreeHeap(ptr) @ stub WsFreeListener diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index c286fd2..1ec3eeb 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -50,6 +50,18 @@ static inline WS_XML_NODE_TYPE node_type( const struct node *node ) return node->hdr.node.nodeType; } +struct channel +{ + WS_CHANNEL_TYPE type; + WS_CHANNEL_BINDING binding; + ULONG prop_count; + WS_CHANNEL_PROPERTY prop[9]; +}; + +HRESULT create_channel( WS_CHANNEL_TYPE, WS_CHANNEL_BINDING, const WS_CHANNEL_PROPERTY *, + ULONG, struct channel ** ) DECLSPEC_HIDDEN; +void free_channel( struct channel * ) DECLSPEC_HIDDEN; + static inline void *heap_alloc( SIZE_T size ) { return HeapAlloc( GetProcessHeap(), 0, size );

1 0

Henri Verbeet : ddraw/tests: Add some tests for the properties of the DC returned by surface GetDC().
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: 2280487111bf2813151ca54e43f36779252fe61e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2280487111bf2813151ca54e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 12:18:49 2016 +0200 ddraw/tests: Add some tests for the properties of the DC returned by surface GetDC(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 75 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 324 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2280487111bf2813151ca…

1 0

Henri Verbeet : wined3d: Be more strict with wined3d_texture_get_dc() calls from d3d9.
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: 9e763ab92be2f6000565c50b851093c6146de01a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e763ab92be2f6000565c50b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 12:18:48 2016 +0200 wined3d: Be more strict with wined3d_texture_get_dc() calls from d3d9. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 20 ++++++++++---------- dlls/wined3d/texture.c | 32 ++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 31 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e763ab92be2f6000565c…

1 0

Daniel Lehman : ucrtbase: Add __stdio_common_vfwprintf.
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: 2f783c6828938d09a7ef86cdd9bc394f7c441136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f783c6828938d09a7ef86cdd… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Apr 6 15:56:43 2016 -0700 ucrtbase: Add __stdio_common_vfwprintf. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/file.c | 28 ++++ dlls/ucrtbase/tests/printf.c | 157 +++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 187 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f783c6828938d09a7ef8…

1 0

Nikolay Sivov : dwrite: Only use fsSelection to switch to sTypo* metrics, remove table version check.
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: f0dd5a012df7c2f6da37d4c53e303af9312e1db5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0dd5a012df7c2f6da37d4c53… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 13 07:02:12 2016 +0300 dwrite: Only use fsSelection to switch to sTypo* metrics, remove table version check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 15 +++++------- dlls/dwrite/tests/font.c | 59 ++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 60 insertions(+), 14 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b9bddea..cbb372c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1187,15 +1187,12 @@ void opentype_get_font_metrics(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_T metrics->xHeight = GET_BE_WORD(tt_os2->sxHeight); } - /* version 4 fields */ - if (version >= 4) { - if (GET_BE_WORD(tt_os2->fsSelection) & OS2_FSSELECTION_USE_TYPO_METRICS) { - SHORT descent = GET_BE_WORD(tt_os2->sTypoDescender); - metrics->ascent = GET_BE_WORD(tt_os2->sTypoAscender); - metrics->descent = descent < 0 ? -descent : 0; - metrics->lineGap = GET_BE_WORD(tt_os2->sTypoLineGap); - metrics->hasTypographicMetrics = TRUE; - } + if (GET_BE_WORD(tt_os2->fsSelection) & OS2_FSSELECTION_USE_TYPO_METRICS) { + SHORT descent = GET_BE_WORD(tt_os2->sTypoDescender); + metrics->ascent = GET_BE_WORD(tt_os2->sTypoAscender); + metrics->descent = descent < 0 ? -descent : 0; + metrics->lineGap = GET_BE_WORD(tt_os2->sTypoLineGap); + metrics->hasTypographicMetrics = TRUE; } } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 5591913..25c85e8 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -180,6 +180,19 @@ typedef struct USHORT usMaxContext; } TT_OS2_V2; +enum OS2_FSSELECTION { + OS2_FSSELECTION_ITALIC = 1 << 0, + OS2_FSSELECTION_UNDERSCORE = 1 << 1, + OS2_FSSELECTION_NEGATIVE = 1 << 2, + OS2_FSSELECTION_OUTLINED = 1 << 3, + OS2_FSSELECTION_STRIKEOUT = 1 << 4, + OS2_FSSELECTION_BOLD = 1 << 5, + OS2_FSSELECTION_REGULAR = 1 << 6, + OS2_FSSELECTION_USE_TYPO_METRICS = 1 << 7, + OS2_FSSELECTION_WWS = 1 << 8, + OS2_FSSELECTION_OBLIQUE = 1 << 9 +}; + typedef struct { ULONG Version; ULONG italicAngle; @@ -1519,7 +1532,7 @@ todo_wine DELETE_FONTFILE(path); } -static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_METRICS *metrics) +static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_METRICS1 *metrics) { void *os2_context, *head_context, *post_context; const TT_OS2_V2 *tt_os2; @@ -1542,6 +1555,19 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET metrics->designUnitsPerEm = GET_BE_WORD(tt_head->unitsPerEm); if (tt_os2) { + if (GET_BE_WORD(tt_os2->fsSelection) & OS2_FSSELECTION_USE_TYPO_METRICS) { + SHORT descent = GET_BE_WORD(tt_os2->sTypoDescender); + metrics->ascent = GET_BE_WORD(tt_os2->sTypoAscender); + metrics->descent = descent < 0 ? -descent : 0; + metrics->hasTypographicMetrics = TRUE; + } + else { + metrics->ascent = GET_BE_WORD(tt_os2->usWinAscent); + /* Some fonts have usWinDescent value stored as signed short, which could be wrongly + interpreted as large unsigned value. */ + metrics->descent = abs((SHORT)GET_BE_WORD(tt_os2->usWinDescent)); + } + metrics->strikethroughPosition = GET_BE_WORD(tt_os2->yStrikeoutPosition); metrics->strikethroughThickness = GET_BE_WORD(tt_os2->yStrikeoutSize); } @@ -1570,10 +1596,15 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET IDWriteFontFace_ReleaseFontTable(fontface, post_context); } -static void check_font_metrics(const WCHAR *nameW, const DWRITE_FONT_METRICS *got, const DWRITE_FONT_METRICS *expected) +static void check_font_metrics(const WCHAR *nameW, BOOL has_metrics1, const DWRITE_FONT_METRICS *got, + const DWRITE_FONT_METRICS1 *expected) { ok(got->designUnitsPerEm == expected->designUnitsPerEm, "font %s: designUnitsPerEm %u, expected %u\n", wine_dbgstr_w(nameW), got->designUnitsPerEm, expected->designUnitsPerEm); + ok(got->ascent == expected->ascent, "font %s: ascent %u, expected %u\n", wine_dbgstr_w(nameW), got->ascent, + expected->ascent); + ok(got->descent == expected->descent, "font %s: descent %u, expected %u\n", wine_dbgstr_w(nameW), got->descent, + expected->descent); ok(got->underlinePosition == expected->underlinePosition, "font %s: underlinePosition %d, expected %d\n", wine_dbgstr_w(nameW), got->underlinePosition, expected->underlinePosition); ok(got->underlineThickness == expected->underlineThickness, "font %s: underlineThickness %u, " @@ -1582,6 +1613,12 @@ static void check_font_metrics(const WCHAR *nameW, const DWRITE_FONT_METRICS *go wine_dbgstr_w(nameW), got->strikethroughPosition, expected->strikethroughPosition); ok(got->strikethroughThickness == expected->strikethroughThickness, "font %s: strikethroughThickness %u, " "expected %u\n", wine_dbgstr_w(nameW), got->strikethroughThickness, expected->strikethroughThickness); + + if (has_metrics1) { + const DWRITE_FONT_METRICS1 *m1 = (const DWRITE_FONT_METRICS1*)got; + ok(m1->hasTypographicMetrics == expected->hasTypographicMetrics, "font %s: hasTypographicMetrics %d, " + "expected %d\n", wine_dbgstr_w(nameW), m1->hasTypographicMetrics, expected->hasTypographicMetrics); + } } static void get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, UINT32 size) @@ -1788,8 +1825,9 @@ if (0) /* crashes on native */ count = IDWriteFontCollection_GetFontFamilyCount(syscollection); for (i = 0; i < count; i++) { - DWRITE_FONT_METRICS expected_metrics; + DWRITE_FONT_METRICS1 expected_metrics, metrics1; IDWriteLocalizedStrings *names; + IDWriteFontFace1 *fontface1; IDWriteFontFamily *family; IDWriteFont *font; WCHAR nameW[256]; @@ -1804,6 +1842,9 @@ if (0) /* crashes on native */ hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); + fontface1 = NULL; + IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); + hr = IDWriteFontFamily_GetFamilyNames(family, &names); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1812,10 +1853,18 @@ if (0) /* crashes on native */ IDWriteLocalizedStrings_Release(names); IDWriteFont_Release(font); - IDWriteFontFace_GetMetrics(fontface, &metrics); get_expected_font_metrics(fontface, &expected_metrics); - check_font_metrics(nameW, &metrics, &expected_metrics); + if (fontface1) { + IDWriteFontFace1_GetMetrics(fontface1, &metrics1); + check_font_metrics(nameW, TRUE, (const DWRITE_FONT_METRICS*)&metrics1, &expected_metrics); + } + else { + IDWriteFontFace_GetMetrics(fontface, &metrics); + check_font_metrics(nameW, FALSE, &metrics, &expected_metrics); + } + if (fontface1) + IDWriteFontFace1_Release(fontface1); IDWriteFontFace_Release(fontface); IDWriteFontFamily_Release(family); }

1 0

Austin English : sfc_os: Return success in SRSetRestorePointA/W.
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: 78ebf5231b52379ce988d5ec2127416405ef6bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ebf5231b52379ce988d5ec2… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 12 22:12:16 2016 -0500 sfc_os: Return success in SRSetRestorePointA/W. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sfc_os/sfc_os.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c index c124b90..f4515f2 100644 --- a/dlls/sfc_os/sfc_os.c +++ b/dlls/sfc_os/sfc_os.c @@ -143,13 +143,13 @@ DWORD WINAPI SfcConnectToServer(DWORD unknown) BOOL WINAPI SRSetRestorePointA(RESTOREPOINTINFOA *restorepoint, STATEMGRSTATUS *status) { FIXME("%p %p\n", restorepoint, status); - status->nStatus = ERROR_SERVICE_DISABLED; + status->nStatus = ERROR_SUCCESS; return FALSE; } BOOL WINAPI SRSetRestorePointW(RESTOREPOINTINFOW *restorepoint, STATEMGRSTATUS *status) { FIXME("%p %p\n", restorepoint, status); - status->nStatus = ERROR_SERVICE_DISABLED; + status->nStatus = ERROR_SUCCESS; return FALSE; }

1 0

Józef Kucia : dxgi/tests: Add test for IDXGISwapChain_GetContainingOutput().
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: 02e5560d99c326d44324be078bf349275f6e3452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e5560d99c326d44324be078… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 12 12:29:41 2016 +0200 dxgi/tests: Add test for IDXGISwapChain_GetContainingOutput(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 837618a..d8b1dd6 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -560,6 +560,120 @@ static void test_create_swapchain(void) DestroyWindow(creation_desc.OutputWindow); } +static void test_get_containing_output(void) +{ + DXGI_OUTPUT_DESC output_desc, output_desc2; + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGIOutput *output, *output2; + unsigned int output_count; + IDXGISwapChain *swapchain; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + IDXGIDevice *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + output_count = 0; + while (IDXGIAdapter_EnumOutputs(adapter, output_count, &output) != DXGI_ERROR_NOT_FOUND) + { + ok(SUCCEEDED(hr), "Failed to enumarate output %u, hr %#x.\n", output_count, hr); + IDXGIOutput_Release(output); + ++output_count; + } + + if (output_count != 1) + { + skip("Adapter has %u outputs.\n", output_count); + goto done; + } + + hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); + ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#x.\n", hr); + + refcount = get_refcount((IUnknown *)output); + todo_wine ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output2); + ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, + "GetContainingOutput failed, hr %#x.\n", hr); + if (hr == DXGI_ERROR_UNSUPPORTED) + { + IDXGISwapChain_Release(swapchain); + IDXGIOutput_Release(output); + goto done; + } + + refcount = get_refcount((IUnknown *)output); + todo_wine ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + refcount = get_refcount((IUnknown *)output2); + todo_wine ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + hr = IDXGIOutput_GetDesc(output2, &output_desc2); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + + ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + "Got unexpected device name %s, expected %s.\n", + wine_dbgstr_w(output_desc.DeviceName), wine_dbgstr_w(output_desc2.DeviceName)); + ok(!memcmp(&output_desc.DesktopCoordinates, &output_desc2.DesktopCoordinates, + sizeof(output_desc.DesktopCoordinates)), + "Got unexpected desktop coordinates {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", + output_desc.DesktopCoordinates.left, output_desc.DesktopCoordinates.top, + output_desc.DesktopCoordinates.right, output_desc.DesktopCoordinates.bottom, + output_desc2.DesktopCoordinates.left, output_desc2.DesktopCoordinates.top, + output_desc2.DesktopCoordinates.right, output_desc2.DesktopCoordinates.bottom); + + refcount = IDXGIOutput_Release(output2); + todo_wine ok(!refcount, "IDXGIOuput has %u references left.\n", refcount); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + + refcount = IDXGIOutput_Release(output); + todo_wine ok(!refcount, "IDXGIOuput has %u references left.\n", refcount); + +done: + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIAdapter_Release(adapter); + todo_wine ok(!refcount, "Adapter has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + DestroyWindow(swapchain_desc.OutputWindow); +} + static void test_create_factory(void) { IDXGIFactory1 *factory; @@ -1412,6 +1526,7 @@ START_TEST(device) test_parents(); test_output(); test_create_swapchain(); + test_get_containing_output(); test_create_factory(); test_private_data(); test_swapchain_resize();

1 0

Henri Verbeet : wined3d: Be more lenient with wined3d_texture_get_dc() calls from ddraw.
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: c3d74913b7d28b0287fcb38f3faf67402cbe79ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3d74913b7d28b0287fcb38f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 12:18:47 2016 +0200 wined3d: Be more lenient with wined3d_texture_get_dc() calls from ddraw. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 6 +----- dlls/d3d9/tests/device.c | 2 +- dlls/ddraw/surface.c | 19 +++++++++++++------ dlls/ddraw/tests/ddraw1.c | 8 ++++---- dlls/ddraw/tests/ddraw2.c | 8 ++++---- dlls/ddraw/tests/ddraw4.c | 8 ++++---- dlls/ddraw/tests/ddraw7.c | 8 ++++---- dlls/wined3d/texture.c | 23 ++++++++++------------- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 4 +--- 10 files changed, 43 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3d74913b7d28b0287fcb…

1 0

Sebastian Lackner : ntdll: Preinitialize OS version data in thread_init.
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: 56b4d35d5279ad2325a734009e8252c00890e50a URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b4d35d5279ad2325a734009… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 12 21:22:05 2016 +0200 ntdll: Preinitialize OS version data in thread_init. Fixes a regression introduced by bd17022c90466cf06392e9ffac905b8b0b7e2cd7. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 0b68185..40747d7 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -251,6 +251,10 @@ HANDLE thread_init(void) peb->TlsExpansionBitmap = &tls_expansion_bitmap; peb->FlsBitmap = &fls_bitmap; peb->LdrData = &ldr; + peb->OSMajorVersion = 5; + peb->OSMinorVersion = 1; + peb->OSBuildNumber = 0xA28; + peb->OSPlatformId = VER_PLATFORM_WIN32_NT; params.CurrentDirectory.DosPath.Buffer = current_dir; params.CurrentDirectory.DosPath.MaximumLength = sizeof(current_dir); params.wShowWindow = 1; /* SW_SHOWNORMAL */

1 0

Józef Kucia : dxgi: Partially implement dxgi_swapchain_GetContainingOutput().
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: master Commit: 944190bad442f19fba5e0073d284469bd2329652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=944190bad442f19fba5e0073d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 12 12:29:40 2016 +0200 dxgi: Partially implement dxgi_swapchain_GetContainingOutput(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index b729970..da705e4 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -287,9 +287,32 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_ResizeTarget(IDXGISwapChain *ifa static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetContainingOutput(IDXGISwapChain *iface, IDXGIOutput **output) { - FIXME("iface %p, output %p stub!\n", iface, output); + IDXGIAdapter *adapter; + IDXGIDevice *device; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, output %p.\n", iface, output); + + if (FAILED(hr = dxgi_swapchain_GetDevice(iface, &IID_IDXGIDevice, (void **)&device))) + return hr; + + hr = IDXGIDevice_GetAdapter(device, &adapter); + IDXGIDevice_Release(device); + if (FAILED(hr)) + { + WARN("GetAdapter failed, hr %#x.\n", hr); + return hr; + } + + if (SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, 1, output))) + { + FIXME("Adapter has got multiple outputs, returning the first one.\n"); + IDXGIOutput_Release(*output); + } + + hr = IDXGIAdapter_EnumOutputs(adapter, 0, output); + IDXGIAdapter_Release(adapter); + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetFrameStatistics(IDXGISwapChain *iface, DXGI_FRAME_STATISTICS *stats)

1 0