瀏覽代碼

* sqldb/dbase: explicit cast to pchar to avoid writing widestrings in dbf header. Fixes mantis #14473

git-svn-id: trunk@24069 -
reiniero 12 年之前
父節點
當前提交
c9161bc51d
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      packages/fcl-db/src/dbase/dbf_dbffile.pas

+ 3 - 3
packages/fcl-db/src/dbase/dbf_dbffile.pas

@@ -595,10 +595,10 @@ begin
       RecordSize := SizeOf(rFieldDescVII);
       FillChar(Header^, HeaderSize, #0);
       PDbfHdr(Header)^.VerDBF := $04;
-      // write language string
+      // write language string. FPC needs an explicit cast to pchar to avoid calling widestring version of StrPLCopy
       StrPLCopy(
-        @PAfterHdrVII(PChar(Header)+SizeOf(rDbfHdr))^.LanguageDriverName[32],
-        ConstructLangName(FFileCodePage, lLocaleID, false), 
+        PChar(@PAfterHdrVII(PChar(Header)+SizeOf(rDbfHdr))^.LanguageDriverName[32]),
+        PChar(ConstructLangName(FFileCodePage, lLocaleID, false)),
         63-32);
       lFieldDescPtr := @lFieldDescVII;
     end else begin