Frédéric Delanoy : cmd: Fix invalid RegSetValueExW call in WCMD_assoc.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 97b074d2dac2063acfab918bf0ae320bb9c19dcf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=97b074d2dac2063acfab918bf0...

Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com>
Date:   Mon Aug 29 21:45:17 2011 +0200

cmd: Fix invalid RegSetValueExW call in WCMD_assoc.

---

 programs/cmd/builtins.c                  |    3 ++-
 programs/cmd/tests/test_builtins.cmd.exp |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index 42e7635..7f003ed 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -2943,7 +2943,8 @@ void WCMD_assoc (const WCHAR *command, BOOL assoc) {
                               accessOptions, NULL, &readKey, NULL);
           if (rc == ERROR_SUCCESS) {
             rc = RegSetValueExW(readKey, NULL, 0, REG_SZ,
-                                 (LPBYTE)newValue, strlenW(newValue));
+                                (LPBYTE)newValue,
+                                sizeof(WCHAR) * (strlenW(newValue) + 1));
             RegCloseKey(readKey);
           }
 
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 1e393f3..296f9b8 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -658,9 +658,9 @@ file created in read-only dir
 ...setting association
 ***
 .foo=bar
-(a)todo_wine@.foo=bar
+.foo=bar
 +++
-(a)todo_wine@.foo=bar
+.foo=bar
 ...resetting association
 ***
 +++