Alexandre Julliard <julliard@winehq.org>

- Added rules for building import libraries in the individual dll
  makefiles, and added support for building a .def.a static import
  library too.
Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
- Test cases for URL_UNESCAPE and small fix.
Francois Gouget <fgouget@free.fr>
- Assorted spelling fixes.

svn path=/trunk/; revision=15623

diff --git a/reactos/lib/shlwapi/Makefile.in b/reactos/lib/shlwapi/Makefile.in
index 7a80242..3121339 100644 (file)
--- a/reactos/lib/shlwapi/Makefile.in
+++ b/reactos/lib/shlwapi/Makefile.in
@@ -4,6 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@\r
 VPATH     = @srcdir@\r
 MODULE    = shlwapi.dll\r
+IMPORTLIB = libshlwapi.$(IMPLIBEXT)\r
 IMPORTS   = ole32 user32 gdi32 advapi32 kernel32 ntdll\r
 DELAYIMPORTS = oleaut32\r
 EXTRALIBS = -luuid $(LIBUNICODE)\r

diff --git a/reactos/lib/shlwapi/reg.c b/reactos/lib/shlwapi/reg.c
index f4ce437..e6a7f17 100644 (file)
--- a/reactos/lib/shlwapi/reg.c
+++ b/reactos/lib/shlwapi/reg.c
@@ -1300,10 +1300,10 @@ LONG WINAPI SHQueryInfoKeyW(HKEY hKey, LPDWORD pwSubKeys, LPDWORD pwSubKeyMax,
  *\r
  *   REG_EXPAND_SZ:\r
  *     case-1: the unexpanded string is smaller than the expanded one\r
- *       subcase-1: the buffer is to small to hold the unexpanded string:\r
+ *       subcase-1: the buffer is too small to hold the unexpanded string:\r
  *          function fails and returns the size of the unexpanded string.\r
  *\r
- *       subcase-2: buffer is to small to hold the expanded string:\r
+ *       subcase-2: buffer is too small to hold the expanded string:\r
  *          the function return success (!!) and the result is truncated\r
  *         *** This is clearly an error in the native implementation. ***\r
  *\r
@@ -1332,7 +1332,7 @@ DWORD WINAPI SHQueryValueExA( HKEY hKey, LPCSTR lpszValue,
     /* Expand type REG_EXPAND_SZ into REG_SZ */\r
     LPSTR szData;\r
 \r
-    /* If the caller didn't supply a buffer or the buffer is to small we have\r
+    /* If the caller didn't supply a buffer or the buffer is too small we have\r
      * to allocate our own\r
      */\r
     if ((!pvData) || (dwRet == ERROR_MORE_DATA) )\r

diff --git a/reactos/lib/shlwapi/url.c b/reactos/lib/shlwapi/url.c
index eedb50b..20f3d00 100644 (file)
--- a/reactos/lib/shlwapi/url.c
+++ b/reactos/lib/shlwapi/url.c
@@ -459,7 +459,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized,
         lpszUrlCpy[--nLen]=0;\r
 \r
     if(dwFlags & URL_UNESCAPE)\r
-        UrlUnescapeW(lpszUrlCpy, NULL, NULL, URL_UNESCAPE_INPLACE);\r
+        UrlUnescapeW(lpszUrlCpy, NULL, &nLen, URL_UNESCAPE_INPLACE);\r
 \r
     if((EscapeFlags = dwFlags & (URL_ESCAPE_UNSAFE |\r
                                  URL_ESCAPE_SPACES_ONLY |\r
@@ -1160,7 +1160,7 @@ HRESULT WINAPI UrlUnescapeW(
     TRACE("(%s, %p, %p, 0x%08lx)\n", debugstr_w(pszUrl), pszUnescaped,\r
          pcchUnescaped, dwFlags);\r
 \r
-    if(!pszUrl || !pszUnescaped || !pcchUnescaped)\r
+    if(!pszUrl || (!pszUnescaped && !(dwFlags & URL_UNESCAPE_INPLACE))|| !pcchUnescaped)\r
        return E_INVALIDARG;\r
 \r
     if(dwFlags & URL_UNESCAPE_INPLACE)\r