diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index f54bfdff73d..32632211b8b 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -2280,9 +2280,7 @@ static HRESULT StorageImpl_Construct(
          goto end;
       }
       strcpyW(This->pwcsName, pwcsName);
-
-      memcpy(This->base.filename, pwcsName, DIRENTRY_NAME_BUFFER_LEN-1);
-      This->base.filename[DIRENTRY_NAME_BUFFER_LEN-1] = 0;
+      lstrcpynW(This->base.filename, pwcsName, DIRENTRY_NAME_BUFFER_LEN);
   }
 
   /*