André Hentschel : oleview: Fix bytecount for memmoves (Coverity).

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 79e6537c10b46f8342b77a1c6e73678d2401143b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=79e6537c10b46f8342b77a1c6e...

Author: André Hentschel <nerv(a)dawncrow.de>
Date:   Mon Jan 30 23:11:08 2017 +0100

oleview: Fix bytecount for memmoves (Coverity).

Signed-off-by: André Hentschel <nerv(a)dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit dd3c58c497a58189f5ead6d223f3f8d610d4b3c7)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 programs/oleview/details.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/programs/oleview/details.c b/programs/oleview/details.c
index b194f6f..fda9b7c 100644
--- a/programs/oleview/details.c
+++ b/programs/oleview/details.c
@@ -139,7 +139,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad
         }
         else if(addings && !memcmp(wszName, wszProxyStubClsid32, sizeof(WCHAR[17])))
         {
-            lenData = sizeof(WCHAR[MAX_LOAD_STRING]);
+            lenData = sizeof(wszData);
 
             RegQueryValueW(hCurKey, NULL, wszData, (LONG *)&lenData);
             RegCloseKey(hCurKey);
@@ -155,7 +155,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad
 
             RegCloseKey(hCurKey);
 
-            memmove(&wszData[6], wszData, lenData * sizeof(WCHAR));
+            memmove(&wszData[6], wszData, lenData);
             memcpy(wszData, wszCLSID, sizeof(WCHAR[6]));
             wszData[5] = '\\';
 
@@ -183,7 +183,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad
 
             RegCloseKey(hCurKey);
 
-            memmove(&wszData[8], wszData, lenData * sizeof(WCHAR));
+            memmove(&wszData[8], wszData, lenData);
             memcpy(wszData, wszTypeLib, sizeof(WCHAR[8]));
             wszData[7] = '\\';
             RegOpenKeyW(HKEY_CLASSES_ROOT, wszData, &hCurKey);
@@ -229,12 +229,11 @@ static void CreateReg(WCHAR *buffer)
             *path = '\\';
             path += 1;
 
-            lenTree = sizeof(WCHAR[MAX_LOAD_STRING]);
+            lenTree = sizeof(wszTree);
 
             if(RegQueryValueW(hKey, NULL, wszTree, (LONG *)&lenTree) == ERROR_SUCCESS)
             {
-                memmove(&wszTree[lenBuffer-lastLenBuffer+3], wszTree,
-                        lenTree * sizeof(WCHAR));
+                memmove(&wszTree[lenBuffer-lastLenBuffer+3], wszTree, lenTree);
                 memcpy(wszTree, &buffer[lastLenBuffer],
                         (lenBuffer - lastLenBuffer) * sizeof(WCHAR));