August 2017 - Wine-Commits - list.winehq.org

Jacek Caban : netprofm: Implement connection points as the same object as their container.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

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

Hugh McMaster : reg/tests: Fix two copy/paste errors.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

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

Hugh McMaster : reg: Use the correct return codes during the import operation.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

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

Hugh McMaster : reg: Delete registry keys via the state machine.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

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

Hugh McMaster : reg: Delete registry values via the state machine.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

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

Hugh McMaster : reg: Introduce a partial state machine for importing Windows 3.1 registry data.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

1 0

Hugh McMaster : reg: Import hex data via the state machine.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

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

Hugh McMaster : reg: Import REG_DWORD data via the state machine.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

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

Hugh McMaster : reg: Parse data types and import REG_SZ data via the state machine.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

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

Hugh McMaster : reg: Parse key names and value names in the state machine.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

1 0