winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
June 2015
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
610 discussions
Start a n
N
ew thread
Matteo Bruni : wined3d: Handle point sprites with PS 3.0.
by Alexandre Julliard
05 Jun '15
05 Jun '15
Module: wine Branch: master Commit: 92fbe333d05fd444090c86cbe158b94fd5d5af68 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=92fbe333d05fd444090c86cbe…
Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 5 00:37:29 2015 +0200 wined3d: Handle point sprites with PS 3.0. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/glsl_shader.c | 14 +++++++++----- dlls/wined3d/shader.c | 3 +++ dlls/wined3d/state.c | 4 ++-- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 7 ++++--- 7 files changed, 22 insertions(+), 14 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=92fbe333d05fd444090c8…
1
0
0
0
Ken Thomases : ntdll: Add support for using libunwind to unwind the stack for x86_64.
by Alexandre Julliard
05 Jun '15
05 Jun '15
Module: wine Branch: master Commit: bbcfa6b4ee5d7fea47c61c84d0bbe789e1ec4466 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bbcfa6b4ee5d7fea47c61c84d…
Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jun 5 00:41:24 2015 -0500 ntdll: Add support for using libunwind to unwind the stack for x86_64. On OS X, Apple uses compact unwind info in preference to DWARF unwind info. --- dlls/ntdll/signal_x86_64.c | 216 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 215 insertions(+), 1 deletion(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbcfa6b4ee5d7fea47c61…
1
0
0
0
Ken Thomases : configure: Add a check for libunwind.h.
by Alexandre Julliard
05 Jun '15
05 Jun '15
Module: wine Branch: master Commit: 260832c5c86b6d22f7b77da5b834fc652755a3be URL:
http://source.winehq.org/git/wine.git/?a=commit;h=260832c5c86b6d22f7b77da5b…
Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jun 5 00:40:23 2015 -0500 configure: Add a check for libunwind.h. --- configure | 1 + configure.ac | 1 + include/config.h.in | 3 +++ 3 files changed, 5 insertions(+) diff --git a/configure b/configure index 1759dba..fa52cf7 100755 --- a/configure +++ b/configure @@ -6626,6 +6626,7 @@ for ac_header in \ lber.h \ ldap.h \ libproc.h \ + libunwind.h \ link.h \ linux/cdrom.h \ linux/compiler.h \ diff --git a/configure.ac b/configure.ac index 445c9d4..79110c1 100644 --- a/configure.ac +++ b/configure.ac @@ -424,6 +424,7 @@ AC_CHECK_HEADERS(\ lber.h \ ldap.h \ libproc.h \ + libunwind.h \ link.h \ linux/cdrom.h \ linux/compiler.h \ diff --git a/include/config.h.in b/include/config.h.in index 0f435d1..eb61a94 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -360,6 +360,9 @@ /* Define to 1 if you have the <libproc.h> header file. */ #undef HAVE_LIBPROC_H +/* Define to 1 if you have the <libunwind.h> header file. */ +#undef HAVE_LIBUNWIND_H + /* Define to 1 if you have the <libv4l1.h> header file. */ #undef HAVE_LIBV4L1_H
1
0
0
0
Iván Matellanes : msvcirt/tests: Add initial tests for streambuf.
by Alexandre Julliard
05 Jun '15
05 Jun '15
Module: wine Branch: master Commit: 4cd21cf727b34ac2379f4896cf04a3a51abde8f6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4cd21cf727b34ac2379f4896c…
Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jun 3 21:10:33 2015 +0200 msvcirt/tests: Add initial tests for streambuf. --- configure | 1 + configure.ac | 1 + dlls/msvcirt/tests/Makefile.in | 4 + dlls/msvcirt/tests/msvcirt.c | 213 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 219 insertions(+) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=4cd21cf727b34ac2379f4…
1
0
0
0
Iván Matellanes : msvcirt: Add initial implementation of streambuf.
by Alexandre Julliard
05 Jun '15
05 Jun '15
Module: wine Branch: master Commit: ee28dbf5424e1605b52fa99c5bb1850e7b9b065c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ee28dbf5424e1605b52fa99c5…
Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jun 3 21:10:23 2015 +0200 msvcirt: Add initial implementation of streambuf. --- dlls/msvcirt/msvcirt.c | 276 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.h | 3 + dlls/msvcirt/msvcirt.spec | 70 +++++------ dlls/msvcrt20/msvcrt20.spec | 70 +++++------ dlls/msvcrt40/msvcrt40.spec | 70 +++++------ 5 files changed, 384 insertions(+), 105 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee28dbf5424e1605b52fa…
1
0
0
0
Joachim Priesner : comdlg32: File dialog: Append multi-part extensions like .abc.def.
by Alexandre Julliard
05 Jun '15
05 Jun '15
Module: wine Branch: master Commit: c5ad37baf0d4a4d14dd9bb07ca7a033ca0cdd018 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c5ad37baf0d4a4d14dd9bb07c…
Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Wed Jun 3 00:14:08 2015 +0200 comdlg32: File dialog: Append multi-part extensions like .abc.def. --- dlls/comdlg32/filedlg.c | 5 +++-- dlls/comdlg32/tests/filedlg.c | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 2890108..1453396 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2596,10 +2596,11 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) filterSearchIndex[0] = '\0'; } + /* find the file extension by searching for the first dot in filterExt */ /* strip the * or anything else from the extension, "*.abc" becomes "abc" */ /* if the extension is invalid or contains a glob, ignore it */ - filterSearchIndex = PathFindExtensionW(filterExt); - if (*filterSearchIndex++ && !strchrW(filterSearchIndex, '*') && !strchrW(filterSearchIndex, '?')) + filterSearchIndex = strchrW(filterExt, '.'); + if (filterSearchIndex++ && !strchrW(filterSearchIndex, '*') && !strchrW(filterSearchIndex, '?')) { strcpyW(filterExt, filterSearchIndex); } diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index e3d9bc7..49a430c 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1130,6 +1130,11 @@ static void test_extension(void) for (i = 0; i < ARRAY_SIZE(defext_wildcard_filters); i++) { test_extension_helper(&ofn, defext_wildcard_filters[i], "deadbeef.xyz"); } + + /* Append valid extensions consisting of multiple parts */ + test_extension_helper(&ofn, "TestFilter (*.abc.def)\0*.abc.def\0", "deadbeef.abc.def"); + test_extension_helper(&ofn, "TestFilter (.abc.def)\0.abc.def\0", "deadbeef.abc.def"); + test_extension_helper(&ofn, "TestFilter (*.*.def)\0*.*.def\0", "deadbeef.xyz"); } #undef ARRAY_SIZE
1
0
0
0
Qian Hong : server: Fix type name of directory file.
by Alexandre Julliard
05 Jun '15
05 Jun '15
Module: wine Branch: master Commit: ef3ed04cdc96c1a885f9796013b480fb7f5bc243 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ef3ed04cdc96c1a885f979601…
Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Jun 2 22:10:37 2015 +0800 server: Fix type name of directory file. --- dlls/ntdll/tests/om.c | 6 +++--- server/change.c | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 1fa9c47..0f9008a 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -783,11 +783,11 @@ static void test_query_object(void) memset( buffer, 0, sizeof(buffer) ); status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); - todo_wine ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); str = (UNICODE_STRING *)buffer; expected_len = sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR); - todo_wine ok( len >= expected_len, "unexpected len %u\n", len ); - todo_wine ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), + ok( len >= expected_len, "unexpected len %u\n", len ); + ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); pNtClose( handle ); diff --git a/server/change.c b/server/change.c index 11d9b93..59d1819 100644 --- a/server/change.c +++ b/server/change.c @@ -148,13 +148,14 @@ static struct security_descriptor *dir_get_sd( struct object *obj ); static int dir_set_sd( struct object *obj, const struct security_descriptor *sd, unsigned int set_info ); static void dir_dump( struct object *obj, int verbose ); +static struct object_type *dir_get_type( struct object *obj ); static void dir_destroy( struct object *obj ); static const struct object_ops dir_ops = { sizeof(struct dir), /* size */ dir_dump, /* dump */ - no_get_type, /* get_type */ + dir_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -250,6 +251,13 @@ static void dir_dump( struct object *obj, int verbose ) fprintf( stderr, "Dirfile fd=%p filter=%08x\n", dir->fd, dir->filter ); } +static struct object_type *dir_get_type( struct object *obj ) +{ + static const WCHAR name[] = {'F','i','l','e'}; + static const struct unicode_str str = { name, sizeof(name) }; + return get_object_type( &str ); +} + /* enter here directly from SIGIO signal handler */ void do_change_notify( int unix_fd ) {
1
0
0
0
Qian Hong : server: Fix type name of File.
by Alexandre Julliard
05 Jun '15
05 Jun '15
Module: wine Branch: master Commit: f208c50cc024fe14d038c517f301196b5c344d12 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f208c50cc024fe14d038c517f…
Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Jun 2 22:10:25 2015 +0800 server: Fix type name of File. --- dlls/ntdll/tests/om.c | 6 +++--- server/file.c | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index b7ef99e..1fa9c47 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -799,11 +799,11 @@ static void test_query_object(void) memset( buffer, 0, sizeof(buffer) ); status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); - todo_wine ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); str = (UNICODE_STRING *)buffer; expected_len = sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR); - todo_wine ok( len >= expected_len, "unexpected len %u\n", len ); - todo_wine ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), + ok( len >= expected_len, "unexpected len %u\n", len ); + ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); DeleteFileA( file1 ); pNtClose( handle ); diff --git a/server/file.c b/server/file.c index 792bbe0..e70304f 100644 --- a/server/file.c +++ b/server/file.c @@ -64,6 +64,7 @@ struct file static unsigned int generic_file_map_access( unsigned int access ); static void file_dump( struct object *obj, int verbose ); +static struct object_type *file_get_type( struct object *obj ); static struct fd *file_get_fd( struct object *obj ); static struct security_descriptor *file_get_sd( struct object *obj ); static int file_set_sd( struct object *obj, const struct security_descriptor *sd, unsigned int set_info ); @@ -77,7 +78,7 @@ static const struct object_ops file_ops = { sizeof(struct file), /* size */ file_dump, /* dump */ - no_get_type, /* get_type */ + file_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -273,6 +274,13 @@ static void file_dump( struct object *obj, int verbose ) fprintf( stderr, "File fd=%p\n", file->fd ); } +static struct object_type *file_get_type( struct object *obj ) +{ + static const WCHAR name[] = {'F','i','l','e'}; + static const struct unicode_str str = { name, sizeof(name) }; + return get_object_type( &str ); +} + static int file_get_poll_events( struct fd *fd ) { struct file *file = get_fd_user( fd );
1
0
0
0
Qian Hong : server: Fix type name of IoCompletion.
by Alexandre Julliard
05 Jun '15
05 Jun '15
Module: wine Branch: master Commit: bdc223ad39f30bffd622c4c1ef1862f1a9606535 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bdc223ad39f30bffd622c4c1e…
Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Jun 2 22:10:14 2015 +0800 server: Fix type name of IoCompletion. --- dlls/ntdll/tests/om.c | 2 +- server/completion.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 8470238..b7ef99e 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -818,7 +818,7 @@ static void test_query_object(void) str = (UNICODE_STRING *)buffer; expected_len = sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR); ok( len >= expected_len, "unexpected len %u\n", len ); - todo_wine ok( str->Buffer && !memcmp( str->Buffer, type_iocompletion, sizeof(type_iocompletion) ), + ok( str->Buffer && !memcmp( str->Buffer, type_iocompletion, sizeof(type_iocompletion) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); pNtClose( handle ); diff --git a/server/completion.c b/server/completion.c index 0c26c37..77c72cc 100644 --- a/server/completion.c +++ b/server/completion.c @@ -109,7 +109,7 @@ static void completion_dump( struct object *obj, int verbose ) static struct object_type *completion_get_type( struct object *obj ) { - static const WCHAR name[] = {'C','o','m','p','l','e','t','i','o','n'}; + static const WCHAR name[] = {'I','o','C','o','m','p','l','e','t','i','o','n'}; static const struct unicode_str str = { name, sizeof(name) }; return get_object_type( &str ); }
1
0
0
0
Qian Hong : ntdll/tests: Add a few more ObjectTypeInformation tests.
by Alexandre Julliard
05 Jun '15
05 Jun '15
Module: wine Branch: master Commit: 7a7fc1e604238c08f7eb8ec380f15b1a9b1803a0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7a7fc1e604238c08f7eb8ec38…
Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Jun 2 22:10:06 2015 +0800 ntdll/tests: Add a few more ObjectTypeInformation tests. --- dlls/ntdll/tests/om.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 945effa..8470238 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -54,6 +54,7 @@ static NTSTATUS (WINAPI *pNtCreateKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJE static NTSTATUS (WINAPI *pNtOpenKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES * ); static NTSTATUS (WINAPI *pNtWaitForKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); static NTSTATUS (WINAPI *pNtReleaseKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); +static NTSTATUS (WINAPI *pNtCreateIoCompletion)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -674,12 +675,16 @@ static void test_query_object(void) '\\','t','e','s','t','_','e','v','e','n','t'}; static const WCHAR type_event[] = {'E','v','e','n','t'}; static const WCHAR type_file[] = {'F','i','l','e'}; + static const WCHAR type_iocompletion[] = {'I','o','C','o','m','p','l','e','t','i','o','n'}; + static const WCHAR type_directory[] = {'D','i','r','e','c','t','o','r','y'}; + static const WCHAR type_section[] = {'S','e','c','t','i','o','n'}; HANDLE handle; char buffer[1024]; NTSTATUS status; ULONG len, expected_len; UNICODE_STRING *str; - char dir[MAX_PATH]; + char dir[MAX_PATH], tmp_path[MAX_PATH], file1[MAX_PATH + 16]; + LARGE_INTEGER size; handle = CreateEventA( NULL, FALSE, FALSE, "test_event" ); @@ -786,6 +791,66 @@ static void test_query_object(void) "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); pNtClose( handle ); + + GetTempPathA(MAX_PATH, tmp_path); + GetTempFileNameA(tmp_path, "foo", 0, file1); + handle = CreateFileA(file1, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); + len = 0; + memset( buffer, 0, sizeof(buffer) ); + status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + todo_wine ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + expected_len = sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR); + todo_wine ok( len >= expected_len, "unexpected len %u\n", len ); + todo_wine ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), + "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + DeleteFileA( file1 ); + pNtClose( handle ); + + status = pNtCreateIoCompletion( &handle, IO_COMPLETION_ALL_ACCESS, NULL, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateIoCompletion failed %x\n", status); + len = 0; + memset( buffer, 0, sizeof(buffer) ); + status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + expected_len = sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR); + ok( len >= expected_len, "unexpected len %u\n", len ); + todo_wine ok( str->Buffer && !memcmp( str->Buffer, type_iocompletion, sizeof(type_iocompletion) ), + "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + pNtClose( handle ); + + status = pNtCreateDirectoryObject( &handle, DIRECTORY_QUERY, NULL ); + ok(status == STATUS_SUCCESS, "Failed to create Directory %08x\n", status); + len = 0; + memset( buffer, 0, sizeof(buffer) ); + status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + expected_len = sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR); + ok( len >= expected_len, "unexpected len %u\n", len ); + ok( str->Buffer && !memcmp( str->Buffer, type_directory, sizeof(type_directory) ), + "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + pNtClose( handle ); + + size.u.LowPart = 256; + size.u.HighPart = 0; + status = pNtCreateSection( &handle, SECTION_MAP_WRITE, NULL, &size, PAGE_READWRITE, SEC_COMMIT, 0 ); + ok( status == STATUS_SUCCESS , "NtCreateSection returned %x\n", status ); + len = 0; + memset( buffer, 0, sizeof(buffer) ); + status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + expected_len = sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR); + ok( len >= expected_len, "unexpected len %u\n", len ); + ok( str->Buffer && !memcmp( str->Buffer, type_section, sizeof(type_section) ), + "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + pNtClose( handle ); } static void test_type_mismatch(void) @@ -1164,6 +1229,7 @@ START_TEST(om) pNtOpenKeyedEvent = (void *)GetProcAddress(hntdll, "NtOpenKeyedEvent"); pNtWaitForKeyedEvent = (void *)GetProcAddress(hntdll, "NtWaitForKeyedEvent"); pNtReleaseKeyedEvent = (void *)GetProcAddress(hntdll, "NtReleaseKeyedEvent"); + pNtCreateIoCompletion = (void *)GetProcAddress(hntdll, "NtCreateIoCompletion"); test_case_sensitive(); test_namespace_pipe();
1
0
0
0
← Newer
1
...
49
50
51
52
53
54
55
...
61
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
Results per page:
10
25
50
100
200