January 2016 - Wine-commits

Hugh McMaster : wineconsole: Improve a user dialog resource string.
by Alexandre Julliard 27 Jan '16

27 Jan '16

1 0

Alexandre Julliard : ntdll/tests: Fix some more failures on restricted Windows.
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: 3e33f6c2d9cd05f2a603c60ef9bdeda2eb8d3098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e33f6c2d9cd05f2a603c60ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 27 12:15:48 2016 +0900 ntdll/tests: Fix some more failures on restricted Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index b957128..8a62cd3 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1099,24 +1099,28 @@ static void test_query_object(void) pRtlCreateUnicodeStringFromAsciiz( &path, "\\REGISTRY\\Machine\\Software\\Classes" ); status = pNtCreateKey( &handle, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); - ok( handle != 0, "NtCreateKey failed status %x\n", status ); + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + "NtCreateKey failed status %x\n", status ); pRtlFreeUnicodeString( &path ); - len = 0; - status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); - ok( status == STATUS_SUCCESS , "NtQueryObject returned %x\n", status ); - str = (UNICODE_STRING *)buffer; - todo_wine - ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); - str = (UNICODE_STRING *)buffer; - expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); - todo_wine - ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */ - "unexpected len %u\n", len ); - todo_wine - ok( len > sizeof(UNICODE_STRING) + sizeof("\\Classes") * sizeof(WCHAR), - "name too short %s\n", wine_dbgstr_w(str->Buffer) ); - trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); - pNtClose( handle ); + if (status == STATUS_SUCCESS) + { + len = 0; + status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); + ok( status == STATUS_SUCCESS , "NtQueryObject returned %x\n", status ); + str = (UNICODE_STRING *)buffer; + todo_wine + ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); + todo_wine + ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */ + "unexpected len %u\n", len ); + todo_wine + ok( len > sizeof(UNICODE_STRING) + sizeof("\\Classes") * sizeof(WCHAR), + "name too short %s\n", wine_dbgstr_w(str->Buffer) ); + trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); + pNtClose( handle ); + } } static void test_type_mismatch(void)

1 0

Nikolay Sivov : oleaut32/tests: Fix some test failures.
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: 12ce3c58ede8e0a2e849c5b39be963dd718201e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12ce3c58ede8e0a2e849c5b39… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 26 19:31:14 2016 +0300 oleaut32/tests: Fix some test failures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 71764c3..ee8568c 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1656,7 +1656,6 @@ static void test_CreateTypeLib(SYSKIND sys) { static OLECHAR dualW[] = {'d','u','a','l',0}; static OLECHAR coclassW[] = {'c','o','c','l','a','s','s',0}; static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0x3213,0}; - static const WCHAR defaultQW[] = {'d','e','f','a','u','l','t','?',0}; static OLECHAR func1W[] = {'f','u','n','c','1',0}; static OLECHAR func2W[] = {'f','u','n','c','2',0}; static OLECHAR prop1W[] = {'P','r','o','p','1',0}; @@ -1701,6 +1700,8 @@ static void test_CreateTypeLib(SYSKIND sys) { TYPEKIND kind; DESCKIND desckind; BINDPTR bindptr; + char nameA[16]; + WCHAR nameW[16]; switch(sys){ case SYS_WIN32: @@ -2197,6 +2198,9 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(hres == S_OK, "got %08x\n", hres); SysFreeString(V_BSTR(&paramdescex.varDefaultValue)); + WideCharToMultiByte(CP_ACP, 0, defaultW, -1, nameA, sizeof(nameA), NULL, NULL); + MultiByteToWideChar(CP_ACP, 0, nameA, -1, nameW, sizeof(nameW)/sizeof(nameW[0])); + hres = ITypeInfo2_GetFuncDesc(ti2, 3, &pfuncdesc); ok(hres == S_OK, "got %08x\n", hres); @@ -2222,7 +2226,7 @@ static void test_CreateTypeLib(SYSKIND sys) { U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultQW), + ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue))); @@ -2234,7 +2238,7 @@ static void test_CreateTypeLib(SYSKIND sys) { U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultQW), + ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue))); @@ -3020,7 +3024,7 @@ static void test_CreateTypeLib(SYSKIND sys) { U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultQW), + ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue))); @@ -3032,7 +3036,7 @@ static void test_CreateTypeLib(SYSKIND sys) { U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultQW), + ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)));

1 0

Henri Verbeet : wined3d: Unify WINED3D_RTYPE_TEXTURE and WINED3D_RTYPE_CUBE_TEXTURE.
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: dafaae77308be415e024739f227fea64ae85d6d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dafaae77308be415e024739f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 00:06:23 2016 +0100 wined3d: Unify WINED3D_RTYPE_TEXTURE and WINED3D_RTYPE_CUBE_TEXTURE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 2 +- dlls/d3d8/device.c | 4 +- dlls/d3d8/directx.c | 26 +++++++- dlls/d3d8/texture.c | 6 +- dlls/d3d9/device.c | 4 +- dlls/d3d9/directx.c | 26 +++++++- dlls/d3d9/texture.c | 6 +- dlls/ddraw/device.c | 6 +- dlls/ddraw/surface.c | 18 ++--- dlls/wined3d/device.c | 60 +++++++---------- dlls/wined3d/directx.c | 38 ++++------- dlls/wined3d/resource.c | 148 ++++++++++++++++++++++------------------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 11 ++- dlls/wined3d/utils.c | 15 ++--- dlls/wined3d/wined3d_private.h | 5 +- include/wine/wined3d.h | 9 +-- 18 files changed, 207 insertions(+), 181 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dafaae77308be415e0247…

1 0

Henri Verbeet : wined3d: Rename WINED3D_RTYPE_VOLUME_TEXTURE to WINED3D_RTYPE_TEXTURE_3D.
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: cf899ac2670b41ae596289ef9336c13d6dee86c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf899ac2670b41ae596289ef9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 00:06:24 2016 +0100 wined3d: Rename WINED3D_RTYPE_VOLUME_TEXTURE to WINED3D_RTYPE_TEXTURE_3D. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 2 +- dlls/d3d8/directx.c | 2 +- dlls/d3d8/texture.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/d3d9/texture.c | 2 +- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/directx.c | 2 +- dlls/wined3d/resource.c | 12 ++++++------ dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/utils.c | 2 +- include/wine/wined3d.h | 6 +++--- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 78aac0a..a73f3fc 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -914,7 +914,7 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi wined3d_private_store_init(&texture->private_store); texture->desc = *desc; - wined3d_desc.resource_type = WINED3D_RTYPE_VOLUME_TEXTURE; + wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE_3D; wined3d_desc.format = wined3dformat_from_dxgi_format(desc->Format); wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 2db6488..0ca0dd3 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -254,7 +254,7 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3 break; case D3DRTYPE_VOLUMETEXTURE: - wined3d_rtype = WINED3D_RTYPE_VOLUME_TEXTURE; + wined3d_rtype = WINED3D_RTYPE_TEXTURE_3D; break; case D3DRTYPE_CUBETEXTURE: diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index f756e01..96a34dc 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1246,7 +1246,7 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev d3d8_resource_init(&texture->resource); list_init(&texture->rtv_list); - desc.resource_type = WINED3D_RTYPE_VOLUME_TEXTURE; + desc.resource_type = WINED3D_RTYPE_TEXTURE_3D; desc.format = wined3dformat_from_d3dformat(format); desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 1d759c4..fd6bc8c 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -270,7 +270,7 @@ static HRESULT WINAPI d3d9_CheckDeviceFormat(IDirect3D9Ex *iface, UINT adapter, break; case D3DRTYPE_VOLUMETEXTURE: - wined3d_rtype = WINED3D_RTYPE_VOLUME_TEXTURE; + wined3d_rtype = WINED3D_RTYPE_TEXTURE_3D; break; case D3DRTYPE_CUBETEXTURE: diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index ebe5e50..878a4ae 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1386,7 +1386,7 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev d3d9_resource_init(&texture->resource); list_init(&texture->rtv_list); - desc.resource_type = WINED3D_RTYPE_VOLUME_TEXTURE; + desc.resource_type = WINED3D_RTYPE_TEXTURE_3D; desc.format = wined3dformat_from_d3dformat(format); desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dfbec0f..bb910b3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3676,7 +3676,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, break; } - case WINED3D_RTYPE_VOLUME_TEXTURE: + case WINED3D_RTYPE_TEXTURE_3D: { for (i = 0; i < level_count; ++i) { @@ -4971,7 +4971,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso break; case WINED3D_RTYPE_TEXTURE_2D: - case WINED3D_RTYPE_VOLUME_TEXTURE: + case WINED3D_RTYPE_TEXTURE_3D: for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) { struct wined3d_texture *texture = wined3d_texture_from_resource(resource); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index cc6e5e1..23fdd89 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4662,7 +4662,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } break; - case WINED3D_RTYPE_VOLUME_TEXTURE: + case WINED3D_RTYPE_TEXTURE_3D: case WINED3D_RTYPE_VOLUME: format_flags |= WINED3DFMT_FLAG_TEXTURE; allowed_usage = WINED3DUSAGE_DYNAMIC diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 4ebcd04..73250ec 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -93,12 +93,12 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * } resource_types[] = { - {WINED3D_RTYPE_BUFFER, 0, WINED3D_GL_RES_TYPE_BUFFER}, - {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_2D}, - {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_RECT}, - {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_RB}, - {WINED3D_RTYPE_TEXTURE_2D, WINED3DUSAGE_LEGACY_CUBEMAP, WINED3D_GL_RES_TYPE_TEX_CUBE}, - {WINED3D_RTYPE_VOLUME_TEXTURE, 0, WINED3D_GL_RES_TYPE_TEX_3D}, + {WINED3D_RTYPE_BUFFER, 0, WINED3D_GL_RES_TYPE_BUFFER}, + {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_2D}, + {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_RECT}, + {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_RB}, + {WINED3D_RTYPE_TEXTURE_2D, WINED3DUSAGE_LEGACY_CUBEMAP, WINED3D_GL_RES_TYPE_TEX_CUBE}, + {WINED3D_RTYPE_TEXTURE_3D, 0, WINED3D_GL_RES_TYPE_TEX_3D}, }; resource_check_usage(usage); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5eea7d2..12d57b8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -53,7 +53,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc if ((desc->format == WINED3DFMT_DXT1 || desc->format == WINED3DFMT_DXT2 || desc->format == WINED3DFMT_DXT3 || desc->format == WINED3DFMT_DXT4 || desc->format == WINED3DFMT_DXT5) && !(format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_TEXTURE) - && desc->resource_type != WINED3D_RTYPE_VOLUME_TEXTURE && !once++) + && desc->resource_type != WINED3D_RTYPE_TEXTURE_3D && !once++) ERR_(winediag)("The application tried to create a DXTn texture, but the driver does not support them.\n"); WARN("Failed to initialize resource, returning %#x\n", hr); @@ -610,9 +610,9 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT return WINED3DERR_INVALIDCALL; } - if (texture->resource.type == WINED3D_RTYPE_VOLUME_TEXTURE) + if (texture->resource.type == WINED3D_RTYPE_TEXTURE_3D) { - WARN("Not supported on volume textures.\n"); + WARN("Not supported on 3D textures.\n"); return WINED3DERR_INVALIDCALL; } @@ -1457,7 +1457,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct hr = texture_init(object, desc, level_count, surface_flags, device, parent, parent_ops); break; - case WINED3D_RTYPE_VOLUME_TEXTURE: + case WINED3D_RTYPE_TEXTURE_3D: hr = volumetexture_init(object, desc, level_count, device, parent, parent_ops); break; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a4829b6..5eb1696 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3205,9 +3205,9 @@ const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) #define WINED3D_TO_STR(x) case x: return #x WINED3D_TO_STR(WINED3D_RTYPE_SURFACE); WINED3D_TO_STR(WINED3D_RTYPE_VOLUME); - WINED3D_TO_STR(WINED3D_RTYPE_VOLUME_TEXTURE); WINED3D_TO_STR(WINED3D_RTYPE_BUFFER); WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_2D); + WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_3D); #undef WINED3D_TO_STR default: FIXME("Unrecognized resource type %#x.\n", resource_type); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0190d12..79db043 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -657,9 +657,9 @@ enum wined3d_resource_type { WINED3D_RTYPE_SURFACE = 1, WINED3D_RTYPE_VOLUME = 2, - WINED3D_RTYPE_VOLUME_TEXTURE = 3, - WINED3D_RTYPE_BUFFER = 4, - WINED3D_RTYPE_TEXTURE_2D = 5, + WINED3D_RTYPE_BUFFER = 3, + WINED3D_RTYPE_TEXTURE_2D = 4, + WINED3D_RTYPE_TEXTURE_3D = 5, }; enum wined3d_pool

1 0

Henri Verbeet : wined3d: Rename the texture creation flags to WINED3D_TEXTURE_CREATE_*.
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: ad11f38db92b425e8df84dc4f7ea58366b73e32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad11f38db92b425e8df84dc4f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 00:06:25 2016 +0100 wined3d: Rename the texture creation flags to WINED3D_TEXTURE_CREATE_*. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 10 +++++----- dlls/d3d8/texture.c | 12 ++++++------ dlls/d3d9/device.c | 14 +++++++------- dlls/d3d9/texture.c | 12 ++++++------ dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/surface.c | 7 ++++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/surface.c | 7 ++++--- dlls/wined3d/texture.c | 8 ++++---- include/wine/wined3d.h | 8 ++++---- 10 files changed, 43 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad11f38db92b425e8df84…

1 0

Henri Verbeet : wined3d: Pass non-NULL rectangles to wined3d_surface_blt() in resolve_depth_buffer().
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: 756b5e777a9ae5618dbf713b1c36ee39d85cdcc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=756b5e777a9ae5618dbf713b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 00:06:26 2016 +0100 wined3d: Pass non-NULL rectangles to wined3d_surface_blt() in resolve_depth_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 581d119..05daafe 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2015,6 +2015,7 @@ static void resolve_depth_buffer(struct wined3d_state *state) { struct wined3d_texture *texture = state->textures[0]; struct wined3d_surface *depth_stencil, *surface; + RECT src_rect, dst_rect; if (!texture || texture->resource.type != WINED3D_RTYPE_TEXTURE_2D || !(texture->resource.format_flags & WINED3DFMT_FLAG_DEPTH)) @@ -2023,7 +2024,9 @@ static void resolve_depth_buffer(struct wined3d_state *state) if (!(depth_stencil = wined3d_rendertarget_view_get_surface(state->fb->depth_stencil))) return; - wined3d_surface_blt(surface, NULL, depth_stencil, NULL, 0, NULL, WINED3D_TEXF_POINT); + SetRect(&dst_rect, 0, 0, surface->resource.width, surface->resource.height); + SetRect(&src_rect, 0, 0, depth_stencil->resource.width, depth_stencil->resource.height); + wined3d_surface_blt(surface, &dst_rect, depth_stencil, &src_rect, 0, NULL, WINED3D_TEXF_POINT); } void CDECL wined3d_device_set_render_state(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Pass non-NULL rectangles to wined3d_surface_blt() in wined3d_device_copy_resource().
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: d178301b723b0a05d8dc0c04b185e39f3ac8ba14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d178301b723b0a05d8dc0c04b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 00:06:27 2016 +0100 wined3d: Pass non-NULL rectangles to wined3d_surface_blt() in wined3d_device_copy_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 05daafe..97586f4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3868,6 +3868,7 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, { struct wined3d_surface *dst_surface, *src_surface; struct wined3d_texture *dst_texture, *src_texture; + RECT dst_rect, src_rect; unsigned int i, count; HRESULT hr; @@ -3929,8 +3930,11 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, dst_surface = surface_from_resource(wined3d_texture_get_sub_resource(dst_texture, i)); src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, i)); - if (FAILED(hr = wined3d_surface_blt(dst_surface, NULL, src_surface, NULL, 0, NULL, WINED3D_TEXF_POINT))) - ERR("Failed to blit, subresource %u, hr %#x.\n", i, hr); + SetRect(&dst_rect, 0, 0, dst_surface->resource.width, dst_surface->resource.height); + SetRect(&src_rect, 0, 0, src_surface->resource.width, src_surface->resource.height); + if (FAILED(hr = wined3d_surface_blt(dst_surface, &dst_rect, + src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) + ERR("Failed to blit, sub-resource %u, hr %#x.\n", i, hr); } }

1 0

André Hentschel : include: Add more OID defines.
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: ff1ecab238320705c0f7ded6e93443aeaf7165be URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff1ecab238320705c0f7ded6e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 26 20:51:02 2016 +0100 include: Add more OID defines. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ntddndis.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/include/ntddndis.h b/include/ntddndis.h index 3ea18ce..e820a81 100644 --- a/include/ntddndis.h +++ b/include/ntddndis.h @@ -57,6 +57,62 @@ extern "C" { #define IOCTL_NDIS_RESERVED12 _NDIS_CONTROL_CODE(0x14, METHOD_BUFFERED) #define IOCTL_NDIS_RESERVED13 _NDIS_CONTROL_CODE(0x15, METHOD_BUFFERED) +#define OID_GEN_SUPPORTED_LIST 0x00010101 +#define OID_GEN_HARDWARE_STATUS 0x00010102 +#define OID_GEN_MEDIA_SUPPORTED 0x00010103 +#define OID_GEN_MEDIA_IN_USE 0x00010104 +#define OID_GEN_MAXIMUM_LOOKAHEAD 0x00010105 +#define OID_GEN_MAXIMUM_FRAME_SIZE 0x00010106 +#define OID_GEN_LINK_SPEED 0x00010107 +#define OID_GEN_TRANSMIT_BUFFER_SPACE 0x00010108 +#define OID_GEN_RECEIVE_BUFFER_SPACE 0x00010109 +#define OID_GEN_TRANSMIT_BLOCK_SIZE 0x0001010a +#define OID_GEN_RECEIVE_BLOCK_SIZE 0x0001010b +#define OID_GEN_VENDOR_ID 0x0001010c +#define OID_GEN_VENDOR_DESCRIPTION 0x0001010d +#define OID_GEN_CURRENT_PACKET_FILTER 0x0001010e +#define OID_GEN_CURRENT_LOOKAHEAD 0x0001010f +#define OID_GEN_DRIVER_VERSION 0x00010110 +#define OID_GEN_MAXIMUM_TOTAL_SIZE 0x00010111 +#define OID_GEN_PROTOCOL_OPTIONS 0x00010112 +#define OID_GEN_MAC_OPTIONS 0x00010113 +#define OID_GEN_MEDIA_CONNECT_STATUS 0x00010114 +#define OID_GEN_MAXIMUM_SEND_PACKETS 0x00010115 + +#define OID_802_3_PERMANENT_ADDRESS 0x01010101 +#define OID_802_3_CURRENT_ADDRESS 0x01010102 +#define OID_802_3_MULTICAST_LIST 0x01010103 +#define OID_802_3_MAXIMUM_LIST_SIZE 0x01010104 +#define OID_802_3_MAC_OPTIONS 0x01010105 +#define OID_802_3_RCV_ERROR_ALIGNMENT 0x01020101 +#define OID_802_3_XMIT_ONE_COLLISION 0x01020102 +#define OID_802_3_XMIT_MORE_COLLISIONS 0x01020103 +#define OID_802_3_XMIT_DEFERRED 0x01020201 +#define OID_802_3_XMIT_MAX_COLLISIONS 0x01020202 +#define OID_802_3_RCV_OVERRUN 0x01020203 +#define OID_802_3_XMIT_UNDERRUN 0x01020204 +#define OID_802_3_XMIT_HEARTBEAT_FAILURE 0x01020205 +#define OID_802_3_XMIT_TIMES_CRS_LOST 0x01020206 +#define OID_802_3_XMIT_LATE_COLLISIONS 0x01020207 +#define OID_802_3_ADD_MULTICAST_ADDRESS 0x01010208 +#define OID_802_3_DELETE_MULTICAST_ADDRESS 0x01010209 + +#define OID_802_5_PERMANENT_ADDRESS 0x02010101 +#define OID_802_5_CURRENT_ADDRESS 0x02010102 +#define OID_802_5_CURRENT_FUNCTIONAL 0x02010103 +#define OID_802_5_CURRENT_GROUP 0x02010104 +#define OID_802_5_LAST_OPEN_STATUS 0x02010105 +#define OID_802_5_CURRENT_RING_STATUS 0x02010106 +#define OID_802_5_CURRENT_RING_STATE 0x02010107 +#define OID_802_5_LINE_ERRORS 0x02020101 +#define OID_802_5_LOST_FRAMES 0x02020102 +#define OID_802_5_BURST_ERRORS 0x02020201 +#define OID_802_5_AC_ERRORS 0x02020202 +#define OID_802_5_ABORT_DELIMETERS 0x02020203 +#define OID_802_5_FRAME_COPIED_ERRORS 0x02020204 +#define OID_802_5_FREQUENCY_ERRORS 0x02020205 +#define OID_802_5_TOKEN_ERRORS 0x02020206 +#define OID_802_5_INTERNAL_ERRORS 0x02020207 #define OID_802_11_BSSID 0x0d010101 #define OID_802_11_SSID 0x0d010102

1 0

Nikolay Sivov : d2d1: Use drawing effect at DrawGlyphRun().
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: 90155cb1e16a6956f12c200c54869657df792f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90155cb1e16a6956f12c200c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 26 15:36:18 2016 +0300 d2d1: Use drawing effect at DrawGlyphRun(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 7c8a43f..7cfbdfa 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -32,6 +32,17 @@ struct d2d_draw_text_layout_ctx D2D1_DRAW_TEXT_OPTIONS options; }; +static ID2D1Brush *d2d_draw_get_text_brush(struct d2d_draw_text_layout_ctx *context, IUnknown *effect) +{ + ID2D1Brush *brush = NULL; + + if (effect && SUCCEEDED(IUnknown_QueryInterface(effect, &IID_ID2D1Brush, (void**)&brush))) + return brush; + + ID2D1Brush_AddRef(context->brush); + return context->brush; +} + static void d2d_point_set(D2D1_POINT_2F *dst, float x, float y) { dst->x = x; @@ -1638,6 +1649,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); D2D1_POINT_2F baseline_origin = {baseline_origin_x, baseline_origin_y}; struct d2d_draw_text_layout_ctx *context = ctx; + ID2D1Brush *brush; TRACE("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, " "measuring_mode %#x, glyph_run %p, desc %p, effect %p.\n", @@ -1646,14 +1658,16 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende if (desc) WARN("Ignoring glyph run description %p.\n", desc); - if (effect) - FIXME("Ignoring effect %p.\n", effect); if (context->options & ~D2D1_DRAW_TEXT_OPTIONS_NO_SNAP) FIXME("Ignoring options %#x.\n", context->options); + brush = d2d_draw_get_text_brush(context, effect); + TRACE("%s\n", debugstr_wn(desc->string, desc->stringLength)); ID2D1RenderTarget_DrawGlyphRun(&render_target->ID2D1RenderTarget_iface, - baseline_origin, glyph_run, context->brush, measuring_mode); + baseline_origin, glyph_run, brush, measuring_mode); + + ID2D1Brush_Release(brush); return S_OK; }

1 0