Index: trunk/src/shlwapi/dbgwrap.cpp
===================================================================
--- trunk/src/shlwapi/dbgwrap.cpp	(revision 7900)
+++ trunk/src/shlwapi/dbgwrap.cpp	(revision 7900)
@@ -0,0 +1,366 @@
+#include <odin.h>
+#include <odinwrap.h>
+#include <os2sel.h>
+
+#include <os2win.h>
+#include <winreg.h>
+#include <winnt.h>
+#include <wincon.h>
+#include <winthunk.h>
+#include <winnls.h>
+#include <ntddk.h>
+#include <heapstring.h>
+
+//#define NO_SHLWAPI_STREAM
+#include "shlwapi.h"
+
+#define DBGWRAP_MODULE "SHLWAPI"
+#include <dbgwrap.h>
+
+
+
+NODEF_DEBUGWRAP8(SHLWAPI_1)
+NODEF_DEBUGWRAP8(SHLWAPI_2)
+NODEF_DEBUGWRAP8(SHLWAPI_3)
+NODEF_DEBUGWRAP8(SHLWAPI_4)
+NODEF_DEBUGWRAP12(SHLWAPI_5)
+NODEF_DEBUGWRAP12(SHLWAPI_6)
+NODEF_DEBUGWRAP12(SHLWAPI_7)
+NODEF_DEBUGWRAP8(SHLWAPI_8)
+NODEF_DEBUGWRAP4(SHLWAPI_9)
+NODEF_DEBUGWRAP8(SHLWAPI_10)
+NODEF_DEBUGWRAP20(SHLWAPI_11)
+NODEF_DEBUGWRAP8(SHLWAPI_12)
+NODEF_DEBUGWRAP8(SHLWAPI_13)
+NODEF_DEBUGWRAP8(SHLWAPI_14)
+NODEF_DEBUGWRAP8(SHLWAPI_15)
+NODEF_DEBUGWRAP16(SHLWAPI_16)
+NODEF_DEBUGWRAP8(SHLWAPI_17)
+NODEF_DEBUGWRAP8(SHLWAPI_18)
+NODEF_DEBUGWRAP4(SHLWAPI_19)
+NODEF_DEBUGWRAP8(SHLWAPI_20)
+NODEF_DEBUGWRAP8(SHLWAPI_21)
+NODEF_DEBUGWRAP8(SHLWAPI_22)
+NODEF_DEBUGWRAP12(SHLWAPI_23)
+NODEF_DEBUGWRAP12(SHLWAPI_24)
+NODEF_DEBUGWRAP4(SHLWAPI_25)
+NODEF_DEBUGWRAP4(SHLWAPI_26)
+NODEF_DEBUGWRAP4(SHLWAPI_27)
+NODEF_DEBUGWRAP4(SHLWAPI_28)
+NODEF_DEBUGWRAP4(SHLWAPI_29)
+NODEF_DEBUGWRAP4(SHLWAPI_30)
+NODEF_DEBUGWRAP4(SHLWAPI_31)
+NODEF_DEBUGWRAP4(SHLWAPI_32)
+NODEF_DEBUGWRAP4(SHLWAPI_33)
+NODEF_DEBUGWRAP4(SHLWAPI_34)
+NODEF_DEBUGWRAP12(SHLWAPI_35)
+NODEF_DEBUGWRAP16(SHLWAPI_36)
+NODEF_DEBUGWRAP16(SHLWAPI_74)
+NODEF_DEBUGWRAP12(SHLWAPI_151)
+NODEF_DEBUGWRAP12(SHLWAPI_152)
+NODEF_DEBUGWRAP12(SHLWAPI_153)
+NODEF_DEBUGWRAP12(SHLWAPI_154)
+NODEF_DEBUGWRAP8(SHLWAPI_156)
+NODEF_DEBUGWRAP8(SHLWAPI_158)
+NODEF_DEBUGWRAP8(SHLWAPI_160)
+NODEF_DEBUGWRAP8(SHLWAPI_162)
+NODEF_DEBUGWRAP24(SHLWAPI_164)
+NODEF_DEBUGWRAP16(SHLWAPI_165)
+NODEF_DEBUGWRAP4(SHLWAPI_169)
+NODEF_DEBUGWRAP4(SHLWAPI_170)
+NODEF_DEBUGWRAP8(SHLWAPI_172)
+NODEF_DEBUGWRAP8(SHLWAPI_174)
+NODEF_DEBUGWRAP16(SHLWAPI_176)
+NODEF_DEBUGWRAP12(SHLWAPI_181)
+NODEF_DEBUGWRAP4(SHLWAPI_183)
+NODEF_DEBUGWRAP24(SHLWAPI_185)
+NODEF_DEBUGWRAP24(SHLWAPI_191)
+NODEF_DEBUGWRAP0(SHLWAPI_193)
+NODEF_DEBUGWRAP12(SHLWAPI_197)
+NODEF_DEBUGWRAP8(SHLWAPI_199)
+NODEF_DEBUGWRAP24(SHLWAPI_205)
+NODEF_DEBUGWRAP24(SHLWAPI_206)
+NODEF_DEBUGWRAP20(SHLWAPI_208)
+NODEF_DEBUGWRAP12(SHLWAPI_210)
+NODEF_DEBUGWRAP8(SHLWAPI_211)
+NODEF_DEBUGWRAP12(SHLWAPI_215)
+NODEF_DEBUGWRAP12(SHLWAPI_217)
+NODEF_DEBUGWRAP16(SHLWAPI_218)
+NODEF_DEBUGWRAP16(SHLWAPI_219)
+NODEF_DEBUGWRAP4(SHLWAPI_222)
+NODEF_DEBUGWRAP4(SHLWAPI_223)
+NODEF_DEBUGWRAP4(SHLWAPI_236)
+NODEF_DEBUGWRAP4(SHLWAPI_237)
+NODEF_DEBUGWRAP12(SHLWAPI_239)
+NODEF_DEBUGWRAP16(SHLWAPI_240)
+NODEF_DEBUGWRAP20(SHLWAPI_243)
+NODEF_DEBUGWRAP16(SHLWAPI_266)
+NODEF_DEBUGWRAP16(SHLWAPI_267)
+NODEF_DEBUGWRAP8(SHLWAPI_268)
+NODEF_DEBUGWRAP0(SHLWAPI_276)
+NODEF_DEBUGWRAP24(SHLWAPI_278)
+NODEF_DEBUGWRAP12(SHLWAPI_289)
+NODEF_DEBUGWRAP20(SHLWAPI_313)
+NODEF_DEBUGWRAP16(SHLWAPI_318)
+NODEF_DEBUGWRAP8(SHLWAPI_320)
+NODEF_DEBUGWRAP8(SHLWAPI_321)
+NODEF_DEBUGWRAP4(SHLWAPI_322)
+NODEF_DEBUGWRAP4(SHLWAPI_323)
+NODEF_DEBUGWRAP4(SHLWAPI_333)
+NODEF_DEBUGWRAP8(SHLWAPI_334)
+NODEF_DEBUGWRAP4(SHLWAPI_335)
+NODEF_DEBUGWRAP4(SHLWAPI_336)
+NODEF_DEBUGWRAP20(SHLWAPI_337)
+NODEF_DEBUGWRAP12(SHLWAPI_346)
+NODEF_DEBUGWRAP12(SHLWAPI_356)
+NODEF_DEBUGWRAP20(SHLWAPI_357)
+NODEF_DEBUGWRAP24(SHLWAPI_358)
+NODEF_DEBUGWRAP12(SHLWAPI_364)
+NODEF_DEBUGWRAP12(SHLWAPI_370)
+NODEF_DEBUGWRAP0(SHLWAPI_376)
+NODEF_DEBUGWRAP12(SHLWAPI_377)
+NODEF_DEBUGWRAP12(SHLWAPI_378)
+NODEF_DEBUGWRAP4(SHLWAPI_389)
+NODEF_DEBUGWRAP8(SHLWAPI_390)
+NODEF_DEBUGWRAP20(SHLWAPI_391)
+NODEF_DEBUGWRAP4(SHLWAPI_401)
+NODEF_DEBUGWRAP4(SHLWAPI_402)
+NODEF_DEBUGWRAP4(SHLWAPI_403)
+NODEF_DEBUGWRAP4(SHLWAPI_413)
+NODEF_DEBUGWRAP4(SHLWAPI_431)
+NODEF_DEBUGWRAP4(SHLWAPI_437)
+
+
+NODEF_DEBUGWRAP8(GetMenuPosFromID)
+DEBUGWRAP12(ColorHLSToRGB)
+
+DEBUGWRAP8(ChrCmpIA)
+DEBUGWRAP8(ChrCmpIW)
+DEBUGWRAP16(ColorRGBToHLS)
+NODEF_DEBUGWRAP4(SHLWAPI_DllGetVersion)
+DEBUGWRAP16(HashData)
+DEBUGWRAP4(PathAddBackslashA)
+DEBUGWRAP4(PathAddBackslashW)
+DEBUGWRAP8(PathAddExtensionA)
+DEBUGWRAP8(PathAddExtensionW)
+DEBUGWRAP8(PathAppendA)
+DEBUGWRAP8(PathAppendW)
+DEBUGWRAP8(PathBuildRootA)
+DEBUGWRAP8(PathBuildRootW)
+DEBUGWRAP8(PathCanonicalizeA)
+DEBUGWRAP8(PathCanonicalizeW)
+DEBUGWRAP12(PathCombineA)
+DEBUGWRAP12(PathCombineW)
+DEBUGWRAP12(PathCommonPrefixA)
+DEBUGWRAP12(PathCommonPrefixW)
+DEBUGWRAP12(PathCompactPathA)
+DEBUGWRAP16(PathCompactPathExA)
+DEBUGWRAP16(PathCompactPathExW)
+DEBUGWRAP12(PathCompactPathW)
+NODEF_DEBUGWRAP16(PathCreateFromUrlA)
+NODEF_DEBUGWRAP16(PathCreateFromUrlW)
+DEBUGWRAP4(PathFileExistsA)
+DEBUGWRAP4(PathFileExistsW)
+DEBUGWRAP4(PathFindExtensionA)
+DEBUGWRAP4(PathFindExtensionW)
+DEBUGWRAP4(PathFindFileNameA)
+DEBUGWRAP4(PathFindFileNameW)
+DEBUGWRAP4(PathFindNextComponentA)
+DEBUGWRAP4(PathFindNextComponentW)
+DEBUGWRAP8(PathFindOnPathA)
+DEBUGWRAP8(PathFindOnPathW)
+DEBUGWRAP4(PathGetArgsA)
+DEBUGWRAP4(PathGetArgsW)
+DEBUGWRAP4(PathGetCharTypeA)
+DEBUGWRAP4(PathGetCharTypeW)
+DEBUGWRAP4(PathGetDriveNumberA)
+DEBUGWRAP4(PathGetDriveNumberW)
+DEBUGWRAP8(PathIsContentTypeA)
+DEBUGWRAP8(PathIsContentTypeW)
+DEBUGWRAP4(PathIsDirectoryA)
+DEBUGWRAP4(PathIsDirectoryW)
+DEBUGWRAP4(PathIsFileSpecA)
+DEBUGWRAP4(PathIsFileSpecW)
+DEBUGWRAP8(PathIsPrefixA)
+DEBUGWRAP8(PathIsPrefixW)
+DEBUGWRAP4(PathIsRelativeA)
+DEBUGWRAP4(PathIsRelativeW)
+DEBUGWRAP4(PathIsRootA)
+DEBUGWRAP4(PathIsRootW)
+DEBUGWRAP8(PathIsSameRootA)
+DEBUGWRAP8(PathIsSameRootW)
+DEBUGWRAP8(PathIsSystemFolderA)
+DEBUGWRAP8(PathIsSystemFolderW)
+DEBUGWRAP4(PathIsUNCA)
+DEBUGWRAP4(PathIsUNCServerA)
+DEBUGWRAP4(PathIsUNCServerShareA)
+DEBUGWRAP4(PathIsUNCServerShareW)
+DEBUGWRAP4(PathIsUNCServerW)
+DEBUGWRAP4(PathIsUNCW)
+DEBUGWRAP4(PathIsURLA)
+DEBUGWRAP4(PathIsURLW)
+DEBUGWRAP4(PathMakePrettyA)
+DEBUGWRAP4(PathMakePrettyW)
+DEBUGWRAP4(PathMakeSystemFolderA)
+DEBUGWRAP4(PathMakeSystemFolderW)
+DEBUGWRAP8(PathMatchSpecA)
+DEBUGWRAP8(PathMatchSpecW)
+DEBUGWRAP4(PathParseIconLocationA)
+DEBUGWRAP4(PathParseIconLocationW)
+DEBUGWRAP4(PathQuoteSpacesA)
+DEBUGWRAP4(PathQuoteSpacesW)
+DEBUGWRAP20(PathRelativePathToA)
+DEBUGWRAP20(PathRelativePathToW)
+DEBUGWRAP4(PathRemoveArgsA)
+DEBUGWRAP4(PathRemoveArgsW)
+DEBUGWRAP4(PathRemoveBackslashA)
+DEBUGWRAP4(PathRemoveBackslashW)
+DEBUGWRAP4(PathRemoveBlanksA)
+DEBUGWRAP4(PathRemoveBlanksW)
+DEBUGWRAP4(PathRemoveExtensionA)
+DEBUGWRAP4(PathRemoveExtensionW)
+DEBUGWRAP4(PathRemoveFileSpecA)
+DEBUGWRAP4(PathRemoveFileSpecW)
+DEBUGWRAP8(PathRenameExtensionA)
+DEBUGWRAP8(PathRenameExtensionW)
+DEBUGWRAP12(PathSearchAndQualifyA)
+DEBUGWRAP12(PathSearchAndQualifyW)
+DEBUGWRAP12(PathSetDlgItemPathA)
+DEBUGWRAP12(PathSetDlgItemPathW)
+DEBUGWRAP4(PathSkipRootA)
+DEBUGWRAP4(PathSkipRootW)
+DEBUGWRAP4(PathStripPathA)
+DEBUGWRAP4(PathStripPathW)
+DEBUGWRAP4(PathStripToRootA)
+DEBUGWRAP4(PathStripToRootW)
+DEBUGWRAP4(PathUnmakeSystemFolderA)
+DEBUGWRAP4(PathUnmakeSystemFolderW)
+DEBUGWRAP4(PathUnquoteSpacesA)
+DEBUGWRAP4(PathUnquoteSpacesW)
+DEBUGWRAP4(SHCreateShellPalette)
+DEBUGWRAP8(SHDeleteEmptyKeyA)
+DEBUGWRAP8(SHDeleteEmptyKeyW)
+DEBUGWRAP8(SHDeleteKeyA)
+DEBUGWRAP8(SHDeleteKeyW)
+NODEF_DEBUGWRAP8(SHDeleteOrphanKeyA)
+NODEF_DEBUGWRAP8(SHDeleteOrphanKeyW)
+DEBUGWRAP12(SHDeleteValueA)
+DEBUGWRAP12(SHDeleteValueW)
+DEBUGWRAP16(SHEnumKeyExA)
+DEBUGWRAP16(SHEnumKeyExW)
+DEBUGWRAP28(SHEnumValueA)
+DEBUGWRAP28(SHEnumValueW)
+NODEF_DEBUGWRAP4(_SHGetInstanceExplorer)
+NODEF_DEBUGWRAP8(SHGetInverseCMAP)
+DEBUGWRAP24(SHGetValueA)
+DEBUGWRAP24(SHGetValueW)
+NODEF_DEBUGWRAP4(SHIsLowMemoryMachine)
+NODEF_DEBUGWRAP16(SHOpenRegStreamA)
+NODEF_DEBUGWRAP16(SHOpenRegStreamW)
+DEBUGWRAP20(SHQueryInfoKeyA)
+DEBUGWRAP20(SHQueryInfoKeyW)
+DEBUGWRAP24(SHQueryValueExA)
+DEBUGWRAP24(SHQueryValueExW)
+DEBUGWRAP4(SHRegCloseUSKey)
+DEBUGWRAP20(SHRegCreateUSKeyA)
+DEBUGWRAP20(SHRegCreateUSKeyW)
+DEBUGWRAP12(SHRegDeleteEmptyUSKeyA)
+DEBUGWRAP12(SHRegDeleteEmptyUSKeyW)
+NODEF_DEBUGWRAP12(SHRegDeleteUSKeyA)
+NODEF_DEBUGWRAP12(SHRegDeleteUSKeyW)
+DEBUGWRAP20(SHRegEnumUSKeyA)
+DEBUGWRAP20(SHRegEnumUSKeyW)
+DEBUGWRAP32(SHRegEnumUSValueA)
+DEBUGWRAP32(SHRegEnumUSValueW)
+DEBUGWRAP16(SHRegGetBoolUSValueA)
+DEBUGWRAP16(SHRegGetBoolUSValueW)
+DEBUGWRAP32(SHRegGetUSValueA)
+DEBUGWRAP32(SHRegGetUSValueW)
+DEBUGWRAP20(SHRegOpenUSKeyA)
+DEBUGWRAP20(SHRegOpenUSKeyW)
+DEBUGWRAP32(SHRegQueryUSValueA)
+DEBUGWRAP32(SHRegQueryUSValueW)
+DEBUGWRAP24(SHRegSetUSValueA)
+DEBUGWRAP24(SHRegSetUSValueW)
+DEBUGWRAP24(SHRegWriteUSValueA)
+DEBUGWRAP24(SHRegWriteUSValueW)
+DEBUGWRAP24(SHSetValueA)
+DEBUGWRAP24(SHSetValueW)
+DEBUGWRAP8(StrCSpnA)
+DEBUGWRAP8(StrCSpnW)
+DEBUGWRAP12(StrCatBuffA)
+DEBUGWRAP12(StrCatBuffW)
+DEBUGWRAP8(StrCatW)
+DEBUGWRAP8(StrChrA)
+DEBUGWRAP8(StrChrIA)
+DEBUGWRAP8(StrChrIW)
+DEBUGWRAP8(StrChrW)
+DEBUGWRAP8(lstrcmpiW)
+DEBUGWRAP12(StrCmpNA)
+DEBUGWRAP12(StrCmpNIA)
+DEBUGWRAP12(StrCmpNIW)
+DEBUGWRAP12(StrCmpNW)
+DEBUGWRAP8(lstrcmpW)
+DEBUGWRAP12(lstrcpynW)
+DEBUGWRAP8(StrCpyW)
+DEBUGWRAP4(StrDupA)
+DEBUGWRAP4(StrDupW)
+DEBUGWRAP12(StrFormatByteSizeA)
+DEBUGWRAP12(StrFormatByteSizeW)
+DEBUGWRAP16(StrFromTimeIntervalA)
+DEBUGWRAP16(StrFromTimeIntervalW)
+DEBUGWRAP12(StrNCatA)
+DEBUGWRAP12(StrNCatW)
+DEBUGWRAP8(StrPBrkA)
+DEBUGWRAP8(StrPBrkW)
+DEBUGWRAP12(StrRChrA)
+DEBUGWRAP12(StrRChrIA)
+DEBUGWRAP12(StrRChrIW)
+DEBUGWRAP12(StrRChrW)
+DEBUGWRAP12(StrRStrIA)
+DEBUGWRAP12(StrRStrIW)
+DEBUGWRAP16(StrRetToBufA)
+DEBUGWRAP16(StrRetToBufW)
+DEBUGWRAP8(StrSpnA)
+DEBUGWRAP8(StrSpnW)
+DEBUGWRAP8(StrStrA)
+DEBUGWRAP8(StrStrIA)
+DEBUGWRAP8(StrStrIW)
+DEBUGWRAP8(StrStrW)
+DEBUGWRAP4(StrToIntA)
+DEBUGWRAP12(StrToIntExA)
+DEBUGWRAP12(StrToIntExW)
+DEBUGWRAP4(StrToIntW)
+DEBUGWRAP8(StrTrimA)
+DEBUGWRAP16(UrlApplySchemeA)
+DEBUGWRAP16(UrlApplySchemeW)
+DEBUGWRAP16(UrlCanonicalizeA)
+DEBUGWRAP16(UrlCanonicalizeW)
+DEBUGWRAP20(UrlCombineA)
+DEBUGWRAP20(UrlCombineW)
+DEBUGWRAP12(UrlCompareA)
+DEBUGWRAP12(UrlCompareW)
+DEBUGWRAP16(UrlCreateFromPathA)
+DEBUGWRAP16(UrlCreateFromPathW)
+DEBUGWRAP16(UrlEscapeA)
+DEBUGWRAP16(UrlEscapeW)
+DEBUGWRAP4(UrlGetLocationA)
+DEBUGWRAP4(UrlGetLocationW)
+DEBUGWRAP20(UrlGetPartA)
+DEBUGWRAP20(UrlGetPartW)
+DEBUGWRAP12(UrlHashA)
+DEBUGWRAP12(UrlHashW)
+DEBUGWRAP8(UrlIsA)
+DEBUGWRAP4(UrlIsNoHistoryA)
+DEBUGWRAP4(UrlIsNoHistoryW)
+DEBUGWRAP4(UrlIsOpaqueA)
+DEBUGWRAP4(UrlIsOpaqueW)
+DEBUGWRAP8(UrlIsW)
+DEBUGWRAP16(UrlUnescapeA)
+DEBUGWRAP16(UrlUnescapeW)
+DEBUGWRAP20(SHRegGetPathA)
+DEBUGWRAP20(SHRegGetPathW)
+DEBUGWRAP12(SHRegDeleteUSValueA)
+DEBUGWRAP12(SHRegDeleteUSValueW)
+
+
Index: trunk/src/shlwapi/makefile
===================================================================
--- trunk/src/shlwapi/makefile	(revision 7898)
+++ trunk/src/shlwapi/makefile	(revision 7900)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.25 2002-02-06 20:18:27 sandervl Exp $
+# $Id: makefile,v 1.26 2002-02-13 16:15:07 sandervl Exp $
 
 #
@@ -11,4 +11,9 @@
 # Compiler, tools, and interference rules.
 #
+!if "$(DEBUG)" == "1"
+DEFFILE    = shlwapidbg.def
+ORGDEFFILE = shlwapi.def
+!endif
+
 !include ../../makefile.inc
 
@@ -32,4 +37,7 @@
 $(OBJDIR)\ordinal.obj \
 $(OBJDIR)\ordinal_odin.obj \
+!if "$(DEBUG)" == "1"
+$(OBJDIR)\dbgwrap.obj \
+!endif
 $(OBJDIR)\shlwapirsrc.obj \
 $(DLLENTRY)
Index: trunk/src/shlwapi/shlstub.cpp
===================================================================
--- trunk/src/shlwapi/shlstub.cpp	(revision 7898)
+++ trunk/src/shlwapi/shlstub.cpp	(revision 7900)
@@ -1,3 +1,3 @@
-/* $Id: shlstub.cpp,v 1.3 2002-02-06 20:18:28 sandervl Exp $ */
+/* $Id: shlstub.cpp,v 1.4 2002-02-13 16:15:07 sandervl Exp $ */
 
 /*
@@ -49,7 +49,5 @@
  *****************************************************************************/
 
-ODINFUNCTION2(LPSTR,    StrFromTimeIntervalA,
-              LPVOID, lp1,
-              LPVOID, lp2)
+LPSTR WIN32API StrFromTimeIntervalA(LPVOID lp1, LPVOID lp2, LPVOID lp3, LPVOID lp4)
 {
   dprintf(("not yet implemented"));
@@ -71,7 +69,5 @@
  *****************************************************************************/
 
-ODINFUNCTION2(LPWSTR,    StrFromTimeIntervalW,
-              LPVOID, lp1,
-              LPVOID, lp2)
+LPWSTR WIN32API StrFromTimeIntervalW(LPVOID lp1, LPVOID lp2, LPVOID lp3, LPVOID lp4)
 {
   dprintf(("not yet implemented"));
Index: trunk/src/shlwapi/shlwapi.def
===================================================================
--- trunk/src/shlwapi/shlwapi.def	(revision 7898)
+++ trunk/src/shlwapi/shlwapi.def	(revision 7900)
@@ -1,3 +1,3 @@
-; $Id: shlwapi.def,v 1.28 2002-02-06 20:18:29 sandervl Exp $
+; $Id: shlwapi.def,v 1.29 2002-02-13 16:15:07 sandervl Exp $
 
 ; updated export ordinals to NT4 SP6 version of SHLWAPI.DLL
@@ -564,6 +564,6 @@
 ;   StrFormatKBSizeA       = _StrFormatKBSizeA@16                 @649
 ;   StrFormatKBSizeW       = _StrFormatKBSizeW@16                 @650
-    StrFromTimeIntervalA   = _StrFromTimeIntervalA@8              @651
-    StrFromTimeIntervalW   = _StrFromTimeIntervalW@8              @652
+    StrFromTimeIntervalA   = _StrFromTimeIntervalA@16             @651
+    StrFromTimeIntervalW   = _StrFromTimeIntervalW@16             @652
   ; IntlStrEqWorkerA       = _StrIsIntlEqualA@16                  @653
   ; StrIsIntlEqualW        = _StrIsIntlEqualW@?                   @654
Index: trunk/src/shlwapi/shlwapidbg.def
===================================================================
--- trunk/src/shlwapi/shlwapidbg.def	(revision 7900)
+++ trunk/src/shlwapi/shlwapidbg.def	(revision 7900)
@@ -0,0 +1,630 @@
+; $Id: shlwapidbg.def,v 1.1 2002-02-13 16:15:08 sandervl Exp $
+
+; updated export ordinals to NT4 SP6 version of SHLWAPI.DLL
+; Note: W95/W98 has DIFFERENT export ordinals
+;
+; Note: Internet Explorer 5 brought the DLL to level
+;       5-0-2314-1000
+
+LIBRARY SHLWAPI INITINSTANCE TERMINSTANCE
+DESCRIPTION 'Odin32 System DLL - SHLWAPI'
+DATA MULTIPLE NONSHARED
+
+
+EXPORTS
+
+; --------------------
+; Ordinal-only exports
+; --------------------
+
+; 2001-08-30 PH
+; Most of the ordinal shell functions are just dynamic mappings of
+; the unicode caller to the character-width of the underlying OS:
+; If OS == UNICODE, the call is passed through
+; if OS == ASCII, the parameters are mapped back and forth
+; So for ODIN, we're just directly linking to the unicode functions.
+
+                             _DbgSHLWAPI_1@8                         @1  NONAME
+                             _DbgSHLWAPI_2@8                         @2  NONAME
+                             _DbgSHLWAPI_3@8                         @3  NONAME
+                             _DbgSHLWAPI_4@8                         @4  NONAME
+                             _DbgSHLWAPI_5@12                        @5  NONAME
+                             _DbgSHLWAPI_6@12                        @6  NONAME
+                             _DbgSHLWAPI_7@12                        @7  NONAME
+                             _DbgSHLWAPI_8@8                         @8  NONAME
+                             _DbgSHLWAPI_9@4                         @9  NONAME
+                             _DbgSHLWAPI_10@8                        @10 NONAME
+
+                             _DbgSHLWAPI_11@20                       @11 NONAME
+                             _DbgSHLWAPI_12@8                        @12 NONAME
+                             _DbgSHLWAPI_13@8                        @13 NONAME
+                             _DbgSHLWAPI_14@8                        @14 NONAME
+                             _DbgSHLWAPI_15@8                        @15 NONAME
+                             _DbgSHLWAPI_16@16                       @16 NONAME
+                             _DbgSHLWAPI_17@8                        @17 NONAME
+                             _DbgSHLWAPI_18@8                        @18 NONAME
+                             _DbgSHLWAPI_19@4                        @19 NONAME
+
+                             _DbgSHLWAPI_20@8                        @20 NONAME
+                             _DbgSHLWAPI_21@8                        @21 NONAME
+                             _DbgSHLWAPI_22@8                        @22 NONAME
+                             _DbgSHLWAPI_23@12                       @23 NONAME
+                             _DbgSHLWAPI_24@12                       @24 NONAME
+                             _DbgSHLWAPI_25@4                        @25 NONAME
+                             _DbgSHLWAPI_26@4                        @26 NONAME
+                             _DbgSHLWAPI_27@4                        @27 NONAME
+                             _DbgSHLWAPI_28@4                        @28 NONAME
+                             _DbgSHLWAPI_29@4                        @29 NONAME
+
+                             _DbgSHLWAPI_30@4                        @30 NONAME
+                             _DbgSHLWAPI_31@4                        @31 NONAME
+                             _DbgSHLWAPI_32@4                        @32 NONAME
+                             _DbgSHLWAPI_33@4                        @33 NONAME
+                             _DbgSHLWAPI_34@4                        @34 NONAME
+                             _DbgSHLWAPI_35@12                       @35 NONAME
+                             _DbgSHLWAPI_36@16                       @36 NONAME
+                             _CallWindowProcW@20                  @37 NONAME
+                             _CharLowerW@4                        @38 NONAME
+                             _CharLowerBuffW@8                    @39 NONAME
+
+                             _CharNextW@4                         @40 NONAME
+                             _CharPrevW@8                         @41 NONAME
+                             _CharToOemW@8                        @42 NONAME
+                             _CharUpperW@4                        @43 NONAME
+                             _CharUpperBuffW@8                    @44 NONAME
+                             _CompareStringW@24                   @45 NONAME
+                             _CopyAcceleratorTableW@12            @46 NONAME
+                             _CreateAcceleratorTableW@8           @47 NONAME
+                             _CreateDCW@16                        @48 NONAME
+                             _CreateDialogParamW@20               @49 NONAME ; @@@PH imcomplete
+
+                             _CreateDirectoryW@8                  @50 NONAME
+                             _CreateEventW@16                     @51 NONAME
+                             _CreateFileW@28                      @52 NONAME
+                             _CreateFontIndirectW@4               @53 NONAME
+                             _CreateICW@16                        @54 NONAME
+                             _CreateWindowExW@48                  @55 NONAME
+                             _DefWindowProcW@16                   @56 NONAME
+                             _DeleteFileW@4                       @57 NONAME
+                             _DialogBoxIndirectParamW@20          @58 NONAME ; @@@PH imcomplete
+                             _DialogBoxParamW@20                  @59 NONAME ; @@@PH imcomplete
+
+                             _DispatchMessageW@4                  @60 NONAME
+                             _DrawTextW@20                        @61 NONAME
+                             _EnumFontFamiliesW@16                @62 NONAME
+                             _EnumFontFamiliesExW@20              @63 NONAME
+                             _EnumResourceNamesW@16               @64 NONAME
+                             _FindFirstFileW@8                    @65 NONAME
+                             _FindResourceW@12                    @66 NONAME
+                             _FindWindowW@8                       @67 NONAME
+                             _FormatMessageW@28                   @68 NONAME
+                             _GetClassInfoW@12                    @69 NONAME
+
+                             _GetClassLongW@8                     @70 NONAME
+                             _GetClassNameW@12                    @71 NONAME
+                             _GetClipboardFormatNameW@12          @72 NONAME
+                             _GetCurrentDirectoryW@8              @73 NONAME
+                             _DbgSHLWAPI_74@16                       @74 NONAME
+                             _GetFileAttributesW@4                @75  NONAME
+                             _GetFullPathNameW@16                 @76 NONAME
+                             _GetLocaleInfoW@16                   @77 NONAME
+                             _GetMenuItemInfoW@16                 @78 NONAME
+                             _GetMessageW@16                      @79 NONAME
+
+                             _GetModuleFileNameW@12               @80 NONAME
+                             _GetSystemDirectoryW@8               @81 NONAME
+                             _SearchPathW@24                      @82 NONAME
+                             _GetModuleHandleW@4                  @83 NONAME
+                             _GetObjectW@12                       @84 NONAME
+                             _GetPrivateProfileIntW@16            @85 NONAME
+                             _GetProfileStringW@20                @86 NONAME
+                             _GetPropW@8                          @87 NONAME
+                             _GetStringTypeExW@20                 @88 NONAME
+                             _GetTempFileNameW@16                 @89 NONAME
+
+                             _GetTempPathW@8                      @90 NONAME
+                             _GetTextExtentPoint32W@16            @91 NONAME
+                             _GetTextFaceW@12                     @92 NONAME
+                             _GetTextMetricsW@8                   @93 NONAME
+                             _GetWindowLongW@8                    @94 NONAME
+                             _GetWindowTextW@12                   @95 NONAME
+                             _GetWindowTextLengthW@4              @96 NONAME
+                             _GetWindowsDirectoryW@8              @97 NONAME
+                             _InsertMenuW@20                      @98 NONAME
+                             _IsDialogMessageW@8                  @99 NONAME
+
+                             _LoadAcceleratorsW@8                 @100 NONAME
+                             _LoadBitmapW@8                       @101 NONAME
+                             _LoadCursorW@8                       @102 NONAME
+                             _LoadIconW@8                         @103 NONAME
+                             _LoadImageW@24                       @104 NONAME
+                             _LoadLibraryExW@12                   @105 NONAME
+                             _LoadMenuW@8                         @106 NONAME
+                             _LoadStringW@16                      @107 NONAME
+                             _MessageBoxIndirectW@4               @108 NONAME
+                             _ModifyMenuW@20                      @109 NONAME
+
+                             _GetCharWidth32W@16                  @110 NONAME
+                             _GetCharacterPlacementW@24           @111 NONAME
+                             _CopyFileW@12                        @112 NONAME
+                             _MoveFileW@8                         @113 NONAME
+                             _OemToCharW@8                        @114 NONAME
+                             _OutputDebugStringW@4                @115 NONAME
+                             _PeekMessageW@20                     @116 NONAME
+                             _PostMessageW@16                     @117 NONAME
+                             _PostThreadMessageW@16               @118 NONAME
+                             _RegCreateKeyW@12                    @119 NONAME
+
+                             _RegCreateKeyExW@36                  @120 NONAME
+                             _RegDeleteKeyW@8                     @121 NONAME
+                             _RegEnumKeyW@16                      @122 NONAME
+                             _RegEnumKeyExW@32                    @123 NONAME
+                             _RegOpenKeyW@12                      @124 NONAME
+                             _RegOpenKeyExW@20                    @125 NONAME
+                             _RegQueryInfoKeyW@48                 @126 NONAME
+                             _RegQueryValueW@16                   @127 NONAME
+                             _RegQueryValueExW@24                 @128 NONAME
+                             _RegSetValueW@20                     @129 NONAME
+
+                             _RegSetValueExW@24                   @130 NONAME
+                             _RegisterClassW@4                    @131 NONAME
+                             _RegisterClipboardFormatW@4          @132 NONAME
+                             _RegisterWindowMessageW@4            @133 NONAME
+                             _RemovePropW@8                       @134 NONAME
+                             _SendDlgItemMessageW@20              @135 NONAME
+                             _SendMessageW@16                     @136 NONAME
+                             _SetCurrentDirectoryW@4              @137 NONAME
+                             _SetDlgItemTextW@12                  @138 NONAME
+                             _SetMenuItemInfoW@16                 @139 NONAME ; @@@PH imcomplete
+
+                             _SetPropW@12                         @140 NONAME
+                             _SetWindowLongW@12                   @141 NONAME
+                             _SetWindowsHookExW@16                @142 NONAME
+                             _SetWindowTextW@8                    @143 NONAME
+                             _StartDocW@8                         @144 NONAME
+                             _SystemParametersInfoW@16            @145 NONAME
+                             _TranslateAcceleratorW@12            @146 NONAME
+                             _UnregisterClassW@8                  @147 NONAME
+                             _VkKeyScanW@4                        @148 NONAME
+                             _WinHelpW@16                         @149 NONAME
+                             _wvsprintfW@12                       @150 NONAME
+
+                             _DbgSHLWAPI_151@12                      @151 NONAME
+                             _DbgSHLWAPI_152@12                      @152 NONAME
+                             _DbgSHLWAPI_153@12                      @153 NONAME
+                             _DbgSHLWAPI_154@12                      @154 NONAME
+;;;;_DbgSHLWAPI_155@??                      @155 NONAME
+                             _DbgSHLWAPI_156@8                       @156 NONAME
+                             _DbgSHLWAPI_158@8                       @158 NONAME
+                             _CompareStringW@24                   @159 NONAME
+
+                             _DbgSHLWAPI_160@8                       @160 NONAME
+                             _DbgSHLWAPI_162@8                       @162 NONAME
+
+                             _DbgSHLWAPI_164@24                      @164 NONAME
+                             _DbgSHLWAPI_165@16                      @165 NONAME
+                             _DbgSHLWAPI_169@4                       @169 NONAME
+
+                             _DbgSHLWAPI_170@4                       @170 NONAME
+                             _DbgSHLWAPI_172@8                       @172 NONAME
+                             _DbgSHLWAPI_174@8                       @174 NONAME
+                             _DbgSHLWAPI_176@16                      @176 NONAME
+
+
+                             _DbgSHLWAPI_181@12                      @181 NONAME
+                             _DbgSHLWAPI_183@4                       @183 NONAME
+                             _DbgSHLWAPI_185@24                      @185 NONAME
+
+                             _DbgSHLWAPI_191@24                      @191 NONAME
+                             _DbgSHLWAPI_193@0                       @193 NONAME
+                             _DbgSHLWAPI_197@12                      @197 NONAME
+                             _DbgSHLWAPI_199@8                       @199 NONAME
+
+                             _DbgSHLWAPI_205@24                      @205 NONAME
+                             _DbgSHLWAPI_206@24                      @206 NONAME
+                             _DbgSHLWAPI_208@20                      @208 NONAME
+
+                             _DbgSHLWAPI_210@12                      @210 NONAME
+                             _DbgSHLWAPI_211@8                       @211 NONAME
+
+                             _DbgSHLWAPI_215@12                      @215 NONAME
+                             _DbgSHLWAPI_217@12                      @217 NONAME
+                             _DbgSHLWAPI_218@16                      @218 NONAME
+                             _DbgSHLWAPI_219@16                      @219 NONAME
+
+                             _DbgSHLWAPI_222@4                       @222 NONAME
+                             _DbgSHLWAPI_223@4                       @223 NONAME
+
+                             _DbgSHLWAPI_236@4                       @236 NONAME
+                             _DbgSHLWAPI_237@4                       @237 NONAME
+                             _DbgSHLWAPI_239@12                      @239 NONAME
+
+                             _DbgSHLWAPI_240@16                      @240 NONAME
+;;PH                             _DbgSHLWAPI_241@0                       @241 NONAME
+                             _DbgPathRemoveArgsA@4                   @241 NONAME
+                             _DbgSHLWAPI_243@20                      @243 NONAME
+
+;   AssocCreate            = _DbgAssocCreate@20                      @253 ;by name
+;   AssocQueryKeyA         = _DbgAssocQueryKeyA@20                   @254 ;by name
+;   AssocQueryKeyW         = _DbgAssocQueryKeyW@20                   @255 ;by name
+
+                             _DbgSHLWAPI_266@16                      @266 NONAME
+                             _DbgSHLWAPI_267@16                      @267 NONAME
+                             _DbgSHLWAPI_268@8                       @268 NONAME
+
+                             _DbgSHLWAPI_276@0                       @276 NONAME ; -> SHEnumKeyExA
+                             _DbgSHLWAPI_278@24                      @278 NONAME
+
+                             _DbgSHLWAPI_289@12                      @289 NONAME
+;;                             _DbgSHLWAPI_284@20                      @294 NONAME
+                             _WritePrivateProfileStringW@16       @298 NONAME
+
+                             _CreateFontW@56                      @300 NONAME
+                             _DrawTextExW@24                      @301 NONAME
+                             _GetMenuItemInfoW@16                 @302 NONAME
+                             _InsertMenuItemW@16                  @303 NONAME
+                             _CreateMetaFileW@4                   @304 NONAME
+                             _CreateMutexW@12                     @305 NONAME
+                             _ExpandEnvironmentStringsW@12        @306 NONAME
+                             _CreateSemaphoreW@16                 @307 NONAME
+                             _IsBadStringPtrW@8                   @308 NONAME
+                             _LoadLibraryW@4                      @309 NONAME
+                             _GetTimeFormatW@24                   @310 NONAME
+                             _GetDateFormatW@24                   @311 NONAME
+                             _GetPrivateProfileStringW@24         @312 NONAME
+                             _DbgSHLWAPI_313@20                      @313 NONAME
+                             _RegisterClassExW@4                  @314 NONAME
+                             _GetClassInfoExW@12                  @315 NONAME
+;;316 stub SHCreateStreamOnFileAOld
+;;317 stub SHCreateStreamOnFileWOld
+                             _DbgSHLWAPI_318@16                      @318 NONAME
+                             _FindWindowExW@16                    @319 NONAME
+
+                             _DbgSHLWAPI_320@8                       @320 NONAME
+                             _DbgSHLWAPI_321@8                       @321 NONAME
+                             _DbgSHLWAPI_322@4                       @322 NONAME
+                             _DbgSHLWAPI_323@4                       @323 NONAME
+
+                             _CallMsgFilterW@8                    @332 NONAME
+                             _DbgSHLWAPI_333@4                       @333 NONAME
+                             _DbgSHLWAPI_334@8                       @334 NONAME
+                             _DbgSHLWAPI_335@4                       @335 NONAME
+                             _DbgSHLWAPI_336@4                       @336 NONAME
+                             _DbgSHLWAPI_337@20                      @337 NONAME
+                             _SetFileAttributesW@8                @338 NONAME
+                             _GetNumberFormatW@24                 @339 NONAME
+                             _MessageBoxW@16                      @340 NONAME
+                             _FindNextFileW@8                     @341 NONAME
+  _SHLWAPI_342@12 = _InterlockedCompareExchange@12                @342 NONAME
+                             _DbgSHLWAPI_346@12                      @346 NONAME
+                             _RegDeleteValueW@8                   @347 NONAME
+
+                             _DbgSHLWAPI_356@12                      @356 NONAME
+                             _DbgSHLWAPI_357@20                      @357 NONAME
+                             _DbgSHLWAPI_358@24                      @358 NONAME
+                             _OpenEventW@12                       @359 NONAME
+                             _RemoveDirectoryW@4                  @360 NONAME
+                             _GetShortPathNameW@12                @361 NONAME
+
+                             _DbgSHLWAPI_364@12                      @364 NONAME
+
+                             _RegEnumValueW@32                    @366 NONAME
+                             _WritePrivateProfileStructW@20       @367 NONAME
+                             _GetPrivateProfileStructW@20         @368 NONAME
+                             _CreateProcessW@40                   @369 NONAME
+                             _DbgSHLWAPI_370@12                      @370 NONAME
+
+                             _DbgSHLWAPI_376@0                       @376 NONAME ;kernel32.GetUserDefaultUILanguage
+                             _DbgSHLWAPI_377@12                      @377 NONAME
+                             _DbgSHLWAPI_378@12                      @378 NONAME
+
+;   AssocQueryStringA      = _DbgAssocQueryStringA@20                @381
+;   AssocQueryStringByKeyA = _DbgAssocQueryStringByKeyA@20           @382
+;;383 stub AssocQueryStringByKeyW
+;;384 stub AssocQueryStringW
+    ChrCmpIA               = _DbgChrCmpIA@8                          @385
+    ChrCmpIW               = _DbgChrCmpIW@8                          @386
+;;387 stub ColorAdjustLuma
+
+                             _DbgSHLWAPI_389@4                       @389 NONAME
+                             _DbgSHLWAPI_390@8                       @390 NONAME
+                             _DbgSHLWAPI_391@20                      @391 NONAME
+
+                             _DbgSHLWAPI_401@4                       @401 NONAME
+                             _DbgSHLWAPI_402@4                       @402 NONAME
+                             _DbgSHLWAPI_403@4                       @403 NONAME
+    ColorHLSToRGB          = _DbgColorHLSToRGB@12                    @404 NONAME
+
+;                            _DbgSHLWAPI_407@16                      @407 NONAME
+;                            _DbgSHLWAPI_408@16                      @408 NONAME
+;                            _DbgSHLWAPI_409@12                      @409 NONAME
+;                            _DbgSHLWAPI_410@12                      @410 NONAME
+
+                             _DbgSHLWAPI_413@4                       @413 NONAME
+
+                             _TrackPopupMenuEx@24                 @428 NONAME
+
+                             _DbgSHLWAPI_431@4                       @431 NONAME
+
+                             _SendMessageTimeoutW@28              @434 NONAME
+
+                             _DbgSHLWAPI_437@4                       @437 NONAME
+
+                             _GetEnvironmentVariableW@12          @442 NONAME
+                             _GetSystemWindowsDirectoryA@8        @443 NONAME
+                             _GetSystemWindowsDirectoryW@8        @444 NONAME
+    ColorRGBToHLS          = _DbgColorRGBToHLS@16                    @445
+
+    DllGetVersion          = _DbgSHLWAPI_DllGetVersion@4             @446
+    GetMenuPosFromID       = _DbgGetMenuPosFromID@8                  @447
+    HashData               = _DbgHashData@16                         @448
+  ; IntlStrEqWorkerA       = _DbgStrIsIntlEqualA@16                  @449
+  ; IntlStrEqWorkerW       = _DbgStrIsIntlEqualw@16                  @450
+    PathAddBackslashA      = _DbgPathAddBackslashA@4                 @451
+    PathAddBackslashW      = _DbgPathAddBackslashW@4                 @452
+    PathAddExtensionA      = _DbgPathAddExtensionA@8                 @453
+    PathAddExtensionW      = _DbgPathAddExtensionW@8                 @454
+    PathAppendA            = _DbgPathAppendA@8                       @455
+    PathAppendW            = _DbgPathAppendW@8                       @456
+    PathBuildRootA         = _DbgPathBuildRootA@8                    @457
+    PathBuildRootW         = _DbgPathBuildRootW@8                    @458
+    PathCanonicalizeA      = _DbgPathCanonicalizeA@8                 @459
+    PathCanonicalizeW      = _DbgPathCanonicalizeW@8                 @460
+    PathCombineA           = _DbgPathCombineA@12                     @461
+    PathCombineW           = _DbgPathCombineW@12                     @462
+    PathCommonPrefixA      = _DbgPathCommonPrefixA@12                @463
+    PathCommonPrefixW      = _DbgPathCommonPrefixW@12                @464
+    PathCompactPathA       = _DbgPathCompactPathA@12                 @465
+    PathCompactPathExA     = _DbgPathCompactPathExA@16               @466
+    PathCompactPathExW     = _DbgPathCompactPathExW@16               @467
+    PathCompactPathW       = _DbgPathCompactPathW@12                 @468
+    PathCreateFromUrlA     = _DbgPathCreateFromUrlA@16               @469
+    PathCreateFromUrlW     = _DbgPathCreateFromUrlW@16               @470
+    PathFileExistsA        = _DbgPathFileExistsA@4                   @471
+    PathFileExistsW        = _DbgPathFileExistsW@4                   @472
+    PathFindExtensionA     = _DbgPathFindExtensionA@4                @473
+    PathFindExtensionW     = _DbgPathFindExtensionW@4                @474
+    PathFindFileNameA      = _DbgPathFindFileNameA@4                 @475
+    PathFindFileNameW      = _DbgPathFindFileNameW@4                 @476
+    PathFindNextComponentA = _DbgPathFindNextComponentA@4            @477
+    PathFindNextComponentW = _DbgPathFindNextComponentW@4            @478
+    PathFindOnPathA        = _DbgPathFindOnPathA@8                   @479
+    PathFindOnPathW        = _DbgPathFindOnPathW@8                   @480
+;   PathFindSuffixArrayA   = _DbgPathFindSuffixArrayA@12             @481
+;   PathFindSuffixArrayW   = _DbgPathFindSuffixArrayW@12             @482
+    PathGetArgsA           = _DbgPathGetArgsA@4                      @483
+    PathGetArgsW           = _DbgPathGetArgsW@4                      @484
+    PathGetCharTypeA       = _DbgPathGetCharTypeA@4                  @485
+    PathGetCharTypeW       = _DbgPathGetCharTypeW@4                  @486
+    PathGetDriveNumberA    = _DbgPathGetDriveNumberA@4               @487
+    PathGetDriveNumberW    = _DbgPathGetDriveNumberW@4               @488
+    PathIsContentTypeA     = _DbgPathIsContentTypeA@8                @489
+    PathIsContentTypeW     = _DbgPathIsContentTypeW@8                @490
+    PathIsDirectoryA       = _DbgPathIsDirectoryA@4                  @491
+;   PathIsDirectoryEmptyA  = _DbgPathIsDirectoryEmptyA@4             @492
+;   PathIsDirectoryEmptyW  = _DbgPathIsDirectoryEmptyW@4             @493
+    PathIsDirectoryW       = _DbgPathIsDirectoryW@4                  @494
+    PathIsFileSpecA        = _DbgPathIsFileSpecA@4                   @495
+    PathIsFileSpecW        = _DbgPathIsFileSpecW@4                   @496
+;   PathIsLFNFileSpecA     = _DbgPathIsLFNFileSpecA@4                @497
+;   PathIsLFNFileSpecW     = _DbgPathIsLFNFileSpecW@4                @498
+;   PathIsNetworkPathA     = _DbgPathIsNetworkPathA@4                @499
+;   PathIsNetworkPathW     = _DbgPathIsNetworkPathW@4                @500
+    PathIsPrefixA          = _DbgPathIsPrefixA@8                     @501
+    PathIsPrefixW          = _DbgPathIsPrefixW@8                     @502
+    PathIsRelativeA        = _DbgPathIsRelativeA@4                   @503
+    PathIsRelativeW        = _DbgPathIsRelativeW@4                   @504
+    PathIsRootA            = _DbgPathIsRootA@4                       @505
+    PathIsRootW            = _DbgPathIsRootW@4                       @506
+    PathIsSameRootA        = _DbgPathIsSameRootA@8                   @507
+    PathIsSameRootW        = _DbgPathIsSameRootW@8                   @508
+    PathIsSystemFolderA    = _DbgPathIsSystemFolderA@8               @509
+    PathIsSystemFolderW    = _DbgPathIsSystemFolderW@8               @510
+    PathIsUNCA             = _DbgPathIsUNCA@4                        @511
+    PathIsUNCServerA       = _DbgPathIsUNCServerA@4                  @512
+    PathIsUNCServerShareA  = _DbgPathIsUNCServerShareA@4             @513
+    PathIsUNCServerShareW  = _DbgPathIsUNCServerShareW@4             @514
+    PathIsUNCServerW       = _DbgPathIsUNCServerW@4                  @515
+    PathIsUNCW             = _DbgPathIsUNCW@4                        @516
+    PathIsURLA             = _DbgPathIsURLA@4                        @517
+    PathIsURLW             = _DbgPathIsURLW@4                        @518
+    PathMakePrettyA        = _DbgPathMakePrettyA@4                   @519
+    PathMakePrettyW        = _DbgPathMakePrettyW@4                   @520
+    PathMakeSystemFolderA  = _DbgPathMakeSystemFolderA@4             @521
+    PathMakeSystemFolderW  = _DbgPathMakeSystemFolderW@4             @522
+    PathMatchSpecA         = _DbgPathMatchSpecA@8                    @523
+    PathMatchSpecW         = _DbgPathMatchSpecW@8                    @524
+    PathParseIconLocationA = _DbgPathParseIconLocationA@4            @525
+    PathParseIconLocationW = _DbgPathParseIconLocationW@4            @526
+    PathQuoteSpacesA       = _DbgPathQuoteSpacesA@4                  @527
+    PathQuoteSpacesW       = _DbgPathQuoteSpacesW@4                  @528
+    PathRelativePathToA    = _DbgPathRelativePathToA@20              @529
+    PathRelativePathToW    = _DbgPathRelativePathToW@20              @530
+    PathRemoveArgsA        = _DbgPathRemoveArgsA@4                   @531
+    PathRemoveArgsW        = _DbgPathRemoveArgsW@4                   @532
+    PathRemoveBackslashA   = _DbgPathRemoveBackslashA@4              @533
+    PathRemoveBackslashW   = _DbgPathRemoveBackslashW@4              @534
+    PathRemoveBlanksA      = _DbgPathRemoveBlanksA@4                 @535
+    PathRemoveBlanksW      = _DbgPathRemoveBlanksW@4                 @536
+    PathRemoveExtensionA   = _DbgPathRemoveExtensionA@4              @537
+    PathRemoveExtensionW   = _DbgPathRemoveExtensionW@4              @538
+    PathRemoveFileSpecA    = _DbgPathRemoveFileSpecA@4               @539
+    PathRemoveFileSpecW    = _DbgPathRemoveFileSpecW@4               @540
+    PathRenameExtensionA   = _DbgPathRenameExtensionA@8              @541
+    PathRenameExtensionW   = _DbgPathRenameExtensionW@8              @542
+    PathSearchAndQualifyA  = _DbgPathSearchAndQualifyA@12            @543
+    PathSearchAndQualifyW  = _DbgPathSearchAndQualifyW@12            @544
+    PathSetDlgItemPathA    = _DbgPathSetDlgItemPathA@12              @545
+    PathSetDlgItemPathW    = _DbgPathSetDlgItemPathW@12              @546
+    PathSkipRootA          = _DbgPathSkipRootA@4                     @547
+    PathSkipRootW          = _DbgPathSkipRootW@4                     @548
+    PathStripPathA         = _DbgPathStripPathA@4                    @549
+    PathStripPathW         = _DbgPathStripPathW@4                    @550
+    PathStripToRootA       = _DbgPathStripToRootA@4                  @551
+    PathStripToRootW       = _DbgPathStripToRootW@4                  @552
+;   PathUndecorateA        = _DbgPathUndecorateA@4                   @553
+;   PathUndecorateW        = _DbgPathUndecorateW@4                   @554
+    PathUnmakeSystemFolderA= _DbgPathUnmakeSystemFolderA@4           @555
+    PathUnmakeSystemFolderW= _DbgPathUnmakeSystemFolderW@4           @556
+    PathUnquoteSpacesA     = _DbgPathUnquoteSpacesA@4                @557
+    PathUnquoteSpacesW     = _DbgPathUnquoteSpacesW@4                @558
+
+;   SHAutoComplete         = _DbgSHAutoComplete@8                    @559
+  ; SHCopyKeyA             = _DbgSHCopyKeyA@?                        @560
+  ; SHCopyKeyW             = _DbgSHCopyKeyW@?                        @561
+    SHCreateShellPalette   = _DbgSHCreateShellPalette@4              @562
+  ; SHCreateStreamOnFileA  = _DbgSHCreateStreamOnFileA@?             @563
+  ; SHCreateStreamOnFileW  = _DbgSHCreateStreamOnFileW@?             @564
+  ; SHCreateStreamWrapper  = _DbgSHCreateStreamWrapper@?             @565
+
+    SHDeleteEmptyKeyA      = _DbgSHDeleteEmptyKeyA@8                 @567
+    SHDeleteEmptyKeyW      = _DbgSHDeleteEmptyKeyW@8                 @568
+    SHDeleteKeyA           = _DbgSHDeleteKeyA@8                      @569
+    SHDeleteKeyW           = _DbgSHDeleteKeyW@8                      @570
+    SHDeleteOrphanKeyA     = _DbgSHDeleteOrphanKeyA@8                @571
+    SHDeleteOrphanKeyW     = _DbgSHDeleteOrphanKeyW@8                @572
+    SHDeleteValueA         = _DbgSHDeleteValueA@12                   @573
+    SHDeleteValueW         = _DbgSHDeleteValueW@12                   @574
+    SHEnumKeyExA           = _DbgSHEnumKeyExA@16                     @575
+    SHEnumKeyExW           = _DbgSHEnumKeyExW@16                     @576
+    SHEnumValueA           = _DbgSHEnumValueA@28                     @577
+    SHEnumValueW           = _DbgSHEnumValueW@28                     @578
+    _SHGetInstanceExplorer = _Dbg_SHGetInstanceExplorer@4            @579
+    SHGetInverseCMAP       = _DbgSHGetInverseCMAP@8                  @580
+;   SHGetThreadRef         = _DbgSHGetThreadRef@?                    @581
+    SHGetValueA            = _DbgSHGetValueA@24                      @582
+    SHGetValueW            = _DbgSHGetValueW@24                      @583
+    SHIsLowMemoryMachine   = _DbgSHIsLowMemoryMachine@4              @584
+    SHOpenRegStream2A      = _DbgSHOpenRegStreamA@16                 @585
+    SHOpenRegStream2W      = _DbgSHOpenRegStreamW@16                 @586
+    SHOpenRegStreamA       = _DbgSHOpenRegStreamA@16                 @587
+    SHOpenRegStreamW       = _DbgSHOpenRegStreamW@16                 @588
+    SHQueryInfoKeyA        = _DbgSHQueryInfoKeyA@20                  @589
+    SHQueryInfoKeyW        = _DbgSHQueryInfoKeyW@20                  @590
+    SHQueryValueExA        = _DbgSHQueryValueExA@24                  @591
+    SHQueryValueExW        = _DbgSHQueryValueExW@24                  @592
+    SHRegCloseUSKey        = _DbgSHRegCloseUSKey@4                   @593
+    SHRegCreateUSKeyA      = _DbgSHRegCreateUSKeyA@20                @594
+    SHRegCreateUSKeyW      = _DbgSHRegCreateUSKeyW@20                @595
+    SHRegDeleteEmptyUSKeyA = _DbgSHRegDeleteEmptyUSKeyA@12           @596
+    SHRegDeleteEmptyUSKeyW = _DbgSHRegDeleteEmptyUSKeyW@12           @597
+    SHRegDeleteUSKeyA      = _DbgSHRegDeleteUSKeyA@12                @598
+    SHRegDeleteUSKeyW      = _DbgSHRegDeleteUSKeyW@12                @599
+  ; SHRegDuplicateHKey     = _DbgSHRegDuplicateHKey@?                @600
+    SHRegEnumUSKeyA        = _DbgSHRegEnumUSKeyA@20                  @601
+    SHRegEnumUSKeyW        = _DbgSHRegEnumUSKeyW@20                  @602
+    SHRegEnumUSValueA      = _DbgSHRegEnumUSValueA@32                @603
+    SHRegEnumUSValueW      = _DbgSHRegEnumUSValueW@32                @604
+    SHRegGetBoolUSValueA   = _DbgSHRegGetBoolUSValueA@16             @605
+    SHRegGetBoolUSValueW   = _DbgSHRegGetBoolUSValueW@16             @606
+    SHRegGetUSValueA       = _DbgSHRegGetUSValueA@32                 @607
+    SHRegGetUSValueW       = _DbgSHRegGetUSValueW@32                 @608
+    SHRegOpenUSKeyA        = _DbgSHRegOpenUSKeyA@20                  @609
+    SHRegOpenUSKeyW        = _DbgSHRegOpenUSKeyW@20                  @610
+;    SHRegQueryInfoKeyA     = _DbgSHRegQueryInfoKeyA@24               @611
+;    SHRegQueryInfoKeyW     = _DbgSHRegQueryInfoKeyW@24               @612
+    SHRegQueryUSValueA     = _DbgSHRegQueryUSValueA@32               @613
+    SHRegQueryUSValueW     = _DbgSHRegQueryUSValueW@32               @614
+    SHRegSetUSValueA       = _DbgSHRegSetUSValueA@24                 @615
+    SHRegSetUSValueW       = _DbgSHRegSetUSValueW@24                 @616
+    SHRegWriteUSValueA     = _DbgSHRegWriteUSValueA@24               @617
+    SHRegWriteUSValueW     = _DbgSHRegWriteUSValueW@24               @618
+;   SHSetSetThreadRef      = _DbgSHSetThreadRef@?                    @619
+    SHSetValueA            = _DbgSHSetValueA@24                      @620
+    SHSetValueW            = _DbgSHSetValueW@24                      @621
+;   SHSkipJunction         = _DbgSHSkipJunction@8                    @622
+;   SHStrDupA              = _DbgSHStrDupA@?                         @623
+;   SHStrDupW              = _DbgSHStrDUpW@?                         @624
+    StrCSpnA               = _DbgStrCSpnA@8                          @625
+  ; StrCSpnIA              = _DbgStrCSpnIA@?                         @626
+  ; StrCSpnIW              = _DbgStrCSpnIW@?                         @627
+    StrCSpnW               = _DbgStrCSpnW@8                          @628
+    StrCatBuffA            = _DbgStrCatBuffA@12                      @629
+    StrCatBuffW            = _DbgStrCatBuffW@12                      @630
+;    StrCatA                = _DbgStrCatA@8                                 ; not exported ?
+    StrCatW                = _DbgStrCatW@8                           @631
+    StrChrA                = _DbgStrChrA@8                           @632
+    StrChrIA               = _DbgStrChrIA@8                          @633
+    StrChrIW               = _DbgStrChrIW@8                          @634
+    StrChrW                = _DbgStrChrW@8                           @635
+    StrCmpIW               = _lstrcmpiW@8                         @636
+    StrCmpNA               = _DbgStrCmpNA@12                         @637
+    StrCmpNIA              = _DbgStrCmpNIA@12                        @638
+    StrCmpNIW              = _DbgStrCmpNIW@12                        @639
+    StrCmpNW               = _DbgStrCmpNW@12                         @640
+    StrCmpW                = _lstrcmpW@8                          @641
+    StrCpyNW               = _lstrcpynW@12                        @642
+;;;    StrCpyA                = _DbgStrCpyA@8                                 ; not exported ?
+    StrCpyW                = _DbgStrCpyW@8                           @643
+    StrDupA                = _DbgStrDupA@4                           @644
+    StrDupW                = _DbgStrDupW@4                           @645
+;   StrFormatByteSize64A   = _DbgStrFormatByteSize64A@16             @646
+    StrFormatByteSizeA     = _DbgStrFormatByteSizeA@12               @647
+    StrFormatByteSizeW     = _DbgStrFormatByteSizeW@12               @648
+;   StrFormatKBSizeA       = _DbgStrFormatKBSizeA@16                 @649
+;   StrFormatKBSizeW       = _DbgStrFormatKBSizeW@16                 @650
+    StrFromTimeIntervalA   = _DbgStrFromTimeIntervalA@16             @651
+    StrFromTimeIntervalW   = _DbgStrFromTimeIntervalW@16             @652
+  ; IntlStrEqWorkerA       = _DbgStrIsIntlEqualA@16                  @653
+  ; StrIsIntlEqualW        = _DbgStrIsIntlEqualW@?                   @654
+    StrNCatA               = _DbgStrNCatA@12                         @655
+    StrNCatW               = _DbgStrNCatW@12                         @656
+    StrPBrkA               = _DbgStrPBrkA@8                          @657
+    StrPBrkW               = _DbgStrPBrkW@8                          @658
+    StrRChrA               = _DbgStrRChrA@12                         @659
+    StrRChrIA              = _DbgStrRChrIA@12                        @660
+    StrRChrIW              = _DbgStrRChrIW@12                        @661
+    StrRChrW               = _DbgStrRChrW@12                         @662
+    StrRStrIA              = _DbgStrRStrIA@12                        @663
+    StrRStrIW              = _DbgStrRStrIW@12                        @664
+    StrRetToBufA           = _DbgStrRetToBufA@16                     @665
+    StrRetToBufW           = _DbgStrRetToBufW@16                     @666
+;   StrRetToStrA           = _DbgStrRetToStrA@12                     @667
+;   StrRetToStrW           = _DbgStrRetToStrW@12                     @668
+    StrSpnA                = _DbgStrSpnA@8                           @669
+    StrSpnW                = _DbgStrSpnW@8                           @670
+    StrStrA                = _DbgStrStrA@8                           @671
+    StrStrIA               = _DbgStrStrIA@8                          @672
+    StrStrIW               = _DbgStrStrIW@8                          @673
+    StrStrW                = _DbgStrStrW@8                           @674
+    StrToIntA              = _DbgStrToIntA@4                         @675
+    StrToIntExA            = _DbgStrToIntExA@12                      @676
+    StrToIntExW            = _DbgStrToIntExW@12                      @677
+    StrToIntW              = _DbgStrToIntW@4                         @678
+    StrTrimA               = _DbgStrTrimA@8                          @679
+  ; StrTrimW               = _DbgStrTrimW@?                          @680
+    UrlApplySchemeA        = _DbgUrlApplySchemeA@16                  @681
+    UrlApplySchemeW        = _DbgUrlApplySchemeW@16                  @682
+    UrlCanonicalizeA       = _DbgUrlCanonicalizeA@16                 @683
+    UrlCanonicalizeW       = _DbgUrlCanonicalizeW@16                 @684
+    UrlCombineA            = _DbgUrlCombineA@20                      @685
+    UrlCombineW            = _DbgUrlCombineW@20                      @686
+    UrlCompareA            = _DbgUrlCompareA@12                      @687
+    UrlCompareW            = _DbgUrlCompareW@12                      @688
+    UrlCreateFromPathA     = _DbgUrlCreateFromPathA@16               @689
+    UrlCreateFromPathW     = _DbgUrlCreateFromPathW@16               @690
+    UrlEscapeA             = _DbgUrlEscapeA@16                       @691
+    UrlEscapeW             = _DbgUrlEscapeW@16                       @692
+    UrlGetLocationA        = _DbgUrlGetLocationA@4                   @693
+    UrlGetLocationW        = _DbgUrlGetLocationW@4                   @694
+    UrlGetPartA            = _DbgUrlGetPartA@20                      @695
+    UrlGetPartW            = _DbgUrlGetPartW@20                      @696
+    UrlHashA               = _DbgUrlHashA@12                         @697
+    UrlHashW               = _DbgUrlHashW@12                         @698
+    UrlIsA                 = _DbgUrlIsA@8                            @699
+    UrlIsNoHistoryA        = _DbgUrlIsNoHistoryA@4                   @700
+    UrlIsNoHistoryW        = _DbgUrlIsNoHistoryW@4                   @701
+    UrlIsOpaqueA           = _DbgUrlIsOpaqueA@4                      @702
+    UrlIsOpaqueW           = _DbgUrlIsOpaqueW@4                      @703
+    UrlIsW                 = _DbgUrlIsW@8                            @704
+    UrlUnescapeA           = _DbgUrlUnescapeA@16                     @705
+    UrlUnescapeW           = _DbgUrlUnescapeW@16                     @706
+    wnsprintfA             = _wnsprintfA                          @707
+    wnsprintfW             = _wnsprintfW                          @708
+;    wvnsprintfA            = _DbgwvnsprintfA@16                      @709
+;    wvnsprintfW            = _DbgwvnsprintfW@16                      @710
+
+    SHRegGetPathA          = _DbgSHRegGetPathA@20                    @802
+    SHRegGetPathW          = _DbgSHRegGetPathW@20                    @803
+    SHRegDeleteUSValueA    = _DbgSHRegDeleteUSValueA@12
+    SHRegDeleteUSValueW    = _DbgSHRegDeleteUSValueW@12
