June 2018 - Wine-Devel - list.winehq.org

[PATCH 1/6] d3d11: Introduce get_resource_properties() helper function.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/view.c | 259 +++++++++++++++++++----------------------------------- 1 file changed, 90 insertions(+), 169 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 164a1839e633..93d0b78655c1 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -25,6 +25,74 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); +static HRESULT get_resource_properties(ID3D11Resource *resource, D3D11_RESOURCE_DIMENSION *dimension, + DXGI_FORMAT *format, unsigned int *miplevel_count, unsigned int *layer_count) +{ + ID3D11Resource_GetType(resource, dimension); + switch (*dimension) + { + case D3D11_RESOURCE_DIMENSION_BUFFER: + return S_OK; + + case D3D11_RESOURCE_DIMENSION_TEXTURE1D: + { + const struct d3d_texture1d *texture; + + if (!(texture = unsafe_impl_from_ID3D11Texture1D((ID3D11Texture1D *)resource))) + { + ERR("Cannot get implementation from ID3D11Texture1D.\n"); + return E_FAIL; + } + + *format = texture->desc.Format; + if (miplevel_count) + *miplevel_count = texture->desc.MipLevels; + *layer_count = texture->desc.ArraySize; + break; + } + + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: + { + const struct d3d_texture2d *texture; + + if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) + { + ERR("Cannot get implementation from ID3D11Texture2D.\n"); + return E_FAIL; + } + + *format = texture->desc.Format; + if (miplevel_count) + *miplevel_count = texture->desc.MipLevels; + *layer_count = texture->desc.ArraySize; + break; + } + + case D3D11_RESOURCE_DIMENSION_TEXTURE3D: + { + const struct d3d_texture3d *texture; + + if (!(texture = unsafe_impl_from_ID3D11Texture3D((ID3D11Texture3D *)resource))) + { + ERR("Cannot get implementation from ID3D11Texture3D.\n"); + return E_FAIL; + } + + *format = texture->desc.Format; + if (miplevel_count) + *miplevel_count = texture->desc.MipLevels; + *layer_count = texture->desc.Depth; + break; + } + + default: + WARN("Invalid resource dimension %#x.\n", *dimension); + return E_INVALIDARG; + } + + return S_OK; +} + static HRESULT set_dsv_desc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension; @@ -113,10 +181,10 @@ static HRESULT set_dsv_desc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, I return S_OK; } - default: - ERR("Unhandled resource dimension %#x.\n", dimension); case D3D11_RESOURCE_DIMENSION_BUFFER: case D3D11_RESOURCE_DIMENSION_TEXTURE3D: + default: + WARN("Invalid resource dimension %#x.\n", dimension); return E_INVALIDARG; } } @@ -126,36 +194,22 @@ static HRESULT normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Res D3D11_RESOURCE_DIMENSION dimension; unsigned int layer_count; DXGI_FORMAT format; + HRESULT hr; - ID3D11Resource_GetType(resource, &dimension); + if (FAILED(hr = get_resource_properties(resource, &dimension, &format, NULL, &layer_count))) + return hr; switch (dimension) { case D3D11_RESOURCE_DIMENSION_TEXTURE1D: - { - const struct d3d_texture1d *texture; - if (desc->ViewDimension != D3D11_DSV_DIMENSION_TEXTURE1D && desc->ViewDimension != D3D11_DSV_DIMENSION_TEXTURE1DARRAY) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture1D((ID3D11Texture1D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture1D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - layer_count = texture->desc.ArraySize; break; - } case D3D11_RESOURCE_DIMENSION_TEXTURE2D: - { - const struct d3d_texture2d *texture; - if (desc->ViewDimension != D3D11_DSV_DIMENSION_TEXTURE2D && desc->ViewDimension != D3D11_DSV_DIMENSION_TEXTURE2DARRAY && desc->ViewDimension != D3D11_DSV_DIMENSION_TEXTURE2DMS @@ -164,26 +218,13 @@ static HRESULT normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Res WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture2D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - layer_count = texture->desc.ArraySize; break; - } case D3D11_RESOURCE_DIMENSION_BUFFER: case D3D11_RESOURCE_DIMENSION_TEXTURE3D: + default: WARN("Invalid resource dimension %#x.\n", dimension); return E_INVALIDARG; - - default: - ERR("Unhandled resource dimension %#x.\n", dimension); - return E_FAIL; } if (desc->Format == DXGI_FORMAT_UNKNOWN) @@ -337,46 +378,30 @@ static HRESULT normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Res D3D11_RESOURCE_DIMENSION dimension; unsigned int layer_count; DXGI_FORMAT format; + HRESULT hr; - ID3D11Resource_GetType(resource, &dimension); + if (FAILED(hr = get_resource_properties(resource, &dimension, &format, NULL, &layer_count))) + return hr; switch (dimension) { case D3D11_RESOURCE_DIMENSION_BUFFER: - { if (desc->ViewDimension != D3D11_RTV_DIMENSION_BUFFER) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } return S_OK; - } case D3D11_RESOURCE_DIMENSION_TEXTURE1D: - { - const struct d3d_texture1d *texture; - if (desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE1D && desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE1DARRAY) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture1D((ID3D11Texture1D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture1D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - layer_count = texture->desc.ArraySize; break; - } case D3D11_RESOURCE_DIMENSION_TEXTURE2D: - { - const struct d3d_texture2d *texture; - if (desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE2D && desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE2DARRAY && desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE2DMS @@ -385,42 +410,19 @@ static HRESULT normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Res WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture2D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - layer_count = texture->desc.ArraySize; break; - } case D3D11_RESOURCE_DIMENSION_TEXTURE3D: - { - const struct d3d_texture3d *texture; - if (desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE3D) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture3D((ID3D11Texture3D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture3D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - layer_count = texture->desc.Depth; break; - } default: - ERR("Unhandled resource dimension %#x.\n", dimension); - return E_FAIL; + WARN("Invalid resource dimension %#x.\n", dimension); + return E_INVALIDARG; } if (desc->Format == DXGI_FORMAT_UNKNOWN) @@ -612,7 +614,7 @@ static HRESULT set_srv_desc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, } default: - ERR("Unhandled resource dimension %#x.\n", dimension); + WARN("Invalid resource dimension %#x.\n", dimension); return E_INVALIDARG; } } @@ -622,12 +624,13 @@ static HRESULT normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11R unsigned int miplevel_count, layer_count; D3D11_RESOURCE_DIMENSION dimension; DXGI_FORMAT format; + HRESULT hr; - ID3D11Resource_GetType(resource, &dimension); + if (FAILED(hr = get_resource_properties(resource, &dimension, &format, &miplevel_count, &layer_count))) + return hr; switch (dimension) { case D3D11_RESOURCE_DIMENSION_BUFFER: - { if (desc->ViewDimension != D3D11_SRV_DIMENSION_BUFFER && desc->ViewDimension != D3D11_SRV_DIMENSION_BUFFEREX) { @@ -640,35 +643,17 @@ static HRESULT normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11R return E_INVALIDARG; } return S_OK; - } case D3D11_RESOURCE_DIMENSION_TEXTURE1D: - { - const struct d3d_texture1d *texture; - if (desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE1D && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE1DARRAY) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture1D((ID3D11Texture1D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture1D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - miplevel_count = texture->desc.MipLevels; - layer_count = texture->desc.ArraySize; break; - } case D3D11_RESOURCE_DIMENSION_TEXTURE2D: - { - const struct d3d_texture2d *texture; - if (desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE2D && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE2DARRAY && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE2DMS @@ -679,44 +664,19 @@ static HRESULT normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11R WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture2D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - miplevel_count = texture->desc.MipLevels; - layer_count = texture->desc.ArraySize; break; - } case D3D11_RESOURCE_DIMENSION_TEXTURE3D: - { - const struct d3d_texture3d *texture; - if (desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE3D) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture3D((ID3D11Texture3D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture3D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - miplevel_count = texture->desc.MipLevels; - layer_count = 1; break; - } default: - ERR("Unhandled resource dimension %#x.\n", dimension); - return E_FAIL; + WARN("Invalid resource dimension %#x.\n", dimension); + return E_INVALIDARG; } if (desc->Format == DXGI_FORMAT_UNKNOWN) @@ -883,88 +843,49 @@ static HRESULT normalize_uav_desc(D3D11_UNORDERED_ACCESS_VIEW_DESC *desc, ID3D11 D3D11_RESOURCE_DIMENSION dimension; unsigned int layer_count; DXGI_FORMAT format; + HRESULT hr; - ID3D11Resource_GetType(resource, &dimension); + if (FAILED(hr = get_resource_properties(resource, &dimension, &format, NULL, &layer_count))) + return hr; switch (dimension) { case D3D11_RESOURCE_DIMENSION_BUFFER: - { if (desc->ViewDimension != D3D11_UAV_DIMENSION_BUFFER) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } return S_OK; - } case D3D11_RESOURCE_DIMENSION_TEXTURE1D: - { - const struct d3d_texture1d *texture; - if (desc->ViewDimension != D3D11_UAV_DIMENSION_TEXTURE1D && desc->ViewDimension != D3D11_UAV_DIMENSION_TEXTURE1DARRAY) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture1D((ID3D11Texture1D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture1D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - layer_count = texture->desc.ArraySize; break; - } case D3D11_RESOURCE_DIMENSION_TEXTURE2D: - { - const struct d3d_texture2d *texture; - if (desc->ViewDimension != D3D11_UAV_DIMENSION_TEXTURE2D && desc->ViewDimension != D3D11_UAV_DIMENSION_TEXTURE2DARRAY) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture2D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - layer_count = texture->desc.ArraySize; break; - } case D3D11_RESOURCE_DIMENSION_TEXTURE3D: - { - const struct d3d_texture3d *texture; - if (desc->ViewDimension != D3D11_UAV_DIMENSION_TEXTURE3D) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture3D((ID3D11Texture3D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture3D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - layer_count = texture->desc.Depth; break; - } default: - ERR("Unhandled resource dimension %#x.\n", dimension); - return E_FAIL; + WARN("Invalid resource dimension %#x.\n", dimension); + return E_INVALIDARG; } if (desc->Format == DXGI_FORMAT_UNKNOWN) -- 2.16.4

June 19, 2018

[PATCH] winedbg: Get rid of ifdefs.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Backend functions are enclosed in #ifdef. --- programs/winedbg/be_arm.c | 4 ---- programs/winedbg/be_arm64.c | 4 ---- programs/winedbg/be_ppc.c | 4 ---- programs/winedbg/be_x86_64.c | 4 ---- 4 files changed, 16 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index e3c8f72db65e..ad0e2857cda2 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1891,12 +1891,8 @@ static BOOL be_arm_store_integer(const struct dbg_lvalue* lvalue, unsigned size, static BOOL be_arm_get_context(HANDLE thread, dbg_ctx_t *ctx) { -#ifdef __arm__ ctx->ctx.ContextFlags = CONTEXT_ALL; return GetThreadContext(thread, &ctx->ctx); -#else - WINE_FIXME("Cannot debug an ARM process on this architecture.\n"); -#endif } static BOOL be_arm_set_context(HANDLE thread, const dbg_ctx_t *ctx) diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index a87921f437f8..bca86b825740 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -280,12 +280,8 @@ void be_arm64_disasm_one_insn(ADDRESS64 *addr, int display) static BOOL be_arm64_get_context(HANDLE thread, dbg_ctx_t *ctx) { -#ifdef __aarch64__ ctx->ctx.ContextFlags = CONTEXT_ALL; return GetThreadContext(thread, &ctx->ctx); -#else - WINE_FIXME("Cannot debug an ARM64 process on this architecture.\n"); -#endif } static BOOL be_arm64_set_context(HANDLE thread, const dbg_ctx_t *ctx) diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c index 54bcb5960a39..ff6ece6df3ae 100644 --- a/programs/winedbg/be_ppc.c +++ b/programs/winedbg/be_ppc.c @@ -182,12 +182,8 @@ static BOOL be_ppc_store_integer(const struct dbg_lvalue* lvalue, unsigned size, static BOOL be_ppc_get_context(HANDLE thread, dbg_ctx_t *ctx) { -#ifdef __powerpc__ ctx->ctx.ContextFlags = CONTEXT_ALL; return GetThreadContext(thread, &ctx->ctx); -#else - WINE_FIXME("Cannot debug a PowerPC process on this architecture.\n"); -#endif } static BOOL be_ppc_set_context(HANDLE thread, const dbg_ctx_t *ctx) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index b7f75c6bdba6..136229fbd66c 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -676,12 +676,8 @@ static BOOL be_x86_64_store_integer(const struct dbg_lvalue* lvalue, unsigned si static BOOL be_x86_64_get_context(HANDLE thread, dbg_ctx_t *ctx) { -#ifdef __x86_64__ ctx->ctx.ContextFlags = CONTEXT_ALL; return GetThreadContext(thread, &ctx->ctx); -#else - WINE_FIXME("Cannot debug an x86-64 process on this architecture.\n"); -#endif } static BOOL be_x86_64_set_context(HANDLE thread, const dbg_ctx_t *ctx) -- 2.16.4

June 19, 2018

Re: [PATCH 2/4 v2] msi: Re-publish product if previous installation with different package is detected

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

June 19, 2018

[PATCH 2/4 v2] msi: Re-publish product if previous installation with different package is detected

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/action.c | 50 +++++++++++++++++++++++++++++++++++++++++++------- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 4 ++-- 3 files changed, 46 insertions(+), 9 deletions(-)

June 19, 2018

Re: [PATCH 4/4] msi: Add ProductToBeRegistered property tests

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

June 19, 2018

Re: [PATCH 2/2] wsdapi/tests: Add tests for AppSequence in Probe message. [v2]

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

June 19, 2018

Re: [PATCH 3/4] msi: Add REINSTALLMODE=v installation mode test

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

June 19, 2018

Re: [PATCH 2/4] msi: Re-publish product if previous installation with different package is detected

by Hans Leidekker

> diff --git a/dlls/msi/action.c b/dlls/msi/action.c > index 74917afdd1..ba351b45bc 100644 > --- a/dlls/msi/action.c > +++ b/dlls/msi/action.c > @@ -4473,6 +4473,7 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) > UINT rc; > HKEY hukey = NULL, hudkey = NULL; > MSIRECORD *uirow; > + BOOL republish = FALSE; > > if (!list_empty(&package->patches)) > { > @@ -4481,14 +4482,65 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) > goto end; > } > > - /* FIXME: also need to publish if the product is in advertise mode */ > - if (!msi_check_publish(package)) > - return ERROR_SUCCESS; > - > rc = MSIREG_OpenProductKey(package->ProductCode, NULL, package->Context, > - &hukey, TRUE); > - if (rc != ERROR_SUCCESS) > - goto end; > + &hukey, FALSE); > + if (rc == ERROR_SUCCESS) > + { > + WCHAR *package_code; > + > + package_code = msi_reg_get_val_str(hukey, INSTALLPROPERTY_PACKAGECODEW); > + if (package_code) > + { > + WCHAR guid[MAX_PATH], packed[SQUASHED_GUID_SIZE], *p; > + MSIHANDLE hdb, suminfo; > + DWORD size; > + > + hdb = alloc_msihandle(&package->db->hdr); > + if (!hdb) > + { > + RegCloseKey(hukey); > + return ERROR_NOT_ENOUGH_MEMORY; > + } > + > + rc = MsiGetSummaryInformationW(hdb, NULL, 0, &suminfo); > + MsiCloseHandle(hdb); > + if (rc == ERROR_SUCCESS) > + { > + size = sizeof(guid); > + rc = MsiSummaryInfoGetPropertyW(suminfo, PID_REVNUMBER, NULL, NULL, NULL, guid, &size); > + MsiCloseHandle(suminfo); > + } > + if (rc == ERROR_SUCCESS) > + { > + p = strchrW(guid, ';'); > + if (p) *p = 0; > + squash_guid(guid, packed); This duplicates code to retrieve the package code in msi_publish_product_properties. You could use get_package_code from package.c, which avoids creating a handle.

June 19, 2018

Re: [PATCH 1/2] wsdapi: Add support for parsing AppSequence header. [v2]

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

June 19, 2018

Re: [PATCH 1/4] msi: Add support for ProductToBeRegistered property

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

June 19, 2018

[PATCH 2/2] wsdapi/tests: Add tests for AppSequence in Probe message. [v2]

by Owen Rudge

v2: Fix missing string null terminator. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)

June 19, 2018

[PATCH 1/2] wsdapi: Add support for parsing AppSequence header. [v2]

by Owen Rudge

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-)

June 19, 2018

Re: [PATCH 2/2] wsdapi/tests: Add tests for AppSequence in Probe message.

by Owen Rudge

> This is failing for me: Ah, think I missed a null character off the wide GUID string - I expect it'll be that. Thanks for letting me know. Owen

June 19, 2018

Re: [PATCH 2/2] wsdapi/tests: Add tests for AppSequence in Probe message.

by Huw Davies

On Mon, Jun 18, 2018 at 10:41:55PM +0100, Owen Rudge wrote: > Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> > --- > dlls/wsdapi/tests/discovery.c | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > > diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c > index 84aa67d663..13b6de0b34 100644 > --- a/dlls/wsdapi/tests/discovery.c > +++ b/dlls/wsdapi/tests/discovery.c > @@ -48,6 +48,7 @@ static const char testProbeMessage[] = "<?xml version=\"1.0\" encoding=\"utf-8\" > "xmlns:grog=\"http://more.tests/\"><soap:Header><wsa:To>urn:schemas-xmlsoap-org:ws:2005:04:discovery</wsa:To>" > "<wsa:Action>http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe</wsa:Action>" > "<wsa:MessageID>urn:uuid:%s</wsa:MessageID>" > + "<wsd:AppSequence InstanceId=\"21\" SequenceId=\"urn:uuid:638abee8-124d-4b6a-8b85-8cf2837a2fd2\" MessageNumber=\"14\"></wsd:AppSequence>" > "<grog:Perry>ExtraInfo</grog:Perry></soap:Header>" > "<soap:Body><wsd:Probe><wsd:Types>grog:Cider</wsd:Types><grog:Lager>MoreInfo</grog:Lager></wsd:Probe></soap:Body></soap:Envelope>"; > > @@ -533,6 +534,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP > static const WCHAR perry[] = {'P','e','r','r','y',0}; > static const WCHAR extra_info[] = {'E','x','t','r','a','I','n','f','o',0}; > WSD_PROBE *probe_msg = (WSD_PROBE *) pSoap->Body; > + WSD_APP_SEQUENCE *appseq = (WSD_APP_SEQUENCE *) pSoap->Header.AppSequence; > > ok(pSoap->Body != NULL, "pSoap->Body == NULL\n"); > ok(pSoap->Header.To != NULL && lstrcmpW(pSoap->Header.To, discoveryTo) == 0, > @@ -556,6 +558,22 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP > if ((ret != RPC_S_OK) || (UuidEqual(&uuid, &probe_message_id, &ret) == FALSE)) return S_OK; > } > > + ok(appseq != NULL, "pSoap->Header.AppSequence == NULL\n"); > + > + if (appseq != NULL) > + { > + static const WCHAR seq_id[] = {'u','r','n',':','u','u','i','d',':','6','3','8','a','b','e','e','8','-', > + '1','2','4','d','-','4','b','6','a','-','8','b','8','5','-', > + '8','c','f','2','8','3','7','a','2','f','d','2'}; > + > + ok(appseq->InstanceId == 21, "pSoap->Header.AppSequence->InstanceId = %s\n", > + wine_dbgstr_longlong(appseq->InstanceId)); > + ok(lstrcmpW(appseq->SequenceId, seq_id) == 0, "pSoap->Header.AppSequence->SequenceId = '%s'\n", > + wine_dbgstr_w(appseq->SequenceId)); > + ok(appseq->MessageNumber == 14, "pSoap->Header.AppSequence->MessageNumber = %s\n", > + wine_dbgstr_longlong(appseq->MessageNumber)); > + } > + > verify_wsdxml_any_text("pSoap->Header.AnyHeaders", pSoap->Header.AnyHeaders, uri_more_tests_no_slash, > prefix_grog, perry, extra_info); > > This is failing for me: ../../../tools/runtest -q -P wine -T ../../.. -M wsdapi.dll -p wsdapi_test.exe.so discovery && touch discovery.ok 0009:fixme:hnetcfg:fw_profile_get_FirewallEnabled 0x164100, 0x32fcd2 0009:fixme:winsock:set_dont_fragment IP_DONTFRAGMENT for IPv4 not supported in this platform 0038:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0037:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0034:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0038:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0034:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0037:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0038:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0034:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0038:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0038:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0037:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0038:fixme:webservices:WsReadToStartElement name and/or namespace not verified discovery.c:571: Test failed: pSoap->Header.AppSequence->SequenceId = 'L"urn:uuid:638abee8-124d-4b6a-8b85-8cf2837a2fd2"' 0034:fixme:webservices:WsReadToStartElement name and/or namespace not verified discovery.c:571: Test failed: pSoap->Header.AppSequence->SequenceId = 'L"urn:uuid:638abee8-124d-4b6a-8b85-8cf2837a2fd2"' 0037:fixme:webservices:WsReadToStartElement name and/or namespace not verified discovery.c:571: Test failed: pSoap->Header.AppSequence->SequenceId = 'L"urn:uuid:638abee8-124d-4b6a-8b85-8cf2837a2fd2"' 0038:fixme:webservices:WsReadToStartElement name and/or namespace not verified discovery.c:571: Test failed: pSoap->Header.AppSequence->SequenceId = 'L"urn:uuid:638abee8-124d-4b6a-8b85-8cf2837a2fd2"' 004a:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0046:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0049:fixme:webservices:WsReadToStartElement name and/or namespace not verified 004a:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0049:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0046:fixme:webservices:WsReadToStartElement name and/or namespace not verified 004a:fixme:webservices:WsReadToStartElement name and/or namespace not verified 004a:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0049:fixme:webservices:WsReadToStartElement name and/or namespace not verified 004a:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0046:fixme:webservices:WsReadToStartElement name and/or namespace not verified 004a:fixme:webservices:WsReadToStartElement name and/or namespace not verified make: *** [Makefile:225: discovery.ok] Error 4

June 19, 2018

[PATCH 2/2] wsdapi/tests: Add tests for AppSequence in Probe message.

by Owen Rudge

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)

June 18, 2018

[PATCH 1/2] wsdapi: Add support for parsing AppSequence header.

by Owen Rudge

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-)

June 18, 2018

Status of Bug 35902

by Farmboy0

Hello everyone, I was wondering what the holdup with the staging patchset for Bug 35902 is. Is there anything to be left done in order to integrate the patches into wine? Regards Farmboy0

June 18, 2018

[PATCH 4/4] msi: Add ProductToBeRegistered property tests

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/tests/package.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)

June 18, 2018

[PATCH 3/4] msi: Add REINSTALLMODE=v installation mode test

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/tests/package.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)

June 18, 2018

[PATCH 2/4] msi: Re-publish product if previous installation with different package is detected

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/action.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 7 deletions(-)

June 18, 2018

[PATCH 1/4] msi: Add support for ProductToBeRegistered property

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/action.c | 3 ++- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 11 ++++++++++- 3 files changed, 13 insertions(+), 2 deletions(-)

June 18, 2018

Re: [PATCH v2 1/3] gdiplus: Fix a memory leak.

by Vincent Povirk

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com>

June 18, 2018

Re: [PATCH v3] vbscript: Treat \r as a newline separator.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

June 18, 2018

Re: [PATCH] urlmon/tests: Use the available ARRAY_SIZE() macro

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

June 18, 2018

Re: [PATCH v2 3/3] gdiplus: Avoid calling GdipFillPath() with an empty path.

by Vincent Povirk

This breaks a test: graphics.c:1764: Test failed: Expected 4, got 0 0060:fixme:gdiplus:GdipGetNearestColor (0x88120, 0x23f96c): Passing color unmodified 0060:fixme:gdiplus:GdipMeasureDriverString Ignoring flags 100 Makefile:327: recipe for target 'graphics.ok' failed make: *** [graphics.ok] Error 1

June 18, 2018