From 7bd0add306aad22d7e423b405683b46fc911d489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Thu, 5 May 2005 18:32:46 +0000 Subject: [PATCH] Sync to Wine-20050419: Peter Berg Larsen - Replace strncpy with memcpy or lstrcpyn. Jakob Eriksson - Get rid of HeapAlloc casts. svn path=/trunk/; revision=15012 --- reactos/lib/oledlg/insobjdlg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/lib/oledlg/insobjdlg.c b/reactos/lib/oledlg/insobjdlg.c index b667e9f148e..0d4a2cd41e7 100644 --- 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; if (ERROR_SUCCESS == RegQueryValueA(hkey, NULL, keydesc, &len)) { - CLSID* lpclsid = (CLSID*) HeapAlloc(GetProcessHeap(), 0, sizeof(CLSID)); + CLSID* lpclsid = HeapAlloc(GetProcessHeap(), 0, sizeof(CLSID)); memcpy(lpclsid, &clsid, sizeof(CLSID)); len = SendMessageA(pdlgInfo->hwndObjTypeLB, LB_ADDSTRING, 0, (LPARAM)keydesc); @@ -479,7 +479,7 @@ static BOOL UIINSERTOBJECTDLG_OnOpen(InsertObjectDlgInfo* pdlgInfo) WCHAR wcsFile[MAX_PATH]; SendMessageA(pdlgInfo->hwndFileTB, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)fname); - strncpy(pdlgInfo->lpOleUIInsertObject->lpszFile, fname, pdlgInfo->lpOleUIInsertObject->cchFile); + lstrcpynA(pdlgInfo->lpOleUIInsertObject->lpszFile, fname, pdlgInfo->lpOleUIInsertObject->cchFile); RtlMultiByteToUnicodeN(wcsFile, MAX_PATH, NULL, fname, MAX_PATH); if (ERROR_SUCCESS == (hres = GetClassFile(wcsFile, &pdlgInfo->lpOleUIInsertObject->clsid)))