February 2016 - Wine-Commits

Józef Kucia : d3d11/tests: Test creation of level_9_* shaders.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 4aaf13359c57e25dec5ccf95bc6cb83cffacb7c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aaf13359c57e25dec5ccf95b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 12 01:27:45 2016 +0100 d3d11/tests: Test creation of level_9_* shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0a36186..00b3d18 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1632,6 +1632,51 @@ static void test_create_shader(void) 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; + static const DWORD ps_4_0_level_9_0[] = + { + 0x43425844, 0xbc6626e7, 0x7778dc9d, 0xc8a43be2, 0xe4b53f7a, 0x00000001, 0x00000170, + 0x00000005, 0x00000034, 0x00000080, 0x000000cc, 0x0000010c, 0x0000013c, 0x53414e58, + 0x00000044, 0x00000044, 0xffff0200, 0x00000020, 0x00000024, 0x00240000, 0x00240000, + 0x00240000, 0x00240000, 0x00240000, 0xffff0200, 0x0200001f, 0x80000000, 0xb00f0000, + 0x02000001, 0x800f0800, 0x80e40000, 0x0000ffff, 0x396e6f41, 0x00000044, 0x00000044, + 0xffff0200, 0x00000020, 0x00000024, 0x00240000, 0x00240000, 0x00240000, 0x00240000, + 0x00240000, 0xffff0200, 0x0200001f, 0x80000000, 0xb00f0000, 0x02000001, 0x800f0800, + 0xb0e40000, 0x0000ffff, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, 0x03001062, + 0x001010f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, 0x4e475349, 0x00000028, 0x00000001, + 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, + 0x4f4c4f43, 0xabab0052, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, + 0xabab0054, + }; + static const DWORD ps_4_0_level_9_1[] = + { + 0x43425844, 0x275ecf38, 0x4349ff01, 0xa6b0e324, 0x6e54a4fc, 0x00000001, 0x00000120, + 0x00000004, 0x00000030, 0x0000007c, 0x000000bc, 0x000000ec, 0x396e6f41, 0x00000044, + 0x00000044, 0xffff0200, 0x00000020, 0x00000024, 0x00240000, 0x00240000, 0x00240000, + 0x00240000, 0x00240000, 0xffff0200, 0x0200001f, 0x80000000, 0xb00f0000, 0x02000001, + 0x800f0800, 0xb0e40000, 0x0000ffff, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x03001062, 0x001010f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, 0x4e475349, 0x00000028, + 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x00000f0f, 0x4f4c4f43, 0xabab0052, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, + 0x45475241, 0xabab0054, + }; + static const DWORD ps_4_0_level_9_3[] = + { + 0x43425844, 0xc7d541c4, 0x961d4e0e, 0x9ce7ec57, 0x70f47dcb, 0x00000001, 0x00000120, + 0x00000004, 0x00000030, 0x0000007c, 0x000000bc, 0x000000ec, 0x396e6f41, 0x00000044, + 0x00000044, 0xffff0200, 0x00000020, 0x00000024, 0x00240000, 0x00240000, 0x00240000, + 0x00240000, 0x00240000, 0xffff0201, 0x0200001f, 0x80000000, 0xb00f0000, 0x02000001, + 0x800f0800, 0xb0e40000, 0x0000ffff, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x03001062, 0x001010f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, 0x4e475349, 0x00000028, + 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x00000f0f, 0x4f4c4f43, 0xabab0052, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, + 0x45475241, 0xabab0054, + }; #if 0 struct gs_out @@ -1695,6 +1740,19 @@ static void test_create_shader(void) continue; } + /* level_9 shaders */ + hr = ID3D11Device_CreatePixelShader(device, ps_4_0_level_9_0, sizeof(ps_4_0_level_9_0), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_0 shader, hr %#x, feature level %#x.\n", hr, feature_level); + ID3D11PixelShader_Release(ps); + + hr = ID3D11Device_CreatePixelShader(device, ps_4_0_level_9_1, sizeof(ps_4_0_level_9_1), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_1 shader, hr %#x, feature level %#x.\n", hr, feature_level); + ID3D11PixelShader_Release(ps); + + hr = ID3D11Device_CreatePixelShader(device, ps_4_0_level_9_3, sizeof(ps_4_0_level_9_3), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_3 shader, hr %#x, feature level %#x.\n", hr, feature_level); + ID3D11PixelShader_Release(ps); + /* vertex shader */ hr = ID3D11Device_CreateVertexShader(device, vs_2_0, sizeof(vs_2_0), NULL, &vs); ok(hr == E_INVALIDARG, "Created a SM2 vertex shader, hr %#x, feature level %#x.\n", hr, feature_level);

1 0

Józef Kucia : d3d11: Extract SM5 shader code from DXBC.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 6ef3324fd85853c451bb4b37bc7013805f39e2a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef3324fd85853c451bb4b37b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 12 01:27:44 2016 +0100 d3d11: Extract SM5 shader code from DXBC. 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/d3d11/d3d11_private.h | 1 + dlls/d3d11/shader.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 873e17d..9d5fd8f 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -44,6 +44,7 @@ #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') +#define TAG_SHEX MAKE_TAG('S', 'H', 'E', 'X') struct d3d_device; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index fb4c15c..0e277fc 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -42,6 +42,8 @@ static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void * break; case TAG_SHDR: + case TAG_SHEX: + if (shader_info->shader_code) FIXME("Multiple SHDR/SHEX chunks.\n"); shader_info->shader_code = (const DWORD *)data; break;

1 0

Józef Kucia : d3d11: Do not generate ERR messages for unrecognized shader bytecode.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: b9f1b0fff82003205b8b698c5551a7c3649cd4c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f1b0fff82003205b8b698c5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 12 01:27:43 2016 +0100 d3d11: Do not generate ERR messages for unrecognized shader bytecode. 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/d3d11/shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index c645b0b..fb4c15c 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -66,7 +66,7 @@ static HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, st if (FAILED(hr)) { - ERR("Failed to parse shader, hr %#x\n", hr); + FIXME("Failed to parse shader, hr %#x.\n", hr); shader_free_signature(shader_info->input_signature); shader_free_signature(shader_info->output_signature); } @@ -378,7 +378,7 @@ static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d shader_info.output_signature = &output_signature; if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info))) { - ERR("Failed to extract shader, hr %#x.\n", hr); + WARN("Failed to extract shader, hr %#x.\n", hr); wined3d_private_store_cleanup(&shader->private_store); wined3d_mutex_unlock(); return hr; @@ -697,7 +697,7 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, stru shader_info.output_signature = &output_signature; if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info))) { - ERR("Failed to extract shader, hr %#x.\n", hr); + WARN("Failed to extract shader, hr %#x.\n", hr); wined3d_private_store_cleanup(&shader->private_store); wined3d_mutex_unlock(); return hr; @@ -1023,7 +1023,7 @@ static HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d shader_info.output_signature = &output_signature; if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info))) { - ERR("Failed to extract shader, hr %#x.\n", hr); + WARN("Failed to extract shader, hr %#x.\n", hr); wined3d_private_store_cleanup(&shader->private_store); wined3d_mutex_unlock(); return hr;

1 0

Matteo Bruni : wined3d: Mark a couple of unimplemented relative addressing cases with FIXMEs.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 24d937b61818c8b68d9e23a0190bc2826853e760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24d937b61818c8b68d9e23a01… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 11 16:10:48 2016 +0100 wined3d: Mark a couple of unimplemented relative addressing cases with FIXMEs. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1b82858..a2ce187 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2164,10 +2164,12 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_INPUT: - /* vertex shaders */ if (version->type == WINED3D_SHADER_TYPE_VERTEX) { struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + + if (reg->idx[0].rel_addr) + FIXME("VS3+ input registers relative addressing.\n"); if (priv->cur_vs_args->swizzle_map & (1u << reg->idx[0].offset)) *is_color = TRUE; sprintf(register_name, "%s_in%u", prefix, reg->idx[0].offset); @@ -2318,6 +2320,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_TEXCRDOUT: /* Vertex shaders >= 3.0: WINED3DSPR_OUTPUT */ + if (reg->idx[0].rel_addr) + FIXME("VS3 output registers relative addressing.\n"); sprintf(register_name, "%s_out[%u]", prefix, reg->idx[0].offset); break;

1 0

Matteo Bruni : wined3d: Add WINED3DFMT_FLAG_RENDERTARGET to WINED3DFMT_B5G5R5X1_UNORM.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 1061969eb6e291566591f37a5ea5e48af3a48297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1061969eb6e291566591f37a5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 11 16:10:46 2016 +0100 wined3d: Add WINED3DFMT_FLAG_RENDERTARGET to WINED3DFMT_B5G5R5X1_UNORM. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dae30c1..b52b967 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1133,7 +1133,8 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_ES2_COMPATIBILITY, NULL}, {WINED3DFMT_B5G5R5X1_UNORM, GL_RGB5, GL_RGB5, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B5G5R5A1_UNORM, GL_RGB5_A1, GL_RGB5_A1, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 0,

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in read_from_framebuffer().
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: d3936190928f3da61e843eac032f17d978d14f9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3936190928f3da61e843eac0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 11:06:05 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in read_from_framebuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 45cefca..c63b680 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2467,6 +2467,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info; struct wined3d_context *context = old_ctx; struct wined3d_surface *restore_rt = NULL; + unsigned int row_pitch, slice_pitch; BYTE *mem; BYTE *row, *top, *bottom; int i; @@ -2512,9 +2513,10 @@ static void read_from_framebuffer(struct wined3d_surface *surface, checkGLcall("glBindBuffer"); } + wined3d_texture_get_pitch(surface->container, surface->texture_level, &row_pitch, &slice_pitch); + /* Setup pixel store pack state -- to glReadPixels into the correct place */ - gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, - wined3d_surface_get_pitch(surface) / surface->resource.format->byte_count); + gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, row_pitch / surface->resource.format->byte_count); checkGLcall("glPixelStorei"); gl_info->gl_ops.gl.p_glReadPixels(0, 0, @@ -2529,11 +2531,10 @@ static void read_from_framebuffer(struct wined3d_surface *surface, if (!srcIsUpsideDown) { - /* glReadPixels returns the image upside down, and there is no way to prevent this. - * Flip the lines in software. */ - UINT pitch = wined3d_surface_get_pitch(surface); + /* glReadPixels returns the image upside down, and there is no way to + * prevent this. Flip the lines in software. */ - if (!(row = HeapAlloc(GetProcessHeap(), 0, pitch))) + if (!(row = HeapAlloc(GetProcessHeap(), 0, row_pitch))) goto error; if (data.buffer_object) @@ -2545,14 +2546,14 @@ static void read_from_framebuffer(struct wined3d_surface *surface, mem = data.addr; top = mem; - bottom = mem + pitch * (surface->resource.height - 1); + bottom = mem + row_pitch * (surface->resource.height - 1); for (i = 0; i < surface->resource.height / 2; i++) { - memcpy(row, top, pitch); - memcpy(top, bottom, pitch); - memcpy(bottom, row, pitch); - top += pitch; - bottom -= pitch; + memcpy(row, top, row_pitch); + memcpy(top, bottom, row_pitch); + memcpy(bottom, row, row_pitch); + top += row_pitch; + bottom -= row_pitch; } HeapFree(GetProcessHeap(), 0, row);

1 0

Alistair Leslie-Hughes : include: Add IColumnsInfo interface.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 0f8a0fd4002f9d5d1cb6dadcb81ef430d8be21b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f8a0fd4002f9d5d1cb6dadcb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 12 15:12:35 2016 +0300 include: Add IColumnsInfo interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 30 +++++++++++++++++++++++++ include/Makefile.in | 1 + include/colinf.idl | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ include/dbs.idl | 28 ++++++++++++++++++++++++ include/oledb.idl | 1 + 5 files changed, 117 insertions(+) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 1243e48..ef0163a 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1513,3 +1513,33 @@ HRESULT CALLBACK IChapteredRowset_ReleaseChapter_Proxy(IChapteredRowset* This, H FIXME("(%p)->(%lx %p): stub\n", This, chapter, refcount); return E_NOTIMPL; } + +HRESULT CALLBACK IColumnsInfo_GetColumnInfo_Proxy(IColumnsInfo* This, DBORDINAL *columns, + DBCOLUMNINFO **colinfo, OLECHAR **stringsbuffer) +{ + FIXME("(%p)->(%p %p %p): stub\n", This, columns, colinfo, stringsbuffer); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IColumnsInfo_GetColumnInfo_Stub(IColumnsInfo* This, DBORDINAL *columns, DBCOLUMNINFO **col_info, + DBBYTEOFFSET **name_offsets, DBBYTEOFFSET **columnid_offsets, DBLENGTH *string_len, OLECHAR **stringsbuffer, + IErrorInfo **error) +{ + FIXME("(%p)->(%p %p %p %p %p %p %p): stub\n", This, columns, col_info, name_offsets, columnid_offsets, + string_len, stringsbuffer, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK IColumnsInfo_MapColumnIDs_Proxy(IColumnsInfo* This, DBORDINAL column_ids, const DBID *dbids, + DBORDINAL *columns) +{ + FIXME("(%p)->(%lu %p %p): stub\n", This, column_ids, dbids, columns); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IColumnsInfo_MapColumnIDs_Stub(IColumnsInfo* This, DBORDINAL column_ids, const DBID *dbids, + DBORDINAL *columns, IErrorInfo **error) +{ + FIXME("(%p)->(%lu %p %p %p): stub\n", This, column_ids, dbids, columns, error); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 129ff6d..010abe5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -24,6 +24,7 @@ IDL_SRCS = \ chprst.idl \ cmdbas.idl \ cmdtxt.idl \ + colinf.idl \ comcat.idl \ commoncontrols.idl \ control.idl \ diff --git a/include/colinf.idl b/include/colinf.idl new file mode 100644 index 0000000..0517153 --- /dev/null +++ b/include/colinf.idl @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2016 Alistair Leslie-Hughes + * + * 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 + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a11-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IColumnsInfo : IUnknown +{ + [local] + HRESULT GetColumnInfo( + [in, out] DBORDINAL *columns, + [out, size_is(,(ULONG)*columns)] DBCOLUMNINFO **colinfo, + [out] OLECHAR **stringsbuffer); + + [call_as(GetColumnInfo)] + HRESULT RemoteGetColumnInfo([in, out] DBORDINAL *columns, + [out, size_is(,(ULONG)*columns)] DBCOLUMNINFO **colinfo, + [out, size_is(,(ULONG)*columns)] DBBYTEOFFSET **name_offsets, + [out, size_is(,(ULONG)*columns)] DBBYTEOFFSET **columnid_offsets, + [in, out] DBLENGTH *string_len, + [in, out, unique, size_is(,(ULONG)*string_len)] OLECHAR **stringsbuffer, + [out] IErrorInfo **errorinfo); + + [local] + HRESULT MapColumnIDs( + [in] DBORDINAL column_ids, + [in, size_is((ULONG)column_ids)] const DBID *dbids, + [out, size_is((ULONG)column_ids)] DBORDINAL *columns); + + [call_as(MapColumnIDs)] + HRESULT RemoteMapColumnIDs( + [in] DBORDINAL column_ids, + [in, size_is((ULONG)column_ids)] const DBID *dbids, + [out, size_is((ULONG)column_ids)] DBORDINAL *columns, + [out] IErrorInfo **errorinfo); +} diff --git a/include/dbs.idl b/include/dbs.idl index 2c46c2b..00e16f9 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -733,3 +733,31 @@ enum DBREASONENUM15 { DBREASON_ROWPOSITION_CLEARED, DBREASON_ROW_ASYNCHINSERT }; + +typedef DWORD DBCOLUMNFLAGS; + +enum DBCOLUMNFLAGSENUM { + DBCOLUMNFLAGS_ISBOOKMARK = 0x0001, + DBCOLUMNFLAGS_MAYDEFER = 0x0002, + DBCOLUMNFLAGS_WRITE = 0x0004, + DBCOLUMNFLAGS_WRITEUNKNOWN = 0x0008, + DBCOLUMNFLAGS_ISFIXEDLENGTH = 0x0010, + DBCOLUMNFLAGS_ISNULLABLE = 0x0020, + DBCOLUMNFLAGS_MAYBENULL = 0x0040, + DBCOLUMNFLAGS_ISLONG = 0x0080, + DBCOLUMNFLAGS_ISROWID = 0x0100, + DBCOLUMNFLAGS_ISROWVER = 0x0200, + DBCOLUMNFLAGS_CACHEDEFERRED = 0x1000 +}; + +typedef struct tagDBCOLUMNINFO { + LPOLESTR pwszName; + ITypeInfo *pTypeInfo; + DBORDINAL iOrdinal; + DBCOLUMNFLAGS dwFlags; + DBLENGTH ulColumnSize; + DBTYPE wType; + BYTE bPrecision; + BYTE bScale; + DBID columnid; +} DBCOLUMNINFO; diff --git a/include/oledb.idl b/include/oledb.idl index 8d7f001..537bb21 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -50,6 +50,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "chprst.idl" #include "cmdbas.idl" #include "cmdtxt.idl" +#include "colinf.idl" #include "dbccmd.idl" #include "dbcses.idl" #include "srcrst.idl"

1 0

Alexandre Julliard : ntdll/tests: Add some tests for opening objects through symlinks.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 14c3f703dd6fe54b48fb4db3af28268a10bb2d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=14c3f703dd6fe54b48fb4db3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 12 20:36:29 2016 +0900 ntdll/tests: Add some tests for opening objects through symlinks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 2e0e490..c05f31d 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -177,6 +177,16 @@ static void test_namespace_pipe(void) status == STATUS_OBJECT_NAME_INVALID, /* vista */ "NtOpenFile should have failed with STATUS_OBJECT_NAME_NOT_FOUND got(%08x)\n", status); + str.Length -= 4 * sizeof(WCHAR); + status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0); + ok(status == STATUS_SUCCESS, "NtOpenFile should have succeeded got %08x\n", status); + pNtClose( h ); + + str.Length -= sizeof(WCHAR); + status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0); + ok(status == STATUS_SUCCESS, "NtOpenFile should have succeeded got %08x\n", status); + pNtClose( h ); + pNtClose(pipe); } @@ -437,13 +447,14 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr, static void test_name_limits(void) { + static const WCHAR localW[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s','\\','L','o','c','a','l',0}; static const WCHAR pipeW[] = {'\\','D','e','v','i','c','e','\\','N','a','m','e','d','P','i','p','e','\\'}; static const WCHAR mailslotW[] = {'\\','D','e','v','i','c','e','\\','M','a','i','l','S','l','o','t','\\'}; static const WCHAR registryW[] = {'\\','R','E','G','I','S','T','R','Y','\\','M','a','c','h','i','n','e','\\','S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\'}; OBJECT_ATTRIBUTES attr, attr2, attr3; IO_STATUS_BLOCK iosb; LARGE_INTEGER size, timeout; - UNICODE_STRING str, target; + UNICODE_STRING str, str2, target; NTSTATUS status; HANDLE ret, ret2; DWORD i; @@ -582,6 +593,15 @@ static void test_name_limits(void) test_all_kernel_objects( __LINE__, &attr2, STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_NAME_INVALID ); test_all_kernel_objects( __LINE__, &attr3, STATUS_SUCCESS, STATUS_OBJECT_PATH_SYNTAX_BAD ); + attr3.ObjectName = &str2; + pRtlInitUnicodeString( &str2, localW ); + status = pNtOpenSymbolicLinkObject( &ret, SYMBOLIC_LINK_QUERY, &attr3 ); + ok( status == STATUS_SUCCESS, "can't open BaseNamedObjects\\Local %x\n", status ); + attr3.ObjectName = &str; + attr3.RootDirectory = ret; + test_all_kernel_objects( __LINE__, &attr3, STATUS_OBJECT_TYPE_MISMATCH, STATUS_OBJECT_TYPE_MISMATCH ); + pNtClose( attr3.RootDirectory ); + status = pNtCreateMutant( &ret, GENERIC_ALL, NULL, FALSE ); ok( status == STATUS_SUCCESS, "NULL: NtCreateMutant failed %x\n", status ); pNtClose( ret ); @@ -873,7 +893,7 @@ static void test_directory(void) NTSTATUS status; UNICODE_STRING str; OBJECT_ATTRIBUTES attr; - HANDLE dir, dir1, h; + HANDLE dir, dir1, h, h2; BOOL is_nt4; /* No name and/or no attributes */ @@ -945,6 +965,39 @@ static void test_directory(void) ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtCreateDirectoryObject got %08x\n", status ); pRtlFreeUnicodeString(&str); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\BaseNamedObjects\\Local\\om.c-test" ); + InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); + status = pNtCreateDirectoryObject( &dir1, DIRECTORY_QUERY, &attr ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "om.c-test" ); + InitializeObjectAttributes( &attr, &str, 0, dir, NULL ); + status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Failed to open directory %08x\n", status ); + if (!status) pNtClose(h); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "om.c-event" ); + InitializeObjectAttributes( &attr, &str, 0, dir1, NULL ); + status = pNtCreateEvent( &h, GENERIC_ALL, &attr, 1, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateEvent failed %x\n", status ); + status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenEvent failed %x\n", status ); + pNtClose( h2 ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "om.c-test\\om.c-event" ); + InitializeObjectAttributes( &attr, &str, 0, dir, NULL ); + status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenEvent failed %x\n", status ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\BasedNamedObjects\\Local\\om.c-test\\om.c-event" ); + InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); + status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); + ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenEvent failed %x\n", status ); + pRtlFreeUnicodeString( &str ); + pNtClose( h ); + pNtClose( dir1 ); + str.Buffer = buffer; str.MaximumLength = sizeof(buffer); len = 0xdeadbeef;

1 0

Alexandre Julliard : server: Set the security descriptor at object creation.time.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 3ea7f7d2f43e50c2e3451cfeda2bde9801622110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea7f7d2f43e50c2e3451cfed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 12 22:57:33 2016 +0900 server: Set the security descriptor at object creation.time. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/completion.c | 5 +---- server/device.c | 4 ++-- server/directory.c | 6 ++---- server/event.c | 12 ++---------- server/mailslot.c | 6 ++---- server/mapping.c | 6 +----- server/mutex.c | 6 +----- server/named_pipe.c | 4 ++-- server/object.c | 46 +++++++++++++++++++++++++++++----------------- server/object.h | 5 ++--- server/process.c | 6 +----- server/semaphore.c | 6 +----- server/symlink.c | 6 +----- server/timer.c | 5 +---- server/winstation.c | 4 ++-- 15 files changed, 50 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ea7f7d2f43e50c2e3451…

1 0

Alexandre Julliard : server: Use a standard object for object attribute roots instead of a directory.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: ff9d90bbb0116e62a69e9accb13d1327a1e890c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff9d90bbb0116e62a69e9accb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 12 21:00:41 2016 +0900 server: Use a standard object for object attribute roots instead of a directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/completion.c | 6 ++--- server/device.c | 12 +++++----- server/directory.c | 66 +++++++++++++++++++++++++---------------------------- server/event.c | 12 +++++----- server/file.h | 6 ++--- server/mailslot.c | 12 +++++----- server/mapping.c | 7 +++--- server/mutex.c | 6 ++--- server/named_pipe.c | 10 ++++---- server/object.h | 11 ++++----- server/process.c | 6 ++--- server/request.c | 4 ++-- server/request.h | 2 +- server/semaphore.c | 6 ++--- server/symlink.c | 6 ++--- server/timer.c | 6 ++--- server/winstation.c | 8 +++---- 17 files changed, 89 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff9d90bbb0116e62a69e9…

1 0