January 2017 - Wine-Commits

Bruno Jesus : maintainers: Add network section.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: af8e6ee6163554a61f5678dea1fec3e990c86705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af8e6ee6163554a61f5678dea… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jan 25 15:08:40 2017 -0200 maintainers: Add network section. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index cec6cdb..46e4273 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -159,6 +159,11 @@ Netstat M: André Hentschel <nerv(a)dawncrow.de> F: programs/netstat/ +Network +P: Bruno Jesus <00cpxxx(a)gmail.com> +F: dlls/iphlpapi/ +F: dlls/ws2_32/ + OLE Embedding M: Huw Davies <huw(a)codeweavers.com> F: dlls/ole32/clipboard.c

1 0

Gerald Pfeifer : server: Remove dead check in is_cpu_supported().
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 4598d32ab418269a6aca3afd2207f0837211f2ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=4598d32ab418269a6aca3afd2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 21 16:25:08 2017 +0100 server: Remove dead check in is_cpu_supported(). Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/thread.c b/server/thread.c index e18c208..67f976d 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1220,7 +1220,7 @@ int is_cpu_supported( enum cpu_type cpu ) { unsigned int prefix_cpu_mask = get_prefix_cpu_mask(); - if (CPU_FLAG(cpu) && (supported_cpus & prefix_cpu_mask & CPU_FLAG(cpu))) return 1; + if (supported_cpus & prefix_cpu_mask & CPU_FLAG(cpu)) return 1; if (!(supported_cpus & prefix_cpu_mask)) set_error( STATUS_NOT_SUPPORTED ); else if (supported_cpus & CPU_FLAG(cpu))

1 0

Bruno Jesus : ntdll: Fake success if changing system date is a no-op.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: eefc1c471c6a3ef7b5cba390a022596edd9c4d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eefc1c471c6a3ef7b5cba390a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jan 22 15:14:25 2017 -0200 ntdll: Fake success if changing system date is a no-op. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 96ffcfa..d232c4c 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -951,14 +951,21 @@ NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER *NewTime, LARGE_INTEGER *Old RtlTimeToSecondsSince1970( NewTime, &sec ); + /* fake success if time didn't change */ + if (oldsec == sec) + return STATUS_SUCCESS; + /* set the new time */ tv.tv_sec = sec; tv.tv_usec = 0; #ifdef HAVE_SETTIMEOFDAY + tm_t = sec; if (!settimeofday(&tv, NULL)) /* 0 is OK, -1 is error */ + { + TRACE("OS time changed to %s\n", ctime(&tm_t)); return STATUS_SUCCESS; - tm_t = sec; + } ERR("Cannot set time to %s, time adjustment %ld: %s\n", ctime(&tm_t), (long)(sec-oldsec), strerror(errno)); if (errno == EPERM)

1 0

Austin English : kernel32: Add BaseFlushAppcompatCache stub.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 0df25df8288ca63d991545029b4ec28b8b512b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df25df8288ca63d991545029… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 18 16:38:26 2017 -0600 kernel32: Add BaseFlushAppcompatCache stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-appcompat-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/process.c | 10 ++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec b/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec index 92a96af..e37c525 100644 --- a/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec +++ b/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec @@ -2,7 +2,7 @@ @ stub BaseCheckAppcompatCacheEx @ stub BaseCleanupAppcompatCacheSupport @ stub BaseDumpAppcompatCache -@ stub BaseFlushAppcompatCache +@ stdcall BaseFlushAppcompatCache() kernel32.BaseFlushAppcompatCache @ stub BaseFreeAppCompatDataForProcess @ stub BaseInitAppcompatCacheSupport @ stub BaseIsAppcompatInfrastructureDisabled diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 224e6ae..06b89de 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -167,11 +167,11 @@ @ stub BaseCheckAppcompatCache # @ stub BaseCheckAppcompatCacheEx # @ stub BaseCheckRunApp -@ stub BaseCleanupAppcompatCache +@ stub BaseCleanupAppcompatCache @ stub BaseCleanupAppcompatCacheSupport # @ stub BaseDllReadWriteIniFile @ stub BaseDumpAppcompatCache -@ stub BaseFlushAppcompatCache +@ stdcall BaseFlushAppcompatCache() # @ stub BaseFormatObjectAttributes # @ stub BaseFormatTimeOut # @ stub BaseGenerateAppCompatData diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 2130240..17cb1db 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4207,3 +4207,13 @@ void WINAPI DeleteProcThreadAttributeList(struct _PROC_THREAD_ATTRIBUTE_LIST *li { return; } + +/********************************************************************** + * BaseFlushAppcompatCache (KERNEL32.@) + */ +BOOL WINAPI BaseFlushAppcompatCache(void) +{ + FIXME(": stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_CSSetShader().
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: bffc232d736b5574f54b63e050f241a41ce9c920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bffc232d736b5574f54b63e05… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 25 11:17:59 2017 +0100 d3d11: Implement d3d11_immediate_context_CSSetShader(). 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/d3d11_private.h | 1 + dlls/d3d11/device.c | 12 +++++++++++- dlls/d3d11/shader.c | 9 +++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 52c43d6..53be0f8 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -350,6 +350,7 @@ struct d3d11_compute_shader HRESULT d3d11_compute_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, struct d3d11_compute_shader **shader) DECLSPEC_HIDDEN; +struct d3d11_compute_shader *unsafe_impl_from_ID3D11ComputeShader(ID3D11ComputeShader *iface) DECLSPEC_HIDDEN; HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 777146d..cf1bdfe 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1205,8 +1205,18 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetUnorderedAccessViews( static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShader(ID3D11DeviceContext *iface, ID3D11ComputeShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - FIXME("iface %p, shader %p, class_instances %p, class_instance_count %u stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d11_compute_shader *cs = unsafe_impl_from_ID3D11ComputeShader(shader); + + TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", iface, shader, class_instances, class_instance_count); + + if (class_instances) + FIXME("Dynamic linking is not implemented yet.\n"); + + wined3d_mutex_lock(); + wined3d_device_set_compute_shader(device->wined3d_device, cs ? cs->wined3d_shader : NULL); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetSamplers(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 1da1293..99af31b 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1749,6 +1749,15 @@ HRESULT d3d11_compute_shader_create(struct d3d_device *device, const void *byte_ return S_OK; } +struct d3d11_compute_shader *unsafe_impl_from_ID3D11ComputeShader(ID3D11ComputeShader *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_compute_shader_vtbl); + + return impl_from_ID3D11ComputeShader(iface); +} + /* ID3D11ClassLinkage methods */ static inline struct d3d11_class_linkage *impl_from_ID3D11ClassLinkage(ID3D11ClassLinkage *iface)

1 0

İsmail Dönmez : d3d11.idl: Added missing D3D11_CS_* constants.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 230bda70ae4ad28d30ea80814d6a5054ac11f8dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=230bda70ae4ad28d30ea80814… Author: İsmail Dönmez <ismail(a)i10z.com> Date: Wed Jan 25 15:53:25 2017 +0100 d3d11.idl: Added missing D3D11_CS_* constants. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 3ca697b..d2b3836 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -68,6 +68,58 @@ const INT D3D11_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MIN = -10; const INT D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_NEGATIVE = -8; const UINT D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_POSITIVE = 7; +const UINT D3D11_CS_4_X_BUCKET00_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 256; +const UINT D3D11_CS_4_X_BUCKET00_MAX_NUM_THREADS_PER_GROUP = 64; +const UINT D3D11_CS_4_X_BUCKET01_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 240; +const UINT D3D11_CS_4_X_BUCKET01_MAX_NUM_THREADS_PER_GROUP = 68; +const UINT D3D11_CS_4_X_BUCKET02_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 224; +const UINT D3D11_CS_4_X_BUCKET02_MAX_NUM_THREADS_PER_GROUP = 72; +const UINT D3D11_CS_4_X_BUCKET03_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 208; +const UINT D3D11_CS_4_X_BUCKET03_MAX_NUM_THREADS_PER_GROUP = 76; +const UINT D3D11_CS_4_X_BUCKET04_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 192; +const UINT D3D11_CS_4_X_BUCKET04_MAX_NUM_THREADS_PER_GROUP = 84; +const UINT D3D11_CS_4_X_BUCKET05_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 176; +const UINT D3D11_CS_4_X_BUCKET05_MAX_NUM_THREADS_PER_GROUP = 92; +const UINT D3D11_CS_4_X_BUCKET06_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 160; +const UINT D3D11_CS_4_X_BUCKET06_MAX_NUM_THREADS_PER_GROUP = 100; +const UINT D3D11_CS_4_X_BUCKET07_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 144; +const UINT D3D11_CS_4_X_BUCKET07_MAX_NUM_THREADS_PER_GROUP = 112; +const UINT D3D11_CS_4_X_BUCKET08_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 128; +const UINT D3D11_CS_4_X_BUCKET08_MAX_NUM_THREADS_PER_GROUP = 128; +const UINT D3D11_CS_4_X_BUCKET09_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 112; +const UINT D3D11_CS_4_X_BUCKET09_MAX_NUM_THREADS_PER_GROUP = 144; +const UINT D3D11_CS_4_X_BUCKET10_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 96; +const UINT D3D11_CS_4_X_BUCKET10_MAX_NUM_THREADS_PER_GROUP = 168; +const UINT D3D11_CS_4_X_BUCKET11_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 80; +const UINT D3D11_CS_4_X_BUCKET11_MAX_NUM_THREADS_PER_GROUP = 204; +const UINT D3D11_CS_4_X_BUCKET12_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 64; +const UINT D3D11_CS_4_X_BUCKET12_MAX_NUM_THREADS_PER_GROUP = 256; +const UINT D3D11_CS_4_X_BUCKET13_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 48; +const UINT D3D11_CS_4_X_BUCKET13_MAX_NUM_THREADS_PER_GROUP = 340; +const UINT D3D11_CS_4_X_BUCKET14_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 32; +const UINT D3D11_CS_4_X_BUCKET14_MAX_NUM_THREADS_PER_GROUP = 512; +const UINT D3D11_CS_4_X_BUCKET15_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 16; +const UINT D3D11_CS_4_X_BUCKET15_MAX_NUM_THREADS_PER_GROUP = 768; +const UINT D3D11_CS_4_X_DISPATCH_MAX_THREAD_GROUPS_IN_Z_DIMENSION = 1; +const UINT D3D11_CS_4_X_RAW_UAV_BYTE_ALIGNMENT = 256; +const UINT D3D11_CS_4_X_THREAD_GROUP_MAX_THREADS_PER_GROUP = 768; +const UINT D3D11_CS_4_X_THREAD_GROUP_MAX_X = 768; +const UINT D3D11_CS_4_X_THREAD_GROUP_MAX_Y = 768; +const UINT D3D11_CS_4_X_UAV_REGISTER_COUNT = 1; +const UINT D3D11_CS_DISPATCH_MAX_THREAD_GROUPS_PER_DIMENSION = 65535; +const UINT D3D11_CS_TGSM_REGISTER_COUNT = 8192; +const UINT D3D11_CS_TGSM_REGISTER_READS_PER_INST = 1; +const UINT D3D11_CS_TGSM_RESOURCE_REGISTER_COMPONENTS = 1; +const UINT D3D11_CS_TGSM_RESOURCE_REGISTER_READ_PORTS = 1; +const UINT D3D11_CS_THREAD_GROUP_MAX_THREADS_PER_GROUP = 1024; +const UINT D3D11_CS_THREAD_GROUP_MAX_X = 1024; +const UINT D3D11_CS_THREAD_GROUP_MAX_Y = 1024; +const UINT D3D11_CS_THREAD_GROUP_MAX_Z = 64; +const UINT D3D11_CS_THREAD_GROUP_MIN_X = 1; +const UINT D3D11_CS_THREAD_GROUP_MIN_Y = 1; +const UINT D3D11_CS_THREAD_GROUP_MIN_Z = 1; +const UINT D3D11_CS_THREAD_LOCAL_TEMP_REGISTER_POOL = 16384; + const UINT D3D11_DEFAULT_DEPTH_BIAS = 0; cpp_quote("#define D3D11_DEFAULT_DEPTH_BIAS_CLAMP 0.0f") const UINT D3D11_DEFAULT_MAX_ANISOTROPY = 16;

1 0

Józef Kucia : ddraw: Cleanup ddraw7_GetAvailableVidMem().
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: d7b3ef0783f66a40421544e2fe43a6dce5f0d556 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b3ef0783f66a40421544e2f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 2 10:44:39 2017 +0100 ddraw: Cleanup ddraw7_GetAvailableVidMem(). 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/ddraw/ddraw.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 3b4c628..e313a75 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1886,7 +1886,7 @@ static HRESULT WINAPI ddraw1_GetVerticalBlankStatus(IDirectDraw *iface, BOOL *st * Returns the total and free video memory * * Params: - * Caps: Specifies the memory type asked for + * caps: Specifies the memory type asked for * total: Pointer to a DWORD to be filled with the total memory * free: Pointer to a DWORD to be filled with the free memory * @@ -1895,7 +1895,7 @@ static HRESULT WINAPI ddraw1_GetVerticalBlankStatus(IDirectDraw *iface, BOOL *st * DDERR_INVALIDPARAMS if free and total are NULL * *****************************************************************************/ -static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *Caps, DWORD *total, +static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *caps, DWORD *total, DWORD *free) { unsigned int framebuffer_size, total_vidmem, free_vidmem; @@ -1903,12 +1903,15 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C struct wined3d_display_mode mode; HRESULT hr = DD_OK; - TRACE("iface %p, caps %p, total %p, free %p.\n", iface, Caps, total, free); + TRACE("iface %p, caps %p, total %p, free %p.\n", iface, caps, total, free); + + if (!total && !free) + return DDERR_INVALIDPARAMS; if (TRACE_ON(ddraw)) { TRACE("Asked for memory with description: "); - DDRAW_dump_DDSCAPS2(Caps); + DDRAW_dump_DDSCAPS2(caps); } wined3d_mutex_lock(); @@ -1917,12 +1920,6 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C * resources, but that's not important */ - if( (!total) && (!free) ) - { - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; - } - /* Some applications (e.g. 3DMark 2000) assume that the reported amount of * video memory doesn't include the memory used by the default framebuffer. */

1 0

Jacek Caban : inetcomm: Added MimeHtmlProtocol stub implementation.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 6832273ed8d39d51c3de44c9ec1bbdd3a8365248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6832273ed8d39d51c3de44c9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 25 12:05:47 2017 +0100 inetcomm: Added MimeHtmlProtocol stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/Makefile.in | 1 + dlls/inetcomm/inetcomm_main.c | 9 +- dlls/inetcomm/inetcomm_private.h | 11 +++ dlls/inetcomm/protocol.c | 192 +++++++++++++++++++++++++++++++++++++++ dlls/inetcomm/tests/mimeole.c | 20 ++++ include/mimeole.idl | 2 + 6 files changed, 234 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6832273ed8d39d51c3de4…

1 0

Jactry Zeng : qcap: Release IBaseFilter.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: ca4227bdf47e88c198442b5e5139d15a768f0d48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca4227bdf47e88c198442b5e5… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Jan 25 10:42:32 2017 +0800 qcap: Release IBaseFilter. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capturegraph.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index 546b1f8..bae75f8 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -687,6 +687,7 @@ fnCaptureGraphBuilder2_FindPin(ICaptureGraphBuilder2 * iface, if (FAILED(hr)) { WARN("Could not enumerate\n"); + IBaseFilter_Release(filter); return hr; } @@ -720,6 +721,7 @@ fnCaptureGraphBuilder2_FindPin(ICaptureGraphBuilder2 * iface, break; } IEnumPins_Release(enumpins); + IBaseFilter_Release(filter); if (hr != S_OK) {

1 0

Huw Davies : usp10/tests: Add a second set of glyph props that have changed in Windows 10.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 55c5a77b47258a86da12f3a1004242ad5e0df78f URL: http://source.winehq.org/git/wine.git/?a=commit;h=55c5a77b47258a86da12f3a10… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 25 08:59:55 2017 +0000 usp10/tests: Add a second set of glyph props that have changed in Windows 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 66 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 56 insertions(+), 10 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index e77f90e..0959699 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -927,8 +927,9 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, DWORD cchString, SCRIPT_CONTROL *Control, SCRIPT_STATE *State, DWORD item, DWORD nGlyphs, - const shapeTest_char* charItems, - const shapeTest_glyph* glyphItems) + const shapeTest_char *charItems, + const shapeTest_glyph *glyphItems, + const SCRIPT_GLYPHPROP *props2) { HRESULT hr; int x, outnItems=0, outnGlyphs=0; @@ -1014,19 +1015,27 @@ static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, winetest_trace("%i: Glyph present when it should not be\n",x); } if (valid > 0) - winetest_ok(glyphProp[x].sva.uJustification == glyphItems[x].GlyphProp.sva.uJustification, "%i: uJustification incorrect (%i)\n",x,glyphProp[x].sva.uJustification); + winetest_ok(glyphProp[x].sva.uJustification == glyphItems[x].GlyphProp.sva.uJustification || + (props2 && glyphProp[x].sva.uJustification == props2[x].sva.uJustification), + "%i: uJustification incorrect (%i)\n",x,glyphProp[x].sva.uJustification); else if (glyphProp[x].sva.uJustification != glyphItems[x].GlyphProp.sva.uJustification) winetest_trace("%i: uJustification incorrect (%i)\n",x,glyphProp[x].sva.uJustification); if (valid > 0) - winetest_ok(glyphProp[x].sva.fClusterStart == glyphItems[x].GlyphProp.sva.fClusterStart, "%i: fClusterStart incorrect (%i)\n",x,glyphProp[x].sva.fClusterStart); + winetest_ok(glyphProp[x].sva.fClusterStart == glyphItems[x].GlyphProp.sva.fClusterStart || + (props2 && glyphProp[x].sva.fClusterStart == props2[x].sva.fClusterStart), + "%i: fClusterStart incorrect (%i)\n",x,glyphProp[x].sva.fClusterStart); else if (glyphProp[x].sva.fClusterStart != glyphItems[x].GlyphProp.sva.fClusterStart) winetest_trace("%i: fClusterStart incorrect (%i)\n",x,glyphProp[x].sva.fClusterStart); if (valid > 0) - winetest_ok(glyphProp[x].sva.fDiacritic == glyphItems[x].GlyphProp.sva.fDiacritic, "%i: fDiacritic incorrect (%i)\n",x,glyphProp[x].sva.fDiacritic); + winetest_ok(glyphProp[x].sva.fDiacritic == glyphItems[x].GlyphProp.sva.fDiacritic || + (props2 && glyphProp[x].sva.fDiacritic == props2[x].sva.fDiacritic), + "%i: fDiacritic incorrect (%i)\n",x,glyphProp[x].sva.fDiacritic); else if (glyphProp[x].sva.fDiacritic != glyphItems[x].GlyphProp.sva.fDiacritic) winetest_trace("%i: fDiacritic incorrect (%i)\n",x,glyphProp[x].sva.fDiacritic); if (valid > 0) - winetest_ok(glyphProp[x].sva.fZeroWidth == glyphItems[x].GlyphProp.sva.fZeroWidth, "%i: fZeroWidth incorrect (%i)\n",x,glyphProp[x].sva.fZeroWidth); + winetest_ok(glyphProp[x].sva.fZeroWidth == glyphItems[x].GlyphProp.sva.fZeroWidth || + (props2 && glyphProp[x].sva.fZeroWidth == props2[x].sva.fZeroWidth), + "%i: fZeroWidth incorrect (%i)\n",x,glyphProp[x].sva.fZeroWidth); else if (glyphProp[x].sva.fZeroWidth != glyphItems[x].GlyphProp.sva.fZeroWidth) winetest_trace("%i: fZeroWidth incorrect (%i)\n",x,glyphProp[x].sva.fZeroWidth); } @@ -1039,9 +1048,14 @@ cleanup: ScriptFreeCache(&sc); } -#define test_shape_ok(a,b,c,d,e,f,g,h,i) (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _test_shape_ok(1,a,b,c,d,e,f,g,h,i) +#define test_shape_ok(a,b,c,d,e,f,g,h,i) \ + (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _test_shape_ok(1,a,b,c,d,e,f,g,h,i,NULL) -#define test_shape_ok_valid(v,a,b,c,d,e,f,g,h,i) (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _test_shape_ok(v,a,b,c,d,e,f,g,h,i) +#define test_shape_ok_valid(v,a,b,c,d,e,f,g,h,i) \ + (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _test_shape_ok(v,a,b,c,d,e,f,g,h,i,NULL) + +#define test_shape_ok_valid_props2(v,a,b,c,d,e,f,g,h,i,j) \ + (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _test_shape_ok(v,a,b,c,d,e,f,g,h,i,j) typedef struct tagRangeP { BYTE range; @@ -1245,6 +1259,18 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + static const SCRIPT_GLYPHPROP phagspa_win10_props[] = { + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0} }; /* Lao */ static const WCHAR test_lao[] = {0x0ead, 0x0eb1, 0x0e81, 0x0eaa, 0x0ead, 0x0e99, 0x0ea5, 0x0eb2, 0x0ea7, 0}; @@ -1281,6 +1307,24 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + static const SCRIPT_GLYPHPROP tibetan_win10_props[] = { + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0} }; /* Devanagari */ static const WCHAR test_devanagari[] = {0x0926, 0x0947, 0x0935, 0x0928, 0x093e, 0x0917, 0x0930, 0x0940}; @@ -1464,7 +1508,8 @@ static void test_ScriptShapeOpenType(HDC hdc) test_valid = find_font_for_range(hdc, "Microsoft PhagsPa", 53, test_phagspa[0], &hfont, &hfont_orig); if (hfont != NULL) { - test_shape_ok_valid(test_valid, hdc, test_phagspa, 11, &Control, &State, 0, 11, phagspa_c, phagspa_g); + test_shape_ok_valid_props2(test_valid, hdc, test_phagspa, 11, &Control, &State, 0, 11, + phagspa_c, phagspa_g, phagspa_win10_props); SelectObject(hdc, hfont_orig); DeleteObject(hfont); } @@ -1480,7 +1525,8 @@ static void test_ScriptShapeOpenType(HDC hdc) test_valid = find_font_for_range(hdc, "Microsoft Himalaya", 70, test_tibetan[0], &hfont, &hfont_orig); if (hfont != NULL) { - test_shape_ok_valid(test_valid, hdc, test_tibetan, 17, &Control, &State, 0, 17, tibetan_c, tibetan_g); + test_shape_ok_valid_props2(test_valid, hdc, test_tibetan, 17, &Control, &State, 0, 17, + tibetan_c, tibetan_g, tibetan_win10_props); SelectObject(hdc, hfont_orig); DeleteObject(hfont); }

1 0