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
March 2023
----- 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
1 participants
910 discussions
Start a n
N
ew thread
Rémi Bernon : widl: Group <ATTR> tokens together.
by Alexandre Julliard
17 Mar '23
17 Mar '23
Module: wine Branch: master Commit: a46facfd8cfa42b073a65257becdc5bbba621471 URL:
https://gitlab.winehq.org/wine/wine/-/commit/a46facfd8cfa42b073a65257becdc5…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Group <ATTR> tokens together. --- tools/widl/parser.l | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index d534b23bf02..02db1cfeeb1 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -199,12 +199,16 @@ struct uuid *parse_uuid(const char *u) <SQUOTE>\\\' addcchar(yytext[1]); <QUOTE,WSTRQUOTE,SQUOTE>\\. addcchar('\\'); addcchar(yytext[1]); <QUOTE,WSTRQUOTE,SQUOTE>. addcchar(yytext[0]); -<ATTR>\] yy_pop_state(); return ']'; -<ATTR>{cident} return attr_token(yytext, yylval); -<ATTR>{uuid} { - yylval->uuid = parse_uuid(yytext); - return aUUID; - } + +<ATTR>{ + \] { yy_pop_state(); return ']'; } + + {cident} { return attr_token( yytext, yylval ); } + {uuid} { + yylval->uuid = parse_uuid( yytext ); + return aUUID; + } +} <INITIAL>{ ^{ws}*\#{ws}*pragma{ws}+ { yy_push_state( PP_PRAGMA ); }
1
0
0
0
Rémi Bernon : widl: Group <INITIAL> tokens together.
by Alexandre Julliard
17 Mar '23
17 Mar '23
Module: wine Branch: master Commit: 832d6985c8d383e69e8ce1f442ff746d013c874e URL:
https://gitlab.winehq.org/wine/wine/-/commit/832d6985c8d383e69e8ce1f442ff74…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Group <INITIAL> tokens together. --- tools/widl/parser.l | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 8698f084354..d534b23bf02 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -139,7 +139,6 @@ struct uuid *parse_uuid(const char *u) ************************************************************************** */ %% -<INITIAL>^{ws}*\#{ws}*pragma{ws}+ yy_push_state(PP_PRAGMA); <PP_LINE>[^\n]* { int lineno; char *cptr, *fname; @@ -177,7 +176,6 @@ struct uuid *parse_uuid(const char *u) yy_pop_state(); } <PP_PRAGMA>[^\n]* yylval->str = xstrdup(yytext); yy_pop_state(); return aPRAGMA; -<INITIAL>^{ws}*midl_pragma{ws}+warning return tPRAGMA_WARNING; <INITIAL,ATTR>\" yy_push_state(QUOTE); cbufidx = 0; <QUOTE>\" { yy_pop_state(); @@ -207,10 +205,17 @@ struct uuid *parse_uuid(const char *u) yylval->uuid = parse_uuid(yytext); return aUUID; } -<INITIAL>{double} { - yylval->dbl = strtod(yytext, NULL); - return aDOUBLE; - } + +<INITIAL>{ + ^{ws}*\#{ws}*pragma{ws}+ { yy_push_state( PP_PRAGMA ); } + ^{ws}*midl_pragma{ws}+warning { return tPRAGMA_WARNING; } + + {double} { + yylval->dbl = strtod( yytext, NULL ); + return aDOUBLE; + } +} + SAFEARRAY{ws}*/\( return tSAFEARRAY; {cident} return kw_token(yytext, yylval);
1
0
0
0
Rémi Bernon : widl: Group <INITIAL,ATTR> tokens together.
by Alexandre Julliard
17 Mar '23
17 Mar '23
Module: wine Branch: master Commit: 2b3a910184b7afb4b1014d75e2a4bfc44e40ae92 URL:
https://gitlab.winehq.org/wine/wine/-/commit/2b3a910184b7afb4b1014d75e2a4bf…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Group <INITIAL,ATTR> tokens together. --- tools/widl/parser.l | 52 +++++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 92955516e9e..8698f084354 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -140,7 +140,6 @@ struct uuid *parse_uuid(const char *u) */ %% <INITIAL>^{ws}*\#{ws}*pragma{ws}+ yy_push_state(PP_PRAGMA); -<INITIAL,ATTR>^{ws}*\#{ws}* yy_push_state(PP_LINE); <PP_LINE>[^\n]* { int lineno; char *cptr, *fname; @@ -202,40 +201,47 @@ struct uuid *parse_uuid(const char *u) <SQUOTE>\\\' addcchar(yytext[1]); <QUOTE,WSTRQUOTE,SQUOTE>\\. addcchar('\\'); addcchar(yytext[1]); <QUOTE,WSTRQUOTE,SQUOTE>. addcchar(yytext[0]); -<INITIAL,ATTR>\[ yy_push_state(ATTR); return '['; <ATTR>\] yy_pop_state(); return ']'; <ATTR>{cident} return attr_token(yytext, yylval); <ATTR>{uuid} { yylval->uuid = parse_uuid(yytext); return aUUID; } -<INITIAL,ATTR>{hex} { - yylval->num = xstrtoul(yytext, NULL, 0); - return aHEXNUM; - } -<INITIAL,ATTR>{int} { - yylval->num = xstrtoul(yytext, NULL, 0); - return aNUM; - } <INITIAL>{double} { yylval->dbl = strtod(yytext, NULL); return aDOUBLE; } SAFEARRAY{ws}*/\( return tSAFEARRAY; {cident} return kw_token(yytext, yylval); -<INITIAL,ATTR>\n line_number++; -<INITIAL,ATTR>{ws} -<INITIAL,ATTR>\<\< return SHL; -<INITIAL,ATTR>\>\> return SHR; -<INITIAL,ATTR>\-\> return MEMBERPTR; -<INITIAL,ATTR>== return EQUALITY; -<INITIAL,ATTR>!= return INEQUALITY; -<INITIAL,ATTR>\>= return GREATEREQUAL; -<INITIAL,ATTR>\<= return LESSEQUAL; -<INITIAL,ATTR>\|\| return LOGICALOR; -<INITIAL,ATTR>&& return LOGICALAND; -<INITIAL,ATTR>\.\.\. return ELLIPSIS; -<INITIAL,ATTR>. return yytext[0]; + +<INITIAL,ATTR>{ + ^{ws}*\#{ws}* { yy_push_state(PP_LINE); } + \[ { yy_push_state(ATTR); return '['; } + + {hex} { + yylval->num = xstrtoul(yytext, NULL, 0); + return aHEXNUM; + } + {int} { + yylval->num = xstrtoul(yytext, NULL, 0); + return aNUM; + } + + \n { line_number++; } + {ws} {} + \<\< { return SHL; } + \>\> { return SHR; } + \-\> { return MEMBERPTR; } + == { return EQUALITY; } + != { return INEQUALITY; } + \>= { return GREATEREQUAL; } + \<= { return LESSEQUAL; } + \|\| { return LOGICALOR; } + && { return LOGICALAND; } + \.\.\. { return ELLIPSIS; } + . { return yytext[0]; } +} + <<EOF>> { if (!list_empty( &import_stack )) return aEOF;
1
0
0
0
Sven Baars : kernelbase: Also call NtOpenKeyEx() on empty key names.
by Alexandre Julliard
17 Mar '23
17 Mar '23
Module: wine Branch: master Commit: 88fa3459b928c6d27f56c67778c0e5d45ebbaa5b URL:
https://gitlab.winehq.org/wine/wine/-/commit/88fa3459b928c6d27f56c67778c0e5…
Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Mar 17 11:56:31 2023 +0100 kernelbase: Also call NtOpenKeyEx() on empty key names. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=54691
--- dlls/advapi32/tests/registry.c | 4 ++-- dlls/kernelbase/registry.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 723950a4d0f..528875261d6 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1510,11 +1510,11 @@ static void test_reg_delete_key(void) ok(ret == ERROR_SUCCESS, "Could not open key, got %ld\n", ret); ret = RegDeleteKeyExA(key, "", KEY_WOW64_32KEY, 0); - todo_wine_if(ptr_size == 64) ok(ret == ERROR_SUCCESS, "RegDeleteKeyExA failed, got %ld\n", ret); + ok(ret == ERROR_SUCCESS, "RegDeleteKeyExA failed, got %ld\n", ret); RegCloseKey(key); ret = RegOpenKeyExA(hkey_main, "deleteme", 0, KEY_READ | KEY_WOW64_32KEY, &key); - todo_wine_if(ptr_size == 64) ok(ret == ERROR_FILE_NOT_FOUND, "Key was not deleted, got %ld\n", ret); + ok(ret == ERROR_FILE_NOT_FOUND, "Key was not deleted, got %ld\n", ret); RegCloseKey(key); } diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index d414b210026..daf1afa2cd6 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -155,7 +155,7 @@ static NTSTATUS open_subkey( HKEY *subkey, HKEY root, UNICODE_STRING *name, DWOR attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (buffer[0] == '\\') return STATUS_OBJECT_PATH_INVALID; + if (len > 0 && buffer[0] == '\\') return STATUS_OBJECT_PATH_INVALID; while (i < len && buffer[i] != '\\') i++; str.Buffer = name->Buffer; @@ -202,7 +202,7 @@ static NTSTATUS open_subkey( HKEY *subkey, HKEY root, UNICODE_STRING *name, DWOR /* wrapper for NtOpenKeyEx to handle Wow6432 nodes */ static NTSTATUS open_key( HKEY *retkey, HKEY root, UNICODE_STRING name, DWORD options, ACCESS_MASK access ) { - HKEY subkey, subkey_root = root; + HKEY subkey = 0, subkey_root = root; NTSTATUS status = 0; *retkey = NULL; @@ -228,7 +228,7 @@ static NTSTATUS open_key( HKEY *retkey, HKEY root, UNICODE_STRING name, DWORD op return status; } - while (!status && name.Length) + while (!status && (name.Length || !subkey)) { status = open_subkey( &subkey, subkey_root, &name, options, access ); if (subkey_root && subkey_root != root) NtClose( subkey_root );
1
0
0
0
Sven Baars : advapi32/tests: Test deleting 32-bit registry keys.
by Alexandre Julliard
17 Mar '23
17 Mar '23
Module: wine Branch: master Commit: 68920ee430fa9f36aaf4f9afa471caa717c36048 URL:
https://gitlab.winehq.org/wine/wine/-/commit/68920ee430fa9f36aaf4f9afa471ca…
Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Mar 17 11:55:45 2023 +0100 advapi32/tests: Test deleting 32-bit registry keys. --- dlls/advapi32/tests/registry.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 524c3e0ef76..723950a4d0f 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1500,6 +1500,22 @@ static void test_reg_delete_key(void) ret = RegOpenKeyA(hkey_main, "deleteme", &key); ok(ret == ERROR_FILE_NOT_FOUND, "Key was not deleted, got %ld\n", ret); RegCloseKey(key); + + /* Test deleting 32-bit keys */ + ret = RegCreateKeyExA(hkey_main, "deleteme", 0, NULL, 0, KEY_ALL_ACCESS | KEY_WOW64_32KEY, NULL, &key, NULL); + ok(ret == ERROR_SUCCESS, "Could not create key, got %ld\n", ret); + RegCloseKey(key); + + ret = RegOpenKeyExA(hkey_main, "deleteme", 0, KEY_READ | KEY_WOW64_32KEY, &key); + ok(ret == ERROR_SUCCESS, "Could not open key, got %ld\n", ret); + + ret = RegDeleteKeyExA(key, "", KEY_WOW64_32KEY, 0); + todo_wine_if(ptr_size == 64) ok(ret == ERROR_SUCCESS, "RegDeleteKeyExA failed, got %ld\n", ret); + RegCloseKey(key); + + ret = RegOpenKeyExA(hkey_main, "deleteme", 0, KEY_READ | KEY_WOW64_32KEY, &key); + todo_wine_if(ptr_size == 64) ok(ret == ERROR_FILE_NOT_FOUND, "Key was not deleted, got %ld\n", ret); + RegCloseKey(key); } static BOOL set_privileges(LPCSTR privilege, BOOL set)
1
0
0
0
Huw Davies : winedump: Fix printf format warning.
by Alexandre Julliard
17 Mar '23
17 Mar '23
Module: wine Branch: master Commit: 9b77f860469b2c244a537e266b383cfee1b1363e URL:
https://gitlab.winehq.org/wine/wine/-/commit/9b77f860469b2c244a537e266b383c…
Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 17 12:59:09 2023 +0000 winedump: Fix printf format warning. --- tools/winedump/pdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index c76c19fec89..d12150ab3a2 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -240,7 +240,7 @@ static void dump_string_table(const PDB_STRING_TABLE* strtable, const char* name end = ptr + strtable->length; while (ptr < end) { - printf("%s\t%zu] %s\n", pfx, ptr - (const char*)(strtable + 1), ptr); + printf("%s\t%tu] %s\n", pfx, ptr - (const char*)(strtable + 1), ptr); ptr += strlen(ptr) + 1; } table = (unsigned *)((char*)(strtable + 1) + strtable->length);
1
0
0
0
Mohamad Al-Jaf : windows.perception.stub: Implement IHolographicSpaceStatics3::get_IsConfigured().
by Alexandre Julliard
17 Mar '23
17 Mar '23
Module: wine Branch: master Commit: a0a782d8a1ce8639627b8f521506f7a77d3a0ea7 URL:
https://gitlab.winehq.org/wine/wine/-/commit/a0a782d8a1ce8639627b8f521506f7…
Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 10 20:45:36 2023 -0500 windows.perception.stub: Implement IHolographicSpaceStatics3::get_IsConfigured(). Needed by the VR game Desperate: Vladivostok. --- dlls/windows.perception.stub/holographicspace.c | 6 ++++-- dlls/windows.perception.stub/tests/perception.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/windows.perception.stub/holographicspace.c b/dlls/windows.perception.stub/holographicspace.c index 52fd6421075..8a12147f4a8 100644 --- a/dlls/windows.perception.stub/holographicspace.c +++ b/dlls/windows.perception.stub/holographicspace.c @@ -174,8 +174,10 @@ DEFINE_IINSPECTABLE( holographicspace_statics3, IHolographicSpaceStatics3, struc static HRESULT WINAPI holographicspace_statics3_get_IsConfigured( IHolographicSpaceStatics3 *iface, boolean *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + TRACE( "iface %p, value %p\n", iface, value ); + + *value = FALSE; + return S_OK; } static const struct IHolographicSpaceStatics3Vtbl holographicspace_statics3_vtbl = diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index 1c763930e05..d0bee4eb247 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -155,8 +155,8 @@ static void test_HolographicSpaceStatics(void) value = 2; hr = IHolographicSpaceStatics3_get_IsConfigured( holographicspace_statics3, &value ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); - todo_wine ok( value == FALSE, "got %d.\n", value ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( value == FALSE, "got %d.\n", value ); ref = IHolographicSpaceStatics3_Release( holographicspace_statics3 ); ok( ref == 2, "got ref %ld.\n", ref );
1
0
0
0
Mohamad Al-Jaf : windows.perception.stub/tests: Add IHolographicSpaceStatics3::get_IsConfigured() tests.
by Alexandre Julliard
17 Mar '23
17 Mar '23
Module: wine Branch: master Commit: f2a7b2f9e1c1d3877e8b7af32c9340bff223819f URL:
https://gitlab.winehq.org/wine/wine/-/commit/f2a7b2f9e1c1d3877e8b7af32c9340…
Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 10 20:43:34 2023 -0500 windows.perception.stub/tests: Add IHolographicSpaceStatics3::get_IsConfigured() tests. --- dlls/windows.perception.stub/tests/perception.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index 67c45e2a480..1c763930e05 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -153,6 +153,11 @@ static void test_HolographicSpaceStatics(void) ok( hr == S_OK, "got hr %#lx.\n", hr ); + value = 2; + hr = IHolographicSpaceStatics3_get_IsConfigured( holographicspace_statics3, &value ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + todo_wine ok( value == FALSE, "got %d.\n", value ); + ref = IHolographicSpaceStatics3_Release( holographicspace_statics3 ); ok( ref == 2, "got ref %ld.\n", ref ); done:
1
0
0
0
Mohamad Al-Jaf : windows.perception.stub: Add IHolographicSpaceStatics3 stub interface.
by Alexandre Julliard
17 Mar '23
17 Mar '23
Module: wine Branch: master Commit: d0ec6366e4423b16fc55f79430c2efa0d267b5ff URL:
https://gitlab.winehq.org/wine/wine/-/commit/d0ec6366e4423b16fc55f79430c2ef…
Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 10 20:40:57 2023 -0500 windows.perception.stub: Add IHolographicSpaceStatics3 stub interface. --- dlls/windows.perception.stub/holographicspace.c | 30 +++++++++++++++++++++++++ dlls/windows.perception.stub/tests/perception.c | 13 +++++++++++ 2 files changed, 43 insertions(+) diff --git a/dlls/windows.perception.stub/holographicspace.c b/dlls/windows.perception.stub/holographicspace.c index a99932f7889..52fd6421075 100644 --- a/dlls/windows.perception.stub/holographicspace.c +++ b/dlls/windows.perception.stub/holographicspace.c @@ -26,6 +26,7 @@ struct holographicspace { IActivationFactory IActivationFactory_iface; IHolographicSpaceStatics2 IHolographicSpaceStatics2_iface; + IHolographicSpaceStatics3 IHolographicSpaceStatics3_iface; LONG ref; }; @@ -57,6 +58,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IHolographicSpaceStatics3 )) + { + *out = &impl->IHolographicSpaceStatics3_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -162,10 +170,32 @@ static const struct IHolographicSpaceStatics2Vtbl holographicspace_statics2_vtbl holographicspace_statics2_remove_IsAvailableChanged, }; +DEFINE_IINSPECTABLE( holographicspace_statics3, IHolographicSpaceStatics3, struct holographicspace, IActivationFactory_iface ) + +static HRESULT WINAPI holographicspace_statics3_get_IsConfigured( IHolographicSpaceStatics3 *iface, boolean *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct IHolographicSpaceStatics3Vtbl holographicspace_statics3_vtbl = +{ + holographicspace_statics3_QueryInterface, + holographicspace_statics3_AddRef, + holographicspace_statics3_Release, + /* IInspectable methods */ + holographicspace_statics3_GetIids, + holographicspace_statics3_GetRuntimeClassName, + holographicspace_statics3_GetTrustLevel, + /* IHolographicSpaceStatics3 methods */ + holographicspace_statics3_get_IsConfigured, +}; + static struct holographicspace holographicspace_statics = { {&factory_vtbl}, {&holographicspace_statics2_vtbl}, + {&holographicspace_statics3_vtbl}, 1, }; diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index 2fb526ed3d5..67c45e2a480 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -99,6 +99,7 @@ static void test_HolographicSpaceStatics(void) { static const WCHAR *holographicspace_statics_name = L"Windows.Graphics.Holographic.HolographicSpace"; IHolographicSpaceStatics2 *holographicspace_statics2; + IHolographicSpaceStatics3 *holographicspace_statics3; IActivationFactory *factory; BOOLEAN value; HSTRING str; @@ -142,6 +143,18 @@ static void test_HolographicSpaceStatics(void) ref = IHolographicSpaceStatics2_Release( holographicspace_statics2 ); ok( ref == 2, "got ref %ld.\n", ref ); + + hr = IActivationFactory_QueryInterface( factory, &IID_IHolographicSpaceStatics3, (void **)&holographicspace_statics3 ); + if (hr == E_NOINTERFACE) /* win1703 */ + { + win_skip( "IHolographicSpaceStatics3 is not supported, skipping tests.\n" ); + goto done; + } + + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = IHolographicSpaceStatics3_Release( holographicspace_statics3 ); + ok( ref == 2, "got ref %ld.\n", ref ); done: ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref );
1
0
0
0
Mohamad Al-Jaf : include: Add IHolographicSpaceStatics3 interface definition.
by Alexandre Julliard
17 Mar '23
17 Mar '23
Module: wine Branch: master Commit: 0f018523332c10da70220100ca28369d51e33f9e URL:
https://gitlab.winehq.org/wine/wine/-/commit/0f018523332c10da70220100ca2836…
Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 17 00:08:45 2023 -0400 include: Add IHolographicSpaceStatics3 interface definition. --- include/windows.graphics.holographic.idl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/windows.graphics.holographic.idl b/include/windows.graphics.holographic.idl index cada5796916..568003cd7a3 100644 --- a/include/windows.graphics.holographic.idl +++ b/include/windows.graphics.holographic.idl @@ -99,6 +99,16 @@ namespace Windows.Graphics.Holographic { [eventremove] HRESULT IsAvailableChanged([in] EventRegistrationToken token); } + [ + contract(Windows.Foundation.UniversalApiContract, 5.0), + exclusiveto(Windows.Graphics.Holographic.HolographicSpace), + uuid(3b00de3d-b1a3-4dfe-8e79-fec5909e6df8) + ] + interface IHolographicSpaceStatics3 : IInspectable + { + [propget] HRESULT IsConfigured([out, retval] boolean *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.Graphics.Holographic.HolographicSpaceCameraAddedEventArgs),
1
0
0
0
← Newer
1
...
47
48
49
50
51
52
53
...
91
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
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
Results per page:
10
25
50
100
200