瀏覽代碼

Merged revisions 10139 via svnmerge from
http://svn.freepascal.org/svn/fpc/trunk

........
r10139 | yury | 2008-02-01 21:59:12 +0200 (Пт, 01 фев 2008) | 1 line

* Fixed bug #10716.
........

git-svn-id: branches/fixes_2_2@10140 -

yury 17 年之前
父節點
當前提交
ce4ed71c6c
共有 2 個文件被更改,包括 2 次插入3 次删除
  1. 1 2
      rtl/wince/system.pp
  2. 1 1
      rtl/wince/sysutils.pp

+ 1 - 2
rtl/wince/system.pp

@@ -310,7 +310,6 @@ const
      MB_USEGLYPHCHARS = 4;
      MB_USEGLYPHCHARS = 4;
      CP_ACP = 0;
      CP_ACP = 0;
      CP_OEMCP = 1;
      CP_OEMCP = 1;
-     WC_NO_BEST_FIT_CHARS = $400;
 
 
 function MultiByteToWideChar(CodePage:UINT; dwFlags:DWORD; lpMultiByteStr:PChar; cchMultiByte:longint; lpWideCharStr:PWideChar;cchWideChar:longint):longint;
 function MultiByteToWideChar(CodePage:UINT; dwFlags:DWORD; lpMultiByteStr:PChar; cchMultiByte:longint; lpWideCharStr:PWideChar;cchWideChar:longint):longint;
      cdecl; external 'coredll' name 'MultiByteToWideChar';
      cdecl; external 'coredll' name 'MultiByteToWideChar';
@@ -337,7 +336,7 @@ end;
 
 
 function WideToAnsiBuf(WideBuf: PWideChar; WideCharsLen: longint; AnsiBuf: PChar; AnsiBufLen: longint): longint;
 function WideToAnsiBuf(WideBuf: PWideChar; WideCharsLen: longint; AnsiBuf: PChar; AnsiBufLen: longint): longint;
 begin
 begin
-  Result := WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, WideBuf, WideCharsLen, AnsiBuf, AnsiBufLen, nil, nil);
+  Result := WideCharToMultiByte(CP_ACP, 0, WideBuf, WideCharsLen, AnsiBuf, AnsiBufLen, nil, nil);
   if ((WideCharsLen <> -1) or (Result = 0)) and (AnsiBuf <> nil) then
   if ((WideCharsLen <> -1) or (Result = 0)) and (AnsiBuf <> nil) then
   begin
   begin
     if Result + 1 > AnsiBufLen then
     if Result + 1 > AnsiBufLen then

+ 1 - 1
rtl/wince/sysutils.pp

@@ -509,7 +509,7 @@ var
 begin
 begin
   if GetLocaleInfo(LID, LT, Buf, 2) > 0 then
   if GetLocaleInfo(LID, LT, Buf, 2) > 0 then
   begin
   begin
-    WideToAnsiBuf(Buf, -1, Buf2, SizeOf(Buf2));
+    WideToAnsiBuf(Buf, 1, Buf2, SizeOf(Buf2));
     Result := Buf2[0];
     Result := Buf2[0];
   end
   end
   else
   else