September 2021 - Wine-Commits

Nikolay Sivov : d3d10/effect: Fix indexing in GetVertexShader().
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: 293484af6016e87f2109a128173e257961936777 URL: https://source.winehq.org/git/wine.git/?a=commit;h=293484af6016e87f2109a128… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 1 16:04:34 2021 +0300 d3d10/effect: Fix indexing in GetVertexShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 24 +++++++++++++------- dlls/d3d10/tests/effect.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 7e583ea956b..180d36ce65b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -6983,7 +6983,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetRawValue( /* ID3D10EffectShaderVariable methods */ static HRESULT d3d10_get_shader_variable(struct d3d10_effect_variable *v, UINT shader_index, - struct d3d10_effect_shader_variable **s) + struct d3d10_effect_shader_variable **s, D3D10_SHADER_VARIABLE_TYPE *basetype) { unsigned int i; @@ -6993,6 +6993,7 @@ static HRESULT d3d10_get_shader_variable(struct d3d10_effect_variable *v, UINT s if (!shader_index) { *s = &v->u.shader; + if (basetype) *basetype = v->type->basetype; return S_OK; } @@ -7010,6 +7011,8 @@ static HRESULT d3d10_get_shader_variable(struct d3d10_effect_variable *v, UINT s } *s = &v->effect->used_shaders[i + shader_index]->u.shader; + if (basetype) *basetype = v->effect->used_shaders[i + shader_index]->type->basetype; + return S_OK; } @@ -7023,7 +7026,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetShaderDesc( TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); - if (FAILED(hr = d3d10_get_shader_variable(v, index, &s))) + if (FAILED(hr = d3d10_get_shader_variable(v, index, &s, NULL))) return hr; memset(desc, 0, sizeof(*desc)); @@ -7052,19 +7055,24 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetVertexShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10VertexShader **shader) { struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); + struct d3d10_effect_shader_variable *s; + D3D10_SHADER_VARIABLE_TYPE basetype; + HRESULT hr; TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); - if (v->type->element_count) - v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + *shader = NULL; - if (v->type->basetype != D3D10_SVT_VERTEXSHADER) + if (FAILED(hr = d3d10_get_shader_variable(v, index, &s, &basetype))) + return hr; + + if (basetype != D3D10_SVT_VERTEXSHADER) { WARN("Shader is not a vertex shader.\n"); - return E_FAIL; + return D3DERR_INVALIDCALL; } - if ((*shader = v->u.shader.shader.vs)) + if ((*shader = s->shader.vs)) ID3D10VertexShader_AddRef(*shader); return S_OK; @@ -7120,7 +7128,7 @@ static HRESULT d3d10_get_shader_variable_signature(struct d3d10_effect_variable struct d3d10_effect_shader_variable *s; HRESULT hr; - if (FAILED(hr = d3d10_get_shader_variable(v, shader_index, &s))) + if (FAILED(hr = d3d10_get_shader_variable(v, shader_index, &s, NULL))) return hr; if (!s->reflection) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index a9d077566e0..4583863d59b 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6010,6 +6010,62 @@ static void test_effect_shader_description(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_effect_shader_object(void) +{ + ID3D10EffectShaderVariable *s; + ID3D10EffectVariable *v; + ID3D10VertexShader *vs; + ID3D10Effect* effect; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = create_effect(fx_local_shader, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "Failed to create an effect!\n"); + + v = effect->lpVtbl->GetVariableByName(effect, "v0"); + + s = v->lpVtbl->AsShader(v); + + vs = (void *)0xdeadbeef; + hr = s->lpVtbl->GetVertexShader(s, 0, &vs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!vs, "Unexpected shader object.\n"); + + vs = (void *)0xdeadbeef; + hr = s->lpVtbl->GetVertexShader(s, 1, &vs); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(!vs, "Unexpected shader object.\n"); + + vs = (void *)0xdeadbeef; + hr = s->lpVtbl->GetVertexShader(s, 2, &vs); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(!vs, "Unexpected shader object.\n"); + + vs = NULL; + hr = s->lpVtbl->GetVertexShader(s, 3, &vs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!vs, "Unexpected shader object.\n"); + ID3D10VertexShader_Release(vs); + + vs = NULL; + hr = s->lpVtbl->GetVertexShader(s, 4, &vs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!vs, "Unexpected shader object.\n"); + ID3D10VertexShader_Release(vs); + + effect->lpVtbl->Release(effect); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(effect) { test_effect_constant_buffer_type(); @@ -6028,4 +6084,5 @@ START_TEST(effect) test_effect_resource_variable(); test_effect_optimize(); test_effect_shader_description(); + test_effect_shader_object(); }

1 0

Nikolay Sivov : d3dx10/sprite: Store projection matrix.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: 66d7ba2d8cec7640e7fd6b9d24110660f970312d URL: https://source.winehq.org/git/wine.git/?a=commit;h=66d7ba2d8cec7640e7fd6b9d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 1 16:09:36 2021 +0300 d3dx10/sprite: Store projection matrix. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/sprite.c | 27 +++++++++++++++++++++++---- dlls/d3dx10_43/tests/d3dx10.c | 14 ++++++++------ 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx10_43/sprite.c b/dlls/d3dx10_43/sprite.c index 5fc9b9edaa2..b2045e72a27 100644 --- a/dlls/d3dx10_43/sprite.c +++ b/dlls/d3dx10_43/sprite.c @@ -32,6 +32,7 @@ struct d3dx10_sprite ID3DX10Sprite ID3DX10Sprite_iface; LONG refcount; + D3DXMATRIX projection; ID3D10Device *device; }; @@ -139,16 +140,30 @@ static HRESULT WINAPI d3dx10_sprite_SetViewTransform(ID3DX10Sprite *iface, D3DXM static HRESULT WINAPI d3dx10_sprite_GetProjectionTransform(ID3DX10Sprite *iface, D3DXMATRIX *transform) { - FIXME("iface %p, transform %p stub!\n", iface, transform); + struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface); - return E_NOTIMPL; + TRACE("iface %p, transform %p.\n", iface, transform); + + if (!transform) + return E_FAIL; + + *transform = sprite->projection; + + return S_OK; } static HRESULT WINAPI d3dx10_sprite_SetProjectionTransform(ID3DX10Sprite *iface, D3DXMATRIX *transform) { - FIXME("iface %p, transform %p stub!\n", iface, transform); + struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface); - return E_NOTIMPL; + TRACE("iface %p, transform %p.\n", iface, transform); + + if (!transform) + return E_FAIL; + + sprite->projection = *transform; + + return S_OK; } static HRESULT WINAPI d3dx10_sprite_GetDevice(ID3DX10Sprite *iface, ID3D10Device **device) @@ -201,6 +216,10 @@ HRESULT WINAPI D3DX10CreateSprite(ID3D10Device *device, UINT size, ID3DX10Sprite object->refcount = 1; object->device = device; ID3D10Device_AddRef(device); + object->projection._11 = 1.0f; + object->projection._22 = 1.0f; + object->projection._33 = 1.0f; + object->projection._44 = 1.0f; *sprite = &object->ID3DX10Sprite_iface; diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index c7aa3eccd24..bc5ca6747f5 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2968,6 +2968,13 @@ static void test_sprite(void) D3DXMATRIX mat, mat2; ULONG refcount; HRESULT hr; + static const D3DXMATRIX identity = + { + ._11 = 1.0f, + ._22 = 1.0f, + ._33 = 1.0f, + ._44 = 1.0f, + }; if (!(device = create_device())) { @@ -3020,11 +3027,10 @@ static void test_sprite(void) /* Projection transform */ hr = ID3DX10Sprite_GetProjectionTransform(sprite, NULL); -todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Sprite_GetProjectionTransform(sprite, &mat); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!memcmp(&mat, &identity, sizeof(mat)), "Unexpected projection transform.\n"); /* Set a transform and test if it gets returned correctly */ mat.m[0][0] = 2.1f; mat.m[0][1] = 6.5f; mat.m[0][2] =-9.6f; mat.m[0][3] = 1.7f; @@ -3033,18 +3039,14 @@ todo_wine mat.m[3][0] = 6.7f; mat.m[3][1] =-5.1f; mat.m[3][2] = 6.1f; mat.m[3][3] = 2.2f; hr = ID3DX10Sprite_SetProjectionTransform(sprite, NULL); -todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Sprite_SetProjectionTransform(sprite, &mat); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Sprite_GetProjectionTransform(sprite, &mat2); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!memcmp(&mat, &mat2, sizeof(mat)), "Unexpected matrix.\n"); -} /* View transform */ hr = ID3DX10Sprite_SetViewTransform(sprite, NULL);

1 0

Nikolay Sivov : d3dx10/font: Add PreloadCharacters().
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: c09f114319d6ed7bb260b8677156cfaad0884146 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c09f114319d6ed7bb260b867… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 1 16:09:35 2021 +0300 d3dx10/font: Add PreloadCharacters(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/font.c | 45 +++++++++++++++++++++++++++++++++++++++++-- dlls/d3dx10_43/tests/d3dx10.c | 3 --- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx10_43/font.c b/dlls/d3dx10_43/font.c index 51704e2bbbe..1a95dbeca02 100644 --- a/dlls/d3dx10_43/font.c +++ b/dlls/d3dx10_43/font.c @@ -168,9 +168,50 @@ static HRESULT WINAPI d3dx_font_GetGlyphData(ID3DX10Font *iface, UINT glyph, static HRESULT WINAPI d3dx_font_PreloadCharacters(ID3DX10Font *iface, UINT first, UINT last) { - FIXME("iface %p, first %u, last %u stub!\n", iface, first, last); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); + unsigned int i, count, start, end; + WORD *indices; + WCHAR *chars; - return E_NOTIMPL; + TRACE("iface %p, first %u, last %u.\n", iface, first, last); + + if (last < first) + return S_OK; + + count = last - first + 1; + indices = heap_alloc(count * sizeof(*indices)); + if (!indices) + return E_OUTOFMEMORY; + + chars = heap_alloc(count * sizeof(*chars)); + if (!chars) + { + heap_free(indices); + return E_OUTOFMEMORY; + } + + for (i = 0; i < count; ++i) + chars[i] = first + i; + + GetGlyphIndicesW(font->hdc, chars, count, indices, 0); + + start = end = indices[0]; + for (i = 1; i < count; ++i) + { + if (indices[i] == end + 1) + { + end = indices[i]; + continue; + } + ID3DX10Font_PreloadGlyphs(iface, start, end); + start = end = indices[i]; + } + ID3DX10Font_PreloadGlyphs(iface, start, end); + + heap_free(chars); + heap_free(indices); + + return S_OK; } static HRESULT WINAPI d3dx_font_PreloadGlyphs(ID3DX10Font *iface, UINT first, UINT last) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 65bccb71521..c7aa3eccd24 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2307,14 +2307,12 @@ todo_wine ID3D10ShaderResourceView_Release(srv); hr = ID3DX10Font_PreloadCharacters(font, 'b', 'a'); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadGlyphs(font, 1, 0); todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadCharacters(font, 'a', 'a'); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); for (c = 'b'; c <= 'z'; ++c) @@ -2376,7 +2374,6 @@ todo_wine } hr = ID3DX10Font_PreloadCharacters(font, 'a', 'z'); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); /* Test multiple textures */

1 0

Nikolay Sivov : d3dx10/font: Add PreloadTextW().
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: abbab131b84b8ccfb8ce814a3a5928531262d081 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abbab131b84b8ccfb8ce814a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 1 16:09:34 2021 +0300 d3dx10/font: Add PreloadTextW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/font.c | 28 ++++++++++++++++++++++++++-- dlls/d3dx10_43/tests/d3dx10.c | 9 --------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx10_43/font.c b/dlls/d3dx10_43/font.c index 2145b1c6f1e..51704e2bbbe 100644 --- a/dlls/d3dx10_43/font.c +++ b/dlls/d3dx10_43/font.c @@ -210,9 +210,33 @@ static HRESULT WINAPI d3dx_font_PreloadTextA(ID3DX10Font *iface, const char *str static HRESULT WINAPI d3dx_font_PreloadTextW(ID3DX10Font *iface, const WCHAR *string, INT count) { - FIXME("iface %p, string %s, count %d stub!\n", iface, debugstr_wn(string, count), count); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); + WORD *indices; + int i; - return E_NOTIMPL; + TRACE("iface %p, string %s, count %d.\n", iface, debugstr_wn(string, count), count); + + if (!string && !count) + return S_OK; + + if (!string) + return D3DERR_INVALIDCALL; + + if (count < 0) + count = lstrlenW(string); + + indices = heap_alloc(count * sizeof(*indices)); + if (!indices) + return E_OUTOFMEMORY; + + GetGlyphIndicesW(font->hdc, string, count, indices, 0); + + for (i = 0; i < count; ++i) + ID3DX10Font_PreloadGlyphs(iface, indices[i], indices[i]); + + heap_free(indices); + + return S_OK; } static INT WINAPI d3dx_font_DrawTextA(ID3DX10Font *iface, ID3DX10Sprite *sprite, diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 8c55dd5810b..65bccb71521 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2263,32 +2263,23 @@ static void test_font(void) hr = ID3DX10Font_PreloadTextA(font, NULL, 1); ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextA(font, "test", -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextA(font, "", 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextA(font, "", -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, NULL, -1); -todo_wine ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, NULL, 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, NULL, 1); -todo_wine ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, testW, -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, L"", 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, L"", -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ID3DX10Font_Release(font);

1 0

Nikolay Sivov : d3d10/effect: Create shaders with stream output when declaration string is present.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: 2327ae70aef79fb90ccb399caa2c5f5167bd02c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2327ae70aef79fb90ccb399c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 1 16:04:32 2021 +0300 d3d10/effect: Create shaders with stream output when declaration string is present. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 48df10acff5..71468bd4d3c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -774,7 +774,7 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse break; case D3D10_SVT_GEOMETRYSHADER: - if (v->type->flags & D3D10_EOT_FLAG_GS_SO) + if (v->u.shader.stream_output_declaration) { struct d3d10_effect_so_decl so_decl;

1 0

Jacek Caban : gdi32: Store abort proc in DC_ATTR.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: 711ce415c01a5e36bde6bb147b5aa3cedc8b35ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=711ce415c01a5e36bde6bb14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:14:25 2021 +0200 gdi32: Store abort proc in DC_ATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/printdrv.c | 17 +---------------- include/ntgdi.h | 1 + 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index f175d8f59bc..0f01e28696d 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1821,6 +1821,18 @@ BOOL WINAPI CancelDC(HDC hdc) return TRUE; } +/********************************************************************** + * SetAbortProc (GDI32.@) + */ +INT WINAPI SetAbortProc( HDC hdc, ABORTPROC abrtprc ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + dc_attr->abort_proc = abrtprc; + return TRUE; +} + /*********************************************************************** * SetICMMode (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 6701385784f..c2e45ab7ce0 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -101,7 +101,6 @@ typedef struct tagDC INT breakExtra; /* breakTotalExtra / breakCount */ INT breakRem; /* breakTotalExtra % breakCount */ - ABORTPROC pAbortProc; /* AbortProc for Printing */ XFORM xformWorld2Wnd; /* World-to-window transformation */ XFORM xformWorld2Vport; /* World-to-viewport transformation */ XFORM xformVport2World; /* Inverse of the above transformation */ diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index c4fcf8ada13..ee8ae295daf 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -76,7 +76,7 @@ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) if(!dc) return SP_ERROR; - if (dc->pAbortProc && !dc->pAbortProc( hdc, 0 )) ret = 0; + if (dc->attr->abort_proc && !dc->attr->abort_proc( hdc, 0 )) ret = 0; else { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pStartDoc ); @@ -204,18 +204,3 @@ INT WINAPI AbortDoc(HDC hdc) } return ret; } - - -/********************************************************************** - * SetAbortProc (GDI32.@) - * - */ -INT WINAPI SetAbortProc(HDC hdc, ABORTPROC abrtprc) -{ - DC *dc = get_dc_ptr( hdc ); - - if (!dc) return FALSE; - dc->pAbortProc = abrtprc; - release_dc_ptr( dc ); - return TRUE; -} diff --git a/include/ntgdi.h b/include/ntgdi.h index 061ed40779c..8bff1d4338f 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -169,6 +169,7 @@ typedef struct DC_ATTR UINT font_code_page; RECTL emf_bounds; void *emf; + ABORTPROC abort_proc; /* AbortProc for printing */ } DC_ATTR; struct font_enum_entry

1 0

Zebediah Figura : avicap32: Build with msvcrt.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: abb17573ce52274387ff6e4d5015d5212f215321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abb17573ce52274387ff6e4d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 1 15:56:46 2021 -0500 avicap32: Build with msvcrt. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avicap32/Makefile.in | 7 ++- dlls/avicap32/avicap32_main.c | 135 ++++++++--------------------------------- dlls/avicap32/unixlib.h | 33 ++++++++++ dlls/avicap32/v4l.c | 137 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 201 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=abb17573ce52274387ff…

1 0

Gijs Vermeulen : avicap32: Partially implement capCreateCaptureWindowW.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: b755d58b13e7c5b61ba7c78b9402b2c919d57b58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b755d58b13e7c5b61ba7c78b… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Sep 1 15:56:47 2021 -0500 avicap32: Partially implement capCreateCaptureWindowW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38011 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avicap32/Makefile.in | 1 + dlls/avicap32/avicap32_main.c | 76 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 61 insertions(+), 16 deletions(-) diff --git a/dlls/avicap32/Makefile.in b/dlls/avicap32/Makefile.in index a899a6207b0..b74c4726e8b 100644 --- a/dlls/avicap32/Makefile.in +++ b/dlls/avicap32/Makefile.in @@ -1,5 +1,6 @@ MODULE = avicap32.dll IMPORTLIB = avicap32 +IMPORTS = user32 EXTRALIBS = -Wl,--subsystem,unixlib EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index d4608138d8b..3ce9d5240b8 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -30,37 +30,74 @@ WINE_DEFAULT_DEBUG_CHANNEL(avicap); +static HINSTANCE avicap_instance; static unixlib_handle_t unix_handle; +static const WCHAR class_name[] = L"wine_avicap_class"; + +static LRESULT CALLBACK avicap_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + default: + if (msg >= WM_CAP_START && msg <= WM_CAP_END) + FIXME("Unhandled message %#x.\n", msg); + return DefWindowProcW(hwnd, msg, wparam, lparam); + } +} + +static void register_class(void) +{ + WNDCLASSEXW class = + { + .cbSize = sizeof(WNDCLASSEXW), + .lpfnWndProc = avicap_wndproc, + .hInstance = avicap_instance, + .hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW), + .hbrBackground = (HBRUSH)(COLOR_BTNFACE+1), + .lpszClassName = class_name, + }; + + if (!RegisterClassExW(&class) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) + ERR("Failed to register class, error %u.\n", GetLastError()); +} + +static void unregister_class(void) +{ + if (!UnregisterClassW(class_name, avicap_instance) && GetLastError() != ERROR_CLASS_DOES_NOT_EXIST) + ERR("Failed to unregister class, error %u.\n", GetLastError()); +} + /*********************************************************************** * capCreateCaptureWindowW (AVICAP32.@) */ -HWND VFWAPI capCreateCaptureWindowW(LPCWSTR lpszWindowName, DWORD dwStyle, INT x, - INT y, INT nWidth, INT nHeight, HWND hWnd, - INT nID) +HWND VFWAPI capCreateCaptureWindowW(const WCHAR *window_name, DWORD style, + int x, int y, int width, int height, HWND parent, int id) { - FIXME("(%s, %08x, %08x, %08x, %08x, %08x, %p, %08x): stub\n", - debugstr_w(lpszWindowName), dwStyle, x, y, nWidth, nHeight, hWnd, nID); - return 0; + TRACE("window_name %s, style %#x, x %d, y %d, width %d, height %d, parent %p, id %#x.\n", + debugstr_w(window_name), style, x, y, width, height, parent, id); + + return CreateWindowW(class_name, window_name, style, x, y, width, height, parent, NULL, avicap_instance, NULL); } /*********************************************************************** * capCreateCaptureWindowA (AVICAP32.@) */ -HWND VFWAPI capCreateCaptureWindowA(LPCSTR lpszWindowName, DWORD dwStyle, INT x, - INT y, INT nWidth, INT nHeight, HWND hWnd, - INT nID) -{ UNICODE_STRING nameW; - HWND retW; +HWND VFWAPI capCreateCaptureWindowA(const char *window_name, DWORD style, + int x, int y, int width, int height, HWND parent, int id) +{ + UNICODE_STRING nameW; + HWND window; - if (lpszWindowName) RtlCreateUnicodeStringFromAsciiz(&nameW, lpszWindowName); - else nameW.Buffer = NULL; + if (window_name) + RtlCreateUnicodeStringFromAsciiz(&nameW, window_name); + else + nameW.Buffer = NULL; - retW = capCreateCaptureWindowW(nameW.Buffer, dwStyle, x, y, nWidth, nHeight, - hWnd, nID); + window = capCreateCaptureWindowW(nameW.Buffer, style, x, y, width, height, parent, id); RtlFreeUnicodeString(&nameW); - return retW; + return window; } /*********************************************************************** @@ -105,6 +142,13 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) NtQueryVirtualMemory(GetCurrentProcess(), instance, MemoryWineUnixFuncs, &unix_handle, sizeof(unix_handle), NULL); DisableThreadLibraryCalls(instance); + register_class(); + avicap_instance = instance; + break; + + case DLL_PROCESS_DETACH: + if (!reserved) + unregister_class(); break; }

1 0

Rémi Bernon : winexinput.sys: Introduce a new winexinput.sys driver.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: 61e217c40a78011bbc37305a063b902582d49429 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61e217c40a78011bbc37305a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 1 07:47:27 2021 +0200 winexinput.sys: Introduce a new winexinput.sys driver. Currently only acting as a pass-through driver, matching any device with a WINEBUS\WINE_COMP_XINPUT compatible id. This creates new WINEXINPUT\ bus and the gamepad PDO on it, adding the &IG_ device id suffix to the original device id (replacing an eventual &MI_ suffix), and removes the need to set it on winebus.sys side. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/winexinput.sys/Makefile.in | 8 + dlls/winexinput.sys/main.c | 448 ++++++++++++++++++++++++++++++++ dlls/winexinput.sys/winexinput.inf | 22 ++ dlls/winexinput.sys/winexinput.rc | 20 ++ dlls/winexinput.sys/winexinput.sys.spec | 1 + loader/wine.inf.in | 1 + 8 files changed, 503 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61e217c40a78011bbc37…

1 0

Rémi Bernon : winebus.sys: Stop enforcing input and IG suffix on gamepads.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: d22ece4c58228153e14813ccb3c7b60054144c4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d22ece4c58228153e14813cc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 1 07:47:28 2021 +0200 winebus.sys: Stop enforcing input and IG suffix on gamepads. The &IG_00 suffix is now automatically added by winexinput.sys. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 5 +---- dlls/winebus.sys/bus_sdl.c | 5 +---- dlls/winebus.sys/bus_udev.c | 2 -- dlls/winebus.sys/main.c | 18 ++++-------------- 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index eb5eddd60fa..9b842dc81a5 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -299,7 +299,6 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * CFStringRef str = NULL; WCHAR serial_string[256]; BOOL is_gamepad = FALSE; - WORD input = -1; TRACE("OS/X IOHID Device Added %p\n", IOHIDDevice); @@ -361,13 +360,11 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * is_gamepad = (axes == 6 && buttons >= 14); } } - if (is_gamepad) - input = 0; if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct platform_private)))) return; - device = bus_create_hid_device(busidW, vid, pid, input, version, uid, str ? serial_string : NULL, + device = bus_create_hid_device(busidW, vid, pid, -1, version, uid, str ? serial_string : NULL, is_gamepad, &iohid_vtbl, &private->unix_device); if (!device) HeapFree(GetProcessHeap(), 0, private); else diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 61d1240e05d..8259531779b 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -744,7 +744,6 @@ static void try_add_device(unsigned int index) WCHAR serial[34] = {0}; char guid_str[34]; BOOL is_xbox_gamepad; - WORD input = -1; SDL_Joystick* joystick; SDL_JoystickID id; @@ -795,12 +794,10 @@ static void try_add_device(unsigned int index) button_count = pSDL_JoystickNumButtons(joystick); is_xbox_gamepad = (axis_count == 6 && button_count >= 14); } - if (is_xbox_gamepad) - input = 0; if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*private)))) return; - device = bus_create_hid_device(sdl_busidW, vid, pid, input, version, index, serial, is_xbox_gamepad, + device = bus_create_hid_device(sdl_busidW, vid, pid, -1, version, index, serial, is_xbox_gamepad, &sdl_vtbl, &private->unix_device); if (!device) HeapFree(GetProcessHeap(), 0, private); else diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index bd70a66f2cd..8d631fb928e 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1131,8 +1131,6 @@ static void try_add_device(struct udev_device *dev) is_gamepad = (axes == 6 && buttons >= 14); } #endif - if (input == (WORD)-1 && is_gamepad) - input = 0; TRACE("Found udev device %s (vid %04x, pid %04x, version %04x, input %d, serial %s)\n", debugstr_a(devnode), vid, pid, version, input, debugstr_w(serial)); diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index e58bf873eac..28bbb5ff7a9 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -149,8 +149,6 @@ static CRITICAL_SECTION device_list_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static struct list device_list = LIST_INIT(device_list); static const WCHAR zero_serialW[]= {'0','0','0','0',0}; -static const WCHAR miW[] = {'M','I',0}; -static const WCHAR igW[] = {'I','G',0}; static NTSTATUS winebus_call(unsigned int code, void *args) { @@ -202,25 +200,17 @@ static WCHAR *get_instance_id(DEVICE_OBJECT *device) static WCHAR *get_device_id(DEVICE_OBJECT *device) { + static const WCHAR input_formatW[] = {'&','M','I','_','%','0','2','u',0}; static const WCHAR formatW[] = {'%','s','\\','v','i','d','_','%','0','4','x', '&','p','i','d','_','%','0','4','x',0}; - static const WCHAR format_inputW[] = {'%','s','\\','v','i','d','_','%','0','4','x', - '&','p','i','d','_','%','0','4','x','&','%','s','_','%','0','2','i',0}; struct device_extension *ext = (struct device_extension *)device->DeviceExtension; DWORD len = strlenW(ext->busid) + 34; - WCHAR *dst; + WCHAR *dst, *tmp; if ((dst = ExAllocatePool(PagedPool, len * sizeof(WCHAR)))) { - if (ext->input == (WORD)-1) - { - sprintfW(dst, formatW, ext->busid, ext->vid, ext->pid); - } - else - { - sprintfW(dst, format_inputW, ext->busid, ext->vid, ext->pid, - ext->is_gamepad ? igW : miW, ext->input); - } + tmp = dst + sprintfW(dst, formatW, ext->busid, ext->vid, ext->pid); + if (ext->input != (WORD)-1) sprintfW(tmp, input_formatW, ext->input); } return dst;

1 0