Changeset 6615 for trunk/src

Timestamp:

Aug 31, 2001, 9:56:34 PM (24 years ago)

Author:

phaller

Message:

.

Location:

trunk/src/shlwapi

Files:

• ordinal_odin.cpp (modified) (4 diffs)
• shlwapi.def (modified) (3 diffs)
• url_odin.cpp (modified) (2 diffs)

trunk/src/shlwapi/ordinal_odin.cpp

@@ -1 @@
-/* $Id: ordinal_odin.cpp,v 1.3 2001-08-30 23:37:03 phaller Exp $ */
+/* $Id: ordinal_odin.cpp,v 1.4 2001-08-31 19:56:34 phaller Exp $ */
 
 /*
@@ -176 +176 @@
   { "res",        18,  3, 0x04 }
 };
-#define END_OF_PROTOCOLTABLE (tabProtocolTable + sizeof(tabProtocolTable))
+#define END_OF_PROTOCOLTABLE (tabProtocolTable + (sizeof(tabProtocolTable) / sizeof(PROTOCOLTABLEENTRY)) )
 
 
@@ -239 +239 @@
   dprintf(("SHLWAPI-SHLWAPI1: URL=%s",
     lpszURL));
-
+  
+  LPSTR lpszColon;
   INT iProtocolLength = extractProtocolFromURL(lpszURL,
-                                               &lpszURL);
+                                               &lpszColon);
   lpHandler->dwProtocolNameLength = iProtocolLength;
   if (0 == iProtocolLength)
@@ -249 +250 @@
 
   DWORD ID = getProtocolTableEntry(lpszURL,
-                                                       iProtocolLength);
+                                   iProtocolLength);
   lpHandler->ProtocolID = ID;
   lpHandler->lpszURL    = (LPSTR)(lpszURL + iProtocolLength + 1);

trunk/src/shlwapi/shlwapi.def

@@ -1 @@
-; $Id: shlwapi.def,v 1.26 2001-08-30 23:37:03 phaller Exp $
+; $Id: shlwapi.def,v 1.27 2001-08-31 19:56:34 phaller Exp $
 
 ; updated export ordinals to NT4 SP6 version of SHLWAPI.DLL
@@ -195 +195 @@
                              _SHLWAPI_237@4                       @237 NONAME
                              _SHLWAPI_240@16                      @240 NONAME
-                             _SHLWAPI_241@0                       @241 NONAME
+; PH                          _SHLWAPI_241@0                       @241 NONAME
+                             _PathRemoveArgsA@4                   @241 NONAME
                              _SHLWAPI_243@20                      @243 NONAME
 ;   AssocCreate            = _AssocCreate@20                      @253 ;by name
@@ -203 +204 @@
                              _SHLWAPI_267@16                      @267 NONAME
                              _SHLWAPI_268@8                       @268 NONAME
-                             _SHLWAPI_276@0                       @276 NONAME
+                             _SHLWAPI_276@0                       @276 NONAME ; -> SHEnumKeyExA
                              _SHLWAPI_278@24                      @278 NONAME
                              _WritePrivateProfileStringW@16       @298 NONAME

trunk/src/shlwapi/url_odin.cpp

@@ -1 @@
-/* $Id: url_odin.cpp,v 1.2 2001-08-30 19:19:59 phaller Exp $ */
+/* $Id: url_odin.cpp,v 1.3 2001-08-31 19:56:34 phaller Exp $ */
 
 /*
@@ -150 +150 @@
               DWORD,   dwFlags)
 {
-  dprintf(("not implemented."));
+  dprintf(("not implemented correctly (In=%s).",
+          pszIn));
 
   strncpy(pszOut,
           pszIn,
           *pcchOut);
-  *pcchOut = 0;
+  *pcchOut = lstrlenA(pszIn);
 
   return S_OK;