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
July
June
May
April
March
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
August 2017
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 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
351 discussions
Start a n
N
ew thread
Jacek Caban : netprofm: Implement connection points as the same object as their container.
by Alexandre Julliard
20 Aug '17
20 Aug '17
Module: wine Branch: master Commit: ba156ed28b7bc39e7bdce41e6afd9c458c2a6eb0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ba156ed28b7bc39e7bdce41e6…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 18 14:43:24 2017 +0200 netprofm: Implement connection points as the same object as their container. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/list.c | 78 ++++++++++++++++++++++------------------------ dlls/netprofm/tests/list.c | 20 ++++++++++-- 2 files changed, 55 insertions(+), 43 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index d59ee0c..3f57284 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -75,6 +75,15 @@ struct connection VARIANT_BOOL connected; }; +struct connection_point +{ + IConnectionPoint IConnectionPoint_iface; + IConnectionPointContainer *container; + IID iid; + struct list sinks; + DWORD cookie; +}; + struct list_manager { INetworkListManager INetworkListManager_iface; @@ -83,16 +92,9 @@ struct list_manager LONG refs; struct list networks; struct list connections; -}; - -struct connection_point -{ - IConnectionPoint IConnectionPoint_iface; - IConnectionPointContainer *container; - LONG refs; - IID iid; - struct list sinks; - DWORD cookie; + struct connection_point list_mgr_cp; + struct connection_point cost_mgr_cp; + struct connection_point conn_mgr_cp; }; struct sink_entry @@ -146,21 +148,14 @@ static ULONG WINAPI connection_point_AddRef( IConnectionPoint *iface ) { struct connection_point *cp = impl_from_IConnectionPoint( iface ); - return InterlockedIncrement( &cp->refs ); + return IConnectionPointContainer_AddRef( cp->container ); } static ULONG WINAPI connection_point_Release( IConnectionPoint *iface ) { struct connection_point *cp = impl_from_IConnectionPoint( iface ); - LONG refs = InterlockedDecrement( &cp->refs ); - if (!refs) - { - TRACE( "destroying %p\n", cp ); - IConnectionPointContainer_Release( cp->container ); - heap_free( cp ); - } - return refs; + return IConnectionPointContainer_Release( cp->container ); } static HRESULT WINAPI connection_point_GetConnectionInterface( @@ -271,27 +266,16 @@ static const IConnectionPointVtbl connection_point_vtbl = connection_point_EnumConnections }; -static HRESULT connection_point_create( - IConnectionPoint **obj, +static void connection_point_init( + struct connection_point *cp, REFIID riid, IConnectionPointContainer *container ) { - struct connection_point *cp; - TRACE( "%p, %s, %p\n", obj, debugstr_guid(riid), container ); - - if (!(cp = heap_alloc( sizeof(*cp) ))) return E_OUTOFMEMORY; cp->IConnectionPoint_iface.lpVtbl = &connection_point_vtbl; cp->container = container; - cp->refs = 1; cp->cookie = 0; cp->iid = *riid; list_init( &cp->sinks ); - - IConnectionPointContainer_AddRef( container ); - - *obj = &cp->IConnectionPoint_iface; - TRACE( "returning iface %p\n", *obj ); - return S_OK; } static inline struct network *impl_from_INetwork( @@ -1394,21 +1378,28 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo REFIID riid, IConnectionPoint **cp) { struct list_manager *This = impl_from_IConnectionPointContainer( iface ); + struct connection_point *ret; TRACE( "%p, %s, %p\n", This, debugstr_guid(riid), cp ); if (!riid || !cp) return E_POINTER; - if (IsEqualGUID( riid, &IID_INetworkListManagerEvents ) || - IsEqualGUID( riid, &IID_INetworkCostManagerEvents ) || - IsEqualGUID( riid, &IID_INetworkConnectionEvents )) - return connection_point_create( cp, riid, iface ); - - FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + if (IsEqualGUID( riid, &IID_INetworkListManagerEvents )) + ret = &This->list_mgr_cp; + else if (IsEqualGUID( riid, &IID_INetworkCostManagerEvents )) + ret = &This->cost_mgr_cp; + else if (IsEqualGUID( riid, &IID_INetworkConnectionEvents )) + ret = &This->conn_mgr_cp; + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + *cp = NULL; + return E_NOINTERFACE; + } - *cp = NULL; - return E_NOINTERFACE; + IConnectionPoint_AddRef( *cp = &ret->IConnectionPoint_iface ); + return S_OK; } static const struct IConnectionPointContainerVtbl cpc_vtbl = @@ -1784,6 +1775,13 @@ HRESULT list_manager_create( void **obj ) init_networks( mgr ); mgr->refs = 1; + connection_point_init( &mgr->list_mgr_cp, &IID_INetworkListManagerEvents, + &mgr->IConnectionPointContainer_iface ); + connection_point_init( &mgr->cost_mgr_cp, &IID_INetworkCostManagerEvents, + &mgr->IConnectionPointContainer_iface); + connection_point_init( &mgr->conn_mgr_cp, &IID_INetworkConnectionEvents, + &mgr->IConnectionPointContainer_iface ); + *obj = &mgr->INetworkListManager_iface; TRACE( "returning iface %p\n", *obj ); return S_OK; diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 3937b2f..0a1f854 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -222,7 +222,7 @@ static void test_INetworkListManager( void ) INetworkCostManager *cost_mgr; NLM_CONNECTIVITY connectivity; VARIANT_BOOL connected; - IConnectionPoint *pt; + IConnectionPoint *pt, *pt2; IEnumNetworks *network_iter; INetwork *network; IEnumNetworkConnections *conn_iter; @@ -319,7 +319,10 @@ static void test_INetworkListManager( void ) hr = IConnectionPoint_Unadvise( pt, cookie ); ok( hr == S_OK, "Unadvise failed: %08x\n", hr ); - IConnectionPoint_Release( pt ); + hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkListManagerEvents, &pt2 ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pt == pt2, "pt != pt2\n"); + IConnectionPoint_Release( pt2 ); hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkCostManagerEvents, &pt ); ok( hr == S_OK || hr == CO_E_FAILEDTOIMPERSONATE, "got %08x\n", hr ); @@ -355,7 +358,18 @@ static void test_INetworkListManager( void ) } IEnumNetworkConnections_Release( conn_iter ); } - INetworkListManager_Release( mgr ); + + /* cps and their container share the same ref count */ + IConnectionPoint_AddRef( pt ); + IConnectionPoint_AddRef( pt ); + + ref1 = IConnectionPoint_Release( pt ); + ref2 = INetworkListManager_Release( mgr ); + ok( ref2 == ref1 - 1, "ref = %u\n", ref1 ); + + IConnectionPoint_Release( pt ); + ref1 = IConnectionPoint_Release( pt ); + ok( !ref1, "ref = %u\n", ref1 ); } START_TEST( list )
1
0
0
0
Hugh McMaster : reg/tests: Fix two copy/paste errors.
by Alexandre Julliard
20 Aug '17
20 Aug '17
Module: wine Branch: master Commit: 5266ef3bc587eb0f0881016d87da0bb0b859b498 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5266ef3bc587eb0f0881016d8…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 18 09:31:39 2017 +0000 reg/tests: Fix two copy/paste errors. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 7863688..b042614 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -3085,14 +3085,14 @@ static void test_unicode_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_key(hkey, "Subkey1c "); - todo_wine err = RegDeleteKeyA(hkey, "Subkey1c "); + err = RegDeleteKeyA(hkey, "Subkey1c "); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_key(hkey, "Subkey1d\t"); - todo_wine err = RegDeleteKeyA(hkey, "Subkey1d\t"); + err = RegDeleteKeyA(hkey, "Subkey1d\t"); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
1
0
0
0
Hugh McMaster : reg: Use the correct return codes during the import operation.
by Alexandre Julliard
20 Aug '17
20 Aug '17
Module: wine Branch: master Commit: 5de883cc9f7bb45ea9a576c1830ad9fb46b1711e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5de883cc9f7bb45ea9a576c18…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 18 09:31:30 2017 +0000 reg: Use the correct return codes during the import operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 6 - programs/reg/tests/reg.c | 532 +++++++++++++++++++++++------------------------ 2 files changed, 266 insertions(+), 272 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=5de883cc9f7bb45ea9a57…
1
0
0
0
Hugh McMaster : reg: Delete registry keys via the state machine.
by Alexandre Julliard
20 Aug '17
20 Aug '17
Module: wine Branch: master Commit: 56e58e47af8abc160fef998458327f59e878fbdb URL:
http://source.winehq.org/git/wine.git/?a=commit;h=56e58e47af8abc160fef99845…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 18 09:31:17 2017 +0000 reg: Delete registry keys via the state machine. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 27 +++++++++++++++++++++++++-- programs/reg/tests/reg.c | 36 ++++++++++++++++++------------------ 2 files changed, 43 insertions(+), 20 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index 654235b..c487924 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -66,6 +66,7 @@ enum parser_state PARSE_WIN31_LINE, /* parsing a Windows 3.1 registry line */ LINE_START, /* at the beginning of a registry line */ KEY_NAME, /* parsing a key name */ + DELETE_KEY, /* deleting a registry key */ DEFAULT_VALUE_NAME, /* parsing a default value name */ QUOTED_VALUE_NAME, /* parsing a double-quoted value name */ DATA_START, /* preparing for data parsing operations */ @@ -105,6 +106,7 @@ static WCHAR *header_state(struct parser *parser, WCHAR *pos); static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos); static WCHAR *line_start_state(struct parser *parser, WCHAR *pos); static WCHAR *key_name_state(struct parser *parser, WCHAR *pos); +static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos); static WCHAR *default_value_name_state(struct parser *parser, WCHAR *pos); static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos); static WCHAR *data_start_state(struct parser *parser, WCHAR *pos); @@ -124,6 +126,7 @@ static const parser_state_func parser_funcs[NB_PARSER_STATES] = parse_win31_line_state, /* PARSE_WIN31_LINE */ line_start_state, /* LINE_START */ key_name_state, /* KEY_NAME */ + delete_key_state, /* DELETE_KEY */ default_value_name_state, /* DEFAULT_VALUE_NAME */ quoted_value_name_state, /* QUOTED_VALUE_NAME */ data_start_state, /* DATA_START */ @@ -581,8 +584,8 @@ static WCHAR *key_name_state(struct parser *parser, WCHAR *pos) if (*p == '-') { - FIXME("key deletion not yet implemented\n"); - goto done; + set_state(parser, DELETE_KEY); + return p + 1; } else if (open_key(parser, p) != ERROR_SUCCESS) output_message(STRING_OPEN_KEY_FAILED, p); @@ -592,6 +595,26 @@ done: return p; } +/* handler for parser DELETE_KEY state */ +static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *p = pos; + + if (*p == 'H' || *p == 'h') + { + HKEY root; + WCHAR *path; + + root = parse_key_name(p, &path); + + if (root && path && *path) + RegDeleteTreeW(root, path); + } + + set_state(parser, LINE_START); + return p; +} + /* handler for parser DEFAULT_VALUE_NAME state */ static WCHAR *default_value_name_state(struct parser *parser, WCHAR *pos) { diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 8ddeabc..6409196 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1713,8 +1713,8 @@ static void test_import(void) "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_nonexist(hkey, "Subkey2a"); - todo_wine verify_key_nonexist(hkey, "Subkey2b"); + verify_key_nonexist(hkey, "Subkey2a"); + verify_key_nonexist(hkey, "Subkey2b"); /* Test case sensitivity when creating and deleting registry keys. */ test_import_str("REGEDIT4\n\n" @@ -1728,8 +1728,8 @@ static void test_import(void) "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" "[-hKeY_cUrReNt_UsEr\\" KEY_BASE "\\sUbKeY3B]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_nonexist(hkey, "Subkey3a"); - todo_wine verify_key_nonexist(hkey, "Subkey3b"); + verify_key_nonexist(hkey, "Subkey3a"); + verify_key_nonexist(hkey, "Subkey3b"); /* Test value deletion. We start by creating some registry values. */ test_import_str("REGEDIT4\n\n" @@ -2278,7 +2278,7 @@ static void test_import(void) ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); } static void test_unicode_import(void) @@ -2330,39 +2330,39 @@ static void test_unicode_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test1\"=\"Value\"\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Test1"); + verify_reg_nonexist(hkey, "Test1"); test_import_wstr("\xef\xbb\xbfregedit4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test2\"=\"Value\"\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - todo_wine verify_reg_nonexist(hkey, "Test2"); + verify_reg_nonexist(hkey, "Test2"); test_import_wstr("\xef\xbb\xbfRegedit4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test3\"=\"Value\"\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - todo_wine verify_reg_nonexist(hkey, "Test3"); + verify_reg_nonexist(hkey, "Test3"); test_import_wstr("\xef\xbb\xbfREGEDIT 4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test4\"=\"Value\"\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Test4"); + verify_reg_nonexist(hkey, "Test4"); test_import_wstr("\xef\xbb\xbfREGEDIT4FOO\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test5\"=\"Value\"\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Test5"); + verify_reg_nonexist(hkey, "Test5"); test_import_wstr("\xef\xbb\xbfREGEDIT4 FOO\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test6\"=\"Value\"\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Test6"); + verify_reg_nonexist(hkey, "Test6"); test_import_wstr("\xef\xbb\xbfREGEDIT5\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -3169,8 +3169,8 @@ static void test_unicode_import(void) "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_nonexist(hkey, "Subkey2a"); - todo_wine verify_key_nonexist(hkey, "Subkey2b"); + verify_key_nonexist(hkey, "Subkey2a"); + verify_key_nonexist(hkey, "Subkey2b"); /* Test case sensitivity when creating and deleting registry keys. */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -3184,8 +3184,8 @@ static void test_unicode_import(void) "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" "[-hKeY_cUrReNt_UsEr\\" KEY_BASE "\\sUbKeY3B]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_nonexist(hkey, "Subkey3a"); - todo_wine verify_key_nonexist(hkey, "Subkey3b"); + verify_key_nonexist(hkey, "Subkey3a"); + verify_key_nonexist(hkey, "Subkey3b"); /* Test value deletion. We start by creating some registry values. */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -3744,7 +3744,7 @@ static void test_unicode_import(void) ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); } static void test_import_with_whitespace(void) @@ -3891,7 +3891,7 @@ static void test_import_with_whitespace(void) ok(err == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", err); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", err); } static void test_unicode_import_with_whitespace(void) @@ -4038,7 +4038,7 @@ static void test_unicode_import_with_whitespace(void) ok(err == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", err); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", err); } static void test_import_31(void)
1
0
0
0
Hugh McMaster : reg: Delete registry values via the state machine.
by Alexandre Julliard
20 Aug '17
20 Aug '17
Module: wine Branch: master Commit: d90f2a55bf270c53ff7edb1f768c657e677ace01 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d90f2a55bf270c53ff7edb1f7…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 18 09:31:08 2017 +0000 reg: Delete registry values via the state machine. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 23 +++++++++++++++++++---- programs/reg/tests/reg.c | 16 ++++++++-------- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index 544a085..654235b 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -69,6 +69,7 @@ enum parser_state DEFAULT_VALUE_NAME, /* parsing a default value name */ QUOTED_VALUE_NAME, /* parsing a double-quoted value name */ DATA_START, /* preparing for data parsing operations */ + DELETE_VALUE, /* deleting a registry value */ DATA_TYPE, /* parsing the registry data type */ STRING_DATA, /* parsing REG_SZ data */ DWORD_DATA, /* parsing DWORD data */ @@ -107,6 +108,7 @@ static WCHAR *key_name_state(struct parser *parser, WCHAR *pos); static WCHAR *default_value_name_state(struct parser *parser, WCHAR *pos); static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos); static WCHAR *data_start_state(struct parser *parser, WCHAR *pos); +static WCHAR *delete_value_state(struct parser *parser, WCHAR *pos); static WCHAR *data_type_state(struct parser *parser, WCHAR *pos); static WCHAR *string_data_state(struct parser *parser, WCHAR *pos); static WCHAR *dword_data_state(struct parser *parser, WCHAR *pos); @@ -125,6 +127,7 @@ static const parser_state_func parser_funcs[NB_PARSER_STATES] = default_value_name_state, /* DEFAULT_VALUE_NAME */ quoted_value_name_state, /* QUOTED_VALUE_NAME */ data_start_state, /* DATA_START */ + delete_value_state, /* DELETE_VALUE */ data_type_state, /* DATA_TYPE */ string_data_state, /* STRING_DATA */ dword_data_state, /* DWORD_DATA */ @@ -642,10 +645,7 @@ static WCHAR *data_start_state(struct parser *parser, WCHAR *pos) p[len] = 0; if (*p == '-') - { - FIXME("value deletion not yet implemented\n"); - goto invalid; - } + set_state(parser, DELETE_VALUE); else set_state(parser, DATA_TYPE); return p; @@ -655,6 +655,21 @@ invalid: return p; } +/* handler for parser DELETE_VALUE state */ +static WCHAR *delete_value_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *p = pos + 1; + + while (*p == ' ' || *p == '\t') p++; + if (*p && *p != ';') goto done; + + RegDeleteValueW(parser->hkey, parser->value_name); + +done: + set_state(parser, LINE_START); + return p; +} + /* handler for parser DATA_TYPE state */ static WCHAR *data_type_state(struct parser *parser, WCHAR *pos) { diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 991284f..8ddeabc 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1758,11 +1758,11 @@ static void test_import(void) "\"Wine46e\"=- ;comment\n" "\"Wine46f\"=- #comment\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine46a"); - todo_wine verify_reg_nonexist(hkey, "Wine46b"); - todo_wine verify_reg_nonexist(hkey, "Wine46c"); + verify_reg_nonexist(hkey, "Wine46a"); + verify_reg_nonexist(hkey, "Wine46b"); + verify_reg_nonexist(hkey, "Wine46c"); verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); - todo_wine verify_reg_nonexist(hkey, "Wine46e"); + verify_reg_nonexist(hkey, "Wine46e"); verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); /* Test the accepted range of the hex-based data types */ @@ -3215,11 +3215,11 @@ static void test_unicode_import(void) "\"Wine46e\"=- ;comment\n" "\"Wine46f\"=- #comment\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine46a"); - todo_wine verify_reg_nonexist(hkey, "Wine46b"); - todo_wine verify_reg_nonexist(hkey, "Wine46c"); + verify_reg_nonexist(hkey, "Wine46a"); + verify_reg_nonexist(hkey, "Wine46b"); + verify_reg_nonexist(hkey, "Wine46c"); verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); - todo_wine verify_reg_nonexist(hkey, "Wine46e"); + verify_reg_nonexist(hkey, "Wine46e"); verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); /* Test the accepted range of the hex-based data types */
1
0
0
0
Hugh McMaster : reg: Handle unknown registry data types in the state machine.
by Alexandre Julliard
20 Aug '17
20 Aug '17
Module: wine Branch: master Commit: db98cc4ced9772b59b0a17124b042bbf870030f9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=db98cc4ced9772b59b0a17124…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 18 09:30:59 2017 +0000 reg: Handle unknown registry data types in the state machine. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index efb09e6..544a085 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -75,6 +75,7 @@ enum parser_state HEX_DATA, /* parsing REG_BINARY, REG_NONE, REG_EXPAND_SZ or REG_MULTI_SZ data */ EOL_BACKSLASH, /* preparing to parse multiple lines of hex data */ HEX_MULTILINE, /* parsing multiple lines of hex data */ + UNKNOWN_DATA, /* parsing an unhandled or invalid data type */ SET_VALUE, /* adding a value to the registry */ NB_PARSER_STATES }; @@ -112,6 +113,7 @@ static WCHAR *dword_data_state(struct parser *parser, WCHAR *pos); static WCHAR *hex_data_state(struct parser *parser, WCHAR *pos); static WCHAR *eol_backslash_state(struct parser *parser, WCHAR *pos); static WCHAR *hex_multiline_state(struct parser *parser, WCHAR *pos); +static WCHAR *unknown_data_state(struct parser *parser, WCHAR *pos); static WCHAR *set_value_state(struct parser *parser, WCHAR *pos); static const parser_state_func parser_funcs[NB_PARSER_STATES] = @@ -129,6 +131,7 @@ static const parser_state_func parser_funcs[NB_PARSER_STATES] = hex_data_state, /* HEX_DATA */ eol_backslash_state, /* EOL_BACKSLASH */ hex_multiline_state, /* HEX_MULTILINE */ + unknown_data_state, /* UNKNOWN_DATA */ set_value_state, /* SET_VALUE */ }; @@ -675,7 +678,7 @@ static WCHAR *data_type_state(struct parser *parser, WCHAR *pos) set_state(parser, HEX_DATA); break; default: - set_state(parser, LINE_START); + set_state(parser, UNKNOWN_DATA); } return line; @@ -794,6 +797,15 @@ invalid: return line; } +/* handler for parser UNKNOWN_DATA state */ +static WCHAR *unknown_data_state(struct parser *parser, WCHAR *pos) +{ + FIXME("Unknown registry data type [0x%x]\n", parser->data_type); + + set_state(parser, LINE_START); + return pos; +} + /* handler for parser SET_VALUE state */ static WCHAR *set_value_state(struct parser *parser, WCHAR *pos) {
1
0
0
0
Hugh McMaster : reg: Import hex data via the state machine.
by Alexandre Julliard
20 Aug '17
20 Aug '17
Module: wine Branch: master Commit: 32d53681b9f36f3f13f6a1f3c5c58e7a790afc8c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=32d53681b9f36f3f13f6a1f3c…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 18 09:30:50 2017 +0000 reg: Import hex data via the state machine. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 179 ++++++++++++++++++- programs/reg/tests/reg.c | 448 +++++++++++++++++++++++------------------------ 2 files changed, 401 insertions(+), 226 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=32d53681b9f36f3f13f6a…
1
0
0
0
Hugh McMaster : reg: Import REG_DWORD data via the state machine.
by Alexandre Julliard
20 Aug '17
20 Aug '17
Module: wine Branch: master Commit: f1874c16677d386636c184d35a164b42381b8dfa URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f1874c16677d386636c184d35…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 18 09:30:38 2017 +0000 reg: Import REG_DWORD data via the state machine. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 60 +++++++++++++++++++++++++++++++ programs/reg/tests/reg.c | 92 ++++++++++++++++++++++-------------------------- 2 files changed, 103 insertions(+), 49 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1874c16677d386636c18…
1
0
0
0
Hugh McMaster : reg: Parse data types and import REG_SZ data via the state machine.
by Alexandre Julliard
20 Aug '17
20 Aug '17
Module: wine Branch: master Commit: 038f1c6986510c862356dbf06d43b85183a4b8da URL:
http://source.winehq.org/git/wine.git/?a=commit;h=038f1c6986510c862356dbf06…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 18 09:30:28 2017 +0000 reg: Parse data types and import REG_SZ data via the state machine. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 129 +++++++++++++++++- programs/reg/tests/reg.c | 330 +++++++++++++++++++++++------------------------ 2 files changed, 290 insertions(+), 169 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=038f1c6986510c862356d…
1
0
0
0
Hugh McMaster : reg: Parse key names and value names in the state machine.
by Alexandre Julliard
20 Aug '17
20 Aug '17
Module: wine Branch: master Commit: 05659343c1524dd6b525cbc273a1584e4ce6015a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=05659343c1524dd6b525cbc27…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 18 09:30:17 2017 +0000 reg: Parse key names and value names in the state machine. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 4 + po/bg.po | 4 + po/ca.po | 6 + po/cs.po | 4 + po/da.po | 4 + po/de.po | 6 + po/el.po | 4 + po/en.po | 4 + po/en_US.po | 4 + po/eo.po | 4 + po/es.po | 4 + po/fa.po | 4 + po/fi.po | 6 + po/fr.po | 6 + po/he.po | 4 + po/hi.po | 4 + po/hr.po | 4 + po/hu.po | 4 + po/it.po | 4 + po/ja.po | 6 + po/ko.po | 4 + po/lt.po | 6 + po/ml.po | 4 + po/nb_NO.po | 6 + po/nl.po | 4 + po/or.po | 4 + po/pa.po | 4 + po/pl.po | 6 + po/pt_BR.po | 6 + po/pt_PT.po | 4 + po/rm.po | 4 + po/ro.po | 4 + po/ru.po | 6 + po/sk.po | 4 + po/sl.po | 4 + po/sr_RS(a)cyrillic.po | 4 + po/sr_RS(a)latin.po | 4 + po/sv.po | 4 + po/te.po | 4 + po/th.po | 4 + po/tr.po | 8 + po/uk.po | 6 + po/wa.po | 4 + po/wine.pot | 4 + po/zh_CN.po | 6 + po/zh_TW.po | 4 + programs/reg/import.c | 187 +++++++++++ programs/reg/reg.rc | 1 + programs/reg/resource.h | 1 + programs/reg/tests/reg.c | 800 +++++++++++++++++++++++------------------------ 50 files changed, 801 insertions(+), 400 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=05659343c1524dd6b525c…
1
0
0
0
← Newer
1
...
15
16
17
18
19
20
21
...
36
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
Results per page:
10
25
50
100
200