wine-commits May 2017

wine-commits@winehq.org

2 participants
640 discussions

Józef Kucia : d3d11: Implement d3d11_immediate_context_ClearState().
by Alexandre Julliard 09 May '17

09 May '17

Module: wine Branch: master Commit: 7198cea1635b32b2082deb3e800a284cc282028e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7198cea1635b32b2082deb3e8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 9 12:51:39 2017 +0200 d3d11: Implement d3d11_immediate_context_ClearState(). 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/d3d11/device.c | 135 +++++++++++++++++++++++++++------------------------- 1 file changed, 69 insertions(+), 66 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 84a878c..4284a59 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2404,7 +2404,74 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceContext *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; + unsigned int i; + + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + wined3d_device_set_vertex_shader(device->wined3d_device, NULL); + wined3d_device_set_hull_shader(device->wined3d_device, NULL); + wined3d_device_set_domain_shader(device->wined3d_device, NULL); + wined3d_device_set_geometry_shader(device->wined3d_device, NULL); + wined3d_device_set_pixel_shader(device->wined3d_device, NULL); + wined3d_device_set_compute_shader(device->wined3d_device, NULL); + for (i = 0; i < D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) + { + wined3d_device_set_vs_sampler(device->wined3d_device, i, NULL); + wined3d_device_set_hs_sampler(device->wined3d_device, i, NULL); + wined3d_device_set_ds_sampler(device->wined3d_device, i, NULL); + wined3d_device_set_gs_sampler(device->wined3d_device, i, NULL); + wined3d_device_set_ps_sampler(device->wined3d_device, i, NULL); + wined3d_device_set_cs_sampler(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) + { + wined3d_device_set_vs_resource_view(device->wined3d_device, i, NULL); + wined3d_device_set_hs_resource_view(device->wined3d_device, i, NULL); + wined3d_device_set_ds_resource_view(device->wined3d_device, i, NULL); + wined3d_device_set_gs_resource_view(device->wined3d_device, i, NULL); + wined3d_device_set_ps_resource_view(device->wined3d_device, i, NULL); + wined3d_device_set_cs_resource_view(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++i) + { + wined3d_device_set_vs_cb(device->wined3d_device, i, NULL); + wined3d_device_set_hs_cb(device->wined3d_device, i, NULL); + wined3d_device_set_ds_cb(device->wined3d_device, i, NULL); + wined3d_device_set_gs_cb(device->wined3d_device, i, NULL); + wined3d_device_set_ps_cb(device->wined3d_device, i, NULL); + wined3d_device_set_cs_cb(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT; ++i) + { + wined3d_device_set_stream_source(device->wined3d_device, i, NULL, 0, 0); + } + wined3d_device_set_index_buffer(device->wined3d_device, NULL, WINED3DFMT_UNKNOWN, 0); + wined3d_device_set_vertex_declaration(device->wined3d_device, NULL); + wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_UNDEFINED); + for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) + { + wined3d_device_set_rendertarget_view(device->wined3d_device, i, NULL, FALSE); + } + wined3d_device_set_depth_stencil_view(device->wined3d_device, NULL); + for (i = 0; i < D3D11_PS_CS_UAV_REGISTER_COUNT; ++i) + { + wined3d_device_set_unordered_access_view(device->wined3d_device, i, NULL); + wined3d_device_set_cs_uav(device->wined3d_device, i, NULL); + } + ID3D11DeviceContext_OMSetDepthStencilState(iface, NULL, 0); + ID3D11DeviceContext_OMSetBlendState(iface, NULL, blend_factor, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_RSSetViewports(iface, 0, NULL); + ID3D11DeviceContext_RSSetScissorRects(iface, 0, NULL); + ID3D11DeviceContext_RSSetState(iface, NULL); + for (i = 0; i < D3D11_SO_BUFFER_SLOT_COUNT; ++i) + { + wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); + } + wined3d_device_set_predication(device->wined3d_device, NULL, FALSE); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_Flush(ID3D11DeviceContext *iface) @@ -4906,75 +4973,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateDataInterface(ID3D10Devi static void STDMETHODCALLTYPE d3d10_device_ClearState(ID3D10Device1 *iface) { - static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; struct d3d_device *device = impl_from_ID3D10Device(iface); - unsigned int i; TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - wined3d_device_set_vertex_shader(device->wined3d_device, NULL); - for (i = 0; i < D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) - { - wined3d_device_set_vs_sampler(device->wined3d_device, i, NULL); - } - for (i = 0; i < D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) - { - wined3d_device_set_vs_resource_view(device->wined3d_device, i, NULL); - } - for (i = 0; i < D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++i) - { - wined3d_device_set_vs_cb(device->wined3d_device, i, NULL); - } - wined3d_device_set_geometry_shader(device->wined3d_device, NULL); - for (i = 0; i < D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) - { - wined3d_device_set_gs_sampler(device->wined3d_device, i, NULL); - } - for (i = 0; i < D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) - { - wined3d_device_set_gs_resource_view(device->wined3d_device, i, NULL); - } - for (i = 0; i < D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++i) - { - wined3d_device_set_gs_cb(device->wined3d_device, i, NULL); - } - wined3d_device_set_pixel_shader(device->wined3d_device, NULL); - for (i = 0; i < D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) - { - wined3d_device_set_ps_sampler(device->wined3d_device, i, NULL); - } - for (i = 0; i < D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) - { - wined3d_device_set_ps_resource_view(device->wined3d_device, i, NULL); - } - for (i = 0; i < D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++i) - { - wined3d_device_set_ps_cb(device->wined3d_device, i, NULL); - } - for (i = 0; i < D3D10_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT; ++i) - { - wined3d_device_set_stream_source(device->wined3d_device, i, NULL, 0, 0); - } - wined3d_device_set_index_buffer(device->wined3d_device, NULL, WINED3DFMT_UNKNOWN, 0); - wined3d_device_set_vertex_declaration(device->wined3d_device, NULL); - wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_UNDEFINED); - for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) - { - wined3d_device_set_rendertarget_view(device->wined3d_device, i, NULL, FALSE); - } - wined3d_device_set_depth_stencil_view(device->wined3d_device, NULL); - ID3D10Device1_OMSetDepthStencilState(iface, NULL, 0); - ID3D10Device1_OMSetBlendState(iface, NULL, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); - ID3D10Device1_RSSetViewports(iface, 0, NULL); - ID3D10Device1_RSSetScissorRects(iface, 0, NULL); - ID3D10Device1_RSSetState(iface, NULL); - for (i = 0; i < D3D10_SO_BUFFER_SLOT_COUNT; ++i) - { - wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); - } - wined3d_device_set_predication(device->wined3d_device, NULL, FALSE); - wined3d_mutex_unlock(); + d3d11_immediate_context_ClearState(&device->immediate_context.ID3D11DeviceContext_iface); } static void STDMETHODCALLTYPE d3d10_device_Flush(ID3D10Device1 *iface)

1 0

Józef Kucia : d3d11: Handle unsupported vertex buffer slots in better way.
by Alexandre Julliard 09 May '17

09 May '17

Module: wine Branch: master Commit: eb4792a9af952f540602413b07b857bb0960b6f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4792a9af952f540602413b0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 9 12:51:38 2017 +0200 d3d11: Handle unsupported vertex buffer slots in better way. D3D11 supports 32 buffers. 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/d3d11/device.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 69642ef..84a878c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1583,12 +1583,18 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetVertexBuffers(ID3D11D wined3d_mutex_lock(); for (i = 0; i < buffer_count; ++i) { - struct wined3d_buffer *wined3d_buffer; + struct wined3d_buffer *wined3d_buffer = NULL; struct d3d_buffer *buffer_impl; if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, start_slot + i, &wined3d_buffer, &offsets[i], &strides[i]))) - ERR("Failed to get vertex buffer %u.\n", start_slot + i); + { + FIXME("Failed to get vertex buffer %u.\n", start_slot + i); + if (strides) + strides[i] = 0; + if (offsets) + offsets[i] = 0; + } if (!wined3d_buffer) { @@ -4415,7 +4421,7 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetVertexBuffers(ID3D10Device1 *ifa wined3d_mutex_lock(); for (i = 0; i < buffer_count; ++i) { - struct wined3d_buffer *wined3d_buffer; + struct wined3d_buffer *wined3d_buffer = NULL; struct d3d_buffer *buffer_impl; if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, start_slot + i,

1 0

Rosanne DiMesio : Remove Steam and GOG from licenses
by Jeremy Newman 09 May '17

09 May '17

Module: appdb Branch: master Commit: d0e262d6b7106afe09fb17ae69b291d96968929b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d0e262d6b7106afe09fb17ae… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon May 8 16:09:18 2017 -0500 Remove Steam and GOG from licenses Steam and GOG are distribution platforms, not licenses. See bug 42970. Entries already using the mistakenly-added items will have to be manually fixed in the live database. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/version.php | 6 ++---- tables/appdb_tables.sql | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/version.php b/include/version.php index 5ee4974..45459fd 100644 --- a/include/version.php +++ b/include/version.php @@ -20,8 +20,6 @@ define("LICENSE_DEMO", "Demo"); define("LICENSE_RETAIL", "Retail"); define('LICENSE_FREETOUSE', 'Free to use'); define('LICENSE_FREETOSHARE', 'Free to use and share'); -define('LICENSE_STEAM', 'Steam'); -define('LICENSE_GOG', 'GOG'); /** * Version class for handling versions. @@ -1371,7 +1369,7 @@ EOT; public static function getLicenses() { return array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREETOUSE, - LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE, LICENSE_STEAM, LICENSE_GOG); + LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE); } // returns a string containing the html for a selection list @@ -1405,7 +1403,7 @@ EOT; public static function checkLicense($sLicense) { $aLicense = array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREETOUSE, - LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE, LICENSE_STEAM, LICENSE_GOG); + LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE); foreach($aLicense as $sElement) { diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index d1cbeb4..be556d3 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -48,6 +48,7 @@ create table appFamily ( /* * a version of an application + * TODO: remove Steam and GOG from the list of licenses after entries using them have been corrected in the live database */ create table appVersion ( versionId int not null auto_increment,

1 0

Ken Thomases : winemac: Track whether a view has ever had an OpenGL context attached.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: b6a4b2f593503a105dde01e7bd11ffdde243117a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a4b2f593503a105dde01e7b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon May 8 15:31:48 2017 -0500 winemac: Track whether a view has ever had an OpenGL context attached. ... rather than whether it currently has one. This is for OpenGLSurfaceMode=behind. In that mode, we need to make the window transparent wherever a GL-rendered view should not be clipped by GDI-rendered children or sibling views. Some apps attach a GL context to the view only temporarily, do some rendering, and then detach it. But the GL surface remains, with the rendered graphics. In order for those to show, the window needs to remain transparent even though none of its views has a GL context currently attached. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 7cb3459..a9290c3 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -296,6 +296,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { NSMutableArray* glContexts; NSMutableArray* pendingGlContexts; + BOOL _everHadGLContext; BOOL _cachedHasGLDescendant; BOOL _cachedHasGLDescendantValid; BOOL clearedGlSurface; @@ -306,6 +307,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi int backingSize[2]; } +@property (readonly, nonatomic) BOOL everHadGLContext; + - (void) addGLContext:(WineOpenGLContext*)context; - (void) removeGLContext:(WineOpenGLContext*)context; - (void) updateGLContexts; @@ -358,6 +361,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @implementation WineContentView +@synthesize everHadGLContext = _everHadGLContext; + - (void) dealloc { [markedText release]; @@ -467,7 +472,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) addGLContext:(WineOpenGLContext*)context { - BOOL hadContext = [self hasGLContext]; + BOOL hadContext = _everHadGLContext; if (!glContexts) glContexts = [[NSMutableArray alloc] init]; if (!pendingGlContexts) @@ -489,6 +494,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self setNeedsDisplay:YES]; } + _everHadGLContext = YES; if (!hadContext) [self invalidateHasGLDescendant]; [(WineWindow*)[self window] updateForGLSubviews]; @@ -496,11 +502,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) removeGLContext:(WineOpenGLContext*)context { - BOOL hadContext = [self hasGLContext]; [glContexts removeObjectIdenticalTo:context]; [pendingGlContexts removeObjectIdenticalTo:context]; - if (hadContext && ![self hasGLContext]) - [self invalidateHasGLDescendant]; [(WineWindow*)[self window] updateForGLSubviews]; } @@ -519,16 +522,11 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self updateGLContexts:NO]; } - - (BOOL) hasGLContext - { - return [glContexts count] || [pendingGlContexts count]; - } - - (BOOL) _hasGLDescendant { if ([self isHidden]) return NO; - if ([self hasGLContext]) + if (_everHadGLContext) return YES; for (WineContentView* view in [self subviews]) { @@ -2485,7 +2483,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi NSRect contentRect = [[self contentView] frame]; BOOL coveredByGLView = FALSE; WineContentView* view = (WineContentView*)[[self contentView] hitTest:NSMakePoint(NSMidX(contentRect), NSMidY(contentRect))]; - if ([view isKindOfClass:[WineContentView class]] && [view hasGLContext]) + if ([view isKindOfClass:[WineContentView class]] && view.everHadGLContext) { NSRect frame = [view convertRect:[view bounds] toView:nil]; if (NSContainsRect(frame, contentRect))

1 0

Ken Thomases : winemac: Move CVDisplayLink operations out of @synchronized blocks to avoid potential deadlock.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 24d3795285102170834ee624e3d07036c87005ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=24d3795285102170834ee624e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon May 8 12:52:02 2017 -0500 winemac: Move CVDisplayLink operations out of @synchronized blocks to avoid potential deadlock. The -fire method called by the display link callback also synchronizes on self (while accessing the windows array). Display link operations use a lock to synchronize, too, and it's held while the callback is running. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 1150322..7cb3459 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -218,22 +218,26 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) addWindow:(WineWindow*)window { + BOOL needsStart; @synchronized(self) { - BOOL needsStart = !_windows.count; + needsStart = !_windows.count; [_windows addObject:window]; - if (needsStart) - CVDisplayLinkStart(_link); } + if (needsStart) + CVDisplayLinkStart(_link); } - (void) removeWindow:(WineWindow*)window { + BOOL shouldStop = FALSE; @synchronized(self) { BOOL wasRunning = _windows.count > 0; [_windows removeObject:window]; if (wasRunning && !_windows.count) - CVDisplayLinkStop(_link); + shouldStop = TRUE; } + if (shouldStop) + CVDisplayLinkStop(_link); } - (void) fire

1 0

Owen Rudge : wsdapi/tests: Add tests for WSDXMLAddSibling.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: e90aaaabe66019903832731c49274466f1b6aed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e90aaaabe66019903832731c4… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed May 3 23:55:58 2017 +0100 wsdapi/tests: Add tests for WSDXMLAddSibling. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/xml.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index 4af81af..fd8ac03 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -194,8 +194,97 @@ static void AddChild_tests(void) WSDFreeLinkedMemory(parent); } +static void AddSibling_tests(void) +{ + WSDXML_ELEMENT *parent, *child1, *child2, *child3; + WSDXML_NAME parentName, child1Name, child2Name; + WSDXML_NAMESPACE ns; + WCHAR parentNameText[] = {'D','a','d',0}; + WCHAR child1NameText[] = {'T','i','m',0}; + WCHAR child2NameText[] = {'B','o','b',0}; + static const WCHAR uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','t','e','s','t','/',0}; + static const WCHAR prefix[] = {'t',0}; + HRESULT hr; + + /* Test invalid values */ + hr = WSDXMLAddSibling(NULL, NULL); + ok(hr == E_INVALIDARG, "WSDXMLAddSibling failed with %08x\n", hr); + + hr = WSDXMLAddSibling(child1, NULL); + ok(hr == E_INVALIDARG, "WSDXMLAddSibling failed with %08x\n", hr); + + hr = WSDXMLAddSibling(NULL, child2); + ok(hr == E_INVALIDARG, "WSDXMLAddSibling failed with %08x\n", hr); + + /* Populate structures */ + ns.Uri = uri; + ns.PreferredPrefix = prefix; + + parentName.LocalName = parentNameText; + parentName.Space = &ns; + + child1Name.LocalName = child1NameText; + child1Name.Space = &ns; + + child2Name.LocalName = child2NameText; + child2Name.Space = &ns; + + /* Create some elements */ + hr = WSDXMLBuildAnyForSingleElement(&parentName, NULL, &parent); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + hr = WSDXMLBuildAnyForSingleElement(&child1Name, child1NameText, &child1); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + hr = WSDXMLBuildAnyForSingleElement(&child2Name, NULL, &child2); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + hr = WSDXMLBuildAnyForSingleElement(&child2Name, NULL, &child3); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + /* Add child1 to parent */ + hr = WSDXMLAddChild(parent, child1); + ok(hr == S_OK, "WSDXMLAddChild failed with %08x\n", hr); + + ok(parent->Node.Parent == NULL, "parent->Node.Parent == %p\n", parent->Node.Parent); + ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); + ok(parent->Node.Next == NULL, "parent->Node.Next == %p\n", parent->Node.Next); + ok(child1->Node.Parent == parent, "child1->Node.Parent == %p\n", child1->Node.Parent); + ok(child1->FirstChild != NULL, "child1->FirstChild == NULL\n"); + ok(child1->FirstChild->Type == TextType, "child1->FirstChild.Type == %d\n", child1->FirstChild->Type); + ok(child1->Node.Next == NULL, "child1->Node.Next == %p\n", child1->Node.Next); + ok(child2->Node.Parent == NULL, "child2->Node.Parent == %p\n", child2->Node.Parent); + ok(child2->FirstChild == NULL, "child2->FirstChild == %p\n", child2->FirstChild); + ok(child2->Node.Next == NULL, "child2->Node.Next == %p\n", child2->Node.Next); + + /* Try to add child2 as sibling of child1 */ + hr = WSDXMLAddSibling(child1, child2); + ok(hr == S_OK, "WSDXMLAddSibling failed with %08x\n", hr); + + ok(child1->Node.Parent == parent, "child1->Node.Parent == %p\n", child1->Node.Parent); + ok(child1->Node.Next == (WSDXML_NODE *)child2, "child1->Node.Next == %p\n", child1->Node.Next); + ok(child2->Node.Parent == parent, "child2->Node.Parent == %p\n", child2->Node.Parent); + ok(child2->Node.Next == NULL, "child2->Node.Next == %p\n", child2->Node.Next); + ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); + + /* Try to add child3 as sibling of child1 */ + hr = WSDXMLAddSibling(child1, child3); + ok(hr == S_OK, "WSDXMLAddSibling failed with %08x\n", hr); + + ok(child1->Node.Parent == parent, "child1->Node.Parent == %p\n", child1->Node.Parent); + ok(child1->Node.Next == (WSDXML_NODE *)child2, "child1->Node.Next == %p\n", child1->Node.Next); + ok(child2->Node.Parent == parent, "child2->Node.Parent == %p\n", child2->Node.Parent); + ok(child2->Node.Next == (WSDXML_NODE *)child3, "child2->Node.Next == %p\n", child2->Node.Next); + ok(child3->Node.Parent == parent, "child2->Node.Parent == %p\n", child2->Node.Parent); + ok(child3->Node.Next == NULL, "child2->Node.Next == %p\n", child2->Node.Next); + ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); + + WSDFreeLinkedMemory(parent); +} + START_TEST(xml) { BuildAnyForSingleElement_tests(); AddChild_tests(); + AddSibling_tests(); }

1 0

Owen Rudge : wsdapi/tests: Add tests for WSDXMLAddChild.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 19241ca6f7e2df92b5b1c577f25845e067bc86ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=19241ca6f7e2df92b5b1c577f… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed May 3 23:55:50 2017 +0100 wsdapi/tests: Add tests for WSDXMLAddChild. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/xml.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index 3f09d33..4af81af 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -103,7 +103,99 @@ static void BuildAnyForSingleElement_tests(void) WSDFreeLinkedMemory(element); } +static void AddChild_tests(void) +{ + WSDXML_ELEMENT *parent, *child1, *child2; + WSDXML_NAME parentName, child1Name, child2Name; + WSDXML_NAMESPACE ns; + WCHAR parentNameText[] = {'D','a','d',0}; + WCHAR child1NameText[] = {'T','i','m',0}; + WCHAR child2NameText[] = {'B','o','b',0}; + static const WCHAR uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','t','e','s','t','/',0}; + static const WCHAR prefix[] = {'t',0}; + HRESULT hr; + + /* Test invalid values */ + hr = WSDXMLAddChild(NULL, NULL); + ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); + + hr = WSDXMLAddChild(parent, NULL); + ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); + + hr = WSDXMLAddChild(NULL, child1); + ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); + + /* Populate structures */ + ns.Uri = uri; + ns.PreferredPrefix = prefix; + + parentName.LocalName = parentNameText; + parentName.Space = &ns; + + child1Name.LocalName = child1NameText; + child1Name.Space = &ns; + + child2Name.LocalName = child2NameText; + child2Name.Space = &ns; + + /* Create some elements */ + hr = WSDXMLBuildAnyForSingleElement(&parentName, NULL, &parent); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + hr = WSDXMLBuildAnyForSingleElement(&child1Name, child1NameText, &child1); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + hr = WSDXMLBuildAnyForSingleElement(&child2Name, NULL, &child2); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + ok(parent->Node.Parent == NULL, "parent->Node.Parent == %p\n", parent->Node.Parent); + ok(parent->FirstChild == NULL, "parent->FirstChild == %p\n", parent->FirstChild); + ok(parent->Node.Next == NULL, "parent->Node.Next == %p\n", parent->Node.Next); + ok(child1->Node.Parent == NULL, "child1->Node.Parent == %p\n", child1->Node.Parent); + ok(child1->FirstChild != NULL, "child1->FirstChild == NULL\n"); + ok(child1->FirstChild->Type == TextType, "child1->FirstChild.Type == %d\n", child1->FirstChild->Type); + ok(child1->Node.Next == NULL, "child1->Node.Next == %p\n", child1->Node.Next); + + /* Add the child to the parent */ + hr = WSDXMLAddChild(parent, child1); + ok(hr == S_OK, "WSDXMLAddChild failed with %08x\n", hr); + + ok(parent->Node.Parent == NULL, "parent->Node.Parent == %p\n", parent->Node.Parent); + ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); + ok(parent->Node.Next == NULL, "parent->Node.Next == %p\n", parent->Node.Next); + ok(child1->Node.Parent == parent, "child1->Node.Parent == %p\n", child1->Node.Parent); + ok(child1->FirstChild != NULL, "child1->FirstChild == NULL\n"); + ok(child1->FirstChild->Type == TextType, "child1->FirstChild.Type == %d\n", child1->FirstChild->Type); + ok(child1->Node.Next == NULL, "child1->Node.Next == %p\n", child1->Node.Next); + + /* Try to set child1 as the child of child2, which already has a parent */ + hr = WSDXMLAddChild(child2, child1); + ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); + + /* Try to set child2 as the child of child1, which has a text node as a child */ + hr = WSDXMLAddChild(child2, child1); + ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); + + /* Add child2 as a child of parent */ + hr = WSDXMLAddChild(parent, child2); + ok(hr == S_OK, "WSDXMLAddChild failed with %08x\n", hr); + + ok(parent->Node.Parent == NULL, "parent->Node.Parent == %p\n", parent->Node.Parent); + ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); + ok(parent->Node.Next == NULL, "parent->Node.Next == %p\n", parent->Node.Next); + ok(child1->Node.Parent == parent, "child1->Node.Parent == %p\n", child1->Node.Parent); + ok(child1->FirstChild != NULL, "child1->FirstChild == NULL\n"); + ok(child1->FirstChild->Type == TextType, "child1->FirstChild.Type == %d\n", child1->FirstChild->Type); + ok(child1->Node.Next == (WSDXML_NODE *)child2, "child1->Node.Next == %p\n", child1->Node.Next); + ok(child2->Node.Parent == parent, "child2->Node.Parent == %p\n", child2->Node.Parent); + ok(child2->FirstChild == NULL, "child2->FirstChild == %p\n", child2->FirstChild); + ok(child2->Node.Next == NULL, "child2->Node.Next == %p\n", child2->Node.Next); + + WSDFreeLinkedMemory(parent); +} + START_TEST(xml) { BuildAnyForSingleElement_tests(); + AddChild_tests(); }

1 0

Owen Rudge : wsdapi/tests: Add tests for WSDXMLBuildAnyForSingleElement.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 9445f681b780074c95c142b9548ac60f25911a3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9445f681b780074c95c142b95… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed May 3 23:55:42 2017 +0100 wsdapi/tests: Add tests for WSDXMLBuildAnyForSingleElement. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 3 +- dlls/wsdapi/tests/xml.c | 109 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index 2b20c63..77434cf 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -3,4 +3,5 @@ IMPORTS = wsdapi ole32 user32 C_SRCS = \ discovery.c \ - memory.c + memory.c \ + xml.c diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c new file mode 100644 index 0000000..3f09d33 --- /dev/null +++ b/dlls/wsdapi/tests/xml.c @@ -0,0 +1,109 @@ +/* + * Web Services on Devices + * XML tests + * + * Copyright 2017 Owen Rudge 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 + */ + +#define COBJMACROS + +#include <windows.h> + +#include "wine/test.h" +#include "wsdapi.h" + +static void BuildAnyForSingleElement_tests(void) +{ + WSDXML_ELEMENT *element; + WSDXML_NAME name; + WSDXML_NAMESPACE ns; + WCHAR nameText[] = {'E','l','1',0}; + WCHAR text[] = {'H','e','l','l','o',0}; + static const WCHAR uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','t','e','s','t','/',0}; + static const WCHAR prefix[] = {'t',0}; + LPWSTR largeText; + const int largeTextSize = 10000 * sizeof(WCHAR); + HRESULT hr; + + /* Populate structures */ + ns.Uri = uri; + ns.PreferredPrefix = prefix; + + name.LocalName = nameText; + name.Space = &ns; + + /* Test invalid arguments */ + hr = WSDXMLBuildAnyForSingleElement(NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "BuildAnyForSingleElement failed with %08x\n", hr); + + hr = WSDXMLBuildAnyForSingleElement(&name, NULL, NULL); + ok(hr == E_POINTER, "BuildAnyForSingleElement failed with %08x\n", hr); + + /* Test calling the function with a text size that exceeds 8192 characters */ + largeText = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, largeTextSize + sizeof(WCHAR)); + memset(largeText, 'a', largeTextSize); + + hr = WSDXMLBuildAnyForSingleElement(&name, largeText, &element); + ok(hr == E_INVALIDARG, "BuildAnyForSingleElement failed with %08x\n", hr); + + /* Test with valid parameters but no text */ + + hr = WSDXMLBuildAnyForSingleElement(&name, NULL, &element); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + ok(element->Name != &name, "element->Name has not been duplicated\n"); + todo_wine ok(element->Name->Space != name.Space, "element->Name->Space has not been duplicated\n"); + ok(element->Name->LocalName != name.LocalName, "element->LocalName has not been duplicated\n"); + ok(lstrcmpW(element->Name->LocalName, name.LocalName) == 0, "element->LocalName = '%s', expected '%s'\n", + wine_dbgstr_w(element->Name->LocalName), wine_dbgstr_w(name.LocalName)); + ok(element->FirstChild == NULL, "element->FirstChild == %p\n", element->FirstChild); + ok(element->Node.Next == NULL, "element->Node.Next == %p\n", element->Node.Next); + ok(element->Node.Type == ElementType, "element->Node.Type == %d\n", element->Node.Type); + + WSDFreeLinkedMemory(element); + + /* Test with valid parameters and text */ + + hr = WSDXMLBuildAnyForSingleElement(&name, text, &element); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + ok(element->Name != &name, "element->Name has not been duplicated\n"); + todo_wine ok(element->Name->Space != name.Space, "element->Name->Space has not been duplicated\n"); + ok(element->Name->LocalName != name.LocalName, "element->LocalName has not been duplicated\n"); + ok(lstrcmpW(element->Name->LocalName, name.LocalName) == 0, "element->LocalName = '%s', expected '%s'\n", + wine_dbgstr_w(element->Name->LocalName), wine_dbgstr_w(name.LocalName)); + ok(element->FirstChild != NULL, "element->FirstChild == %p\n", element->FirstChild); + ok(element->Node.Next == NULL, "element->Node.Next == %p\n", element->Node.Next); + ok(element->Node.Type == ElementType, "element->Node.Type == %d\n", element->Node.Type); + + if (element->FirstChild != NULL) + { + ok(element->FirstChild->Parent == element, "element->FirstChild->Parent = %p, expected %p\n", element->FirstChild->Parent, element); + ok(element->FirstChild->Next == NULL, "element->FirstChild.Next == %p\n", element->FirstChild->Next); + ok(element->FirstChild->Type == TextType, "element->FirstChild.Type == %d\n", element->Node.Type); + ok(((WSDXML_TEXT *)element->FirstChild)->Text != NULL, "element->FirstChild.Text is null\n"); + ok(lstrcmpW(((WSDXML_TEXT *)element->FirstChild)->Text, text) == 0, "element->FirstChild->Text = '%s', expected '%s'\n", + wine_dbgstr_w(((WSDXML_TEXT *)element->FirstChild)->Text), wine_dbgstr_w(text)); + } + + WSDFreeLinkedMemory(element); +} + +START_TEST(xml) +{ + BuildAnyForSingleElement_tests(); +}

1 0

Owen Rudge : wsdapi: Implement WSDXMLAddChild, Sibling, BuildAnyForSingleElement, CleanupElement.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: e47e132d1bc0218e28e5d7764aec7d887d5450ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e47e132d1bc0218e28e5d7764… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed May 3 23:55:30 2017 +0100 wsdapi: Implement WSDXMLAddChild, Sibling, BuildAnyForSingleElement, CleanupElement. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/Makefile.in | 3 +- dlls/wsdapi/wsdapi.spec | 8 +- dlls/wsdapi/xml.c | 215 ++++++++++++++++++++++++++++++++++++++++++++++++ include/wsdutil.h | 5 ++ include/wsdxmldom.h | 7 ++ 5 files changed, 233 insertions(+), 5 deletions(-) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index 7d63fe2..764682d 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -5,4 +5,5 @@ IMPORTS = kernel32 C_SRCS = \ discovery.c \ main.c \ - memory.c + memory.c \ + xml.c diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index 7145f7d..8ee17cb 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -36,10 +36,10 @@ @ stub WSDSetConfigurationOption @ stub WSDUriDecode @ stub WSDUriEncode -@ stub WSDXMLAddChild -@ stub WSDXMLAddSibling -@ stub WSDXMLBuildAnyForSingleElement -@ stub WSDXMLCleanupElement +@ stdcall WSDXMLAddChild(ptr ptr) +@ stdcall WSDXMLAddSibling(ptr ptr) +@ stdcall WSDXMLBuildAnyForSingleElement(ptr ptr ptr) +@ stdcall WSDXMLCleanupElement(ptr) @ stub WSDXMLCreateContext @ stub WSDXMLGetNameFromBuiltinNamespace @ stub WSDXMLGetValueFromAny diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c new file mode 100644 index 0000000..1cc45b8 --- /dev/null +++ b/dlls/wsdapi/xml.c @@ -0,0 +1,215 @@ +/* + * Web Services on Devices + * + * Copyright 2017 Owen Rudge 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> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" +#include "wsdapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); + +#define WSD_MAX_TEXT_LENGTH 8192 + +static LPWSTR duplicate_string(void *parentMemoryBlock, LPCWSTR value) +{ + int valueLen; + LPWSTR dup; + + valueLen = lstrlenW(value) + 1; + + dup = WSDAllocateLinkedMemory(parentMemoryBlock, valueLen * sizeof(WCHAR)); + + if (dup) memcpy(dup, value, valueLen * sizeof(WCHAR)); + return dup; +} + +static WSDXML_NAME *duplicate_name(void *parentMemoryBlock, WSDXML_NAME *name) +{ + WSDXML_NAME *dup; + + dup = WSDAllocateLinkedMemory(parentMemoryBlock, sizeof(WSDXML_NAME)); + + if (dup == NULL) + { + return NULL; + } + + dup->Space = name->Space; + dup->LocalName = duplicate_string(dup, name->LocalName); + + if (dup->LocalName == NULL) + { + WSDFreeLinkedMemory(dup); + return NULL; + } + + return dup; +} + +HRESULT WINAPI WSDXMLAddChild(WSDXML_ELEMENT *pParent, WSDXML_ELEMENT *pChild) +{ + WSDXML_NODE *currentNode; + + TRACE("(%p, %p)\n", pParent, pChild); + + if ((pParent == NULL) || (pChild == NULL) || (pChild->Node.Parent != NULL)) + { + return E_INVALIDARG; + } + + /* See if the parent already has a child */ + currentNode = pParent->FirstChild; + + if (currentNode == NULL) + { + pParent->FirstChild = (WSDXML_NODE *)pChild; + } + else + { + /* Find the last sibling node and make this child the next sibling */ + WSDXMLAddSibling((WSDXML_ELEMENT *)currentNode, pChild); + } + + pChild->Node.Parent = pParent; + + /* Link the memory allocations */ + WSDAttachLinkedMemory(pParent, pChild); + + return S_OK; +} + +HRESULT WINAPI WSDXMLAddSibling(WSDXML_ELEMENT *pFirst, WSDXML_ELEMENT *pSecond) +{ + WSDXML_NODE *currentNode; + + TRACE("(%p, %p)\n", pFirst, pSecond); + + if ((pFirst == NULL) || (pSecond == NULL)) + { + return E_INVALIDARG; + } + + /* See if the first node already has a sibling */ + currentNode = pFirst->Node.Next; + + if (currentNode == NULL) + { + pFirst->Node.Next = (WSDXML_NODE *)pSecond; + } + else + { + /* Find the last sibling node and make the second element the next sibling */ + while (1) + { + if (currentNode->Next == NULL) + { + currentNode->Next = (WSDXML_NODE *)pSecond; + break; + } + + currentNode = currentNode->Next; + } + } + + /* Reparent the second node under the first */ + pSecond->Node.Parent = pFirst->Node.Parent; + + /* Link the memory allocations */ + WSDAttachLinkedMemory(pFirst->Node.Parent, pSecond); + + return S_OK; +} + +HRESULT WINAPI WSDXMLBuildAnyForSingleElement(WSDXML_NAME *pElementName, LPCWSTR pszText, WSDXML_ELEMENT **ppAny) +{ + WSDXML_TEXT *child; + + TRACE("(%p, %s, %p)\n", pElementName, debugstr_w(pszText), ppAny); + + if ((pElementName == NULL) || ((pszText != NULL) && (lstrlenW(pszText) > WSD_MAX_TEXT_LENGTH))) + { + return E_INVALIDARG; + } + + if (ppAny == NULL) + { + return E_POINTER; + } + + *ppAny = WSDAllocateLinkedMemory(NULL, sizeof(WSDXML_ELEMENT)); + + if (*ppAny == NULL) + { + return E_OUTOFMEMORY; + } + + ZeroMemory(*ppAny, sizeof(WSDXML_ELEMENT)); + + (*ppAny)->Name = duplicate_name(*ppAny, pElementName); + + if ((*ppAny)->Name == NULL) + { + WSDFreeLinkedMemory(*ppAny); + return E_OUTOFMEMORY; + } + + if (pszText != NULL) + { + child = WSDAllocateLinkedMemory(*ppAny, sizeof(WSDXML_TEXT)); + + if (child == NULL) + { + WSDFreeLinkedMemory(*ppAny); + return E_OUTOFMEMORY; + } + + child->Node.Parent = *ppAny; + child->Node.Next = NULL; + child->Node.Type = TextType; + child->Text = duplicate_string(child, pszText); + + if (child->Text == NULL) + { + WSDFreeLinkedMemory(*ppAny); + return E_OUTOFMEMORY; + } + + (*ppAny)->FirstChild = (WSDXML_NODE *)child; + } + + return S_OK; +} + +HRESULT WINAPI WSDXMLCleanupElement(WSDXML_ELEMENT *pAny) +{ + TRACE("(%p)\n", pAny); + + if (pAny == NULL) + { + return E_INVALIDARG; + } + + WSDFreeLinkedMemory(pAny); + return S_OK; +} diff --git a/include/wsdutil.h b/include/wsdutil.h index 8a89eb1..2980d40 100644 --- a/include/wsdutil.h +++ b/include/wsdutil.h @@ -24,4 +24,9 @@ void WINAPI WSDAttachLinkedMemory(void *pParent, void *pChild); void WINAPI WSDDetachLinkedMemory(void *pVoid); void WINAPI WSDFreeLinkedMemory(void *pVoid); +HRESULT WINAPI WSDXMLAddChild(WSDXML_ELEMENT *pParent, WSDXML_ELEMENT *pChild); +HRESULT WINAPI WSDXMLAddSibling(WSDXML_ELEMENT *pFirst, WSDXML_ELEMENT *pSecond); +HRESULT WINAPI WSDXMLBuildAnyForSingleElement(WSDXML_NAME *pElementName, LPCWSTR pszText, WSDXML_ELEMENT **ppAny); +HRESULT WINAPI WSDXMLCleanupElement(WSDXML_ELEMENT *pAny); + #endif diff --git a/include/wsdxmldom.h b/include/wsdxmldom.h index e9fb3bd..8901236 100644 --- a/include/wsdxmldom.h +++ b/include/wsdxmldom.h @@ -26,6 +26,7 @@ typedef struct _WSDXML_PREFIX_MAPPING WSDXML_PREFIX_MAPPING; typedef struct _WSDXML_ATTRIBUTE WSDXML_ATTRIBUTE; typedef struct _WSDXML_NODE WSDXML_NODE; typedef struct _WSDXML_ELEMENT WSDXML_ELEMENT; +typedef struct _WSDXML_TEXT WSDXML_TEXT; typedef const WSDXML_NAMESPACE *PCWSDXML_NAMESPACE; typedef const WSDXML_TYPE *PCWSDXML_TYPE; @@ -87,4 +88,10 @@ struct _WSDXML_ELEMENT WSDXML_PREFIX_MAPPING *PrefixMappings; }; +struct _WSDXML_TEXT +{ + WSDXML_NODE Node; + WCHAR *Text; +}; + #endif /* __WSDXMLDOM_H__ */

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_OMGetRenderTargetsAndUnorderedAccessViews ().
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: aaded07dde60da88ab2b6b901d46c2b81f204000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaded07dde60da88ab2b6b901… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 8 09:48:05 2017 +0200 d3d11: Implement d3d11_immediate_context_OMGetRenderTargetsAndUnorderedAccessViews(). 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/d3d11/device.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 136917b..69642ef 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1882,11 +1882,39 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargetsAndUnord UINT unordered_access_view_start_slot, UINT unordered_access_view_count, ID3D11UnorderedAccessView **unordered_access_views) { - FIXME("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p, " + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_unordered_access_view *wined3d_view; + struct d3d11_unordered_access_view *view_impl; + unsigned int i; + + TRACE("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p, " "unordered_access_view_start_slot %u, unordered_access_view_count %u, " - "unordered_access_views %p stub!\n", + "unordered_access_views %p.\n", iface, render_target_view_count, render_target_views, depth_stencil_view, unordered_access_view_start_slot, unordered_access_view_count, unordered_access_views); + + if (render_target_views || depth_stencil_view) + d3d11_immediate_context_OMGetRenderTargets(iface, render_target_view_count, + render_target_views, depth_stencil_view); + + if (unordered_access_views) + { + wined3d_mutex_lock(); + for (i = 0; i < unordered_access_view_count; ++i) + { + if (!(wined3d_view = wined3d_device_get_unordered_access_view(device->wined3d_device, + unordered_access_view_start_slot + i))) + { + unordered_access_views[i] = NULL; + continue; + } + + view_impl = wined3d_unordered_access_view_get_parent(wined3d_view); + unordered_access_views[i] = &view_impl->ID3D11UnorderedAccessView_iface; + ID3D11UnorderedAccessView_AddRef(unordered_access_views[i]); + } + wined3d_mutex_unlock(); + } } static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11DeviceContext *iface,

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2017