February 2016 - Wine-commits

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

12 Feb '16

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

Józef Kucia : dxgi: Return S_OK in dxgi_factory_MakeWindowAssociation() stub.
by Alexandre Julliard 12 Feb '16

12 Feb '16

Module: wine Branch: master Commit: a36ae03c9fab07b019117bdfda228d0637209b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36ae03c9fab07b019117bdfd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 12 01:27:42 2016 +0100 dxgi: Return S_OK in dxgi_factory_MakeWindowAssociation() stub. 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/dxgi/factory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 5da45f3..5956e62 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -165,7 +165,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IDXGIFactory { FIXME("iface %p, window %p, flags %#x stub!\n", iface, window, flags); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IDXGIFactory1 *iface, HWND *window)

1 0

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

12 Feb '16

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

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

12 Feb '16

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/tests: Test creation of level_9_* shaders.
by Alexandre Julliard 12 Feb '16

12 Feb '16

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

Charles Davis : dwrite: Fix typos, and fix definition of Mac LangCodes for Welsh and up.
by Alexandre Julliard 12 Feb '16

12 Feb '16

Module: wine Branch: master Commit: dcca411ac32e69a4c2f1be01595db113a20498e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcca411ac32e69a4c2f1be015… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Feb 12 02:00:02 2016 -0700 dwrite: Fix typos, and fix definition of Mac LangCodes for Welsh and up. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 5b29c21..7d59bf8 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -470,7 +470,7 @@ enum TT_NAME_MAC_LANGUAGE_ID TT_NAME_MAC_LANGID_LAO, TT_NAME_MAC_LANGID_VIETNAMESE, TT_NAME_MAC_LANGID_INDONESIAN, - TT_NAME_MAC_LANGID_TAGALONG, + TT_NAME_MAC_LANGID_TAGALOG, TT_NAME_MAC_LANGID_MALAY_ROMAN, TT_NAME_MAC_LANGID_MALAY_ARABIC, TT_NAME_MAC_LANGID_AMHARIC, @@ -483,11 +483,11 @@ enum TT_NAME_MAC_LANGUAGE_ID TT_NAME_MAC_LANGID_NYANJA, TT_NAME_MAC_LANGID_MALAGASY, TT_NAME_MAC_LANGID_ESPERANTO, - TT_NAME_MAC_LANGID_WELSH, + TT_NAME_MAC_LANGID_WELSH = 128, TT_NAME_MAC_LANGID_BASQUE, TT_NAME_MAC_LANGID_CATALAN, TT_NAME_MAC_LANGID_LATIN, - TT_NAME_MAC_LANGID_QUENCHUA, + TT_NAME_MAC_LANGID_QUECHUA, TT_NAME_MAC_LANGID_GUARANI, TT_NAME_MAC_LANGID_AYMARA, TT_NAME_MAC_LANGID_TATAR, @@ -605,6 +605,39 @@ static const char name_mac_langid_to_locale[][10] = { "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "cy-GB", "eu-ES", "ca-ES",

1 0

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

12 Feb '16

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

Alexandre Julliard : server: Require a directory as root to open an object with a name.
by Alexandre Julliard 12 Feb '16

12 Feb '16

Module: wine Branch: master Commit: 10a38ef0567c34a7f56ee88f6f972507f6eecf2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a38ef0567c34a7f56ee88f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 12 21:06:58 2016 +0900 server: Require a directory as root to open an object with a name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/handle.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/server/handle.c b/server/handle.c index 3b0d033..37fba69 100644 --- a/server/handle.c +++ b/server/handle.c @@ -592,7 +592,14 @@ obj_handle_t open_object( struct process *process, obj_handle_t parent, unsigned return 0; } - if (parent && !(root = get_handle_obj( process, parent, 0, NULL ))) return 0; + if (parent) + { + if (name->len) + root = get_directory_obj( process, parent ); + else /* opening the object itself can work for non-directories too */ + root = get_handle_obj( process, parent, 0, NULL ); + if (!root) return 0; + } if ((obj = open_named_object( root, ops, name, attributes ))) {

1 0

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

12 Feb '16

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 : ntdll/tests: Add some tests for opening objects through symlinks.
by Alexandre Julliard 12 Feb '16

12 Feb '16

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