Changeset 6609 for trunk/src

Timestamp:

Aug 31, 2001, 1:37:03 AM (24 years ago)

Author:

phaller

Message:

.

Location:

trunk/src/shlwapi

Files:

• ordinal.c (modified) (1 diff)
• ordinal_odin.cpp (modified) (2 diffs)
• path.c (modified) (1 diff)
• shlwapi.def (modified) (2 diffs)

trunk/src/shlwapi/ordinal.c

@@ -68 +68 @@
  */
 DWORD WINAPI SHLWAPI_1 (
-        LPSTR lpString1,
-        LPSTR lpString2)
-{
-  if (lpString1 == NULL)
-    return 0;
+        LPSTR   lpURL,
+        LPDWORD lpdwFlags)
+{
+  if (lpURL == NULL)
+    return E_INVALIDARG;
   
-  if (lpString2 == NULL)
-    return 0;
+  if (lpdwFlags == NULL)
+    return E_INVALIDARG;
+  
+  // verify flags
+  if (*lpdwFlags != 0x18)   // some unknown flag
+    return E_INVALIDARG;      // some unknown error condition
   
   FIXME("(%p %s %p %s)\n",lpStr, debugstr_a(lpStr),x, debugstr_a(x));

trunk/src/shlwapi/ordinal_odin.cpp

@@ -1 @@
-/* $Id: ordinal_odin.cpp,v 1.2 2001-05-19 11:14:01 sandervl Exp $ */
+/* $Id: ordinal_odin.cpp,v 1.3 2001-08-30 23:37:03 phaller Exp $ */
 
 /*
@@ -90 +90 @@
  *****************************************************************************/
 
-ODINFUNCTION2(DWORD,SHLWAPI_1,
-              DWORD,arg0,
-              DWORD,arg1)
+// return characters in protocol part
+static INT extractProtocolFromURL(LPSTR  pszURL,
+                                  LPSTR* ppszColon)
+{
+  int i = 0;  // number of characters scanned
+  LPSTR s = pszURL;
+
+  *ppszColon = NULL;
+
+  if (*pszURL == 0)
+    return 0;
+
+
+  // scan through the string for the 1st colon
+  while(*s)
+  {
+    // filter non-printable characters
+    if (*s < ' ')
+      return 0;
+    else
+      if (*s > 0x80)
+        return 0;     
+
+    // Note: actually, the original code has a table with
+    // "forbidden" characters, we don't reproduce this here yet.
+
+    if (*s == ':')
+    {
+       // yes, first colon found!
+       if ( (pszURL[0] == 'U' || pszURL[0] == 'u') &&
+            (pszURL[1] == 'R' || pszURL[1] == 'r') &&
+            (pszURL[2] == 'L' || pszURL[2] == 'l') )
+       {
+         // restart scan!
+         pszURL = s+1;
+         i = 0;
+       }
+       else
+       {
+         // OK, protocol extracted
+         *ppszColon = s;
+         return i;
+       }
+    }
+
+    // skip to next character
+    i++;
+    s++;
+  }  
+
+  return 0;
+}
+
+typedef struct tabProtocolTableEntry
+{
+  LPSTR  pszName; // Note: original is unicode
+  DWORD  ID;
+  DWORD  dwNameLength;
+  DWORD  dwCharacteristic;
+} PROTOCOLTABLEENTRY, *LPPROTOCOLTABLEENTRY;
+
+
+#define PROTOCOL_HTTP 2
+#define PROTOCOL_FILE 9
+
+static PROTOCOLTABLEENTRY tabProtocolTable[] =
+{
+  { "http",        PROTOCOL_HTTP,  4, 0x0a },
+  { "file",        PROTOCOL_FILE,  4, 0x08 },
+  { "ftp",         1,  3, 0x0a },
+  { "https",      11,  5, 0x0a },
+  { "news",        5,  4, 0x0a },
+  { "mailto",      0,  6, 0x01 }, 
+  { "gopher",      3,  6, 0x0a },
+  { "nntp",        6,  4, 0x0a },
+  { "telnet",      7,  6, 0x0a },
+  { "wais",        8,  4, 0x00 },
+  { "mk",         10,  2, 0x04 },
+  { "shell",      12,  5, 0x01 },
+  { "local",      14,  5, 0x00 },
+  { "javascript", 15, 10, 0x05 },
+  { "vbscript",   16,  8, 0x05 },
+  { "snews",      13,  5, 0x0a },
+  { "about",      17,  5, 0x05 },
+  { "res",        18,  3, 0x04 }
+};
+#define END_OF_PROTOCOLTABLE (tabProtocolTable + sizeof(tabProtocolTable))
+
+
+
+static DWORD getProtocolTableEntry(LPSTR pszProtocol, DWORD dwNameLength)
+{
+  LPPROTOCOLTABLEENTRY lpEntry = tabProtocolTable;
+
+  for(;;)
+  {
+    if (lpEntry->dwNameLength == dwNameLength)
+      if (lstrncmpiA( lpEntry->pszName, pszProtocol, dwNameLength) == 0)
+      {
+        return lpEntry->ID; 
+      }
+
+    lpEntry++;
+
+    // if scanning beyond end of the table,
+    // abort and return null
+    if (lpEntry > END_OF_PROTOCOLTABLE)
+      return 0;
+  }
+}
+
+typedef struct tagProtocolHandlerA
+{
+  DWORD  dwSize;
+  DWORD  dwProtocolNameLength;
+  LPSTR  lpszProtocolName;
+  LPSTR  lpszURL;
+  DWORD  dwURLNameLength;
+  DWORD  ProtocolID;
+} PROTOCOLHANDLERA, *LPPROTOCOLHANDLERA;
+
+typedef struct tagProtocolHandlerW
+{
+  DWORD  dwSize;
+  DWORD  dwProtocolNameLength;
+  LPWSTR lpszProtocolName;
+  LPWSTR lpszURL;
+  DWORD  dwURLNameLength;
+  DWORD  ProtocolID;
+} PROTOCOLHANDLERW, *LPPROTOCOLHANDLERW;
+
+
+ODINFUNCTION2(DWORD,   SHLWAPI_1,
+              LPSTR,   lpszURL,
+              LPPROTOCOLHANDLERA, lpHandler)
 {
   dprintf(("not implemented"));
 
-  return 0;
-}
-
-
-/*****************************************************************************
- * Name      : ???
- * Purpose   : Unknown (used by explorer.exe)
- * Parameters: Unknown (wrong)
- * Variables :
- * Result    : Unknown
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Christoph Bratschi [Wed, 2000/03/29 19:47]
- *****************************************************************************/
-
-ODINFUNCTION2(DWORD,SHLWAPI_2,
-              DWORD,arg0,
-              DWORD,arg1)
-{
-  dprintf(("not implemented"));
+  if (NULL == lpszURL)
+    return E_INVALIDARG;
+
+  if (NULL == lpHandler)
+    return E_INVALIDARG;
+
+  if (lpHandler->dwSize != sizeof( PROTOCOLHANDLERA) )
+    return E_INVALIDARG;
+
+  dprintf(("SHLWAPI-SHLWAPI1: URL=%s",
+    lpszURL));
+
+  INT iProtocolLength = extractProtocolFromURL(lpszURL,
+                                               &lpszURL);
+  lpHandler->dwProtocolNameLength = iProtocolLength;
+  if (0 == iProtocolLength)
+    return 0x80041001; // unknown error constant
+
+  lpHandler->lpszProtocolName = lpszURL;
+
+  DWORD ID = getProtocolTableEntry(lpszURL,
+                                                       iProtocolLength);
+  lpHandler->ProtocolID = ID;
+  lpHandler->lpszURL    = (LPSTR)(lpszURL + iProtocolLength + 1);
+  
+  if (ID == PROTOCOL_FILE)
+  {
+    // cut off leading slashes as required
+    if (lpHandler->lpszURL[0] == '/' &&
+        lpHandler->lpszURL[1] == '/')
+      lpHandler->lpszURL = lpHandler->lpszURL + 2;
+
+    if (lpHandler->lpszURL[0] == '/')
+      lpHandler->lpszURL = lpHandler->lpszURL + 1;
+  }
+
+  lpHandler->dwURLNameLength = lstrlenA(lpHandler->lpszURL);
+
+  return NO_ERROR;
+}
+
+
+/*****************************************************************************
+ * Name      : ParseURLIntoProtocolAndURI_W
+ * Purpose   :
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    : UNTESTED
+ *
+ * Author    : Patrick Haller [2001-08-30]
+ *****************************************************************************/
+
+ODINFUNCTION2(DWORD,              SHLWAPI_2,
+              LPWSTR,             lpszURL,
+              LPPROTOCOLHANDLERW, lpHandler)
+{
+  dprintf(("not yet implemented"));
+
+  // PH: do unicode conversion, call SHLWAPI_1 
 
   return 0;

trunk/src/shlwapi/path.c

@@ -1171 +1171 @@
 BOOL WINAPI PathIsURLA(LPCSTR lpstrPath)
 {
+  // 2001-08-30 PH
+  // SHLWAPI/W95 Code:
+  //
+  // if (lpstrPath == NULL)
+  //   return FALSE;
+  //
+  // DWORD dwUnknown = SHREG_xxx; // 0x18
+  // return SHLWAPI_1(lpstrPath, &dwUnknown);
+  
+  
         LPSTR lpstrRes;
         int iSize, i=0;

trunk/src/shlwapi/shlwapi.def

@@ -1 @@
-; $Id: shlwapi.def,v 1.25 2001-08-30 19:19:58 phaller Exp $
+; $Id: shlwapi.def,v 1.26 2001-08-30 23:37:03 phaller Exp $
 
 ; updated export ordinals to NT4 SP6 version of SHLWAPI.DLL
@@ -18 +18 @@
 ; --------------------
 
+; 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.
 
                              _SHLWAPI_1@8                         @1  NONAME