July 2018 - Wine-Commits - list.winehq.org

Józef Kucia : include: Add missing D3D_PRIMITIVE_TOPOLOGY enum values.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: vkd3d Branch: master Commit: 8d9d910374d36f31272a34a9c568eb27a6c33f66 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8d9d910374d36f31272a34a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 12:05:47 2018 +0200 include: Add missing D3D_PRIMITIVE_TOPOLOGY enum values. 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> --- include/vkd3d_d3dcommon.idl | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/include/vkd3d_d3dcommon.idl b/include/vkd3d_d3dcommon.idl index a874b6c..8bfa567 100644 --- a/include/vkd3d_d3dcommon.idl +++ b/include/vkd3d_d3dcommon.idl @@ -28,6 +28,42 @@ typedef enum D3D_PRIMITIVE_TOPOLOGY D3D_PRIMITIVE_TOPOLOGY_LINESTRIP = 3, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5, + D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ = 10, + D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ = 11, + D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ = 12, + D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ = 13, + D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST = 33, + D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST, } D3D_PRIMITIVE_TOPOLOGY; typedef enum D3D_FEATURE_LEVEL

1 0

Józef Kucia : libs/vkd3d-shader: Add debug name for vDomainLocation register.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: vkd3d Branch: master Commit: 6e8dae9d625bf7e281b1d3f49afe2efefe9a836f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6e8dae9d625bf7e281b1d3f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 12:05:43 2018 +0200 libs/vkd3d-shader: Add debug name for vDomainLocation register. 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> --- libs/vkd3d-shader/spirv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 3260b28..d236db9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2160,6 +2160,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_DEPTHOUT: snprintf(buffer, buffer_size, "oDepth"); break; + case VKD3DSPR_TESSCOORD: + snprintf(buffer, buffer_size, "vDomainLocation"); + break; case VKD3DSPR_THREADID: snprintf(buffer, buffer_size, "vThreadID"); break;

1 0

Józef Kucia : libs/vkd3d: Validate PrimitiveTopologyType for PSO with tessellation shaders.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: vkd3d Branch: master Commit: b7d2278f5706737cfed34a3557827ace6be8e62c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b7d2278f5706737cfed34a3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 12:05:46 2018 +0200 libs/vkd3d: Validate PrimitiveTopologyType for PSO with tessellation shaders. 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> --- libs/vkd3d/state.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 861f5bb..973caee 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1969,22 +1969,43 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (shader_info.uav_counter_mask) FIXME("UAV counters not implemented for graphics pipelines.\n"); - if (shader_stages[i].stage == VK_SHADER_STAGE_FRAGMENT_BIT) - compile_args = &ps_compile_args; - else - compile_args = NULL; + compile_args = NULL; + switch (shader_stages[i].stage) + { + case VK_SHADER_STAGE_VERTEX_BIT: + if ((ret = vkd3d_shader_parse_input_signature(&dxbc, &input_signature)) < 0) + { + hr = hresult_from_vkd3d_result(ret); + goto fail; + } + break; + + case VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT: + case VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT: + if (desc->PrimitiveTopologyType != D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH) + { + WARN("D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH must be used with tessellation shaders.\n"); + hr = E_INVALIDARG; + goto fail; + } + break; + + case VK_SHADER_STAGE_GEOMETRY_BIT: + break; + + case VK_SHADER_STAGE_FRAGMENT_BIT: + compile_args = &ps_compile_args; + break; + + default: + hr = E_INVALIDARG; + goto fail; + } if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count], shader_stages[i].stage, b, &shader_interface, compile_args))) goto fail; - if (shader_stages[i].stage == VK_SHADER_STAGE_VERTEX_BIT - && (ret = vkd3d_shader_parse_input_signature(&dxbc, &input_signature)) < 0) - { - hr = hresult_from_vkd3d_result(ret); - goto fail; - } - ++graphics->stage_count; }

1 0

Józef Kucia : libs/vkd3d-shader: Treat vicp register as regular shader input.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: vkd3d Branch: master Commit: 054b1e41dd62a60d006c3b8a0cba19e07ad3154d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=054b1e41dd62a60d006c3b8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 12:05:42 2018 +0200 libs/vkd3d-shader: Treat vicp register as regular shader input. 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> --- libs/vkd3d-shader/spirv.c | 11 +++++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 5 +++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1755c25..3260b28 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1729,7 +1729,7 @@ static void vkd3d_symbol_make_register(struct vkd3d_symbol *symbol, symbol->type = VKD3D_SYMBOL_REGISTER; memset(&symbol->key, 0, sizeof(symbol->key)); symbol->key.reg.type = reg->type; - if (reg->type == VKD3DSPR_INPUT && reg->idx[1].offset != ~0u) + if (vkd3d_shader_register_is_input(reg) && reg->idx[1].offset != ~0u) symbol->key.reg.idx = reg->idx[1].offset; else if (reg->type != VKD3DSPR_IMMCONSTBUFFER) symbol->key.reg.idx = reg->idx[0].offset; @@ -2150,6 +2150,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_INPUT: snprintf(buffer, buffer_size, "v%u", idx); break; + case VKD3DSPR_INCONTROLPOINT: + snprintf(buffer, buffer_size, "vicp%u", idx); + break; case VKD3DSPR_OUTPUT: case VKD3DSPR_COLOROUT: snprintf(buffer, buffer_size, "o%u", idx); @@ -3755,10 +3758,10 @@ static void vkd3d_dxbc_compiler_emit_dcl_input(struct vkd3d_dxbc_compiler *compi { const struct vkd3d_shader_dst_param *dst = &instruction->declaration.dst; - if (dst->reg.type != VKD3DSPR_INPUT) - vkd3d_dxbc_compiler_emit_input_register(compiler, dst); - else + if (vkd3d_shader_register_is_input(&dst->reg)) vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); + else + vkd3d_dxbc_compiler_emit_input_register(compiler, dst); } static void vkd3d_dxbc_compiler_emit_interpolation_decorations(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 9eb2c12..b1eadde 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -778,6 +778,11 @@ static inline BOOL vkd3d_shader_instruction_has_texel_offset(const struct vkd3d_ return ins->texel_offset.u || ins->texel_offset.v || ins->texel_offset.w; } +static inline bool vkd3d_shader_register_is_input(const struct vkd3d_shader_register *reg) +{ + return reg->type == VKD3DSPR_INPUT || reg->type == VKD3DSPR_INCONTROLPOINT; +} + void vkd3d_shader_trace(void *data) DECLSPEC_HIDDEN; void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size,

1 0

Józef Kucia : libs/vkd3d-shader: Enable arrayed inputs for all shader types.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: vkd3d Branch: master Commit: faa11182023453ad2f3bfcec840bd185079897c4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=faa11182023453ad2f3bfce… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 12:05:41 2018 +0200 libs/vkd3d-shader: Enable arrayed inputs for all shader types. 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> --- libs/vkd3d-shader/spirv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bfa2bc0..1755c25 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3000,11 +3000,6 @@ static const struct vkd3d_shader_signature_element *vkd3d_find_signature_element return NULL; } -static bool vkd3d_dxbc_compiler_is_input_arrayed(struct vkd3d_dxbc_compiler *compiler) -{ - return compiler->shader_type == VKD3D_SHADER_TYPE_GEOMETRY; -} - static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { @@ -3027,7 +3022,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi assert(!reg->idx[0].rel_addr); assert(!reg->idx[1].rel_addr); - if (vkd3d_dxbc_compiler_is_input_arrayed(compiler)) + if (reg->idx[1].offset != ~0u) { array_size = reg->idx[0].offset; reg_idx = reg->idx[1].offset;

1 0

Michael Stefaniuc : ole32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: d93954bd93ea7633e8938e38744369e79944a3f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d93954bd93ea7633e8938e38… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 17 21:20:06 2018 +0200 ole32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 6 +++--- dlls/ole32/clipboard.c | 2 +- dlls/ole32/datacache.c | 2 +- dlls/ole32/moniker.c | 2 +- dlls/ole32/ole2.c | 2 +- dlls/ole32/ole2impl.c | 2 +- dlls/ole32/rpc.c | 4 ++-- dlls/ole32/storage32.c | 9 ++++----- dlls/ole32/usrmarshal.c | 4 ++-- 9 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index ebad794..30a24d2 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -536,14 +536,14 @@ static HRESULT WINAPI ClassMoniker_GetDisplayName(IMoniker* iface, *ppszDisplayName = CoTaskMemAlloc(sizeof(wszClsidPrefix) + (CHARS_IN_GUID-2) * sizeof(WCHAR)); - StringFromGUID2(&This->clsid, *ppszDisplayName+sizeof(wszClsidPrefix)/sizeof(WCHAR)-2, CHARS_IN_GUID); + StringFromGUID2(&This->clsid, *ppszDisplayName+ARRAY_SIZE(wszClsidPrefix)-2, CHARS_IN_GUID); /* note: this overwrites the opening curly bracket of the CLSID string generated above */ memcpy(*ppszDisplayName, wszClsidPrefix, sizeof(wszClsidPrefix)-sizeof(WCHAR)); /* note: this overwrites the closing curly bracket of the CLSID string generated above */ - (*ppszDisplayName)[sizeof(wszClsidPrefix)/sizeof(WCHAR)-2+CHARS_IN_GUID-2] = ':'; - (*ppszDisplayName)[sizeof(wszClsidPrefix)/sizeof(WCHAR)-2+CHARS_IN_GUID-1] = '\0'; + (*ppszDisplayName)[ARRAY_SIZE(wszClsidPrefix)-2+CHARS_IN_GUID-2] = ':'; + (*ppszDisplayName)[ARRAY_SIZE(wszClsidPrefix)-2+CHARS_IN_GUID-1] = '\0'; TRACE("string is %s\n", debugstr_w(*ppszDisplayName)); return S_OK; diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 919d9e3..cb005d3 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1197,7 +1197,7 @@ static HRESULT get_priv_data(ole_priv_data **data) for(cf = 0; (cf = EnumClipboardFormats(cf)) != 0; count++) { WCHAR buf[256]; - if (GetClipboardFormatNameW(cf, buf, sizeof(buf) / sizeof(WCHAR))) + if (GetClipboardFormatNameW(cf, buf, ARRAY_SIZE(buf))) TRACE("cf %04x %s\n", cf, debugstr_w(buf)); else TRACE("cf %04x\n", cf); diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index b72b8ff..3eff569 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2667,7 +2667,7 @@ static HRESULT WINAPI DataCache_UpdateCache( IOleCache2 *iface, IDataObject *dat } else { - for (i = 0; i < sizeof(view_list) / sizeof(view_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(view_list); i++) { fmt.cfFormat = view_list[i]; fmt.tymed = tymed_from_cf( fmt.cfFormat ); diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index ffbaa61..c1312d1 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -1152,7 +1152,7 @@ HRESULT WINAPI MkParseDisplayName(LPBC pbc, LPCOLESTR szDisplayName, *pchEaten = 0; *ppmk = NULL; - if (!strncmpiW(szDisplayName, wszClsidColon, sizeof(wszClsidColon)/sizeof(wszClsidColon[0]))) + if (!strncmpiW(szDisplayName, wszClsidColon, ARRAY_SIZE(wszClsidColon))) { hr = ClassMoniker_CreateFromDisplayName(pbc, szDisplayName, &chEaten, &moniker); if (FAILED(hr) && (hr != MK_E_SYNTAX)) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index c7a9b27..2de9edb 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -967,7 +967,7 @@ static HRESULT WINAPI EnumOLEVERB_Next( LPWSTR pwszOLEVERB; LPWSTR pwszMenuFlags; LPWSTR pwszAttribs; - LONG res = RegEnumKeyW(This->hkeyVerb, This->index, wszSubKey, sizeof(wszSubKey)/sizeof(wszSubKey[0])); + LONG res = RegEnumKeyW(This->hkeyVerb, This->index, wszSubKey, ARRAY_SIZE(wszSubKey)); if (res == ERROR_NO_MORE_ITEMS) { hr = S_FALSE; diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index ccf31fa..fa5777b 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -135,7 +135,7 @@ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf, BOOL if (other_fmts) { - for (i = 0; i < sizeof(fmt_id)/sizeof(fmt_id[0]); i++) + for (i = 0; i < ARRAY_SIZE(fmt_id); i++) { init_fmtetc(&fmt, fmt_id[i], TYMED_ISTORAGE); hr = IDataObject_QueryGetData(data, &fmt); diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index a73d23c..9aa945b 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1658,7 +1658,7 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) static const WCHAR embedding[] = { ' ', '-','E','m','b','e','d','d','i','n','g',0 }; HKEY key; HRESULT hres; - WCHAR command[MAX_PATH+sizeof(embedding)/sizeof(WCHAR)]; + WCHAR command[MAX_PATH+ARRAY_SIZE(embedding)]; DWORD size = (MAX_PATH+1) * sizeof(WCHAR); STARTUPINFOW sinfo; PROCESS_INFORMATION pinfo; @@ -1799,7 +1799,7 @@ static void get_localserver_pipe_name(WCHAR *pipefn, REFCLSID rclsid) { static const WCHAR wszPipeRef[] = {'\\','\\','.','\\','p','i','p','e','\\',0}; strcpyW(pipefn, wszPipeRef); - StringFromGUID2(rclsid, pipefn + sizeof(wszPipeRef)/sizeof(wszPipeRef[0]) - 1, CHARS_IN_GUID); + StringFromGUID2(rclsid, pipefn + ARRAY_SIZE(wszPipeRef) - 1, CHARS_IN_GUID); } /* FIXME: should call to rpcss instead */ diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 51f178b..886d9b9 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5057,7 +5057,7 @@ static HRESULT StorageImpl_LockOne(StorageImpl *This, ULONG start, ULONG end) if (SUCCEEDED(hr)) { - for (j=0; j<sizeof(This->locked_bytes)/sizeof(This->locked_bytes[0]); j++) + for (j = 0; j < ARRAY_SIZE(This->locked_bytes); j++) { if (This->locked_bytes[j] == 0) { @@ -5200,10 +5200,10 @@ static void StorageImpl_Destroy(StorageBaseImpl* iface) BlockChainStream_Destroy(This->rootBlockChain); BlockChainStream_Destroy(This->smallBlockDepotChain); - for (i=0; i<BLOCKCHAIN_CACHE_SIZE; i++) + for (i = 0; i < BLOCKCHAIN_CACHE_SIZE; i++) BlockChainStream_Destroy(This->blockChainCache[i]); - for (i=0; i<sizeof(This->locked_bytes)/sizeof(This->locked_bytes[0]); i++) + for (i = 0; i < ARRAY_SIZE(This->locked_bytes); i++) { ULARGE_INTEGER offset, cb; cb.QuadPart = 1; @@ -9369,8 +9369,7 @@ HRESULT WINAPI WriteFmtUserTypeStg( /* get the clipboard format name */ if( cf ) { - n = GetClipboardFormatNameW( cf, szwClipName, - sizeof(szwClipName)/sizeof(szwClipName[0]) ); + n = GetClipboardFormatNameW(cf, szwClipName, ARRAY_SIZE(szwClipName)); szwClipName[n]=0; } diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 8d36e13..772bff5 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -116,7 +116,7 @@ ULONG __RPC_USER CLIPFORMAT_UserSize(ULONG *pFlags, ULONG size, CLIPFORMAT *pCF) /* urg! this function is badly designed because it won't tell us how * much space is needed without doing a dummy run of storing the * name into a buffer */ - ret = GetClipboardFormatNameW(*pCF, format, sizeof(format)/sizeof(format[0])-1); + ret = GetClipboardFormatNameW(*pCF, format, ARRAY_SIZE(format)-1); if (!ret) RaiseException(DV_E_CLIPFORMAT, 0, 0, NULL); size += (ret + 1) * sizeof(WCHAR); @@ -161,7 +161,7 @@ unsigned char * __RPC_USER CLIPFORMAT_UserMarshal(ULONG *pFlags, unsigned char * *(DWORD *)pBuffer = *pCF; pBuffer += 4; - len = GetClipboardFormatNameW(*pCF, format, sizeof(format)/sizeof(format[0])-1); + len = GetClipboardFormatNameW(*pCF, format, ARRAY_SIZE(format)-1); if (!len) RaiseException(DV_E_CLIPFORMAT, 0, 0, NULL); len += 1;

1 0

Nikolay Sivov : comctl32/trackbar: Scale thumb size with resolution.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 489c01eeb24ed17e792422071ba05b5e58be81ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=489c01eeb24ed17e79242207… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 14:13:03 2018 +0300 comctl32/trackbar: Scale thumb size with resolution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/trackbar.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index d774823..7cb73ca 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1468,25 +1468,28 @@ TRACKBAR_SetUnicodeFormat (TRACKBAR_INFO *infoPtr, BOOL fUnicode) return bTemp; } +static int get_scaled_metric(const TRACKBAR_INFO *infoPtr, int value) +{ + return MulDiv(value, GetDpiForWindow(infoPtr->hwndSelf), 96); +} static LRESULT TRACKBAR_InitializeThumb (TRACKBAR_INFO *infoPtr) { + int client_size; RECT rect; - int clientWidth, clientMetric; - /* initial thumb length */ - clientMetric = (infoPtr->dwStyle & TBS_ENABLESELRANGE) ? 23 : 21; + infoPtr->uThumbLen = get_scaled_metric(infoPtr, infoPtr->dwStyle & TBS_ENABLESELRANGE ? 23 : 21); + GetClientRect(infoPtr->hwndSelf,&rect); - if (infoPtr->dwStyle & TBS_VERT) { - clientWidth = rect.right - rect.left; - } else { - clientWidth = rect.bottom - rect.top; - } - if (clientWidth >= clientMetric) - infoPtr->uThumbLen = clientMetric; + if (infoPtr->dwStyle & TBS_VERT) + client_size = rect.right - rect.left; else - infoPtr->uThumbLen = clientWidth > 9 ? clientWidth - 6 : 4; + client_size = rect.bottom - rect.top; + + if (client_size < infoPtr->uThumbLen) + infoPtr->uThumbLen = client_size > get_scaled_metric(infoPtr, 9) ? + client_size - get_scaled_metric(infoPtr, 5) : get_scaled_metric(infoPtr, 4); TRACKBAR_CalcChannel (infoPtr); TRACKBAR_UpdateThumb (infoPtr);

1 0

Nikolay Sivov : comctl32/taskdialog: Use per-window dpi settings.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 6292c0abdcb7b710914fe731c96eff6c6c219f17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6292c0abdcb7b710914fe731… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 14:13:06 2018 +0300 comctl32/taskdialog: Use per-window dpi settings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 4631899..856a0b3 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -316,8 +316,8 @@ static void taskdialog_get_radio_button_size(struct taskdialog_info *dialog_info hfont = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); old_hfont = SelectObject(hdc, hfont); - radio_box_width = 12 * GetDeviceCaps(hdc, LOGPIXELSX) / 96 + 1; - radio_box_height = 12 * GetDeviceCaps(hdc, LOGPIXELSY) / 96 + 1; + radio_box_width = 12 * GetDpiForWindow(hwnd) / 96 + 1; + radio_box_height = 12 * GetDpiForWindow(hwnd) / 96 + 1; GetCharWidthW(hdc, '0', '0', &text_offset); text_offset /= 2;

1 0

Józef Kucia : winevulkan: Avoid FIXMEs for unsupported Vulkan functions.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: a77416c47a3dc61b5553d310e1b0f87ffb7a605f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a77416c47a3dc61b5553d310… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 17 10:40:18 2018 +0200 winevulkan: Avoid FIXMEs for unsupported Vulkan functions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 5c156c1..0bb68c2 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -935,7 +935,7 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * return func; } - TRACE("Function %s not found.\n", debugstr_a(name)); + WARN("Unsupported device function: %s.\n", debugstr_a(name)); return NULL; } @@ -970,7 +970,7 @@ PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const { void *func; - TRACE("%p %s\n", instance, debugstr_a(name)); + TRACE("%p, %s\n", instance, debugstr_a(name)); if (!name) return NULL; @@ -985,7 +985,7 @@ PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const } if (!instance) { - FIXME("Global function %s not found.\n", debugstr_a(name)); + WARN("Global function %s not found.\n", debugstr_a(name)); return NULL; } @@ -996,13 +996,13 @@ PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const func = wine_vk_get_device_proc_addr(name); if (func) return func; - FIXME("Unsupported device or instance function: %s.\n", debugstr_a(name)); + WARN("Unsupported device or instance function: %s.\n", debugstr_a(name)); return NULL; } void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *name) { - TRACE("%p %s\n", instance, debugstr_a(name)); + TRACE("%p, %s\n", instance, debugstr_a(name)); /* Initial version of the Vulkan ICD spec required vkGetInstanceProcAddr to be * exported. vk_icdGetInstanceProcAddr was added later to separate ICD calls from

1 0

Alexandre Julliard : user32: Take DPI awareness into account in GetDpiForMonitorInternal().
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 898f4b6c6a20cc3800bd38142da1d02d5a6a948e URL: https://source.winehq.org/git/wine.git/?a=commit;h=898f4b6c6a20cc3800bd3814… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 13:54:40 2018 +0200 user32: Take DPI awareness into account in GetDpiForMonitorInternal(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 34 +++++++++++++++++++++++++++------- dlls/user32/tests/sysparams.c | 22 ++++++++++++++++++++++ dlls/user32/win.c | 8 ++++++-- dlls/user32/win.h | 3 ++- 4 files changed, 57 insertions(+), 10 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index e1044e94..c92d9af 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -39,6 +39,7 @@ #include "winerror.h" #include "controls.h" +#include "win.h" #include "user_private.h" #include "wine/gdi_driver.h" #include "wine/unicode.h" @@ -3192,7 +3193,16 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, /********************************************************************** * get_monitor_dpi */ -UINT get_monitor_dpi( HWND hwnd ) +UINT get_monitor_dpi( HMONITOR monitor ) +{ + /* FIXME: use the monitor DPI instead */ + return system_dpi; +} + +/********************************************************************** + * get_win_monitor_dpi + */ +UINT get_win_monitor_dpi( HWND hwnd ) { /* FIXME: use the monitor DPI instead */ return system_dpi; @@ -3324,12 +3334,22 @@ UINT WINAPI GetDpiForSystem(void) */ BOOL WINAPI GetDpiForMonitorInternal( HMONITOR monitor, UINT type, UINT *x, UINT *y ) { - UINT dpi = system_dpi; - - WARN( "(%p, %u, %p, %p): semi-stub\n", monitor, type, x, y ); - - if (x) *x = dpi; - if (y) *y = dpi; + if (type > 2) + { + SetLastError( ERROR_BAD_ARGUMENTS ); + return FALSE; + } + if (!x || !y) + { + SetLastError( ERROR_INVALID_ADDRESS ); + return FALSE; + } + switch (GetAwarenessFromDpiAwarenessContext( GetThreadDpiAwarenessContext() )) + { + case DPI_AWARENESS_UNAWARE: *x = *y = USER_DEFAULT_SCREEN_DPI; break; + case DPI_AWARENESS_SYSTEM_AWARE: *x = *y = system_dpi; break; + default: *x = *y = get_monitor_dpi( monitor ); break; + } return TRUE; } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index fec37b6..7903c9a 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -46,6 +46,7 @@ static BOOL (WINAPI *pGetProcessDpiAwarenessInternal)(HANDLE,DPI_AWARENESS*); static BOOL (WINAPI *pSetProcessDpiAwarenessInternal)(DPI_AWARENESS); static UINT (WINAPI *pGetDpiForSystem)(void); static UINT (WINAPI *pGetDpiForWindow)(HWND); +static BOOL (WINAPI *pGetDpiForMonitorInternal)(HMONITOR,UINT,UINT*,UINT*); static DPI_AWARENESS_CONTEXT (WINAPI *pGetThreadDpiAwarenessContext)(void); static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); static DPI_AWARENESS_CONTEXT (WINAPI *pGetWindowDpiAwarenessContext)(HWND); @@ -3549,6 +3550,26 @@ static void test_dpi_window(void) dpi = pGetDpiForWindow( hwnd ); ok( dpi == (i == DPI_AWARENESS_UNAWARE ? USER_DEFAULT_SCREEN_DPI : real_dpi), "%lu: got %u / %u\n", i, dpi, real_dpi ); + if (pGetDpiForMonitorInternal) + { + BOOL res; + SetLastError( 0xdeadbeef ); + res = pGetDpiForMonitorInternal( MonitorFromWindow( hwnd, 0 ), 0, &dpi, NULL ); + ok( !res, "succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_ADDRESS, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + res = pGetDpiForMonitorInternal( MonitorFromWindow( hwnd, 0 ), 3, &dpi, &dpi ); + ok( !res, "succeeded\n" ); + ok( GetLastError() == ERROR_BAD_ARGUMENTS, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + res = pGetDpiForMonitorInternal( MonitorFromWindow( hwnd, 0 ), 3, &dpi, NULL ); + ok( !res, "succeeded\n" ); + ok( GetLastError() == ERROR_BAD_ARGUMENTS, "wrong error %u\n", GetLastError() ); + res = pGetDpiForMonitorInternal( MonitorFromWindow( hwnd, 0 ), 0, &dpi, &dpi ); + ok( res, "failed err %u\n", GetLastError() ); + ok( dpi == (i == DPI_AWARENESS_UNAWARE ? USER_DEFAULT_SCREEN_DPI : real_dpi), + "%lu: got %u / %u\n", i, dpi, real_dpi ); + } msg.hwnd = hwnd; for (j = DPI_AWARENESS_UNAWARE; j <= DPI_AWARENESS_PER_MONITOR_AWARE; j++) { @@ -3660,6 +3681,7 @@ START_TEST(sysparams) pSetProcessDPIAware = (void*)GetProcAddress(hdll, "SetProcessDPIAware"); pGetDpiForSystem = (void*)GetProcAddress(hdll, "GetDpiForSystem"); pGetDpiForWindow = (void*)GetProcAddress(hdll, "GetDpiForWindow"); + pGetDpiForMonitorInternal = (void*)GetProcAddress(hdll, "GetDpiForMonitorInternal"); pSetProcessDpiAwarenessContext = (void*)GetProcAddress(hdll, "SetProcessDpiAwarenessContext"); pGetProcessDpiAwarenessInternal = (void*)GetProcAddress(hdll, "GetProcessDpiAwarenessInternal"); pSetProcessDpiAwarenessInternal = (void*)GetProcAddress(hdll, "SetProcessDpiAwarenessInternal"); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 28bc1f6..5f2ac4e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2240,11 +2240,15 @@ UINT WINAPI GetDpiForWindow( HWND hwnd ) SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return 0; } - if (win == WND_DESKTOP) return get_monitor_dpi( GetDesktopWindow() ); + if (win == WND_DESKTOP) + { + POINT pt = { 0, 0 }; + return get_monitor_dpi( MonitorFromPoint( pt, MONITOR_DEFAULTTOPRIMARY )); + } if (win != WND_OTHER_PROCESS) { ret = win->dpi; - if (!ret) ret = get_monitor_dpi( hwnd ); + if (!ret) ret = get_win_monitor_dpi( hwnd ); WIN_ReleasePtr( win ); } else diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 15331c3..b6c162a 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -128,7 +128,8 @@ extern void WINPOS_ActivateOtherWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) DECLSPEC_HIDDEN; extern void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) DECLSPEC_HIDDEN; -extern UINT get_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; +extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; +extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN;

1 0