- wine-devel - winehq.org

[PATCH] setupapi/tests: Add a trailing '\n' to a couple of ok() calls.
by Francois Gouget 14 Mar '19

14 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/setupapi/tests/devinst.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 0f27783d87a..004a9564014 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -63,13 +63,13 @@ static void test_create_device_list_ex(void) "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); - ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoListExW(NULL, NULL, empty, NULL); - ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); -- 2.20.1

2 1

[PATCH] dbghelp: Spelling fixes in a couple of comments.
by Francois Gouget 14 Mar '19

14 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dbghelp/symbol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 96a1f8743c4..f59e322fef2 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -850,7 +850,7 @@ static void symt_get_length(struct module* module, const struct symt* symt, ULON *size = 0x1000; /* arbitrary value */ } -/* neede by symt_find_nearest */ +/* needed by symt_find_nearest */ static int symt_get_best_at(struct module* module, int idx_sorttab) { ULONG64 ref_addr; @@ -870,7 +870,7 @@ static int symt_get_best_at(struct module* module, int idx_sorttab) !cmp_sorttab_addr(module, idx_sorttab + 1, ref_addr)) idx_sorttab++; } - /* if no better symbol fond restore original */ + /* if no better symbol was found restore the original */ if (module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol) idx_sorttab = idx_sorttab_orig; } -- 2.20.1

1 0

[PATCH] vbscript/tests: A spelling fix in a comment.
by Francois Gouget 14 Mar '19

14 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/vbscript/tests/lang.vbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 9f1d24c5400..afd7c241ed5 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1366,7 +1366,7 @@ end sub call test_identifiers() sub test_dotIdentifiers - ' test keywords that can also be an indentifier after a dot + ' test keywords that can also be an identifier after a dot ' Call ok(testObj.rem = 10, "testObj.rem = " & testObj.rem & " expected 10") Call ok(testObj.true = 10, "testObj.true = " & testObj.true & " expected 10") Call ok(testObj.false = 10, "testObj.false = " & testObj.false & " expected 10") -- 2.20.1

1 0

[PATCH] vssapi: A spelling fix in a variable name.
by Francois Gouget 14 Mar '19

14 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/vsbackup.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vsbackup.idl b/include/vsbackup.idl index b2dca11f8fe..d2d8795ce41 100644 --- a/include/vsbackup.idl +++ b/include/vsbackup.idl @@ -63,7 +63,7 @@ interface IVssBackupComponents : IUnknown HRESULT GetWriterStatus([in] UINT index, [out] VSS_ID *instance, [out] VSS_ID *id, [out] BSTR *writer, [out] VSS_WRITER_STATE *status, [out] HRESULT *failure); HRESULT SetBackupSucceeded([in] VSS_ID instance, [in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, - [in] LPCWSTR path, [in] LPCWSTR name, [in] BOOL succeded); + [in] LPCWSTR path, [in] LPCWSTR name, [in] BOOL succeeded); HRESULT SetBackupOptions([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, [in] LPCWSTR name, [in] LPCWSTR options); HRESULT SetSelectedForRestore([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, -- 2.20.1

1 0

[PATCH 2/2] d3d9/tests: Mark one more test in test_vshader_input() as broken on WARP.
by Henri Verbeet 13 Mar '19

13 Mar '19

This fails intermittently on the testbot. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 93186109e5f..0ce994820e3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8747,8 +8747,7 @@ static void test_vshader_input(void) * * A test app for this behavior is Half Life 2 Episode 2 in dxlevel 95, and related games(Portal, TF2). */ - ok(color == 0x000000ff || color == 0x00808080 || color == 0x00000000 - || broken(color_match(color, D3DCOLOR_ARGB(0x00, 0x0b, 0x75, 0x80), 1)), + ok(color == 0x000000ff || color == 0x00808080 || color == 0x00000000 || broken(warp), "Got unexpected color 0x%08x for quad 2 (different colors).\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); -- 2.11.0

2 1

[PATCH] d3dxof: Change "value" size to 512.
by Józef Kucia 13 Mar '19

13 Mar '19

is_name() may write up to 512 bytes to the "value". Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3dxof/d3dxof_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index cf33ed21ceaa..ff29261b6085 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -130,7 +130,7 @@ typedef struct { BOOL list_separator; ULONG cur_pos_data; LPBYTE cur_pstrings; - BYTE value[100]; + BYTE value[512]; xobject** pxo_globals; ULONG nb_pxo_globals; xobject* pxo_tab; -- 2.19.2

4 3

[PATCH 6/6] d3dx9: Merge the d3dx_effect_SetTexture() helper
by Michael Stefaniuc 13 Mar '19

13 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 59 +++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 32 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0e436a1515..e180c2077c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1499,35 +1499,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, struct IDirect3DBaseTexture9 *texture) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && !param->element_count && - (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D - || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D - || param->type == D3DXPT_TEXTURECUBE)) - { - struct IDirect3DBaseTexture9 *oltexture = *(struct IDirect3DBaseTexture9 **)param->data; - - if (texture == oltexture) - return D3D_OK; - - if (texture) IDirect3DBaseTexture9_AddRef(texture); - if (oltexture) IDirect3DBaseTexture9_Release(oltexture); - - *(struct IDirect3DBaseTexture9 **)param->data = texture; - set_dirty(param); - - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { @@ -3532,14 +3503,38 @@ static HRESULT WINAPI d3dx_effect_GetString(ID3DXEffect *iface, D3DXHANDLE param return D3DERR_INVALIDCALL; } -static HRESULT WINAPI d3dx_effect_SetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter, - struct IDirect3DBaseTexture9 *texture) +static HRESULT WINAPI d3dx_effect_SetTexture(ID3DXEffect *iface, D3DXHANDLE parameter, + IDirect3DBaseTexture9 *texture) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture); - return d3dx9_base_effect_set_texture(&effect->base_effect, parameter, texture); + if (param && !param->element_count + && (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D + || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D + || param->type == D3DXPT_TEXTURECUBE)) + { + IDirect3DBaseTexture9 *old_texture = *(IDirect3DBaseTexture9 **)param->data; + + if (texture == old_texture) + return D3D_OK; + + if (texture) + IDirect3DBaseTexture9_AddRef(texture); + if (old_texture) + IDirect3DBaseTexture9_Release(old_texture); + + *(IDirect3DBaseTexture9 **)param->data = texture; + set_dirty(param); + + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetTexture(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 5/6] d3dx9: Merge the d3dx_effect_GetTexture() helper
by Michael Stefaniuc 13 Mar '19

13 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 155a499b9f..0e436a1515 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1528,27 +1528,6 @@ static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_texture(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, struct IDirect3DBaseTexture9 **texture) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (texture && param && !param->element_count && - (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D - || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D - || param->type == D3DXPT_TEXTURECUBE)) - { - *texture = *(struct IDirect3DBaseTexture9 **)param->data; - if (*texture) IDirect3DBaseTexture9_AddRef(*texture); - TRACE("Returning %p\n", *texture); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { @@ -3563,14 +3542,29 @@ static HRESULT WINAPI d3dx_effect_SetTexture(struct ID3DXEffect *iface, D3DXHAND return d3dx9_base_effect_set_texture(&effect->base_effect, parameter, texture); } -static HRESULT WINAPI d3dx_effect_GetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter, - struct IDirect3DBaseTexture9 **texture) +static HRESULT WINAPI d3dx_effect_GetTexture(ID3DXEffect *iface, D3DXHANDLE parameter, + IDirect3DBaseTexture9 **texture) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture); - return d3dx9_base_effect_get_texture(&effect->base_effect, parameter, texture); + if (texture && param && !param->element_count + && (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D + || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D + || param->type == D3DXPT_TEXTURECUBE)) + { + *texture = *(IDirect3DBaseTexture9 **)param->data; + if (*texture) + IDirect3DBaseTexture9_AddRef(*texture); + TRACE("Returning %p.\n", *texture); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 4/6] d3dx9: Merge the d3dx_effect_SetString() helper
by Michael Stefaniuc 13 Mar '19

13 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a81e330eaa..155a499b9f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1499,22 +1499,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_string(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const char *string) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && param->type == D3DXPT_STRING) - { - set_dirty(param); - return set_string(param->data, string); - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DBaseTexture9 *texture) { @@ -3535,10 +3519,19 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTransposePointerArray(ID3DXEffect *if static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char *string) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, string %s.\n", iface, parameter, debugstr_a(string)); - return d3dx9_base_effect_set_string(&effect->base_effect, parameter, string); + if (param && param->type == D3DXPT_STRING) + { + set_dirty(param); + return set_string(param->data, string); + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string) -- 2.20.1

2 1

[PATCH 3/6] d3dx9: Merge the d3dx_effect_GetString() helper
by Michael Stefaniuc 13 Mar '19

13 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 554d43df01..a81e330eaa 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1515,23 +1515,6 @@ static HRESULT d3dx9_base_effect_set_string(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_string(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const char **string) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (string && param && !param->element_count && param->type == D3DXPT_STRING) - { - *string = *(const char **)param->data; - TRACE("Returning %s.\n", debugstr_a(*string)); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DBaseTexture9 *texture) { @@ -3561,10 +3544,20 @@ static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE param static HRESULT WINAPI d3dx_effect_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, string %p.\n", iface, parameter, string); - return d3dx9_base_effect_get_string(&effect->base_effect, parameter, string); + if (string && param && !param->element_count && param->type == D3DXPT_STRING) + { + *string = *(const char **)param->data; + TRACE("Returning %s.\n", debugstr_a(*string)); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 2/6] d3dx9: Merge the d3dx_effect_GetPixelShader() helper
by Michael Stefaniuc 13 Mar '19

13 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 993e61356b..554d43df01 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1582,24 +1582,6 @@ static HRESULT d3dx9_base_effect_get_texture(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_pixel_shader(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, struct IDirect3DPixelShader9 **shader) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (shader && param && !param->element_count && param->type == D3DXPT_PIXELSHADER) - { - if ((*shader = *(struct IDirect3DPixelShader9 **)param->data)) - IDirect3DPixelShader9_AddRef(*shader); - TRACE("Returning %p.\n", *shader); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { @@ -3606,13 +3588,24 @@ static HRESULT WINAPI d3dx_effect_GetTexture(struct ID3DXEffect *iface, D3DXHAND } static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE parameter, - struct IDirect3DPixelShader9 **shader) + IDirect3DPixelShader9 **shader) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader); - return d3dx9_base_effect_get_pixel_shader(&effect->base_effect, parameter, shader); + if (shader && param && !param->element_count && param->type == D3DXPT_PIXELSHADER) + { + if ((*shader = *(IDirect3DPixelShader9 **)param->data)) + IDirect3DPixelShader9_AddRef(*shader); + TRACE("Returning %p.\n", *shader); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetVertexShader(struct ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 1/6] d3dx9: Merge the d3dx_effect_GetParameterDesc() helper
by Michael Stefaniuc 13 Mar '19

13 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 49 ++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b12127b35b..993e61356b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -989,33 +989,6 @@ static inline DWORD d3dx9_effect_version(DWORD major, DWORD minor) return (0xfeff0000 | ((major) << 8) | (minor)); } -static HRESULT d3dx9_base_effect_get_parameter_desc(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXPARAMETER_DESC *desc) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!desc || !param) - { - WARN("Invalid argument specified.\n"); - return D3DERR_INVALIDCALL; - } - - desc->Name = param->name; - desc->Semantic = param->semantic; - desc->Class = param->class; - desc->Type = param->type; - desc->Rows = param->rows; - desc->Columns = param->columns; - desc->Elements = param->element_count; - desc->Annotations = is_top_level_parameter(param) - ? top_level_parameter_from_parameter(param)->annotation_count : 0; - desc->StructMembers = param->member_count; - desc->Flags = param->flags; - desc->Bytes = param->bytes; - - return D3D_OK; -} - static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_state *state, void **param_value, struct d3dx_parameter **out_param, BOOL update_all, BOOL *param_dirty) @@ -2335,10 +2308,30 @@ static HRESULT WINAPI d3dx_effect_GetParameterDesc(ID3DXEffect *iface, D3DXHANDL D3DXPARAMETER_DESC *desc) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, desc %p.\n", iface, parameter, desc); - return d3dx9_base_effect_get_parameter_desc(&effect->base_effect, parameter, desc); + if (!desc || !param) + { + WARN("Invalid argument specified.\n"); + return D3DERR_INVALIDCALL; + } + + desc->Name = param->name; + desc->Semantic = param->semantic; + desc->Class = param->class; + desc->Type = param->type; + desc->Rows = param->rows; + desc->Columns = param->columns; + desc->Elements = param->element_count; + desc->Annotations = is_top_level_parameter(param) + ? top_level_parameter_from_parameter(param)->annotation_count : 0; + desc->StructMembers = param->member_count; + desc->Flags = param->flags; + desc->Bytes = param->bytes; + + return D3D_OK; } static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDLE technique, -- 2.20.1

2 1

[PATCH v2 1/6] include: Correct IDL attributes for control.idl.
by Zebediah Figura 13 Mar '19

13 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/control.idl | 49 +++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/include/control.idl b/include/control.idl index 529d435f78..265444aad0 100644 --- a/include/control.idl +++ b/include/control.idl @@ -42,7 +42,8 @@ library QuartzTypeLib [ object, uuid(56a868b1-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) + oleautomation, + dual, ] interface IMediaControl : IDispatch { @@ -52,8 +53,8 @@ library QuartzTypeLib HRESULT GetState( [in] LONG msTimeout, [out] OAFilterState *pfs ); HRESULT RenderFile( [in] BSTR strFilename ); HRESULT AddSourceFilter( [in] BSTR strFilename, [out] IDispatch **ppUnk ); - [propget] HRESULT FilterCollection( [out] IDispatch **ppUnk ); - [propget] HRESULT RegFilterCollection( [out] IDispatch **ppUnk ); + [propget] HRESULT FilterCollection( [out, retval] IDispatch **ppUnk ); + [propget] HRESULT RegFilterCollection( [out, retval] IDispatch **ppUnk ); HRESULT StopWhenReady(); } @@ -64,7 +65,8 @@ library QuartzTypeLib [ object, uuid(56a868b3-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) + oleautomation, + dual, ] interface IBasicAudio : IDispatch { @@ -81,7 +83,8 @@ library QuartzTypeLib [ object, uuid(56a868b4-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) + oleautomation, + dual, ] interface IVideoWindow : IDispatch { @@ -133,7 +136,8 @@ library QuartzTypeLib [ object, uuid(56a868b5-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) + oleautomation, + dual, ] interface IBasicVideo : IDispatch { @@ -168,9 +172,9 @@ library QuartzTypeLib HRESULT GetVideoPaletteEntries( [in] LONG StartIndex, [in] LONG Entries, [out] LONG *pRetrieved, - [out, size_is(Entries), length_is(*pRetrieved)] LONG *pPalette ); + [out] LONG *pPalette ); HRESULT GetCurrentImage( [in, out] LONG *pBufferSize, - [out, size_is(*pBufferSize), length_is(*pBufferSize)] LONG *pDIBImage ); + [out] LONG *pDIBImage ); HRESULT IsUsingDefaultSource(); HRESULT IsUsingDefaultDestination(); } @@ -193,7 +197,8 @@ library QuartzTypeLib [ object, uuid(56a868b6-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) + oleautomation, + dual, ] interface IMediaEvent : IDispatch { @@ -212,7 +217,6 @@ library QuartzTypeLib [ object, uuid(56a868c0-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) ] interface IMediaEventEx : IMediaEvent { @@ -228,21 +232,22 @@ library QuartzTypeLib [ object, uuid(56a868b2-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) + oleautomation, + dual, ] interface IMediaPosition : IDispatch { - HRESULT get_Duration( [out] REFTIME *plength ); - HRESULT put_CurrentPosition( [in] REFTIME llTime ); - HRESULT get_CurrentPosition( [out] REFTIME *pllTime ); - HRESULT get_StopTime( [out] REFTIME *pllTime ); - HRESULT put_StopTime( [in] REFTIME llTime ); - HRESULT get_PrerollTime( [out] REFTIME *pllTime ); - HRESULT put_PrerollTime( [in] REFTIME llTime ); - HRESULT put_Rate( [in] double dRate ); - HRESULT get_Rate( [out] double *pdRate ); - HRESULT CanSeekForward( [out] LONG *pCanSeekForward ); - HRESULT CanSeekBackward( [out] LONG *pCanSeekBackward ); + [propget] HRESULT Duration( [out, retval] REFTIME *plength ); + [propput] HRESULT CurrentPosition( [in] REFTIME llTime ); + [propget] HRESULT CurrentPosition( [out, retval] REFTIME *pllTime ); + [propget] HRESULT StopTime( [out, retval] REFTIME *pllTime ); + [propput] HRESULT StopTime( [in] REFTIME llTime ); + [propget] HRESULT PrerollTime( [out, retval] REFTIME *pllTime ); + [propput] HRESULT PrerollTime( [in] REFTIME llTime ); + [propput] HRESULT Rate( [in] double dRate ); + [propget] HRESULT Rate( [out, retval] double *pdRate ); + HRESULT CanSeekForward( [out, retval] LONG *pCanSeekForward ); + HRESULT CanSeekBackward( [out, retval] LONG *pCanSeekBackward ); } } /* library QuartzTypeLib */ -- 2.20.1

2 9

[PATCH 2/4] dxgi/tests: Use void pointer for get_refcount() parameter.
by Józef Kucia 13 Mar '19

13 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 53 +++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 23d6a29c8ed3..91d218f3e8ef 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -106,10 +106,11 @@ static void run_queued_tests(void) heap_free(threads); } -static ULONG get_refcount(IUnknown *iface) +static ULONG get_refcount(void *iface) { - IUnknown_AddRef(iface); - return IUnknown_Release(iface); + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); } #define check_interface(a, b, c, d) check_interface_(__LINE__, a, b, c, d) @@ -1418,10 +1419,10 @@ static void test_create_swapchain(void) hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); - expected_refcount = get_refcount((IUnknown *)adapter); - refcount = get_refcount((IUnknown *)factory); + expected_refcount = get_refcount(adapter); + refcount = get_refcount(factory); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); - refcount = get_refcount((IUnknown *)device); + refcount = get_refcount(device); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); creation_desc.OutputWindow = NULL; @@ -1441,11 +1442,11 @@ static void test_create_swapchain(void) hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); - refcount = get_refcount((IUnknown *)adapter); + refcount = get_refcount(adapter); ok(refcount >= expected_refcount, "Got refcount %u, expected >= %u.\n", refcount, expected_refcount); - refcount = get_refcount((IUnknown *)factory); + refcount = get_refcount(factory); todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount); - refcount = get_refcount((IUnknown *)device); + refcount = get_refcount(device); ok(refcount == 3, "Got unexpected refcount %u.\n", refcount); hr = IDXGISwapChain_GetDesc(swapchain, NULL); @@ -1492,7 +1493,7 @@ static void test_create_swapchain(void) refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "Swapchain has %u references left.\n", refcount); - refcount = get_refcount((IUnknown *)factory); + refcount = get_refcount(factory); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); for (i = 0; i < ARRAY_SIZE(refresh_list); ++i) @@ -3210,23 +3211,23 @@ static void test_private_data(void) ok(!ptr, "Got unexpected pointer %p.\n", ptr); ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, (IUnknown *)test_object); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected_refcount = refcount + 1; - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, (IUnknown *)test_object); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected_refcount--; - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, @@ -3235,7 +3236,7 @@ static void test_private_data(void) size = sizeof(data); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, size, data); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, 42, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -3252,7 +3253,7 @@ static void test_private_data(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(size == sizeof(test_object), "Got unexpected size %u.\n", size); expected_refcount++; - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); if (ptr) IUnknown_Release(ptr); @@ -3267,7 +3268,7 @@ static void test_private_data(void) hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(size == sizeof(device), "Got unexpected size %u.\n", size); - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); size = 1; @@ -4263,13 +4264,13 @@ static void test_output_desc(void) hr = IDXGIFactory_EnumAdapters(factory, i, &adapter2); ok(SUCCEEDED(hr), "Failed to enumerate adapter %u, hr %#x.\n", i, hr); ok(adapter != adapter2, "Expected to get new instance of IDXGIAdapter, %p == %p.\n", adapter, adapter2); - refcount = get_refcount((IUnknown *)adapter); + refcount = get_refcount(adapter); ok(refcount == 1, "Get unexpected refcount %u for adapter %u.\n", refcount, i); IDXGIAdapter_Release(adapter2); - refcount = get_refcount((IUnknown *)factory); + refcount = get_refcount(factory); ok(refcount == 2, "Get unexpected refcount %u.\n", refcount); - refcount = get_refcount((IUnknown *)adapter); + refcount = get_refcount(adapter); ok(refcount == 1, "Get unexpected refcount %u for adapter %u.\n", refcount, i); for (j = 0; ; ++j) @@ -4285,15 +4286,15 @@ static void test_output_desc(void) hr = IDXGIAdapter_EnumOutputs(adapter, j, &output2); ok(SUCCEEDED(hr), "Failed to enumerate output %u on adapter %u, hr %#x.\n", j, i, hr); ok(output != output2, "Expected to get new instance of IDXGIOutput, %p == %p.\n", output, output2); - refcount = get_refcount((IUnknown *)output); + refcount = get_refcount(output); ok(refcount == 1, "Get unexpected refcount %u for output %u, adapter %u.\n", refcount, j, i); IDXGIOutput_Release(output2); - refcount = get_refcount((IUnknown *)factory); + refcount = get_refcount(factory); ok(refcount == 2, "Get unexpected refcount %u.\n", refcount); - refcount = get_refcount((IUnknown *)adapter); + refcount = get_refcount(adapter); ok(refcount == 2, "Get unexpected refcount %u for adapter %u.\n", refcount, i); - refcount = get_refcount((IUnknown *)output); + refcount = get_refcount(output); ok(refcount == 1, "Get unexpected refcount %u for output %u, adapter %u.\n", refcount, j, i); hr = IDXGIOutput_GetDesc(output, &desc); @@ -4310,12 +4311,12 @@ static void test_output_desc(void) wine_dbgstr_rect(&monitor_info.rcMonitor)); IDXGIOutput_Release(output); - refcount = get_refcount((IUnknown *)adapter); + refcount = get_refcount(adapter); ok(refcount == 1, "Get unexpected refcount %u for adapter %u.\n", refcount, i); } IDXGIAdapter_Release(adapter); - refcount = get_refcount((IUnknown *)factory); + refcount = get_refcount(factory); ok(refcount == 1, "Get unexpected refcount %u.\n", refcount); } -- 2.19.2

3 2

[PATCH resend 1/6] user32/focus: Prevent a recursive loop with the activation messages
by Gabriel Ivăncescu 13 Mar '19

13 Mar '19

When activating a window and sending activation messages to the window procedure, we have to avoid a recursive loop by not sending more of these messages or hooks while we are still activating the window. Some applications actually depend on this behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46274 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- It may seem a bit strange, but this is exactly what's needed to match the testcase in the next patch, so this is how Windows does it (including the hooks). dlls/user32/focus.c | 44 +++++++++++++++++++++++++++++--------------- dlls/user32/win.h | 1 + 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index f1c8831..0d32d00 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -78,7 +78,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) { HWND previous = GetActiveWindow(); BOOL ret; - DWORD old_thread, new_thread; + DWORD winflags, old_thread, new_thread; CBTACTIVATESTRUCT cbt; if (previous == hwnd) @@ -87,16 +87,24 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) return TRUE; } - /* call CBT hook chain */ - cbt.fMouse = mouse; - cbt.hWndActive = previous; - if (HOOK_CallHooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt, TRUE )) return FALSE; - - if (IsWindow(previous)) + /* Prevent a recursive activation loop with the activation messages */ + winflags = win_set_flags(hwnd, WIN_IS_IN_ACTIVATION, 0); + if (!(winflags & WIN_IS_IN_ACTIVATION)) { - SendMessageW( previous, WM_NCACTIVATE, FALSE, (LPARAM)hwnd ); - SendMessageW( previous, WM_ACTIVATE, - MAKEWPARAM( WA_INACTIVE, IsIconic(previous) ), (LPARAM)hwnd ); + ret = FALSE; + + /* call CBT hook chain */ + cbt.fMouse = mouse; + cbt.hWndActive = previous; + if (HOOK_CallHooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt, TRUE )) + goto clear_flags; + + if (IsWindow(previous)) + { + SendMessageW( previous, WM_NCACTIVATE, FALSE, (LPARAM)hwnd ); + SendMessageW( previous, WM_ACTIVATE, + MAKEWPARAM( WA_INACTIVE, IsIconic(previous) ), (LPARAM)hwnd ); + } } SERVER_START_REQ( set_active_window ) @@ -106,9 +114,9 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) previous = wine_server_ptr_handle( reply->previous ); } SERVER_END_REQ; - if (!ret) return FALSE; + if (!ret) goto clear_flags; if (prev) *prev = previous; - if (previous == hwnd) return TRUE; + if (previous == hwnd) goto clear_flags; if (hwnd) { @@ -116,7 +124,11 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) if (SendMessageW( hwnd, WM_QUERYNEWPALETTE, 0, 0 )) SendMessageTimeoutW( HWND_BROADCAST, WM_PALETTEISCHANGING, (WPARAM)hwnd, 0, SMTO_ABORTIFHUNG, 2000, NULL ); - if (!IsWindow(hwnd)) return FALSE; + if (!IsWindow(hwnd)) + { + ret = FALSE; + goto clear_flags; + } } old_thread = previous ? GetWindowThreadProcessId( previous, NULL ) : 0; @@ -148,7 +160,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) } } - if (IsWindow(hwnd)) + if (!(winflags & WIN_IS_IN_ACTIVATION) && IsWindow(hwnd)) { SendMessageW( hwnd, WM_NCACTIVATE, (hwnd == GetForegroundWindow()), (LPARAM)previous ); SendMessageW( hwnd, WM_ACTIVATE, @@ -173,7 +185,9 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) } } - return TRUE; +clear_flags: + win_set_flags(hwnd, 0, WIN_IS_IN_ACTIVATION); + return ret; } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 81b08fc..d53e1a5 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -79,6 +79,7 @@ typedef struct tagWND #define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0020 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */ #define WIN_CHILDREN_MOVED 0x0040 /* children may have moved, ignore stored positions */ #define WIN_HAS_IME_WIN 0x0080 /* the window has been registered with imm32 */ +#define WIN_IS_IN_ACTIVATION 0x0100 /* the window is in an activation process */ /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; -- 2.20.1

2 11

[PATCH 9/9] msidb: Add support for wildcard (full database) export.
by Erich E. Hoover 13 Mar '19

13 Mar '19

msidb allows a full database export with the special "*" database name. Note: It does not support true wildcards, just this special indication that you wish to export all the tables in the database.

1 0

[PATCH 8/9] msidb: Add support for exporting with short (DOS) filenames.
by Erich E. Hoover 13 Mar '19

13 Mar '19

msidb's "-s" flag modifies the database export to use short (DOS) filenames instead of full table names. This flag is convenient because it uses the same filenames that the import (-i) option expects. For example, the InstallExecuteSequence table gets imported (or exported with this flag) as InstallE.idt where the normal export option uses InstallExecuteSequence.idt.

1 0

[PATCH 7/9] msidb: Add support for exporting database tables.
by Erich E. Hoover 13 Mar '19

13 Mar '19

msidb allows developers to export tables from a database with the "-e" mode flag followed by a list of tables. For example, this call would export three tables to the current directory: msidb -d package.msi -f . -e ActionText Component InstallExecuteSequence

1 0

[PATCH 6/9] msidb: Add support for extracting stream/cabinet files from MSI databases.
by Erich E. Hoover 13 Mar '19

13 Mar '19

msidb allows developers to extract "streams" (cabinet files) from a database with the "-x" mode flag followed by the filename for the stream in the database, example: msidb -d package.msi -x cabinet.cab

1 0

[PATCH 5/9] msidb: Add support for removing stream/cabinet files from MSI databases.
by Erich E. Hoover 13 Mar '19

13 Mar '19

msidb allows developers to remove "streams" (cabinet files) from a database with the "-k" mode flag followed by the filename for the stream in the database, example: msidb -d package.msi -k cabinet.cab

1 0

[PATCH 4/9] msi: Add support for exporting binary streams (Binary/Icon tables).
by Erich E. Hoover 13 Mar '19

13 Mar '19

The Binary and Icon tables store their data in a different format from other tables, one column of the data is stored as a "stream" instead of a normal text field. With this patch those tables can now be exported properly by the MSI export functionality.

1 0

[PATCH 3/9] msi: Break out field exporting into a separate routine.
by Erich E. Hoover 13 Mar '19

13 Mar '19

msi_export_record is a lot more complicated than necessary, this patch splits out the field export part of that functionality as msi_export_field. This also needs to be separate for exporting binary stream data (next patch).

1 0

[PATCH 2/9] msi: Add support for exporting the _SummaryInformation table.
by Erich E. Hoover 13 Mar '19

13 Mar '19

The _SummaryInformation table stores a lot of important information about an MSI database. This patch adds the ability to export that table since, like _ForceCodepage, it is stored in a different format than the other tables.

1 0

[PATCH v2 1/9] msi: Add support for deleting streams from an MSI database.
by Erich E. Hoover 13 Mar '19

13 Mar '19

msidb allows developers to remove "streams" (cabinet files) from a database with the "-k" mode flag. To support that feature we need MSIMODIFY_DELETE support in the underlying MSI implementation. Per Hans' request, this version has been updated with additional error checking, unconditionally releasing the stream (see tests), and added tests for the strange behavior that occurs when deleting in-use streams. The series has also been reordered to include all changes to msi first and msidb support for them afterwards. Best, Erich

1 0

[test PATCH] user32/tests: Use EM_SETMARGINS to test EC_USEFONTINFO margins.
by Akihiro Sagawa 13 Mar '19

13 Mar '19

Please ignore this patch. Since I cannot specify debian9 Chinese locale environment through the test bot submission page, I post here instead. This patch aims to figure out ongoing issues on the environment. Akihiro Sagawa

2 1

[PATCH 1/4] ddraw: Protect against invalid clipper pointers (v2).
by Stefan Dösinger 13 Mar '19

13 Mar '19

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- v2: Drop the magic and move bad clipper detection into a separate function instead of impl_from_IDirectDrawClipper. I also dropped patch 4 (see 159887) from this resubmission because with moving the bad clipper detection to a separate function there is still a difference between impl_from_... and unsafe_impl_from_... . --- dlls/ddraw/clipper.c | 67 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index 01cac40ec6e..e4b7ec2bd50 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -26,17 +26,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); +static const struct IDirectDrawClipperVtbl ddraw_clipper_vtbl; + static inline struct ddraw_clipper *impl_from_IDirectDrawClipper(IDirectDrawClipper *iface) { return CONTAINING_RECORD(iface, struct ddraw_clipper, IDirectDrawClipper_iface); } +static BOOL ddraw_clipper_is_valid(const struct ddraw_clipper *clipper) +{ + /* Native is very lenient when you invoke the clipper methods with a clipper pointer that + * points to something that is either not accessible or not a clipper, or if you break + * a clipper after assigning it to a surface. Deus Ex: Goty depends on this. */ + + if (IsBadReadPtr(clipper, sizeof(*clipper))) + { + WARN("The application gave us an invalid clipper pointer %p.\n", clipper); + return FALSE; + } + if (clipper->IDirectDrawClipper_iface.lpVtbl != &ddraw_clipper_vtbl) + { + WARN("The clipper vtable is modified: %p, expected %p.\n", + clipper->IDirectDrawClipper_iface.lpVtbl, &ddraw_clipper_vtbl); + return FALSE; + } + + return TRUE; +} + static HRESULT WINAPI ddraw_clipper_QueryInterface(IDirectDrawClipper *iface, REFIID iid, void **object) { struct ddraw_clipper *clipper = impl_from_IDirectDrawClipper(iface); TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); + if (!ddraw_clipper_is_valid(clipper)) + return DDERR_INVALIDPARAMS; + if (IsEqualGUID(&IID_IDirectDrawClipper, iid) || IsEqualGUID(&IID_IUnknown, iid)) { @@ -54,17 +80,31 @@ static HRESULT WINAPI ddraw_clipper_QueryInterface(IDirectDrawClipper *iface, RE static ULONG WINAPI ddraw_clipper_AddRef(IDirectDrawClipper *iface) { struct ddraw_clipper *clipper = impl_from_IDirectDrawClipper(iface); - ULONG refcount = InterlockedIncrement(&clipper->ref); + ULONG refcount; - TRACE("%p increasing refcount to %u.\n", clipper, refcount); + if (!ddraw_clipper_is_valid(clipper)) + { + WARN("Invalid clipper, returning 0.\n"); + return 0; + } + refcount = InterlockedIncrement(&clipper->ref); + TRACE("%p increasing refcount to %u.\n", clipper, refcount); return refcount; } static ULONG WINAPI ddraw_clipper_Release(IDirectDrawClipper *iface) { struct ddraw_clipper *clipper = impl_from_IDirectDrawClipper(iface); - ULONG refcount = InterlockedDecrement(&clipper->ref); + ULONG refcount; + + if (!ddraw_clipper_is_valid(clipper)) + { + WARN("Invalid clipper, returning 0.\n"); + return 0; + } + + refcount = InterlockedDecrement(&clipper->ref); TRACE("%p decreasing refcount to %u.\n", clipper, refcount); @@ -72,6 +112,7 @@ static ULONG WINAPI ddraw_clipper_Release(IDirectDrawClipper *iface) { if (clipper->region) DeleteObject(clipper->region); + clipper->IDirectDrawClipper_iface.lpVtbl = NULL; /* Should help with detecting freed clippers. */ heap_free(clipper); } @@ -84,6 +125,9 @@ static HRESULT WINAPI ddraw_clipper_SetHWnd(IDirectDrawClipper *iface, DWORD fla TRACE("iface %p, flags %#x, window %p.\n", iface, flags, window); + if (!ddraw_clipper_is_valid(clipper)) + return DDERR_INVALIDPARAMS; + if (flags) { FIXME("flags %#x, not supported.\n", flags); @@ -161,6 +205,9 @@ static HRESULT WINAPI ddraw_clipper_GetClipList(IDirectDrawClipper *iface, RECT TRACE("iface %p, rect %s, clip_list %p, clip_list_size %p.\n", iface, wine_dbgstr_rect(rect), clip_list, clip_list_size); + if (!ddraw_clipper_is_valid(clipper)) + return DDERR_INVALIDPARAMS; + wined3d_mutex_lock(); if (clipper->window) @@ -238,6 +285,9 @@ static HRESULT WINAPI ddraw_clipper_SetClipList(IDirectDrawClipper *iface, RGNDA TRACE("iface %p, region %p, flags %#x.\n", iface, region, flags); + if (!ddraw_clipper_is_valid(clipper)) + return DDERR_INVALIDPARAMS; + wined3d_mutex_lock(); if (clipper->window) @@ -268,6 +318,9 @@ static HRESULT WINAPI ddraw_clipper_GetHWnd(IDirectDrawClipper *iface, HWND *win TRACE("iface %p, window %p.\n", iface, window); + if (!ddraw_clipper_is_valid(clipper)) + return DDERR_INVALIDPARAMS; + wined3d_mutex_lock(); *window = clipper->window; wined3d_mutex_unlock(); @@ -282,6 +335,9 @@ static HRESULT WINAPI ddraw_clipper_Initialize(IDirectDrawClipper *iface, TRACE("iface %p, ddraw %p, flags %#x.\n", iface, ddraw, flags); + if (!ddraw_clipper_is_valid(clipper)) + return DDERR_INVALIDPARAMS; + wined3d_mutex_lock(); if (clipper->initialized) { @@ -297,8 +353,13 @@ static HRESULT WINAPI ddraw_clipper_Initialize(IDirectDrawClipper *iface, static HRESULT WINAPI ddraw_clipper_IsClipListChanged(IDirectDrawClipper *iface, BOOL *changed) { + struct ddraw_clipper *clipper = impl_from_IDirectDrawClipper(iface); + FIXME("iface %p, changed %p stub!\n", iface, changed); + if (!ddraw_clipper_is_valid(clipper)) + return DDERR_INVALIDPARAMS; + /* XXX What is safest? */ *changed = FALSE; -- 2.19.2

4 9

[PATCH v2] d3d10: Implement ID3D10EffectScalarVariable::{Get, Set}{Int, Float, Bool}
by Nick Renieris 13 Mar '19

13 Mar '19

Signed-off-by: Nick Renieris <velocityra(a)gmail.com> --- dlls/d3d10/d3d10_private.h | 11 +++++++ dlls/d3d10/effect.c | 71 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 70 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index e785b8b..4f51bf7 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -100,6 +100,16 @@ struct d3d10_effect_shader_variable } shader; }; +struct d3d10_effect_scalar_variable +{ + union + { + int i; + float f; + BOOL b; + }; +}; + struct d3d10_effect_state_object_variable { union @@ -173,6 +183,7 @@ struct d3d10_effect_variable { struct d3d10_effect_state_object_variable state; struct d3d10_effect_shader_variable shader; + struct d3d10_effect_scalar_variable scalar; } u; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index cd6f4a3..81b0a8a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -4125,17 +4125,33 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetRawValue(ID3D10 static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetFloat(ID3D10EffectScalarVariable *iface, float value) { - FIXME("iface %p, value %.8e stub!\n", iface, value); + struct d3d10_effect_variable *This; - return E_NOTIMPL; + TRACE("iface %p, value %.8e\n", iface, value); + + if (!iface) + return D3DERR_INVALIDCALL; + + This = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + This->u.scalar.f = value; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetFloat(ID3D10EffectScalarVariable *iface, float *value) { - FIXME("iface %p, value %p stub!\n", iface, value); + struct d3d10_effect_variable *This; - return E_NOTIMPL; + TRACE("iface %p, value %p\n", iface, value); + + if (!iface || !value) + return D3DERR_INVALIDCALL; + + This = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + *value = This->u.scalar.f; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetFloatArray(ID3D10EffectScalarVariable *iface, @@ -4157,17 +4173,32 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetFloatArray(ID3D static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetInt(ID3D10EffectScalarVariable *iface, int value) { - FIXME("iface %p, value %d stub!\n", iface, value); + struct d3d10_effect_variable *This; - return E_NOTIMPL; + TRACE("iface %p, value %d\n", iface, value); + + if (!iface) + return D3DERR_INVALIDCALL; + + This = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + This->u.scalar.i = value; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetInt(ID3D10EffectScalarVariable *iface, int *value) { - FIXME("iface %p, value %p stub!\n", iface, value); + struct d3d10_effect_variable *This; - return E_NOTIMPL; + TRACE("iface %p, value %p\n", iface, value); + if (!iface || !value) + return D3DERR_INVALIDCALL; + + This = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + *value = This->u.scalar.i; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetIntArray(ID3D10EffectScalarVariable *iface, @@ -4189,17 +4220,33 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetIntArray(ID3D10 static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetBool(ID3D10EffectScalarVariable *iface, BOOL value) { - FIXME("iface %p, value %d stub!\n", iface, value); + struct d3d10_effect_variable *This; - return E_NOTIMPL; + TRACE("iface %p, value %d\n", iface, value); + + if (!iface) + return D3DERR_INVALIDCALL; + + This = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + This->u.scalar.b = value; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetBool(ID3D10EffectScalarVariable *iface, BOOL *value) { - FIXME("iface %p, value %p stub!\n", iface, value); + struct d3d10_effect_variable *This; - return E_NOTIMPL; + TRACE("iface %p, value %p\n", iface, value); + + if (!iface || !value) + return D3DERR_INVALIDCALL; + + This = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + *value = This->u.scalar.b; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetBoolArray(ID3D10EffectScalarVariable *iface, -- 2.7.4

3 6

[PATCH 1/2] ddraw: Clear *clipper on failure in ddraw_surface7_GetClipper().
by Henri Verbeet 13 Mar '19

13 Mar '19

From: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 160692. dlls/ddraw/surface.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2b788bd8d13..b8cc2d2195d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4408,39 +4408,25 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_BltFast(IDirectDrawSurfac src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags); } -/***************************************************************************** - * IDirectDrawSurface7::GetClipper - * - * Returns the IDirectDrawClipper interface of the clipper assigned to this - * surface - * - * Params: - * Clipper: Address to store the interface pointer at - * - * Returns: - * DD_OK on success - * DDERR_INVALIDPARAMS if Clipper is NULL - * DDERR_NOCLIPPERATTACHED if there's no clipper attached - * - *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_GetClipper(IDirectDrawSurface7 *iface, IDirectDrawClipper **Clipper) +static HRESULT WINAPI ddraw_surface7_GetClipper(IDirectDrawSurface7 *iface, IDirectDrawClipper **clipper) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - TRACE("iface %p, clipper %p.\n", iface, Clipper); + TRACE("iface %p, clipper %p.\n", iface, clipper); - if (!Clipper) + if (!clipper) return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); if (!surface->clipper) { wined3d_mutex_unlock(); + *clipper = NULL; return DDERR_NOCLIPPERATTACHED; } - *Clipper = &surface->clipper->IDirectDrawClipper_iface; - IDirectDrawClipper_AddRef(*Clipper); + *clipper = &surface->clipper->IDirectDrawClipper_iface; + IDirectDrawClipper_AddRef(*clipper); wined3d_mutex_unlock(); return DD_OK; -- 2.11.0

2 1

[PATCH 4/4] dxgi: Do not forward d3d11_swapchain_Present() to d3d11_swapchain_Present1().
by Józef Kucia 13 Mar '19

13 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 47f71961768a..704b03c8a6ea 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -295,13 +295,33 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDevice(IDXGISwapChain1 *ifac /* IDXGISwapChain1 methods */ +static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, + unsigned int sync_interval, unsigned int flags) +{ + if (sync_interval > 4) + { + WARN("Invalid sync interval %u.\n", sync_interval); + return DXGI_ERROR_INVALID_CALL; + } + + if (flags & ~DXGI_PRESENT_TEST) + FIXME("Unimplemented flags %#x.\n", flags); + if (flags & DXGI_PRESENT_TEST) + { + WARN("Returning S_OK for DXGI_PRESENT_TEST.\n"); + return S_OK; + } + + return wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); +} + static HRESULT STDMETHODCALLTYPE d3d11_swapchain_Present(IDXGISwapChain1 *iface, UINT sync_interval, UINT flags) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); TRACE("iface %p, sync_interval %u, flags %#x.\n", iface, sync_interval, flags); - return IDXGISwapChain1_Present1(&swapchain->IDXGISwapChain1_iface, sync_interval, flags, NULL); + return d3d11_swapchain_present(swapchain, sync_interval, flags); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetBuffer(IDXGISwapChain1 *iface, @@ -650,24 +670,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_Present1(IDXGISwapChain1 *iface TRACE("iface %p, sync_interval %u, flags %#x, present_parameters %p.\n", iface, sync_interval, flags, present_parameters); - if (sync_interval > 4) - { - WARN("Invalid sync interval %u.\n", sync_interval); - return DXGI_ERROR_INVALID_CALL; - } - - if (flags & ~DXGI_PRESENT_TEST) - FIXME("Unimplemented flags %#x.\n", flags); - if (flags & DXGI_PRESENT_TEST) - { - WARN("Returning S_OK for DXGI_PRESENT_TEST.\n"); - return S_OK; - } - if (present_parameters) FIXME("Ignored present parameters %p.\n", present_parameters); - return wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); + return d3d11_swapchain_present(swapchain, sync_interval, flags); } static BOOL STDMETHODCALLTYPE d3d11_swapchain_IsTemporaryMonoSupported(IDXGISwapChain1 *iface) -- 2.19.2

3 2

[PATCH 3/4] d3d12: Do not pass VkPhysicalDevice to vkd3d if we failed to find matching device.
by Józef Kucia 13 Mar '19

13 Mar '19

Vkd3d has got a better heuristic for selecting the device. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/d3d12_main.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 9eef3ad92ddf..2c6472acb06d 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -267,10 +267,7 @@ static VkPhysicalDevice d3d12_get_vk_physical_device(struct vkd3d_instance *inst } if (!vk_physical_device) - { FIXME("Could not find Vulkan physical device for DXGI adapter.\n"); - vk_physical_device = vk_physical_devices[0]; - } done: heap_free(vk_physical_devices); @@ -284,7 +281,6 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe struct vkd3d_instance_create_info instance_create_info; struct vkd3d_device_create_info device_create_info; struct wine_dxgi_adapter_info adapter_info; - VkPhysicalDevice vk_physical_device; const struct vulkan_funcs *vk_funcs; struct vkd3d_instance *instance; IWineDXGIAdapter *wine_adapter; @@ -344,15 +340,12 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe goto done; } - if (!(vk_physical_device = d3d12_get_vk_physical_device(instance, vk_funcs, &adapter_info))) - goto done_instance; - device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; device_create_info.next = NULL; device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance = instance; device_create_info.instance_create_info = NULL; - device_create_info.vk_physical_device = vk_physical_device; + device_create_info.vk_physical_device = d3d12_get_vk_physical_device(instance, vk_funcs, &adapter_info); device_create_info.device_extensions = device_extensions; device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); device_create_info.parent = (IUnknown *)wine_adapter; @@ -360,7 +353,6 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe hr = vkd3d_create_device(&device_create_info, iid, device); -done_instance: vkd3d_instance_decref(instance); done: -- 2.19.2

3 2

[PATCH 1/4] wined3d: Store BGRA vertex capabilities in struct wined3d_d3d_info.
by Józef Kucia 13 Mar '19

13 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/context.c | 8 +++----- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 5bcb39f59c14..686f4f06cbb7 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3741,6 +3741,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, || gl_info->supported[ARB_TEXTURE_RECTANGLE]; d3d_info->draw_base_vertex_offset = !!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]; + d3d_info->vertex_bgra = !!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 267238dafa42..6d270a7eb693 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3516,8 +3516,7 @@ static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) /* Context activation is done by the caller. */ void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_info, - const struct wined3d_state *state, const struct wined3d_gl_info *gl_info, - const struct wined3d_d3d_info *d3d_info) + const struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) { /* We need to deal with frequency data! */ struct wined3d_vertex_declaration *declaration = state->vertex_declaration; @@ -3613,8 +3612,7 @@ void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_inf stream_info->elements[idx].divisor = 0; } - if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] - && element->format->id == WINED3DFMT_B8G8R8A8_UNORM) + if (!d3d_info->vertex_bgra && element->format->id == WINED3DFMT_B8G8R8A8_UNORM) { stream_info->swizzle_map |= 1u << idx; } @@ -3633,7 +3631,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st unsigned int i; WORD map; - wined3d_stream_info_from_declaration(stream_info, state, gl_info, d3d_info); + wined3d_stream_info_from_declaration(stream_info, state, d3d_info); stream_info->all_vbo = 1; context->buffer_fence_count = 0; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 79a5b68c6f77..1328543186ad 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3422,7 +3422,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, vs = state->shader[WINED3D_SHADER_TYPE_VERTEX]; state->shader[WINED3D_SHADER_TYPE_VERTEX] = NULL; - wined3d_stream_info_from_declaration(&stream_info, state, &device->adapter->gl_info, &device->adapter->d3d_info); + wined3d_stream_info_from_declaration(&stream_info, state, &device->adapter->d3d_info); state->shader[WINED3D_SHADER_TYPE_VERTEX] = vs; /* We can't convert FROM a VBO, and vertex buffers used to source into diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d0edb8c8bd86..e70010e74c94 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -206,6 +206,7 @@ struct wined3d_d3d_info unsigned int texture_npot : 1; unsigned int texture_npot_conditional : 1; unsigned int draw_base_vertex_offset : 1; + unsigned int vertex_bgra : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location; @@ -1511,8 +1512,7 @@ struct wined3d_stream_info }; void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_info, - const struct wined3d_state *state, const struct wined3d_gl_info *gl_info, - const struct wined3d_d3d_info *d3d_info) DECLSPEC_HIDDEN; + const struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) DECLSPEC_HIDDEN; struct wined3d_direct_dispatch_parameters { -- 2.19.2

2 1

[PATCH v2 1/7] d3d8/tests: Add a test for CheckDeviceFormat() with an unsupported adapter format.
by Matteo Bruni 13 Mar '19

13 Mar '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Get rid of broken(), it can return D3DERR_NOTAVAILABLE with the gdi renderer too. (Henri) dlls/d3d8/tests/device.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 51dd3aef579..d5989b8b09a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8148,6 +8148,13 @@ static void test_check_device_format(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, device type %#x.\n", hr, device_type); } + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, + 0, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8); + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_VERTEXBUFFER, D3DFMT_VERTEXDATA); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); -- 2.19.2

4 20

[PATCH 5/5] mshtml: Correctly handle documents with no window associated in IHTMLDocument2::get_location.
by Jacek Caban 13 Mar '19

13 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 6 +++--- dlls/mshtml/tests/dom.c | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-)

1 0

[PATCH 4/5] mshtml: Add IHTMLDOMImplementation2::createHTMLDocument implementation.
by Jacek Caban 13 Mar '19

13 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 26 ++++++++------- dlls/mshtml/htmlwindow.c | 6 +++- dlls/mshtml/mshtml_private.h | 6 ++-- dlls/mshtml/nsiface.idl | 16 +++++++++- dlls/mshtml/omnavigator.c | 62 +++++++++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 19 +++++++++++ 6 files changed, 116 insertions(+), 19 deletions(-)

1 0

[PATCH 3/5] mshtml: Bind events directly to document node for documents with no window associated.
by Jacek Caban 13 Mar '19

13 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsevents.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-)

1 0

[PATCH 2/5] mshtml: Use detach_document_node in detach_gecko_browser.
by Jacek Caban 13 Mar '19

13 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsembed.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[PATCH 1/5] mshtml: Don't Use HTMLDocument type in HTMLDOMNode_unlink.
by Jacek Caban 13 Mar '19

13 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlnode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH] ucrtbase: Add more _o forwards.
by Józef Kucia 13 Mar '19

13 Mar '19

For dxc.exe. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- .../api-ms-win-crt-private-l1-1-0.spec | 32 +++++++++---------- dlls/ucrtbase/ucrtbase.spec | 32 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 77be3a55151f..99df11e5c56b 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -94,7 +94,7 @@ @ stub _o____lc_collate_cp_func @ stub _o____lc_locale_name_func @ stub _o____mb_cur_max_func -@ stub _o___acrt_iob_func +@ cdecl _o___acrt_iob_func(long) ucrtbase._o___acrt_iob_func @ stub _o___conio_common_vcprintf @ stub _o___conio_common_vcprintf_p @ stub _o___conio_common_vcprintf_s @@ -143,10 +143,10 @@ @ stub _o___pctype_func @ stub _o___pwctype_func @ stub _o___std_exception_copy -@ stub _o___std_exception_destroy +@ cdecl _o___std_exception_destroy(ptr) ucrtbase._o___std_exception_destroy @ cdecl _o___std_type_info_destroy_list(ptr) ucrtbase._o___std_type_info_destroy_list @ stub _o___std_type_info_name -@ stub _o___stdio_common_vfprintf +@ cdecl _o___stdio_common_vfprintf(int64 ptr str ptr ptr) ucrtbase._o___stdio_common_vfprintf @ stub _o___stdio_common_vfprintf_p @ stub _o___stdio_common_vfprintf_s @ stub _o___stdio_common_vfscanf @@ -154,11 +154,11 @@ @ stub _o___stdio_common_vfwprintf_p @ stub _o___stdio_common_vfwprintf_s @ stub _o___stdio_common_vfwscanf -@ stub _o___stdio_common_vsnprintf_s +@ cdecl _o___stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase._o___stdio_common_vsnprintf_s @ stub _o___stdio_common_vsnwprintf_s @ stub _o___stdio_common_vsprintf @ stub _o___stdio_common_vsprintf_p -@ stub _o___stdio_common_vsprintf_s +@ cdecl _o___stdio_common_vsprintf_s(int64 ptr long str ptr ptr) ucrtbase._o___stdio_common_vsprintf_s @ stub _o___stdio_common_vsscanf @ stub _o___stdio_common_vswprintf @ stub _o___stdio_common_vswprintf_p @@ -240,7 +240,7 @@ @ stub _o__endthread @ stub _o__endthreadex @ stub _o__eof -@ stub _o__errno +@ cdecl _o__errno() ucrtbase._o__errno @ stub _o__except1 @ cdecl _o__execute_onexit_table(ptr) ucrtbase._o__execute_onexit_table @ stub _o__execv @@ -281,7 +281,7 @@ @ stub _o__findnext64 @ stub _o__findnext64i32 @ stub _o__flushall -@ stub _o__fpclass +@ cdecl _o__fpclass(double) ucrtbase._o__fpclass @ stub _o__fpclassf @ stub _o__fputc_nolock @ stub _o__fputchar @@ -985,15 +985,15 @@ @ stub _o_getwchar @ stub _o_hypot @ stub _o_is_wctype -@ stub _o_isalnum -@ stub _o_isalpha +@ cdecl _o_isalnum(long) ucrtbase._o_isalnum +@ cdecl _o_isalpha(long) ucrtbase._o_isalpha @ stub _o_isblank @ stub _o_iscntrl -@ stub _o_isdigit +@ cdecl _o_isdigit(long) ucrtbase._o_isdigit @ stub _o_isgraph @ stub _o_isleadbyte @ stub _o_islower -@ stub _o_isprint +@ cdecl _o_isprint(long) ucrtbase._o_isprint @ stub _o_ispunct @ stub _o_isspace @ stub _o_isupper @@ -1075,12 +1075,12 @@ @ stub _o_puts @ stub _o_putwc @ stub _o_putwchar -@ stub _o_qsort +@ cdecl _o_qsort(ptr long long ptr) ucrtbase._o_qsort @ stub _o_qsort_s @ stub _o_raise @ stub _o_rand @ stub _o_rand_s -@ stub _o_realloc +@ cdecl _o_realloc(ptr long) ucrtbase._o_realloc @ stub _o_remainder @ stub _o_remainderf @ stub _o_remainderl @@ -1113,7 +1113,7 @@ @ stub _o_sqrt @ stub _o_sqrtf @ stub _o_srand -@ stub _o_strcat_s +@ cdecl _o_strcat_s(str long str) ucrtbase._o_strcat_s @ stub _o_strcoll @ stub _o_strcpy_s @ stub _o_strerror @@ -1128,7 +1128,7 @@ @ stub _o_strtol @ stub _o_strtold @ stub _o_strtoll -@ stub _o_strtoul +@ cdecl _o_strtoul(str ptr long) ucrtbase._o_strtoul @ stub _o_strtoull @ stub _o_system @ stub _o_tan @@ -1141,7 +1141,7 @@ @ stub _o_tgammal @ stub _o_tmpfile_s @ stub _o_tmpnam_s -@ stub _o_tolower +@ cdecl _o_tolower(long) ucrtbase._o_tolower @ cdecl _o_toupper(long) ucrtbase._o_toupper @ stub _o_towlower @ stub _o_towupper diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2d1d8da35626..cd189d9f9827 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -758,7 +758,7 @@ @ stub _o____lc_collate_cp_func @ stub _o____lc_locale_name_func @ stub _o____mb_cur_max_func -@ stub _o___acrt_iob_func +@ cdecl _o___acrt_iob_func(long) MSVCRT___acrt_iob_func @ stub _o___conio_common_vcprintf @ stub _o___conio_common_vcprintf_p @ stub _o___conio_common_vcprintf_s @@ -807,10 +807,10 @@ @ stub _o___pctype_func @ stub _o___pwctype_func @ stub _o___std_exception_copy -@ stub _o___std_exception_destroy +@ cdecl _o___std_exception_destroy(ptr) MSVCRT___std_exception_destroy @ cdecl _o___std_type_info_destroy_list(ptr) MSVCRT_type_info_destroy_list @ stub _o___std_type_info_name -@ stub _o___stdio_common_vfprintf +@ cdecl _o___stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf @ stub _o___stdio_common_vfprintf_p @ stub _o___stdio_common_vfprintf_s @ stub _o___stdio_common_vfscanf @@ -818,11 +818,11 @@ @ stub _o___stdio_common_vfwprintf_p @ stub _o___stdio_common_vfwprintf_s @ stub _o___stdio_common_vfwscanf -@ stub _o___stdio_common_vsnprintf_s +@ cdecl _o___stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s @ stub _o___stdio_common_vsnwprintf_s @ stub _o___stdio_common_vsprintf @ stub _o___stdio_common_vsprintf_p -@ stub _o___stdio_common_vsprintf_s +@ cdecl _o___stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s @ stub _o___stdio_common_vsscanf @ stub _o___stdio_common_vswprintf @ stub _o___stdio_common_vswprintf_p @@ -904,7 +904,7 @@ @ stub _o__endthread @ stub _o__endthreadex @ stub _o__eof -@ stub _o__errno +@ cdecl _o__errno() MSVCRT__errno @ stub _o__except1 @ cdecl _o__execute_onexit_table(ptr) MSVCRT__execute_onexit_table @ stub _o__execv @@ -945,7 +945,7 @@ @ stub _o__findnext64 @ stub _o__findnext64i32 @ stub _o__flushall -@ stub _o__fpclass +@ cdecl _o__fpclass(double) MSVCRT__fpclass @ stub _o__fpclassf @ stub _o__fputc_nolock @ stub _o__fputchar @@ -1649,15 +1649,15 @@ @ stub _o_getwchar @ stub _o_hypot @ stub _o_is_wctype -@ stub _o_isalnum -@ stub _o_isalpha +@ cdecl _o_isalnum(long) MSVCRT_isalnum +@ cdecl _o_isalpha(long) MSVCRT_isalpha @ stub _o_isblank @ stub _o_iscntrl -@ stub _o_isdigit +@ cdecl _o_isdigit(long) MSVCRT_isdigit @ stub _o_isgraph @ stub _o_isleadbyte @ stub _o_islower -@ stub _o_isprint +@ cdecl _o_isprint(long) MSVCRT_isprint @ stub _o_ispunct @ stub _o_isspace @ stub _o_isupper @@ -1740,12 +1740,12 @@ @ stub _o_puts @ stub _o_putwc @ stub _o_putwchar -@ stub _o_qsort +@ cdecl _o_qsort(ptr long long ptr) MSVCRT_qsort @ stub _o_qsort_s @ stub _o_raise @ stub _o_rand @ stub _o_rand_s -@ stub _o_realloc +@ cdecl _o_realloc(ptr long) MSVCRT_realloc @ stub _o_remainder @ stub _o_remainderf @ stub _o_remainderl @@ -1778,7 +1778,7 @@ @ stub _o_sqrt @ stub _o_sqrtf @ stub _o_srand -@ stub _o_strcat_s +@ cdecl _o_strcat_s(str long str) MSVCRT_strcat_s @ stub _o_strcoll @ stub _o_strcpy_s @ stub _o_strerror @@ -1793,7 +1793,7 @@ @ stub _o_strtol @ stub _o_strtold @ stub _o_strtoll -@ stub _o_strtoul +@ cdecl _o_strtoul(str ptr long) MSVCRT_strtoul @ stub _o_strtoull @ stub _o_system @ stub _o_tan @@ -1806,7 +1806,7 @@ @ stub _o_tgammal @ stub _o_tmpfile_s @ stub _o_tmpnam_s -@ stub _o_tolower +@ cdecl _o_tolower(long) MSVCRT__tolower @ cdecl _o_toupper(long) MSVCRT__toupper @ stub _o_towlower @ stub _o_towupper -- 2.19.2

2 1

[PATCH] winemaker: Fix --single-target option parsing.
by Huw Davies 13 Mar '19

13 Mar '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- tools/winemaker/winemaker | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winemaker/winemaker b/tools/winemaker/winemaker index ec5fb16a68..88ae78ce48 100755 --- a/tools/winemaker/winemaker +++ b/tools/winemaker/winemaker @@ -2702,8 +2702,9 @@ binmode(STDOUT, ":utf8"); target_init(\@global_settings); -foreach(@ARGV) { - my $arg=$_; +my @args = @ARGV; +while (@args>0) { + my $arg=shift @args; # General options if ($arg eq "--nobanner") { $opt_no_banner=1; @@ -2712,7 +2713,7 @@ foreach(@ARGV) { } elsif ($arg eq "--nobackup") { $opt_backup=0; } elsif ($arg eq "--single-target") { - $opt_single_target=shift @ARGV; + $opt_single_target=shift @args; } elsif ($arg eq "--lower-none") { $opt_lower=$OPT_LOWER_NONE; } elsif ($arg eq "--lower-all") { -- 2.17.1

2 1

[PATCH] winebuild: Use the correct section label on macOS.
by Huw Davies 13 Mar '19

13 Mar '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- tools/winebuild/build.h | 2 ++ tools/winebuild/res32.c | 2 +- tools/winebuild/spec32.c | 2 +- tools/winebuild/utils.c | 20 ++++++++++++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 1d4f217ae1..603b6e2b07 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -281,7 +281,9 @@ extern const char *func_declaration( const char *func ); extern const char *asm_globl( const char *func ); extern const char *get_asm_ptr_keyword(void); extern const char *get_asm_string_keyword(void); +extern const char *get_asm_export_section(void); extern const char *get_asm_rodata_section(void); +extern const char *get_asm_rsrc_section(void); extern const char *get_asm_string_section(void); extern void output_function_size( const char *name ); extern void output_gnu_stack_note(void); diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 634c933bfe..bd55bb2fa5 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -441,7 +441,7 @@ void output_resources( DLLSPEC *spec ) /* output the resource directories */ output( "\n/* resources */\n\n" ); - output( "\t.section %s\n", target_platform == PLATFORM_WINDOWS ? ".rsrc" : ".data" ); + output( "\t%s\n", get_asm_rsrc_section() ); output( "\t.align %d\n", get_alignment(get_ptr_size()) ); output( ".L__wine_spec_resources:\n" ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index d0c147df59..65c8d144e3 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -384,7 +384,7 @@ void output_exports( DLLSPEC *spec ) if (!nr_exports) return; output( "\n/* export table */\n\n" ); - output( "\t.section %s\n", target_platform == PLATFORM_WINDOWS ? ".edata" : ".data" ); + output( "\t%s\n", get_asm_export_section() ); output( "\t.align %d\n", get_alignment(4) ); output( ".L__wine_spec_exports:\n" ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index beff2ab135..a1cc9aabd4 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -1201,6 +1201,16 @@ const char *get_asm_string_keyword(void) } } +const char *get_asm_export_section(void) +{ + switch (target_platform) + { + case PLATFORM_APPLE: return ".data"; + case PLATFORM_WINDOWS: return ".section .edata"; + default: return ".section .data"; + } +} + const char *get_asm_rodata_section(void) { switch (target_platform) @@ -1210,6 +1220,16 @@ const char *get_asm_rodata_section(void) } } +const char *get_asm_rsrc_section(void) +{ + switch (target_platform) + { + case PLATFORM_APPLE: return ".data"; + case PLATFORM_WINDOWS: return ".section .rsrc"; + default: return ".section .data"; + } +} + const char *get_asm_string_section(void) { switch (target_platform) -- 2.18.0

1 0

[PATCH 1/6] mfplat: Use newer threadpool environment structure.
by Nikolay Sivov 13 Mar '19

13 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/queue.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 66f8588f82..e579168770 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -62,7 +62,7 @@ struct work_item struct queue { TP_POOL *pool; - TP_CALLBACK_ENVIRON env; + TP_CALLBACK_ENVIRON_V3 env; CRITICAL_SECTION cs; struct list pending_items; }; @@ -163,10 +163,13 @@ static void init_work_queue(MFASYNC_WORKQUEUE_TYPE queue_type, struct queue *que unsigned int max_thread; queue->pool = CreateThreadpool(NULL); - queue->env.Version = 1; + memset(&queue->env, 0, sizeof(queue->env)); + queue->env.Version = 3; + queue->env.Size = sizeof(queue->env); queue->env.Pool = queue->pool; queue->env.CleanupGroup = CreateThreadpoolCleanupGroup(); queue->env.CleanupGroupCancelCallback = standard_queue_cleanup_callback; + queue->env.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; list_init(&queue->pending_items); InitializeCriticalSection(&queue->cs); @@ -344,7 +347,7 @@ static HRESULT queue_submit_item(struct queue *queue, IMFAsyncResult *result) if (!(item = alloc_work_item(queue, result))) return E_OUTOFMEMORY; - work_object = CreateThreadpoolWork(standard_queue_worker, item, &queue->env); + work_object = CreateThreadpoolWork(standard_queue_worker, item, (TP_CALLBACK_ENVIRON *)&queue->env); SubmitThreadpoolWork(work_object); TRACE("dispatched %p.\n", result); @@ -483,7 +486,7 @@ static HRESULT queue_submit_wait(struct queue *queue, HANDLE event, LONG priorit else callback = waiting_item_callback; - item->u.wait_object = CreateThreadpoolWait(callback, item, &queue->env); + item->u.wait_object = CreateThreadpoolWait(callback, item, (TP_CALLBACK_ENVIRON *)&queue->env); SetThreadpoolWait(item->u.wait_object, event, NULL); TRACE("dispatched %p.\n", result); @@ -516,7 +519,7 @@ static HRESULT queue_submit_timer(struct queue *queue, IMFAsyncResult *result, I filetime.dwLowDateTime = t.u.LowPart; filetime.dwHighDateTime = t.u.HighPart; - item->u.timer_object = CreateThreadpoolTimer(callback, item, &queue->env); + item->u.timer_object = CreateThreadpoolTimer(callback, item, (TP_CALLBACK_ENVIRON *)&queue->env); SetThreadpoolTimer(item->u.timer_object, &filetime, period, 0); TRACE("dispatched %p.\n", result); -- 2.20.1

2 7

[PATCH] ntdll/threadpool: Add support for callback priority.
by Nikolay Sivov 13 Mar '19

13 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/tests/threadpool.c | 17 ++++++--- dlls/ntdll/threadpool.c | 67 ++++++++++++++++++++++++++++++----- 2 files changed, 72 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 3bd2d994ec..bf5493cac0 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -517,12 +517,21 @@ static void test_tp_simple(void) memset(&environment3, 0, sizeof(environment3)); environment3.Version = 3; environment3.Pool = pool; - environment3.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; environment3.Size = sizeof(environment3); + + for (i = 0; i < 3; ++i) + { + environment3.CallbackPriority = TP_CALLBACK_PRIORITY_HIGH + i; + status = pTpSimpleTryPost(simple_cb, semaphore, (TP_CALLBACK_ENVIRON *)&environment3); + ok(!status, "TpSimpleTryPost failed with status %x\n", status); + result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + } + + environment3.CallbackPriority = 10; status = pTpSimpleTryPost(simple_cb, semaphore, (TP_CALLBACK_ENVIRON *)&environment3); - ok(!status, "TpSimpleTryPost failed with status %x\n", status); - result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(status == STATUS_INVALID_PARAMETER || broken(!status) /* Vista does not support priorities */, + "TpSimpleTryPost failed with status %x\n", status); /* test with invalid version number */ memset(&environment, 0, sizeof(environment)); diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index bf7449cdfa..a7ad321a8b 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -123,8 +123,8 @@ struct threadpool LONG objcount; BOOL shutdown; CRITICAL_SECTION cs; - /* pool of work items, locked via .cs */ - struct list pool; + /* Pools of work items, locked via .cs, order matches TP_CALLBACK_PRIORITY - high, normal, low. */ + struct list pools[3]; RTL_CONDITION_VARIABLE update_event; /* information about worker threads, locked via .cs */ int max_workers; @@ -155,6 +155,7 @@ struct threadpool_object PTP_SIMPLE_CALLBACK finalization_callback; BOOL may_run_long; HMODULE race_dll; + TP_CALLBACK_PRIORITY priority; /* information about the group, locked via .group->cs */ struct list group_entry; BOOL is_group_member; @@ -1648,6 +1649,7 @@ static void tp_waitqueue_unlock( struct threadpool_object *wait ) static NTSTATUS tp_threadpool_alloc( struct threadpool **out ) { struct threadpool *pool; + unsigned int i; pool = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*pool) ); if (!pool) @@ -1660,7 +1662,8 @@ static NTSTATUS tp_threadpool_alloc( struct threadpool **out ) RtlInitializeCriticalSection( &pool->cs ); pool->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": threadpool.cs"); - list_init( &pool->pool ); + for (i = 0; i < ARRAY_SIZE(pool->pools); ++i) + list_init( &pool->pools[i] ); RtlInitializeConditionVariable( &pool->update_event ); pool->max_workers = 500; @@ -1696,6 +1699,8 @@ static void tp_threadpool_shutdown( struct threadpool *pool ) */ static BOOL tp_threadpool_release( struct threadpool *pool ) { + unsigned int i; + if (interlocked_dec( &pool->refcount )) return FALSE; @@ -1703,7 +1708,8 @@ static BOOL tp_threadpool_release( struct threadpool *pool ) assert( pool->shutdown ); assert( !pool->objcount ); - assert( list_empty( &pool->pool ) ); + for (i = 0; i < ARRAY_SIZE(pool->pools); ++i) + assert( list_empty( &pool->pools[i] ) ); pool->cs.DebugInfo->Spare[0] = 0; RtlDeleteCriticalSection( &pool->cs ); @@ -1725,7 +1731,25 @@ static NTSTATUS tp_threadpool_lock( struct threadpool **out, TP_CALLBACK_ENVIRON NTSTATUS status = STATUS_SUCCESS; if (environment) + { + /* Validate environment parameters. */ + if (environment->Version == 3) + { + TP_CALLBACK_ENVIRON_V3 *environment3 = (TP_CALLBACK_ENVIRON_V3 *)environment; + + switch (environment3->CallbackPriority) + { + case TP_CALLBACK_PRIORITY_HIGH: + case TP_CALLBACK_PRIORITY_NORMAL: + case TP_CALLBACK_PRIORITY_LOW: + break; + default: + return STATUS_INVALID_PARAMETER; + } + } + pool = (struct threadpool *)environment->Pool; + } if (!pool) { @@ -1860,6 +1884,7 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa object->finalization_callback = NULL; object->may_run_long = 0; object->race_dll = NULL; + object->priority = TP_CALLBACK_PRIORITY_NORMAL; memset( &object->group_entry, 0, sizeof(object->group_entry) ); object->is_group_member = FALSE; @@ -1881,6 +1906,13 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa object->finalization_callback = environment->FinalizationCallback; object->may_run_long = environment->u.s.LongFunction != 0; object->race_dll = environment->RaceDll; + if (environment->Version == 3) + { + TP_CALLBACK_ENVIRON_V3 *environment_v3 = (TP_CALLBACK_ENVIRON_V3 *)environment; + + object->priority = environment_v3->CallbackPriority; + assert( object->priority < ARRAY_SIZE(pool->pools) ); + } if (environment->ActivationContext) FIXME( "activation context not supported yet\n" ); @@ -1916,6 +1948,11 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa tp_object_release( object ); } +static void tp_object_prio_queue( struct threadpool_object *object ) +{ + list_add_tail( &object->pool->pools[object->priority], &object->pool_entry ); +} + /*********************************************************************** * tp_object_submit (internal) * @@ -1940,7 +1977,7 @@ static void tp_object_submit( struct threadpool_object *object, BOOL signaled ) /* Queue work item and increment refcount. */ interlocked_inc( &object->refcount ); if (!object->num_pending_callbacks++) - list_add_tail( &pool->pool, &object->pool_entry ); + tp_object_prio_queue( object ); /* Count how often the object was signaled. */ if (object->type == TP_OBJECT_TYPE_WAIT && signaled) @@ -2061,6 +2098,20 @@ static BOOL tp_object_release( struct threadpool_object *object ) return TRUE; } +static struct list *threadpool_get_next_item( const struct threadpool *pool ) +{ + struct list *ptr; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(pool->pools); ++i) + { + if ((ptr = list_head( &pool->pools[i] ))) + break; + } + + return ptr; +} + /*********************************************************************** * threadpool_worker_proc (internal) */ @@ -2080,7 +2131,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) pool->num_busy_workers--; for (;;) { - while ((ptr = list_head( &pool->pool ))) + while ((ptr = threadpool_get_next_item( pool ))) { struct threadpool_object *object = LIST_ENTRY( ptr, struct threadpool_object, pool_entry ); assert( object->num_pending_callbacks > 0 ); @@ -2089,7 +2140,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) * the end of the pool list. Otherwise remove it from the pool. */ list_remove( &object->pool_entry ); if (--object->num_pending_callbacks) - list_add_tail( &pool->pool, &object->pool_entry ); + tp_object_prio_queue( object ); /* For wait objects check if they were signaled or have timed out. */ if (object->type == TP_OBJECT_TYPE_WAIT) @@ -2230,7 +2281,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) * can be terminated. */ timeout.QuadPart = (ULONGLONG)THREADPOOL_WORKER_TIMEOUT * -10000; if (RtlSleepConditionVariableCS( &pool->update_event, &pool->cs, &timeout ) == STATUS_TIMEOUT && - !list_head( &pool->pool ) && (pool->num_workers > max( pool->min_workers, 1 ) || + !threadpool_get_next_item( pool ) && (pool->num_workers > max( pool->min_workers, 1 ) || (!pool->min_workers && !pool->objcount))) { break; -- 2.20.1

1 0

[PATCH 1/5] quartz/tests: Add some tests for IBasicAudio on the DirectSound renderer.
by Zebediah Figura 13 Mar '19

13 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/dsoundrender.c | 66 ++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 0d48bec879..dcaedd512d 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -146,6 +146,7 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IDispatch, FALSE); check_interface(filter, &IID_IKsPropertySet, FALSE); check_interface(filter, &IID_IPin, FALSE); check_interface(filter, &IID_IQualProp, FALSE); @@ -336,6 +337,70 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_basic_audio(void) +{ + IBaseFilter *filter = create_dsound_render(); + LONG balance, volume; + ITypeInfo *typeinfo; + IBasicAudio *audio; + TYPEATTR *typeattr; + ULONG ref, count; + HRESULT hr; + + hr = IBaseFilter_QueryInterface(filter, &IID_IBasicAudio, (void **)&audio); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBasicAudio_get_Balance(audio, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBasicAudio_get_Balance(audio, &balance); + if (hr != VFW_E_MONO_AUDIO_HW) + { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(balance == 0, "Got balance %d.\n", balance); + + hr = IBasicAudio_put_Balance(audio, DSBPAN_LEFT - 1); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IBasicAudio_put_Balance(audio, DSBPAN_LEFT); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBasicAudio_get_Balance(audio, &balance); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(balance == DSBPAN_LEFT, "Got balance %d.\n", balance); + } + + hr = IBasicAudio_get_Volume(audio, &volume); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(volume == 0, "Got volume %d.\n", volume); + + hr = IBasicAudio_put_Volume(audio, DSBVOLUME_MIN - 1); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IBasicAudio_put_Volume(audio, DSBVOLUME_MIN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBasicAudio_get_Volume(audio, &volume); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(volume == DSBVOLUME_MIN, "Got volume %d.\n", volume); + + hr = IBasicAudio_GetTypeInfoCount(audio, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + + hr = IBasicAudio_GetTypeInfo(audio, 0, 0, &typeinfo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(typeattr->typekind == TKIND_DISPATCH, "Got kind %u.\n", typeattr->typekind); + ok(IsEqualGUID(&typeattr->guid, &IID_IBasicAudio), "Got IID %s.\n", wine_dbgstr_guid(&typeattr->guid)); + ITypeInfo_Release(typeinfo); + + IBasicAudio_Release(audio); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -415,6 +480,7 @@ START_TEST(dsoundrender) test_enum_pins(); test_find_pin(); test_pin_info(); + test_basic_audio(); test_basefilter(); CoUninitialize(); -- 2.20.1

2 7

[PATCH] hid: Handle overlapped file handles.
by Zebediah Figura 13 Mar '19

13 Mar '19

This fixes a crash in the hid:device tests for me, and likely helps with bug 46711. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/hid/hidd.c | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 614e7c4bf5..2c26d9260f 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -38,6 +38,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); +static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD out_len, DWORD *ret_len) +{ + OVERLAPPED ovl = {0}; + BOOL ret; + + ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + ret = DeviceIoControl(file, code, in_buf, in_len, out_buf, out_len, ret_len, &ovl); + if (!ret && GetLastError() == ERROR_IO_PENDING) + ret = GetOverlappedResult(file, &ovl, ret_len, TRUE); + return ret; +} + BOOLEAN WINAPI HidD_FreePreparsedData(PHIDP_PREPARSED_DATA PreparsedData) { TRACE("(%p)\n", PreparsedData); @@ -52,7 +64,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) TRACE("(%p %p)\n", HidDeviceObject, Attr); - ret = DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION), NULL, NULL); + ret = sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION), NULL); if (ret) { @@ -66,7 +78,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, NULL); } void WINAPI HidD_GetHidGuid(LPGUID guid) @@ -78,43 +90,43 @@ void WINAPI HidD_GetHidGuid(LPGUID guid) BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL); } BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL); } BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers) { TRACE("(%p %p)\n", HidDeviceObject, NumberBuffers); - return DeviceIoControl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers), NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers), NULL); } BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL); } BOOLEAN WINAPI HidD_SetNumInputBuffers(HANDLE HidDeviceObject, ULONG NumberBuffers) { TRACE("(%p %i)\n", HidDeviceObject, NumberBuffers); - return DeviceIoControl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0, NULL); } BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL); } BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, NULL); } BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData) @@ -124,14 +136,14 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT TRACE("(%p %p)\n", HidDeviceObject, PreparsedData); - if (!DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, - &info, sizeof(HID_COLLECTION_INFORMATION), NULL, NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, + &info, sizeof(HID_COLLECTION_INFORMATION), NULL)) return FALSE; if (!(data = HeapAlloc(GetProcessHeap(), 0, info.DescriptorSize))) return FALSE; - if (!DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, - data, info.DescriptorSize, NULL, NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, + data, info.DescriptorSize, NULL)) { HeapFree( GetProcessHeap(), 0, data ); return FALSE; @@ -143,5 +155,5 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT BOOLEAN WINAPI HidD_SetOutputReport(HANDLE HidDeviceObject, void *ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL); } -- 2.20.1

3 3

[PATCH] imm32: Get rid of some casts in attributes helper, document arguments.
by Nikolay Sivov 12 Mar '19

12 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/imm32/imm.c | 51 ++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 948ef780f6..b4621412ac 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1231,33 +1231,40 @@ static INT CopyCompStringIMEtoClient(const InputContextData *data, const void *s return ret; } -static INT CopyCompAttrIMEtoClient(InputContextData *data, LPBYTE source, INT slen, LPBYTE ssource, INT sslen, - LPBYTE target, INT tlen, BOOL unicode ) +/* Composition string encoding is defined by context, returned attributes correspond to string, converted according to + passed mode. String length is in characters, attributes are in byte arrays. */ +static INT CopyCompAttrIMEtoClient(const InputContextData *data, const BYTE *src, INT src_len, const void *comp_string, + INT str_len, BYTE *dst, INT dst_len, BOOL unicode) { + union + { + const void *str; + const WCHAR *strW; + const char *strA; + } string; INT rc; + string.str = comp_string; + if (is_himc_ime_unicode(data) && !unicode) { - rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)ssource, sslen, NULL, 0, NULL, NULL); - if (tlen) + rc = WideCharToMultiByte(CP_ACP, 0, string.strW, str_len, NULL, 0, NULL, NULL); + if (dst_len) { - const BYTE *src = source; - LPBYTE dst = target; int i, j = 0, k = 0; - if (rc < tlen) - tlen = rc; - for (i = 0; i < sslen; ++i) + if (rc < dst_len) + dst_len = rc; + for (i = 0; i < str_len; ++i) { int len; - len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)ssource + i, 1, - NULL, 0, NULL, NULL); + len = WideCharToMultiByte(CP_ACP, 0, string.strW + i, 1, NULL, 0, NULL, NULL); for (; len > 0; --len) { dst[j++] = src[k]; - if (j >= tlen) + if (j >= dst_len) goto end; } ++k; @@ -1268,23 +1275,21 @@ static INT CopyCompAttrIMEtoClient(InputContextData *data, LPBYTE source, INT sl } else if (!is_himc_ime_unicode(data) && unicode) { - rc = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ssource, sslen, NULL, 0); - if (tlen) + rc = MultiByteToWideChar(CP_ACP, 0, string.strA, str_len, NULL, 0); + if (dst_len) { - const BYTE *src = source; - LPBYTE dst = target; int i, j = 0; - if (rc < tlen) - tlen = rc; - for (i = 0; i < sslen; ++i) + if (rc < dst_len) + dst_len = rc; + for (i = 0; i < str_len; ++i) { - if (IsDBCSLeadByte(((LPSTR)ssource)[i])) + if (IsDBCSLeadByte(string.strA[i])) continue; dst[j++] = src[i]; - if (j >= tlen) + if (j >= dst_len) break; } rc = j; @@ -1292,8 +1297,8 @@ static INT CopyCompAttrIMEtoClient(InputContextData *data, LPBYTE source, INT sl } else { - memcpy( target, source, min(slen,tlen)); - rc = slen; + memcpy(dst, src, min(src_len, dst_len)); + rc = src_len; } return rc; -- 2.20.1

2 1

[PATCH] shell32: In SHRestricted add missing slash
by Fabian Maurer 12 Mar '19

12 Mar '19

Credits for this fix goes to the ReactOS devs See https://jira.reactos.org/browse/CORE-15666 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/shell32/shpolicy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/shpolicy.c b/dlls/shell32/shpolicy.c index 62e6ab5760..a05c7e96fd 100644 --- a/dlls/shell32/shpolicy.c +++ b/dlls/shell32/shpolicy.c @@ -854,6 +854,7 @@ DWORD WINAPI SHRestricted (RESTRICTIONS policy) } lstrcpyA(regstr, strRegistryPolicyA); + lstrcatA(regstr, "\\"); lstrcatA(regstr, p->appstr); /* return 0 and don't set the cache if any registry errors occur */ -- 2.21.0

1 0

[PATCH 6/6] d3dx9: Merge the d3dx_effect_SetMatrixTransposePointerArray() helper
by Michael Stefaniuc 12 Mar '19

12 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 63 ++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 9a4d1965d7..b12127b35b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1526,41 +1526,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_matrix_transpose_pointer_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && count <= param->element_count) - { - UINT i; - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - set_dirty(param); - for (i = 0; i < count; ++i) - { - set_matrix_transpose(&param->members[i], matrix[i]); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_string(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const char *string) { @@ -3537,10 +3502,36 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTransposePointerArray(ID3DXEffect *if const D3DXMATRIX **matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); - return d3dx9_base_effect_set_matrix_transpose_pointer_array(&effect->base_effect, parameter, matrix, count); + if (param && count <= param->element_count) + { + unsigned int i; + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + set_dirty(param); + for (i = 0; i < count; ++i) + set_matrix_transpose(&param->members[i], matrix[i]); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetMatrixTransposePointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 5/6] d3dx9: Merge the d3dx_effect_SetMatrixTransposeArray() helper
by Michael Stefaniuc 12 Mar '19

12 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 69 ++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b302e0ac69..9a4d1965d7 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1526,44 +1526,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_matrix_transpose_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && param->element_count >= count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - set_dirty(param); - for (i = 0; i < count; ++i) - { - set_matrix_transpose(&param->members[i], &matrix[i]); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_transpose_pointer_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) { @@ -3495,10 +3457,39 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTransposeArray(ID3DXEffect *iface, D3 const D3DXMATRIX *matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); - return d3dx9_base_effect_set_matrix_transpose_array(&effect->base_effect, parameter, matrix, count); + if (param && param->element_count >= count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + set_dirty(param); + for (i = 0; i < count; ++i) + set_matrix_transpose(&param->members[i], &matrix[i]); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetMatrixTransposeArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 4/6] d3dx9: Merge the d3dx_effect_SetMatrixTranspose() helper
by Michael Stefaniuc 12 Mar '19

12 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 61 +++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 34 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f8ca61452e..b302e0ac69 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1526,39 +1526,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_matrix_transpose(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXMATRIX *matrix) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && !param->element_count) - { - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - set_dirty(param); - set_matrix_transpose(param, matrix); - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_transpose_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) { @@ -3454,10 +3421,36 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTranspose(ID3DXEffect *iface, D3DXHAN const D3DXMATRIX *matrix) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); - return d3dx9_base_effect_set_matrix_transpose(&effect->base_effect, parameter, matrix); + if (param && !param->element_count) + { + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + set_dirty(param); + set_matrix_transpose(param, matrix); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetMatrixTranspose(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 3/6] d3dx9: Merge the d3dx_effect_GetMatrixTransposePointerArray() helper
by Michael Stefaniuc 12 Mar '19

12 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 70 +++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5ccae8ad35..f8ca61452e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1632,44 +1632,6 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose_pointer_array(struct d3dx9 return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_matrix_transpose_pointer_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!count) return D3D_OK; - - if (matrix && param && count <= param->element_count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - for (i = 0; i < count; ++i) - { - get_matrix(&param->members[i], matrix[i], TRUE); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_string(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const char *string) { @@ -3601,10 +3563,40 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTransposePointerArray(ID3DXEffect *if D3DXMATRIX **matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); - return d3dx9_base_effect_get_matrix_transpose_pointer_array(&effect->base_effect, parameter, matrix, count); + if (!count) + return D3D_OK; + + if (matrix && param && count <= param->element_count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + get_matrix(&param->members[i], matrix[i], TRUE); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char *string) -- 2.20.1

2 1

[PATCH 2/6] d3dx9: Merge the d3dx_effect_GetMatrixTransposeArray() helper
by Michael Stefaniuc 12 Mar '19

12 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 72 +++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 40 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7e74eb026e..5ccae8ad35 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1597,45 +1597,6 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose_array(struct d3dx9_base_ef return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_matrix_transpose_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!count) return D3D_OK; - - if (matrix && param && count <= param->element_count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - for (i = 0; i < count; ++i) - { - get_matrix(&param->members[i], &matrix[i], TRUE); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_transpose_pointer_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) { @@ -3589,10 +3550,41 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTransposeArray(ID3DXEffect *iface, D3 D3DXMATRIX *matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); - return d3dx9_base_effect_get_matrix_transpose_array(&effect->base_effect, parameter, matrix, count); + if (!count) + return D3D_OK; + + if (matrix && param && count <= param->element_count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + get_matrix(&param->members[i], &matrix[i], TRUE); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetMatrixTransposePointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 1/6] d3dx9: Merge the d3dx_effect_GetMatrixTranspose() helper
by Michael Stefaniuc 12 Mar '19

12 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 65 +++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 6e5dfbd71d..7e74eb026e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1559,41 +1559,6 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose(struct d3dx9_base_effect * return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_matrix_transpose(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXMATRIX *matrix) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (matrix && param && !param->element_count) - { - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - get_matrix(param, matrix, FALSE); - return D3D_OK; - - case D3DXPC_MATRIX_ROWS: - get_matrix(param, matrix, TRUE); - return D3D_OK; - - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_transpose_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) { @@ -3576,10 +3541,38 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTranspose(ID3DXEffect *iface, D3DXHAN D3DXMATRIX *matrix) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); - return d3dx9_base_effect_get_matrix_transpose(&effect->base_effect, parameter, matrix); + if (matrix && param && !param->element_count) + { + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + get_matrix(param, matrix, FALSE); + return D3D_OK; + + case D3DXPC_MATRIX_ROWS: + get_matrix(param, matrix, TRUE); + return D3D_OK; + + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetMatrixTransposeArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH] quartz: : Remove an unused return variable (coccinelle)
by Michael Stefaniuc 12 Mar '19

12 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/quartz/memallocator.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 477c63ae05..4e366f3146 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -196,7 +196,6 @@ static HRESULT WINAPI BaseMemAllocator_SetProperties(IMemAllocator * iface, ALLO static HRESULT WINAPI BaseMemAllocator_GetProperties(IMemAllocator * iface, ALLOCATOR_PROPERTIES *pProps) { BaseMemAllocator *This = impl_from_IMemAllocator(iface); - HRESULT hr = S_OK; TRACE("(%p)->(%p)\n", This, pProps); @@ -206,7 +205,7 @@ static HRESULT WINAPI BaseMemAllocator_GetProperties(IMemAllocator * iface, ALLO } LeaveCriticalSection(This->pCritSect); - return hr; + return S_OK; } static HRESULT WINAPI BaseMemAllocator_Commit(IMemAllocator * iface) -- 2.20.1

1 0

[PATCH] shell32: Remove unused return variables (coccinelle)
by Michael Stefaniuc 12 Mar '19

12 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/autocomplete.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 36b0c5d7bc..bd9b8725bb 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -923,13 +923,12 @@ static HRESULT WINAPI IAutoComplete2_fnEnable( BOOL fEnable) { IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); - HRESULT hr = S_OK; TRACE("(%p)->(%s)\n", This, (fEnable)?"true":"false"); This->enabled = fEnable; - return hr; + return S_OK; } /****************************************************************************** @@ -1063,13 +1062,12 @@ static HRESULT WINAPI IAutoComplete2_fnGetOptions( DWORD *pdwFlag) { IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); - HRESULT hr = S_OK; TRACE("(%p) -> (%p)\n", This, pdwFlag); *pdwFlag = This->options; - return hr; + return S_OK; } /************************************************************************** -- 2.20.1

1 0

[PATCH] ws2_32: Handle EISCONN from sendmsg
by Rob Hughes (BLOOMBERG/ LONDON) 12 Mar '19

12 Mar '19

When calling sendmsg on a socket that's already connected, some implementations will return EISCONN if you specify a recipient (notably, Darwin/OSX with UDP connections). Newer versions of Linux and Windows will simply ignore the destination parameter. Signed-off-by: Rob Hughes <rhughes37(a)bloomberg.net> --- dlls/ws2_32/socket.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3755338ee8..c75a7047ce 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2628,6 +2628,11 @@ static int WS2_send( int fd, struct ws2_async *wsa, int flags ) while ((ret = sendmsg(fd, &hdr, flags)) == -1) { + if (errno == EISCONN) { + hdr.msg_name = 0; + hdr.msg_namelen = 0; + continue; + } if (errno != EINTR) return -1; } -- 2.19.1

2 1

[PATCH] winecfg: Correct comment issues.
by Isira Seneviratne 12 Mar '19

12 Mar '19

2 1

[PATCH 4/4] dxgi: Factor out d3d11_swapchain_get_hwnd().
by Józef Kucia 12 Mar '19

12 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 1998e480333e..47f71961768a 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -150,6 +150,17 @@ static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, I return DXGI_ERROR_NOT_FOUND; } +static HWND d3d11_swapchain_get_hwnd(struct d3d11_swapchain *swapchain) +{ + struct wined3d_swapchain_desc wined3d_desc; + + wined3d_mutex_lock(); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); + wined3d_mutex_unlock(); + + return wined3d_desc.device_window; +} + static inline struct d3d11_swapchain *d3d11_swapchain_from_IDXGISwapChain1(IDXGISwapChain1 *iface) { return CONTAINING_RECORD(iface, struct d3d11_swapchain, IDXGISwapChain1_iface); @@ -490,7 +501,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - struct wined3d_swapchain_desc swapchain_desc; IDXGIAdapter *adapter; IDXGIDevice *device; HRESULT hr; @@ -511,11 +521,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapCh if (SUCCEEDED(hr)) { - wined3d_mutex_lock(); - wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); - wined3d_mutex_unlock(); - - hr = dxgi_get_output_from_window(adapter, swapchain_desc.device_window, output); + HWND hwnd = d3d11_swapchain_get_hwnd(swapchain); + hr = dxgi_get_output_from_window(adapter, hwnd, output); IDXGIAdapter_Release(adapter); } else @@ -611,7 +618,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFullscreenDesc(IDXGISwapChai static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetHwnd(IDXGISwapChain1 *iface, HWND *hwnd) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - struct wined3d_swapchain_desc wined3d_desc; TRACE("iface %p, hwnd %p.\n", iface, hwnd); @@ -621,11 +627,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetHwnd(IDXGISwapChain1 *iface, return DXGI_ERROR_INVALID_CALL; } - wined3d_mutex_lock(); - wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); - wined3d_mutex_unlock(); - - *hwnd = wined3d_desc.device_window; + *hwnd = d3d11_swapchain_get_hwnd(swapchain); return S_OK; } -- 2.19.2

3 2

[PATCH 3/4] d3d12: Use VkPhysicalDevice corresponding to IDXGIAdapter.
by Józef Kucia 12 Mar '19

12 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/Makefile.in | 2 +- dlls/d3d12/d3d12_main.c | 197 +++++++++++++++++++++++++++++++++++----- 2 files changed, 174 insertions(+), 25 deletions(-) diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in index ba51960f2c74..5b92997ecdef 100644 --- a/dlls/d3d12/Makefile.in +++ b/dlls/d3d12/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3d12.dll IMPORTLIB = d3d12 -IMPORTS = dxgi dxguid gdi32 user32 +IMPORTS = dxgi dxguid gdi32 user32 uuid EXTRALIBS = $(VKD3D_LIBS) EXTRAINCL = $(VKD3D_CFLAGS) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index dace4142ab63..9eef3ad92ddf 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -36,6 +36,10 @@ #include <vkd3d.h> +#include "initguid.h" +#include "wine/wined3d.h" +#include "wine/winedxgi.h" + WINE_DEFAULT_DEBUG_CHANNEL(d3d12); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -118,14 +122,13 @@ static const struct vulkan_funcs *get_vk_funcs(void) return vk_funcs; } -static HRESULT d3d12_get_adapter(IUnknown **adapter, LUID *luid) +static HRESULT d3d12_get_adapter(IWineDXGIAdapter **wine_adapter, IUnknown *adapter) { - DXGI_ADAPTER_DESC adapter_desc; + IDXGIAdapter *dxgi_adapter = NULL; IDXGIFactory4 *factory = NULL; - IDXGIAdapter *dxgi_adapter; HRESULT hr; - if (!*adapter) + if (!adapter) { if (FAILED(hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory))) { @@ -138,37 +141,153 @@ static HRESULT d3d12_get_adapter(IUnknown **adapter, LUID *luid) WARN("Failed to enumerate primary adapter, hr %#x.\n", hr); goto done; } + + adapter = (IUnknown *)dxgi_adapter; } - else if (FAILED(hr = IUnknown_QueryInterface(*adapter, &IID_IDXGIAdapter, (void **)&dxgi_adapter))) - { + + if (FAILED(hr = IUnknown_QueryInterface(adapter, &IID_IWineDXGIAdapter, (void **)wine_adapter))) WARN("Invalid adapter %p, hr %#x.\n", adapter, hr); + +done: + if (dxgi_adapter) + IDXGIAdapter_Release(dxgi_adapter); + if (factory) + IDXGIFactory4_Release(factory); + + return hr; +} + +static BOOL check_vk_instance_extension(const struct vulkan_funcs *vk_funcs, const char *name) +{ + VkExtensionProperties *properties; + BOOL ret = FALSE; + unsigned int i; + uint32_t count; + + if (vk_funcs->p_vkEnumerateInstanceExtensionProperties(NULL, &count, NULL) < 0) + return FALSE; + + if (!(properties = heap_calloc(count, sizeof(*properties)))) + return FALSE; + + if (vk_funcs->p_vkEnumerateInstanceExtensionProperties(NULL, &count, properties) >= 0) + { + for (i = 0; i < count; ++i) + { + if (!strcmp(properties[i].extensionName, name)) + { + ret = TRUE; + break; + } + } + } + + heap_free(properties); + return ret; +} + +static VkPhysicalDevice d3d12_get_vk_physical_device(struct vkd3d_instance *instance, + const struct vulkan_funcs *vk_funcs, const struct wine_dxgi_adapter_info *adapter_info) +{ + PFN_vkGetPhysicalDeviceProperties2 pfn_vkGetPhysicalDeviceProperties2 = NULL; + PFN_vkGetPhysicalDeviceProperties pfn_vkGetPhysicalDeviceProperties; + PFN_vkEnumeratePhysicalDevices pfn_vkEnumeratePhysicalDevices; + VkPhysicalDevice vk_physical_device = VK_NULL_HANDLE; + VkPhysicalDeviceIDProperties id_properties; + VkPhysicalDeviceProperties2 properties2; + VkPhysicalDeviceProperties properties; + VkPhysicalDevice *vk_physical_devices; + VkInstance vk_instance; + unsigned int i; + uint32_t count; + VkResult vr; + + vk_instance = vkd3d_instance_get_vk_instance(instance); + + pfn_vkEnumeratePhysicalDevices = vk_funcs->p_vkGetInstanceProcAddr(vk_instance, "vkEnumeratePhysicalDevices"); + + pfn_vkGetPhysicalDeviceProperties = vk_funcs->p_vkGetInstanceProcAddr(vk_instance, "vkGetPhysicalDeviceProperties"); + if (check_vk_instance_extension(vk_funcs, VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME)) + pfn_vkGetPhysicalDeviceProperties2 = vk_funcs->p_vkGetInstanceProcAddr(vk_instance, "vkGetPhysicalDeviceProperties2KHR"); + + if ((vr = pfn_vkEnumeratePhysicalDevices(vk_instance, &count, NULL)) < 0) + { + WARN("Failed to get device count, vr %d.\n", vr); + return VK_NULL_HANDLE; + } + if (!count) + { + WARN("No physical device available.\n"); + return VK_NULL_HANDLE; + } + + if (!(vk_physical_devices = heap_calloc(count, sizeof(*vk_physical_devices)))) + return VK_NULL_HANDLE; + + if ((vr = pfn_vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices)) < 0) goto done; + + if (!IsEqualGUID(&adapter_info->driver_uuid, &GUID_NULL) && pfn_vkGetPhysicalDeviceProperties2) + { + TRACE("Matching adapters by UUIDs.\n"); + + for (i = 0; i < count; ++i) + { + memset(&id_properties, 0, sizeof(id_properties)); + id_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; + + properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + properties2.pNext = &id_properties; + + pfn_vkGetPhysicalDeviceProperties2(vk_physical_devices[i], &properties2); + + if (!memcmp(id_properties.driverUUID, &adapter_info->driver_uuid, VK_UUID_SIZE) + && !memcmp(id_properties.deviceUUID, &adapter_info->device_uuid, VK_UUID_SIZE)) + { + vk_physical_device = vk_physical_devices[i]; + break; + } + } } - if (SUCCEEDED(hr = IDXGIAdapter_GetDesc(dxgi_adapter, &adapter_desc))) + if (!vk_physical_device) { - *adapter = (IUnknown *)dxgi_adapter; - *luid = adapter_desc.AdapterLuid; + WARN("Matching adapters by PCI IDs.\n"); + + for (i = 0; i < count; ++i) + { + pfn_vkGetPhysicalDeviceProperties(vk_physical_devices[i], &properties); + + if (properties.vendorID == adapter_info->vendor_id && properties.deviceID == adapter_info->device_id) + { + vk_physical_device = vk_physical_devices[i]; + break; + } + } } - else + + if (!vk_physical_device) { - IDXGIAdapter_Release(dxgi_adapter); + FIXME("Could not find Vulkan physical device for DXGI adapter.\n"); + vk_physical_device = vk_physical_devices[0]; } done: - if (factory) - IDXGIFactory4_Release(factory); - - return hr; + heap_free(vk_physical_devices); + return vk_physical_device; } HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { + struct vkd3d_optional_instance_extensions_info optional_extensions_info; struct vkd3d_instance_create_info instance_create_info; struct vkd3d_device_create_info device_create_info; + struct wine_dxgi_adapter_info adapter_info; + VkPhysicalDevice vk_physical_device; const struct vulkan_funcs *vk_funcs; - LUID adapter_luid; + struct vkd3d_instance *instance; + IWineDXGIAdapter *wine_adapter; HRESULT hr; static const char * const instance_extensions[] = @@ -176,6 +295,10 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_WIN32_SURFACE_EXTENSION_NAME, }; + static const char * const optional_instance_extensions[] = + { + VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, + }; static const char * const device_extensions[] = { VK_KHR_SWAPCHAIN_EXTENSION_NAME, @@ -190,12 +313,22 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe return E_FAIL; } - /* FIXME: Get VkPhysicalDevice for IDXGIAdapter. */ - if (FAILED(hr = d3d12_get_adapter(&adapter, &adapter_luid))) + if (FAILED(hr = d3d12_get_adapter(&wine_adapter, adapter))) return hr; - memset(&instance_create_info, 0, sizeof(instance_create_info)); + if (FAILED(hr = IWineDXGIAdapter_get_adapter_info(wine_adapter, &adapter_info))) + { + WARN("Failed to get adapter info, hr %#x.\n", hr); + goto done; + } + + optional_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO; + optional_extensions_info.next = NULL; + optional_extensions_info.extensions = optional_instance_extensions; + optional_extensions_info.extension_count = ARRAY_SIZE(optional_instance_extensions); + instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + instance_create_info.next = &optional_extensions_info; instance_create_info.pfn_signal_event = d3d12_signal_event; instance_create_info.pfn_create_thread = d3d12_create_thread; instance_create_info.pfn_join_thread = d3d12_join_thread; @@ -205,17 +338,33 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe instance_create_info.instance_extensions = instance_extensions; instance_create_info.instance_extension_count = ARRAY_SIZE(instance_extensions); - memset(&device_create_info, 0, sizeof(device_create_info)); + if (FAILED(hr = vkd3d_create_instance(&instance_create_info, &instance))) + { + WARN("Failed to create vkd3d instance, hr %#x.\n", hr); + goto done; + } + + if (!(vk_physical_device = d3d12_get_vk_physical_device(instance, vk_funcs, &adapter_info))) + goto done_instance; + device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; + device_create_info.next = NULL; device_create_info.minimum_feature_level = minimum_feature_level; - device_create_info.instance_create_info = &instance_create_info; + device_create_info.instance = instance; + device_create_info.instance_create_info = NULL; + device_create_info.vk_physical_device = vk_physical_device; device_create_info.device_extensions = device_extensions; device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); - device_create_info.parent = adapter; - device_create_info.adapter_luid = adapter_luid; + device_create_info.parent = (IUnknown *)wine_adapter; + device_create_info.adapter_luid = adapter_info.luid; hr = vkd3d_create_device(&device_create_info, iid, device); - IUnknown_Release(adapter); + +done_instance: + vkd3d_instance_decref(instance); + +done: + IWineDXGIAdapter_Release(wine_adapter); return hr; } -- 2.19.2

3 2

[PATCH 2/4] dxgi: Introduce IWineDXGIAdapter::get_adapter_info().
by Józef Kucia 12 Mar '19

12 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/adapter.c | 24 ++++++++++++++++++++++++ include/wine/winedxgi.idl | 12 ++++++++++++ 2 files changed, 36 insertions(+) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 31baae6f49ff..d96cb1e5b237 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -364,6 +364,28 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, return dxgi_adapter_get_desc(adapter, desc); } +static HRESULT STDMETHODCALLTYPE dxgi_adapter_get_adapter_info(IWineDXGIAdapter *iface, + struct wine_dxgi_adapter_info *info) +{ + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); + struct wined3d_adapter_identifier adapter_id; + HRESULT hr; + + TRACE("iface %p, info %p.\n", iface, info); + + memset(&adapter_id, 0, sizeof(adapter_id)); + if (SUCCEEDED(hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id))) + { + info->driver_uuid = adapter_id.driver_uuid; + info->device_uuid = adapter_id.device_uuid; + info->vendor_id = adapter_id.vendor_id; + info->device_id = adapter_id.device_id; + info->luid = adapter_id.adapter_luid; + } + + return hr; +} + static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = { dxgi_adapter_QueryInterface, @@ -390,6 +412,8 @@ static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = dxgi_adapter_UnregisterVideoMemoryBudgetChangeNotification, /* IDXGIAdapter4 methods */ dxgi_adapter_GetDesc3, + /* IWineDXGIAdapter methods */ + dxgi_adapter_get_adapter_info, }; struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index f300eb928b62..84440901a9e9 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -68,6 +68,17 @@ interface IWineDXGIDeviceParent : IUnknown struct wined3d_device_parent *get_wined3d_device_parent(); } +struct wine_dxgi_adapter_info +{ + GUID driver_uuid; + GUID device_uuid; + + DWORD vendor_id; + DWORD device_id; + + LUID luid; +}; + [ object, local, @@ -75,6 +86,7 @@ interface IWineDXGIDeviceParent : IUnknown ] interface IWineDXGIAdapter : IDXGIAdapter4 { + HRESULT get_adapter_info([out] struct wine_dxgi_adapter_info *info); } [ -- 2.19.2

3 2

Google Season of Docs
by André Hentschel 12 Mar '19

12 Mar '19

Hi all, This is the first year of GSoS and organizations can apply in April. In short GSoS is about creating/improving documentation, but have a look at the project site for more info. So the main questions are: Is that interesting for us? Do we want to apply? Who would like to volunteer as a mentor? Who could start an ideas list? If you wish I could handle the registration process which hopefully is similar to GSoC See: https://developers.google.com/season-of-docs/ and https://developers.google.com/season-of-docs/docs/project-ideas

1 0

[PATCH 1/4] wined3d: Add driver and device UUIDs to adapter identifiers.
by Józef Kucia 12 Mar '19

12 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/directx.c | 7 ++++++- dlls/wined3d/wined3d_gl.h | 3 ++- dlls/wined3d/wined3d_private.h | 4 +++- include/wine/wined3d.h | 8 +++++--- 5 files changed, 42 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 492d7f952305..5bcb39f59c14 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -179,6 +179,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_framebuffer_blit", EXT_FRAMEBUFFER_BLIT }, {"GL_EXT_framebuffer_multisample", EXT_FRAMEBUFFER_MULTISAMPLE }, {"GL_EXT_framebuffer_object", EXT_FRAMEBUFFER_OBJECT }, + {"GL_EXT_memory_object", EXT_MEMORY_OBJECT }, {"GL_EXT_gpu_program_parameters", EXT_GPU_PROGRAM_PARAMETERS }, {"GL_EXT_gpu_shader4", EXT_GPU_SHADER4 }, {"GL_EXT_packed_depth_stencil", EXT_PACKED_DEPTH_STENCIL }, @@ -2499,6 +2500,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glVertexAttribI4uivEXT) USE_GL_FUNC(glVertexAttribI4usvEXT) USE_GL_FUNC(glVertexAttribIPointerEXT) + /* GL_EXT_memory_object */ + USE_GL_FUNC(glGetUnsignedBytei_vEXT) + USE_GL_FUNC(glGetUnsignedBytevEXT) /* GL_EXT_point_parameters */ USE_GL_FUNC(glPointParameterfEXT) USE_GL_FUNC(glPointParameterfvEXT) @@ -3871,6 +3875,28 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(driver_info->vram_bytes)); + if (gl_info->supported[EXT_MEMORY_OBJECT]) + { + GLint device_count = 0; + + gl_info->gl_ops.gl.p_glGetIntegerv(GL_NUM_DEVICE_UUIDS_EXT, &device_count); + if (device_count > 0) + { + if (device_count > 1) + FIXME("A set of %d devices is not supported.\n", device_count); + + GL_EXTCALL(glGetUnsignedBytevEXT(GL_DRIVER_UUID_EXT, (GLubyte *)&adapter->driver_uuid)); + GL_EXTCALL(glGetUnsignedBytei_vEXT(GL_DEVICE_UUID_EXT, 0, (GLubyte *)&adapter->device_uuid)); + + TRACE("Driver UUID: %s, device UUID %s.\n", + debugstr_guid(&adapter->driver_uuid), debugstr_guid(&adapter->device_uuid)); + } + else + { + WARN("Unexpected device count %d.\n", device_count); + } + } + gl_ext_emul_mask = adapter->vertex_pipe->vp_get_emul_mask(gl_info) | adapter->fragment_pipe->get_emul_mask(gl_info); if (gl_ext_emul_mask & GL_EXT_EMUL_ARB_MULTITEXTURE) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a05f6cccdc4a..d51e672a137e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1211,7 +1211,9 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, identifier->device_id = adapter->driver_info.device; identifier->subsystem_id = 0; identifier->revision = 0; - memcpy(&identifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(identifier->device_identifier)); + identifier->device_identifier = IID_D3DDEVICE_D3DUID; + identifier->driver_uuid = adapter->driver_uuid; + identifier->device_uuid = adapter->device_uuid; identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; identifier->adapter_luid = adapter->luid; identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); @@ -2548,6 +2550,9 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o TRACE("Allocated LUID %08x:%08x for adapter %p.\n", adapter->luid.HighPart, adapter->luid.LowPart, adapter); + memset(&adapter->driver_uuid, 0, sizeof(adapter->driver_uuid)); + memset(&adapter->device_uuid, 0, sizeof(adapter->device_uuid)); + adapter->formats = NULL; if (wined3d_creation_flags & WINED3D_NO3D) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index a02073c28af1..ae067e65805a 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -157,14 +157,15 @@ enum wined3d_gl_extension EXT_BLEND_FUNC_SEPARATE, EXT_BLEND_MINMAX, EXT_BLEND_SUBTRACT, - EXT_DRAW_BUFFERS2, EXT_DEPTH_BOUNDS_TEST, + EXT_DRAW_BUFFERS2, EXT_FOG_COORD, EXT_FRAMEBUFFER_BLIT, EXT_FRAMEBUFFER_MULTISAMPLE, EXT_FRAMEBUFFER_OBJECT, EXT_GPU_PROGRAM_PARAMETERS, EXT_GPU_SHADER4, + EXT_MEMORY_OBJECT, EXT_PACKED_DEPTH_STENCIL, EXT_PACKED_FLOAT, EXT_POINT_PARAMETERS, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6907c7b2e926..d0edb8c8bd86 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2686,7 +2686,7 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, /* The adapter structure */ struct wined3d_adapter { - UINT ordinal; + unsigned int ordinal; POINT monitor_position; enum wined3d_format_id screen_format; @@ -2694,6 +2694,8 @@ struct wined3d_adapter struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; UINT64 vram_bytes_used; + GUID driver_uuid; + GUID device_uuid; LUID luid; WCHAR device_name[CCHDEVICENAME]; /* for use with e.g. ChangeDisplaySettings() */ diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 07329024fefb..2f8ed5efc77f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1719,17 +1719,19 @@ struct wined3d_tri_patch_info struct wined3d_adapter_identifier { char *driver; - UINT driver_size; + unsigned int driver_size; char *description; - UINT description_size; + unsigned int description_size; char *device_name; - UINT device_name_size; + unsigned int device_name_size; LARGE_INTEGER driver_version; DWORD vendor_id; DWORD device_id; DWORD subsystem_id; DWORD revision; GUID device_identifier; + GUID driver_uuid; + GUID device_uuid; DWORD whql_level; LUID adapter_luid; SIZE_T video_memory; -- 2.19.2

2 1

[PATCH] comctl32/combo: Fix misleading indentation
by Fabian Maurer 12 Mar '19

12 Mar '19

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/combo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 12ea7bbff6..8a533e65b1 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -1020,7 +1020,7 @@ static void CBDropDown( LPHEADCOMBO lphc ) else { if (nItems > lphc->visibleItems) - nItems = lphc->visibleItems; + nItems = lphc->visibleItems; nDroppedHeight = nItems * nIHeight + COMBO_YBORDERSIZE(); } } -- 2.21.0

1 0

[PATCH v2 1/2] kernel32/path: Allow renaming a file/directory to a different capitalization of itself
by Gabriel Ivăncescu 12 Mar '19

12 Mar '19

Renaming a file or directory from e.g. foobar to FooBar (or any other caps-only change) should work and capitalize it, like on Windows, instead of being a no-op. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Use CP_UNIXCP instead of the hack. (thanks Zeb!). But I can't reproduce the testbot failures with MoveFile on my wine install, even on a totally fresh prefix, and I can't use the testbot either since it is a Wine failure not a Windows test failure. Is it a false positive or pre-existing failure? dlls/kernel32/path.c | 73 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index cf1c768..f5ba38a 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1136,6 +1136,16 @@ static BOOL is_same_file(HANDLE h1, HANDLE h2) return ret; } +static ULONG get_handle_attr(HANDLE handle) +{ + FILE_BASIC_INFORMATION info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryInformationFile(handle, &io, &info, sizeof(info), FileBasicInformation); + return status != STATUS_SUCCESS ? 0 : info.FileAttributes; +} + /************************************************************************** * CopyFileW (KERNEL32.@) */ @@ -1317,6 +1327,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, NTSTATUS status; HANDLE source_handle = 0, dest_handle = 0; ANSI_STRING source_unix, dest_unix; + BOOL same_file = FALSE; DWORD options; TRACE("(%s,%s,%p,%p,%04x)\n", @@ -1369,18 +1380,22 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_PATH_NOT_FOUND ); goto error; } - options = FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT; + options = FILE_SYNCHRONOUS_IO_NONALERT; if (flag & MOVEFILE_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, options ); if (status == STATUS_SUCCESS) /* destination exists */ { - if (!(flag & MOVEFILE_REPLACE_EXISTING)) + ULONG attrib = 0; + + if (!(flag & MOVEFILE_REPLACE_EXISTING) || + ((attrib = get_handle_attr(dest_handle)) & FILE_ATTRIBUTE_DIRECTORY)) { - if (!is_same_file( source_handle, dest_handle )) + if (!(same_file = is_same_file( source_handle, dest_handle ))) { - SetLastError( ERROR_ALREADY_EXISTS ); + SetLastError( (attrib & FILE_ATTRIBUTE_DIRECTORY) + ? ERROR_ACCESS_DENIED : ERROR_ALREADY_EXISTS ); RtlFreeUnicodeString( &nt_name ); goto error; } @@ -1390,6 +1405,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_ACCESS_DENIED ); goto error; } + else same_file = is_same_file( source_handle, dest_handle ); NtClose( dest_handle ); dest_handle = NULL; @@ -1402,13 +1418,60 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } status = wine_nt_to_unix_file_name( &nt_name, &dest_unix, FILE_OPEN_IF, FALSE ); - RtlFreeUnicodeString( &nt_name ); if (status != STATUS_SUCCESS && status != STATUS_NO_SUCH_FILE) { + RtlFreeUnicodeString( &nt_name ); SetLastError( RtlNtStatusToDosError(status) ); goto error; } + /* When it's renaming to the same file, preserve the case sensitivity of the last + component, so that renaming a\b\c\foobar to a\b\c\Foobar works correctly like + on Windows, but note that due to hard links the paths must be exactly identical */ + if (same_file && source_unix.Length == dest_unix.Length && + !memcmp(source_unix.Buffer, dest_unix.Buffer, dest_unix.Length)) + { + size_t nt_filename_len, pathlen; + const WCHAR *nt_filename; + BOOL used_default; + char *tmp; + INT num; + + nt_filename = memrchrW(nt_name.Buffer, '\\', nt_name.Length) + 1; + nt_filename_len = nt_name.Length - (nt_filename - nt_name.Buffer); + + /* Build it from path + filename (the latter converted from nt_name) */ + num = WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + NULL, 0, NULL, &used_default); + if (!num && GetLastError() == ERROR_INVALID_PARAMETER) + { + num = WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + NULL, 0, NULL, NULL); + used_default = FALSE; + } + + if (!used_default && num > 0) + { + for (pathlen = dest_unix.Length; --pathlen > 0;) + if (dest_unix.Buffer[pathlen] == '/') { pathlen++; break; } + + tmp = dest_unix.Buffer; + if (dest_unix.MaximumLength < pathlen + num + 1) + tmp = RtlReAllocateHeap(GetProcessHeap(), 0, tmp, pathlen + num + 1); + if (tmp) + { + dest_unix.Buffer = tmp; + dest_unix.Length = pathlen + num; + dest_unix.MaximumLength = dest_unix.Length + 1; + dest_unix.Buffer[dest_unix.Length] = '\0'; + + WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + dest_unix.Buffer + pathlen, num, NULL, NULL); + } + } + } + RtlFreeUnicodeString( &nt_name ); + /* now perform the rename */ if (rename( source_unix.Buffer, dest_unix.Buffer ) == -1) -- 2.20.1

2 3

[PATCH] mfplat/tests: Fix the trailing '\n's in ok() messages.
by Francois Gouget 12 Mar '19

12 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mfplat/tests/mfplat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3fa729b50ee..4eaa1c18993 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -990,9 +990,9 @@ static void test_MFCreateAsyncResult(void) ok(state == (IUnknown *)result, "Unexpected state.\n"); refcount = IMFAsyncResult_Release(result2); - ok(!refcount, "Unexpected refcount %u\n.", refcount); + ok(!refcount, "Unexpected refcount %u.\n", refcount); refcount = IMFAsyncResult_Release(result); - ok(!refcount, "Unexpected refcount %u\n.", refcount); + ok(!refcount, "Unexpected refcount %u.\n", refcount); /* Event handle is closed on release. */ hr = MFCreateAsyncResult(NULL, NULL, NULL, &result); @@ -1005,7 +1005,7 @@ static void test_MFCreateAsyncResult(void) ok(ret, "Failed to get handle info.\n"); refcount = IMFAsyncResult_Release(result); - ok(!refcount, "Unexpected refcount %u\n.", refcount); + ok(!refcount, "Unexpected refcount %u.\n", refcount); ret = GetHandleInformation(event, &flags); ok(!ret, "Expected handle to be closed.\n"); @@ -1019,7 +1019,7 @@ static void test_MFCreateAsyncResult(void) ok(ret, "Failed to get handle info.\n"); refcount = IMFAsyncResult_Release(result); - ok(!refcount, "Unexpected refcount %u\n.", refcount); + ok(!refcount, "Unexpected refcount %u.\n", refcount); ret = GetHandleInformation(event, &flags); ok(!ret, "Expected handle to be closed.\n"); } @@ -1752,7 +1752,7 @@ static void test_MFInvokeCallback(void) ok(ret == WAIT_TIMEOUT, "Expected timeout, ret %#x.\n", ret); refcount = IMFAsyncResult_Release(result); - ok(!refcount, "Unexpected refcount %u\n.", refcount); + ok(!refcount, "Unexpected refcount %u.\n", refcount); hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); -- 2.20.1

2 1

[PATCH] ws2_32: Handle EISCONN from sendmsg
by Rob Hughes 12 Mar '19

12 Mar '19

When calling sendmsg on a socket that's already connected, some implementations will return EISCONN if you specify a recipient (notably, Darwin/OSX with UDP connections). Newer versions of Linux and Windows will simply ignore the destination parameter. Signed-off-by: Rob Hughes <rbhughes(a)gmail.com> --- dlls/ws2_32/socket.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3755338ee8..c75a7047ce 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2628,6 +2628,11 @@ static int WS2_send( int fd, struct ws2_async *wsa, int flags ) while ((ret = sendmsg(fd, &hdr, flags)) == -1) { + if (errno == EISCONN) { + hdr.msg_name = 0; + hdr.msg_namelen = 0; + continue; + } if (errno != EINTR) return -1; } -- 2.19.1

1 0

[PATCH] windowscodecs: Remove redundant not-NULL checks (coccinellery)
by Michael Stefaniuc 12 Mar '19

12 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return copypixels_to_24bppBGR() if prc is NULL. dlls/windowscodecs/converter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 3b3030bfc4..72cbf1f18b 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -1348,7 +1348,7 @@ static HRESULT copypixels_to_8bppGray(struct FormatConverter *This, const WICRec if (!srcdata) return E_OUTOFMEMORY; hr = copypixels_to_24bppBGR(This, prc, srcstride, srcdatasize, srcdata, source_format); - if (SUCCEEDED(hr) && prc) + if (SUCCEEDED(hr)) { INT x, y; BYTE *src = srcdata, *dst = pbBuffer; @@ -1438,7 +1438,7 @@ static HRESULT copypixels_to_8bppIndexed(struct FormatConverter *This, const WIC if (!srcdata) return E_OUTOFMEMORY; hr = copypixels_to_24bppBGR(This, prc, srcstride, srcdatasize, srcdata, source_format); - if (SUCCEEDED(hr) && prc) + if (SUCCEEDED(hr)) { INT x, y; BYTE *src = srcdata, *dst = pbBuffer; -- 2.20.1

2 1

[PATCH 10/10] mshtml: Move SetDesignMode call to create_document_node.
by Jacek Caban 12 Mar '19

12 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 13 +++++++++++++ dlls/mshtml/htmlwindow.c | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-)

1 0

[PATCH 09/10] mshtml: Move init_editor to HTMLDocumentNode.
by Jacek Caban 12 Mar '19

12 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/editor.c | 6 +++--- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/mutation.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)

1 0

[PATCH 08/10] mshtml: Get rid of handle_edit_load.
by Jacek Caban 12 Mar '19

12 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/editor.c | 5 ----- dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-)

1 0

[PATCH 07/10] mshtml: Move cmdtable_t to HTMLDocumentNode.
by Jacek Caban 12 Mar '19

12 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/editor.c | 292 ++++++++++++++++------------------- dlls/mshtml/mshtml_private.h | 10 +- dlls/mshtml/olecmd.c | 265 +++++++++++++++---------------- 3 files changed, 274 insertions(+), 293 deletions(-)

1 0

[PATCH 05/10] mshtml: Move IsDirty implementation to GeckoBrowser.
by Jacek Caban 12 Mar '19

12 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/editor.c | 7 +++---- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/persist.c | 5 +---- 3 files changed, 5 insertions(+), 9 deletions(-)

1 0

[PATCH 06/10] mshtml: Move do_ns_command to HTMLDocumentNode.
by Jacek Caban 12 Mar '19

12 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/editor.c | 26 +++++++++++--------------- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/olecmd.c | 23 +++++++++++++---------- 3 files changed, 25 insertions(+), 26 deletions(-)

1 0

[PATCH 04/10] mshtml: Pass document node to handle_edit_event.
by Jacek Caban 12 Mar '19

12 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/editor.c | 20 ++++++++++---------- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsevents.c | 6 ++---- 3 files changed, 13 insertions(+), 15 deletions(-)

1 0

[PATCH 03/10] mshtml: Move user mode to GeckoBrowser.
by Jacek Caban 12 Mar '19

12 Mar '19

1 0

[PATCH 02/10] mshtml: Move cycle collection to detach_gecko_browser.
by Jacek Caban 12 Mar '19

12 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 11 ----------- dlls/mshtml/nsembed.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 11 deletions(-)

1 0

[PATCH 01/10] mshtml: Move script mode handling to GeckoBrowser.
by Jacek Caban 12 Mar '19

12 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlscript.h | 2 +- dlls/mshtml/htmlwindow.c | 1 - dlls/mshtml/mshtml_private.h | 18 ++++++++++------ dlls/mshtml/nsembed.c | 1 + dlls/mshtml/persist.c | 19 +++------------- dlls/mshtml/script.c | 42 +++++++++++++++++++++++++----------- 6 files changed, 45 insertions(+), 38 deletions(-)

1 0

[PATCH] user32/tests: Remove a space before a '\n'.
by Francois Gouget 12 Mar '19

12 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/tests/monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 8bf284a5e1c..c5e67453229 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -195,7 +195,7 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index sscanf(device->DeviceID, "\\\\?\\DISPLAY#Default_Monitor#%[^#]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}", buffer) == 1 || /* win8+ */ (!lstrcmpiA(buffer, device_id_prefix) && sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1), /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ - "#%d: wrong DeviceID : %s \n", monitor_index, device->DeviceID); + "#%d: wrong DeviceID : %s\n", monitor_index, device->DeviceID); } else { -- 2.20.1

1 0

[PATCH] gdi32: Fix the FreeType case in a comment.
by Francois Gouget 12 Mar '19

12 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 098faff3426..68d232e2da2 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4178,7 +4178,7 @@ static BOOL init_freetype(void) ((FT_Version.minor << 8) & 0x00ff00) | ((FT_Version.patch ) & 0x0000ff); - /* In Freetype < 2.8.1 v40's FT_LOAD_TARGET_MONO has broken advance widths. */ + /* In FreeType < 2.8.1 v40's FT_LOAD_TARGET_MONO has broken advance widths. */ if (pFT_Property_Set && FT_SimpleVersion < FT_VERSION_VALUE(2, 8, 1)) { FT_UInt interpreter_version = 35; -- 2.20.1

1 0

[PATCH] strmbase: A spelling fix in a comment.
by Francois Gouget 12 Mar '19

12 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/strmbase/qualitycontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 970164e0eb8..456ef83c5ea 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -128,7 +128,7 @@ HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityContro #define UPDATE_RUNNING_AVG(avg,val) DO_RUNNING_AVG(avg,val,8) /* the windows for these running averages are experimentally obtained. - * possitive values get averaged more while negative values use a small + * positive values get averaged more while negative values use a small * window so we can react faster to badness. */ #define UPDATE_RUNNING_AVG_P(avg,val) DO_RUNNING_AVG(avg,val,16) #define UPDATE_RUNNING_AVG_N(avg,val) DO_RUNNING_AVG(avg,val,4) -- 2.20.1

1 0

[PATCH v3 1/3] opencl: Add OpenCL 1.0 function pointer loader.
by Nakarin Khankham 12 Mar '19

12 Mar '19

Signed-off-by: Nakarin Khankham <garuda2550(a)gmail.com> --- v2: Use function pointer instead of call the function directly. v3: Remove WINAPI from function pointer prototype, SIZE_T => size_t. --- configure | 56 ++++++++ configure.ac | 1 + dlls/opencl/opencl.c | 321 +++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 3 + 4 files changed, 381 insertions(+) diff --git a/configure b/configure index 1d80c01f3f..003e0739a9 100755 --- a/configure +++ b/configure @@ -11810,6 +11810,62 @@ if test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" = xyes; then : fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lOpenCL" >&5 +$as_echo_n "checking for -lOpenCL... " >&6; } +if ${ac_cv_lib_soname_OpenCL+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lOpenCL $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char clGetPlatformInfo (); +int +main () +{ +return clGetPlatformInfo (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + case "$LIBEXT" in + dll) ac_cv_lib_soname_OpenCL=`$ac_cv_path_LDD conftest.exe | grep "OpenCL" | sed -e "s/dll.*/dll/"';2,$d'` ;; + dylib) ac_cv_lib_soname_OpenCL=`$OTOOL -L conftest$ac_exeext | grep "libOpenCL\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libOpenCL\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_OpenCL=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libOpenCL\\.$LIBEXT" | sed -e "s/^.*\\[\$libOpenCL\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` + if ${ac_cv_lib_soname_OpenCL:+false} :; then : + ac_cv_lib_soname_OpenCL=`$LDD conftest$ac_exeext | grep "libOpenCL\\.$LIBEXT" | sed -e "s/^.*$libOpenCL\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` +fi ;; + esac +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if ${ac_cv_lib_soname_OpenCL:+false} :; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + cat >>confdefs.h <<_ACEOF +#define SONAME_LIBOPENCL "libOpenCL.$LIBEXT" +_ACEOF + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_OpenCL" >&5 +$as_echo "$ac_cv_lib_soname_OpenCL" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBOPENCL "$ac_cv_lib_soname_OpenCL" +_ACEOF + + +fi fi if test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes; then : case "x$with_opencl" in diff --git a/configure.ac b/configure.ac index 71e8606e7c..137b7302d8 100644 --- a/configure.ac +++ b/configure.ac @@ -1264,6 +1264,7 @@ dnl **** Check for OpenCL **** if test "$ac_cv_header_CL_cl_h" = "yes" then AC_CHECK_LIB(OpenCL,clGetPlatformInfo,[AC_SUBST(OPENCL_LIBS,["-lOpenCL"])]) + WINE_CHECK_SONAME(OpenCL,clGetPlatformInfo,,[AC_DEFINE_UNQUOTED(SONAME_LIBOPENCL,["libOpenCL.$LIBEXT"])]) fi WINE_NOTICE_WITH(opencl,[test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes], [OpenCL ${notice_platform}development files not found, OpenCL won't be supported.], diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 2d145bf25c..7d292c03be 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -43,6 +43,327 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl); #define OPENCL_WITH_GL 0 +/* Platform API */ +static cl_int (*pclGetPlatformIDs)(cl_uint num_entries, cl_platform_id *platforms, cl_uint *num_platforms); +static cl_int (*pclGetPlatformInfo)(cl_platform_id platform, cl_platform_info param_name, + size_t param_value_size, void * param_value, size_t * param_value_size_ret); + +/* Device APIs */ +static cl_int (*pclGetDeviceIDs)(cl_platform_id platform, cl_device_type device_type, + cl_uint num_entries, cl_device_id * devices, cl_uint * num_devices); +static cl_int (*pclGetDeviceInfo)(cl_device_id device, cl_device_info param_name, + size_t param_value_size, void * param_value, size_t * param_value_size_ret); + +/* Context APIs */ +static cl_context (*pclCreateContext)(const cl_context_properties * properties, cl_uint num_devices, const cl_device_id * devices, + void (*pfn_notify)(const char *errinfo, const void *private_info, size_t cb, void *user_data), + void * user_data, cl_int * errcode_ret); +static cl_context (*pclCreateContextFromType)(const cl_context_properties * properties, cl_device_type device_type, + void (*pfn_notify)(const char *errinfo, const void *private_info, size_t cb, void *user_data), + void * user_data, cl_int * errcode_ret); +static cl_int (*pclRetainContext)(cl_context context); +static cl_int (*pclReleaseContext)(cl_context context); +static cl_int (*pclGetContextInfo)(cl_context context, cl_context_info param_name, + size_t param_value_size, void * param_value, size_t * param_value_size_ret); + +/* Command Queue APIs */ +static cl_command_queue (*pclCreateCommandQueue)(cl_context context, cl_device_id device, + cl_command_queue_properties properties, cl_int * errcode_ret); +static cl_int (*pclRetainCommandQueue)(cl_command_queue command_queue); +static cl_int (*pclReleaseCommandQueue)(cl_command_queue command_queue); +static cl_int (*pclGetCommandQueueInfo)(cl_command_queue command_queue, cl_command_queue_info param_name, + size_t param_value_size, void * param_value, size_t * param_value_size_ret); +static cl_int (*pclSetCommandQueueProperty)(cl_command_queue command_queue, cl_command_queue_properties properties, cl_bool enable, + cl_command_queue_properties * old_properties); + +/* Memory Object APIs */ +static cl_mem (*pclCreateBuffer)(cl_context context, cl_mem_flags flags, size_t size, void * host_ptr, cl_int * errcode_ret); +static cl_mem (*pclCreateImage2D)(cl_context context, cl_mem_flags flags, cl_image_format * image_format, + size_t image_width, size_t image_height, size_t image_row_pitch, void * host_ptr, cl_int * errcode_ret); +static cl_mem (*pclCreateImage3D)(cl_context context, cl_mem_flags flags, cl_image_format * image_format, + size_t image_width, size_t image_height, size_t image_depth, size_t image_row_pitch, size_t image_slice_pitch, + void * host_ptr, cl_int * errcode_ret); +static cl_int (*pclRetainMemObject)(cl_mem memobj); +static cl_int (*pclReleaseMemObject)(cl_mem memobj); +static cl_int (*pclGetSupportedImageFormats)(cl_context context, cl_mem_flags flags, cl_mem_object_type image_type, cl_uint num_entries, + cl_image_format * image_formats, cl_uint * num_image_formats); +static cl_int (*pclGetMemObjectInfo)(cl_mem memobj, cl_mem_info param_name, size_t param_value_size, void * param_value, size_t * param_value_size_ret); +static cl_int (*pclGetImageInfo)(cl_mem image, cl_image_info param_name, size_t param_value_size, void * param_value, size_t * param_value_size_ret); + +/* Sampler APIs */ +static cl_sampler (*pclCreateSampler)(cl_context context, cl_bool normalized_coords, cl_addressing_mode addressing_mode, + cl_filter_mode filter_mode, cl_int * errcode_ret); +static cl_int (*pclRetainSampler)(cl_sampler sampler); +static cl_int (*pclReleaseSampler)(cl_sampler sampler); +static cl_int (*pclGetSamplerInfo)(cl_sampler sampler, cl_sampler_info param_name, size_t param_value_size, + void * param_value, size_t * param_value_size_ret); + +/* Program Object APIs */ +static cl_program (*pclCreateProgramWithSource)(cl_context context, cl_uint count, const char ** strings, + const size_t * lengths, cl_int * errcode_ret); +static cl_program (*pclCreateProgramWithBinary)(cl_context context, cl_uint num_devices, const cl_device_id * device_list, + const size_t * lengths, const unsigned char ** binaries, cl_int * binary_status, + cl_int * errcode_ret); +static cl_int (*pclRetainProgram)(cl_program program); +static cl_int (*pclReleaseProgram)(cl_program program); +static cl_int (*pclBuildProgram)(cl_program program, cl_uint num_devices, const cl_device_id * device_list, const char * options, + void (*pfn_notify)(cl_program program, void * user_data), + void * user_data); +static cl_int (*pclUnloadCompiler)(void); +static cl_int (*pclGetProgramInfo)(cl_program program, cl_program_info param_name, + size_t param_value_size, void * param_value, size_t * param_value_size_ret); +static cl_int (*pclGetProgramBuildInfo)(cl_program program, cl_device_id device, + cl_program_build_info param_name, size_t param_value_size, void * param_value, + size_t * param_value_size_ret); + +/* Kernel Object APIs */ +static cl_kernel (*pclCreateKernel)(cl_program program, char * kernel_name, cl_int * errcode_ret); +static cl_int (*pclCreateKernelsInProgram)(cl_program program, cl_uint num_kernels, + cl_kernel * kernels, cl_uint * num_kernels_ret); +static cl_int (*pclRetainKernel)(cl_kernel kernel); +static cl_int (*pclReleaseKernel)(cl_kernel kernel); +static cl_int (*pclSetKernelArg)(cl_kernel kernel, cl_uint arg_index, size_t arg_size, void * arg_value); +static cl_int (*pclGetKernelInfo)(cl_kernel kernel, cl_kernel_info param_name, + size_t param_value_size, void * param_value, size_t * param_value_size_ret); +static cl_int (*pclGetKernelWorkGroupInfo)(cl_kernel kernel, cl_device_id device, + cl_kernel_work_group_info param_name, size_t param_value_size, + void * param_value, size_t * param_value_size_ret); +/* Event Object APIs */ +static cl_int (*pclWaitForEvents)(cl_uint num_events, cl_event * event_list); +static cl_int (*pclGetEventInfo)(cl_event event, cl_event_info param_name, size_t param_value_size, + void * param_value, size_t * param_value_size_ret); +static cl_int (*pclRetainEvent)(cl_event event); +static cl_int (*pclReleaseEvent)(cl_event event); + +/* Profiling APIs */ +static cl_int (*pclGetEventProfilingInfo)(cl_event event, cl_profiling_info param_name, size_t param_value_size, + void * param_value, size_t * param_value_size_ret); + +/* Flush and Finish APIs */ +static cl_int (*pclFlush)(cl_command_queue command_queue); +static cl_int (*pclFinish)(cl_command_queue command_queue); + +/* Enqueued Commands APIs */ +static cl_int (*pclEnqueueReadBuffer)(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, + size_t offset, size_t cb, void * ptr, + cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueWriteBuffer)(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, + size_t offset, size_t cb, const void * ptr, + cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueCopyBuffer)(cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, + size_t src_offset, size_t dst_offset, size_t cb, + cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueReadImage)(cl_command_queue command_queue, cl_mem image, cl_bool blocking_read, + const size_t * origin, const size_t * region, + size_t row_pitch, size_t slice_pitch, void * ptr, + cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueWriteImage)(cl_command_queue command_queue, cl_mem image, cl_bool blocking_write, + const size_t * origin, const size_t * region, + size_t input_row_pitch, size_t input_slice_pitch, const void * ptr, + cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueCopyImage)(cl_command_queue command_queue, cl_mem src_image, cl_mem dst_image, + size_t * src_origin, size_t * dst_origin, size_t * region, + cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueCopyImageToBuffer)(cl_command_queue command_queue, cl_mem src_image, cl_mem dst_buffer, + size_t * src_origin, size_t * region, size_t dst_offset, + cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueCopyBufferToImage)(cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_image, + size_t src_offset, size_t * dst_origin, size_t * region, + cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event); +static void * (*pclEnqueueMapBuffer)(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_map, + cl_map_flags map_flags, size_t offset, size_t cb, + cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event, cl_int * errcode_ret); +static void * (*pclEnqueueMapImage)(cl_command_queue command_queue, cl_mem image, cl_bool blocking_map, + cl_map_flags map_flags, size_t * origin, size_t * region, + size_t * image_row_pitch, size_t * image_slice_pitch, + cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event, cl_int * errcode_ret); +static cl_int (*pclEnqueueUnmapMemObject)(cl_command_queue command_queue, cl_mem memobj, void * mapped_ptr, + cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueNDRangeKernel)(cl_command_queue command_queue, cl_kernel kernel, cl_uint work_dim, + size_t * global_work_offset, size_t * global_work_size, size_t * local_work_size, + cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueTask)(cl_command_queue command_queue, cl_kernel kernel, + cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueNativeKernel)(cl_command_queue command_queue, + void (*user_func)(void *args), + void * args, size_t cb_args, + cl_uint num_mem_objects, const cl_mem * mem_list, const void ** args_mem_loc, + cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueMarker)(cl_command_queue command_queue, cl_event * event); +static cl_int (*pclEnqueueWaitForEvents)(cl_command_queue command_queue, cl_uint num_events, cl_event * event_list); +static cl_int (*pclEnqueueBarrier)(cl_command_queue command_queue); + +/* Extension function access */ +static void * (*pclGetExtensionFunctionAddress)(const char * func_name); + + +static BOOL init_opencl(void); +static BOOL load_opencl_func(void); + +static void * opencl_handle = NULL; + + +/*********************************************************************** + * DllMain [Internal] + * + * Initializes the internal 'opencl.dll'. + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) +{ + TRACE("opencl.dll: %p,%x,%p\n", hinstDLL, reason, reserved); + + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + if (init_opencl()) + load_opencl_func(); + break; + + case DLL_PROCESS_DETACH: + if (reserved) break; + if (opencl_handle) wine_dlclose(opencl_handle, NULL, 0); + } + + return TRUE; +} + + +/*********************************************************************** + * init_opencl [Internal] + * + * Initializes OpenCL library. + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +static BOOL init_opencl(void) +{ +#ifdef SONAME_LIBOPENCL + char error[256]; + + opencl_handle = wine_dlopen(SONAME_LIBOPENCL, RTLD_NOW, error, sizeof(error)); + if (opencl_handle != NULL) + { + TRACE("Opened library %s\n", SONAME_LIBOPENCL); + return TRUE; + } + else + ERR("Failed to open library %s: %s\n", SONAME_LIBOPENCL, error); +#else + ERR("OpenCL is needed but support was not included at build time\n"); +#endif + return FALSE; +} + + +/*********************************************************************** + * load_opencl_func [Internal] + * + * Populate function table. + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +static BOOL load_opencl_func(void) +{ + char error[256]; + + if (opencl_handle == NULL) + return FALSE; + +#define LOAD_FUNCPTR(f) \ + if (!(p##f = wine_dlsym(opencl_handle, #f, error, sizeof(error)))) \ + WARN("%s not found in %s (%s)\n", #f, SONAME_LIBOPENCL, error); + + /* Platform API */ + LOAD_FUNCPTR(clGetPlatformIDs); + LOAD_FUNCPTR(clGetPlatformInfo); + /* Device APIs */ + LOAD_FUNCPTR(clGetDeviceIDs); + LOAD_FUNCPTR(clGetDeviceInfo); + /* Context APIs */ + LOAD_FUNCPTR(clCreateContext); + LOAD_FUNCPTR(clCreateContextFromType); + LOAD_FUNCPTR(clRetainContext); + LOAD_FUNCPTR(clReleaseContext); + LOAD_FUNCPTR(clGetContextInfo); + /* Command Queue APIs */ + LOAD_FUNCPTR(clCreateCommandQueue); + LOAD_FUNCPTR(clRetainCommandQueue); + LOAD_FUNCPTR(clReleaseCommandQueue); + LOAD_FUNCPTR(clGetCommandQueueInfo); + LOAD_FUNCPTR(clSetCommandQueueProperty); + /* Memory Object APIs */ + LOAD_FUNCPTR(clCreateBuffer); + LOAD_FUNCPTR(clCreateImage2D); + LOAD_FUNCPTR(clCreateImage3D); + LOAD_FUNCPTR(clRetainMemObject); + LOAD_FUNCPTR(clReleaseMemObject); + LOAD_FUNCPTR(clGetSupportedImageFormats); + LOAD_FUNCPTR(clGetMemObjectInfo); + LOAD_FUNCPTR(clGetImageInfo); + /* Sampler APIs */ + LOAD_FUNCPTR(clCreateSampler); + LOAD_FUNCPTR(clRetainSampler); + LOAD_FUNCPTR(clReleaseSampler); + LOAD_FUNCPTR(clGetSamplerInfo); + /* Program Object APIs */ + LOAD_FUNCPTR(clCreateProgramWithSource); + LOAD_FUNCPTR(clCreateProgramWithBinary); + LOAD_FUNCPTR(clRetainProgram); + LOAD_FUNCPTR(clReleaseProgram); + LOAD_FUNCPTR(clBuildProgram); + LOAD_FUNCPTR(clUnloadCompiler); + LOAD_FUNCPTR(clGetProgramInfo); + LOAD_FUNCPTR(clGetProgramBuildInfo); + /* Kernel Object APIs */ + LOAD_FUNCPTR(clCreateKernel); + LOAD_FUNCPTR(clCreateKernelsInProgram); + LOAD_FUNCPTR(clRetainKernel); + LOAD_FUNCPTR(clReleaseKernel); + LOAD_FUNCPTR(clSetKernelArg); + LOAD_FUNCPTR(clGetKernelInfo); + LOAD_FUNCPTR(clGetKernelWorkGroupInfo); + /* Event Object APIs */ + LOAD_FUNCPTR(clWaitForEvents); + LOAD_FUNCPTR(clGetEventInfo); + LOAD_FUNCPTR(clRetainEvent); + LOAD_FUNCPTR(clReleaseEvent); + /* Profiling APIs */ + LOAD_FUNCPTR(clGetEventProfilingInfo); + /* Flush and Finish APIs */ + LOAD_FUNCPTR(clFlush); + LOAD_FUNCPTR(clFinish); + /* Enqueued Commands APIs */ + LOAD_FUNCPTR(clEnqueueReadBuffer); + LOAD_FUNCPTR(clEnqueueWriteBuffer); + LOAD_FUNCPTR(clEnqueueCopyBuffer); + LOAD_FUNCPTR(clEnqueueReadImage); + LOAD_FUNCPTR(clEnqueueWriteImage); + LOAD_FUNCPTR(clEnqueueCopyImage); + LOAD_FUNCPTR(clEnqueueCopyImageToBuffer); + LOAD_FUNCPTR(clEnqueueCopyBufferToImage); + LOAD_FUNCPTR(clEnqueueMapBuffer); + LOAD_FUNCPTR(clEnqueueMapImage); + LOAD_FUNCPTR(clEnqueueUnmapMemObject); + LOAD_FUNCPTR(clEnqueueNDRangeKernel); + LOAD_FUNCPTR(clEnqueueTask); + LOAD_FUNCPTR(clEnqueueNativeKernel); + LOAD_FUNCPTR(clEnqueueMarker); + LOAD_FUNCPTR(clEnqueueWaitForEvents); + LOAD_FUNCPTR(clEnqueueBarrier); + /* Extension function access */ + LOAD_FUNCPTR(clGetExtensionFunctionAddress); + +#undef LOAD_FUNCPTR + + return TRUE; +} + + /*---------------------------------------------------------------*/ /* Platform API */ diff --git a/include/config.h.in b/include/config.h.in index 999f4a6130..a08e81c86e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1548,6 +1548,9 @@ /* Define to the soname of the libopenal library. */ #undef SONAME_LIBOPENAL +/* Define to the soname of the libOpenCL library. */ +#undef SONAME_LIBOPENCL + /* Define to the soname of the libOSMesa library. */ #undef SONAME_LIBOSMESA -- 2.17.1

3 3

[PATCH 1/2] kernel32/path: Allow renaming a file/directory to a different capitalization of itself
by Gabriel Ivăncescu 12 Mar '19

12 Mar '19

Renaming a file or directory from e.g. foobar to FooBar (or any other caps-only change) should work and capitalize it, like on Windows, instead of being a no-op. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Currently Wine simply finds the existing foobar and thus "changes" it from foobar to foobar, which is a no-op and wrong. This is especially annoying with file managers when trying to rename files to different capitalization... The __wine_wcstoumbs is taken from the similar __wine_init_codepages layout used in locale.c. I've had to do it this way and export it because accessing the ntdll_wcstoumbs internal function is required here to build the filename in its original capitalization, untouched. I am aware that the extern function declaration may not be acceptable, but I made it similar to __wine_init_codepages. I'd appreciate some feedback on how to do this better. dlls/kernel32/path.c | 69 +++++++++++++++++++++++++++++++++++++++---- dlls/ntdll/ntdll.spec | 1 + 2 files changed, 65 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index cf1c768..cda55f5 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1136,6 +1136,16 @@ static BOOL is_same_file(HANDLE h1, HANDLE h2) return ret; } +static ULONG get_handle_attr(HANDLE handle) +{ + FILE_BASIC_INFORMATION info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryInformationFile(handle, &io, &info, sizeof(info), FileBasicInformation); + return status != STATUS_SUCCESS ? 0 : info.FileAttributes; +} + /************************************************************************** * CopyFileW (KERNEL32.@) */ @@ -1310,6 +1320,9 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, LPPROGRESS_ROUTINE fnProgress, LPVOID param, DWORD flag ) { + extern int __wine_wcstoumbs(DWORD flags, const WCHAR* src, int srclen, char* dst, + int dstlen, const char* defchar, int *used); + FILE_BASIC_INFORMATION info; UNICODE_STRING nt_name; OBJECT_ATTRIBUTES attr; @@ -1317,6 +1330,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, NTSTATUS status; HANDLE source_handle = 0, dest_handle = 0; ANSI_STRING source_unix, dest_unix; + BOOL same_file = FALSE; DWORD options; TRACE("(%s,%s,%p,%p,%04x)\n", @@ -1369,18 +1383,22 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_PATH_NOT_FOUND ); goto error; } - options = FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT; + options = FILE_SYNCHRONOUS_IO_NONALERT; if (flag & MOVEFILE_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, options ); if (status == STATUS_SUCCESS) /* destination exists */ { - if (!(flag & MOVEFILE_REPLACE_EXISTING)) + ULONG attr = 0; + + if (!(flag & MOVEFILE_REPLACE_EXISTING) || + ((attr = get_handle_attr(dest_handle)) & FILE_ATTRIBUTE_DIRECTORY)) { - if (!is_same_file( source_handle, dest_handle )) + if (!(same_file = is_same_file( source_handle, dest_handle ))) { - SetLastError( ERROR_ALREADY_EXISTS ); + SetLastError( (attr & FILE_ATTRIBUTE_DIRECTORY) + ? ERROR_ACCESS_DENIED : ERROR_ALREADY_EXISTS ); RtlFreeUnicodeString( &nt_name ); goto error; } @@ -1390,6 +1408,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_ACCESS_DENIED ); goto error; } + else same_file = is_same_file( source_handle, dest_handle ); NtClose( dest_handle ); dest_handle = NULL; @@ -1402,13 +1421,53 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } status = wine_nt_to_unix_file_name( &nt_name, &dest_unix, FILE_OPEN_IF, FALSE ); - RtlFreeUnicodeString( &nt_name ); if (status != STATUS_SUCCESS && status != STATUS_NO_SUCH_FILE) { SetLastError( RtlNtStatusToDosError(status) ); + RtlFreeUnicodeString( &nt_name ); goto error; } + /* when it's renaming to the same file, preserve the case sensitivity of the last + component, so that renaming a\b\c\foobar to a\b\c\Foobar works correctly like + on Windows, but note that due to hard links, the paths must be exactly identical */ + if (same_file && source_unix.Length == dest_unix.Length && + !memcmp(source_unix.Buffer, dest_unix.Buffer, dest_unix.Length)) + { + size_t ntpathlen, pathlen; + int num, used_default; + char *tmp; + + /* find the '\' from the end */ + for (ntpathlen = nt_name.Length; nt_name.Buffer[--ntpathlen] != '\\';) {} + ntpathlen++; + + /* build it from path + filename (the latter converted from nt_name) */ + num = __wine_wcstoumbs(0, nt_name.Buffer + ntpathlen, nt_name.Length - ntpathlen, + NULL, 0, NULL, &used_default); + if (num > 0 && !used_default) + { + /* find the '/' from the end */ + for (pathlen = dest_unix.Length; --pathlen > 0;) + if (dest_unix.Buffer[pathlen] == '/') { pathlen++; break; } + + tmp = dest_unix.Buffer; + if (source_unix.MaximumLength < pathlen + num + 1) + tmp = RtlReAllocateHeap(GetProcessHeap(), 0, tmp, pathlen + num + 1); + if (tmp) + { + dest_unix.Buffer = tmp; + dest_unix.Length = pathlen + num; + dest_unix.MaximumLength = pathlen + num + 1; + dest_unix.Buffer[dest_unix.Length] = '\0'; + + __wine_wcstoumbs(0, nt_name.Buffer + ntpathlen, nt_name.Length - ntpathlen, + dest_unix.Buffer + pathlen, num, NULL, NULL); + } + } + } + RtlFreeUnicodeString( &nt_name ); + /* now perform the rename */ if (rename( source_unix.Buffer, dest_unix.Buffer ) == -1) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6062cfb..2299d9f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1515,6 +1515,7 @@ # Codepages @ cdecl __wine_init_codepages(ptr ptr ptr) +@ cdecl __wine_wcstoumbs(long wstr long ptr long str ptr) ntdll_wcstoumbs # signal handling @ cdecl __wine_set_signal_handler(long ptr) -- 2.20.1

3 5

[PATCH v2] gdi32: add D3DKMTCloseAdapter stub
by Louis Lenders 12 Mar '19

12 Mar '19

v2: change return value to STATUS_SUCCESS Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46571 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/gdi32/driver.c | 11 +++++++++++ dlls/gdi32/gdi32.spec | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index 405afb986f..e8aa38edf4 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -6,7 +6,7 @@ @ stub D3DKMTCheckOcclusion @ stub D3DKMTCheckSharedResourceAccess @ stub D3DKMTCheckVidPnExclusiveOwnership -@ stub D3DKMTCloseAdapter +@ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTConfigureSharedResource @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateAllocation2 diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 8920b73f59..78a16dd150 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -26,6 +26,8 @@ #include <stdarg.h> #include <string.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "ddrawgdi.h" @@ -1253,3 +1255,12 @@ NTSTATUS WINAPI D3DKMTEscape( const void *pData ) FIXME("(%p): stub\n", pData); return STATUS_NO_MEMORY; } + +/****************************************************************************** + * D3DKMTCloseAdapter [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTCloseAdapter( const void *pData ) +{ + FIXME("(%p): stub\n", pData); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2dc8f0e887..6e8f0285f4 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,6 +80,7 @@ @ stdcall CreateScalableFontResourceA(long str str str) @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) +@ stdcall D3DKMTCloseAdapter(ptr) @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) -- 2.20.1

2 1

Query in proposal
by hi 12 Mar '19

12 Mar '19

Sir/mam, Greetings, With respectfully I want to say that I am really interested on your two project in gsoc 2019. Should I write Two different proposal or Mention on only one proposal.If you don’t mind please give me an answer. Thanks, Prafful Jha

3 2

[PATCH 1/5] ddraw: Protect against invalid clipper pointers.
by Stefan Dösinger 12 Mar '19

12 Mar '19

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/ddraw/clipper.c | 66 +++++++++++++++++++++++++++++++++++--- dlls/ddraw/ddraw_private.h | 1 + 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index 01cac40ec6e..95036538d8f 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -26,9 +26,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); +static const struct IDirectDrawClipperVtbl ddraw_clipper_vtbl; + +#define DDRAW_CLIPPER_MAGIC (MAKEFOURCC('C','L','I','P')) + static inline struct ddraw_clipper *impl_from_IDirectDrawClipper(IDirectDrawClipper *iface) { - return CONTAINING_RECORD(iface, struct ddraw_clipper, IDirectDrawClipper_iface); + /* Native is very lenient when you invoke the methods (clipper or surface) with a clipper + * pointer that points to something that is either not accessible or not a clipper. Deus + * Ex: Goty depends on this. */ + struct ddraw_clipper *clipper = CONTAINING_RECORD(iface, struct ddraw_clipper, IDirectDrawClipper_iface); + + if (IsBadReadPtr(clipper, sizeof(*clipper))) + { + WARN("The application gave us a bad clipper.\n"); + return NULL; + } + if (clipper->magic != DDRAW_CLIPPER_MAGIC) + { + WARN("The application gave us a bad clipper.\n"); + return NULL; + } + return clipper; } static HRESULT WINAPI ddraw_clipper_QueryInterface(IDirectDrawClipper *iface, REFIID iid, void **object) @@ -37,6 +56,9 @@ static HRESULT WINAPI ddraw_clipper_QueryInterface(IDirectDrawClipper *iface, RE TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); + if (!clipper) + return DDERR_INVALIDPARAMS; + if (IsEqualGUID(&IID_IDirectDrawClipper, iid) || IsEqualGUID(&IID_IUnknown, iid)) { @@ -54,17 +76,31 @@ static HRESULT WINAPI ddraw_clipper_QueryInterface(IDirectDrawClipper *iface, RE static ULONG WINAPI ddraw_clipper_AddRef(IDirectDrawClipper *iface) { struct ddraw_clipper *clipper = impl_from_IDirectDrawClipper(iface); - ULONG refcount = InterlockedIncrement(&clipper->ref); + ULONG refcount; - TRACE("%p increasing refcount to %u.\n", clipper, refcount); + if (!clipper) + { + WARN("Invalid clipper, returning 0.\n"); + return 0; + } + refcount = InterlockedIncrement(&clipper->ref); + TRACE("%p increasing refcount to %u.\n", clipper, refcount); return refcount; } static ULONG WINAPI ddraw_clipper_Release(IDirectDrawClipper *iface) { struct ddraw_clipper *clipper = impl_from_IDirectDrawClipper(iface); - ULONG refcount = InterlockedDecrement(&clipper->ref); + ULONG refcount; + + if (!clipper || iface->lpVtbl != &ddraw_clipper_vtbl) + { + WARN("Invalid clipper, returning 0.\n"); + return 0; + } + + refcount = InterlockedDecrement(&clipper->ref); TRACE("%p decreasing refcount to %u.\n", clipper, refcount); @@ -72,6 +108,7 @@ static ULONG WINAPI ddraw_clipper_Release(IDirectDrawClipper *iface) { if (clipper->region) DeleteObject(clipper->region); + clipper->magic = 0; /* Should help with detecting freed clippers. */ heap_free(clipper); } @@ -84,6 +121,9 @@ static HRESULT WINAPI ddraw_clipper_SetHWnd(IDirectDrawClipper *iface, DWORD fla TRACE("iface %p, flags %#x, window %p.\n", iface, flags, window); + if (!clipper) + return DDERR_INVALIDPARAMS; + if (flags) { FIXME("flags %#x, not supported.\n", flags); @@ -161,6 +201,9 @@ static HRESULT WINAPI ddraw_clipper_GetClipList(IDirectDrawClipper *iface, RECT TRACE("iface %p, rect %s, clip_list %p, clip_list_size %p.\n", iface, wine_dbgstr_rect(rect), clip_list, clip_list_size); + if (!clipper) + return DDERR_INVALIDPARAMS; + wined3d_mutex_lock(); if (clipper->window) @@ -238,6 +281,9 @@ static HRESULT WINAPI ddraw_clipper_SetClipList(IDirectDrawClipper *iface, RGNDA TRACE("iface %p, region %p, flags %#x.\n", iface, region, flags); + if (!clipper) + return DDERR_INVALIDPARAMS; + wined3d_mutex_lock(); if (clipper->window) @@ -268,6 +314,9 @@ static HRESULT WINAPI ddraw_clipper_GetHWnd(IDirectDrawClipper *iface, HWND *win TRACE("iface %p, window %p.\n", iface, window); + if (!clipper) + return DDERR_INVALIDPARAMS; + wined3d_mutex_lock(); *window = clipper->window; wined3d_mutex_unlock(); @@ -282,6 +331,9 @@ static HRESULT WINAPI ddraw_clipper_Initialize(IDirectDrawClipper *iface, TRACE("iface %p, ddraw %p, flags %#x.\n", iface, ddraw, flags); + if (!clipper) + return DDERR_INVALIDPARAMS; + wined3d_mutex_lock(); if (clipper->initialized) { @@ -297,8 +349,13 @@ static HRESULT WINAPI ddraw_clipper_Initialize(IDirectDrawClipper *iface, static HRESULT WINAPI ddraw_clipper_IsClipListChanged(IDirectDrawClipper *iface, BOOL *changed) { + struct ddraw_clipper *clipper = impl_from_IDirectDrawClipper(iface); + FIXME("iface %p, changed %p stub!\n", iface, changed); + if (!clipper) + return DDERR_INVALIDPARAMS; + /* XXX What is safest? */ *changed = FALSE; @@ -322,6 +379,7 @@ HRESULT ddraw_clipper_init(struct ddraw_clipper *clipper) { clipper->IDirectDrawClipper_iface.lpVtbl = &ddraw_clipper_vtbl; clipper->ref = 1; + clipper->magic = DDRAW_CLIPPER_MAGIC; return DD_OK; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 77e28662724..e6971e9bc7f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -387,6 +387,7 @@ struct ddraw_clipper HWND window; HRGN region; BOOL initialized; + DWORD magic; }; HRESULT ddraw_clipper_init(struct ddraw_clipper *clipper) DECLSPEC_HIDDEN; -- 2.19.2

3 14

[PATCH] winegcc: Restore the linker option specifier for strip.
by Huw Davies 12 Mar '19

12 Mar '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index b58c39af36..94d29067e2 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -406,7 +406,7 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, "-image_base" ); strarray_add( flags, opts->image_base ); } - if (opts->strip) strarray_add( flags, "-x" ); + if (opts->strip) strarray_add( flags, "-Wl,-x" ); return flags; case PLATFORM_SOLARIS: -- 2.18.0

1 0

[PATCH 2/2] advapi32: CryptAcquireContext(CRYPT_DELETEKEYSET) should set returned provider handle to 0.
by Dmitry Timoshkov 12 Mar '19

12 Mar '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/crypt.c | 1 + dlls/advapi32/tests/crypt.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index ab1e5982da..59b2971b07 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -523,6 +523,7 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer, */ if (dwFlags & CRYPT_DELETEKEYSET) { + *phProv = 0; pProv->dwMagic = 0; FreeLibrary(pProv->hModule); CRYPT_Free(provnameA); diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 4653f33c90..adc9c1612f 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -273,7 +273,6 @@ static void test_incorrect_api_usage(void) result = pCryptAcquireContextA(&hProv2, szBadKeySet, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); ok (result, "%d\n", GetLastError()); -todo_wine ok (hProv2 == 0, "%ld\n", hProv2); if (!result) return; @@ -1183,7 +1182,6 @@ static void test_container_sd(void) ret = CryptAcquireContextA(&prov, "winetest", "Microsoft Enhanced Cryptographic Provider v1.0", PROV_RSA_FULL, CRYPT_MACHINE_KEYSET|CRYPT_DELETEKEYSET); ok(ret, "got %u\n", GetLastError()); -todo_wine ok(prov == 0, "got %ld\n", prov); } -- 2.20.1

1 0

[PATCH 1/2] advapi32/tests: Add a test for provider handle returned by CryptAcquireContext(CRYPT_DELETEKEYSET).
by Dmitry Timoshkov 12 Mar '19

12 Mar '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/tests/crypt.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 13671eb0c2..4653f33c90 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -268,12 +268,15 @@ static void test_incorrect_api_usage(void) dwTemp = CRYPT_MODE_ECB; result = pCryptSetKeyParam(hKey2, KP_MODE, (BYTE*)&dwTemp, sizeof(DWORD)); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); - + + hProv2 = 0xdeadbeef; result = pCryptAcquireContextA(&hProv2, szBadKeySet, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); ok (result, "%d\n", GetLastError()); +todo_wine + ok (hProv2 == 0, "%ld\n", hProv2); if (!result) return; - + result = pCryptReleaseContext(hProv, 0); ok (result, "%d\n", GetLastError()); if (!result) return; @@ -1176,9 +1179,12 @@ static void test_container_sd(void) ret = CryptReleaseContext(prov, 0); ok(ret, "got %u\n", GetLastError()); + prov = 0xdeadbeef; ret = CryptAcquireContextA(&prov, "winetest", "Microsoft Enhanced Cryptographic Provider v1.0", PROV_RSA_FULL, CRYPT_MACHINE_KEYSET|CRYPT_DELETEKEYSET); ok(ret, "got %u\n", GetLastError()); +todo_wine + ok(prov == 0, "got %ld\n", prov); } START_TEST(crypt) -- 2.20.1

1 0

[PATCH 1/5] mfplat: Implement CreateObjectFromURL().
by Nikolay Sivov 12 Mar '19

12 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 151 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 145 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 06be27daa3..c57dd10fd5 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1908,6 +1908,7 @@ static const IMFMediaSourceVtbl mfsourcevtbl = enum resolved_object_origin { OBJECT_FROM_BYTESTREAM, + OBJECT_FROM_URL, }; struct resolver_queued_result @@ -1937,6 +1938,7 @@ typedef struct source_resolver IMFSourceResolver IMFSourceResolver_iface; LONG refcount; IMFAsyncCallback stream_callback; + IMFAsyncCallback url_callback; CRITICAL_SECTION cs; struct list pending; } mfsourceresolver; @@ -1951,6 +1953,11 @@ static struct source_resolver *impl_from_stream_IMFAsyncCallback(IMFAsyncCallbac return CONTAINING_RECORD(iface, struct source_resolver, stream_callback); } +static struct source_resolver *impl_from_url_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct source_resolver, url_callback); +} + static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enum resolved_object_origin origin, IMFAsyncResult *result) { @@ -1960,6 +1967,7 @@ static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enu { IUnknown *handler; IMFByteStreamHandler *stream_handler; + IMFSchemeHandler *scheme_handler; } handler; queued_result = heap_alloc(sizeof(*queued_result)); @@ -1972,6 +1980,10 @@ static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enu queued_result->hr = IMFByteStreamHandler_EndCreateObject(handler.stream_handler, result, &queued_result->obj_type, &queued_result->object); break; + case OBJECT_FROM_URL: + queued_result->hr = IMFSchemeHandler_EndCreateObject(handler.scheme_handler, result, &queued_result->obj_type, + &queued_result->object); + break; default: queued_result->hr = E_FAIL; } @@ -2132,6 +2144,34 @@ static const IMFAsyncCallbackVtbl source_resolver_callback_stream_vtbl = source_resolver_callback_stream_Invoke, }; +static ULONG WINAPI source_resolver_callback_url_AddRef(IMFAsyncCallback *iface) +{ + struct source_resolver *resolver = impl_from_url_IMFAsyncCallback(iface); + return IMFSourceResolver_AddRef(&resolver->IMFSourceResolver_iface); +} + +static ULONG WINAPI source_resolver_callback_url_Release(IMFAsyncCallback *iface) +{ + struct source_resolver *resolver = impl_from_url_IMFAsyncCallback(iface); + return IMFSourceResolver_Release(&resolver->IMFSourceResolver_iface); +} + +static HRESULT WINAPI source_resolver_callback_url_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct source_resolver *resolver = impl_from_url_IMFAsyncCallback(iface); + + return resolver_handler_end_create(resolver, OBJECT_FROM_URL, result); +} + +static const IMFAsyncCallbackVtbl source_resolver_callback_url_vtbl = +{ + source_resolver_callback_QueryInterface, + source_resolver_callback_url_AddRef, + source_resolver_callback_url_Release, + source_resolver_callback_GetParameters, + source_resolver_callback_url_Invoke, +}; + static HRESULT resolver_create_registered_handler(HKEY hkey, REFIID riid, void **handler) { unsigned int j = 0, name_length, type; @@ -2223,6 +2263,73 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA return hr; } +static HRESULT resolver_get_scheme_handler(const WCHAR *url, DWORD flags, IMFSchemeHandler **handler) +{ + static const char schemehandlerspath[] = "Software\\Microsoft\\Windows Media Foundation\\SchemeHandlers"; + static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; + const WCHAR *ptr = url; + unsigned int len, i; + WCHAR *scheme; + HRESULT hr; + + /* RFC 3986: scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." ) */ + while (*ptr) + { + WCHAR ch = tolowerW(*ptr); + + if (*ptr == '*' && ptr == url) + { + ptr++; + break; + } + else if (!(*ptr >= '0' && *ptr <= '9') && + !(ch >= 'a' && ch <= 'z') && + *ptr != '+' && *ptr != '-' && *ptr != '.') + { + break; + } + + ptr++; + } + + /* Schemes must end with a ':' */ + if (ptr == url || *ptr != ':') + return MF_E_UNSUPPORTED_SCHEME; + + len = ptr - url; + scheme = heap_alloc((len + 1) * sizeof(WCHAR)); + if (!scheme) + return E_OUTOFMEMORY; + + memcpy(scheme, url, len * sizeof(WCHAR)); + scheme[len] = 0; + + /* FIXME: check local handlers first */ + + for (i = 0, hr = E_FAIL; i < ARRAY_SIZE(hkey_roots); ++i) + { + HKEY hkey, hkey_handler; + + if (RegOpenKeyA(hkey_roots[i], schemehandlerspath, &hkey)) + continue; + + if (!RegOpenKeyW(hkey, scheme, &hkey_handler)) + { + hr = resolver_create_registered_handler(hkey_handler, &IID_IMFSchemeHandler, (void **)handler); + RegCloseKey(hkey_handler); + } + + RegCloseKey(hkey); + + if (SUCCEEDED(hr)) + break; + } + + heap_free(scheme); + + return hr; +} + static HRESULT resolver_end_create_object(struct source_resolver *resolver, enum resolved_object_origin origin, IMFAsyncResult *result, MF_OBJECT_TYPE *obj_type, IUnknown **out) { @@ -2318,14 +2425,45 @@ static ULONG WINAPI source_resolver_Release(IMFSourceResolver *iface) return refcount; } -static HRESULT WINAPI mfsourceresolver_CreateObjectFromURL(IMFSourceResolver *iface, const WCHAR *url, - DWORD flags, IPropertyStore *props, MF_OBJECT_TYPE *obj_type, IUnknown **object) +static HRESULT WINAPI source_resolver_CreateObjectFromURL(IMFSourceResolver *iface, const WCHAR *url, + DWORD flags, IPropertyStore *props, MF_OBJECT_TYPE *obj_type, IUnknown **object) { - mfsourceresolver *This = impl_from_IMFSourceResolver(iface); + struct source_resolver *resolver = impl_from_IMFSourceResolver(iface); + IMFSchemeHandler *handler; + IMFAsyncResult *result; + MFASYNCRESULT *data; + HRESULT hr; - FIXME("(%p)->(%s, %#x, %p, %p, %p): stub\n", This, debugstr_w(url), flags, props, obj_type, object); + TRACE("%p, %s, %#x, %p, %p, %p\n", iface, debugstr_w(url), flags, props, obj_type, object); - return E_NOTIMPL; + if (!url || !obj_type || !object) + return E_POINTER; + + if (FAILED(hr = resolver_get_scheme_handler(url, flags, &handler))) + return hr; + + hr = MFCreateAsyncResult((IUnknown *)handler, NULL, NULL, &result); + IMFSchemeHandler_Release(handler); + if (FAILED(hr)) + return hr; + + data = (MFASYNCRESULT *)result; + data->hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + + hr = IMFSchemeHandler_BeginCreateObject(handler, url, flags, props, NULL, &resolver->stream_callback, + (IUnknown *)result); + if (FAILED(hr)) + { + IMFAsyncResult_Release(result); + return hr; + } + + WaitForSingleObject(data->hEvent, INFINITE); + + hr = resolver_end_create_object(resolver, OBJECT_FROM_URL, result, obj_type, object); + IMFAsyncResult_Release(result); + + return hr; } static HRESULT WINAPI source_resolver_CreateObjectFromByteStream(IMFSourceResolver *iface, IMFByteStream *stream, @@ -2484,7 +2622,7 @@ static const IMFSourceResolverVtbl mfsourceresolvervtbl = source_resolver_QueryInterface, source_resolver_AddRef, source_resolver_Release, - mfsourceresolver_CreateObjectFromURL, + source_resolver_CreateObjectFromURL, source_resolver_CreateObjectFromByteStream, mfsourceresolver_BeginCreateObjectFromURL, mfsourceresolver_EndCreateObjectFromURL, @@ -2511,6 +2649,7 @@ HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver) object->IMFSourceResolver_iface.lpVtbl = &mfsourceresolvervtbl; object->stream_callback.lpVtbl = &source_resolver_callback_stream_vtbl; + object->url_callback.lpVtbl = &source_resolver_callback_url_vtbl; object->refcount = 1; list_init(&object->pending); InitializeCriticalSection(&object->cs); -- 2.20.1

1 4

[PATCH 1/8] quartz/tests: Add some tests for ACM wrapper pin interfaces.
by Zebediah Figura 12 Mar '19

12 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/acmwrapper.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/quartz/tests/acmwrapper.c b/dlls/quartz/tests/acmwrapper.c index 571e78d9df..a543893d79 100644 --- a/dlls/quartz/tests/acmwrapper.c +++ b/dlls/quartz/tests/acmwrapper.c @@ -61,6 +61,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_interfaces(void) { IBaseFilter *filter = create_acm_wrapper(); + IPin *pin; check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); @@ -80,6 +81,30 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source_id, &pin); + + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IMediaPosition, TRUE); + check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); } -- 2.20.1

1 7

[PATCH v3] po: Update Sinhala translation.
by Isira Seneviratne 12 Mar '19

12 Mar '19

1 0

[PATCH v2] po: Update Sinhala translation.
by Isira Seneviratne 12 Mar '19

12 Mar '19

1 0

[PATCH] winecfg: Fix some errors in resource file.
by Isira Seneviratne 12 Mar '19

12 Mar '19

1 0

[PATCH] winevdm: Correct comment typos.
by Isira Seneviratne 11 Mar '19

11 Mar '19

1 0

[PATCH 2/3] ntdll: Fix event op functions declarations.
by Jacek Caban 11 Mar '19

11 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/except.c | 3 +-- dlls/ntdll/sync.c | 11 ++++------- include/winternl.h | 6 +++--- 3 files changed, 8 insertions(+), 12 deletions(-)

2 1

[PATCH] mscoree: Implement an override setting for .net libraries.
by Vincent Povirk 11 Mar '19

11 Mar '19

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/mscoree/metahost.c | 319 ++++++++++++++++++++++++++++++--- dlls/mscoree/mscoree_private.h | 1 + 2 files changed, 300 insertions(+), 20 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index b9f7637f05a..c3f0ffb1c41 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -39,6 +39,7 @@ #include "metahost.h" #include "fusion.h" #include "wine/list.h" +#include "wine/heap.h" #include "mscoree_private.h" #include "wine/debug.h" @@ -86,6 +87,7 @@ typedef void (CDECL *MonoProfilerRuntimeShutdownBeginCallback) (MonoProfiler *pr MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly); MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status); +const char* (CDECL *mono_assembly_name_get_name)(MonoAssemblyName *aname); MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status); void (CDECL *mono_callspec_set_assembly)(MonoAssembly *assembly); MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); @@ -193,6 +195,7 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_assembly_get_image); LOAD_MONO_FUNCTION(mono_assembly_load_from); + LOAD_MONO_FUNCTION(mono_assembly_name_get_name); LOAD_MONO_FUNCTION(mono_assembly_open); LOAD_MONO_FUNCTION(mono_config_parse); LOAD_MONO_FUNCTION(mono_class_from_mono_type); @@ -1180,6 +1183,274 @@ HRESULT CLRMetaHostPolicy_CreateInstance(REFIID riid, void **ppobj) return ICLRMetaHostPolicy_QueryInterface(&GlobalCLRMetaHostPolicy.ICLRMetaHostPolicy_iface, riid, ppobj); } +/* + * Assembly search override settings: + * + * WINE_MONO_OVERRIDES=*,Gac=n + * Never search the GAC for libraries. + * + * WINE_MONO_OVERRIDES=Microsoft.Xna.Framework,Gac=n + * Never search the GAC for Microsoft.Xna.Framework + * + * WINE_MONO_OVERRIDES=Microsoft.Xna.Framework.*,Gac=n;Microsoft.Xna.Framework.GamerServices,Gac=y + * Never search the GAC for Microsoft.Xna.Framework, or any library starting + * with Microsoft.Xna.Framework, except for Microsoft.Xna.Framework.GamerServices + */ + +/* assembly search override flags */ +#define ASSEMBLY_SEARCH_GAC 1 +#define ASSEMBLY_SEARCH_UNDEFINED 2 +#define ASSEMBLY_SEARCH_DEFAULT ASSEMBLY_SEARCH_GAC + +typedef struct override_entry { + char *name; + DWORD flags; + struct list entry; +} override_entry; + +static struct list env_overrides = LIST_INIT(env_overrides); + +#define IS_OPTION_TRUE(ch) \ + ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') +#define IS_OPTION_FALSE(ch) \ + ((ch) == 'n' || (ch) == 'N' || (ch) == 'f' || (ch) == 'F' || (ch) == '0') + +static void parse_override_entry(override_entry *entry, const char *string, int string_len) +{ + const char *next_key, *equals, *value; + UINT kvp_len, key_len; + + entry->flags = ASSEMBLY_SEARCH_DEFAULT; + + while (string && string_len > 0) + { + next_key = memchr(string, ',', string_len); + + if (next_key) + { + kvp_len = next_key - string; + next_key++; + } + else + kvp_len = string_len; + + equals = memchr(string, '=', kvp_len); + + if (equals) + { + key_len = equals - string; + value = equals + 1; + switch (key_len) { + case 3: + if (!strncasecmp(string, "gac", 3)) { + if (IS_OPTION_TRUE(*value)) + entry->flags |= ASSEMBLY_SEARCH_GAC; + else if (IS_OPTION_FALSE(*value)) + entry->flags &= ~ASSEMBLY_SEARCH_GAC; + } + break; + default: + break; + } + } + + string = next_key; + string_len -= kvp_len + 1; + } +} + +static BOOL WINAPI parse_env_overrides(INIT_ONCE *once, void *param, void **context) +{ + const char *override_string = getenv("WINE_MONO_OVERRIDES"); + struct override_entry *entry; + + if (override_string) + { + const char *entry_start; + + entry_start = override_string; + + while (entry_start && *entry_start) + { + const char *next_entry, *basename_end; + UINT entry_len; + + next_entry = strchr(entry_start, ';'); + + if (next_entry) + { + entry_len = next_entry - entry_start; + next_entry++; + } + else + entry_len = strlen(entry_start); + + basename_end = memchr(entry_start, ',', entry_len); + + if (!basename_end) + { + entry_start = next_entry; + continue; + } + + entry = heap_alloc_zero(sizeof(*entry)); + if (!entry) + { + ERR("out of memory\n"); + break; + } + + entry->name = heap_alloc_zero(basename_end - entry_start + 1); + if (!entry->name) + { + ERR("out of memory\n"); + heap_free(entry); + break; + } + + memcpy(entry->name, entry_start, basename_end - entry_start); + + entry_len -= basename_end - entry_start + 1; + entry_start = basename_end + 1; + + parse_override_entry(entry, entry_start, entry_len); + + list_add_tail(&env_overrides, &entry->entry); + + entry_start = next_entry; + } + } + + return TRUE; +} + +static DWORD get_basename_search_flags(const char *basename, MonoAssemblyName *aname, HKEY userkey, HKEY appkey) +{ + struct override_entry *entry; + char buffer[256]; + DWORD buffer_size; + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + + InitOnceExecuteOnce(&init_once, parse_env_overrides, NULL, NULL); + + LIST_FOR_EACH_ENTRY(entry, &env_overrides, override_entry, entry) + { + if (strcmp(basename, entry->name) == 0) + { + return entry->flags; + } + } + + buffer_size = sizeof(buffer); + if (appkey && !RegQueryValueExA(appkey, basename, 0, NULL, (LPBYTE)buffer, &buffer_size)) + { + override_entry reg_entry; + + memset(&reg_entry, 0, sizeof(reg_entry)); + + parse_override_entry(&reg_entry, buffer, strlen(buffer)); + + return reg_entry.flags; + } + + buffer_size = sizeof(buffer); + if (userkey && !RegQueryValueExA(userkey, basename, 0, NULL, (LPBYTE)buffer, &buffer_size)) + { + override_entry reg_entry; + + memset(&reg_entry, 0, sizeof(reg_entry)); + + parse_override_entry(&reg_entry, buffer, strlen(buffer)); + + return reg_entry.flags; + } + + return ASSEMBLY_SEARCH_UNDEFINED; +} + +static HKEY get_app_overrides_key(void) +{ + static const WCHAR subkeyW[] = {'\\','M','o','n','o','\\','A','s','m','O','v','e','r','r','i','d','e','s',0}; + WCHAR bufferW[MAX_PATH+18]; + HKEY appkey = 0; + DWORD len; + + len = (GetModuleFileNameW( 0, bufferW, MAX_PATH )); + if (len && len < MAX_PATH) + { + HKEY tmpkey; + WCHAR *p, *appname = bufferW; + if ((p = strrchrW( appname, '/' ))) appname = p + 1; + if ((p = strrchrW( appname, '\\' ))) appname = p + 1; + strcatW( appname, subkeyW ); + /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\Mono\AsmOverrides */ + if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey )) + { + if (RegOpenKeyW( tmpkey, appname, &appkey )) appkey = 0; + RegCloseKey( tmpkey ); + } + } + + return appkey; +} + +static DWORD get_assembly_search_flags(MonoAssemblyName *aname) +{ + const char *name = mono_assembly_name_get_name(aname); + char *name_copy, *name_end; + DWORD result; + HKEY appkey = 0, userkey; + + /* @@ Wine registry key: HKCU\Software\Wine\Mono\AsmOverrides */ + if (RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Mono\\AsmOverrides", &userkey )) userkey = 0; + + appkey = get_app_overrides_key(); + + result = get_basename_search_flags(name, aname, userkey, appkey); + if (result != ASSEMBLY_SEARCH_UNDEFINED) + { + if (userkey) RegCloseKey(userkey); + if (appkey) RegCloseKey(appkey); + return result; + } + + name_copy = heap_alloc((strlen(name) + 3) * sizeof(WCHAR)); + if (!name_copy) + { + ERR("out of memory\n"); + if (userkey) RegCloseKey(userkey); + if (appkey) RegCloseKey(appkey); + return ASSEMBLY_SEARCH_DEFAULT; + } + + strcpy(name_copy, name); + name_end = name_copy + strlen(name); + + do + { + strcpy(name_end, ".*"); + result = get_basename_search_flags(name_copy, aname, userkey, appkey); + if (result != ASSEMBLY_SEARCH_UNDEFINED) break; + + *name_end = 0; + name_end = strrchr(name_copy, '.'); + } while (name_end != NULL); + + /* default flags */ + if (result == ASSEMBLY_SEARCH_UNDEFINED) + { + result = get_basename_search_flags("*", aname, userkey, appkey); + if (result == ASSEMBLY_SEARCH_UNDEFINED) + result = ASSEMBLY_SEARCH_DEFAULT; + } + + heap_free(name_copy); + if (appkey) RegCloseKey(appkey); + if (userkey) RegCloseKey(userkey); + + return result; +} + HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int path_length) { HRESULT hr=S_OK; @@ -1229,6 +1500,7 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname WCHAR path[MAX_PATH]; char *pathA; MonoImageOpenStatus stat; + DWORD search_flags; stringname = mono_stringify_assembly_name(aname); @@ -1236,38 +1508,45 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname if (!stringname) return NULL; - /* FIXME: We should search the given paths before the GAC. */ + search_flags = get_assembly_search_flags(aname); - stringnameW_size = MultiByteToWideChar(CP_UTF8, 0, stringname, -1, NULL, 0); + /* FIXME: We should search the given paths before the GAC. */ - stringnameW = HeapAlloc(GetProcessHeap(), 0, stringnameW_size * sizeof(WCHAR)); - if (stringnameW) + if ((search_flags & ASSEMBLY_SEARCH_GAC) != 0) { - MultiByteToWideChar(CP_UTF8, 0, stringname, -1, stringnameW, stringnameW_size); + stringnameW_size = MultiByteToWideChar(CP_UTF8, 0, stringname, -1, NULL, 0); - hr = get_file_from_strongname(stringnameW, path, MAX_PATH); - - HeapFree(GetProcessHeap(), 0, stringnameW); - } - else - hr = E_OUTOFMEMORY; + stringnameW = HeapAlloc(GetProcessHeap(), 0, stringnameW_size * sizeof(WCHAR)); + if (stringnameW) + { + MultiByteToWideChar(CP_UTF8, 0, stringname, -1, stringnameW, stringnameW_size); - if (SUCCEEDED(hr)) - { - TRACE("found: %s\n", debugstr_w(path)); + hr = get_file_from_strongname(stringnameW, path, MAX_PATH); - pathA = WtoA(path); + HeapFree(GetProcessHeap(), 0, stringnameW); + } + else + hr = E_OUTOFMEMORY; - if (pathA) + if (SUCCEEDED(hr)) { - result = mono_assembly_open(pathA, &stat); + TRACE("found: %s\n", debugstr_w(path)); + + pathA = WtoA(path); - if (!result) - ERR("Failed to load %s, status=%u\n", debugstr_w(path), stat); + if (pathA) + { + result = mono_assembly_open(pathA, &stat); + + if (!result) + ERR("Failed to load %s, status=%u\n", debugstr_w(path), stat); - HeapFree(GetProcessHeap(), 0, pathA); + HeapFree(GetProcessHeap(), 0, pathA); + } } } + else + TRACE("skipping Windows GAC search due to override setting\n"); mono_free(stringname); diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 8ffb1f99e6d..4e7ee013934 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -144,6 +144,7 @@ extern BOOL is_mono_started DECLSPEC_HIDDEN; extern MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly) DECLSPEC_HIDDEN; extern MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status) DECLSPEC_HIDDEN; +extern const char* (CDECL *mono_assembly_name_get_name)(MonoAssemblyName *aname) DECLSPEC_HIDDEN; extern MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status) DECLSPEC_HIDDEN; extern void (CDECL *mono_callspec_set_assembly)(MonoAssembly *assembly) DECLSPEC_HIDDEN; extern MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type) DECLSPEC_HIDDEN; -- 2.17.1

2 5

[PATCH v2 02/10] d3dx9: Merge the d3dx_effect_GetIntArray() helper
by Michael Stefaniuc 11 Mar '19

11 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: resent dlls/d3dx9_36/effect.c | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5d0be346b8..7425c7b9a1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1426,30 +1426,6 @@ static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_int_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, INT *n, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (n && param && (param->class == D3DXPC_SCALAR - || param->class == D3DXPC_VECTOR - || param->class == D3DXPC_MATRIX_ROWS - || param->class == D3DXPC_MATRIX_COLUMNS)) - { - UINT i, size = min(count, param->bytes / sizeof(DWORD)); - - for (i = 0; i < size; ++i) - { - set_number(&n[i], D3DXPT_INT, (DWORD *)param->data + i, param->type); - } - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -3431,10 +3407,25 @@ static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE par static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count); - return d3dx9_base_effect_get_int_array(&effect->base_effect, parameter, n, count); + if (n && param && (param->class == D3DXPC_SCALAR + || param->class == D3DXPC_VECTOR + || param->class == D3DXPC_MATRIX_ROWS + || param->class == D3DXPC_MATRIX_COLUMNS)) + { + unsigned int i, size = min(count, param->bytes / sizeof(DWORD)); + + for (i = 0; i < size; ++i) + set_number(&n[i], D3DXPT_INT, (DWORD *)param->data + i, param->type); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float f) -- 2.20.1

3 3

[PATCH v2 7/7] user32/tests: Use calculated EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa 11 Mar '19

11 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 94 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 79 insertions(+), 15 deletions(-)

2 1

[PATCH v2 6/7] user32: Implement EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa 11 Mar '19

11 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/edit.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 3 deletions(-)

2 1

[PATCH v2 4/7] user32/tests: Add Unicode version tests for Edit control margins.
by Akihiro Sagawa 11 Mar '19

11 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)

2 1

[PATCH v2 3/7] user32/tests: Move the default margin size tests into a separate function.
by Akihiro Sagawa 11 Mar '19

11 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 82 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 65 insertions(+), 17 deletions(-)

2 1

[PATCH vkd3d 2/2] tests: Introduce assert_that().
by Józef Kucia 11 Mar '19

11 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> This allows us to put a bug_if() or todo_if() in the front of functions that check other conditions not directly related to the actual test. assert_that() is similar to ok(). The main difference is that it ignores bug_if() and todo_if(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_test.h | 53 ++++++++++++++++++++++++++++++------ tests/d3d12.c | 14 ++-------- tests/d3d12_crosstest.h | 6 ++-- tests/d3d12_test_utils.h | 12 ++++---- 4 files changed, 56 insertions(+), 29 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index d7593e2649ff..53afdd90358d 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -40,10 +40,26 @@ static void vkd3d_test_end_todo(void); static const char *vkd3d_test_name = #name; \ static void vkd3d_test_main(int argc, char **argv) +/* + * Use assert_that() for conditions that should always be true. + * todo_if() and bug_if() do not influence assert_that(). + */ +#define assert_that assert_that_(__LINE__) + #define ok ok_(__LINE__) + #define skip skip_(__LINE__) + #define trace trace_(__LINE__) +#define assert_that_(line) \ + do { \ + unsigned int vkd3d_line = line; \ + VKD3D_TEST_ASSERT_THAT + +#define VKD3D_TEST_ASSERT_THAT(args...) \ + vkd3d_test_assert_that(vkd3d_line, args); } while (0) + #define ok_(line) \ do { \ unsigned int vkd3d_line = line; \ @@ -116,6 +132,33 @@ broken(bool condition) return condition && vkd3d_test_platform_is_windows(); } +static void +vkd3d_test_check_assert_that(unsigned int line, bool result, const char *fmt, va_list args) +{ + if (result) + { + InterlockedIncrement(&vkd3d_test_state.success_count); + if (vkd3d_test_state.debug_level > 1) + printf("%s:%d%s: Test succeeded.\n", vkd3d_test_name, line, vkd3d_test_state.context); + } + else + { + InterlockedIncrement(&vkd3d_test_state.failure_count); + printf("%s:%d%s: Test failed: ", vkd3d_test_name, line, vkd3d_test_state.context); + vprintf(fmt, args); + } +} + +static void VKD3D_PRINTF_FUNC(3, 4) VKD3D_UNUSED +vkd3d_test_assert_that(unsigned int line, bool result, const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + vkd3d_test_check_assert_that(line, result, fmt, args); + va_end(args); +} + static void vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list args) { @@ -147,17 +190,9 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg } vprintf(fmt, args); } - else if (result) - { - InterlockedIncrement(&vkd3d_test_state.success_count); - if (vkd3d_test_state.debug_level > 1) - printf("%s:%d%s: Test succeeded.\n", vkd3d_test_name, line, vkd3d_test_state.context); - } else { - InterlockedIncrement(&vkd3d_test_state.failure_count); - printf("%s:%d%s: Test failed: ", vkd3d_test_name, line, vkd3d_test_state.context); - vprintf(fmt, args); + vkd3d_test_check_assert_that(line, result, fmt, args); } } diff --git a/tests/d3d12.c b/tests/d3d12.c index e044a5385b21..e3e86e8afa07 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5606,7 +5606,6 @@ static void test_draw_uav_only(void) D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle; D3D12_ROOT_PARAMETER root_parameter; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *resource; @@ -5688,10 +5687,8 @@ static void test_draw_uav_only(void) transition_resource_state(command_list, resource, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); - get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list); bug_if(is_radv_device(context.device)) - check_readback_data_uint(&rb, NULL, 500, 0); - release_resource_readback(&rb); + check_sub_resource_uint(resource, 0, queue, command_list, 500, 0); ID3D12DescriptorHeap_Release(cpu_descriptor_heap); ID3D12DescriptorHeap_Release(descriptor_heap); @@ -7906,7 +7903,7 @@ static void test_shader_instructions(void) struct ivec4 i; } output; bool skip_on_warp; - bool skip_on_mesa; + bool is_mesa_bug; } tests[] = { @@ -8671,12 +8668,6 @@ static void test_shader_instructions(void) continue; } - if (tests[i].skip_on_mesa && is_mesa_device(context.device)) - { - skip("Skipping shader '%s' test on Mesa.\n", tests[i].ps->name); - continue; - } - if (current_ps != tests[i].ps) { if (context.pipeline_state) @@ -8704,6 +8695,7 @@ static void test_shader_instructions(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(tests[i].is_mesa_bug && is_mesa_device(context.device)) check_sub_resource_vec4(context.render_target, 0, queue, command_list, &tests[i].output.f, 2); reset_command_list(command_list, context.allocator); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index ae49bf4c68f9..74b8301ca278 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -220,12 +220,12 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); - ok_(line)(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + assert_that_(line)(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); hr = ID3D12CommandQueue_Signal(queue, fence, 1); - ok_(line)(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + assert_that_(line)(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); hr = wait_for_fence(fence, 1); - ok_(line)(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); + assert_that_(line)(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); ID3D12Fence_Release(fence); } diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 1b2aec5959f0..53fa0e763ea3 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -121,7 +121,7 @@ static ID3D12Resource *create_buffer_(unsigned int line, ID3D12Device *device, hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, initial_resource_state, NULL, &IID_ID3D12Resource, (void **)&buffer); - ok_(line)(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + assert_that_(line)(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); return buffer; } @@ -291,10 +291,10 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi HRESULT hr; hr = ID3D12Resource_GetDevice(texture, &IID_ID3D12Device, (void **)&device); - ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); + assert_that(hr == S_OK, "Failed to get device, hr %#x.\n", hr); resource_desc = ID3D12Resource_GetDesc(texture); - ok(resource_desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER, + assert_that(resource_desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER, "Resource %p is not texture.\n", texture); miplevel = sub_resource % resource_desc.MipLevels; @@ -317,7 +317,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RESOLVE_DEST, NULL, &IID_ID3D12Resource, (void **)&src_resource); - ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + assert_that(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); ID3D12GraphicsCommandList_ResolveSubresource(command_list, src_resource, 0, texture, sub_resource, resource_desc.Format); @@ -348,7 +348,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, NULL); hr = ID3D12GraphicsCommandList_Close(command_list); - ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + assert_that(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); exec_command_list(queue, command_list); wait_queue_idle(device, queue); @@ -360,7 +360,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi read_range.Begin = 0; read_range.End = resource_desc.Width; hr = ID3D12Resource_Map(rb->resource, 0, &read_range, &rb->data); - ok(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); + assert_that(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); } static void *get_readback_data(struct resource_readback *rb, -- 2.19.2

2 1

[PATCH vkd3d 1/2] vkd3d: Fix feature queries for depth/stencil formats.
by Józef Kucia 11 Mar '19

11 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 4 ++++ tests/d3d12.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3d9d90cb6558..204489c2993a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1801,6 +1801,8 @@ static HRESULT d3d12_device_check_multisample_quality_levels(struct d3d12_device goto done; if (!(format = vkd3d_get_format(data->Format, false))) + format = vkd3d_get_format(data->Format, true); + if (!format) { FIXME("Unhandled format %#x.\n", data->Format); return E_INVALIDARG; @@ -1934,6 +1936,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * data->Support1 = D3D12_FORMAT_SUPPORT1_NONE; data->Support2 = D3D12_FORMAT_SUPPORT2_NONE; if (!(format = vkd3d_get_format(data->Format, false))) + format = vkd3d_get_format(data->Format, true); + if (!format) { FIXME("Unhandled format %#x.\n", data->Format); return E_INVALIDARG; diff --git a/tests/d3d12.c b/tests/d3d12.c index 173c576e1855..e044a5385b21 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -343,6 +343,22 @@ static unsigned int format_block_height(DXGI_FORMAT format) } } +static const DXGI_FORMAT depth_stencil_formats[] = +{ + DXGI_FORMAT_R32G8X24_TYPELESS, + DXGI_FORMAT_D32_FLOAT_S8X24_UINT, + DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS, + DXGI_FORMAT_X32_TYPELESS_G8X24_UINT, + DXGI_FORMAT_R32_TYPELESS, + DXGI_FORMAT_D32_FLOAT, + DXGI_FORMAT_R24G8_TYPELESS, + DXGI_FORMAT_D24_UNORM_S8_UINT, + DXGI_FORMAT_R24_UNORM_X8_TYPELESS, + DXGI_FORMAT_X24_TYPELESS_G8_UINT, + DXGI_FORMAT_R16_TYPELESS, + DXGI_FORMAT_D16_UNORM, +}; + static void get_buffer_readback_with_command_list(ID3D12Resource *buffer, DXGI_FORMAT format, struct resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) { @@ -1172,6 +1188,15 @@ static void test_format_support(void) format_support.Support2 & unsupported_format_features[i].f.Support2); } + for (i = 0; i < ARRAY_SIZE(depth_stencil_formats); ++i) + { + memset(&format_support, 0, sizeof(format_support)); + format_support.Format = depth_stencil_formats[i]; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_SUPPORT, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } @@ -1292,6 +1317,17 @@ static void test_multisample_quality_levels(void) ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags); ok(format_support.NumQualityLevels >= 1, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + for (i = 0; i < ARRAY_SIZE(depth_stencil_formats); ++i) + { + memset(&format_support, 0, sizeof(format_support)); + format_support.Format = depth_stencil_formats[i]; + format_support.SampleCount = 4; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -- 2.19.2

2 1

[PATCH v2 2/7] user32: Fix minimum control size conditions when using EC_USEFONTINFO.
by Akihiro Sagawa 11 Mar '19

11 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/edit.c | 47 +++++++++++++---------------------------------- dlls/user32/tests/edit.c | 1 - 2 files changed, 13 insertions(+), 35 deletions(-)

2 1

[PATCH 5/5] d3d12: Set ordinal for D3D12CreateDevice().
by Józef Kucia 11 Mar '19

11 Mar '19

It seems that D3D12CreateDevice() is imported by ordinal on Windows. Reported by Sveinar Søpler. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/d3d12.spec | 2 +- dlls/d3d12/tests/d3d12.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec index 5c4f4cfecf8a..63c8db8d235f 100644 --- a/dlls/d3d12/d3d12.spec +++ b/dlls/d3d12/d3d12.spec @@ -1,5 +1,5 @@ @ stub GetBehaviorValue -@ stdcall D3D12CreateDevice(ptr long ptr ptr) +101 stdcall D3D12CreateDevice(ptr long ptr ptr) @ stdcall D3D12GetDebugInterface(ptr ptr) @ stub D3D12CoreCreateLayeredDevice @ stub D3D12CoreGetLayeredDeviceSize diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 6b6f056e8770..76efb561c4f7 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -774,6 +774,21 @@ static void check_sub_resource_uint_(unsigned int line, ID3D12Resource *texture, release_resource_readback(&rb); } +static void test_ordinals(void) +{ + PFN_D3D12_CREATE_DEVICE pfn_D3D12CreateDevice, pfn_101; + HMODULE d3d12; + + d3d12 = GetModuleHandleA("d3d12.dll"); + ok(!!d3d12, "Failed to get module handle.\n"); + + pfn_D3D12CreateDevice = (void *)GetProcAddress(d3d12, "D3D12CreateDevice"); + ok(!!pfn_D3D12CreateDevice, "Failed to get D3D12CreateDevice() proc address.\n"); + + pfn_101 = (void *)GetProcAddress(d3d12, (const char *)101); + ok(pfn_101 == pfn_D3D12CreateDevice, "Got %p, expected %p.\n", pfn_101, pfn_D3D12CreateDevice); +} + static void test_interfaces(void) { D3D12_COMMAND_QUEUE_DESC desc; @@ -1368,6 +1383,7 @@ START_TEST(d3d12) print_adapter_info(); + test_ordinals(); test_interfaces(); test_create_device(); test_draw(); -- 2.19.2

3 2

[PATCH 4/5] d3d12: Add test for creating device with adapter.
by Józef Kucia 11 Mar '19

11 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 156 ++++++++++++++++++++++++++++++++------- 1 file changed, 131 insertions(+), 25 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 205f13fd10c7..6b6f056e8770 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -40,6 +40,11 @@ static BOOL compare_color(DWORD c1, DWORD c2, unsigned int max_diff) return TRUE; } +static BOOL equal_luid(LUID a, LUID b) +{ + return a.LowPart == b.LowPart && a.HighPart == b.HighPart; +} + static unsigned int format_size(DXGI_FORMAT format) { switch (format) @@ -282,6 +287,25 @@ static ID3D12PipelineState *create_pipeline_state_(unsigned int line, ID3D12Devi return pipeline_state; } +#define create_command_queue(a, b) create_command_queue_(__LINE__, a, b) +static ID3D12CommandQueue *create_command_queue_(unsigned int line, + ID3D12Device *device, D3D12_COMMAND_LIST_TYPE type) +{ + D3D12_COMMAND_QUEUE_DESC command_queue_desc; + ID3D12CommandQueue *queue; + HRESULT hr; + + command_queue_desc.Type = type; + command_queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; + command_queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; + command_queue_desc.NodeMask = 0; + hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, + &IID_ID3D12CommandQueue, (void **)&queue); + ok_(__FILE__, line)(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + + return queue; +} + struct test_context_desc { BOOL no_pipeline; @@ -381,7 +405,6 @@ static void create_render_target_(unsigned int line, struct test_context *contex static BOOL init_test_context_(unsigned int line, struct test_context *context, const struct test_context_desc *desc) { - D3D12_COMMAND_QUEUE_DESC command_queue_desc; D3D12_DESCRIPTOR_HEAP_DESC rtv_heap_desc; unsigned int rtv_size; ID3D12Device *device; @@ -397,13 +420,7 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context, } device = context->device; - command_queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; - command_queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; - command_queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; - command_queue_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, - &IID_ID3D12CommandQueue, (void **)&context->queue); - ok_(__FILE__, line)(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + context->queue = create_command_queue_(line, device, D3D12_COMMAND_LIST_TYPE_DIRECT); for (i = 0; i < ARRAY_SIZE(context->allocator); ++i) { @@ -577,11 +594,9 @@ static HWND create_window(DWORD style) return CreateWindowA("static", "d3d12_test", style, 0, 0, 256, 256, NULL, NULL, NULL, NULL); } -static IDXGISwapChain3 *create_swapchain(struct test_context *context, HWND window, - unsigned int buffer_count, DXGI_FORMAT format, unsigned int width, unsigned int height) +static IDXGISwapChain3 *create_swapchain(struct test_context *context, ID3D12CommandQueue *queue, + HWND window, unsigned int buffer_count, DXGI_FORMAT format, unsigned int width, unsigned int height) { - ID3D12CommandQueue *queue = context->queue; - ID3D12Device *device = context->device; IDXGISwapChain1 *swapchain1; DXGI_SWAP_CHAIN_DESC1 desc; IDXGISwapChain3 *swapchain; @@ -591,7 +606,8 @@ static IDXGISwapChain3 *create_swapchain(struct test_context *context, HWND wind assert(buffer_count <= MAX_FRAME_COUNT); - destroy_render_targets(context); + if (context) + destroy_render_targets(context); hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); @@ -617,15 +633,18 @@ static IDXGISwapChain3 *create_swapchain(struct test_context *context, HWND wind ok(hr == S_OK, "Failed to query IDXGISwapChain3, hr %#x.\n", hr); IDXGISwapChain1_Release(swapchain1); - for (i = 0; i < buffer_count; ++i) + if (context) { - hr = IDXGISwapChain3_GetBuffer(swapchain, i, &IID_ID3D12Resource, (void **)&context->render_target[i]); - ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", i, hr); - ID3D12Device_CreateRenderTargetView(device, context->render_target[i], NULL, context->rtv[i]); - } + set_viewport(&context->viewport, 0.0f, 0.0f, width, height, 0.0f, 1.0f); + SetRect(&context->scissor_rect, 0, 0, width, height); - set_viewport(&context->viewport, 0.0f, 0.0f, width, height, 0.0f, 1.0f); - SetRect(&context->scissor_rect, 0, 0, width, height); + for (i = 0; i < buffer_count; ++i) + { + hr = IDXGISwapChain3_GetBuffer(swapchain, i, &IID_ID3D12Resource, (void **)&context->render_target[i]); + ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", i, hr); + ID3D12Device_CreateRenderTargetView(context->device, context->render_target[i], NULL, context->rtv[i]); + } + } return swapchain; } @@ -808,6 +827,90 @@ static void test_interfaces(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_device(void) +{ + DXGI_ADAPTER_DESC adapter_desc; + IDXGISwapChain3 *swapchain; + ID3D12CommandQueue *queue; + LUID adapter_luid, luid; + IDXGIFactory4 *factory; + IDXGIAdapter *adapter; + ID3D12Device *device; + IDXGIOutput *output; + ULONG refcount; + HWND window; + HRESULT hr; + RECT rect; + BOOL ret; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory4_EnumAdapters(factory, 0, &adapter); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IDXGIFactory4_Release(factory); + + hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + adapter_luid = adapter_desc.AdapterLuid; + + refcount = get_refcount(adapter); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + hr = D3D12CreateDevice((IUnknown *)adapter, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDXGIAdapter_Release(adapter); + ok(refcount >= 1, "Got unexpected refcount %u.\n", refcount); + adapter = NULL; + + luid = ID3D12Device_GetAdapterLuid(device); + ok(equal_luid(luid, adapter_luid), "Got LUID %08x:%08x, expected %08x:%08x.\n", + luid.HighPart, luid.LowPart, adapter_luid.HighPart, adapter_luid.LowPart); + + queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT); + window = create_window(WS_VISIBLE); + ret = GetClientRect(window, &rect); + ok(ret, "Failed to get client rect.\n"); + swapchain = create_swapchain(NULL, queue, window, 2, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + + hr = IDXGISwapChain3_GetContainingOutput(swapchain, &output); + if (hr != DXGI_ERROR_UNSUPPORTED) + { + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIOutput_GetParent(output, &IID_IDXGIAdapter, (void **)&adapter); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IDXGIOutput_Release(output); + + memset(&adapter_desc, 0, sizeof(adapter_desc)); + hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + ok(equal_luid(adapter_desc.AdapterLuid, adapter_luid), + "Got LUID %08x:%08x, expected %08x:%08x.\n", + adapter_desc.AdapterLuid.HighPart, adapter_desc.AdapterLuid.LowPart, + adapter_luid.HighPart, adapter_luid.LowPart); + } + else + { + skip("GetContaingOutput() is not supported.\n"); + } + + refcount = IDXGISwapChain3_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + DestroyWindow(window); + ID3D12CommandQueue_Release(queue); + + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_draw(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -909,7 +1012,7 @@ static void test_swapchain_draw(void) context.pipeline_state = create_pipeline_state(device, context.root_signature, tests[i].format, &ps); - swapchain = create_swapchain(&context, window, 2, tests[i].format, rect.right, rect.bottom); + swapchain = create_swapchain(&context, queue, window, 2, tests[i].format, rect.right, rect.bottom); index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); backbuffer = context.render_target[index]; rtv = context.rtv[index]; @@ -977,7 +1080,8 @@ static void test_swapchain_refcount(void) window = create_window(WS_VISIBLE); ret = GetClientRect(window, &rect); ok(ret, "Failed to get client rect.\n"); - swapchain = create_swapchain(&context, window, buffer_count, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + swapchain = create_swapchain(&context, context.queue, window, + buffer_count, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); for (i = 0; i < buffer_count; ++i) { @@ -1054,7 +1158,7 @@ static void test_swapchain_size_mismatch(void) queue = context.queue; window = CreateWindowA("static", "d3d12_test", WS_VISIBLE, 0, 0, 200, 200, NULL, NULL, NULL, NULL); - swapchain = create_swapchain(&context, window, 2, DXGI_FORMAT_B8G8R8A8_UNORM, 400, 400); + swapchain = create_swapchain(&context, queue, window, 2, DXGI_FORMAT_B8G8R8A8_UNORM, 400, 400); index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); backbuffer = context.render_target[index]; rtv = context.rtv[index]; @@ -1087,7 +1191,7 @@ static void test_swapchain_size_mismatch(void) window = create_window(WS_VISIBLE); ret = GetClientRect(window, &rect); ok(ret, "Failed to get client rect.\n"); - swapchain = create_swapchain(&context, window, 4, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + swapchain = create_swapchain(&context, queue, window, 4, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); @@ -1177,7 +1281,8 @@ static void test_swapchain_backbuffer_index(void) window = create_window(WS_VISIBLE); ret = GetClientRect(window, &rect); ok(ret, "Failed to get client rect.\n"); - swapchain = create_swapchain(&context, window, buffer_count, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + swapchain = create_swapchain(&context, queue, window, + buffer_count, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); @@ -1264,6 +1369,7 @@ START_TEST(d3d12) print_adapter_info(); test_interfaces(); + test_create_device(); test_draw(); test_swapchain_draw(); test_swapchain_refcount(); -- 2.19.2

3 2

[PATCH 3/5] dxgi: Implement d3d12_swapchain_GetContainingOutput().
by Józef Kucia 11 Mar '19

11 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 5e66a5fadfa9..1998e480333e 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -852,6 +852,7 @@ cleanup: static PFN_vkd3d_acquire_vk_queue vkd3d_acquire_vk_queue; static PFN_vkd3d_create_image_resource vkd3d_create_image_resource; +static PFN_vkd3d_get_device_parent vkd3d_get_device_parent; static PFN_vkd3d_get_vk_device vkd3d_get_vk_device; static PFN_vkd3d_get_vk_format vkd3d_get_vk_format; static PFN_vkd3d_get_vk_physical_device vkd3d_get_vk_physical_device; @@ -1936,9 +1937,26 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeTarget(IDXGISwapChain3 *i static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapChain3 *iface, IDXGIOutput **output) { - FIXME("iface %p, output %p stub!\n", iface, output); + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); + IUnknown *device_parent; + IDXGIAdapter *adapter; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, output %p.\n", iface, output); + + device_parent = vkd3d_get_device_parent(swapchain->device); + + if (SUCCEEDED(hr = IUnknown_QueryInterface(device_parent, &IID_IDXGIAdapter, (void **)&adapter))) + { + hr = dxgi_get_output_from_window(adapter, swapchain->window, output); + IDXGIAdapter_Release(adapter); + } + else + { + WARN("Failed to get adapter, hr %#x.\n", hr); + } + + return hr; } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFrameStatistics(IDXGISwapChain3 *iface, @@ -2407,6 +2425,7 @@ static BOOL load_vkd3d_functions(void *vkd3d_handle) #define LOAD_FUNCPTR(f) if (!(f = wine_dlsym(vkd3d_handle, #f, NULL, 0))) return FALSE; LOAD_FUNCPTR(vkd3d_acquire_vk_queue) LOAD_FUNCPTR(vkd3d_create_image_resource) + LOAD_FUNCPTR(vkd3d_get_device_parent) LOAD_FUNCPTR(vkd3d_get_vk_device) LOAD_FUNCPTR(vkd3d_get_vk_format) LOAD_FUNCPTR(vkd3d_get_vk_physical_device) -- 2.19.2

3 2

[PATCH 2/5] dxgi: Improve d3d11_swapchain_GetContainingOutput() implementation.
by Józef Kucia 11 Mar '19

11 Mar '19

Use MonitorFromWindow() to find the containing IDXGIOutput. This matches our DXGI tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 68 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 55 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 849b94ae9e09..5e66a5fadfa9 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -110,6 +110,46 @@ BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) return TRUE; } +static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, IDXGIOutput **dxgi_output) +{ + DXGI_OUTPUT_DESC desc; + IDXGIOutput *output; + unsigned int index; + HMONITOR monitor; + HRESULT hr; + + if (!(monitor = MonitorFromWindow(window, MONITOR_DEFAULTTONEAREST))) + { + WARN("Failed to get monitor from window.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + index = 0; + while ((hr = IDXGIAdapter_EnumOutputs(adapter, index, &output)) == S_OK) + { + if (FAILED(hr = IDXGIOutput_GetDesc(output, &desc))) + { + WARN("Failed to get output desc %u, hr %#x.\n", index, hr); + ++index; + continue; + } + + if (desc.Monitor == monitor) + { + *dxgi_output = output; + return S_OK; + } + + IDXGIOutput_Release(output); + ++index; + } + if (hr != DXGI_ERROR_NOT_FOUND) + WARN("Failed to enumerate outputs, hr %#x.\n", hr); + + WARN("Output could not be found.\n"); + return DXGI_ERROR_NOT_FOUND; +} + static inline struct d3d11_swapchain *d3d11_swapchain_from_IDXGISwapChain1(IDXGISwapChain1 *iface) { return CONTAINING_RECORD(iface, struct d3d11_swapchain, IDXGISwapChain1_iface); @@ -450,6 +490,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); + struct wined3d_swapchain_desc swapchain_desc; IDXGIAdapter *adapter; IDXGIDevice *device; HRESULT hr; @@ -462,25 +503,26 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapCh return S_OK; } - if (FAILED(hr = d3d11_swapchain_GetDevice(iface, &IID_IDXGIDevice, (void **)&device))) - return hr; - - hr = IDXGIDevice_GetAdapter(device, &adapter); - IDXGIDevice_Release(device); - if (FAILED(hr)) + if (SUCCEEDED(hr = d3d11_swapchain_GetDevice(iface, &IID_IDXGIDevice, (void **)&device))) { - WARN("GetAdapter failed, hr %#x.\n", hr); - return hr; + hr = IDXGIDevice_GetAdapter(device, &adapter); + IDXGIDevice_Release(device); } - if (SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, 1, output))) + if (SUCCEEDED(hr)) + { + wined3d_mutex_lock(); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); + wined3d_mutex_unlock(); + + hr = dxgi_get_output_from_window(adapter, swapchain_desc.device_window, output); + IDXGIAdapter_Release(adapter); + } + else { - FIXME("Adapter has got multiple outputs, returning the first one.\n"); - IDXGIOutput_Release(*output); + WARN("Failed to get adapter, hr %#x.\n", hr); } - hr = IDXGIAdapter_EnumOutputs(adapter, 0, output); - IDXGIAdapter_Release(adapter); return hr; } -- 2.19.2

4 3

[PATCH 1/5] d3d12: Pass IDXGIAdapter and adapter LUID to vkd3d.
by Józef Kucia 11 Mar '19

11 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/Makefile.in | 2 +- dlls/d3d12/d3d12_main.c | 58 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in index 62fb01a21270..ba51960f2c74 100644 --- a/dlls/d3d12/Makefile.in +++ b/dlls/d3d12/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3d12.dll IMPORTLIB = d3d12 -IMPORTS = gdi32 user32 +IMPORTS = dxgi dxguid gdi32 user32 EXTRALIBS = $(VKD3D_LIBS) EXTRAINCL = $(VKD3D_CFLAGS) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index d6d691c3c237..dace4142ab63 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -20,6 +20,7 @@ #include "config.h" #include "wine/port.h" +#define COBJMACROS #define VK_NO_PROTOTYPES #define VKD3D_NO_VULKAN_H #define VKD3D_NO_WIN32_TYPES @@ -30,6 +31,7 @@ #include "wine/vulkan.h" #include "wine/vulkan_driver.h" +#include "dxgi1_6.h" #include "d3d12.h" #include <vkd3d.h> @@ -116,12 +118,58 @@ static const struct vulkan_funcs *get_vk_funcs(void) return vk_funcs; } +static HRESULT d3d12_get_adapter(IUnknown **adapter, LUID *luid) +{ + DXGI_ADAPTER_DESC adapter_desc; + IDXGIFactory4 *factory = NULL; + IDXGIAdapter *dxgi_adapter; + HRESULT hr; + + if (!*adapter) + { + if (FAILED(hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory))) + { + WARN("Failed to create DXGI factory, hr %#x.\n", hr); + goto done; + } + + if (FAILED(hr = IDXGIFactory4_EnumAdapters(factory, 0, &dxgi_adapter))) + { + WARN("Failed to enumerate primary adapter, hr %#x.\n", hr); + goto done; + } + } + else if (FAILED(hr = IUnknown_QueryInterface(*adapter, &IID_IDXGIAdapter, (void **)&dxgi_adapter))) + { + WARN("Invalid adapter %p, hr %#x.\n", adapter, hr); + goto done; + } + + if (SUCCEEDED(hr = IDXGIAdapter_GetDesc(dxgi_adapter, &adapter_desc))) + { + *adapter = (IUnknown *)dxgi_adapter; + *luid = adapter_desc.AdapterLuid; + } + else + { + IDXGIAdapter_Release(dxgi_adapter); + } + +done: + if (factory) + IDXGIFactory4_Release(factory); + + return hr; +} + HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { struct vkd3d_instance_create_info instance_create_info; struct vkd3d_device_create_info device_create_info; const struct vulkan_funcs *vk_funcs; + LUID adapter_luid; + HRESULT hr; static const char * const instance_extensions[] = { @@ -142,7 +190,9 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe return E_FAIL; } - FIXME("Ignoring adapter %p.\n", adapter); + /* FIXME: Get VkPhysicalDevice for IDXGIAdapter. */ + if (FAILED(hr = d3d12_get_adapter(&adapter, &adapter_luid))) + return hr; memset(&instance_create_info, 0, sizeof(instance_create_info)); instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; @@ -161,8 +211,12 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe device_create_info.instance_create_info = &instance_create_info; device_create_info.device_extensions = device_extensions; device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); + device_create_info.parent = adapter; + device_create_info.adapter_luid = adapter_luid; - return vkd3d_create_device(&device_create_info, iid, device); + hr = vkd3d_create_device(&device_create_info, iid, device); + IUnknown_Release(adapter); + return hr; } HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size, -- 2.19.2

3 2

[PATCH v2 1/7] user32/tests: Use EM_SETMARGINS to test EC_USEFONTINFO margins.
by Akihiro Sagawa 11 Mar '19

11 Mar '19

Tests assume that WM_SETFONT margins are equal to EM_SETMARGINS with EC_USEFONTINFO ones. This isn't true in the CJK charset font. This patch also contains a patch which uses GdiGetCodePage instead of GetTextCharset because GetTextCharset can't handle associated charset correctly seen in Chinese locale. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 54 ++++++++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 20 deletions(-)

2 1

[PATCH 3/3] ntdll: Add support for returning previous state argument in event functions.
by Jacek Caban 11 Mar '19

11 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/sync.c | 10 +++------- dlls/ntdll/tests/om.c | 5 ----- server/event.c | 1 + server/protocol.def | 2 ++ 4 files changed, 6 insertions(+), 12 deletions(-)

1 0

[PATCH 1/3] ntdll/tests: Add more event op tests.
by Jacek Caban 11 Mar '19

11 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 48 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-)

1 0

[PATCH 2/2] server: Wake waiters when new pipe server instance is created.
by Jacek Caban 11 Mar '19

11 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 78 ++++++++++++++++++++++++++++++++++++++ server/named_pipe.c | 1 + 2 files changed, 79 insertions(+)

1 0

[PATCH 1/2] server: Connect pipe servers in order that they enter listening state.
by Jacek Caban 11 Mar '19

11 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 114 ++++++++++++++++++++++++++++++++++--- server/named_pipe.c | 52 +++++------------ 2 files changed, 122 insertions(+), 44 deletions(-)

1 0

[PATCH 1/2] ntoskrnl.exe: Add MmBuildMdlForNonPagedPool stub.
by Gijs Vermeulen 11 Mar '19

11 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46761 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 52e0228bae..caeb89b870 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2525,6 +2525,14 @@ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS lowaddress, PHYSICAL_ADDRESS return NULL; } +/*********************************************************************** + * MmBuildMdlForNonPagedPool (NTOSKRNL.EXE.@) + */ +void WINAPI MmBuildMdlForNonPagedPool(MDL *mdl) +{ + FIXME("stub: %p\n", mdl); +} + /*********************************************************************** * MmCreateSection (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 438f720333..dbe381f2da 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -672,7 +672,7 @@ @ stub MmAllocateMappingAddress @ stdcall MmAllocateNonCachedMemory(long) @ stdcall MmAllocatePagesForMdl(int64 int64 int64 long) -@ stub MmBuildMdlForNonPagedPool +@ stdcall MmBuildMdlForNonPagedPool(ptr) @ stub MmCanFileBeTruncated @ stub MmCommitSessionMappedView @ stdcall MmCopyVirtualMemory(ptr ptr ptr ptr long long ptr) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 293da50cde..53e064fdd1 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1542,6 +1542,7 @@ NTSTATUS WINAPI KeWaitForSingleObject(void*,KWAIT_REASON,KPROCESSOR_MODE,BOOLEA PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,SIZE_T); +void WINAPI MmBuildMdlForNonPagedPool(MDL*); void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); void * WINAPI MmGetSystemRoutineAddress(UNICODE_STRING*); PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDL,KPROCESSOR_MODE,MEMORY_CACHING_TYPE,PVOID,ULONG,ULONG); -- 2.21.0

1 1

[PATCH] include/wine/unicode: Avoid scanning the entire string in memrchrW
by Gabriel Ivăncescu 11 Mar '19

11 Mar '19

Scanning backwards can avoid a full scan of the entire string and makes more sense since we are looking for the last char. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- include/wine/unicode.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index a4b483a..8ee84e4 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -291,10 +291,9 @@ WINE_UNICODE_INLINE WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) WINE_UNICODE_INLINE WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) { - const WCHAR *end; - WCHAR *ret = NULL; - for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) ret = (WCHAR *)(ULONG_PTR)ptr; - return ret; + const WCHAR *p; + for (p = ptr + n - 1; p >= ptr; p--) if (*p == ch) return (WCHAR *)(ULONG_PTR)p; + return NULL; } WINE_UNICODE_INLINE long int atolW( const WCHAR *str ) -- 2.20.1

1 0

[PATCH 10/10] d3dx9: Merge the d3dx_effect_SetMatrixPointerArray() helper
by Michael Stefaniuc 11 Mar '19

11 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 63 ++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 88271406f3..356641d621 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1526,41 +1526,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && count <= param->element_count) - { - UINT i; - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - set_dirty(param); - for (i = 0; i < count; ++i) - { - set_matrix(&param->members[i], matrix[i]); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_transpose(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX *matrix) { @@ -3527,10 +3492,36 @@ static HRESULT WINAPI d3dx_effect_SetMatrixPointerArray(ID3DXEffect *iface, D3DX const D3DXMATRIX **matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); - return d3dx9_base_effect_set_matrix_pointer_array(&effect->base_effect, parameter, matrix, count); + if (param && count <= param->element_count) + { + unsigned int i; + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + set_dirty(param); + for (i = 0; i < count; ++i) + set_matrix(&param->members[i], matrix[i]); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetMatrixPointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 09/10] d3dx9: Merge the d3dx_effect_SetMatrixArray() helper
by Michael Stefaniuc 11 Mar '19

11 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 69 ++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ea1e06f4b9..88271406f3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1526,44 +1526,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_matrix_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && param->element_count >= count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - set_dirty(param); - for (i = 0; i < count; ++i) - { - set_matrix(&param->members[i], &matrix[i]); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) { @@ -3485,10 +3447,39 @@ static HRESULT WINAPI d3dx_effect_SetMatrixArray(ID3DXEffect *iface, D3DXHANDLE const D3DXMATRIX *matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); - return d3dx9_base_effect_set_matrix_array(&effect->base_effect, parameter, matrix, count); + if (param && param->element_count >= count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + set_dirty(param); + for (i = 0; i < count; ++i) + set_matrix(&param->members[i], &matrix[i]); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetMatrixArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 08/10] d3dx9: Merge the d3dx_effect_SetMatrix() helper
by Michael Stefaniuc 11 Mar '19

11 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 61 +++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 34 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1d93e702fd..ea1e06f4b9 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1526,39 +1526,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_matrix(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXMATRIX *matrix) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && !param->element_count) - { - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - set_matrix(param, matrix); - set_dirty(param); - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) { @@ -3448,10 +3415,36 @@ static HRESULT WINAPI d3dx_effect_GetVectorArray(ID3DXEffect *iface, D3DXHANDLE static HRESULT WINAPI d3dx_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXMATRIX *matrix) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); - return d3dx9_base_effect_set_matrix(&effect->base_effect, parameter, matrix); + if (param && !param->element_count) + { + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + set_matrix(param, matrix); + set_dirty(param); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix) -- 2.20.1

2 1

[PATCH 07/10] d3dx9: Merge the d3dx_effect_GetMatrixPointerArray() helper
by Michael Stefaniuc 11 Mar '19

11 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 70 +++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 925bfb5505..1d93e702fd 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1632,44 +1632,6 @@ static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effe return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_matrix_pointer_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!count) return D3D_OK; - - if (param && matrix && count <= param->element_count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - for (i = 0; i < count; ++i) - { - get_matrix(&param->members[i], matrix[i], FALSE); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_transpose(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX *matrix) { @@ -3591,10 +3553,40 @@ static HRESULT WINAPI d3dx_effect_GetMatrixPointerArray(ID3DXEffect *iface, D3DX D3DXMATRIX **matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); - return d3dx9_base_effect_get_matrix_pointer_array(&effect->base_effect, parameter, matrix, count); + if (!count) + return D3D_OK; + + if (param && matrix && count <= param->element_count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + get_matrix(&param->members[i], matrix[i], FALSE); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetMatrixTranspose(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 06/10] d3dx9: Merge the d3dx_effect_GetMatrixArray() helper
by Michael Stefaniuc 11 Mar '19

11 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 72 +++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 40 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f6ed26360d..925bfb5505 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1597,45 +1597,6 @@ static HRESULT d3dx9_base_effect_set_matrix_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_matrix_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!count) return D3D_OK; - - if (matrix && param && count <= param->element_count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - for (i = 0; i < count; ++i) - { - get_matrix(&param->members[i], &matrix[i], FALSE); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) { @@ -3579,10 +3540,41 @@ static HRESULT WINAPI d3dx_effect_GetMatrixArray(ID3DXEffect *iface, D3DXHANDLE D3DXMATRIX *matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); - return d3dx9_base_effect_get_matrix_array(&effect->base_effect, parameter, matrix, count); + if (!count) + return D3D_OK; + + if (matrix && param && count <= param->element_count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + get_matrix(&param->members[i], &matrix[i], FALSE); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetMatrixPointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 05/10] d3dx9: Merge the d3dx_effect_GetMatrix() helper
by Michael Stefaniuc 11 Mar '19

11 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 59 +++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 33 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0052f172fe..f6ed26360d 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1559,38 +1559,6 @@ static HRESULT d3dx9_base_effect_set_matrix(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_matrix(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXMATRIX *matrix) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (matrix && param && !param->element_count) - { - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - get_matrix(param, matrix, FALSE); - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) { @@ -3566,10 +3534,35 @@ static HRESULT WINAPI d3dx_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE param static HRESULT WINAPI d3dx_effect_GetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); - return d3dx9_base_effect_get_matrix(&effect->base_effect, parameter, matrix); + if (matrix && param && !param->element_count) + { + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + get_matrix(param, matrix, FALSE); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetMatrixArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH v2 04/10] d3dx9: Merge the d3dx_effect_SetIntArray() helper
by Michael Stefaniuc 11 Mar '19

11 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: resent dlls/d3dx9_36/effect.c | 69 ++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d1eaa6a767..0052f172fe 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1345,44 +1345,6 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const INT *n, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param) - { - UINT i, size = min(count, param->bytes / sizeof(DWORD)); - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_MATRIX_ROWS: - for (i = 0; i < size; ++i) - { - set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT); - } - set_dirty(param); - return D3D_OK; - - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -3390,10 +3352,39 @@ static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE paramete static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, const INT *n, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count); - return d3dx9_base_effect_set_int_array(&effect->base_effect, parameter, n, count); + if (param) + { + unsigned int i, size = min(count, param->bytes / sizeof(DWORD)); + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < size; ++i) + set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT); + set_dirty(param); + return D3D_OK; + + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, UINT count) -- 2.20.1

2 1

[PATCH v2 01/10] d3dx9: Merge the d3dx_effect_GetInt() helper
by Michael Stefaniuc 11 Mar '19

11 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: - INT ==> int - FLOAT ==> float - Removed a comment dlls/d3dx9_36/effect.c | 69 ++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 230af5bde8..5d0be346b8 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1388,44 +1388,6 @@ static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHAN return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_int(struct d3dx9_base_effect *base, D3DXHANDLE parameter, INT *n) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (n && param && !param->element_count) - { - if (param->columns == 1 && param->rows == 1) - { - set_number(n, D3DXPT_INT, param->data, param->type); - TRACE("Returning %i\n", *n); - return D3D_OK; - } - - if (param->type == D3DXPT_FLOAT && - ((param->class == D3DXPC_VECTOR && param->columns != 2) - || (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) - { - TRACE("Vector fixup\n"); - - /* all components (3,4) are clamped (0,255) and put in the INT */ - *n = (INT)(min(max(0.0f, *((FLOAT *)param->data + 2)), 1.0f) * INT_FLOAT_MULTI); - *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 1)), 1.0f) * INT_FLOAT_MULTI)) << 8; - *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 0)), 1.0f) * INT_FLOAT_MULTI)) << 16; - if (param->columns * param->rows > 3) - { - *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 3)), 1.0f) * INT_FLOAT_MULTI)) << 24; - } - - TRACE("Returning %i\n", *n); - return D3D_OK; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const INT *n, UINT count) { @@ -3422,10 +3384,39 @@ static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE paramete static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, n %p.\n", iface, parameter, n); - return d3dx9_base_effect_get_int(&effect->base_effect, parameter, n); + if (n && param && !param->element_count) + { + if (param->columns == 1 && param->rows == 1) + { + set_number(n, D3DXPT_INT, param->data, param->type); + TRACE("Returning %d.\n", *n); + return D3D_OK; + } + + if (param->type == D3DXPT_FLOAT && + ((param->class == D3DXPC_VECTOR && param->columns != 2) + || (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) + { + TRACE("Vector fixup.\n"); + + *n = min(max(0.0f, *((float *)param->data + 2)), 1.0f) * INT_FLOAT_MULTI; + *n += ((int)(min(max(0.0f, *((float *)param->data + 1)), 1.0f) * INT_FLOAT_MULTI)) << 8; + *n += ((int)(min(max(0.0f, *((float *)param->data + 0)), 1.0f) * INT_FLOAT_MULTI)) << 16; + if (param->columns * param->rows > 3) + *n += ((int)(min(max(0.0f, *((float *)param->data + 3)), 1.0f) * INT_FLOAT_MULTI)) << 24; + + TRACE("Returning %d.\n", *n); + return D3D_OK; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, const INT *n, UINT count) -- 2.20.1

2 1

[PATCH] msi: Skip the special SummaryInformation stream in msi_commit_streams.
by Hans Leidekker 11 Mar '19

11 Mar '19

Avoids adding a useless table stream when called on an existing database. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/streams.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 6565b3d4c4..dae1d971c4 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -616,7 +616,10 @@ UINT msi_commit_streams( MSIDATABASE *db ) for (i = 0; i < db->num_streams; i++) { name = msi_string_lookup( db->strings, db->streams[i].str_index, NULL ); + if (!strcmpW( name, szSumInfo )) continue; + if (!(encname = encode_streamname( FALSE, name ))) return ERROR_OUTOFMEMORY; + TRACE("saving stream %s as %s\n", debugstr_w(name), debugstr_w(encname)); hr = IStorage_CreateStream( db->storage, encname, STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stream ); if (SUCCEEDED( hr )) -- 2.20.1

1 0

[PATCH] ntoskrnl.exe: Support NULL type in ObReferenceObjectByHandle.
by Jacek Caban 11 Mar '19

11 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 32 ++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/ntoskrnl_private.h | 9 ++++++++ dlls/ntoskrnl.exe/tests/driver.c | 11 ++++++++-- 3 files changed, 48 insertions(+), 4 deletions(-)

1 0

[PATCH] jscript: Add Object.getPrototypeOf implementation.
by Jacek Caban 11 Mar '19

11 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/object.c | 30 +++++++++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 2 ++ dlls/mshtml/tests/es5.js | 30 +++++++++++++++++++++++++++++- 3 files changed, 60 insertions(+), 2 deletions(-)

1 0

[PATCH v2 5/7] user32/tests: Tests default margin size with various font face.
by Akihiro Sagawa 11 Mar '19

11 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 49 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-)

1 0

[PATCH 9/9] mshtml: Create top content window in init_browser.
by Jacek Caban 11 Mar '19

11 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 13 +++---------- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/nsembed.c | 17 ++++++++++++++++- 3 files changed, 21 insertions(+), 11 deletions(-)

1 0

[PATCH 8/9] mshtml: Store GeckoBrowser weak reference in HTMLOuterWindow.
by Jacek Caban 11 Mar '19

11 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlwindow.c | 11 +++++++++-- dlls/mshtml/mshtml_private.h | 4 ++++ dlls/mshtml/nsembed.c | 7 +++++++ 3 files changed, 20 insertions(+), 2 deletions(-)

1 0

[PATCH 7/9] mshtml: Pass GeckoBrowser instead of HTMLDocumentObj to create_outer_window.
by Jacek Caban 11 Mar '19

11 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 9 +-------- dlls/mshtml/htmlframe.c | 10 ++-------- dlls/mshtml/htmlwindow.c | 18 +++++++----------- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 11 insertions(+), 28 deletions(-)

1 0

[PATCH 6/9] mshtml: Store weak GeckoBrowser reference in HTMLDocumentNode.
by Jacek Caban 11 Mar '19

11 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 8 ++++++++ dlls/mshtml/mshtml_private.h | 5 +++++ dlls/mshtml/nsembed.c | 9 +++++++++ 3 files changed, 22 insertions(+)

1 0

[PATCH 5/9] mshtml: Use global security manager.
by Jacek Caban 11 Mar '19

11 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 4 ++++ dlls/mshtml/htmlwindow.c | 9 --------- dlls/mshtml/main.c | 20 ++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/mutation.c | 3 ++- dlls/mshtml/persist.c | 2 +- dlls/mshtml/secmgr.c | 6 +++--- 7 files changed, 31 insertions(+), 16 deletions(-)

1 0

[PATCH 4/9] mshtml: Pass GeckoBrowser instead of HTMLDocumentObj to create_document_node.
by Jacek Caban 11 Mar '19

11 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 3 ++- dlls/mshtml/htmlwindow.c | 6 ++---- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-)

1 0

[PATCH 3/9] mshtml: Move child window list to inner window and detach children when detaching parent.
by Jacek Caban 11 Mar '19

11 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlwindow.c | 32 +++++++++++++++----------------- dlls/mshtml/mshtml_private.h | 2 +- 2 files changed, 16 insertions(+), 18 deletions(-)

1 0

[PATCH 2/9] mshtml: Detach more document objects in detach_inner_window.
by Jacek Caban 11 Mar '19

11 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 38 ++++++++++++++++++++++-------------- dlls/mshtml/htmlwindow.c | 8 +++----- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 27 insertions(+), 20 deletions(-)

1 0

[PATCH 1/9] mshtml: Rename NSContainer to GeckoBrowser.
by Jacek Caban 11 Mar '19

11 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Long term plan is to move parts of HTMLDocumentObj to GeckoBrowser and split them in a way allowing them to run in different threads. This is needed to move Gecko-related tasks into a separated thread to workaround Gecko main thread limitation. --- dlls/mshtml/editor.c | 4 +- dlls/mshtml/htmldoc.c | 4 +- dlls/mshtml/mshtml_private.h | 16 +-- dlls/mshtml/nsembed.c | 220 +++++++++++++++++------------------ dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/nsio.c | 2 +- dlls/mshtml/view.c | 2 +- 7 files changed, 125 insertions(+), 125 deletions(-)

1 0

[website] German translation for release 3.0.5
by Julian Rüger 11 Mar '19

11 Mar '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 4.3
by Julian Rüger 11 Mar '19

11 Mar '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 4.2
by Julian Rüger 11 Mar '19

11 Mar '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 4.1
by Julian Rüger 11 Mar '19

11 Mar '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 5/13] msi: Add support for deleting streams from an MSI database.
by Erich E. Hoover 11 Mar '19

11 Mar '19

msidb allows developers to remove "streams" (cabinet files) from a database with the "-k" mode flag. To support that feature we need MSIMODIFY_DELETE support in the underlying MSI implementation.

2 1

[PATCH 4/13] winemsibuilder: Forward winemsibuilder functionality to msidb.
by Erich E. Hoover 11 Mar '19

11 Mar '19

Patches 1-3 implement the msidb features required by winemsibuilder, this patch forwards winemsibuilder requests to msidb so that these features are not unnecessarily duplicated. The user is also informed that they should use msidb directly and provides them with the equivalent command-line arguments.

2 1

[PATCH 3/13] msidb: Add support for adding stream/cabinet files to MSI databases.
by Erich E. Hoover 11 Mar '19

11 Mar '19

msidb allows developers to add "streams" (cabinet files) to a database with the "-a" mode flag followed by a filename, example: msidb -d package.msi -a cabinet.cab

2 1

[PATCH 1/13] msidb: Add stub tool for manipulating MSI databases.
by Erich E. Hoover 11 Mar '19

11 Mar '19

The "Windows SDK Components for Windows Installer Developers" has a command line tool called msidb that is incredibly useful for creating, editing, and exporting MSI installer databases, think of it as winemsibuilder on steroids. This patch series implements much of the functionality of the msidb tool, maintains compatible CLI flags, and the underlying MSI functionality necessary to support these features. Jacek expressed an interest in having these patches resurrected for use by the Gecko build scripts and Austin's VS builds of Valgrind. With this patch series all the existing winemsibuilder functionality is available, plus the ability to drop streams, export the _SummaryInformation table, and export binary streams (Binary/Icon tables). A big feature of the implementation is that it allows you to edit existing installer databases, rather than just creating new ones. This specific patch creates the initial "stub" version of the tool with the ability to open, close, and create installer databases. This version differs from the original submission a few years ago in that it uses transact mode, rather than direct, per Hans Leidekker's suggestion. Best, Erich

2 1

[PATCH] winhttp: Don't crash setting up secure proxy
by Andrew Eikum 11 Mar '19

11 Mar '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- The crash happens when calling secure_proxy_connect with request->netconn==NULL. dlls/winhttp/request.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index af484cccf8..d3d9f572f2 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1673,6 +1673,9 @@ static BOOL open_connection( struct request *request ) } netconn_set_timeout( netconn, TRUE, request->send_timeout ); netconn_set_timeout( netconn, FALSE, request->receive_response_timeout ); + + request->netconn = netconn; + if (is_secure) { if (connect->session->proxy_server && @@ -1680,6 +1683,7 @@ static BOOL open_connection( struct request *request ) { if (!secure_proxy_connect( request )) { + request->netconn = NULL; heap_free( addressW ); netconn_close( netconn ); return FALSE; @@ -1693,13 +1697,13 @@ static BOOL open_connection( struct request *request ) !netconn_secure_connect( netconn, connect->hostname, request->security_flags, &request->cred_handle, request->check_revocation )) { + request->netconn = NULL; heap_free( addressW ); netconn_close( netconn ); return FALSE; } } - request->netconn = netconn; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, addressW, strlenW(addressW) + 1 ); } else -- 2.21.0

2 1

[PATCH v3 3/3] opencl: Add OpenCL 1.1 implementation.
by Nakarin Khankham 11 Mar '19

11 Mar '19

Signed-off-by: Nakarin Khankham <garuda2550(a)gmail.com> --- v2: Use function pointer instead of call the function directly. v3: Remove WINAPI from function pointer prototype. --- dlls/opencl/opencl.c | 194 ++++++++++++++++++++++++++++++++++++++++ dlls/opencl/opencl.spec | 10 +++ 2 files changed, 204 insertions(+) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 221cf1a04c..41fc71b2c9 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -196,6 +196,28 @@ static cl_int (*pclEnqueueBarrier)(cl_command_queue command_queue); /* Extension function access */ static void * (*pclGetExtensionFunctionAddress)(const char * func_name); +/* OpenCL 1.1 functions */ +static cl_mem (*pclCreateSubBuffer)(cl_mem buffer, cl_mem_flags flags, + cl_buffer_create_type buffer_create_type, const void * buffer_create_info, cl_int * errcode_ret); +static cl_event (*pclCreateUserEvent)(cl_context context, cl_int * errcode_ret); +static cl_int (*pclEnqueueCopyBufferRect)(cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, + const size_t * src_origin, const size_t * dst_origin, const size_t * region, + size_t src_row_pitch, size_t src_slice_pitch, + size_t dst_row_pitch, size_t dst_slice_pitch, + cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueReadBufferRect)(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, + const size_t * buffer_origin, const size_t * host_origin, const size_t * region, + size_t buffer_row_pitch, size_t buffer_slice_pitch, size_t host_row_pitch, size_t host_slice_pitch, + void * ptr, cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueWriteBufferRect)(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, + const size_t * buffer_origin, const size_t * host_origin, const size_t * region, + size_t buffer_row_pitch, size_t buffer_slice_pitch, size_t host_row_pitch, size_t host_slice_pitch, + const void * ptr, cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event); +static cl_int (*pclSetEventCallback)(cl_event event, cl_int command_exec_callback_type, + void (*pfn_notify)(cl_event, cl_int, void *), void *user_data); +static cl_int (*pclSetMemObjectDestructorCallback)(cl_mem memobj, void (*pfn_notify)(cl_mem, void*), void *user_data); +static cl_int (*pclSetUserEventStatus)(cl_event event, cl_int execution_status); + static BOOL init_opencl(void); static BOOL load_opencl_func(void); @@ -358,6 +380,18 @@ static BOOL load_opencl_func(void) /* Extension function access */ LOAD_FUNCPTR(clGetExtensionFunctionAddress); + /* OpenCL 1.1 functions */ +#ifdef CL_VERSION_1_1 + LOAD_FUNCPTR(clCreateSubBuffer); + LOAD_FUNCPTR(clCreateUserEvent); + LOAD_FUNCPTR(clEnqueueCopyBufferRect); + LOAD_FUNCPTR(clEnqueueReadBufferRect); + LOAD_FUNCPTR(clEnqueueWriteBufferRect); + LOAD_FUNCPTR(clSetEventCallback); + LOAD_FUNCPTR(clSetMemObjectDestructorCallback); + LOAD_FUNCPTR(clSetUserEventStatus); +#endif + #undef LOAD_FUNCPTR return TRUE; @@ -648,6 +682,20 @@ cl_mem WINAPI wine_clCreateBuffer(cl_context context, cl_mem_flags flags, size_t return ret; } +cl_mem WINAPI wine_clCreateSubBuffer(cl_mem buffer, cl_mem_flags flags, + cl_buffer_create_type buffer_create_type, const void * buffer_create_info, cl_int * errcode_ret) +{ + cl_mem ret; + TRACE("\n"); + if (!pclCreateSubBuffer) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclCreateSubBuffer(buffer, flags, buffer_create_type, buffer_create_info, errcode_ret); + return ret; +} + cl_mem WINAPI wine_clCreateImage2D(cl_context context, cl_mem_flags flags, cl_image_format * image_format, size_t image_width, size_t image_height, size_t image_row_pitch, void * host_ptr, cl_int * errcode_ret) { @@ -725,6 +773,46 @@ cl_int WINAPI wine_clGetImageInfo(cl_mem image, cl_image_info param_name, size_t return ret; } +typedef struct +{ + void WINAPI (*pfn_notify)(cl_mem memobj, void* user_data); + void *user_data; +} MEM_CALLBACK; + +static void mem_fn_notify(cl_mem memobj, void* user_data) +{ + MEM_CALLBACK *mcb; + FIXME("(%p, %p)\n", memobj, user_data); + mcb = (MEM_CALLBACK *) user_data; + mcb->pfn_notify(memobj, mcb->user_data); + HeapFree(GetProcessHeap(), 0, mcb); + FIXME("Callback COMPLETED\n"); +} + +cl_int WINAPI wine_clSetMemObjectDestructorCallback(cl_mem memobj, void WINAPI (*pfn_notify)(cl_mem, void*), void *user_data) +{ + /* FIXME: Based on PROGRAM_CALLBACK/program_fn_notify function. I'm not sure about this. */ + cl_int ret; + FIXME("(%p, %p, %p)\n", memobj, pfn_notify, user_data); + if (!pclSetMemObjectDestructorCallback) return CL_INVALID_VALUE; + if(pfn_notify) + { + /* When pfn_notify is provided, clSetMemObjectDestructorCallback is asynchronous */ + MEM_CALLBACK *mcb; + mcb = HeapAlloc(GetProcessHeap(), 0, sizeof(MEM_CALLBACK)); + mcb->pfn_notify = pfn_notify; + mcb->user_data = user_data; + ret = pclSetMemObjectDestructorCallback(memobj, mem_fn_notify, user_data); + } + else + { + /* When pfn_notify is NULL, clSetMemObjectDestructorCallback is synchronous */ + ret = pclSetMemObjectDestructorCallback(memobj, NULL, user_data); + } + FIXME("(%p, %p, %p)=%d\n", memobj, pfn_notify, user_data, ret); + return ret; +} + /*---------------------------------------------------------------*/ /* Sampler APIs */ @@ -1009,6 +1097,69 @@ cl_int WINAPI wine_clReleaseEvent(cl_event event) return ret; } +cl_event WINAPI wine_clCreateUserEvent(cl_context context, cl_int * errcode_ret) +{ + cl_event ret; + TRACE("\n"); + if (!pclCreateUserEvent) + { + *errcode_ret = CL_INVALID_CONTEXT; + return NULL; + } + ret = pclCreateUserEvent(context, errcode_ret); + return ret; +} + +typedef struct +{ + void WINAPI (*pfn_notify)(cl_event event, cl_int num, void* user_data); + void *user_data; +} EVENT_CALLBACK; + +static void event_fn_notify(cl_event event, cl_int num, void* user_data) +{ + EVENT_CALLBACK *ecb; + FIXME("(%p, %d, %p)\n", event, num, user_data); + ecb = (EVENT_CALLBACK *) user_data; + ecb->pfn_notify(event, num, ecb->user_data); + HeapFree(GetProcessHeap(), 0, ecb); + FIXME("Callback COMPLETED\n"); +} + +cl_int WINAPI wine_clSetEventCallback(cl_event event, cl_int command_exec_callback_type, + void WINAPI (*pfn_notify)(cl_event, cl_int, void *), void *user_data) +{ + /* FIXME: Based on PROGRAM_CALLBACK/program_fn_notify function. I'm not sure about this. */ + cl_int ret; + FIXME("(%p, %d, %p, %p)\n", event, command_exec_callback_type, pfn_notify, user_data); + if (!pclSetEventCallback) return CL_INVALID_EVENT; + if(pfn_notify) + { + /* When pfn_notify is provided, clSetEventCallback is asynchronous */ + EVENT_CALLBACK *ecb; + ecb = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENT_CALLBACK)); + ecb->pfn_notify = pfn_notify; + ecb->user_data = user_data; + ret = pclSetEventCallback(event, command_exec_callback_type, event_fn_notify, user_data); + } + else + { + /* When pfn_notify is NULL, clSetEventCallback is synchronous */ + ret = pclSetEventCallback(event, command_exec_callback_type, NULL, user_data); + } + FIXME("(%p, %d, %p, %p)=%d\n", event, command_exec_callback_type, pfn_notify, user_data, ret); + return ret; +} + +cl_int WINAPI wine_clSetUserEventStatus(cl_event event, cl_int execution_status) +{ + cl_int ret; + TRACE("\n"); + if (!pclSetUserEventStatus) return CL_INVALID_EVENT; + ret = pclSetUserEventStatus(event, execution_status); + return ret; +} + /*---------------------------------------------------------------*/ /* Profiling APIs */ @@ -1062,6 +1213,21 @@ cl_int WINAPI wine_clEnqueueReadBuffer(cl_command_queue command_queue, cl_mem bu return ret; } +cl_int WINAPI wine_clEnqueueReadBufferRect(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, + const size_t * buffer_origin, const size_t * host_origin, const size_t * region, + size_t buffer_row_pitch, size_t buffer_slice_pitch, size_t host_row_pitch, size_t host_slice_pitch, + void * ptr, cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) +{ + cl_int ret; + TRACE("\n"); + if (!pclEnqueueReadBufferRect) return CL_INVALID_VALUE; + ret = pclEnqueueReadBufferRect(command_queue, buffer, blocking_read, + buffer_origin, host_origin, region, + buffer_row_pitch, buffer_slice_pitch, host_row_pitch, host_slice_pitch, + ptr, num_events_in_wait_list, event_wait_list, event); + return ret; +} + cl_int WINAPI wine_clEnqueueWriteBuffer(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, size_t offset, size_t cb, const void * ptr, cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) @@ -1073,6 +1239,21 @@ cl_int WINAPI wine_clEnqueueWriteBuffer(cl_command_queue command_queue, cl_mem b return ret; } +cl_int WINAPI wine_clEnqueueWriteBufferRect( cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, + const size_t * buffer_origin, const size_t * host_origin, const size_t * region, + size_t buffer_row_pitch, size_t buffer_slice_pitch, size_t host_row_pitch, size_t host_slice_pitch, + const void * ptr, cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) +{ + cl_int ret; + TRACE("\n"); + if (!pclEnqueueWriteBufferRect) return CL_INVALID_VALUE; + ret = pclEnqueueWriteBufferRect(command_queue, buffer, blocking_read, + buffer_origin, host_origin, region, + buffer_row_pitch, buffer_slice_pitch, host_row_pitch, host_slice_pitch, + ptr, num_events_in_wait_list, event_wait_list, event); + return ret; +} + cl_int WINAPI wine_clEnqueueCopyBuffer(cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, size_t src_offset, size_t dst_offset, size_t cb, cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) @@ -1084,6 +1265,19 @@ cl_int WINAPI wine_clEnqueueCopyBuffer(cl_command_queue command_queue, cl_mem sr return ret; } +cl_int WINAPI wine_clEnqueueCopyBufferRect(cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, + const size_t * src_origin, const size_t * dst_origin, const size_t * region, + size_t src_row_pitch, size_t src_slice_pitch, + size_t dst_row_pitch, size_t dst_slice_pitch, + cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) +{ + cl_int ret; + TRACE("\n"); + if (!pclEnqueueCopyBufferRect) return CL_INVALID_VALUE; + ret = pclEnqueueCopyBufferRect(command_queue, src_buffer, dst_buffer, src_origin, dst_origin, region, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, num_events_in_wait_list, event_wait_list, event); + return ret; +} + cl_int WINAPI wine_clEnqueueReadImage(cl_command_queue command_queue, cl_mem image, cl_bool blocking_read, const size_t * origin, const size_t * region, SIZE_T row_pitch, SIZE_T slice_pitch, void * ptr, diff --git a/dlls/opencl/opencl.spec b/dlls/opencl/opencl.spec index ba8ce6e7cd..4782653f3d 100644 --- a/dlls/opencl/opencl.spec +++ b/dlls/opencl/opencl.spec @@ -94,3 +94,13 @@ # @ stdcall clGetGLTextureInfo( long long long ptr ptr ) wine_clGetGLTextureInfo # @ stdcall clEnqueueAcquireGLObjects( long long ptr long ptr ptr ) wine_clEnqueueAcquireGLObjects # @ stdcall clEnqueueReleaseGLObjects( long long ptr long ptr ptr ) wine_clEnqueueReleaseGLObjects + +# OpenCL 1.1 +@ stdcall clCreateSubBuffer( long long long ptr ptr ) wine_clCreateSubBuffer +@ stdcall clCreateUserEvent( long ptr ) wine_clCreateUserEvent +@ stdcall clEnqueueCopyBufferRect( long long long ptr ptr ptr long long long long long ptr ptr ) wine_clEnqueueCopyBufferRect +@ stdcall clEnqueueReadBufferRect( long long long ptr ptr ptr long long long long ptr long ptr ptr ) wine_clEnqueueReadBufferRect +@ stdcall clEnqueueWriteBufferRect( long long long ptr ptr ptr long long long long ptr long ptr ptr ) wine_clEnqueueWriteBufferRect +@ stdcall clSetEventCallback( long long ptr ptr ) wine_clSetEventCallback +@ stdcall clSetMemObjectDestructorCallback( long ptr ptr ) wine_clSetMemObjectDestructorCallback +@ stdcall clSetUserEventStatus( long long ) wine_clSetUserEventStatus -- 2.17.1

1 0

[PATCH v3 2/3] opencl: Use function pointer instead of call the function directly.
by Nakarin Khankham 11 Mar '19

11 Mar '19

Signed-off-by: Nakarin Khankham <garuda2550(a)gmail.com> --- dlls/opencl/opencl.c | 241 +++++++++++++++++++++++++++++++------------ 1 file changed, 177 insertions(+), 64 deletions(-) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 7d292c03be..221cf1a04c 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -371,7 +371,8 @@ cl_int WINAPI wine_clGetPlatformIDs(cl_uint num_entries, cl_platform_id *platfor { cl_int ret; TRACE("(%d, %p, %p)\n", num_entries, platforms, num_platforms); - ret = clGetPlatformIDs(num_entries, platforms, num_platforms); + if (!pclGetPlatformIDs) return CL_INVALID_VALUE; + ret = pclGetPlatformIDs(num_entries, platforms, num_platforms); TRACE("(%d, %p, %p)=%d\n", num_entries, platforms, num_platforms, ret); return ret; } @@ -382,6 +383,8 @@ cl_int WINAPI wine_clGetPlatformInfo(cl_platform_id platform, cl_platform_info p cl_int ret; TRACE("(%p, 0x%x, %ld, %p, %p)\n", platform, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetPlatformInfo) return CL_INVALID_VALUE; + /* Hide all extensions. * TODO: Add individual extension support as needed. */ @@ -404,7 +407,7 @@ cl_int WINAPI wine_clGetPlatformInfo(cl_platform_id platform, cl_platform_info p } else { - ret = clGetPlatformInfo(platform, param_name, param_value_size, param_value, param_value_size_ret); + ret = pclGetPlatformInfo(platform, param_name, param_value_size, param_value, param_value_size_ret); } TRACE("(%p, 0x%x, %ld, %p, %p)=%d\n", platform, param_name, param_value_size, param_value, param_value_size_ret, ret); @@ -420,7 +423,8 @@ cl_int WINAPI wine_clGetDeviceIDs(cl_platform_id platform, cl_device_type device { cl_int ret; TRACE("(%p, 0x%lx, %d, %p, %p)\n", platform, (long unsigned int)device_type, num_entries, devices, num_devices); - ret = clGetDeviceIDs(platform, device_type, num_entries, devices, num_devices); + if (!pclGetDeviceIDs) return CL_INVALID_VALUE; + ret = pclGetDeviceIDs(platform, device_type, num_entries, devices, num_devices); TRACE("(%p, 0x%lx, %d, %p, %p)=%d\n", platform, (long unsigned int)device_type, num_entries, devices, num_devices, ret); return ret; } @@ -431,6 +435,8 @@ cl_int WINAPI wine_clGetDeviceInfo(cl_device_id device, cl_device_info param_nam cl_int ret; TRACE("(%p, 0x%x, %ld, %p, %p)\n",device, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetDeviceInfo) return CL_INVALID_VALUE; + /* Hide all extensions. * TODO: Add individual extension support as needed. */ @@ -453,7 +459,7 @@ cl_int WINAPI wine_clGetDeviceInfo(cl_device_id device, cl_device_info param_nam } else { - ret = clGetDeviceInfo(device, param_name, param_value_size, param_value, param_value_size_ret); + ret = pclGetDeviceInfo(device, param_name, param_value_size, param_value, param_value_size_ret); } /* Filter out the CL_EXEC_NATIVE_KERNEL flag */ @@ -493,6 +499,11 @@ cl_context WINAPI wine_clCreateContext(const cl_context_properties * properties, cl_context ret; CONTEXT_CALLBACK *ccb; TRACE("(%p, %d, %p, %p, %p, %p)\n", properties, num_devices, devices, pfn_notify, user_data, errcode_ret); + if (!pclCreateContext) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } /* FIXME: The CONTEXT_CALLBACK structure is currently leaked. * Pointers to callback redirectors should be remembered and free()d when the context is destroyed. * The problem is determining when a context is being destroyed. clReleaseContext only decrements @@ -502,7 +513,7 @@ cl_context WINAPI wine_clCreateContext(const cl_context_properties * properties, ccb = HeapAlloc(GetProcessHeap(), 0, sizeof(CONTEXT_CALLBACK)); ccb->pfn_notify = pfn_notify; ccb->user_data = user_data; - ret = clCreateContext(properties, num_devices, devices, context_fn_notify, ccb, errcode_ret); + ret = pclCreateContext(properties, num_devices, devices, context_fn_notify, ccb, errcode_ret); TRACE("(%p, %d, %p, %p, %p, %p (%d)))=%p\n", properties, num_devices, devices, &pfn_notify, user_data, errcode_ret, errcode_ret ? *errcode_ret : 0, ret); return ret; } @@ -514,6 +525,11 @@ cl_context WINAPI wine_clCreateContextFromType(const cl_context_properties * pro cl_context ret; CONTEXT_CALLBACK *ccb; TRACE("(%p, 0x%lx, %p, %p, %p)\n", properties, (long unsigned int)device_type, pfn_notify, user_data, errcode_ret); + if (!pclCreateContextFromType) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } /* FIXME: The CONTEXT_CALLBACK structure is currently leaked. * Pointers to callback redirectors should be remembered and free()d when the context is destroyed. * The problem is determining when a context is being destroyed. clReleaseContext only decrements @@ -523,7 +539,7 @@ cl_context WINAPI wine_clCreateContextFromType(const cl_context_properties * pro ccb = HeapAlloc(GetProcessHeap(), 0, sizeof(CONTEXT_CALLBACK)); ccb->pfn_notify = pfn_notify; ccb->user_data = user_data; - ret = clCreateContextFromType(properties, device_type, context_fn_notify, ccb, errcode_ret); + ret = pclCreateContextFromType(properties, device_type, context_fn_notify, ccb, errcode_ret); TRACE("(%p, 0x%lx, %p, %p, %p (%d)))=%p\n", properties, (long unsigned int)device_type, pfn_notify, user_data, errcode_ret, errcode_ret ? *errcode_ret : 0, ret); return ret; } @@ -532,7 +548,8 @@ cl_int WINAPI wine_clRetainContext(cl_context context) { cl_int ret; TRACE("(%p)\n", context); - ret = clRetainContext(context); + if (!pclRetainContext) return CL_INVALID_VALUE; + ret = pclRetainContext(context); TRACE("(%p)=%d\n", context, ret); return ret; } @@ -541,7 +558,8 @@ cl_int WINAPI wine_clReleaseContext(cl_context context) { cl_int ret; TRACE("(%p)\n", context); - ret = clReleaseContext(context); + if (!pclReleaseContext) return CL_INVALID_VALUE; + ret = pclReleaseContext(context); TRACE("(%p)=%d\n", context, ret); return ret; } @@ -551,7 +569,8 @@ cl_int WINAPI wine_clGetContextInfo(cl_context context, cl_context_info param_na { cl_int ret; TRACE("(%p, 0x%x, %ld, %p, %p)\n", context, param_name, param_value_size, param_value, param_value_size_ret); - ret = clGetContextInfo(context, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetContextInfo) return CL_INVALID_VALUE; + ret = pclGetContextInfo(context, param_name, param_value_size, param_value, param_value_size_ret); TRACE("(%p, 0x%x, %ld, %p, %p)=%d\n", context, param_name, param_value_size, param_value, param_value_size_ret, ret); return ret; } @@ -565,7 +584,12 @@ cl_command_queue WINAPI wine_clCreateCommandQueue(cl_context context, cl_device_ { cl_command_queue ret; TRACE("(%p, %p, 0x%lx, %p)\n", context, device, (long unsigned int)properties, errcode_ret); - ret = clCreateCommandQueue(context, device, properties, errcode_ret); + if (!pclCreateCommandQueue) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclCreateCommandQueue(context, device, properties, errcode_ret); TRACE("(%p, %p, 0x%lx, %p)=%p\n", context, device, (long unsigned int)properties, errcode_ret, ret); return ret; } @@ -574,7 +598,8 @@ cl_int WINAPI wine_clRetainCommandQueue(cl_command_queue command_queue) { cl_int ret; TRACE("(%p)\n", command_queue); - ret = clRetainCommandQueue(command_queue); + if (!pclRetainCommandQueue) return CL_INVALID_VALUE; + ret = pclRetainCommandQueue(command_queue); TRACE("(%p)=%d\n", command_queue, ret); return ret; } @@ -583,7 +608,8 @@ cl_int WINAPI wine_clReleaseCommandQueue(cl_command_queue command_queue) { cl_int ret; TRACE("(%p)\n", command_queue); - ret = clReleaseCommandQueue(command_queue); + if (!pclReleaseCommandQueue) return CL_INVALID_VALUE; + ret = pclReleaseCommandQueue(command_queue); TRACE("(%p)=%d\n", command_queue, ret); return ret; } @@ -593,7 +619,8 @@ cl_int WINAPI wine_clGetCommandQueueInfo(cl_command_queue command_queue, cl_comm { cl_int ret; TRACE("%p, %d, %ld, %p, %p\n", command_queue, param_name, param_value_size, param_value, param_value_size_ret); - ret = clGetCommandQueueInfo(command_queue, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetCommandQueueInfo) return CL_INVALID_VALUE; + ret = pclGetCommandQueueInfo(command_queue, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -612,7 +639,12 @@ cl_mem WINAPI wine_clCreateBuffer(cl_context context, cl_mem_flags flags, size_t { cl_mem ret; TRACE("\n"); - ret = clCreateBuffer(context, flags, size, host_ptr, errcode_ret); + if (!pclCreateBuffer) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclCreateBuffer(context, flags, size, host_ptr, errcode_ret); return ret; } @@ -621,7 +653,12 @@ cl_mem WINAPI wine_clCreateImage2D(cl_context context, cl_mem_flags flags, cl_im { cl_mem ret; TRACE("\n"); - ret = clCreateImage2D(context, flags, image_format, image_width, image_height, image_row_pitch, host_ptr, errcode_ret); + if (!pclCreateImage2D) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclCreateImage2D(context, flags, image_format, image_width, image_height, image_row_pitch, host_ptr, errcode_ret); return ret; } @@ -631,7 +668,12 @@ cl_mem WINAPI wine_clCreateImage3D(cl_context context, cl_mem_flags flags, cl_im { cl_mem ret; TRACE("\n"); - ret = clCreateImage3D(context, flags, image_format, image_width, image_height, image_depth, image_row_pitch, image_slice_pitch, host_ptr, errcode_ret); + if (!pclCreateImage3D) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclCreateImage3D(context, flags, image_format, image_width, image_height, image_depth, image_row_pitch, image_slice_pitch, host_ptr, errcode_ret); return ret; } @@ -639,7 +681,8 @@ cl_int WINAPI wine_clRetainMemObject(cl_mem memobj) { cl_int ret; TRACE("(%p)\n", memobj); - ret = clRetainMemObject(memobj); + if (!pclRetainMemObject) return CL_INVALID_VALUE; + ret = pclRetainMemObject(memobj); TRACE("(%p)=%d\n", memobj, ret); return ret; } @@ -648,7 +691,8 @@ cl_int WINAPI wine_clReleaseMemObject(cl_mem memobj) { cl_int ret; TRACE("(%p)\n", memobj); - ret = clReleaseMemObject(memobj); + if (!pclReleaseMemObject) return CL_INVALID_VALUE; + ret = pclReleaseMemObject(memobj); TRACE("(%p)=%d\n", memobj, ret); return ret; } @@ -658,7 +702,8 @@ cl_int WINAPI wine_clGetSupportedImageFormats(cl_context context, cl_mem_flags f { cl_int ret; TRACE("\n"); - ret = clGetSupportedImageFormats(context, flags, image_type, num_entries, image_formats, num_image_formats); + if (!pclGetSupportedImageFormats) return CL_INVALID_VALUE; + ret = pclGetSupportedImageFormats(context, flags, image_type, num_entries, image_formats, num_image_formats); return ret; } @@ -666,7 +711,8 @@ cl_int WINAPI wine_clGetMemObjectInfo(cl_mem memobj, cl_mem_info param_name, siz { cl_int ret; TRACE("\n"); - ret = clGetMemObjectInfo(memobj, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetMemObjectInfo) return CL_INVALID_VALUE; + ret = pclGetMemObjectInfo(memobj, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -674,7 +720,8 @@ cl_int WINAPI wine_clGetImageInfo(cl_mem image, cl_image_info param_name, size_t { cl_int ret; TRACE("\n"); - ret = clGetImageInfo(image, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetImageInfo) return CL_INVALID_VALUE; + ret = pclGetImageInfo(image, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -687,7 +734,12 @@ cl_sampler WINAPI wine_clCreateSampler(cl_context context, cl_bool normalized_co { cl_sampler ret; TRACE("\n"); - ret = clCreateSampler(context, normalized_coords, addressing_mode, filter_mode, errcode_ret); + if (!pclCreateSampler) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclCreateSampler(context, normalized_coords, addressing_mode, filter_mode, errcode_ret); return ret; } @@ -695,7 +747,8 @@ cl_int WINAPI wine_clRetainSampler(cl_sampler sampler) { cl_int ret; TRACE("\n"); - ret = clRetainSampler(sampler); + if (!pclRetainSampler) return CL_INVALID_VALUE; + ret = pclRetainSampler(sampler); return ret; } @@ -703,7 +756,8 @@ cl_int WINAPI wine_clReleaseSampler(cl_sampler sampler) { cl_int ret; TRACE("\n"); - ret = clReleaseSampler(sampler); + if (!pclReleaseSampler) return CL_INVALID_VALUE; + ret = pclReleaseSampler(sampler); return ret; } @@ -712,7 +766,8 @@ cl_int WINAPI wine_clGetSamplerInfo(cl_sampler sampler, cl_sampler_info param_na { cl_int ret; TRACE("\n"); - ret = clGetSamplerInfo(sampler, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetSamplerInfo) return CL_INVALID_VALUE; + ret = pclGetSamplerInfo(sampler, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -725,7 +780,12 @@ cl_program WINAPI wine_clCreateProgramWithSource(cl_context context, cl_uint cou { cl_program ret; TRACE("\n"); - ret = clCreateProgramWithSource(context, count, strings, lengths, errcode_ret); + if (!pclCreateProgramWithSource) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclCreateProgramWithSource(context, count, strings, lengths, errcode_ret); return ret; } @@ -735,7 +795,12 @@ cl_program WINAPI wine_clCreateProgramWithBinary(cl_context context, cl_uint num { cl_program ret; TRACE("\n"); - ret = clCreateProgramWithBinary(context, num_devices, device_list, lengths, binaries, binary_status, errcode_ret); + if (!pclCreateProgramWithBinary) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclCreateProgramWithBinary(context, num_devices, device_list, lengths, binaries, binary_status, errcode_ret); return ret; } @@ -743,7 +808,8 @@ cl_int WINAPI wine_clRetainProgram(cl_program program) { cl_int ret; TRACE("\n"); - ret = clRetainProgram(program); + if (!pclRetainProgram) return CL_INVALID_PROGRAM; + ret = pclRetainProgram(program); return ret; } @@ -751,7 +817,8 @@ cl_int WINAPI wine_clReleaseProgram(cl_program program) { cl_int ret; TRACE("\n"); - ret = clReleaseProgram(program); + if (!pclReleaseProgram) return CL_INVALID_PROGRAM; + ret = pclReleaseProgram(program); return ret; } @@ -777,6 +844,7 @@ cl_int WINAPI wine_clBuildProgram(cl_program program, cl_uint num_devices, const { cl_int ret; TRACE("\n"); + if (!pclBuildProgram) return CL_INVALID_VALUE; if(pfn_notify) { /* When pfn_notify is provided, clBuildProgram is asynchronous */ @@ -784,12 +852,12 @@ cl_int WINAPI wine_clBuildProgram(cl_program program, cl_uint num_devices, const pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PROGRAM_CALLBACK)); pcb->pfn_notify = pfn_notify; pcb->user_data = user_data; - ret = clBuildProgram(program, num_devices, device_list, options, program_fn_notify, pcb); + ret = pclBuildProgram(program, num_devices, device_list, options, program_fn_notify, pcb); } else { /* When pfn_notify is NULL, clBuildProgram is synchronous */ - ret = clBuildProgram(program, num_devices, device_list, options, NULL, user_data); + ret = pclBuildProgram(program, num_devices, device_list, options, NULL, user_data); } return ret; } @@ -798,7 +866,8 @@ cl_int WINAPI wine_clUnloadCompiler(void) { cl_int ret; TRACE("()\n"); - ret = clUnloadCompiler(); + if (!pclUnloadCompiler) return CL_SUCCESS; + ret = pclUnloadCompiler(); TRACE("()=%d\n", ret); return ret; } @@ -808,7 +877,8 @@ cl_int WINAPI wine_clGetProgramInfo(cl_program program, cl_program_info param_na { cl_int ret; TRACE("\n"); - ret = clGetProgramInfo(program, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetProgramInfo) return CL_INVALID_VALUE; + ret = pclGetProgramInfo(program, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -818,7 +888,8 @@ cl_int WINAPI wine_clGetProgramBuildInfo(cl_program program, cl_device_id device { cl_int ret; TRACE("\n"); - ret = clGetProgramBuildInfo(program, device, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetProgramBuildInfo) return CL_INVALID_VALUE; + ret = pclGetProgramBuildInfo(program, device, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -830,7 +901,12 @@ cl_kernel WINAPI wine_clCreateKernel(cl_program program, char * kernel_name, cl_ { cl_kernel ret; TRACE("\n"); - ret = clCreateKernel(program, kernel_name, errcode_ret); + if (!pclCreateKernel) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclCreateKernel(program, kernel_name, errcode_ret); return ret; } @@ -839,7 +915,8 @@ cl_int WINAPI wine_clCreateKernelsInProgram(cl_program program, cl_uint num_kern { cl_int ret; TRACE("\n"); - ret = clCreateKernelsInProgram(program, num_kernels, kernels, num_kernels_ret); + if (!pclCreateKernelsInProgram) return CL_INVALID_VALUE; + ret = pclCreateKernelsInProgram(program, num_kernels, kernels, num_kernels_ret); return ret; } @@ -847,7 +924,8 @@ cl_int WINAPI wine_clRetainKernel(cl_kernel kernel) { cl_int ret; TRACE("\n"); - ret = clRetainKernel(kernel); + if (!pclRetainKernel) return CL_INVALID_KERNEL; + ret = pclRetainKernel(kernel); return ret; } @@ -855,7 +933,8 @@ cl_int WINAPI wine_clReleaseKernel(cl_kernel kernel) { cl_int ret; TRACE("\n"); - ret = clReleaseKernel(kernel); + if (!pclReleaseKernel) return CL_INVALID_KERNEL; + ret = pclReleaseKernel(kernel); return ret; } @@ -863,7 +942,8 @@ cl_int WINAPI wine_clSetKernelArg(cl_kernel kernel, cl_uint arg_index, size_t ar { cl_int ret; TRACE("\n"); - ret = clSetKernelArg(kernel, arg_index, arg_size, arg_value); + if (!pclSetKernelArg) return CL_INVALID_KERNEL; + ret = pclSetKernelArg(kernel, arg_index, arg_size, arg_value); return ret; } @@ -872,7 +952,8 @@ cl_int WINAPI wine_clGetKernelInfo(cl_kernel kernel, cl_kernel_info param_name, { cl_int ret; TRACE("\n"); - ret = clGetKernelInfo(kernel, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetKernelInfo) return CL_INVALID_VALUE; + ret = pclGetKernelInfo(kernel, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -882,7 +963,8 @@ cl_int WINAPI wine_clGetKernelWorkGroupInfo(cl_kernel kernel, cl_device_id devic { cl_int ret; TRACE("\n"); - ret = clGetKernelWorkGroupInfo(kernel, device, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetKernelWorkGroupInfo) return CL_INVALID_VALUE; + ret = pclGetKernelWorkGroupInfo(kernel, device, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -894,7 +976,8 @@ cl_int WINAPI wine_clWaitForEvents(cl_uint num_events, cl_event * event_list) { cl_int ret; TRACE("\n"); - ret = clWaitForEvents(num_events, event_list); + if (!pclWaitForEvents) return CL_INVALID_EVENT; + ret = pclWaitForEvents(num_events, event_list); return ret; } @@ -903,7 +986,8 @@ cl_int WINAPI wine_clGetEventInfo(cl_event event, cl_event_info param_name, size { cl_int ret; TRACE("\n"); - ret = clGetEventInfo(event, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetEventInfo) return CL_INVALID_EVENT; + ret = pclGetEventInfo(event, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -911,7 +995,8 @@ cl_int WINAPI wine_clRetainEvent(cl_event event) { cl_int ret; TRACE("\n"); - ret = clRetainEvent(event); + if (!pclRetainEvent) return CL_INVALID_EVENT; + ret = pclRetainEvent(event); return ret; } @@ -919,7 +1004,8 @@ cl_int WINAPI wine_clReleaseEvent(cl_event event) { cl_int ret; TRACE("\n"); - ret = clReleaseEvent(event); + if (!pclReleaseEvent) return CL_INVALID_EVENT; + ret = pclReleaseEvent(event); return ret; } @@ -932,7 +1018,8 @@ cl_int WINAPI wine_clGetEventProfilingInfo(cl_event event, cl_profiling_info par { cl_int ret; TRACE("\n"); - ret = clGetEventProfilingInfo(event, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetEventProfilingInfo) return CL_INVALID_EVENT; + ret = pclGetEventProfilingInfo(event, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -944,7 +1031,8 @@ cl_int WINAPI wine_clFlush(cl_command_queue command_queue) { cl_int ret; TRACE("(%p)\n", command_queue); - ret = clFlush(command_queue); + if (!pclFlush) return CL_INVALID_COMMAND_QUEUE; + ret = pclFlush(command_queue); TRACE("(%p)=%d\n", command_queue, ret); return ret; } @@ -953,7 +1041,8 @@ cl_int WINAPI wine_clFinish(cl_command_queue command_queue) { cl_int ret; TRACE("(%p)\n", command_queue); - ret = clFinish(command_queue); + if (!pclFinish) return CL_INVALID_COMMAND_QUEUE; + ret = pclFinish(command_queue); TRACE("(%p)=%d\n", command_queue, ret); return ret; } @@ -968,7 +1057,8 @@ cl_int WINAPI wine_clEnqueueReadBuffer(cl_command_queue command_queue, cl_mem bu { cl_int ret; TRACE("\n"); - ret = clEnqueueReadBuffer(command_queue, buffer, blocking_read, offset, cb, ptr, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueReadBuffer) return CL_INVALID_VALUE; + ret = pclEnqueueReadBuffer(command_queue, buffer, blocking_read, offset, cb, ptr, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -978,7 +1068,8 @@ cl_int WINAPI wine_clEnqueueWriteBuffer(cl_command_queue command_queue, cl_mem b { cl_int ret; TRACE("\n"); - ret = clEnqueueWriteBuffer(command_queue, buffer, blocking_write, offset, cb, ptr, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueWriteBuffer) return CL_INVALID_VALUE; + ret = pclEnqueueWriteBuffer(command_queue, buffer, blocking_write, offset, cb, ptr, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -988,7 +1079,8 @@ cl_int WINAPI wine_clEnqueueCopyBuffer(cl_command_queue command_queue, cl_mem sr { cl_int ret; TRACE("\n"); - ret = clEnqueueCopyBuffer(command_queue, src_buffer, dst_buffer, src_offset, dst_offset, cb, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueCopyBuffer) return CL_INVALID_VALUE; + ret = pclEnqueueCopyBuffer(command_queue, src_buffer, dst_buffer, src_offset, dst_offset, cb, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -1000,7 +1092,8 @@ cl_int WINAPI wine_clEnqueueReadImage(cl_command_queue command_queue, cl_mem ima cl_int ret; TRACE("(%p, %p, %d, %p, %p, %ld, %ld, %p, %d, %p, %p)\n", command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); - ret = clEnqueueReadImage(command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueReadImage) return CL_INVALID_VALUE; + ret = pclEnqueueReadImage(command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); TRACE("(%p, %p, %d, %p, %p, %ld, %ld, %p, %d, %p, %p)=%d\n", command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event, ret); return ret; @@ -1013,7 +1106,8 @@ cl_int WINAPI wine_clEnqueueWriteImage(cl_command_queue command_queue, cl_mem im { cl_int ret; TRACE("\n"); - ret = clEnqueueWriteImage(command_queue, image, blocking_write, origin, region, input_row_pitch, input_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueWriteImage) return CL_INVALID_VALUE; + ret = pclEnqueueWriteImage(command_queue, image, blocking_write, origin, region, input_row_pitch, input_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -1023,7 +1117,8 @@ cl_int WINAPI wine_clEnqueueCopyImage(cl_command_queue command_queue, cl_mem src { cl_int ret; TRACE("\n"); - ret = clEnqueueCopyImage(command_queue, src_image, dst_image, src_origin, dst_origin, region, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueCopyImage) return CL_INVALID_VALUE; + ret = pclEnqueueCopyImage(command_queue, src_image, dst_image, src_origin, dst_origin, region, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -1033,7 +1128,8 @@ cl_int WINAPI wine_clEnqueueCopyImageToBuffer(cl_command_queue command_queue, cl { cl_int ret; TRACE("\n"); - ret = clEnqueueCopyImageToBuffer(command_queue, src_image, dst_buffer, src_origin, region, dst_offset, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueCopyImageToBuffer) return CL_INVALID_VALUE; + ret = pclEnqueueCopyImageToBuffer(command_queue, src_image, dst_buffer, src_origin, region, dst_offset, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -1043,7 +1139,8 @@ cl_int WINAPI wine_clEnqueueCopyBufferToImage(cl_command_queue command_queue, cl { cl_int ret; TRACE("\n"); - ret = clEnqueueCopyBufferToImage(command_queue, src_buffer, dst_image, src_offset, dst_origin, region, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueCopyBufferToImage) return CL_INVALID_VALUE; + ret = pclEnqueueCopyBufferToImage(command_queue, src_buffer, dst_image, src_offset, dst_origin, region, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -1053,7 +1150,12 @@ void * WINAPI wine_clEnqueueMapBuffer(cl_command_queue command_queue, cl_mem buf { void * ret; TRACE("\n"); - ret = clEnqueueMapBuffer(command_queue, buffer, blocking_map, map_flags, offset, cb, num_events_in_wait_list, event_wait_list, event, errcode_ret); + if (!pclEnqueueMapBuffer) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclEnqueueMapBuffer(command_queue, buffer, blocking_map, map_flags, offset, cb, num_events_in_wait_list, event_wait_list, event, errcode_ret); return ret; } @@ -1064,7 +1166,12 @@ void * WINAPI wine_clEnqueueMapImage(cl_command_queue command_queue, cl_mem imag { void * ret; TRACE("\n"); - ret = clEnqueueMapImage(command_queue, image, blocking_map, map_flags, origin, region, image_row_pitch, image_slice_pitch, num_events_in_wait_list, event_wait_list, event, errcode_ret); + if (!pclEnqueueMapImage) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclEnqueueMapImage(command_queue, image, blocking_map, map_flags, origin, region, image_row_pitch, image_slice_pitch, num_events_in_wait_list, event_wait_list, event, errcode_ret); return ret; } @@ -1073,7 +1180,8 @@ cl_int WINAPI wine_clEnqueueUnmapMemObject(cl_command_queue command_queue, cl_me { cl_int ret; TRACE("\n"); - ret = clEnqueueUnmapMemObject(command_queue, memobj, mapped_ptr, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueUnmapMemObject) return CL_INVALID_VALUE; + ret = pclEnqueueUnmapMemObject(command_queue, memobj, mapped_ptr, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -1083,7 +1191,8 @@ cl_int WINAPI wine_clEnqueueNDRangeKernel(cl_command_queue command_queue, cl_ker { cl_int ret; TRACE("\n"); - ret = clEnqueueNDRangeKernel(command_queue, kernel, work_dim, global_work_offset, global_work_size, local_work_size, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueNDRangeKernel) return CL_INVALID_VALUE; + ret = pclEnqueueNDRangeKernel(command_queue, kernel, work_dim, global_work_offset, global_work_size, local_work_size, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -1092,7 +1201,8 @@ cl_int WINAPI wine_clEnqueueTask(cl_command_queue command_queue, cl_kernel kerne { cl_int ret; TRACE("\n"); - ret = clEnqueueTask(command_queue, kernel, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueTask) return CL_INVALID_VALUE; + ret = pclEnqueueTask(command_queue, kernel, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -1121,7 +1231,8 @@ cl_int WINAPI wine_clEnqueueMarker(cl_command_queue command_queue, cl_event * ev { cl_int ret; TRACE("\n"); - ret = clEnqueueMarker(command_queue, event); + if (!pclEnqueueMarker) return CL_INVALID_VALUE; + ret = pclEnqueueMarker(command_queue, event); return ret; } @@ -1129,7 +1240,8 @@ cl_int WINAPI wine_clEnqueueWaitForEvents(cl_command_queue command_queue, cl_uin { cl_int ret; TRACE("\n"); - ret = clEnqueueWaitForEvents(command_queue, num_events, event_list); + if (!pclEnqueueWaitForEvents) return CL_INVALID_VALUE; + ret = pclEnqueueWaitForEvents(command_queue, num_events, event_list); return ret; } @@ -1137,7 +1249,8 @@ cl_int WINAPI wine_clEnqueueBarrier(cl_command_queue command_queue) { cl_int ret; TRACE("\n"); - ret = clEnqueueBarrier(command_queue); + if (!pclEnqueueBarrier) return CL_INVALID_VALUE; + ret = pclEnqueueBarrier(command_queue); return ret; } -- 2.17.1

1 0

[v2 PATCH] mfplat/tests: Remove a test crashing on XP/Vista.
by Nikolay Sivov 11 Mar '19

11 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: another attempt dlls/mfplat/tests/mfplat.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ae9d3b5719..3fa729b50e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -873,9 +873,6 @@ static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResul IMFMediaEvent_Release(event); - hr = IMFMediaEventQueue_EndGetEvent(queue, result, &event); - ok(hr == E_FAIL, "Unexpected result, hr %#x.\n", hr); - IMFMediaEventQueue_Release(queue); SetEvent(callback->event); -- 2.20.1

1 0

[PATCH] mfplat/tests: Remove a test crashing on XP/Vista.
by Nikolay Sivov 11 Mar '19

11 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Running this manually, this seems to help. Let's see how it goes. dlls/mfplat/tests/mfplat.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ae9d3b5719..ad248ffa09 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -846,7 +846,7 @@ static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResul { struct test_callback *callback = impl_from_IMFAsyncCallback(iface); IMFMediaEventQueue *queue; - IUnknown *state, *obj; + IUnknown *state; HRESULT hr; ok(result != NULL, "Unexpected result object.\n"); @@ -868,9 +868,6 @@ static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResul hr = IMFMediaEventQueue_EndGetEvent(queue, result, &event); ok(hr == S_OK, "Failed to finalize GetEvent, hr %#x.\n", hr); - hr = IMFAsyncResult_GetObject(result, &obj); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); - IMFMediaEvent_Release(event); hr = IMFMediaEventQueue_EndGetEvent(queue, result, &event); -- 2.20.1

2 1

[PATCH 1/8] include: Add Media Foundation handler interfaces definition.
by Nikolay Sivov 11 Mar '19

11 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/mfidl.idl | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 04a6d71bf9..630dc6120d 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -183,6 +183,58 @@ interface IMFMediaSession : IMFMediaEventGenerator HRESULT GetFullTopology([in] DWORD flags, [in] TOPOID id, [out] IMFTopology **topology); } +[ + object, + uuid(bb420aa4-765b-4a1f-91fe-d6a8a143924c), + local +] +interface IMFByteStreamHandler : IUnknown +{ + HRESULT BeginCreateObject( + [in] IMFByteStream *stream, + [in] const WCHAR *url, + [in] DWORD flags, + [in] IPropertyStore *props, + [out] IUnknown **cancel_cookie, + [in] IMFAsyncCallback *callback, + [in] IUnknown *state); + + HRESULT EndCreateObject( + [in] IMFAsyncResult *result, + [out] MF_OBJECT_TYPE *obj_type, + [out] IUnknown **object); + + HRESULT CancelObjectCreation( + [in] IUnknown *cancel_cookie); + + HRESULT GetMaxNumberOfBytesRequiredForResolution( + [out] QWORD *bytes); +} + +[ + object, + uuid(6d4c7b74-52a0-4bb7-b0db-55f29f47a668), + local +] +interface IMFSchemeHandler : IUnknown +{ + HRESULT BeginCreateObject( + [in] const WCHAR *url, + [in] DWORD flags, + [in] IPropertyStore *props, + [out] IUnknown **cancel_cookie, + [in] IMFAsyncCallback *callback, + [in] IUnknown *state); + + HRESULT EndCreateObject( + [in] IMFAsyncResult *result, + [out] MF_OBJECT_TYPE *obj_type, + [out] IUnknown **object); + + HRESULT CancelObjectCreation( + [in] IUnknown *cancel_cookie); +} + [ object, uuid(fbe5a32d-a497-4b61-bb85-97b1a848a6e3) -- 2.20.1

2 10

[PATCH v2] po: Update Tamil translation.
by Isira Seneviratne 11 Mar '19

11 Mar '19

1 0

Problem building from ARM64
by Carlo B. 11 Mar '19

11 Mar '19

Hello, I wanted to try to build WINE for ARM64 but I'm having some problems. The configure script gives me this error message: "You need clang >= 5.0 to build Wine for arm64." I understand that probably I have to use clang instead of GCC because the missing support of __builtin_ms_va_list, but the problem is that I'm not able to find that anywhere and the most recent one is clang 4.0 into the list of available packages. Where did you get the right tools? Even the toolchains at developer.arm.com do not include this feature. I'm using i686 Debian 9.8.0 multiarch with aarch64-linux-gnu cross compiler. Perhaps it would be worth to update this thing and its solution also in the wiki page of the ARM64 port: https://wiki.winehq.org/ARM64 Sincerely.

3 3

[PATCH] d3d10: Implement ID3D10EffectScalarVariable::{Get, Set}{Int, Float, Bool}
by Nick Renieris 11 Mar '19

11 Mar '19

Signed-off-by: Nick Renieris <velocityra(a)gmail.com> --- dlls/d3d10/d3d10_private.h | 11 +++++++ dlls/d3d10/effect.c | 71 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 70 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index e785b8b..4f51bf7 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -100,6 +100,16 @@ struct d3d10_effect_shader_variable } shader; }; +struct d3d10_effect_scalar_variable +{ + union + { + int i; + float f; + BOOL b; + }; +}; + struct d3d10_effect_state_object_variable { union @@ -173,6 +183,7 @@ struct d3d10_effect_variable { struct d3d10_effect_state_object_variable state; struct d3d10_effect_shader_variable shader; + struct d3d10_effect_scalar_variable scalar; } u; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index cd6f4a3..f576983 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -4125,17 +4125,33 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetRawValue(ID3D10 static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetFloat(ID3D10EffectScalarVariable *iface, float value) { - FIXME("iface %p, value %.8e stub!\n", iface, value); + struct d3d10_effect_variable *This; - return E_NOTIMPL; + TRACE("iface %p, value %.8e\n", iface, value); + + if (!iface) + return D3DERR_INVALIDCALL; + + This = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + This->u.scalar.i = value; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetFloat(ID3D10EffectScalarVariable *iface, float *value) { - FIXME("iface %p, value %p stub!\n", iface, value); + struct d3d10_effect_variable *This; - return E_NOTIMPL; + TRACE("iface %p, value %p\n", iface, value); + + if (!iface || !value) + return D3DERR_INVALIDCALL; + + This = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + *value = This->u.scalar.f; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetFloatArray(ID3D10EffectScalarVariable *iface, @@ -4157,17 +4173,32 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetFloatArray(ID3D static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetInt(ID3D10EffectScalarVariable *iface, int value) { - FIXME("iface %p, value %d stub!\n", iface, value); + struct d3d10_effect_variable *This; - return E_NOTIMPL; + TRACE("iface %p, value %d\n", iface, value); + + if (!iface) + return D3DERR_INVALIDCALL; + + This = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + This->u.scalar.i = value; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetInt(ID3D10EffectScalarVariable *iface, int *value) { - FIXME("iface %p, value %p stub!\n", iface, value); + struct d3d10_effect_variable *This; - return E_NOTIMPL; + TRACE("iface %p, value %p\n", iface, value); + if (!iface || !value) + return D3DERR_INVALIDCALL; + + This = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + *value = This->u.scalar.i; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetIntArray(ID3D10EffectScalarVariable *iface, @@ -4189,17 +4220,33 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetIntArray(ID3D10 static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetBool(ID3D10EffectScalarVariable *iface, BOOL value) { - FIXME("iface %p, value %d stub!\n", iface, value); + struct d3d10_effect_variable *This; - return E_NOTIMPL; + TRACE("iface %p, value %d\n", iface, value); + + if (!iface) + return D3DERR_INVALIDCALL; + + This = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + This->u.scalar.b = value; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetBool(ID3D10EffectScalarVariable *iface, BOOL *value) { - FIXME("iface %p, value %p stub!\n", iface, value); + struct d3d10_effect_variable *This; - return E_NOTIMPL; + TRACE("iface %p, value %p\n", iface, value); + + if (!iface || !value) + return D3DERR_INVALIDCALL; + + This = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + *value = This->u.scalar.b; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetBoolArray(ID3D10EffectScalarVariable *iface, -- 2.7.4

1 0

uirbbon
by Fabian Maurer 10 Mar '19

10 Mar '19

Hello wine-devel, I'm progressing with uiribbon (see my last mails), so I've the file format reverse engineered enough to be able to parse them properly. The code to parse the files is generated from a kaitai struct description file, so I have written a C# program to turn that description file into usable C code. IMHO it would make sense to put that description file into Wine, too, but we'd also need the code generator for that. In IRC it was suggested that I could use a python script for that, is that okay? Alternative would be to write all the binary parser/writer from hand, but I'd rather just generate that from a comparatively simple description format - that's a lot easier IMHO. We also had a bit of discussion on implementing the "xml to binary blob" compiler, but I'm still a bit torn on how useful that would be. IMHO time would be better spent on an implementation. On the other hand, having a compiler would mean we better understand the format itself, and we don't have to embed binary blobs into our tests. I'm pretty sure I could pull it off, but it would take quite some time. Your thoughts? Regards, Fabian Maurer

1 0

Re: [PATCH 3/3] imm32: Fix output buffer length handling for A -> W conversion case of GCS_COMPSTR.
by Aric Stewart 10 Mar '19

10 Mar '19

Interesting my earlier sign-offs did not go through. Signed-off-by: Aric Stewart <aric(a)codeweavers.com>

2 2

[PATCH] wmvcore: Upgrade to IWMProfileManager2.
by Gijs Vermeulen 10 Mar '19

10 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28847 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/wmvcore/wmvcore_main.c | 77 +++++++++++++++++++++++-------------- 1 file changed, 48 insertions(+), 29 deletions(-) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 10ed18afa1..18a2afd640 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -87,25 +87,28 @@ HRESULT WINAPI WMCreateBackupRestorer(IUnknown *callback, IWMLicenseBackup **lic } typedef struct { - IWMProfileManager IWMProfileManager_iface; + IWMProfileManager2 IWMProfileManager2_iface; LONG ref; -} WMProfileManager; +} WMProfileManager2; -static inline WMProfileManager *impl_from_IWMProfileManager(IWMProfileManager *iface) +static inline WMProfileManager2 *impl_from_IWMProfileManager2(IWMProfileManager2 *iface) { - return CONTAINING_RECORD(iface, WMProfileManager, IWMProfileManager_iface); + return CONTAINING_RECORD(iface, WMProfileManager2, IWMProfileManager2_iface); } -static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager *iface, REFIID riid, void **ppv) +static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager2 *iface, REFIID riid, void **ppv) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager2 *This = impl_from_IWMProfileManager2(iface); if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IWMProfileManager_iface; + *ppv = &This->IWMProfileManager2_iface; }else if(IsEqualGUID(&IID_IWMProfileManager, riid)) { TRACE("(%p)->(IID_IWMProfileManager %p)\n", This, ppv); - *ppv = &This->IWMProfileManager_iface; + *ppv = &This->IWMProfileManager2_iface; + }else if(IsEqualGUID(&IID_IWMProfileManager2, riid)) { + TRACE("(%p)->(IID_IWMProfileManager2 %p)\n", This, ppv); + *ppv = &This->IWMProfileManager2_iface; }else { FIXME("Unsupported iface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -116,9 +119,9 @@ static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager *iface, return S_OK; } -static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager *iface) +static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager2 *iface) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager2 *This = impl_from_IWMProfileManager2(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -126,9 +129,9 @@ static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager *iface) return ref; } -static ULONG WINAPI WMProfileManager_Release(IWMProfileManager *iface) +static ULONG WINAPI WMProfileManager_Release(IWMProfileManager2 *iface) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager2 *This = impl_from_IWMProfileManager2(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -139,49 +142,63 @@ static ULONG WINAPI WMProfileManager_Release(IWMProfileManager *iface) return ref; } -static HRESULT WINAPI WMProfileManager_CreateEmptyProfile(IWMProfileManager *iface, WMT_VERSION version, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_CreateEmptyProfile(IWMProfileManager2 *iface, WMT_VERSION version, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager2 *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%x %p)\n", This, version, ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_LoadProfileByID(IWMProfileManager *iface, REFGUID guid, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_LoadProfileByID(IWMProfileManager2 *iface, REFGUID guid, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager2 *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_guid(guid), ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_LoadProfileByData(IWMProfileManager *iface, const WCHAR *profile, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_LoadProfileByData(IWMProfileManager2 *iface, const WCHAR *profile, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager2 *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_w(profile), ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_SaveProfile(IWMProfileManager *iface, IWMProfile *profile, WCHAR *profile_str, DWORD *len) +static HRESULT WINAPI WMProfileManager_SaveProfile(IWMProfileManager2 *iface, IWMProfile *profile, WCHAR *profile_str, DWORD *len) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager2 *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%p %p %p)\n", This, profile, profile_str, len); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_GetSystemProfileCount(IWMProfileManager *iface, DWORD *ret) +static HRESULT WINAPI WMProfileManager_GetSystemProfileCount(IWMProfileManager2 *iface, DWORD *ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager2 *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%p)\n", This, ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_LoadSystemProfile(IWMProfileManager *iface, DWORD index, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_LoadSystemProfile(IWMProfileManager2 *iface, DWORD index, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager2 *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%d %p)\n", This, index, ret); return E_NOTIMPL; } -static const IWMProfileManagerVtbl WMProfileManagerVtbl = { +static HRESULT WINAPI WMProfileManager2_GetSystemProfileVersion(IWMProfileManager2 *iface, WMT_VERSION *version) +{ + WMProfileManager2 *This = impl_from_IWMProfileManager2(iface); + FIXME("(%p)->(%p)\n", This, version); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfileManager2_SetSystemProfileVersion(IWMProfileManager2 *iface, WMT_VERSION version) +{ + WMProfileManager2 *This = impl_from_IWMProfileManager2(iface); + FIXME("(%p)->(%x)\n", This, version); + return E_NOTIMPL; +} + +static const IWMProfileManager2Vtbl WMProfileManager2Vtbl = { WMProfileManager_QueryInterface, WMProfileManager_AddRef, WMProfileManager_Release, @@ -190,12 +207,14 @@ static const IWMProfileManagerVtbl WMProfileManagerVtbl = { WMProfileManager_LoadProfileByData, WMProfileManager_SaveProfile, WMProfileManager_GetSystemProfileCount, - WMProfileManager_LoadSystemProfile + WMProfileManager_LoadSystemProfile, + WMProfileManager2_GetSystemProfileVersion, + WMProfileManager2_SetSystemProfileVersion }; HRESULT WINAPI WMCreateProfileManager(IWMProfileManager **ret) { - WMProfileManager *profile_mgr; + WMProfileManager2 *profile_mgr; TRACE("(%p)\n", ret); @@ -203,9 +222,9 @@ HRESULT WINAPI WMCreateProfileManager(IWMProfileManager **ret) if(!profile_mgr) return E_OUTOFMEMORY; - profile_mgr->IWMProfileManager_iface.lpVtbl = &WMProfileManagerVtbl; + profile_mgr->IWMProfileManager2_iface.lpVtbl = &WMProfileManager2Vtbl; profile_mgr->ref = 1; - *ret = &profile_mgr->IWMProfileManager_iface; + *ret = (IWMProfileManager *)&profile_mgr->IWMProfileManager2_iface; return S_OK; } -- 2.21.0

2 2

[PATCH v2] wmvcore: Upgrade to IWMProfileManager2.
by Gijs Vermeulen 10 Mar '19

10 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28847 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/wmvcore/wmvcore_main.c | 73 +++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 27 deletions(-) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 10ed18afa1..af23ab88b8 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -87,25 +87,28 @@ HRESULT WINAPI WMCreateBackupRestorer(IUnknown *callback, IWMLicenseBackup **lic } typedef struct { - IWMProfileManager IWMProfileManager_iface; + IWMProfileManager2 IWMProfileManager2_iface; LONG ref; } WMProfileManager; -static inline WMProfileManager *impl_from_IWMProfileManager(IWMProfileManager *iface) +static inline WMProfileManager *impl_from_IWMProfileManager2(IWMProfileManager2 *iface) { - return CONTAINING_RECORD(iface, WMProfileManager, IWMProfileManager_iface); + return CONTAINING_RECORD(iface, WMProfileManager, IWMProfileManager2_iface); } -static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager *iface, REFIID riid, void **ppv) +static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager2 *iface, REFIID riid, void **ppv) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IWMProfileManager_iface; + *ppv = &This->IWMProfileManager2_iface; }else if(IsEqualGUID(&IID_IWMProfileManager, riid)) { TRACE("(%p)->(IID_IWMProfileManager %p)\n", This, ppv); - *ppv = &This->IWMProfileManager_iface; + *ppv = &This->IWMProfileManager2_iface; + }else if(IsEqualGUID(&IID_IWMProfileManager2, riid)) { + TRACE("(%p)->(IID_IWMProfileManager2 %p)\n", This, ppv); + *ppv = &This->IWMProfileManager2_iface; }else { FIXME("Unsupported iface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -116,9 +119,9 @@ static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager *iface, return S_OK; } -static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager *iface) +static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager2 *iface) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -126,9 +129,9 @@ static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager *iface) return ref; } -static ULONG WINAPI WMProfileManager_Release(IWMProfileManager *iface) +static ULONG WINAPI WMProfileManager_Release(IWMProfileManager2 *iface) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -139,49 +142,63 @@ static ULONG WINAPI WMProfileManager_Release(IWMProfileManager *iface) return ref; } -static HRESULT WINAPI WMProfileManager_CreateEmptyProfile(IWMProfileManager *iface, WMT_VERSION version, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_CreateEmptyProfile(IWMProfileManager2 *iface, WMT_VERSION version, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%x %p)\n", This, version, ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_LoadProfileByID(IWMProfileManager *iface, REFGUID guid, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_LoadProfileByID(IWMProfileManager2 *iface, REFGUID guid, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_guid(guid), ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_LoadProfileByData(IWMProfileManager *iface, const WCHAR *profile, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_LoadProfileByData(IWMProfileManager2 *iface, const WCHAR *profile, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_w(profile), ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_SaveProfile(IWMProfileManager *iface, IWMProfile *profile, WCHAR *profile_str, DWORD *len) +static HRESULT WINAPI WMProfileManager_SaveProfile(IWMProfileManager2 *iface, IWMProfile *profile, WCHAR *profile_str, DWORD *len) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%p %p %p)\n", This, profile, profile_str, len); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_GetSystemProfileCount(IWMProfileManager *iface, DWORD *ret) +static HRESULT WINAPI WMProfileManager_GetSystemProfileCount(IWMProfileManager2 *iface, DWORD *ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%p)\n", This, ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_LoadSystemProfile(IWMProfileManager *iface, DWORD index, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_LoadSystemProfile(IWMProfileManager2 *iface, DWORD index, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%d %p)\n", This, index, ret); return E_NOTIMPL; } -static const IWMProfileManagerVtbl WMProfileManagerVtbl = { +static HRESULT WINAPI WMProfileManager2_GetSystemProfileVersion(IWMProfileManager2 *iface, WMT_VERSION *version) +{ + WMProfileManager *This = impl_from_IWMProfileManager2(iface); + FIXME("(%p)->(%p)\n", This, version); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfileManager2_SetSystemProfileVersion(IWMProfileManager2 *iface, WMT_VERSION version) +{ + WMProfileManager *This = impl_from_IWMProfileManager2(iface); + FIXME("(%p)->(%x)\n", This, version); + return E_NOTIMPL; +} + +static const IWMProfileManager2Vtbl WMProfileManager2Vtbl = { WMProfileManager_QueryInterface, WMProfileManager_AddRef, WMProfileManager_Release, @@ -190,7 +207,9 @@ static const IWMProfileManagerVtbl WMProfileManagerVtbl = { WMProfileManager_LoadProfileByData, WMProfileManager_SaveProfile, WMProfileManager_GetSystemProfileCount, - WMProfileManager_LoadSystemProfile + WMProfileManager_LoadSystemProfile, + WMProfileManager2_GetSystemProfileVersion, + WMProfileManager2_SetSystemProfileVersion }; HRESULT WINAPI WMCreateProfileManager(IWMProfileManager **ret) @@ -203,9 +222,9 @@ HRESULT WINAPI WMCreateProfileManager(IWMProfileManager **ret) if(!profile_mgr) return E_OUTOFMEMORY; - profile_mgr->IWMProfileManager_iface.lpVtbl = &WMProfileManagerVtbl; + profile_mgr->IWMProfileManager2_iface.lpVtbl = &WMProfileManager2Vtbl; profile_mgr->ref = 1; - *ret = &profile_mgr->IWMProfileManager_iface; + *ret = (IWMProfileManager *)&profile_mgr->IWMProfileManager2_iface; return S_OK; } -- 2.21.0

1 0

Fwd: [PATCH] uianimation: Add stub dll
by Vijay Kiran Kamuju 10 Mar '19

10 Mar '19

Isira, has explained the functionality of this idl and its related dll. Its needed for bug# 41369. I am trying to get the patch in staging to upstream, by checking the Windows 7 sdk. I am also splitting and modifying the patches in staging appropriately. Thanks, Vijay On Sat, Mar 9, 2019 at 12:25 PM Isira Seneviratne <isirasen96(a)gmail.com> wrote: > > > > On Sat, Mar 9, 2019 at 4:43 PM Nikolay Sivov <nsivov(a)codeweavers.com> wrote: >> >> Any idea what's that for? >> > It seems to be the Windows Animation Manager that was introduced with Windows 7 and the Windows Vista Platform Update: https://docs.microsoft.com/en-us/windows/desktop/uianimation/-main-portal > > According to that page, its purpose is to simplify the process of adding animation to an application UI. >

4 4

Re: [PATCH 1/3] imm32: Replace macros with helper functions.
by Aric Stewart 09 Mar '19

09 Mar '19

Signed-off-by: Aric Stewart <aric(a)codeweavers.com>

1 0

Re: [PATCH 2/3] imm32: Fix output buffer length handling for no-conversion case of GCS_COMPSTR.
by Aric Stewart 09 Mar '19

09 Mar '19

Signed-off-by: Aric Stewart <aric(a)codeweavers.com>

1 0

[PATCH v3] find: First tests
by Fabian Maurer 09 Mar '19

09 Mar '19

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/find/tests/Makefile.in | 5 + programs/find/tests/find.c | 301 ++++++++++++++++++++++++++++++++ 2 files changed, 306 insertions(+) create mode 100644 programs/find/tests/Makefile.in create mode 100644 programs/find/tests/find.c diff --git a/programs/find/tests/Makefile.in b/programs/find/tests/Makefile.in new file mode 100644 index 0000000000..c5b359bd98 --- /dev/null +++ b/programs/find/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = find.exe +IMPORTS = user32 + +C_SRCS = \ + find.c diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c new file mode 100644 index 0000000000..558875dd47 --- /dev/null +++ b/programs/find/tests/find.c @@ -0,0 +1,301 @@ +/* + * Copyright 2018 Fabian Maurer + * + * 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 <windows.h> +#include <stdio.h> + +#include "wine/heap.h" +#include "wine/test.h" + +void read_all_from_handle(HANDLE handle, BYTE **str, int *len) +{ + char buffer[4096]; + DWORD bytes_read; + DWORD length = 0; + BOOL success; + BYTE *ret = heap_alloc_zero(1); + + for (;;) + { + success = ReadFile(handle, buffer, sizeof(buffer), &bytes_read, NULL); + if (!success || !bytes_read) + break; + ret = heap_realloc(ret, length + bytes_read); + memcpy((char *)ret + length, buffer, bytes_read); + length += bytes_read; + } + + *str = ret; + *len = length; +} + +void write_to_handle(HANDLE handle, const BYTE *str, int len) +{ + DWORD dummy; + WriteFile(handle, str, len, &dummy, NULL); +} + +void check_find_output(const BYTE *child_output, int child_output_len, const BYTE *out_expected, int out_expected_len, const char *file, int line) +{ + BOOL strings_are_equal; + char *child_output_copy; + char *out_expected_copy; + int i, pos; + + if (child_output_len != out_expected_len) + strings_are_equal = FALSE; + else + { + strings_are_equal = memcmp(child_output, out_expected, out_expected_len) == 0; + } + + /* Format strings for debug printing */ + child_output_copy = heap_alloc_zero(child_output_len * 4 + 1); + out_expected_copy = heap_alloc_zero(out_expected_len * 4 + 1); + + for (i = 0, pos = 0; i < child_output_len; i++) + { + if (child_output[i] && child_output[i] != '\r' && child_output[i] < 128) + child_output_copy[pos++] = child_output[i]; + else + { + sprintf(&child_output_copy[pos], "\\x%02x", child_output[i]); + pos += 4; + } + } + + for (i = 0, pos = 0; i < out_expected_len; i++) + { + if (out_expected[i] && out_expected[i] != '\r' && out_expected[i] < 128) + out_expected_copy[pos++] = out_expected[i]; + else + { + sprintf(&out_expected_copy[pos], "\\x%02x", out_expected[i]); + pos += 4; + } + + } + + todo_wine_if(out_expected_len != 0) + ok_(file, line)(strings_are_equal, "\n#################### Expected:\n" + "%s\n" + "#################### But got:\n" + "%s\n" + "####################\n", + out_expected_copy, child_output_copy); + + heap_free(child_output_copy); + heap_free(out_expected_copy); +} + +static void mangle_text(const BYTE *input, int input_len, BYTE *output, int output_max, int *output_len) { + WCHAR buffer[200]; + int count_wchar; + + /* Check for UTF-16 LE BOM */ + if (input[0] == 0xFF && input[1] == 0xFE) + { + int buffer_count = 0; + int i; + + /* Copy utf16le into a WCHAR array, stripping the BOM */ + for (i = 2; i < input_len; i += 2) + { + buffer[buffer_count++] = input[i] + (input[i + 1] << 8); + } + + *output_len = WideCharToMultiByte(GetConsoleCP(), 0, buffer, buffer_count, (char *)output, output_max, NULL, NULL); + } + else + { + count_wchar = MultiByteToWideChar(GetConsoleCP(), 0, (char *)input, input_len, buffer, ARRAY_SIZE(buffer)); + *output_len = WideCharToMultiByte(GetConsoleCP(), 0, buffer, count_wchar, (char *)output, output_max, NULL, NULL); + } +} + +#define run_find_stdin_bytes(commandline, input, out_expected, exitcode_expected) \ + run_find_stdin_(commandline, input, sizeof(input), out_expected, sizeof(out_expected), exitcode_expected, __FILE__, __LINE__) + +static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int input_len, const BYTE *out_expected, int out_expected_len, int exitcode_expected, const char *file, int line) +{ + static const WCHAR find_exe[] = { 'f','i','n','d','.','e','x','e',' ','%','s' }; + HANDLE child_stdin_read; + HANDLE child_stdout_write; + HANDLE parent_stdin_write; + HANDLE parent_stdout_read; + STARTUPINFOW startup_info = {0}; + SECURITY_ATTRIBUTES security_attributes; + PROCESS_INFORMATION process_info = {0}; + BYTE *child_output = NULL; + int child_output_len; + WCHAR cmd[4096]; + DWORD exitcode; + BYTE out_expected_mangled[200]; + int out_expected_mangled_len; + + mangle_text(out_expected, out_expected_len, out_expected_mangled, ARRAY_SIZE(out_expected_mangled), &out_expected_mangled_len); + + security_attributes.nLength = sizeof(SECURITY_ATTRIBUTES); + security_attributes.bInheritHandle = TRUE; + security_attributes.lpSecurityDescriptor = NULL; + + CreatePipe(&parent_stdout_read, &child_stdout_write, &security_attributes, 0); + CreatePipe(&child_stdin_read, &parent_stdin_write, &security_attributes, 0); + + SetHandleInformation(parent_stdout_read, HANDLE_FLAG_INHERIT, 0); + SetHandleInformation(parent_stdin_write, HANDLE_FLAG_INHERIT, 0); + + startup_info.cb = sizeof(STARTUPINFOW); + startup_info.hStdInput = child_stdin_read; + startup_info.hStdOutput = child_stdout_write; + startup_info.hStdError = NULL; + startup_info.dwFlags |= STARTF_USESTDHANDLES; + + wsprintfW(cmd, find_exe, commandline); + + CreateProcessW(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &startup_info, &process_info); + CloseHandle(child_stdin_read); + CloseHandle(child_stdout_write); + + write_to_handle(parent_stdin_write, input, input_len); + CloseHandle(parent_stdin_write); + + read_all_from_handle(parent_stdout_read, &child_output, &child_output_len); + CloseHandle(parent_stdout_read); + + GetExitCodeProcess(process_info.hProcess, &exitcode); + CloseHandle(process_info.hProcess); + CloseHandle(process_info.hThread); + + check_find_output(child_output, child_output_len, out_expected_mangled, out_expected_mangled_len, file, line); + + todo_wine_if(exitcode_expected != 0) + ok_(file, line)(exitcode == exitcode_expected, "Expected exitcode %d, got %d\n", exitcode_expected, exitcode); + + heap_free(child_output); +} + +#define run_find_stdin_str(commandline, input, out_expected, exitcode_expected) \ + run_find_stdin_str_(commandline, input, lstrlenA(input), out_expected, lstrlenA(out_expected), exitcode_expected, __FILE__, __LINE__) + +static void run_find_stdin_str_(const char *commandline, const char *input, int input_len, const char *out_expected, int out_expected_len, int exitcode_expected, const char *file, int line) +{ + WCHAR *commandlineW; + int len_commandlineW; + + /* Turn commandline into WCHAR string */ + len_commandlineW = MultiByteToWideChar(CP_UTF8, 0, commandline, -1, 0, 0); + commandlineW = heap_alloc(len_commandlineW * sizeof(WCHAR)); + MultiByteToWideChar(CP_UTF8, 0, commandline, -1, commandlineW, len_commandlineW); + + run_find_stdin_(commandlineW, (BYTE *)input, lstrlenA(input), (BYTE *)out_expected, lstrlenA(out_expected), exitcode_expected, file, line); + + heap_free(commandlineW); +} + +static void test_errors(void) +{ + run_find_stdin_str("", "", "FIND: Parameter format not correct\r\n", 2); + run_find_stdin_str("test", "", "FIND: Parameter format not correct\r\n", 2); + run_find_stdin_str("\"test", "", "FIND: Parameter format not correct\r\n", 2); + run_find_stdin_str("\"test\" /XYZ", "", "FIND: Invalid switch\r\n", 2); +} + +static void test_singleline_without_switches(void) +{ + run_find_stdin_str("\"\"", "test", "", 1); + run_find_stdin_str("\"test\"", "", "", 1); + run_find_stdin_str("\"test\"", "test", "test\r\n", 0); + run_find_stdin_str("\"test\"", "test2", "test2\r\n", 0); + run_find_stdin_str("\"test2\"", "test", "", 1); +} + +static void test_multiline(void) +{ + /* Newline in input shouldn't work */ + run_find_stdin_str("\"t1\r\nt1\"", "t1\r\nt1", "", 1); + run_find_stdin_str("\"t1\nt1\"", "t1\nt1", "", 1); + + /* Newline should always be displayed as \r\n */ + run_find_stdin_str("\"test1\"", "test1\ntest2", "test1\r\n", 0); + run_find_stdin_str("\"test1\"", "test1\r\ntest2", "test1\r\n", 0); + + /* Test with empty line */ + run_find_stdin_str("\"test1\"", "test1\n\ntest2", "test1\r\n", 0); + + /* Two strings to be found */ + run_find_stdin_str("\"test\"", "junk1\ntest1\ntest2\r\njunk", "test1\r\ntest2\r\n", 0); +} + +static const BYTE str_empty[] = {}; +static const BYTE str_jap_shiftjis[] = { 0x8E,0x84,0x82,0xCD,'t','e','s','t','!','\r','\n' }; +static const BYTE str_jap_utf8_bom[] = { 0xEF,0xBB,0xBF,0xE7,0xA7,0x81,0xE3,0x81,0xAF,'j','a','p','t','e','s','t','!','\r','\n' }; +static const BYTE str_jap_utf8_nobom[] = { 0xE7,0xA7,0x81,0xE3,0x81,0xAF,'j','a','p','t','e','s','t','!','\r','\n' }; +static const BYTE str_jap_utf16le_bom[] = { 0xFF,0xFE,0xC1,0x79,0x6F,0x30,'t',0,'e',0,'s',0,'t',0,'!',0,'\r',0,'\n',0 }; +static const BYTE str_jap_utf16le_nobom[] = { 0xC1,0x79,0x6F,0x30,'t',0,'e',0,'s',0,'t',0,'!',0 }; +static const BYTE str_jap_utf16be_bom[] = { 0xFE,0xFF,0x79,0xC1,0x30,0x6F,0,'t',0,'e',0,'s',0,'t',0,'!' }; +static const BYTE str_jap_utf16be_nobom[] = { 0x79,0xC1,0x30,0x6F,0,'t',0,'e',0,'s',0,'t',0,'!' }; +static const BYTE str_rus_utf8_bom[] = { 0xEF,0xBB,0xBF,0xD0,0xBF,0xD1,0x80,0xD0,0xB8,0xD0,0xB2,0xD0,0xB5,0xD1,0x82,0x20,'t','e','s','t','!','\r','\n' }; +static const BYTE str_rus_utf8_nobom[] = { 0xD0,0xBF,0xD1,0x80,0xD0,0xB8,0xD0,0xB2,0xD0,0xB5,0xD1,0x82,0x20,'t','e','s','t','!','\r','\n' }; +static const BYTE str_en_utf8_bom[] = { 0xEF,0xBB,0xBF,'e','n','t','e','s','t','\r','\n' }; +static const BYTE str_en_utf8_nobom[] = { 't','e','s','t','\r','\n' }; + +static const WCHAR wstr_quoted_test[] = { '"','t', 'e', 's', 't','"',0 }; + +static void test_unicode_support(void) +{ + /* Test unicode support on STDIN + * Those depend on the active codepage - e.g. 932 (japanese) behaves different from 1252 (latin) + */ + + /* Test UTF-8 BOM */ + run_find_stdin_bytes(wstr_quoted_test, str_en_utf8_nobom, str_en_utf8_nobom, 0); + run_find_stdin_bytes(wstr_quoted_test, str_en_utf8_bom, str_en_utf8_bom, 0); + + /* Test russian character */ + run_find_stdin_bytes(wstr_quoted_test, str_rus_utf8_bom, str_rus_utf8_bom, 0); + run_find_stdin_bytes(wstr_quoted_test, str_rus_utf8_nobom, str_rus_utf8_nobom, 0); + + /* Test japanese characters */ + run_find_stdin_bytes(wstr_quoted_test, str_jap_utf8_nobom, str_jap_utf8_nobom, 0); + run_find_stdin_bytes(wstr_quoted_test, str_jap_utf8_bom, str_jap_utf8_bom, 0); + run_find_stdin_bytes(wstr_quoted_test, str_jap_shiftjis, str_jap_shiftjis, 0); + + /* Test unsupported encodings */ + run_find_stdin_bytes(wstr_quoted_test, str_jap_utf16le_nobom, str_empty, 1); + run_find_stdin_bytes(wstr_quoted_test, str_jap_utf16be_bom, str_empty, 1); + run_find_stdin_bytes(wstr_quoted_test, str_jap_utf16be_nobom, str_empty, 1); + + /* Test utf16le */ + run_find_stdin_bytes(wstr_quoted_test, str_jap_utf16le_bom, str_jap_utf16le_bom, 0); +} + +START_TEST(find) +{ + if (PRIMARYLANGID(GetUserDefaultUILanguage()) != LANG_ENGLISH) + { + skip("Error tests only work with english locale.\n"); + } + else + { + test_errors(); + } + test_singleline_without_switches(); + test_multiline(); + test_unicode_support(); +} -- 2.21.0

1 0

[PATCH] uianimation: Add stub dll
by Vijay Kiran Kamuju 09 Mar '19

09 Mar '19

based on patch from Louis Lenders Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/uianimation/Makefile.in | 4 +++ dlls/uianimation/main.c | 46 +++++++++++++++++++++++++++++++ dlls/uianimation/uianimation.spec | 4 +++ 5 files changed, 57 insertions(+) create mode 100644 dlls/uianimation/Makefile.in create mode 100644 dlls/uianimation/main.c create mode 100644 dlls/uianimation/uianimation.spec diff --git a/configure b/configure index 1d80c01f3f6..c8ffe98b78b 100755 --- a/configure +++ b/configure @@ -1563,6 +1563,7 @@ enable_traffic enable_twain_32 enable_tzres enable_ucrtbase +enable_uianimation enable_uiautomationcore enable_uiribbon enable_unicows @@ -20098,6 +20099,7 @@ wine_fn_config_makefile dlls/typelib.dll16 enable_win16 wine_fn_config_makefile dlls/tzres enable_tzres wine_fn_config_makefile dlls/ucrtbase enable_ucrtbase wine_fn_config_makefile dlls/ucrtbase/tests enable_tests +wine_fn_config_makefile dlls/uianimation enable_uianimation wine_fn_config_makefile dlls/uiautomationcore enable_uiautomationcore wine_fn_config_makefile dlls/uiautomationcore/tests enable_tests wine_fn_config_makefile dlls/uiribbon enable_uiribbon diff --git a/configure.ac b/configure.ac index 71e8606e7c5..fc3b9dfc2b5 100644 --- a/configure.ac +++ b/configure.ac @@ -3741,6 +3741,7 @@ WINE_CONFIG_MAKEFILE(dlls/typelib.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/tzres) WINE_CONFIG_MAKEFILE(dlls/ucrtbase) WINE_CONFIG_MAKEFILE(dlls/ucrtbase/tests) +WINE_CONFIG_MAKEFILE(dlls/uianimation) WINE_CONFIG_MAKEFILE(dlls/uiautomationcore) WINE_CONFIG_MAKEFILE(dlls/uiautomationcore/tests) WINE_CONFIG_MAKEFILE(dlls/uiribbon) diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in new file mode 100644 index 00000000000..b504181b9a2 --- /dev/null +++ b/dlls/uianimation/Makefile.in @@ -0,0 +1,4 @@ +MODULE = uianimation.dll + +C_SRCS = \ + main.c diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c new file mode 100644 index 00000000000..0fa9bfb4151 --- /dev/null +++ b/dlls/uianimation/main.c @@ -0,0 +1,46 @@ +/* + * Uianimation main file. + * + * Copyright (C) 2018 Louis Lenders + * + * 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 "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "uianimation.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(uianimation); + +BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) +{ + TRACE("(%p %d %p)\n", dll, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( dll ); + break; + } + return TRUE; +} diff --git a/dlls/uianimation/uianimation.spec b/dlls/uianimation/uianimation.spec new file mode 100644 index 00000000000..a43b12d26a5 --- /dev/null +++ b/dlls/uianimation/uianimation.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow() +@ stub DllGetClassObject(ptr ptr ptr) +@ stub DllRegisterServer() +@ stub DllUnregisterServer() -- 2.17.0

3 2

[PATCH v2 3/4] opencl: Fix compiler warning.
by Nakarin Khankham 09 Mar '19

09 Mar '19

Signed-off-by: Nakarin Khankham <garuda2550(a)gmail.com> --- dlls/opencl/opencl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 0dbc780279..9ea96a5e3a 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -483,7 +483,7 @@ typedef struct void *user_data; } CONTEXT_CALLBACK; -static void context_fn_notify(const char *errinfo, const void *private_info, size_t cb, void *user_data) +static void WINAPI context_fn_notify(const char *errinfo, const void *private_info, size_t cb, void *user_data) { CONTEXT_CALLBACK *ccb; TRACE("(%s, %p, %ld, %p)\n", errinfo, private_info, (SIZE_T)cb, user_data); @@ -828,7 +828,7 @@ typedef struct void *user_data; } PROGRAM_CALLBACK; -static void program_fn_notify(cl_program program, void * user_data) +static void WINAPI program_fn_notify(cl_program program, void * user_data) { PROGRAM_CALLBACK *pcb; TRACE("(%p, %p)\n", program, user_data); -- 2.17.1

2 1

[PATCH 8/9] user32: Implement WM_SETFONT margins in the CJK case.
by Akihiro Sagawa 09 Mar '19

09 Mar '19

Fixes Bug 46685. I'll send comctl32 (v6) fix, later. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46685 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/edit.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)

3 3

[PATCH v2 03/10] d3dx9: Merge the d3dx_effect_SetInt() helper
by Michael Stefaniuc 09 Mar '19

09 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: FLOAT ==> float dlls/d3dx9_36/effect.c | 80 +++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 44 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7425c7b9a1..d1eaa6a767 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1345,49 +1345,6 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHANDLE parameter, INT n) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && !param->element_count) - { - if (param->rows == 1 && param->columns == 1) - { - DWORD value; - - set_number(&value, param->type, &n, D3DXPT_INT); - if (value != *(DWORD *)param->data) - set_dirty(param); - *(DWORD *)param->data = value; - return D3D_OK; - } - - /* - * Split the value, if parameter is a vector with dimension 3 or 4. - */ - if (param->type == D3DXPT_FLOAT && - ((param->class == D3DXPC_VECTOR && param->columns != 2) || - (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) - { - TRACE("Vector fixup\n"); - - *(FLOAT *)param->data = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; - ((FLOAT *)param->data)[1] = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; - ((FLOAT *)param->data)[2] = (n & 0xff) * INT_FLOAT_MULTI_INVERSE; - if (param->rows * param->columns > 3) - { - ((FLOAT *)param->data)[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; - } - set_dirty(param); - return D3D_OK; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const INT *n, UINT count) { @@ -3351,10 +3308,45 @@ static HRESULT WINAPI d3dx_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, n %d.\n", iface, parameter, n); - return d3dx9_base_effect_set_int(&effect->base_effect, parameter, n); + if (param && !param->element_count) + { + if (param->rows == 1 && param->columns == 1) + { + DWORD value; + + set_number(&value, param->type, &n, D3DXPT_INT); + if (value != *(DWORD *)param->data) + set_dirty(param); + *(DWORD *)param->data = value; + return D3D_OK; + } + + /* + * Split the value, if parameter is a vector with dimension 3 or 4. + */ + if (param->type == D3DXPT_FLOAT && + ((param->class == D3DXPC_VECTOR && param->columns != 2) || + (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) + { + TRACE("Vector fixup.\n"); + + *(float *)param->data = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; + ((float *)param->data)[1] = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; + ((float *)param->data)[2] = (n & 0xff) * INT_FLOAT_MULTI_INVERSE; + if (param->rows * param->columns > 3) + ((float *)param->data)[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; + set_dirty(param); + return D3D_OK; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n) -- 2.20.1

1 0

[PATCH] gphoto2.ds: Remove useless casts to self
by Michael Stefaniuc 09 Mar '19

09 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gphoto2.ds/ds_image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c index cb3bbed327..32f526782e 100644 --- a/dlls/gphoto2.ds/ds_image.c +++ b/dlls/gphoto2.ds/ds_image.c @@ -192,7 +192,7 @@ static TW_UINT16 _get_image_and_startup_jpeg(void) { activeDS.jd.err = pjpeg_std_error(&activeDS.jerr); /* jpeg_create_decompress is a macro that expands to jpeg_CreateDecompress - see jpeglib.h * jpeg_create_decompress(&jd); */ - pjpeg_CreateDecompress(&activeDS.jd, JPEG_LIB_VERSION, (size_t) sizeof(struct jpeg_decompress_struct)); + pjpeg_CreateDecompress(&activeDS.jd, JPEG_LIB_VERSION, sizeof(struct jpeg_decompress_struct)); activeDS.jd.src = &activeDS.xjsm; ret=pjpeg_read_header(&activeDS.jd,TRUE); activeDS.jd.out_color_space = JCS_RGB; @@ -610,7 +610,7 @@ _get_gphoto2_file_as_DIB( jd.err = pjpeg_std_error(&jerr); /* jpeg_create_decompress is a macro that expands to jpeg_CreateDecompress - see jpeglib.h * jpeg_create_decompress(&jd); */ - pjpeg_CreateDecompress(&jd, JPEG_LIB_VERSION, (size_t) sizeof(struct jpeg_decompress_struct)); + pjpeg_CreateDecompress(&jd, JPEG_LIB_VERSION, sizeof(struct jpeg_decompress_struct)); jd.src = &xjsm; ret=pjpeg_read_header(&jd,TRUE); jd.out_color_space = JCS_RGB; -- 2.20.1

2 1

[PATCH v2] find: First tests
by Fabian Maurer 08 Mar '19

08 Mar '19

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/find/tests/Makefile.in | 5 + programs/find/tests/find.c | 278 ++++++++++++++++++++++++++++++++ 2 files changed, 283 insertions(+) create mode 100644 programs/find/tests/Makefile.in create mode 100644 programs/find/tests/find.c diff --git a/programs/find/tests/Makefile.in b/programs/find/tests/Makefile.in new file mode 100644 index 0000000000..c5b359bd98 --- /dev/null +++ b/programs/find/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = find.exe +IMPORTS = user32 + +C_SRCS = \ + find.c diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c new file mode 100644 index 0000000000..9bb7530d71 --- /dev/null +++ b/programs/find/tests/find.c @@ -0,0 +1,278 @@ +/* + * Copyright 2018 Fabian Maurer + * + * 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 <windows.h> +#include <stdio.h> + +#include "wine/heap.h" +#include "wine/test.h" + +void read_all_from_handle(HANDLE handle, BYTE **str, int *len) +{ + char buffer[4096]; + DWORD bytes_read; + DWORD length = 0; + BOOL success; + BYTE *ret = heap_alloc_zero(1); + + for (;;) + { + success = ReadFile(handle, buffer, sizeof(buffer), &bytes_read, NULL); + if (!success || !bytes_read) + break; + ret = heap_realloc(ret, length + bytes_read); + memcpy((char *)ret + length, buffer, bytes_read); + length += bytes_read; + } + + *str = ret; + *len = length; +} + +void write_to_handle(HANDLE handle, const BYTE *str, int len) +{ + DWORD dummy; + WriteFile(handle, str, len, &dummy, NULL); +} + +void check_find_output(const BYTE *child_output, int child_output_len, const BYTE *out_expected, int out_expected_len, const char *file, int line) +{ + BOOL strings_are_equal; + char *child_output_copy; + char *out_expected_copy; + int i, pos; + + if (child_output_len != out_expected_len) + strings_are_equal = FALSE; + else + { + strings_are_equal = memcmp(child_output, out_expected, out_expected_len) == 0; + } + + /* Format strings for debug printing */ + child_output_copy = heap_alloc_zero(child_output_len * 4 + 1); + out_expected_copy = heap_alloc_zero(out_expected_len * 4 + 1); + + for (i = 0, pos = 0; i < child_output_len; i++) + { + if (child_output[i] && child_output[i] != '\r' && child_output[i] < 128) + child_output_copy[pos++] = child_output[i]; + else + { + sprintf(&child_output_copy[pos], "\\x%02x", child_output[i]); + pos += 4; + } + } + + for (i = 0, pos = 0; i < out_expected_len; i++) + { + if (out_expected[i] && out_expected[i] != '\r' && out_expected[i] < 128) + out_expected_copy[pos++] = out_expected[i]; + else + { + sprintf(&out_expected_copy[pos], "\\x%02x", out_expected[i]); + pos += 4; + } + + } + + todo_wine_if(out_expected_len != 0) + ok_(file, line)(strings_are_equal, "\n#################### Expected:\n" + "%s\n" + "#################### But got:\n" + "%s\n" + "####################\n", + out_expected_copy, child_output_copy); + + heap_free(child_output_copy); + heap_free(out_expected_copy); +} + +#define run_find_stdin_bytes(commandline, input, out_expected, exitcode_expected) \ + run_find_stdin_(commandline, input, sizeof(input), out_expected, sizeof(out_expected), exitcode_expected, __FILE__, __LINE__) + +static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int input_len, const BYTE *out_expected, int out_expected_len, int exitcode_expected, const char *file, int line) +{ + static const WCHAR find_exe[] = { 'f','i','n','d','.','e','x','e',' ','%','s' }; + HANDLE child_stdin_read; + HANDLE child_stdout_write; + HANDLE parent_stdin_write; + HANDLE parent_stdout_read; + STARTUPINFOW startup_info = {0}; + SECURITY_ATTRIBUTES security_attributes; + PROCESS_INFORMATION process_info = {0}; + BYTE *child_output = NULL; + int child_output_len; + WCHAR cmd[4096]; + DWORD exitcode; + + security_attributes.nLength = sizeof(SECURITY_ATTRIBUTES); + security_attributes.bInheritHandle = TRUE; + security_attributes.lpSecurityDescriptor = NULL; + + CreatePipe(&parent_stdout_read, &child_stdout_write, &security_attributes, 0); + CreatePipe(&child_stdin_read, &parent_stdin_write, &security_attributes, 0); + + SetHandleInformation(parent_stdout_read, HANDLE_FLAG_INHERIT, 0); + SetHandleInformation(parent_stdin_write, HANDLE_FLAG_INHERIT, 0); + + startup_info.cb = sizeof(STARTUPINFOW); + startup_info.hStdInput = child_stdin_read; + startup_info.hStdOutput = child_stdout_write; + startup_info.hStdError = NULL; + startup_info.dwFlags |= STARTF_USESTDHANDLES; + + wsprintfW(cmd, find_exe, commandline); + + CreateProcessW(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &startup_info, &process_info); + CloseHandle(child_stdin_read); + CloseHandle(child_stdout_write); + + write_to_handle(parent_stdin_write, input, input_len); + CloseHandle(parent_stdin_write); + + read_all_from_handle(parent_stdout_read, &child_output, &child_output_len); + CloseHandle(parent_stdout_read); + + GetExitCodeProcess(process_info.hProcess, &exitcode); + CloseHandle(process_info.hProcess); + CloseHandle(process_info.hThread); + + check_find_output(child_output, child_output_len, out_expected, out_expected_len, file, line); + + todo_wine_if(exitcode_expected != 0) + ok_(file, line)(exitcode == exitcode_expected, "Expected exitcode %d, got %d\n", exitcode_expected, exitcode); + + heap_free(child_output); +} + +#define run_find_stdin_str(commandline, input, out_expected, exitcode_expected) \ + run_find_stdin_str_(commandline, input, lstrlenA(input), out_expected, lstrlenA(out_expected), exitcode_expected, __FILE__, __LINE__) + +static void run_find_stdin_str_(const char *commandline, const char *input, int input_len, const char *out_expected, int out_expected_len, int exitcode_expected, const char *file, int line) +{ + WCHAR *commandlineW; + int len_commandlineW; + + /* Turn commandline into WCHAR string */ + len_commandlineW = MultiByteToWideChar(CP_UTF8, 0, commandline, -1, 0, 0); + commandlineW = heap_alloc(len_commandlineW * sizeof(WCHAR)); + MultiByteToWideChar(CP_UTF8, 0, commandline, -1, commandlineW, len_commandlineW); + + run_find_stdin_(commandlineW, (BYTE *)input, lstrlenA(input), (BYTE *)out_expected, lstrlenA(out_expected), exitcode_expected, file, line); + + heap_free(commandlineW); +} + +static void test_errors(void) +{ + run_find_stdin_str("", "", "FIND: Parameter format not correct\r\n", 2); + run_find_stdin_str("test", "", "FIND: Parameter format not correct\r\n", 2); + run_find_stdin_str("\"test", "", "FIND: Parameter format not correct\r\n", 2); + run_find_stdin_str("\"test\" /XYZ", "", "FIND: Invalid switch\r\n", 2); +} + +static void test_singleline_without_switches(void) +{ + run_find_stdin_str("\"\"", "test", "", 1); + run_find_stdin_str("\"test\"", "", "", 1); + run_find_stdin_str("\"test\"", "test", "test\r\n", 0); + run_find_stdin_str("\"test\"", "test2", "test2\r\n", 0); + run_find_stdin_str("\"test2\"", "test", "", 1); +} + +static void test_multiline(void) +{ + /* Newline in input shouldn't work */ + run_find_stdin_str("\"t1\r\nt1\"", "t1\r\nt1", "", 1); + run_find_stdin_str("\"t1\nt1\"", "t1\nt1", "", 1); + + /* Newline should always be displayed as \r\n */ + run_find_stdin_str("\"test1\"", "test1\ntest2", "test1\r\n", 0); + run_find_stdin_str("\"test1\"", "test1\r\ntest2", "test1\r\n", 0); + + /* Test with empty line */ + run_find_stdin_str("\"test1\"", "test1\n\ntest2", "test1\r\n", 0); + + /* Two strings to be found */ + run_find_stdin_str("\"test\"", "junk1\ntest1\ntest2\r\njunk", "test1\r\ntest2\r\n", 0); +} + +static const BYTE str_empty[] = {}; +static const BYTE str_jap_shiftjis[] = { 0x8E,0x84,0x82,0xCD,'t','e','s','t','!','\r','\n' }; +static const BYTE str_jap_utf8_bom[] = { 0xEF,0xBB,0xBF,0xE7,0xA7,0x81,0xE3,0x81,0xAF,'j','a','p','t','e','s','t','!','\r','\n' }; +static const BYTE str_jap_utf8_nobom[] = { 0xE7,0xA7,0x81,0xE3,0x81,0xAF,'j','a','p','t','e','s','t','!','\r','\n' }; +static const BYTE str_jap_utf16le_bom[] = { 0xFF,0xFE,0xC1,0x79,0x6F,0x30,'t',0,'e',0,'s',0,'t',0,'!',0,'\r',0,'\n',0 }; +static const BYTE str_jap_utf16le_bom_res[] = { '?','?','t','e','s','t','!','\r','\n' }; +static const BYTE str_jap_utf16le_nobom[] = { 0xC1,0x79,0x6F,0x30,'t',0,'e',0,'s',0,'t',0,'!',0 }; +static const BYTE str_jap_utf16be_bom[] = { 0xFE,0xFF,0x79,0xC1,0x30,0x6F,0,'t',0,'e',0,'s',0,'t',0,'!' }; +static const BYTE str_jap_utf16be_nobom[] = { 0x79,0xC1,0x30,0x6F,0,'t',0,'e',0,'s',0,'t',0,'!' }; +static const BYTE str_rus_utf8_bom[] = { 0xEF,0xBB,0xBF,0xD0,0xBF,0xD1,0x80,0xD0,0xB8,0xD0,0xB2,0xD0,0xB5,0xD1,0x82,0x20,'t','e','s','t','!','\r','\n' }; +static const BYTE str_rus_utf8_nobom[] = { 0xD0,0xBF,0xD1,0x80,0xD0,0xB8,0xD0,0xB2,0xD0,0xB5,0xD1,0x82,0x20,'t','e','s','t','!','\r','\n' }; +static const BYTE str_en_utf8_bom[] = { 0xEF,0xBB,0xBF,'e','n','t','e','s','t','\r','\n' }; +static const BYTE str_en_utf8_nobom[] = { 't','e','s','t','\r','\n' }; + +static const WCHAR wstr_quoted_test[] = { '"','t', 'e', 's', 't','"',0 }; +static const WCHAR wstr_quoted_watashi_utf8[] = {'"',0xE7,0xA7,0x81,'"' }; + + +static void test_unicode_support(void) +{ + /* Test unicode support on STDIN */ + + /* Test UTF-8 BOM */ + run_find_stdin_bytes(wstr_quoted_test, str_en_utf8_nobom, str_en_utf8_nobom, 0); + run_find_stdin_bytes(wstr_quoted_test, str_en_utf8_bom, str_en_utf8_bom, 0); + + /* Test russian character */ + run_find_stdin_bytes(wstr_quoted_test, str_rus_utf8_bom, str_rus_utf8_bom, 0); + run_find_stdin_bytes(wstr_quoted_test, str_rus_utf8_nobom, str_rus_utf8_nobom, 0); + + /* Test japanese characters */ + run_find_stdin_bytes(wstr_quoted_test, str_jap_utf8_nobom, str_jap_utf8_nobom, 0); + run_find_stdin_bytes(wstr_quoted_test, str_jap_utf8_bom, str_jap_utf8_bom, 0); + run_find_stdin_bytes(wstr_quoted_test, str_jap_shiftjis, str_jap_shiftjis, 0); + + /* Test unsupported encodings */ + run_find_stdin_bytes(wstr_quoted_test, str_jap_utf16le_nobom, str_empty, 1); + run_find_stdin_bytes(wstr_quoted_test, str_jap_utf16be_bom, str_empty, 1); + run_find_stdin_bytes(wstr_quoted_test, str_jap_utf16be_nobom, str_empty, 1); + + /* Test utf16le */ + run_find_stdin_bytes(wstr_quoted_test, str_jap_utf16le_bom, str_jap_utf16le_bom_res, 0); + + /* Test unicode search parameter */ + run_find_stdin_bytes(wstr_quoted_watashi_utf8, str_jap_utf8_bom, str_empty, 1); + run_find_stdin_bytes(wstr_quoted_watashi_utf8, str_jap_utf8_bom, str_empty, 1); + run_find_stdin_bytes(wstr_quoted_watashi_utf8, str_jap_utf8_bom, str_empty, 1); +} + +START_TEST(find) +{ + if (PRIMARYLANGID(GetUserDefaultUILanguage()) != LANG_ENGLISH) + { + skip("Error tests only work with english locale.\n"); + } + else + { + test_errors(); + } + test_singleline_without_switches(); + test_multiline(); + test_unicode_support(); +} -- 2.21.0

1 0

[PATCH 07/10] d3dx9: Merge the d3dx_effect_GetInt() helper
by Michael Stefaniuc 08 Mar '19

08 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 70 +++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 230af5bde8..b08344ca4b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1388,44 +1388,6 @@ static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHAN return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_int(struct d3dx9_base_effect *base, D3DXHANDLE parameter, INT *n) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (n && param && !param->element_count) - { - if (param->columns == 1 && param->rows == 1) - { - set_number(n, D3DXPT_INT, param->data, param->type); - TRACE("Returning %i\n", *n); - return D3D_OK; - } - - if (param->type == D3DXPT_FLOAT && - ((param->class == D3DXPC_VECTOR && param->columns != 2) - || (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) - { - TRACE("Vector fixup\n"); - - /* all components (3,4) are clamped (0,255) and put in the INT */ - *n = (INT)(min(max(0.0f, *((FLOAT *)param->data + 2)), 1.0f) * INT_FLOAT_MULTI); - *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 1)), 1.0f) * INT_FLOAT_MULTI)) << 8; - *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 0)), 1.0f) * INT_FLOAT_MULTI)) << 16; - if (param->columns * param->rows > 3) - { - *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 3)), 1.0f) * INT_FLOAT_MULTI)) << 24; - } - - TRACE("Returning %i\n", *n); - return D3D_OK; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const INT *n, UINT count) { @@ -3422,10 +3384,40 @@ static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE paramete static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, n %p.\n", iface, parameter, n); - return d3dx9_base_effect_get_int(&effect->base_effect, parameter, n); + if (n && param && !param->element_count) + { + if (param->columns == 1 && param->rows == 1) + { + set_number(n, D3DXPT_INT, param->data, param->type); + TRACE("Returning %i.\n", *n); + return D3D_OK; + } + + if (param->type == D3DXPT_FLOAT && + ((param->class == D3DXPC_VECTOR && param->columns != 2) + || (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) + { + TRACE("Vector fixup.\n"); + + /* all components (3,4) are clamped (0,255) and put in the INT */ + *n = (INT)(min(max(0.0f, *((FLOAT *)param->data + 2)), 1.0f) * INT_FLOAT_MULTI); + *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 1)), 1.0f) * INT_FLOAT_MULTI)) << 8; + *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 0)), 1.0f) * INT_FLOAT_MULTI)) << 16; + if (param->columns * param->rows > 3) + *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 3)), 1.0f) * INT_FLOAT_MULTI)) << 24; + + TRACE("Returning %i.\n", *n); + return D3D_OK; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, const INT *n, UINT count) -- 2.20.1

2 2

[PATCH 06/10] d3dx9: Merge the d3dx_effect_SetFloatArray() helper
by Michael Stefaniuc 08 Mar '19

08 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 69 ++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 47bb6b7985..230af5bde8 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1488,44 +1488,6 @@ static HRESULT d3dx9_base_effect_get_int_array(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_float_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const float *f, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param) - { - UINT i, size = min(count, param->bytes / sizeof(DWORD)); - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_MATRIX_ROWS: - for (i = 0; i < size; ++i) - { - set_number((DWORD *)param->data + i, param->type, &f[i], D3DXPT_FLOAT); - } - set_dirty(param); - return D3D_OK; - - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -3530,10 +3492,39 @@ static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE p const float *f, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, f %p, count %u.\n", iface, parameter, f, count); - return d3dx9_base_effect_set_float_array(&effect->base_effect, parameter, f, count); + if (param) + { + unsigned int i, size = min(count, param->bytes / sizeof(DWORD)); + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < size; ++i) + set_number((DWORD *)param->data + i, param->type, &f[i], D3DXPT_FLOAT); + set_dirty(param); + return D3D_OK; + + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetFloatArray(ID3DXEffect *iface, D3DXHANDLE parameter, float *f, UINT count) -- 2.20.1

2 1

[PATCH 05/10] d3dx9: Merge the d3dx_effect_SetFloat() helper
by Michael Stefaniuc 08 Mar '19

08 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 70351b26cd..47bb6b7985 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1488,26 +1488,6 @@ static HRESULT d3dx9_base_effect_get_int_array(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_float(struct d3dx9_base_effect *base, D3DXHANDLE parameter, float f) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && !param->element_count && param->rows == 1 && param->columns == 1) - { - DWORD value; - - set_number(&value, param->type, &f, D3DXPT_FLOAT); - if (value != *(DWORD *)param->data) - set_dirty(param); - *(DWORD *)param->data = value; - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_float_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const float *f, UINT count) { @@ -3507,10 +3487,24 @@ static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE par static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float f) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, f %.8e.\n", iface, parameter, f); - return d3dx9_base_effect_set_float(&effect->base_effect, parameter, f); + if (param && !param->element_count && param->rows == 1 && param->columns == 1) + { + DWORD value; + + set_number(&value, param->type, &f, D3DXPT_FLOAT); + if (value != *(DWORD *)param->data) + set_dirty(param); + *(DWORD *)param->data = value; + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float *f) -- 2.20.1

2 1

[PATCH 04/10] d3dx9: Merge the d3dx_effect_GetFloatArray() helper
by Michael Stefaniuc 08 Mar '19

08 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0052d8f320..70351b26cd 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1546,30 +1546,6 @@ static HRESULT d3dx9_base_effect_set_float_array(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_float_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, float *f, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (f && param && (param->class == D3DXPC_SCALAR - || param->class == D3DXPC_VECTOR - || param->class == D3DXPC_MATRIX_ROWS - || param->class == D3DXPC_MATRIX_COLUMNS)) - { - UINT i, size = min(count, param->bytes / sizeof(DWORD)); - - for (i = 0; i < size; ++i) - { - set_number(&f[i], D3DXPT_FLOAT, (DWORD *)param->data + i, param->type); - } - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -3569,10 +3545,25 @@ static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE p static HRESULT WINAPI d3dx_effect_GetFloatArray(ID3DXEffect *iface, D3DXHANDLE parameter, float *f, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, f %p, count %u.\n", iface, parameter, f, count); - return d3dx9_base_effect_get_float_array(&effect->base_effect, parameter, f, count); + if (f && param && (param->class == D3DXPC_SCALAR + || param->class == D3DXPC_VECTOR + || param->class == D3DXPC_MATRIX_ROWS + || param->class == D3DXPC_MATRIX_COLUMNS)) + { + unsigned int i, size = min(count, param->bytes / sizeof(DWORD)); + + for (i = 0; i < size; ++i) + set_number(&f[i], D3DXPT_FLOAT, (DWORD *)param->data + i, param->type); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) -- 2.20.1

2 1

[PATCH 03/10] d3dx9: Merge the d3dx_effect_GetFloat() helper
by Michael Stefaniuc 08 Mar '19

08 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 14caada9be..0052d8f320 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1508,22 +1508,6 @@ static HRESULT d3dx9_base_effect_set_float(struct d3dx9_base_effect *base, D3DXH return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_float(struct d3dx9_base_effect *base, D3DXHANDLE parameter, float *f) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (f && param && !param->element_count && param->columns == 1 && param->rows == 1) - { - set_number(f, D3DXPT_FLOAT, (DWORD *)param->data, param->type); - TRACE("Returning %f\n", *f); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_float_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const float *f, UINT count) { @@ -3556,10 +3540,20 @@ static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parame static HRESULT WINAPI d3dx_effect_GetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float *f) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, f %p.\n", iface, parameter, f); - return d3dx9_base_effect_get_float(&effect->base_effect, parameter, f); + if (f && param && !param->element_count && param->columns == 1 && param->rows == 1) + { + set_number(f, D3DXPT_FLOAT, (DWORD *)param->data, param->type); + TRACE("Returning %f.\n", *f); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 02/10] d3dx9: Merge the d3dx_effect_SetBoolArray() helper
by Michael Stefaniuc 08 Mar '19

08 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 73 +++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 40 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index abf0bd9518..14caada9be 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1345,45 +1345,6 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const BOOL *b, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param) - { - UINT i, size = min(count, param->bytes / sizeof(DWORD)); - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_MATRIX_ROWS: - for (i = 0; i < size; ++i) - { - /* don't crop the input, use D3DXPT_INT instead of D3DXPT_BOOL */ - set_number((DWORD *)param->data + i, param->type, &b[i], D3DXPT_INT); - } - set_dirty(param); - return D3D_OK; - - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHANDLE parameter, INT n) { struct d3dx_parameter *param = get_valid_parameter(base, parameter); @@ -3483,10 +3444,42 @@ static HRESULT WINAPI d3dx_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE paramet static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, const BOOL *b, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count); - return d3dx9_base_effect_set_bool_array(&effect->base_effect, parameter, b, count); + if (param) + { + unsigned int i, size = min(count, param->bytes / sizeof(DWORD)); + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < size; ++i) + { + /* don't crop the input, use D3DXPT_INT instead of D3DXPT_BOOL */ + set_number((DWORD *)param->data + i, param->type, &b[i], D3DXPT_INT); + } + set_dirty(param); + return D3D_OK; + + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b, UINT count) -- 2.20.1

2 1

[PATCH 01/10] d3dx9: Merge the d3dx_effect_SetBool() helper
by Michael Stefaniuc 08 Mar '19

08 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 4deb40f55e..abf0bd9518 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1345,22 +1345,6 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_bool(struct d3dx9_base_effect *base, D3DXHANDLE parameter, BOOL b) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && !param->element_count && param->rows == 1 && param->columns == 1) - { - set_number(param->data, param->type, &b, D3DXPT_BOOL); - set_dirty(param); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const BOOL *b, UINT count) { @@ -3461,10 +3445,20 @@ static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parame static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, b %#x.\n", iface, parameter, b); - return d3dx9_base_effect_set_bool(&effect->base_effect, parameter, b); + if (param && !param->element_count && param->rows == 1 && param->columns == 1) + { + set_number(param->data, param->type, &b, D3DXPT_BOOL); + set_dirty(param); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b) -- 2.20.1

2 1

[PATCH] shell32: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc 08 Mar '19

08 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return E_OUTOFMEMORY if list is NULL. dlls/shell32/recyclebin.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 0d80e6376d..49e7f5da32 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -431,8 +431,7 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH return S_OK; failed: - if (list) - IEnumIDList_Release(&list->IEnumIDList_iface); + IEnumIDList_Release(&list->IEnumIDList_iface); for (; i<pidls_count; i++) ILFree(pidls[i]); SHFree(pidls); -- 2.20.1

2 1

[PATCH] winemenubuilder: Remove useless cast to self
by Michael Stefaniuc 08 Mar '19

08 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 3fa2b476d0..fa700f8c19 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -539,7 +539,7 @@ static int populate_module16_icons(struct IconData16 *iconData16, GRPICONDIR *gr for (j = 0; j < iconData16->iconResources->count; j++) { NE_NAMEINFO *iconInfo = (NE_NAMEINFO*)iconPtr; - if ((((BYTE*)iconPtr) + sizeof(NE_NAMEINFO)) > (iconData16->fileBytes + iconData16->fileSize)) + if ((iconPtr + sizeof(NE_NAMEINFO)) > (iconData16->fileBytes + iconData16->fileSize)) { WINE_WARN("file too small for icon NE_NAMEINFO\n"); break; -- 2.20.1

1 0

[PATCH] winefile: Remove useless cast to self
by Michael Stefaniuc 08 Mar '19

08 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winefile/winefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 23be450d5f..2f4eb2a444 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -739,7 +739,7 @@ static HICON extract_icon(IShellFolder* folder, LPCITEMIDLIST pidl) { IExtractIconW* pExtract; - if (SUCCEEDED(IShellFolder_GetUIObjectOf(folder, 0, 1, (LPCITEMIDLIST*)&pidl, &IID_IExtractIconW, 0, (LPVOID*)&pExtract))) { + if (SUCCEEDED(IShellFolder_GetUIObjectOf(folder, 0, 1, &pidl, &IID_IExtractIconW, 0, (void**)&pExtract))) { WCHAR path[_MAX_PATH]; unsigned flags; HICON hicon; -- 2.20.1

1 0

[PATCH] wininet: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc 08 Mar '19

08 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return NULL if lpwfs is NULL. dlls/wininet/ftp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index e12e494160..ec94f85723 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2581,8 +2581,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, lerror: if (!bSuccess) { - if(lpwfs) - WININET_Release( &lpwfs->hdr ); + WININET_Release(&lpwfs->hdr); return NULL; } -- 2.20.1

1 0

[PATCH 1/5] d3d8: Return failure in CheckDeviceFormat() for unsupported adapter formats.
by Matteo Bruni 08 Mar '19

08 Mar '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- I saw bug 46792, not debugged yet... dlls/d3d8/directx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 09188cc2aef..f78ff3e5af7 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -242,10 +242,11 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3 TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#x, resource_type %#x, format %#x.\n", iface, adapter, device_type, adapter_format, usage, resource_type, format); - if (!adapter_format) + if (adapter_format != D3DFMT_X8R8G8B8 && adapter_format != D3DFMT_R5G6B5 + && adapter_format != D3DFMT_X1R5G5B5) { WARN("Invalid adapter format.\n"); - return D3DERR_INVALIDCALL; + return adapter_format ? D3DERR_NOTAVAILABLE : D3DERR_INVALIDCALL; } bind_flags = wined3d_bind_flags_from_d3d8_usage(usage); -- 2.19.2

5 15

[PATCH] winemac: Fix typo in comments.
by Nikolay Sivov 08 Mar '19

08 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winemac.drv/ime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 00fb236589..4d95275168 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -144,8 +144,8 @@ static int updateField(DWORD origLen, DWORD origOffset, DWORD currentOffset, static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len, DWORD *flags) { - /* we need to make sure the CompStr, CompClaus and CompAttr fields are all - * set and correct */ + /* We need to make sure the CompStr, CompClause and CompAttr fields are all + * set and correct. */ int needed_size; HIMCC rc; LPBYTE newdata = NULL; -- 2.20.1

2 1

[PATCH 13/13] msidb: Add support for wildcard (full database) export.
by Erich E. Hoover 08 Mar '19

08 Mar '19

msidb allows a full database export with the special "*" database name. Note: It does not support true wildcards, just this special indication that you wish to export all the tables in the database.

1 0

[PATCH 12/13] msi: Add support for exporting binary streams (Binary/Icon tables).
by Erich E. Hoover 08 Mar '19

08 Mar '19

The Binary and Icon tables store their data in a different format from other tables, one column of the data is stored as a "stream" instead of a normal text field. With this patch those tables can now be exported properly by the MSI export functionality.

1 0

[PATCH 11/13] msi: Break out field exporting into a separate routine.
by Erich E. Hoover 08 Mar '19

08 Mar '19

msi_export_record is a lot more complicated than necessary, this patch splits out the field export part of that functionality as msi_export_field. This also needs to be separate for exporting binary stream data (next patch).

1 0

[PATCH 10/13] msi: Add support for exporting the _SummaryInformation table.
by Erich E. Hoover 08 Mar '19

08 Mar '19

The _SummaryInformation table stores a lot of important information about an MSI database. This patch adds the ability to export that table since, like _ForceCodepage, it is stored in a different format than the other tables.

1 0

[PATCH 9/13] msidb: Add support for exporting with short (DOS) filenames.
by Erich E. Hoover 08 Mar '19

08 Mar '19

msidb's "-s" flag modifies the database export to use short (DOS) filenames instead of full table names. This flag is convenient because it uses the same filenames that the import (-i) option expects. For example, the InstallExecuteSequence table gets imported (or exported with this flag) as InstallE.idt where the normal export option uses InstallExecuteSequence.idt.

1 0

[PATCH 8/13] msidb: Add support for exporting database tables.
by Erich E. Hoover 08 Mar '19

08 Mar '19

msidb allows developers to export tables from a database with the "-e" mode flag followed by a list of tables. For example, this call would export three tables to the current directory: msidb -d package.msi -f . -e ActionText Component InstallExecuteSequence

1 0

[PATCH 7/13] msidb: Add support for extracting stream/cabinet files from MSI databases.
by Erich E. Hoover 08 Mar '19

08 Mar '19

msidb allows developers to extract "streams" (cabinet files) from a database with the "-x" mode flag followed by the filename for the stream in the database, example: msidb -d package.msi -x cabinet.cab

1 0

[PATCH 6/13] msidb: Add support for removing stream/cabinet files from MSI databases.
by Erich E. Hoover 08 Mar '19

08 Mar '19

msidb allows developers to remove "streams" (cabinet files) from a database with the "-k" mode flag followed by the filename for the stream in the database, example: msidb -d package.msi -k cabinet.cab

1 0

[PATCH] winex11: Fix typo in comments.
by Nikolay Sivov 08 Mar '19

08 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winex11.drv/ime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 2f90f8539b..dfeed2cb1e 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -183,8 +183,8 @@ static int updateField(DWORD origLen, DWORD origOffset, DWORD currentOffset, static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len) { - /* we need to make sure the CompStr, CompClaus and CompAttr fields are all - * set and correct */ + /* We need to make sure the CompStr, CompClause and CompAttr fields are all + * set and correct. */ int needed_size; HIMCC rc; LPBYTE newdata = NULL; -- 2.20.1

1 0

[PATCH 8/8] mshtml: Simplify handling origin URI charset.
by Jacek Caban 08 Mar '19

08 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsio.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-)

1 0

[PATCH 7/8] mshtml: Get rid of no longer needed is_doc_uri from nsWineURI.
by Jacek Caban 08 Mar '19

08 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/binding.h | 1 - dlls/mshtml/nsembed.c | 7 +------ dlls/mshtml/nsio.c | 31 +------------------------------ 3 files changed, 2 insertions(+), 37 deletions(-)

1 0

[PATCH 6/8] mshtml: Move TranslateUrl call to before_async_open.
by Jacek Caban 08 Mar '19

08 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsio.c | 49 ++++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 34 deletions(-)

1 0

[PATCH 5/8] mshtml: Use channel_bsc from URI for child documents as well.
by Jacek Caban 08 Mar '19

08 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsio.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)

1 0

[PATCH 4/8] mshtml: Get rid of no longer needed windowref_t.
by Jacek Caban 08 Mar '19

08 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/htmlwindow.c | 12 --------- dlls/mshtml/mshtml_private.h | 17 ------------ dlls/mshtml/navigate.c | 2 +- dlls/mshtml/nsio.c | 51 +++++++----------------------------- dlls/mshtml/persist.c | 2 +- 6 files changed, 12 insertions(+), 74 deletions(-)

1 0

[PATCH 3/8] mshtml: Always use get_channel_window to get window in nsIChannel::AsyncOpen.
by Jacek Caban 08 Mar '19

08 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsio.c | 74 ++++------------------------------------------ 1 file changed, 5 insertions(+), 69 deletions(-)

1 0

[PATCH 2/8] mshtml: Get nsIWebProgress from notification callback if load group has no observer.
by Jacek Caban 08 Mar '19

08 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsio.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)

1 0

[PATCH 1/8] mshtml: Use load_flags instead of is_doc_uri in nsChannel implementation.
by Jacek Caban 08 Mar '19

08 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsio.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)

1 0

Re: [PATCH 2/3] imm32: Fix output buffer length handling for no-conversion case of GCS_COMPSTR.
by Aric Stewart 08 Mar '19

08 Mar '19

Signed-off-by: Aric Stewart <aric(a)codeweavers.com>

1 0

Re: [PATCH 1/3] imm32: Replace macros with helper functions.
by Aric Stewart 08 Mar '19

08 Mar '19

Signed-off-by: Aric Stewart <aric(a)codeweavers.com>

1 0

Re: [PATCH 3/3] imm32: Fix output buffer length handling for A -> W conversion case of GCS_COMPSTR.
by Aric Stewart 08 Mar '19

08 Mar '19

Signed-off-by: Aric Stewart <aric(a)codeweavers.com>

1 0

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-devel