wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Matteo Bruni : makedep: Use an unsigned constant in hash_filename.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 5cb8f0d0dd7684e67069013e57be4b9aa4b4c1c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb8f0d0dd7684e67069013e5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 2 00:53:58 2016 +0100 makedep: Use an unsigned constant in hash_filename. This fixes a "warning: this decimal constant is unsigned only in ISO C90" with gcc 4.9.3. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 298ec04..8cbba1b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -729,7 +729,7 @@ static char *get_line( FILE *file ) static unsigned int hash_filename( const char *name ) { /* FNV-1 hash */ - unsigned int ret = 2166136261; + unsigned int ret = 2166136261u; while (*name) ret = (ret * 16777619) ^ *name++; return ret % HASH_SIZE; }

1 0

Matteo Bruni : opengl32: Move a TRACE to the proper place.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 5c77426d7fdf53d77cde517d34f2f8230d3332ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c77426d7fdf53d77cde517d3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 2 00:50:05 2016 +0100 opengl32: Move a TRACE to the proper place. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/wgl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index f3f78ef..f4601dd 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1769,6 +1769,9 @@ static GLubyte *filter_extensions_list(const char *extensions, const char *disab p = str = HeapAlloc(GetProcessHeap(), 0, strlen(extensions) + 2); if (!str) return NULL; + + TRACE( "GL_EXTENSIONS:\n" ); + for (;;) { while (*extensions == ' ') @@ -1817,6 +1820,9 @@ static GLuint *filter_extensions_index(const char *disabled) disabled_exts = HeapAlloc(GetProcessHeap(), 0, disabled_size * sizeof(*disabled_exts)); if (!disabled_exts) return NULL; + + TRACE( "GL_EXTENSIONS:\n" ); + for (j = 0; j < extensions_count; ++j) { gl_ext = (const char *)funcs->ext.p_glGetStringi(GL_EXTENSIONS, j); @@ -1863,8 +1869,6 @@ static BOOL filter_extensions(const char *extensions, GLubyte **exts_list, GLuin { static const char *disabled; - TRACE( "GL_EXTENSIONS:\n" ); - if (!disabled) { HKEY hkey;

1 0

Jacek Caban : mshtml: Added support for IHTMLDOMAttribute:: nodeValue property on detached attributes.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 6c637ab9c6a65d5601f98545b05f413f777c444e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c637ab9c6a65d5601f98545b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 1 14:31:25 2016 +0100 mshtml: Added support for IHTMLDOMAttribute::nodeValue property on detached attributes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 13 +++++-------- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 885b2aa..97a4ce2 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -83,6 +83,7 @@ static ULONG WINAPI HTMLDOMAttribute_Release(IHTMLDOMAttribute *iface) if(!ref) { assert(!This->elem); release_dispex(&This->dispex); + VariantClear(&This->value); heap_free(This->name); heap_free(This); } @@ -150,10 +151,8 @@ static HRESULT WINAPI HTMLDOMAttribute_put_nodeValue(IHTMLDOMAttribute *iface, V TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - if(!This->elem) { - FIXME("NULL This->elem\n"); - return E_UNEXPECTED; - } + if(!This->elem) + return VariantCopy(&This->value, &v); memset(&ei, 0, sizeof(ei)); @@ -167,10 +166,8 @@ static HRESULT WINAPI HTMLDOMAttribute_get_nodeValue(IHTMLDOMAttribute *iface, V TRACE("(%p)->(%p)\n", This, p); - if(!This->elem) { - FIXME("NULL This->elem\n"); - return E_UNEXPECTED; - } + if(!This->elem) + return VariantCopy(p, &This->value); return get_elem_attr_value_by_dispid(This->elem, This->dispid, 0, p); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f4e6668..36c95ce 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -943,7 +943,9 @@ typedef struct { LONG ref; + /* name and value are valid only for detached attributes (when elem == NULL). */ WCHAR *name; + VARIANT value; HTMLElement *elem; DISPID dispid; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 11e9d27..15a3027 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4790,6 +4790,7 @@ static void _get_attr_node_value(unsigned line, IHTMLDOMAttribute *attr, VARIANT { HRESULT hres; + V_VT(v) = VT_EMPTY; hres = IHTMLDOMAttribute_get_nodeValue(attr, v); ok_(__FILE__,line) (hres == S_OK, "get_nodeValue failed: %08x\n", hres); ok_(__FILE__,line) (V_VT(v) == vt, "vt=%d, expected %d\n", V_VT(v), vt); @@ -8914,6 +8915,8 @@ static void test_create_elems(IHTMLDocument2 *doc) ok(hres == S_OK, "createAttribute dailed: %08x\n", hres); SysFreeString(str); if(SUCCEEDED(hres)) { + VARIANT v; + test_disp((IUnknown*)attr, &DIID_DispHTMLDOMAttribute, "[object]"); test_ifaces((IUnknown*)attr, attr_iids); test_no_iface((IUnknown*)attr, &IID_IHTMLDOMNode); @@ -8921,6 +8924,19 @@ static void test_create_elems(IHTMLDocument2 *doc) test_attr_node_name(attr, "Test"); test_attr_expando(attr, VARIANT_FALSE); + get_attr_node_value(attr, &v, VT_EMPTY); + + V_VT(&v) = VT_I4; + V_I4(&v) = 1; + put_attr_node_value(attr, v); + + get_attr_node_value(attr, &v, VT_I4); + ok(V_I4(&v) == 1, "nodeValue = %d\n", V_I4(&v)); + + V_VT(&v) = VT_EMPTY; + put_attr_node_value(attr, v); + get_attr_node_value(attr, &v, VT_EMPTY); + IHTMLDOMAttribute_Release(attr); }

1 0

Jacek Caban : mshtml: Always return false in IHTMLDOMAttribute2:: get_expando for detached attributes.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 4e9324c43e639b50edfe614fbec0697c86f7b8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e9324c43e639b50edfe614fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 1 14:28:52 2016 +0100 mshtml: Always return false in IHTMLDOMAttribute2::get_expando for detached attributes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 2 +- dlls/mshtml/tests/dom.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 446cb6f..885b2aa 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -335,7 +335,7 @@ static HRESULT WINAPI HTMLDOMAttribute2_get_expando(IHTMLDOMAttribute2 *iface, V TRACE("(%p)->(%p)\n", This, p); - *p = get_dispid_type(This->dispid) == DISPEXPROP_BUILTIN ? VARIANT_FALSE : VARIANT_TRUE; + *p = !This->elem || get_dispid_type(This->dispid) == DISPEXPROP_BUILTIN ? VARIANT_FALSE : VARIANT_TRUE; return S_OK; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e27339a..11e9d27 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -8919,6 +8919,7 @@ static void test_create_elems(IHTMLDocument2 *doc) test_no_iface((IUnknown*)attr, &IID_IHTMLDOMNode); test_attr_node_name(attr, "Test"); + test_attr_expando(attr, VARIANT_FALSE); IHTMLDOMAttribute_Release(attr); }

1 0

Hugh McMaster : advapi32/tests: Add tests for deleting the default value.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 50c5a2ce2e5122d8d00759e0d7926829571a4395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c5a2ce2e5122d8d00759e0d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 1 22:23:47 2016 +1100 advapi32/tests: Add tests for deleting the default value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 5bc129c..d37042f 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3326,6 +3326,19 @@ static void test_delete_value(void) res = RegDeleteValueA( hkey_main, longname ); ok(res == ERROR_FILE_NOT_FOUND || broken(res == ERROR_MORE_DATA), /* nt4, win2k */ "expect ERROR_FILE_NOT_FOUND, got %i\n", res); + + /* Default registry value */ + res = RegSetValueExA(hkey_main, "", 0, REG_SZ, (const BYTE *)"value", 6); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res); + + res = RegQueryValueExA(hkey_main, "", NULL, NULL, NULL, NULL); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res); + + res = RegDeleteValueA(hkey_main, "" ); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res); + + res = RegQueryValueExA(hkey_main, "", NULL, NULL, NULL, NULL); + ok(res == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", res); } static void test_delete_key_value(void) @@ -3374,6 +3387,19 @@ static void test_delete_key_value(void) ret = RegQueryValueExA(subkey, "test", NULL, NULL, NULL, NULL); ok(ret == ERROR_FILE_NOT_FOUND, "got %d\n", ret); + /* Default registry value */ + ret = RegSetValueExA(subkey, "", 0, REG_SZ, (const BYTE *)"value", 6); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + + ret = RegQueryValueExA(subkey, "", NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + + ret = pRegDeleteKeyValueA(hkey_main, "Subkey1", "" ); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + + ret = RegQueryValueExA(subkey, "", NULL, NULL, NULL, NULL); + ok(ret == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", ret); + RegDeleteKeyA(subkey, ""); RegCloseKey(subkey); }

1 0

Hugh McMaster : advapi32/tests: Fix typos.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 80383dcf3905925a5f1d66a73c3272432c2ef035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80383dcf3905925a5f1d66a73… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 1 22:23:46 2016 +1100 advapi32/tests: Fix typos. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 4b3b4e9..5bc129c 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2205,7 +2205,7 @@ static void test_reg_delete_tree(void) "subkey2 was not deleted\n"); size = MAX_PATH; ok(!RegQueryValueA(subkey, NULL, buffer, &size), - "Default value of subkey not longer present\n"); + "Default value of subkey no longer present\n"); ret = RegCreateKeyA(subkey, "subkey2", &subkey2); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); @@ -2216,7 +2216,7 @@ static void test_reg_delete_tree(void) ok(RegOpenKeyA(subkey, "subkey2", &subkey2), "subkey2 was not deleted\n"); ok(!RegQueryValueA(subkey, NULL, buffer, &size), - "Default value of subkey not longer present\n"); + "Default value of subkey no longer present\n"); ret = RegCreateKeyA(subkey, "subkey2", &subkey2); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);

1 0

Józef Kucia : d3d10core/tests: Introduce check_texture_color().
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 3ab957d19c2208c001c26e8b18d53c1bcdfe9264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab957d19c2208c001c26e8b1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 29 18:35:51 2016 +0100 d3d10core/tests: Introduce check_texture_color(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 71 ++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8a3fbc7..11f9c73 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -89,6 +89,7 @@ struct texture_readback { ID3D10Texture2D *texture; D3D10_MAPPED_TEXTURE2D mapped_texture; + unsigned int width, height; }; static void get_texture_readback(ID3D10Texture2D *texture, struct texture_readback *rb) @@ -113,6 +114,9 @@ static void get_texture_readback(ID3D10Texture2D *texture, struct texture_readba return; } + rb->width = texture_desc.Width; + rb->height = texture_desc.Height; + ID3D10Device_CopyResource(device, (ID3D10Resource *)rb->texture, (ID3D10Resource *)texture); if (FAILED(hr = ID3D10Texture2D_Map(rb->texture, 0, D3D10_MAP_READ, 0, &rb->mapped_texture))) { @@ -151,6 +155,35 @@ static DWORD get_texture_color(ID3D10Texture2D *texture, unsigned int x, unsigne return color; } +#define check_texture_color(t, c, d) check_texture_color_(__LINE__, t, c, d) +static void check_texture_color_(unsigned int line, ID3D10Texture2D *texture, + DWORD expected_color, BYTE max_diff) +{ + struct texture_readback rb; + unsigned int x = 0, y = 0; + BOOL all_match = TRUE; + DWORD color = 0; + + get_texture_readback(texture, &rb); + for (y = 0; y < rb.height; ++y) + { + for (x = 0; x < rb.width; ++x) + { + color = get_readback_color(&rb, x, y); + if (!compare_color(color, expected_color, max_diff)) + { + all_match = FALSE; + break; + } + } + if (!all_match) + break; + } + release_texture_readback(&rb); + ok_(__FILE__, line)(all_match, + "Got unexpected color 0x%08x at (%u, %u).\n", color, x, y); +} + static ID3D10Device *create_device(void) { ID3D10Device *device; @@ -2103,8 +2136,7 @@ static void test_scissor(void) ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); ID3D10Device_ClearRenderTargetView(device, rtv, red); - color = get_texture_color(backbuffer, 320, 240); - ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); + check_texture_color(backbuffer, 0xff0000ff, 1); ID3D10Device_Draw(device, 4, 0); color = get_texture_color(backbuffer, 320, 60); @@ -4743,19 +4775,10 @@ static void test_update_subresource(void) ID3D10Device_RSSetViewports(device, 1, &vp); ID3D10Device_ClearRenderTargetView(device, backbuffer_rtv, red); + check_texture_color(backbuffer, 0x7f0000ff, 1); ID3D10Device_Draw(device, 4, 0); - get_texture_readback(backbuffer, &rb); - for (i = 0; i < 4; ++i) - { - for (j = 0; j < 4; ++j) - { - color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120); - ok(compare_color(color, 0x00000000, 0), - "Got unexpected color 0x%08x at (%u, %u).\n", color, j, i); - } - } - release_texture_readback(&rb); + check_texture_color(backbuffer, 0x00000000, 0); set_box(&box, 1, 1, 0, 3, 3, 1); ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)texture, 0, &box, @@ -5090,11 +5113,7 @@ static void test_multisample_init(void) ID3D10Texture2D *backbuffer, *multi; ID3D10Device *device; ULONG refcount; - DWORD color; HRESULT hr; - unsigned int x, y; - struct texture_readback rb; - BOOL all_zero = TRUE; UINT count = 0; HWND window; IDXGISwapChain *swapchain; @@ -5141,23 +5160,7 @@ static void test_multisample_init(void) ID3D10Device_ResolveSubresource(device, (ID3D10Resource *)backbuffer, 0, (ID3D10Resource *)multi, 0, DXGI_FORMAT_R8G8B8A8_UNORM); - get_texture_readback(backbuffer, &rb); - for (y = 0; y < 480; ++y) - { - for (x = 0; x < 640; ++x) - { - color = get_readback_color(&rb, x, y); - if (!compare_color(color, 0x00000000, 0)) - { - all_zero = FALSE; - break; - } - } - if (!all_zero) - break; - } - release_texture_readback(&rb); - todo_wine ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); + todo_wine check_texture_color(backbuffer, 0x00000000, 0); ID3D10RenderTargetView_Release(rtview); ID3D10Texture2D_Release(backbuffer);

1 0

Józef Kucia : d3d10core/tests: Port test_create_typeless_resource() from d3d11.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 7244ad3c72570e39ee0a57400f3d40fc0629e73c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7244ad3c72570e39ee0a57400… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 29 18:35:47 2016 +0100 d3d10core/tests: Port test_create_typeless_resource() from d3d11. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 103 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 25f22c2..8a3fbc7 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -5744,6 +5744,108 @@ static void test_swapchain_flip(void) DestroyWindow(window); } +static void test_create_typeless_resource(void) +{ + D3D10_TEXTURE2D_DESC texture2d_desc; + D3D10_TEXTURE3D_DESC texture3d_desc; + ID3D10Resource *resource; + ID3D10Device *device; + ULONG refcount; + unsigned int i; + HRESULT hr; + + static const struct + { + DXGI_FORMAT format; + D3D10_BIND_FLAG bind_flags; + D3D10_RESOURCE_DIMENSION type; + BOOL succeeds; + BOOL todo; + } + tests[] = + { + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_VERTEX_BUFFER, D3D10_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_INDEX_BUFFER, D3D10_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_CONSTANT_BUFFER, D3D10_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE3D, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_RENDER_TARGET, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_DEPTH_STENCIL, D3D10_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE3D, TRUE, FALSE}, + {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D10_BIND_RENDER_TARGET, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R32G32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R32G8X24_TYPELESS, D3D10_BIND_DEPTH_STENCIL, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, TRUE}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE3D, TRUE, FALSE}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D10_BIND_RENDER_TARGET, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_VERTEX_BUFFER, D3D10_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_INDEX_BUFFER, D3D10_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_CONSTANT_BUFFER, D3D10_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_DEPTH_STENCIL, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R8G8_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R16_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R8_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + }; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + texture2d_desc.Width = 512; + texture2d_desc.Height = 512; + texture2d_desc.MipLevels = 1; + texture2d_desc.ArraySize = 1; + texture2d_desc.SampleDesc.Count = 1; + texture2d_desc.SampleDesc.Quality = 0; + texture2d_desc.Usage = D3D10_USAGE_DEFAULT; + texture2d_desc.CPUAccessFlags = 0; + texture2d_desc.MiscFlags = 0; + + texture3d_desc.Width = 64; + texture3d_desc.Height = 64; + texture3d_desc.Depth = 64; + texture3d_desc.MipLevels = 1; + texture3d_desc.Usage = D3D10_USAGE_DEFAULT; + texture3d_desc.CPUAccessFlags = 0; + texture3d_desc.MiscFlags = 0; + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + if (tests[i].type == D3D10_RESOURCE_DIMENSION_TEXTURE2D) + { + texture2d_desc.Format = tests[i].format; + texture2d_desc.BindFlags = tests[i].bind_flags; + hr = ID3D10Device_CreateTexture2D(device, &texture2d_desc, NULL, (ID3D10Texture2D **)&resource); + } + else if (tests[i].type == D3D10_RESOURCE_DIMENSION_TEXTURE3D) + { + texture3d_desc.Format = tests[i].format; + texture3d_desc.BindFlags = tests[i].bind_flags; + hr = ID3D10Device_CreateTexture3D(device, &texture3d_desc, NULL, (ID3D10Texture3D **)&resource); + } + else + { + trace("Test %u: Unknown resource type %#x.\n", i, tests[i].type); + continue; + } + + todo_wine_if(tests[i].todo) + ok(hr == (tests[i].succeeds ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); + + if (SUCCEEDED(hr)) + ID3D10Resource_Release(resource); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_feature_level(); @@ -5776,4 +5878,5 @@ START_TEST(device) test_check_multisample_quality_levels(); test_cb_relative_addressing(); test_swapchain_flip(); + test_create_typeless_resource(); }

1 0

Nikolay Sivov : gdi32: Use a macro instead of accessing FT_Face flags directly.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 4b05cac3911300f604d3a7674b723a91111fabec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b05cac3911300f604d3a7674… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 1 07:49:52 2016 +0300 gdi32: Use a macro instead of accessing FT_Face flags directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 01cb913..184e1d3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7458,7 +7458,7 @@ static BOOL get_bitmap_text_metrics(GdiFont *font) TM.tmUnderlined = font->underline; TM.tmStruckOut = font->strikeout; /* NB inverted meaning of TMPF_FIXED_PITCH */ - TM.tmPitchAndFamily = ft_face->face_flags & FT_FACE_FLAG_FIXED_WIDTH ? 0 : TMPF_FIXED_PITCH; + TM.tmPitchAndFamily = FT_IS_FIXED_WIDTH(ft_face) ? 0 : TMPF_FIXED_PITCH; TM.tmCharSet = font->charset; } #undef TM

1 0

Nikolay Sivov : include: Fix IsBad* prototypes.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: cd220569ddd1a43ade05a04d76f372ee6937e97e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd220569ddd1a43ade05a04d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 1 11:53:31 2016 +0300 include: Fix IsBad* prototypes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/virtual.c | 16 ++++++++-------- include/winbase.h | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 4bfc6cc..cce707b 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -647,7 +647,7 @@ UINT WINAPI ResetWriteWatch( LPVOID base, SIZE_T size ) * Success: TRUE. * Failure: FALSE. Process has read access to entire block. */ -BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size ) +BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT_PTR size ) { if (!size) return FALSE; /* handle 0 size case w/o reference */ if (!ptr) return TRUE; @@ -655,7 +655,7 @@ BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size ) { volatile const char *p = ptr; char dummy __attribute__((unused)); - UINT count = size; + UINT_PTR count = size; while (count > system_info.PageSize) { @@ -689,14 +689,14 @@ BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size ) * Success: TRUE. * Failure: FALSE. Process has write access to entire block. */ -BOOL WINAPI IsBadWritePtr( LPVOID ptr, UINT size ) +BOOL WINAPI IsBadWritePtr( LPVOID ptr, UINT_PTR size ) { if (!size) return FALSE; /* handle 0 size case w/o reference */ if (!ptr) return TRUE; __TRY { volatile char *p = ptr; - UINT count = size; + UINT_PTR count = size; while (count > system_info.PageSize) { @@ -730,7 +730,7 @@ BOOL WINAPI IsBadWritePtr( LPVOID ptr, UINT size ) * Success: TRUE. * Failure: FALSE. Process has read access to entire block. */ -BOOL WINAPI IsBadHugeReadPtr( LPCVOID ptr, UINT size ) +BOOL WINAPI IsBadHugeReadPtr( LPCVOID ptr, UINT_PTR size ) { return IsBadReadPtr( ptr, size ); } @@ -749,7 +749,7 @@ BOOL WINAPI IsBadHugeReadPtr( LPCVOID ptr, UINT size ) * Success: TRUE. * Failure: FALSE. Process has write access to entire block. */ -BOOL WINAPI IsBadHugeWritePtr( LPVOID ptr, UINT size ) +BOOL WINAPI IsBadHugeWritePtr( LPVOID ptr, UINT_PTR size ) { return IsBadWritePtr( ptr, size ); } @@ -786,7 +786,7 @@ BOOL WINAPI IsBadCodePtr( FARPROC ptr ) * Success: TRUE. * Failure: FALSE. Read access to all bytes in string. */ -BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT max ) +BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) { if (!str) return TRUE; @@ -810,7 +810,7 @@ BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT max ) * * See IsBadStringPtrA. */ -BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT max ) +BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) { if (!str) return TRUE; diff --git a/include/winbase.h b/include/winbase.h index 89f27c9..15edac3 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2236,13 +2236,13 @@ WINBASEAPI PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ENTRY); WINBASEAPI BOOL WINAPI IsBadCodePtr(FARPROC); -WINBASEAPI BOOL WINAPI IsBadHugeReadPtr(LPCVOID,UINT); -WINBASEAPI BOOL WINAPI IsBadHugeWritePtr(LPVOID,UINT); -WINBASEAPI BOOL WINAPI IsBadReadPtr(LPCVOID,UINT); -WINBASEAPI BOOL WINAPI IsBadStringPtrA(LPCSTR,UINT); -WINBASEAPI BOOL WINAPI IsBadStringPtrW(LPCWSTR,UINT); +WINBASEAPI BOOL WINAPI IsBadHugeReadPtr(LPCVOID,UINT_PTR); +WINBASEAPI BOOL WINAPI IsBadHugeWritePtr(LPVOID,UINT_PTR); +WINBASEAPI BOOL WINAPI IsBadReadPtr(LPCVOID,UINT_PTR); +WINBASEAPI BOOL WINAPI IsBadStringPtrA(LPCSTR,UINT_PTR); +WINBASEAPI BOOL WINAPI IsBadStringPtrW(LPCWSTR,UINT_PTR); #define IsBadStringPtr WINELIB_NAME_AW(IsBadStringPtr) -WINBASEAPI BOOL WINAPI IsBadWritePtr(LPVOID,UINT); +WINBASEAPI BOOL WINAPI IsBadWritePtr(LPVOID,UINT_PTR); WINBASEAPI BOOL WINAPI IsDebuggerPresent(void); WINBASEAPI BOOL WINAPI IsSystemResumeAutomatic(void); WINADVAPI BOOL WINAPI IsTextUnicode(LPCVOID,INT,LPINT);

1 0

Jump to page:

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-commits March 2016