Add fpwidestring and unicodeducet in uses clause for go32v2 target

git-svn-id: trunk@38735 -

tests/webtbs/tw10482.pp

@@ -2,9 +2,19 @@ program fpctest4;
 {$ifdef fpc}
 {$mode delphi}
 {$endif fpc}
+{$ifdef go32v2}
+  {$define USE_FPWIDESTRING_UNIT}
+  {$define USE_UNICODEDUCET_UNIT}
+{$endif}
 uses
 {$ifdef unix}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+{$endif}
+{$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+{$endif}
+{$ifdef USE_UNICODEDUCET_UNIT}
+  unicodeducet,
 {$endif}
   Classes,sysutils,variants,typinfo;
 

tests/webtbs/tw11791.pp

@@ -1,8 +1,24 @@
 {$mode objfpc}{$H+}
 
+{$ifdef go32v2}
+  {$define USE_FPWIDESTRING_UNIT}
+  {$define USE_UNICODEDUCET_UNIT}
+{$endif}
 uses
-{$ifdef unix}{$ifdef darwin}iosxwstr{$else}cwstring{$endif},{$endif}
-Classes, SysUtils;
+{$ifdef unix}
+  {$ifdef darwin}
+  iosxwstr,
+  {$else}
+  cwstring,
+  {$endif}
+{$endif}
+{$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+{$endif}
+{$ifdef USE_UNICODEDUCET_UNIT}
+  unicodeducet,
+{$endif}
+  Classes, SysUtils;
 
 
 const buffer : array[1..20334] of char=(

tests/webtbs/tw12993.pp

@@ -1,5 +1,16 @@
 {$codepage cp866}
 
+{$ifdef go32v2}
+  {$define USE_FPWIDESTRING_UNIT}
+  {$define USE_UNICODEDUCET_UNIT}
+uses
+{$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+{$endif}
+{$ifdef USE_UNICODEDUCET_UNIT}
+  unicodeducet;
+{$endif}
+{$endif}
 {$ifdef unix}
 uses
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif};

tests/webtbs/tw13015.pp

@@ -7,9 +7,20 @@ program test;
 {$apptype console}
 {$endif}
 
+{$ifdef go32v2}
+  {$define USE_FPWIDESTRING_UNIT}
+  {$define USE_UNICODEDUCET_UNIT}
+{$endif}
+
 uses
 {$ifdef unix}
  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+{$endif}
+{$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+{$endif}
+{$ifdef USE_UNICODEDUCET_UNIT}
+  unicodeducet,
 {$endif}
  Classes,SysUtils,uw13015;
 

tests/webtbs/tw13075.pp

@@ -1,9 +1,19 @@
 {$mode objfpc}{$H+}
 
+{$ifdef go32v2}
+  {$define USE_FPWIDESTRING_UNIT}
+  {$define USE_UNICODEDUCET_UNIT}
+{$endif}
 
 uses
 {$ifdef unix}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+{$endif}
+{$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+{$endif}
+{$ifdef USE_UNICODEDUCET_UNIT}
+  unicodeducet,
 {$endif}
   Classes, SysUtils;
 

tests/webtbs/tw17591.pp

@@ -1,7 +1,17 @@
 program comparetext;
 {$ifdef FPC}{$mode objfpc}{$h+}{$endif}
 {$ifdef mswindows}{$apptype console}{$endif}
+{$ifdef go32v2}
+  {$define USE_FPWIDESTRING_UNIT}
+  {$define USE_UNICODEDUCET_UNIT}
+{$endif}
 uses
+{$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+{$endif}
+{$ifdef USE_UNICODEDUCET_UNIT}
+  unicodeducet,
+{$endif}
  sysutils
 {$ifdef unix}
  ,{$ifdef darwin}iosxwstr{$else}cwstring{$endif}

tests/webtbs/tw25198.pp

@@ -2,6 +2,18 @@ program concatenate_resourestrings_delphiunicode;
 
 {$mode delphiunicode}
 {$codepage cp1250}
+{$ifdef go32v2}
+  {$define USE_FPWIDESTRING_UNIT}
+  {$define USE_UNICODEDUCET_UNIT}
+uses
+{$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+{$endif}
+{$ifdef USE_UNICODEDUCET_UNIT}
+  unicodeducet;
+{$endif}
+
+{$endif}
 
 {$ifdef unix}
 uses

tests/webtbs/tw3235a.pp

@@ -1,5 +1,17 @@
 program TestStrIComp;
+
+{$ifdef go32v2}
+  {$define USE_FPWIDESTRING_UNIT}
+  {$define USE_UNICODEDUCET_UNIT}
+{$endif}
+
   uses
+{$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+{$endif}
+{$ifdef USE_UNICODEDUCET_UNIT}
+  unicodeducet,
+{$endif}
     {$ifdef unix}{$ifdef darwin}iosxwstr{$else}cwstring{$endif},{$endif}
     SysUtils;
 

tests/webtbs/tw4080.pp

@@ -1,5 +1,16 @@
 program tw4080;
 {$i+}
+{$ifdef go32v2}
+  {$define USE_FPWIDESTRING_UNIT}
+  {$define USE_UNICODEDUCET_UNIT}
+uses
+{$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+{$endif}
+{$ifdef USE_UNICODEDUCET_UNIT}
+  unicodeducet;
+{$endif}
+{$endif}
 
 {$ifdef unix}
 uses

tests/webtbs/tw7006.pp

@@ -1,8 +1,28 @@
 program av;
 {$ifdef FPC}{$mode objfpc}{$h+}{$INTERFACES CORBA}{$endif}
 {$ifdef mswindows}{$apptype console}{$endif}
+{$ifdef go32v2}
+  {$define USE_FPWIDESTRING_UNIT}
+  {$define USE_UNICODEDUCET_UNIT}
+{$endif}
 uses
- {$ifdef FPC}{$ifdef unix}cthreads,{$ifdef darwin}iosxwstr{$else}cwstring{$endif},{$endif}{$endif}sysutils;
+{$ifdef FPC}
+  {$ifdef unix}
+  cthreads,
+    {$ifdef darwin}
+    iosxwstr
+    {$else}
+    cwstring
+    {$endif}
+  ,{$endif}
+  {$ifdef USE_FPWIDESTRING_UNIT}
+    fpwidestring,
+  {$endif}
+  {$ifdef USE_UNICODEDUCET_UNIT}
+    unicodeducet,
+  {$endif}
+{$endif}
+  sysutils;
 type
  testrecty = record
   str: widestring;

tests/webtbs/tw7758a.pp

@@ -1,9 +1,19 @@
 { %norun }
 
+{$ifdef go32v2}
+  {$define use_fpwidestring_unit}
+  {$define use_unicodeducet_unit}
+{$endif}
 uses
   {$ifdef unix}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
   {$endif}
+{$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+{$endif}
+{$ifdef USE_UNICODEDUCET_UNIT}
+  unicodeducet,
+{$endif}
   sysutils;
 
 { just to make sure that no all wide->shortstring compile time conversions }