--- Merging r30918 into '.':

U    rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r30918 into '.':
 U   .
--- Merging r30919 into '.':
A    packages/winunits-base/src/shlwapi.pp
U    packages/winunits-base/src/buildwinutilsbase.pp
U    packages/winunits-base/fpmake.pp
--- Recording mergeinfo for merge of r30919 into '.':
 G   .

# revisions: 30918,30919

git-svn-id: branches/fixes_3_0@30982 -

.gitattributes

@@ -7490,6 +7490,7 @@ packages/winunits-base/src/richedit.pp svneol=native#text/plain
 packages/winunits-base/src/shellapi.pp svneol=native#text/plain
 packages/winunits-base/src/shfolder.pp svneol=native#text/plain
 packages/winunits-base/src/shlobj.pp svneol=native#text/plain
+packages/winunits-base/src/shlwapi.pp svneol=native#text/plain
 packages/winunits-base/src/stdole2.pas svneol=native#text/plain
 packages/winunits-base/src/tmschema.inc svneol=native#text/plain
 packages/winunits-base/src/typelib.pas svneol=native#text/plain

packages/winunits-base/fpmake.pp

@@ -46,6 +46,7 @@ begin
           AddUnit('ole2');
           AddUnit('activex');
           AddUnit('shellapi');
+          AddUnit('shlwapi');
           AddUnit('shlobj');
           AddUnit('oleserver');
           AddUnit('shfolder');
@@ -82,6 +83,7 @@ begin
     T:=P.Targets.AddImplicitUnit('oleserver.pp');
     T:=P.Targets.AddImplicitUnit('richedit.pp');
     T:=P.Targets.AddImplicitUnit('shellapi.pp');
+    T:=P.Targets.AddImplicitUnit('shlwapi.pp');
     T:=P.Targets.AddImplicitUnit('shfolder.pp');
     T:=P.Targets.AddImplicitUnit('shlobj.pp');
     T:=P.Targets.AddImplicitUnit('winver.pp');

packages/winunits-base/src/buildwinutilsbase.pp

@@ -25,7 +25,8 @@ uses
     ole2, activex, shellapi, shlobj, oleserver,  shfolder, richedit,
     imagehlp, wininet, uxtheme, dwmapi, multimon, htmlhelp, winutils,
     comserv, winspool, imm, imm_dyn, nb30, win9xwsmanager, stdole2, 
-	eventsink, typelib, libkinect10, urlmon;
+    eventsink, typelib, libkinect10, urlmon,
+    shlwapi;
 
 implementation
 

packages/winunits-base/src/shlwapi.pp

@@ -0,0 +1,25 @@
+unit shlwapi;
+
+{
+    This file is part of the Free Pascal run time library.
+    shlwapi calls are parked here for now.
+    Copyright (c) 1999-2002 by Marco van de Voort,
+    member of the Free Pascal development team.
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ ************************************************************************}
+
+interface
+{$mode delphi}
+
+function StrCmpLogicalW(psz1, psz2: PWideChar): Integer; stdcall; external 'shlwapi.dll';
+
+implementation
+
+end.

rtl/win/wininc/defines.inc

@@ -324,11 +324,14 @@
   { CompareString, LCMapString  }
      LOCALE_SYSTEM_DEFAULT = $800;
      LOCALE_USER_DEFAULT = $400;
-     NORM_IGNORECASE = 1;
-     NORM_IGNOREKANATYPE = 65536;
-     NORM_IGNORENONSPACE = 2;
-     NORM_IGNORESYMBOLS = 4;
-     NORM_IGNOREWIDTH = 131072;
+     NORM_IGNORECASE            = 1;
+     NORM_IGNORENONSPACE        = 2;
+     NORM_IGNORESYMBOLS         = 4;
+     LINGUISTIC_IGNORECASE      = $00000010;
+     LINGUISTIC_IGNOREDIACRITIC = $00000020;
+     NORM_IGNOREKANATYPE        = $00010000;
+     NORM_IGNOREWIDTH           = $00020000;
+     NORM_LINGUISTIC_CASING     = $08000000;
      SORT_STRINGSORT = 4096;
      LCMAP_BYTEREV = 2048;
      LCMAP_FULLWIDTH = 8388608;