[ros-diffs] [winesync] 31794: Autosyncing with Wine HEAD

Author: winesync
Date: Mon Jan 14 19:32:09 2008
New Revision: 31794

URL: http://svn.reactos.org/svn/reactos?rev=31794&view=rev
Log:
Autosyncing with Wine HEAD

Modified:
    trunk/reactos/dll/win32/shlwapi/ordinal.c
    trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild
    trunk/reactos/dll/win32/shlwapi/url.c

Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/ordinal.c (original)
+++ trunk/reactos/dll/win32/shlwapi/ordinal.c Mon Jan 14 19:32:09 2008
@@ -46,6 +46,7 @@
 #include "shlwapi.h"
 #include "shellapi.h"
 #include "commdlg.h"
+#include "mshtmhst.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
 
@@ -3226,13 +3227,10 @@
     EnableModeless(IOleInPlaceFrame);
   else if (IsIface(IShellBrowser))
     EnableModeless(IShellBrowser);
-#if 0
-  /* FIXME: Wine has no headers for these objects yet */
   else if (IsIface(IInternetSecurityMgrSite))
     EnableModeless(IInternetSecurityMgrSite);
   else if (IsIface(IDocHostUIHandler))
     EnableModeless(IDocHostUIHandler);
-#endif
   else
     return hRet;
 

Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild (original)
+++ trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild Mon Jan 14 19:32:09 2008
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
 <module name="shlwapi" type="win32dll"
baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32"
installname="shlwapi.dll" allowwarnings="true">
 	<importlibrary definition="shlwapi.spec.def" />
 	<include base="shlwapi">.</include>
@@ -41,3 +42,4 @@
 	<file>shlwapi.rc</file>
 	<file>shlwapi.spec</file>
 </module>
+</group>

Modified: trunk/reactos/dll/win32/shlwapi/url.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?re…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/url.c (original)
+++ trunk/reactos/dll/win32/shlwapi/url.c Mon Jan 14 19:32:09 2008
@@ -843,6 +843,9 @@
     HRESULT ret;
     DWORD lenW = sizeof(bufW)/sizeof(WCHAR), lenA;
 
+    if (!pszEscaped || !pcchEscaped || !*pcchEscaped)
+        return E_INVALIDARG;
+
     if(!RtlCreateUnicodeStringFromAsciiz(&urlW, pszUrl))
         return E_INVALIDARG;
     if((ret = UrlEscapeW(urlW.Buffer, escapedW, &lenW, dwFlags)) == E_POINTER) {
@@ -851,13 +854,13 @@
     }
     if(ret == S_OK) {
         RtlUnicodeToMultiByteSize(&lenA, escapedW, lenW * sizeof(WCHAR));
-        if(pszEscaped && *pcchEscaped > lenA) {
+        if(*pcchEscaped > lenA) {
             RtlUnicodeToMultiByteN(pszEscaped, *pcchEscaped - 1, &lenA, escapedW,
lenW * sizeof(WCHAR));
             pszEscaped[lenA] = 0;
             *pcchEscaped = lenA;
         } else {
             *pcchEscaped = lenA + 1;
-            ret = E_INVALIDARG;
+            ret = E_POINTER;
         }
     }
     if(escapedW != bufW) HeapFree(GetProcessHeap(), 0, escapedW);