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

Hans Leidekker : webservices: Allow structures to be passed by value in WsWriteType.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: e87c64f69ce38768b5be61aaf6127ff9a43a09e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e87c64f69ce38768b5be61aaf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 25 20:02:48 2016 +0200 webservices: Allow structures to be passed by value in WsWriteType. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 15 +++++++++++++++ dlls/webservices/writer.c | 4 +--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 128e66e..8888c69 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -791,6 +791,21 @@ static void test_simple_struct_type(void) ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<struct>value</struct>", __LINE__ ); + /* required value */ + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_VALUE, test, sizeof(*test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<struct>value</struct>", __LINE__ ); + hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 89f9465..8872a37 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1695,9 +1695,7 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY case WS_STRUCT_TYPE: { const void *ptr; - - if (!desc || option == WS_WRITE_REQUIRED_VALUE) return E_INVALIDARG; - + if (!desc) return E_INVALIDARG; if (!option) option = WS_WRITE_REQUIRED_POINTER; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_struct( writer, mapping, desc, ptr );

1 0

Hans Leidekker : webservices: Fix the condition to determine when to skip writing a namespace attribute.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 39509987780cac86e5e5af721bbe46e85e70bd88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39509987780cac86e5e5af721… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 25 20:02:45 2016 +0200 webservices: Fix the condition to determine when to skip writing a namespace attribute. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 177c6e0..d3fe269 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -558,6 +558,12 @@ static HRESULT write_add_namespace_attribute( struct writer *writer, const WS_XM return S_OK; } +static inline BOOL str_equal( const WS_XML_STRING *str1, const WS_XML_STRING *str2 ) +{ + if (!str1 && !str2) return TRUE; + return WsXmlStringEquals( str1, str2, NULL ) == S_OK; +} + static BOOL namespace_in_scope( const WS_XML_ELEMENT_NODE *elem, const WS_XML_STRING *prefix, const WS_XML_STRING *ns ) { @@ -572,11 +578,8 @@ static BOOL namespace_in_scope( const WS_XML_ELEMENT_NODE *elem, const WS_XML_ST for (i = 0; i < elem->attributeCount; i++) { if (!elem->attributes[i]->isXmlNs) continue; - if (WsXmlStringEquals( elem->attributes[i]->prefix, prefix, NULL ) == S_OK && - WsXmlStringEquals( elem->attributes[i]->ns, ns, NULL ) == S_OK) - { - return TRUE; - } + if (str_equal( elem->attributes[i]->prefix, prefix ) && + str_equal( elem->attributes[i]->ns, ns )) return TRUE; } } return FALSE; @@ -587,8 +590,7 @@ static HRESULT write_set_element_namespace( struct writer *writer ) WS_XML_ELEMENT_NODE *elem = &writer->current->hdr; HRESULT hr; - if (!elem->ns->length || is_current_namespace( writer, elem->ns ) || - namespace_in_scope( elem, elem->prefix, elem->ns )) return S_OK; + if (!elem->ns->length || namespace_in_scope( elem, elem->prefix, elem->ns )) return S_OK; if ((hr = write_add_namespace_attribute( writer, elem->prefix, elem->ns, FALSE )) != S_OK) return hr;

1 0

Józef Kucia : dxgi: Enable WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: f94ef02dbcc5db2dafcb14beaf553e5dd7626791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94ef02dbcc5db2dafcb14bea… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 25 12:22:55 2016 +0200 dxgi: Enable WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE. 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 | 3 +++ dlls/dxgi/tests/device.c | 63 +++++++++++++++++++++--------------------------- dlls/dxgi/utils.c | 7 ++++-- 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e0185dd..7b02b3e 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -481,6 +481,9 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device wined3d_mutex_lock(); wined3d_private_store_init(&swapchain->private_store); + if (!desc->windowed && (!desc->backbuffer_width || !desc->backbuffer_height)) + FIXME("Fullscreen swapchain with back buffer width/height equal to 0 not supported properly.\n"); + swapchain->fullscreen = !desc->windowed; desc->windowed = TRUE; if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index d533af4..41a4d85 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1183,21 +1183,18 @@ static void test_create_swapchain(void) expected_height = expected_client_rect->bottom - expected_client_rect->top; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - todo_wine ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); - ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n", - result_desc.BufferDesc.Width, expected_width); - ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n", - result_desc.BufferDesc.Height, expected_height); - check_swapchain_fullscreen_state(swapchain, &expected_state); - hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); - check_swapchain_fullscreen_state(swapchain, &initial_state); - IDXGISwapChain_Release(swapchain); - } + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + todo_wine ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n", + result_desc.BufferDesc.Width, expected_width); + todo_wine ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n", + result_desc.BufferDesc.Height, expected_height); + check_swapchain_fullscreen_state(swapchain, &expected_state); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + check_swapchain_fullscreen_state(swapchain, &initial_state); + IDXGISwapChain_Release(swapchain); IDXGIOutput_Release(expected_state.target); @@ -2161,25 +2158,22 @@ static void test_inexact_modes(void) sizes[i].width, sizes[i].height, output); hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - todo_wine ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - check_swapchain_fullscreen_state(swapchain, &expected_state); - hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); - ok(result_desc.BufferDesc.Width == sizes[i].width, "Got width %u, expected %u.\n", - result_desc.BufferDesc.Width, sizes[i].width); - ok(result_desc.BufferDesc.Height == sizes[i].height, "Got height %u, expected %u.\n", - result_desc.BufferDesc.Height, sizes[i].height); + check_swapchain_fullscreen_state(swapchain, &expected_state); + hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(result_desc.BufferDesc.Width == sizes[i].width, "Got width %u, expected %u.\n", + result_desc.BufferDesc.Width, sizes[i].width); + ok(result_desc.BufferDesc.Height == sizes[i].height, "Got height %u, expected %u.\n", + result_desc.BufferDesc.Height, sizes[i].height); - hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); - check_swapchain_fullscreen_state(swapchain, &initial_state); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + check_swapchain_fullscreen_state(swapchain, &initial_state); - refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); - } + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); /* Test SetFullscreenState(). */ swapchain_desc.BufferDesc.Width = sizes[i].width; @@ -2189,11 +2183,10 @@ static void test_inexact_modes(void) hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); - todo_wine hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); - todo_wine ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - check_swapchain_fullscreen_state(swapchain, &expected_state); + check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); ok(result_desc.BufferDesc.Width == sizes[i].width, "Got width %u, expected %u.\n", diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index eda279f..b940b15 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -453,11 +453,14 @@ void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, wined3d_mode->scanline_ordering = wined3d_scanline_ordering_from_dxgi(mode->ScanlineOrdering); } +#define DXGI_WINED3D_SWAPCHAIN_FLAGS \ + (WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE | WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT) + unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) { unsigned int flags = 0; - wined3d_flags &= ~WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT; + wined3d_flags &= ~DXGI_WINED3D_SWAPCHAIN_FLAGS; if (wined3d_flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { @@ -473,7 +476,7 @@ unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) unsigned int wined3d_swapchain_flags_from_dxgi(unsigned int flags) { - unsigned int wined3d_flags = WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT; /* WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL? */ + unsigned int wined3d_flags = DXGI_WINED3D_SWAPCHAIN_FLAGS; /* WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL? */ if (flags & DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH) {

1 0

Józef Kucia : wined3d: Optionally use closest matching mode in wined3d_swapchain_set_fullscreen( ).
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 92a6c5839d9ebda9b94facbfd5bdac1bbb423600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a6c5839d9ebda9b94facbfd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 25 12:22:54 2016 +0200 wined3d: Optionally use closest matching mode in wined3d_swapchain_set_fullscreen(). 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/wined3d/swapchain.c | 48 ++++++++++++++++++++++++++++-------------------- include/wine/wined3d.h | 3 ++- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e405457..fdfe337 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1450,35 +1450,44 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode) { struct wined3d_device *device = swapchain->device; - struct wined3d_display_mode default_mode; - unsigned int width, height; + struct wined3d_display_mode actual_mode; HRESULT hr; TRACE("swapchain %p, desc %p, mode %p.\n", swapchain, swapchain_desc, mode); if (swapchain->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { - width = swapchain_desc->backbuffer_width; - height = swapchain_desc->backbuffer_height; - - if (!mode) + if (mode) + { + actual_mode = *mode; + } + else { if (!swapchain_desc->windowed) { - default_mode.width = swapchain_desc->backbuffer_width; - default_mode.height = swapchain_desc->backbuffer_height; - default_mode.refresh_rate = swapchain_desc->refresh_rate; - default_mode.format_id = swapchain_desc->backbuffer_format; - default_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + actual_mode.width = swapchain_desc->backbuffer_width; + actual_mode.height = swapchain_desc->backbuffer_height; + actual_mode.refresh_rate = swapchain_desc->refresh_rate; + actual_mode.format_id = swapchain_desc->backbuffer_format; + actual_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; } else { - default_mode = swapchain->original_mode; + actual_mode = swapchain->original_mode; } - mode = &default_mode; } - if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, mode))) + if (swapchain->desc.flags & WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE) + { + if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(device->wined3d, + device->adapter->ordinal, &actual_mode))) + { + WARN("Failed to find closest matching mode, hr %#x.\n", hr); + } + } + + if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, + device->adapter->ordinal, &actual_mode))) { WARN("Failed to set display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; @@ -1490,19 +1499,18 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha WARN("WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH is not set, ignoring mode.\n"); if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, - &default_mode, NULL))) + &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; } - mode = &default_mode; - - width = mode->width; - height = mode->height; } if (!swapchain_desc->windowed) { + unsigned int width = actual_mode.width; + unsigned int height = actual_mode.height; + if (swapchain->desc.windowed) { HWND focus_window = device->create_parms.focus_window; @@ -1522,7 +1530,7 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha /* Fullscreen -> fullscreen mode change */ MoveWindow(swapchain->device_window, 0, 0, width, height, TRUE); } - swapchain->d3d_mode = *mode; + swapchain->d3d_mode = actual_mode; } else if (!swapchain->desc.windowed) { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bc343ec..81dffea 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -829,7 +829,8 @@ enum wined3d_display_rotation #define WINED3D_SWAPCHAIN_NOAUTOROTATE 0x00000020u #define WINED3D_SWAPCHAIN_UNPRUNEDMODE 0x00000040u #define WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH 0x00001000u -#define WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT 0x00002000u +#define WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE 0x00002000u +#define WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT 0x00004000u #define WINED3DDP_MAXTEXCOORD 8

1 0

Józef Kucia : dxgi: Introduce helper functions for converting wined3d_display_mode.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 9381ad89fbe376dce1a318b11e2c8f0d0eae3505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9381ad89fbe376dce1a318b11… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 25 12:22:50 2016 +0200 dxgi: Introduce helper functions for converting wined3d_display_mode. 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/dxgi_private.h | 2 ++ dlls/dxgi/output.c | 30 +++++++++++++++++------------- dlls/dxgi/swapchain.c | 6 +----- dlls/dxgi/utils.c | 10 ++++++++++ 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 987370f1..b417470 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -91,6 +91,8 @@ void dxgi_sample_desc_from_wined3d(DXGI_SAMPLE_DESC *desc, enum wined3d_multisample_type wined3d_type, unsigned int wined3d_quality) DECLSPEC_HIDDEN; void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc) DECLSPEC_HIDDEN; +void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, + const DXGI_MODE_DESC *mode) DECLSPEC_HIDDEN; unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) DECLSPEC_HIDDEN; unsigned int wined3d_swapchain_flags_from_dxgi(unsigned int flags) DECLSPEC_HIDDEN; HRESULT dxgi_get_private_data(struct wined3d_private_store *store, diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index cfd08fe..6d7ca20 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -23,6 +23,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +static void dxgi_mode_from_wined3d(DXGI_MODE_DESC *mode, const struct wined3d_display_mode *wined3d_mode) +{ + mode->Width = wined3d_mode->width; + mode->Height = wined3d_mode->height; + mode->RefreshRate.Numerator = wined3d_mode->refresh_rate; + mode->RefreshRate.Denominator = 1; + mode->Format = dxgi_format_from_wined3dformat(wined3d_mode->format_id); + mode->ScanlineOrdering = wined3d_mode->scanline_ordering; + mode->Scaling = DXGI_MODE_SCALING_UNSPECIFIED; /* FIXME */ +} + static inline struct dxgi_output *impl_from_IDXGIOutput(IDXGIOutput *iface) { return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput_iface); @@ -154,11 +165,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput *iface, DXGI_OU static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *iface, DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC *desc) { - struct dxgi_output *This = impl_from_IDXGIOutput(iface); + struct dxgi_output *output = impl_from_IDXGIOutput(iface); enum wined3d_format_id wined3d_format; + unsigned int i, max_count; struct wined3d *wined3d; - UINT i; - UINT max_count; FIXME("iface %p, format %s, flags %#x, mode_count %p, desc %p partial stub!\n", iface, debug_dxgi_format(format), flags, mode_count, desc); @@ -172,11 +182,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *ifa return S_OK; } - wined3d = This->adapter->factory->wined3d; + wined3d = output->adapter->factory->wined3d; wined3d_format = wined3dformat_from_dxgi_format(format); wined3d_mutex_lock(); - max_count = wined3d_get_adapter_mode_count(wined3d, This->adapter->ordinal, + max_count = wined3d_get_adapter_mode_count(wined3d, output->adapter->ordinal, wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); if (!desc) @@ -199,7 +209,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *ifa struct wined3d_display_mode mode; HRESULT hr; - hr = wined3d_enum_adapter_modes(wined3d, This->adapter->ordinal, wined3d_format, + hr = wined3d_enum_adapter_modes(wined3d, output->adapter->ordinal, wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &mode); if (FAILED(hr)) { @@ -208,13 +218,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *ifa return hr; } - desc[i].Width = mode.width; - desc[i].Height = mode.height; - desc[i].RefreshRate.Numerator = mode.refresh_rate; - desc[i].RefreshRate.Denominator = 1; - desc[i].Format = format; - desc[i].ScanlineOrdering = mode.scanline_ordering; - desc[i].Scaling = DXGI_MODE_SCALING_UNSPECIFIED; /* FIXME */ + dxgi_mode_from_wined3d(&desc[i], &mode); } wined3d_mutex_unlock(); diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0057aa2..e0185dd 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -351,11 +351,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_ResizeTarget(IDXGISwapChain *ifa if (target_mode_desc->Scaling) FIXME("Ignoring scaling %#x.\n", target_mode_desc->Scaling); - mode.width = target_mode_desc->Width; - mode.height = target_mode_desc->Height; - mode.refresh_rate = dxgi_rational_to_uint(&target_mode_desc->RefreshRate); - mode.format_id = wined3dformat_from_dxgi_format(target_mode_desc->Format); - mode.scanline_ordering = wined3d_scanline_ordering_from_dxgi(target_mode_desc->ScanlineOrdering); + wined3d_display_mode_from_dxgi(&mode, target_mode_desc); wined3d_mutex_lock(); hr = wined3d_swapchain_resize_target(swapchain->wined3d_swapchain, &mode); diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index b9be4a5..eda279f 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -443,6 +443,16 @@ void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, } } +void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, + const DXGI_MODE_DESC *mode) +{ + wined3d_mode->width = mode->Width; + wined3d_mode->height = mode->Height; + wined3d_mode->refresh_rate = dxgi_rational_to_uint(&mode->RefreshRate); + wined3d_mode->format_id = wined3dformat_from_dxgi_format(mode->Format); + wined3d_mode->scanline_ordering = wined3d_scanline_ordering_from_dxgi(mode->ScanlineOrdering); +} + unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) { unsigned int flags = 0;

1 0

Józef Kucia : dxgi/tests: Add test for switching display mode to inexact resolution.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 87891518b7f1362674df4ae64ba1a59c0fc32c58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87891518b7f1362674df4ae64… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 25 12:22:49 2016 +0200 dxgi/tests: Add test for switching display mode to inexact resolution. 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 | 181 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 03407ca..23624eb 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1841,6 +1841,186 @@ static void test_resize_target(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_inexact_modes(void) +{ + struct swapchain_fullscreen_state initial_state, expected_state; + DXGI_SWAP_CHAIN_DESC swapchain_desc, result_desc; + IDXGIOutput *output = NULL; + IDXGISwapChain *swapchain; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + IDXGIDevice *device; + unsigned int i; + ULONG refcount; + HRESULT hr; + + static const struct + { + unsigned int width, height; + } + sizes[] = + { + {101, 101}, + {203, 204}, + {799, 601}, + }; + + 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 = 1; + 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, 400, 200, 0, 0, 0, 0); + swapchain_desc.Windowed = FALSE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH; + + memset(&initial_state, 0, sizeof(initial_state)); + capture_fullscreen_state(&initial_state.fullscreen_state, swapchain_desc.OutputWindow); + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); + ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, + "GetContainingOutput failed, hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + if (hr == DXGI_ERROR_UNSUPPORTED) + { + win_skip("GetContainingOutput() not supported.\n"); + goto done; + } + if (result_desc.Windowed) + { + win_skip("Fullscreen not supported.\n"); + goto done; + } + + check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); + + for (i = 0; i < sizeof(sizes) / sizeof(*sizes); ++i) + { + /* Test CreateSwapChain(). */ + swapchain_desc.BufferDesc.Width = sizes[i].width; + swapchain_desc.BufferDesc.Height = sizes[i].height; + swapchain_desc.Windowed = FALSE; + + expected_state = initial_state; + compute_expected_swapchain_fullscreen_state_after_fullscreen_change(&expected_state, + &swapchain_desc, &initial_state.fullscreen_state.monitor_rect, + sizes[i].width, sizes[i].height, output); + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + todo_wine ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + + if (SUCCEEDED(hr)) + { + check_swapchain_fullscreen_state(swapchain, &expected_state); + hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(result_desc.BufferDesc.Width == sizes[i].width, "Got width %u, expected %u.\n", + result_desc.BufferDesc.Width, sizes[i].width); + ok(result_desc.BufferDesc.Height == sizes[i].height, "Got height %u, expected %u.\n", + result_desc.BufferDesc.Height, sizes[i].height); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + check_swapchain_fullscreen_state(swapchain, &initial_state); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + } + + /* Test SetFullscreenState(). */ + swapchain_desc.BufferDesc.Width = sizes[i].width; + swapchain_desc.BufferDesc.Height = sizes[i].height; + swapchain_desc.Windowed = TRUE; + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + + todo_wine hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); + todo_wine ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + + if (SUCCEEDED(hr)) + check_swapchain_fullscreen_state(swapchain, &expected_state); + hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(result_desc.BufferDesc.Width == sizes[i].width, "Got width %u, expected %u.\n", + result_desc.BufferDesc.Width, sizes[i].width); + ok(result_desc.BufferDesc.Height == sizes[i].height, "Got height %u, expected %u.\n", + result_desc.BufferDesc.Height, sizes[i].height); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + check_swapchain_fullscreen_state(swapchain, &initial_state); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + + /* Test ResizeTarget(). */ + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.Windowed = TRUE; + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + + swapchain_desc.BufferDesc.Width = sizes[i].width; + swapchain_desc.BufferDesc.Height = sizes[i].height; + hr = IDXGISwapChain_ResizeTarget(swapchain, &swapchain_desc.BufferDesc); + todo_wine ok(SUCCEEDED(hr), "ResizeTarget failed, hr %#x.\n", hr); + + if (SUCCEEDED(hr)) + check_swapchain_fullscreen_state(swapchain, &expected_state); + hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(result_desc.BufferDesc.Width == 800, "Got width %u.\n", result_desc.BufferDesc.Width); + ok(result_desc.BufferDesc.Height == 600, "Got height %u.\n", result_desc.BufferDesc.Height); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + check_swapchain_fullscreen_state(swapchain, &initial_state); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + } + +done: + if (output) + IDXGIOutput_Release(output); + IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + static void test_create_factory(void) { IDXGIFactory1 *factory; @@ -2693,6 +2873,7 @@ START_TEST(device) test_set_fullscreen(); test_default_fullscreen_target_output(); test_resize_target(); + test_inexact_modes(); test_create_factory(); test_private_data(); test_swapchain_resize();

1 0

Józef Kucia : dxgi/tests: Extend test for creating swapchain.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: ce4e01387eb83ec778195a9c573a2abdb5827919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4e01387eb83ec778195a9c5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 25 12:22:48 2016 +0200 dxgi/tests: Extend test for creating swapchain. 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 | 173 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 163 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce4e01387eb83ec778195…

1 0

Nikolay Sivov : oleaut32: Implement ITypeComp::Bind() proxy/stub.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: ff934e82a8e0fd6d4f8069796282c58b80661557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff934e82a8e0fd6d4f8069796… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 26 12:30:47 2016 +0300 oleaut32: Implement ITypeComp::Bind() proxy/stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/usrmarshal.c | 117 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 98 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 955b709..61c8cc2 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -82,6 +82,10 @@ unsigned char * WINAPI CLEANLOCALSTORAGE_UserMarshal(ULONG *pFlags, unsigned cha { ALIGN_POINTER(Buffer, 3); *(DWORD*)Buffer = pstg->flags; + + if (!pstg->pInterface) + return Buffer + sizeof(DWORD); + switch(pstg->flags) { case CLS_LIBATTR: @@ -1407,31 +1411,106 @@ static void free_embedded_elemdesc(ELEMDESC *edesc) HRESULT CALLBACK ITypeComp_Bind_Proxy( ITypeComp* This, - LPOLESTR szName, + LPOLESTR name, ULONG lHashVal, - WORD wFlags, - ITypeInfo** ppTInfo, - DESCKIND* pDescKind, - BINDPTR* pBindPtr) -{ - FIXME("not implemented\n"); - return E_FAIL; + WORD flags, + ITypeInfo **ti, + DESCKIND *desckind, + BINDPTR *bindptr) +{ + CLEANLOCALSTORAGE stg = { 0 }; + ITypeComp *typecomp; + FUNCDESC *funcdesc; + VARDESC *vardesc; + HRESULT hr; + + TRACE("(%p, %s, %#x, %#x, %p, %p, %p)\n", This, debugstr_w(name), lHashVal, flags, ti, + desckind, bindptr); + + *desckind = DESCKIND_NONE; + memset(bindptr, 0, sizeof(*bindptr)); + + hr = ITypeComp_RemoteBind_Proxy(This, name, lHashVal, flags, ti, desckind, + &funcdesc, &vardesc, &typecomp, &stg); + + if (hr == S_OK) + { + switch (*desckind) + { + case DESCKIND_FUNCDESC: + bindptr->lpfuncdesc = funcdesc; + break; + case DESCKIND_VARDESC: + case DESCKIND_IMPLICITAPPOBJ: + bindptr->lpvardesc = vardesc; + break; + case DESCKIND_TYPECOMP: + bindptr->lptcomp = typecomp; + break; + default: + ; + } + } + + return hr; } HRESULT __RPC_STUB ITypeComp_Bind_Stub( ITypeComp* This, - LPOLESTR szName, + LPOLESTR name, ULONG lHashVal, - WORD wFlags, - ITypeInfo** ppTInfo, - DESCKIND* pDescKind, - LPFUNCDESC* ppFuncDesc, - LPVARDESC* ppVarDesc, - ITypeComp** ppTypeComp, - CLEANLOCALSTORAGE* pDummy) -{ - FIXME("not implemented\n"); - return E_FAIL; + WORD flags, + ITypeInfo **ti, + DESCKIND *desckind, + FUNCDESC **funcdesc, + VARDESC **vardesc, + ITypeComp **typecomp, + CLEANLOCALSTORAGE *stg) +{ + BINDPTR bindptr; + HRESULT hr; + + TRACE("(%p, %s, %#x, %#x, %p, %p, %p, %p, %p, %p)\n", This, debugstr_w(name), + lHashVal, flags, ti, desckind, funcdesc, vardesc, typecomp, stg); + + memset(stg, 0, sizeof(*stg)); + memset(&bindptr, 0, sizeof(bindptr)); + + *funcdesc = NULL; + *vardesc = NULL; + *typecomp = NULL; + *ti = NULL; + + hr = ITypeComp_Bind(This, name, lHashVal, flags, ti, desckind, &bindptr); + if(hr != S_OK) + return hr; + + switch (*desckind) + { + case DESCKIND_FUNCDESC: + *funcdesc = bindptr.lpfuncdesc; + stg->pInterface = (IUnknown*)*ti; + stg->pStorage = funcdesc; + stg->flags = CLS_FUNCDESC; + break; + case DESCKIND_VARDESC: + case DESCKIND_IMPLICITAPPOBJ: + *vardesc = bindptr.lpvardesc; + stg->pInterface = (IUnknown*)*ti; + stg->pStorage = vardesc; + stg->flags = CLS_VARDESC; + break; + case DESCKIND_TYPECOMP: + *typecomp = bindptr.lptcomp; + break; + default: + ; + } + + if (stg->pInterface) + IUnknown_AddRef(stg->pInterface); + + return hr; } HRESULT CALLBACK ITypeComp_BindType_Proxy(

1 0

Nikolay Sivov : oleaut32: Support querying for ITypeComp from ITypeInfo.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 5c4cbc9d6006a1c630dabf1dc4e820f770aee9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4cbc9d6006a1c630dabf1dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 25 20:57:15 2016 +0300 oleaut32: Support querying for ITypeComp from ITypeInfo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 24 +++++++++++++++++++----- dlls/oleaut32/typelib.c | 4 +++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 593925b..4f43cfe 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -227,15 +227,13 @@ static void ref_count_test(LPCWSTR type_lib) static void test_TypeComp(void) { + ITypeComp *pTypeComp, *tcomp, *pTypeComp_tmp; + ITypeInfo *pTypeInfo, *ti, *pFontTypeInfo; ITypeLib *pTypeLib; - ITypeComp *pTypeComp; HRESULT hr; ULONG ulHash; DESCKIND desckind; BINDPTR bindptr; - ITypeInfo *pTypeInfo; - ITypeInfo *pFontTypeInfo; - ITypeComp *pTypeComp_tmp; static WCHAR wszStdFunctions[] = {'S','t','d','F','u','n','c','t','i','o','n','s',0}; static WCHAR wszSavePicture[] = {'S','a','v','e','P','i','c','t','u','r','e',0}; static WCHAR wszOLE_TRISTATE[] = {'O','L','E','_','T','R','I','S','T','A','T','E',0}; @@ -436,6 +434,17 @@ static void test_TypeComp(void) hr = ITypeInfo_GetTypeComp(pFontTypeInfo, &pTypeComp); ok_ole_success(hr, ITypeLib_GetTypeComp); + hr = ITypeInfo_QueryInterface(pFontTypeInfo, &IID_ITypeComp, (void**)&tcomp); + ok(hr == S_OK, "got %08x\n", hr); + ok(tcomp == pTypeComp, "got %p, was %p\n", tcomp, pTypeComp); + + hr = ITypeComp_QueryInterface(tcomp, &IID_ITypeInfo, (void**)&ti); + ok(hr == S_OK, "got %08x\n", hr); + ok(ti == pFontTypeInfo, "got %p, was %p\n", ti, pFontTypeInfo); + ITypeInfo_Release(ti); + + ITypeComp_Release(tcomp); + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszClone); hr = ITypeComp_Bind(pTypeComp, wszClone, ulHash, 0, &pTypeInfo, &desckind, &bindptr); ok_ole_success(hr, ITypeComp_Bind); @@ -1684,7 +1693,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ITypeInfo *interface1, *interface2, *dual, *unknown, *dispatch, *ti; ITypeInfo *tinfos[2]; ITypeInfo2 *ti2; - ITypeComp *tcomp; + ITypeComp *tcomp, *tcomp2; MEMBERID memids[2]; FUNCDESC funcdesc, *pfuncdesc; ELEMDESC elemdesc[5], *edesc; @@ -3599,6 +3608,11 @@ static void test_CreateTypeLib(SYSKIND sys) { hres = ITypeInfo_GetTypeComp(ti, &tcomp); ok(hres == S_OK, "got %08x\n", hres); + hres = ITypeInfo_QueryInterface(ti, &IID_ITypeComp, (void**)&tcomp2); + ok(hres == S_OK, "got %08x\n", hres); + ok(tcomp == tcomp2, "got %p, was %p\n", tcomp2, tcomp); + ITypeComp_Release(tcomp2); + hres = ITypeComp_Bind(tcomp, invokeW, 0, INVOKE_FUNC, &interface1, &desckind, &bindptr); ok(hres == S_OK, "got %08x\n", hres); ok(desckind == DESCKIND_FUNCDESC, "got wrong desckind: 0x%x\n", desckind); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 6f87279..b0ee5f2 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5583,9 +5583,11 @@ static HRESULT WINAPI ITypeInfo_fnQueryInterface( else if(IsEqualIID(riid, &IID_ICreateTypeInfo) || IsEqualIID(riid, &IID_ICreateTypeInfo2)) *ppvObject = &This->ICreateTypeInfo2_iface; + else if(IsEqualIID(riid, &IID_ITypeComp)) + *ppvObject = &This->ITypeComp_iface; if(*ppvObject){ - ITypeInfo2_AddRef(iface); + IUnknown_AddRef((IUnknown*)*ppvObject); TRACE("-- Interface: (%p)->(%p)\n",ppvObject,*ppvObject); return S_OK; }

1 0

Hans Leidekker : webservices: Add support for optional and nillable fields in the writer.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 81d978902d26fc3f60004dad63b52bf0b5f33694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81d978902d26fc3f60004dad6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 25 20:02:49 2016 +0200 webservices: Add support for optional and nillable fields in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 85 +++++++++++++++++++++++++++++++++++++++++ dlls/webservices/writer.c | 58 +++++++++++++++++++++++++--- 2 files changed, 138 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 8888c69..d2573e3 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2111,6 +2111,90 @@ static void test_double(void) WsFreeWriter( writer ); } +static void test_field_flags(void) +{ + static const char expected[] = + "<t><bool a:nil=\"true\" xmlns:a=\"http://www.w3.org/2001/XMLSchema-instance\"/><int32>-1</int32>" + "<xmlstr a:nil=\"true\" xmlns:a=\"http://www.w3.org/2001/XMLSchema-instance\"/></t>"; + HRESULT hr; + WS_XML_WRITER *writer; + WS_STRUCT_DESCRIPTION s; + WS_FIELD_DESCRIPTION f, f2, f3, f4, *fields[4]; + WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}, str_guid = {4, (BYTE *)"guid"}; + WS_XML_STRING str_int32 = {5, (BYTE *)"int32"}, str_bool = {4, (BYTE *)"bool"}; + WS_XML_STRING str_xmlstr = {6, (BYTE *)"xmlstr"}; + INT32 val = -1; + struct test + { + GUID guid; + BOOL *bool_ptr; + INT32 *int32_ptr; + WS_XML_STRING xmlstr; + } test; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_ELEMENT_FIELD_MAPPING; + f.localName = &str_guid; + f.ns = &ns; + f.type = WS_GUID_TYPE; + f.options = WS_FIELD_OPTIONAL; + fields[0] = &f; + + memset( &f2, 0, sizeof(f2) ); + f2.mapping = WS_ELEMENT_FIELD_MAPPING; + f2.localName = &str_bool; + f2.offset = FIELD_OFFSET(struct test, bool_ptr); + f2.ns = &ns; + f2.type = WS_BOOL_TYPE; + f2.options = WS_FIELD_POINTER|WS_FIELD_NILLABLE; + fields[1] = &f2; + + memset( &f3, 0, sizeof(f3) ); + f3.mapping = WS_ELEMENT_FIELD_MAPPING; + f3.localName = &str_int32; + f3.offset = FIELD_OFFSET(struct test, int32_ptr); + f3.ns = &ns; + f3.type = WS_INT32_TYPE; + f3.options = WS_FIELD_POINTER|WS_FIELD_NILLABLE; + fields[2] = &f3; + + memset( &f4, 0, sizeof(f4) ); + f4.mapping = WS_ELEMENT_FIELD_MAPPING; + f4.localName = &str_xmlstr; + f4.offset = FIELD_OFFSET(struct test, xmlstr); + f4.ns = &ns; + f4.type = WS_XML_STRING_TYPE; + f4.options = WS_FIELD_NILLABLE; + fields[3] = &f4; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields; + s.fieldCount = 4; + + memset( &test, 0, sizeof(test) ); + test.int32_ptr = &val; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, + &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, expected, __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -2137,4 +2221,5 @@ START_TEST(writer) test_WsCopyNode(); test_text_types(); test_double(); + test_field_flags(); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 8872a37..7f732f0 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1564,6 +1564,26 @@ static HRESULT write_type_xml_string( struct writer *writer, WS_TYPE_MAPPING map return write_type_text( writer, mapping, &utf8.text ); } +static inline BOOL is_nil_value( const char *value, ULONG size ) +{ + ULONG i; + for (i = 0; i < size; i++) if (value[i]) return FALSE; + return TRUE; +} + +static HRESULT write_add_nil_attribute( struct writer *writer ) +{ + static const WS_XML_STRING prefix = {1, (BYTE *)"a"}; + static const WS_XML_STRING localname = {3, (BYTE *)"nil"}; + static const WS_XML_STRING ns = {41, (BYTE *)"http://www.w3.org/2001/XMLSchema-instance"}; + static const WS_XML_UTF8_TEXT value = {{WS_XML_TEXT_TYPE_UTF8}, {4, (BYTE *)"true"}}; + HRESULT hr; + + if ((hr = write_add_attribute( writer, &prefix, &localname, &ns, FALSE )) != S_OK) return hr; + if ((hr = write_set_attribute_value( writer, &value.text )) != S_OK) return hr; + return write_add_namespace_attribute( writer, &prefix, &ns, FALSE ); +} + static HRESULT write_type( struct writer *, WS_TYPE_MAPPING, WS_TYPE, const void *, WS_WRITE_OPTION, const void *, ULONG ); @@ -1574,14 +1594,33 @@ static HRESULT write_type_struct_field( struct writer *writer, const WS_FIELD_DE WS_TYPE_MAPPING mapping; WS_WRITE_OPTION option; - if (!desc->options || desc->options == WS_FIELD_OPTIONAL) option = 0; - else if (desc->options == WS_FIELD_POINTER) option = WS_WRITE_REQUIRED_POINTER; - else + if (desc->options & ~(WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) { FIXME( "options 0x%x not supported\n", desc->options ); return E_NOTIMPL; } + if (is_nil_value( value, size )) + { + if (desc->options & WS_FIELD_NILLABLE) + { + if (desc->options & WS_FIELD_POINTER) + option = WS_WRITE_NILLABLE_POINTER; + else + option = WS_WRITE_NILLABLE_VALUE; + } + else + { + if (desc->options & WS_FIELD_OPTIONAL) return S_OK; + return E_INVALIDARG; + } + } + else + { + if (desc->options & WS_FIELD_POINTER) option = WS_WRITE_REQUIRED_POINTER; + else option = 0; + } + switch (desc->mapping) { case WS_ATTRIBUTE_FIELD_MAPPING: @@ -1595,6 +1634,10 @@ static HRESULT write_type_struct_field( struct writer *writer, const WS_FIELD_DE case WS_ELEMENT_FIELD_MAPPING: if ((hr = write_element_node( writer, NULL, desc->localName, desc->ns )) != S_OK) return hr; + if (option == WS_WRITE_NILLABLE_VALUE || option == WS_WRITE_NILLABLE_POINTER) + { + if ((hr = write_add_nil_attribute( writer )) != S_OK) return hr; + } mapping = WS_ELEMENT_TYPE_MAPPING; break; @@ -1620,8 +1663,11 @@ static HRESULT write_type_struct_field( struct writer *writer, const WS_FIELD_DE return E_NOTIMPL; } - if ((hr = write_type( writer, mapping, desc->type, desc->typeDescription, option, value, size )) != S_OK) - return hr; + if (option != WS_WRITE_NILLABLE_VALUE && option != WS_WRITE_NILLABLE_POINTER) + { + if ((hr = write_type( writer, mapping, desc->type, desc->typeDescription, option, value, size )) != S_OK) + return hr; + } switch (mapping) { @@ -1670,11 +1716,13 @@ static HRESULT get_value_ptr( WS_WRITE_OPTION option, const void *value, ULONG s switch (option) { case WS_WRITE_REQUIRED_VALUE: + case WS_WRITE_NILLABLE_VALUE: if (!value || !size) return E_INVALIDARG; *ptr = value; return S_OK; case WS_WRITE_REQUIRED_POINTER: + case WS_WRITE_NILLABLE_POINTER: if (size != sizeof(const void *) || !(*ptr = *(const void **)value)) return E_INVALIDARG; return S_OK;

1 0