[INPUT]

- Use _wcsdup instead internal DuplicateString
- Check of the returned value of the wcsstr function is added

svn path=/trunk/; revision=72301

reactos/dll/cpl/input/input.h

@@ -75,23 +75,6 @@ INT_PTR CALLBACK
 ChangeKeySeqDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 
-static inline WCHAR*
-DuplicateString(const WCHAR *pszString)
-{
-    WCHAR *pszDuplicate;
-    size_t size;
-
-    size = (wcslen(pszString) + 1) * sizeof(WCHAR);
-
-    pszDuplicate = (WCHAR*) malloc(size);
-    if (pszDuplicate != NULL)
-    {
-        StringCbCopyW(pszDuplicate, size, pszString);
-    }
-
-    return pszDuplicate;
-}
-
 static inline DWORD
 DWORDfromString(const WCHAR *pszString)
 {

reactos/dll/cpl/input/input_list.c

@@ -318,7 +318,7 @@ InputList_Add(LOCALE_LIST_NODE *pLocale, LAYOUT_LIST_NODE *pLayout)
         if (len > 0)
         {
             szIndicator[len - 1] = 0;
-            pInput->pszIndicator = DuplicateString(szIndicator);
+            pInput->pszIndicator = _wcsdup(szIndicator);
         }
     }
 
@@ -447,7 +447,7 @@ InputList_Create(VOID)
                         if (len > 0)
                         {
                             szIndicator[len - 1] = 0;
-                            pInput->pszIndicator = DuplicateString(szIndicator);
+                            pInput->pszIndicator = _wcsdup(szIndicator);
                         }
                     }
                 }

reactos/dll/cpl/input/layout_list.c

@@ -28,7 +28,7 @@ LayoutList_AppendNode(DWORD dwId, DWORD dwSpecialId, const WCHAR *pszName)
 
     ZeroMemory(pNew, sizeof(LAYOUT_LIST_NODE));
 
-    pNew->pszName = DuplicateString(pszName);
+    pNew->pszName = _wcsdup(pszName);
     if (pNew->pszName == NULL)
     {
         free(pNew);
@@ -153,10 +153,8 @@ LayoutList_Create(VOID)
                                          (LPBYTE)szBuffer, &dwSize) == ERROR_SUCCESS &&
                         szBuffer[0] == L'@')
                     {
-                        WCHAR szPath[MAX_PATH];
                         WCHAR *pBuffer;
                         WCHAR *pIndex;
-                        INT iIndex;
 
                         /* Move to the position after the character "@" */
                         pBuffer = szBuffer + 1;
@@ -164,6 +162,11 @@ LayoutList_Create(VOID)
                         /* Get a pointer to the beginning ",-" */
                         pIndex = wcsstr(pBuffer, L",-");
 
+                        if (pIndex != NULL)
+                        {
+                            WCHAR szPath[MAX_PATH];
+                            INT iIndex;
+
                             /* Convert the number in the string after the ",-" */
                             iIndex = _wtoi(pIndex + 2);
 
@@ -203,6 +206,11 @@ LayoutList_Create(VOID)
                         }
                         else
                         {
+                            goto NotTranslated;
+                        }
+                    }
+                    else
+                    {
 NotTranslated:
                         dwSize = sizeof(szBuffer);
 

reactos/dll/cpl/input/locale_list.c

@@ -28,7 +28,7 @@ LocaleList_Append(DWORD dwId, const WCHAR *pszName)
 
     ZeroMemory(pNew, sizeof(LOCALE_LIST_NODE));
 
-    pNew->pszName = DuplicateString(pszName);
+    pNew->pszName = _wcsdup(pszName);
     if (pNew->pszName == NULL)
     {
         free(pNew);