Sync to Wine-20050419:

Peter Berg Larsen <pebl@math.ku.dk>
- Replace strncpy with memcpy or lstrcpyn.
Jakob Eriksson <jakov@vmlinux.org>
- Get rid of HeapAlloc casts.

svn path=/trunk/; revision=15012

diff --git a/reactos/lib/oledlg/insobjdlg.c b/reactos/lib/oledlg/insobjdlg.c
index b667e9f..0d4a2cd 100644 (file)
--- a/reactos/lib/oledlg/insobjdlg.c
+++ b/reactos/lib/oledlg/insobjdlg.c
@@ -375,7 +375,7 @@ static BOOL UIINSERTOBJECTDLG_PopulateObjectTypes(InsertObjectDlgInfo* pdlgInfo)
     len = MAX_PATH;\r
     if (ERROR_SUCCESS == RegQueryValueA(hkey, NULL, keydesc, &len))\r
     {\r
-       CLSID* lpclsid = (CLSID*) HeapAlloc(GetProcessHeap(), 0, sizeof(CLSID));\r
+       CLSID* lpclsid = HeapAlloc(GetProcessHeap(), 0, sizeof(CLSID));\r
        memcpy(lpclsid, &clsid, sizeof(CLSID));\r
 \r
        len = SendMessageA(pdlgInfo->hwndObjTypeLB, LB_ADDSTRING, 0, (LPARAM)keydesc);\r
@@ -479,7 +479,7 @@ static BOOL UIINSERTOBJECTDLG_OnOpen(InsertObjectDlgInfo* pdlgInfo)
       WCHAR wcsFile[MAX_PATH];\r
 \r
       SendMessageA(pdlgInfo->hwndFileTB, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)fname);\r
-      strncpy(pdlgInfo->lpOleUIInsertObject->lpszFile, fname, pdlgInfo->lpOleUIInsertObject->cchFile);\r
+      lstrcpynA(pdlgInfo->lpOleUIInsertObject->lpszFile, fname, pdlgInfo->lpOleUIInsertObject->cchFile);\r
 \r
       RtlMultiByteToUnicodeN(wcsFile, MAX_PATH, NULL, fname, MAX_PATH); \r
       if (ERROR_SUCCESS == (hres = GetClassFile(wcsFile, &pdlgInfo->lpOleUIInsertObject->clsid)))\r