Changeset 8584 for trunk/src/shlwapi/ordinal.c

Timestamp:

Jun 7, 2002, 10:02:20 AM (23 years ago)

Author:

sandervl

Message:

resynced with latest Wine

File:

• trunk/src/shlwapi/ordinal.c (modified) (57 diffs)

trunk/src/shlwapi/ordinal.c

@@ -5 +5 @@
  *           1998 Jürgen Schmied
  *           2001 Jon Griffiths
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
@@ -24 +38 @@
 #include "winreg.h"
 #include "winuser.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "ordinal.h"
 #include "shlwapi.h"
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 extern HINSTANCE shlwapi_hInstance;
@@ -36 +50 @@
 extern HMODULE SHLWAPI_hmpr;
 extern HMODULE SHLWAPI_hmlang;
+extern HMODULE SHLWAPI_hversion;
+
+extern DWORD SHLWAPI_ThreadRef_index;
 
 typedef HANDLE HSHARED; /* Shared memory */
@@ -98 +115 @@
 };
 
-/* Macro to get function pointer for a module*/
-#define GET_FUNC(module, name, fail) \
-  if (!SHLWAPI_h##module) SHLWAPI_h##module = LoadLibraryA(#module ".dll"); \
-  if (!SHLWAPI_h##module) return fail; \
-  if (!pfnFunc) pfnFunc = (void*)GetProcAddress(SHLWAPI_h##module, name); \
-  if (!pfnFunc) return fail
+/* function pointers for GET_FUNC macro; these need to be global because of gcc bug */
+#ifdef __WIN32OS2__
+static LPITEMIDLIST (* WINAPI pSHBrowseForFolderW)(LPBROWSEINFOW);
+static HRESULT (* WINAPI pConvertINetUnicodeToMultiByte)(LPDWORD,DWORD,LPCWSTR,LPINT,LPSTR,LPINT);
+static BOOL    (* WINAPI pPlaySoundW)(LPCWSTR, HMODULE, DWORD);
+static DWORD   (* WINAPI pSHGetFileInfoW)(LPCWSTR,DWORD,SHFILEINFOW*,UINT,UINT);
+static UINT    (* WINAPI pDragQueryFileW)(HDROP, UINT, LPWSTR, UINT);
+static BOOL    (* WINAPI pSHGetPathFromIDListW)(LPCITEMIDLIST, LPWSTR);
+static BOOL    (* WINAPI pShellExecuteExW)(LPSHELLEXECUTEINFOW);
+static HICON   (* WINAPI pSHFileOperationW)(LPSHFILEOPSTRUCTW);
+static HICON   (* WINAPI pExtractIconExW)(LPCWSTR, INT,HICON *,HICON *, UINT);
+static BOOL    (* WINAPI pSHGetNewLinkInfoW)(LPCWSTR, LPCWSTR, LPCWSTR, BOOL*, UINT);
+static DWORD   (* WINAPI pSHDefExtractIconW)(LPVOID, LPVOID, LPVOID, LPVOID, LPVOID, LPVOID); /* FIXME: Correct args */
+static HICON   (* WINAPI pExtractIconW)(HINSTANCE, LPCWSTR, UINT);
+static BOOL    (* WINAPI pGetSaveFileNameW)(LPOPENFILENAMEW);
+static DWORD   (* WINAPI pWNetRestoreConnectionW)(LPVOID, LPVOID); /* FIXME: Correct args */
+static DWORD   (* WINAPI pWNetGetLastErrorW)(LPVOID, LPVOID, LPVOID, LPVOID, LPVOID); /* FIXME: Correct args */
+static BOOL    (* WINAPI pPageSetupDlgW)(LPPAGESETUPDLGW);
+static BOOL    (* WINAPI pPrintDlgW)(LPPRINTDLGW);
+static BOOL    (* WINAPI pGetOpenFileNameW)(LPOPENFILENAMEW);
+static HRESULT (* WINAPI pSHGetInstanceExplorer)(LPUNKNOWN *);
+static DWORD   (* WINAPI pGetFileVersionInfoSizeW)(LPCWSTR,LPDWORD);
+static BOOL    (* WINAPI pGetFileVersionInfoW)(LPCWSTR,DWORD,DWORD,LPVOID);
+static WORD    (* WINAPI pVerQueryValueW)(LPVOID,LPCWSTR,LPVOID*,UINT*);
+#else
+static LPITEMIDLIST (WINAPI *pSHBrowseForFolderW)(LPBROWSEINFOW);
+static HRESULT (WINAPI *pConvertINetUnicodeToMultiByte)(LPDWORD,DWORD,LPCWSTR,LPINT,LPSTR,LPINT);
+static BOOL    (WINAPI *pPlaySoundW)(LPCWSTR, HMODULE, DWORD);
+static DWORD   (WINAPI *pSHGetFileInfoW)(LPCWSTR,DWORD,SHFILEINFOW*,UINT,UINT);
+static UINT    (WINAPI *pDragQueryFileW)(HDROP, UINT, LPWSTR, UINT);
+static BOOL    (WINAPI *pSHGetPathFromIDListW)(LPCITEMIDLIST, LPWSTR);
+static BOOL    (WINAPI *pShellExecuteExW)(LPSHELLEXECUTEINFOW);
+static HICON   (WINAPI *pSHFileOperationW)(LPSHFILEOPSTRUCTW);
+static HICON   (WINAPI *pExtractIconExW)(LPCWSTR, INT,HICON *,HICON *, UINT);
+static BOOL    (WINAPI *pSHGetNewLinkInfoW)(LPCWSTR, LPCWSTR, LPCWSTR, BOOL*, UINT);
+static DWORD   (WINAPI *pSHDefExtractIconW)(LPVOID, LPVOID, LPVOID, LPVOID, LPVOID, LPVOID); /* FIXME: Correct args */
+static HICON   (WINAPI *pExtractIconW)(HINSTANCE, LPCWSTR, UINT);
+static BOOL    (WINAPI *pGetSaveFileNameW)(LPOPENFILENAMEW);
+static DWORD   (WINAPI *pWNetRestoreConnectionW)(LPVOID, LPVOID); /* FIXME: Correct args */
+static DWORD   (WINAPI *pWNetGetLastErrorW)(LPVOID, LPVOID, LPVOID, LPVOID, LPVOID); /* FIXME: Correct args */
+static BOOL    (WINAPI *pPageSetupDlgW)(LPPAGESETUPDLGW);
+static BOOL    (WINAPI *pPrintDlgW)(LPPRINTDLGW);
+static BOOL    (WINAPI *pGetOpenFileNameW)(LPOPENFILENAMEW);
+static HRESULT (WINAPI *pSHGetInstanceExplorer)(LPUNKNOWN *);
+static DWORD   (WINAPI *pGetFileVersionInfoSizeW)(LPCWSTR,LPDWORD);
+static BOOL    (WINAPI *pGetFileVersionInfoW)(LPCWSTR,DWORD,DWORD,LPVOID);
+static WORD    (WINAPI *pVerQueryValueW)(LPVOID,LPCWSTR,LPVOID*,UINT*);
+#endif
 
 /*
@@ -127 +186 @@
 
     if (y->size != 0x18) return E_INVALIDARG;
-    /* FIXME: leading white space generates error of 0x80041001 which 
+    /* FIXME: leading white space generates error of 0x80041001 which
      *        is undefined
      */
@@ -183 +242 @@
 
     if (y->size != 0x18) return E_INVALIDARG;
-    /* FIXME: leading white space generates error of 0x80041001 which 
+    /* FIXME: leading white space generates error of 0x80041001 which
      *        is undefined
      */
@@ -230 +289 @@
 
 /*************************************************************************
+ * @    [SHLWAPI.3]
+ *
+ * Determine if a file exists locally and is of an executable type.
+ *
+ * PARAMS
+ *  lpszFile       [O] File to search for
+ *  dwWhich        [I] Type of executable to search for
+ *
+ * RETURNS
+ *  TRUE  If the file was found. lpszFile contains the file name.
+ *  FALSE Otherwise.
+ *
+ * NOTES
+ *  lpszPath is modified in place and must be at least MAX_PATH in length.
+ *  If the function returns FALSE, the path is modified to its orginal state.
+ *  If the given path contains an extension or dwWhich is 0, executable
+ *  extensions are not checked.
+ *
+ *  Ordinals 3-6 are a classic case of MS exposing limited functionality to
+ *  users (here through PathFindOnPath) and keeping advanced functionality for
+ *  their own developers exclusive use. Monopoly, anyone?
+ */
+BOOL WINAPI SHLWAPI_3(LPSTR lpszFile,DWORD dwWhich)
+{
+  return SHLWAPI_PathFindLocalExeA(lpszFile,dwWhich);
+}
+
+/*************************************************************************
+ * @    [SHLWAPI.4]
+ *
+ * Unicode version of SHLWAPI_3.
+ */
+BOOL WINAPI SHLWAPI_4(LPWSTR lpszFile,DWORD dwWhich)
+{
+  return SHLWAPI_PathFindLocalExeW(lpszFile,dwWhich);
+}
+
+/*************************************************************************
+ * @    [SHLWAPI.5]
+ *
+ * Search a range of paths for a specific type of executable.
+ *
+ * PARAMS
+ *  lpszFile       [O] File to search for
+ *  lppszOtherDirs [I] Other directories to look in
+ *  dwWhich        [I] Type of executable to search for
+ *
+ * RETURNS
+ *  Success: TRUE. The path to the executable is stored in sFile.
+ *  Failure: FALSE. The path to the executable is unchanged.
+ */
+BOOL WINAPI SHLWAPI_5(LPSTR lpszFile,LPCSTR *lppszOtherDirs,DWORD dwWhich)
+{
+  return SHLWAPI_PathFindOnPathExA(lpszFile,lppszOtherDirs,dwWhich);
+}
+
+/*************************************************************************
+ * @    [SHLWAPI.6]
+ *
+ * Unicode version of SHLWAPI_5.
+ */
+BOOL WINAPI SHLWAPI_6(LPWSTR lpszFile,LPCWSTR *lppszOtherDirs,DWORD dwWhich)
+{
+  return SHLWAPI_PathFindOnPathExW(lpszFile,lppszOtherDirs,dwWhich);
+}
+
+/*************************************************************************
  * SHLWAPI_DupSharedHandle
  *
@@ -304 +430 @@
  * SHLWAPI_11           - Helper function; Duplicate cross-process handles
    */
-HSHARED WINAPI SHLWAPI_7 (DWORD dwProcId, LPCVOID lpvData, DWORD dwSize)
+HSHARED WINAPI SHLWAPI_7 (DWORD dwProcId, DWORD dwSize, LPCVOID lpvData)
 {
   HANDLE hMap;
@@ -528 +654 @@
  * Function:
  *    Retrieves IE "AcceptLanguage" value from registry. ASCII mode.
- *  
+ *
  */
 HRESULT WINAPI SHLWAPI_14 (
@@ -540 +666 @@
 
         mystrlen = (*buflen > 6) ? *buflen : 6;
-        mystr = (CHAR*)HeapAlloc(GetProcessHeap(), 
+        mystr = (CHAR*)HeapAlloc(GetProcessHeap(),
                                  HEAP_ZERO_MEMORY, mystrlen);
-        RegOpenKeyA(HKEY_CURRENT_USER, 
-                    "Software\\Microsoft\\Internet Explorer\\International", 
+        RegOpenKeyA(HKEY_CURRENT_USER,
+                    "Software\\Microsoft\\Internet Explorer\\International",
                     &mykey);
-        if (RegQueryValueExA(mykey, "AcceptLanguage", 
+        if (RegQueryValueExA(mykey, "AcceptLanguage",
                               0, &mytype, mystr, &mystrlen)) {
             /* Did not find value */
@@ -564 +690 @@
             FIXME("missing code\n");
         }
-        if (mystrlen > *buflen) 
+        if (mystrlen > *buflen)
             lstrcpynA(langbuf, mystr, *buflen);
         else {
             lstrcpyA(langbuf, mystr);
             *buflen = lstrlenA(langbuf);
-        }        
+        }
         RegCloseKey(mykey);
         HeapFree(GetProcessHeap(), 0, mystr);
@@ -581 +707 @@
  * Function:
  *    Retrieves IE "AcceptLanguage" value from registry. UNICODE mode.
- *  
+ *
  */
 HRESULT WINAPI SHLWAPI_15 (
@@ -593 +719 @@
 
         mystrlen = (*buflen > 6) ? *buflen : 6;
-        mystr = (CHAR*)HeapAlloc(GetProcessHeap(), 
+        mystr = (CHAR*)HeapAlloc(GetProcessHeap(),
                                  HEAP_ZERO_MEMORY, mystrlen);
-        RegOpenKeyA(HKEY_CURRENT_USER, 
-                    "Software\\Microsoft\\Internet Explorer\\International", 
+        RegOpenKeyA(HKEY_CURRENT_USER,
+                    "Software\\Microsoft\\Internet Explorer\\International",
                     &mykey);
-        if (RegQueryValueExA(mykey, "AcceptLanguage", 
+        if (RegQueryValueExA(mykey, "AcceptLanguage",
                               0, &mytype, mystr, &mystrlen)) {
             /* Did not find value */
@@ -870 +996 @@
 BOOL WINAPI SHLWAPI_36(HMENU h1, UINT ui2, UINT h3, LPCWSTR p4)
 {
-    TRACE("(0x%08x, 0x%08x, 0x%08x, %s): stub\n", 
+    TRACE("(0x%08x, 0x%08x, 0x%08x, %s): stub\n",
           h1, ui2, h3, debugstr_w(p4));
     return AppendMenuW(h1, ui2, h3, p4);
-}
-
-/*************************************************************************
- *      @       [SHLWAPI.40]
- *
- * Get pointer to next Unicode character.
- */
-LPCWSTR WINAPI SHLWAPI_40(LPCWSTR str)
-{
-  return *str ? str + 1 : str;
 }
 
@@ -941 +1057 @@
 {
     return strncmpiW( str1, str2, len );
+}
+
+/*************************************************************************
+ *      @       [SHLWAPI.155]
+ *
+ *      Case sensitive string compare (ASCII). Does not SetLastError().
+ */
+DWORD WINAPI SHLWAPI_155 ( LPSTR str1, LPSTR str2)
+{
+    return strcmp(str1, str2);
 }
 
@@ -1073 +1199 @@
  *      @       [SHLWAPI.174]
  *
- * Seems to do call either IObjectWithSite::SetSite or 
+ * Seems to do call either IObjectWithSite::SetSite or
  *   IPersistMoniker::GetClassID.  But since we do not implement either
  *   of those classes in our headers, we will fake it out.
@@ -1079 +1205 @@
 DWORD WINAPI SHLWAPI_174(
         IUnknown *p1,     /* [in]   OLE object                          */
-        LPVOID *p2)       /* [out]  ptr to result of either GetClassID 
+        LPVOID *p2)       /* [out]  ptr to result of either GetClassID
                                     or SetSite call.                    */
 {
@@ -1089 +1215 @@
     ret = IUnknown_QueryInterface((IUnknown *)p1, (REFIID)id1, (LPVOID *)&p1);
     TRACE("first IU_QI ret=%08lx, p1=%p\n", ret, p1);
-    if (ret) { 
+    if (ret) {
 
         /* see if GetClassId interface exists for IPersistMoniker object */
@@ -1098 +1224 @@
         /* fake a GetClassId call */
         ret = IOleWindow_GetWindow((IOleWindow *)aa, (HWND*)p2);
-        TRACE("second IU_QI doing 0x0c ret=%08lx, *p2=%08lx\n", ret, 
+        TRACE("second IU_QI doing 0x0c ret=%08lx, *p2=%08lx\n", ret,
               *(LPDWORD)p2);
         IUnknown_Release((IUnknown *)aa);
@@ -1105 +1231 @@
         /* fake a SetSite call */
         ret = IOleWindow_GetWindow((IOleWindow *)p1, (HWND*)p2);
-        TRACE("first IU_QI doing 0x0c ret=%08lx, *p2=%08lx\n", ret, 
+        TRACE("first IU_QI doing 0x0c ret=%08lx, *p2=%08lx\n", ret,
               *(LPDWORD)p2);
         IUnknown_Release((IUnknown *)p1);
@@ -1112 +1238 @@
 }
 
+/*************************************************************************
+ *      @       [SHLWAPI.175]
+ *
+ *      NOTE:
+ *        Param1 can be an IShellFolder Object
+ */
+HRESULT WINAPI SHLWAPI_175 (LPVOID x, LPVOID y)
+{
+        FIXME("(%p %p) stub\n", x,y);
+        return E_FAIL;
+}
 /*************************************************************************
  *      @       [SHLWAPI.176]
@@ -1133 +1270 @@
     if (!unk) return E_FAIL;
     ret = IUnknown_QueryInterface(unk, &IID_IServiceProvider, &aa);
-    TRACE("did IU_QI retval=%08lx, aa=%p\n", ret, aa); 
+    TRACE("did IU_QI retval=%08lx, aa=%p\n", ret, aa);
     if (ret) return ret;
-    ret = IServiceProvider_QueryService((IServiceProvider *)aa, sid, riid, 
+    ret = IServiceProvider_QueryService((IServiceProvider *)aa, sid, riid,
                                         (void **)z);
-    TRACE("did ISP_QS retval=%08lx, *z=%p\n", ret, (LPVOID)*z); 
+    TRACE("did ISP_QS retval=%08lx, *z=%p\n", ret, (LPVOID)*z);
     IUnknown_Release((IUnknown*)aa);
     return ret;
@@ -1220 +1357 @@
 
 /*************************************************************************
+ *      @       [SHLWAPI.209]
+ *
+ * Some sort of memory management process - associated with _208
+ */
+DWORD WINAPI SHLWAPI_209 (
+        LPVOID   a)
+{
+    FIXME("(%p) stub\n",
+          a);
+    return 1;
+}
+
+/*************************************************************************
  *      @       [SHLWAPI.210]
  *
@@ -1261 +1411 @@
         len_a = lstrlenA(lpStrSrc);
         ret = MultiByteToWideChar(0, 0, lpStrSrc, len_a, lpwStrDest, len);
-        TRACE("%s %s %d, ret=%d\n", 
+        TRACE("%s %s %d, ret=%d\n",
               debugstr_a(lpStrSrc), debugstr_w(lpwStrDest), len, ret);
         return ret;
@@ -1274 +1424 @@
                        LPINT lpnMultiCharCount)
 {
-  static HRESULT (* WINAPI pfnFunc)(LPDWORD,DWORD,LPCWSTR,LPINT,LPSTR,LPINT);
   WCHAR emptyW[] = { '\0' };
   int len , reqLen;
@@ -1300 +1449 @@
       INT nWideCharCount = len - 1;
 
-      GET_FUNC(mlang, "ConvertINetUnicodeToMultiByte", 0);
-      if (!pfnFunc(&dwMode, CodePage, lpSrcStr, &nWideCharCount, lpDstStr,
-                   lpnMultiCharCount))
+      GET_FUNC(pConvertINetUnicodeToMultiByte, mlang, "ConvertINetUnicodeToMultiByte", 0);
+      if (!pConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &nWideCharCount, lpDstStr,
+                                          lpnMultiCharCount))
         return 0;
 
@@ -1313 +1462 @@
         *lpnMultiCharCount = 0;
 
-        if (pfnFunc(&dwMode, CodePage, lpSrcStr, &len, mem, lpnMultiCharCount))
+        if (pConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &len, mem, lpnMultiCharCount))
         {
           SHLWAPI_162 (mem, *lpnMultiCharCount);
@@ -1400 +1549 @@
             xmove = x;
             while (xmove->refid) {
-                TRACE("trying (indx %ld) %s\n", xmove->indx, 
+                TRACE("trying (indx %ld) %s\n", xmove->indx,
                       debugstr_guid(xmove->refid));
                 if (IsEqualIID(riid, xmove->refid)) {
@@ -1543 +1692 @@
 /*************************************************************************
  *      @       [SHLWAPI.266]
+ *
+ * native does at least approximately:
+ *     strcpyW(newstr, x);
+ *     strcatW(newstr, "\\Restrictions");
+ *     if (RegOpenKeyExA(80000001, newstr, 00000000,00000001,40520b78))
+ *        return 0;
+ *    *unknown*
  */
 DWORD WINAPI SHLWAPI_266 (
         LPVOID w,
-        LPVOID x,
+        LPVOID x,   /* [in] partial registry key */
         LPVOID y,
         LPVOID z)
 {
         FIXME("(%p %p %p %p)stub\n",w,x,y,z);
-        return 0xabba1248;
+        return /* 0xabba1248 */ 0;
 }
 
@@ -1558 +1714 @@
  */
 HRESULT WINAPI SHLWAPI_267 (
-        LPVOID w, /* [???] NOTE: same as 1th parameter of SHLWAPI_219 */
-        LPVOID x, /* [???] NOTE: same as 2nd parameter of SHLWAPI_219 */
-        LPVOID y,
-        LPVOID z)
+        LPVOID w,
+        LPVOID x,
+        LPVOID y, /* [???] NOTE: same as 3rd parameter of SHLWAPI_219 */
+        LPVOID z) /* [???] NOTE: same as 4th parameter of SHLWAPI_219 */
 {
         FIXME("(%p %p %p %p)stub\n",w,x,y,z);
+
+        /* native seems to do:
+         *  SHLWAPI_219 ((LPVOID)(((LPSTR)x)-4), ???, (REFIID) y, (LPVOID*) z);
+         */
+
         *((LPDWORD)z) = 0xabba1200;
-        return 0xabba1254;
+        return /* 0xabba1254 */ 0;
 }
 
@@ -1582 +1743 @@
  *      @       [SHLWAPI.276]
  *
+ * on first call process does following:  other calls just returns 2
+ *  instance = LoadLibraryA("SHELL32.DLL");
+ *  func = GetProcAddress(instance, "DllGetVersion");
+ *  ret = RegOpenKeyExA(80000002, "Software\\Microsoft\\Internet Explorer",00000000,0002001f, newkey);
+ *  ret = RegQueryValueExA(newkey, "IntegratedBrowser",00000000,00000000,4052588c,40525890);
+ *  RegCloseKey(newkey);
+ *  FreeLibrary(instance);
+ *  return 2;
  */
 DWORD WINAPI SHLWAPI_276 ()
 {
         FIXME("()stub\n");
-        return /* 0xabba1244 */ 0;
+        return /* 0xabba1244 */ 2;
 }
 
@@ -1637 +1806 @@
 BOOL WINAPI SHLWAPI_289(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound)
 {
-  static BOOL (* WINAPI pfnFunc)(LPCWSTR, HMODULE, DWORD) = NULL;
-
-  GET_FUNC(winmm, "PlaySoundW", FALSE);
-  return pfnFunc(pszSound, hmod, fdwSound);
+  GET_FUNC(pPlaySoundW, winmm, "PlaySoundW", FALSE);
+  return pPlaySoundW(pszSound, hmod, fdwSound);
 }
 
@@ -1675 +1842 @@
                          SHFILEINFOW *psfi, UINT sizeofpsfi, UINT flags)
 {
-  static DWORD (* WINAPI pfnFunc)(LPCWSTR,DWORD,SHFILEINFOW*,UINT,UINT) = NULL;
-
-  GET_FUNC(shell32, "SHGetFileInfoW", 0);
-  return pfnFunc(path, dwFileAttributes, psfi, sizeofpsfi, flags);
+  GET_FUNC(pSHGetFileInfoW, shell32, "SHGetFileInfoW", 0);
+  return pSHGetFileInfoW(path, dwFileAttributes, psfi, sizeofpsfi, flags);
 }
 
@@ -1688 +1853 @@
 UINT WINAPI SHLWAPI_318(HDROP hDrop, UINT lFile, LPWSTR lpszFile, UINT lLength)
 {
-  static UINT (* WINAPI pfnFunc)(HDROP, UINT, LPWSTR, UINT) = NULL;
-
-  GET_FUNC(shell32, "DragQueryFileW", 0);
-  return pfnFunc(hDrop, lFile, lpszFile, lLength);
+  GET_FUNC(pDragQueryFileW, shell32, "DragQueryFileW", 0);
+  return pDragQueryFileW(hDrop, lFile, lpszFile, lLength);
 }
 
@@ -1701 +1864 @@
 LPITEMIDLIST WINAPI SHLWAPI_333(LPBROWSEINFOW lpBi)
 {
-  static LPITEMIDLIST (* WINAPI pfnFunc)(LPBROWSEINFOW) = NULL;
-
-  GET_FUNC(shell32, "SHBrowseForFolderW", NULL);
-  return pfnFunc(lpBi);
+  GET_FUNC(pSHBrowseForFolderW, shell32, "SHBrowseForFolderW", NULL);
+  return pSHBrowseForFolderW(lpBi);
 }
 
@@ -1714 +1875 @@
 BOOL WINAPI SHLWAPI_334(LPCITEMIDLIST pidl,LPWSTR pszPath)
 {
-  static BOOL (* WINAPI pfnFunc)(LPCITEMIDLIST, LPWSTR) = NULL;
-
-  GET_FUNC(shell32, "SHGetPathFromIDListW", 0);
-  return pfnFunc(pidl, pszPath);
+  GET_FUNC(pSHGetPathFromIDListW, shell32, "SHGetPathFromIDListW", 0);
+  return pSHGetPathFromIDListW(pidl, pszPath);
 }
 
@@ -1727 +1886 @@
 BOOL WINAPI SHLWAPI_335(LPSHELLEXECUTEINFOW lpExecInfo)
 {
-  static BOOL (* WINAPI pfnFunc)(LPSHELLEXECUTEINFOW) = NULL;
-
-  GET_FUNC(shell32, "ShellExecuteExW", FALSE);
-  return pfnFunc(lpExecInfo);
+  GET_FUNC(pShellExecuteExW, shell32, "ShellExecuteExW", FALSE);
+  return pShellExecuteExW(lpExecInfo);
 }
 
@@ -1740 +1897 @@
 DWORD WINAPI SHLWAPI_336(LPSHFILEOPSTRUCTW lpFileOp)
 {
-  static HICON (* WINAPI pfnFunc)(LPSHFILEOPSTRUCTW) = NULL;
-
-  GET_FUNC(shell32, "SHFileOperationW", 0);
-  return pfnFunc(lpFileOp);
+  GET_FUNC(pSHFileOperationW, shell32, "SHFileOperationW", 0);
+  return pSHFileOperationW(lpFileOp);
 }
 
@@ -1754 +1909 @@
                          HICON *phiconSmall, UINT nIcons)
 {
-  static HICON (* WINAPI pfnFunc)(LPCWSTR, INT,HICON *,HICON *, UINT) = NULL;
-
-  GET_FUNC(shell32, "ExtractIconExW", (HICON)0);
-  return pfnFunc(lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons);
+  GET_FUNC(pExtractIconExW, shell32, "ExtractIconExW", (HICON)0);
+  return pExtractIconExW(lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons);
 }
 
@@ -1764 +1917 @@
  *
  */
-DWORD WINAPI SHLWAPI_342 (
-        LPDWORD  w,   /* [out] location to put HKEY value???   */
-        HKEY     x,   /* [in]  appears to be HKEY_CURRENT_USER */
-        LPVOID y)
-{
-        FIXME("(%p 0x%08x %p)stub\n", w,x,y);
-        *w = (DWORD)x;
-        return /* 0xabba1249 */ 0;
+LONG WINAPI SHInterlockedCompareExchange( PLONG dest, LONG xchg, LONG compare)
+{
+        return InterlockedCompareExchange(dest, xchg, compare);
 }
 
@@ -1788 +1936 @@
 
 /*************************************************************************
- *      @       [SHLWAPI.356]
- */
-DWORD WINAPI SHLWAPI_356 (
-        LPVOID x,
-        LPVOID y,
-        LPVOID z)
-{
-        FIXME("(%p %p %p)stub\n", x,y,z);
-        return 0;
-}
+ *      @       [SHLWAPI.350]
+ *
+ * seems to be late bound call to GetFileVersionInfoSizeW
+ */
+DWORD WINAPI SHLWAPI_350 (
+        LPWSTR x,
+        LPVOID y)
+{
+        DWORD ret;
+
+        GET_FUNC(pGetFileVersionInfoSizeW, version, "GetFileVersionInfoSizeW", 0);
+        ret = pGetFileVersionInfoSizeW(x, y);
+        return 0x208 + ret;
+}
+
+/*************************************************************************
+ *      @       [SHLWAPI.351]
+ *
+ * seems to be late bound call to GetFileVersionInfoW
+ */
+BOOL  WINAPI SHLWAPI_351 (
+        LPWSTR w,   /* [in] path to dll */
+        DWORD  x,   /* [in] parm 2 to GetFileVersionInfoA */
+        DWORD  y,   /* [in] return value from .350 - assume length */
+        LPVOID z)   /* [in/out] buffer (+0x208 sent to GetFileVersionInfoA) */
+{
+    GET_FUNC(pGetFileVersionInfoW, version, "GetFileVersionInfoW", 0);
+#ifdef __WIN32OS2__
+    return pGetFileVersionInfoW(w, x, y-0x208, (LPSTR)z+0x208);
+#else
+    return pGetFileVersionInfoW(w, x, y-0x208, z+0x208);
+#endif
+}
+
+/*************************************************************************
+ *      @       [SHLWAPI.352]
+ *
+ * seems to be late bound call to VerQueryValueW
+ */
+WORD WINAPI SHLWAPI_352 (
+        LPVOID w,   /* [in] buffer from _351 */
+        LPWSTR x,   /* [in]   value to retrieve -
+                              converted and passed to VerQueryValueA as #2 */
+        LPVOID y,   /* [out]  ver buffer - passed to VerQueryValueA as #3 */
+        UINT*  z)   /* [in]   ver length - passed to VerQueryValueA as #4 */
+{
+    GET_FUNC(pVerQueryValueW, version, "VerQueryValueW", 0);
+#ifdef __WIN32OS2__
+    return pVerQueryValueW((LPSTR)w+0x208, x, y, z);
+#else
+    return pVerQueryValueW(w+0x208, x, y, z);
+#endif
+}
+
+/**************************************************************************
+ *      @       [SHLWAPI.356]
+ *
+ *      mbc - this function is undocumented, The parameters are correct and
+ *            the calls to InitializeSecurityDescriptor and
+ *            SetSecurityDescriptorDacl are correct, but apparently some
+ *            apps call this function with all zero parameters.
+ */
+
+DWORD WINAPI SHLWAPI_356(PACL pDacl, PSECURITY_DESCRIPTOR pSD, LPCSTR *str)
+{
+  if(str != 0){
+    *str = 0;
+  }
+
+  if(!pDacl){
+    return 0;
+  }
+
+  if (!InitializeSecurityDescriptor(pSD, 1)) return 0;
+  return SetSecurityDescriptorDacl(pSD, 1, pDacl, 0);
+}
+
 
 /*************************************************************************
@@ -1807 +2022 @@
                         BOOL *pfMustCopy, UINT uFlags)
 {
-  static BOOL (* WINAPI pfnFunc)(LPCWSTR, LPCWSTR, LPCWSTR, BOOL*, UINT) = NULL;
-
-  GET_FUNC(shell32, "SHGetNewLinkInfoW", FALSE);
-  return pfnFunc(pszLinkTo, pszDir, pszName, pfMustCopy, uFlags);
+  GET_FUNC(pSHGetNewLinkInfoW, shell32, "SHGetNewLinkInfoW", FALSE);
+  return pSHGetNewLinkInfoW(pszLinkTo, pszDir, pszName, pfMustCopy, uFlags);
 }
 
@@ -1821 +2034 @@
                          LPVOID arg5, LPVOID arg6)
 {
-  /* FIXME: Correct args */
-  static DWORD (* WINAPI pfnFunc)(LPVOID, LPVOID, LPVOID, LPVOID, LPVOID, LPVOID) = NULL;
-
-  GET_FUNC(shell32, "SHDefExtractIconW", 0);
-  return pfnFunc(arg1, arg2, arg3, arg4, arg5, arg6);
+  GET_FUNC(pSHDefExtractIconW, shell32, "SHDefExtractIconW", 0);
+  return pSHDefExtractIconW(arg1, arg2, arg3, arg4, arg5, arg6);
 }
 
@@ -1847 +2057 @@
                          UINT nIconIndex)
 {
-  static HICON (* WINAPI pfnFunc)(HINSTANCE, LPCWSTR, UINT) = NULL;
-
-  GET_FUNC(shell32, "ExtractIconW", (HICON)0);
-  return pfnFunc(hInstance, lpszExeFileName, nIconIndex);
+  GET_FUNC(pExtractIconW, shell32, "ExtractIconW", (HICON)0);
+  return pExtractIconW(hInstance, lpszExeFileName, nIconIndex);
 }
 
@@ -1868 +2076 @@
  *      @       [SHLWAPI.377]
  *
- * FIXME: Native appears to do DPA_Create and a DPA_InsertPtr for 
+ * FIXME: Native appears to do DPA_Create and a DPA_InsertPtr for
  *        each call here.
  * FIXME: Native shows calls to:
@@ -1931 +2139 @@
 BOOL WINAPI SHLWAPI_389(LPOPENFILENAMEW ofn)
 {
-  static BOOL (* WINAPI pfnFunc)(LPOPENFILENAMEW) = NULL;
-
-  GET_FUNC(comdlg32, "GetSaveFileNameW", FALSE);
-  return pfnFunc(ofn);
+  GET_FUNC(pGetSaveFileNameW, comdlg32, "GetSaveFileNameW", FALSE);
+  return pGetSaveFileNameW(ofn);
 }
 
@@ -1944 +2150 @@
 DWORD WINAPI SHLWAPI_390(LPVOID arg1, LPVOID arg2)
 {
-  /* FIXME: Correct args */
-  static DWORD (* WINAPI pfnFunc)(LPVOID, LPVOID) = NULL;
-
-  GET_FUNC(mpr, "WNetRestoreConnectionW", 0);
-  return pfnFunc(arg1, arg2);
+  GET_FUNC(pWNetRestoreConnectionW, mpr, "WNetRestoreConnectionW", 0);
+  return pWNetRestoreConnectionW(arg1, arg2);
 }
 
@@ -1959 +2162 @@
                          LPVOID arg5)
 {
-  /* FIXME: Correct args */
-  static DWORD (* WINAPI pfnFunc)(LPVOID, LPVOID, LPVOID, LPVOID, LPVOID) = NULL;
-
-  GET_FUNC(mpr, "WNetGetLastErrorW", 0);
-  return pfnFunc(arg1, arg2, arg3, arg4, arg5);
+  GET_FUNC(pWNetGetLastErrorW, mpr, "WNetGetLastErrorW", 0);
+  return pWNetGetLastErrorW(arg1, arg2, arg3, arg4, arg5);
 }
 
@@ -1973 +2173 @@
 BOOL WINAPI SHLWAPI_401(LPPAGESETUPDLGW pagedlg)
 {
-  static BOOL (* WINAPI pfnFunc)(LPPAGESETUPDLGW) = NULL;
-
-  GET_FUNC(comdlg32, "PageSetupDlgW", FALSE);
-  return pfnFunc(pagedlg);
+  GET_FUNC(pPageSetupDlgW, comdlg32, "PageSetupDlgW", FALSE);
+  return pPageSetupDlgW(pagedlg);
 }
 
@@ -1986 +2184 @@
 BOOL WINAPI SHLWAPI_402(LPPRINTDLGW printdlg)
 {
-  static BOOL (* WINAPI pfnFunc)(LPPRINTDLGW) = NULL;
-
-  GET_FUNC(comdlg32, "PrintDlgW", FALSE);
-  return pfnFunc(printdlg);
+  GET_FUNC(pPrintDlgW, comdlg32, "PrintDlgW", FALSE);
+  return pPrintDlgW(printdlg);
 }
 
@@ -1999 +2195 @@
 BOOL WINAPI SHLWAPI_403(LPOPENFILENAMEW ofn)
 {
-  static BOOL (* WINAPI pfnFunc)(LPOPENFILENAMEW) = NULL;
-
-  GET_FUNC(comdlg32, "GetOpenFileNameW", FALSE);
-  return pfnFunc(ofn);
+  GET_FUNC(pGetOpenFileNameW, comdlg32, "GetOpenFileNameW", FALSE);
+  return pGetOpenFileNameW(ofn);
 }
 
@@ -2069 +2263 @@
 
 /*************************************************************************
+ *      @       [SHLWAPI.418]
+ *
+ * Function seems to do FreeLibrary plus other things.
+ *
+ * FIXME native shows the following calls:
+ *   RtlEnterCriticalSection
+ *   LocalFree
+ *   GetProcAddress(Comctl32??, 150L)
+ *   DPA_DeletePtr
+ *   RtlLeaveCriticalSection
+ *  followed by the FreeLibrary.
+ *  The above code may be related to .377 above.
+ */
+BOOL  WINAPI SHLWAPI_418 (HMODULE x)
+{
+        FIXME("(0x%08lx) partial stub\n", (LONG)x);
+        return FreeLibrary(x);
+}
+
+/*************************************************************************
  *      @       [SHLWAPI.431]
  */
@@ -2077 +2291 @@
 }
 
+/*************************************************************************
+ *      @       [SHLWAPI.436]
+ *
+ *  This is really CLSIDFromString which is exported by ole32.dll,
+ *  however the native shlwapi.dll does *not* import ole32. Nor does
+ *  ole32.dll import this ordinal from shlwapi. Therefore we must conclude
+ *  that MS duplicated the code for CLSIDFromString.
+ *
+ *  This is a duplicate (with changes for UNICODE) of CLSIDFromString16
+ *  in dlls/ole32/compobj.c
+ */
+DWORD WINAPI SHLWAPI_436 (LPWSTR idstr, CLSID *id)
+{
+    LPWSTR s = idstr;
+    BYTE *p;
+    INT i;
+    WCHAR table[256];
+
+    if (!s) {
+        memset(s, 0, sizeof(CLSID));
+        return S_OK;
+    }
+    else {  /* validate the CLSID string */
+
+        if (strlenW(s) != 38)
+            return CO_E_CLASSSTRING;
+
+        if ((s[0]!=L'{') || (s[9]!=L'-') || (s[14]!=L'-') || (s[19]!=L'-') || (s[24]!=L'-') || (s[37]!=L'}'))
+            return CO_E_CLASSSTRING;
+
+        for (i=1; i<37; i++)
+            {
+                if ((i == 9)||(i == 14)||(i == 19)||(i == 24)) continue;
+                if (!(((s[i] >= L'0') && (s[i] <= L'9'))  ||
+                      ((s[i] >= L'a') && (s[i] <= L'f'))  ||
+                      ((s[i] >= L'A') && (s[i] <= L'F')))
+                    )
+                    return CO_E_CLASSSTRING;
+            }
+    }
+
+    TRACE("%s -> %p\n", debugstr_w(s), id);
+
+  /* quick lookup table */
+    memset(table, 0, 256*sizeof(WCHAR));
+
+    for (i = 0; i < 10; i++) {
+        table['0' + i] = i;
+    }
+    for (i = 0; i < 6; i++) {
+        table['A' + i] = i+10;
+        table['a' + i] = i+10;
+    }
+
+    /* in form {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} */
+
+    p = (BYTE *) id;
+
+    s++;        /* skip leading brace  */
+    for (i = 0; i < 4; i++) {
+        p[3 - i] = table[*s]<<4 | table[*(s+1)];
+        s += 2;
+    }
+    p += 4;
+    s++;        /* skip - */
+
+    for (i = 0; i < 2; i++) {
+        p[1-i] = table[*s]<<4 | table[*(s+1)];
+        s += 2;
+    }
+    p += 2;
+    s++;        /* skip - */
+
+    for (i = 0; i < 2; i++) {
+        p[1-i] = table[*s]<<4 | table[*(s+1)];
+        s += 2;
+    }
+    p += 2;
+    s++;        /* skip - */
+
+    /* these are just sequential bytes */
+    for (i = 0; i < 2; i++) {
+        *p++ = table[*s]<<4 | table[*(s+1)];
+        s += 2;
+    }
+    s++;        /* skip - */
+
+    for (i = 0; i < 6; i++) {
+        *p++ = table[*s]<<4 | table[*(s+1)];
+        s += 2;
+    }
+
+    return S_OK;
+}
 #ifndef __WIN32OS2__
 /*************************************************************************
@@ -2104 +2412 @@
  * Input HLS values are constrained to the range (0..240).
  */
-VOID WINAPI ColorRGBToHLS(COLORREF drRGB, LPWORD pwHue, 
+VOID WINAPI ColorRGBToHLS(COLORREF drRGB, LPWORD pwHue,
                           LPWORD wLuminance, LPWORD pwSaturation)
 {
@@ -2123 +2431 @@
  *      SHGetInverseCMAP (SHLWAPI.@)
  */
-DWORD WINAPI SHGetInverseCMAP (LPVOID x, DWORD why)
-{
-        FIXME("(%p, %#lx)stub\n", x, why);
+DWORD WINAPI SHGetInverseCMAP (LPDWORD* x, DWORD why)
+{
+    if (why == 4) {
+        FIXME(" - returning bogus address for SHGetInverseCMAP\n");
+        *x = (LPDWORD)0xabba1249;
         return 0;
-}
-
-#ifndef __WIN32OS2__
+    }
+    FIXME("(%p, %#lx)stub\n", x, why);
+    return 0;
+}
+
 /*************************************************************************
  *      SHIsLowMemoryMachine    [SHLWAPI.@]
@@ -2138 +2450 @@
         return 0;
 }
-#endif
+
 /*************************************************************************
  *      GetMenuPosFromID        [SHLWAPI.@]
@@ -2164 +2476 @@
 HRESULT WINAPI _SHGetInstanceExplorer (LPUNKNOWN *lpUnknown)
 {
-  static HRESULT (* WINAPI pfnFunc)(LPUNKNOWN *) = NULL;
-
-  GET_FUNC(shell32, "SHGetInstanceExplorer", E_FAIL);
-  return pfnFunc(lpUnknown);
-}
+  GET_FUNC(pSHGetInstanceExplorer, shell32, "SHGetInstanceExplorer", E_FAIL);
+  return pSHGetInstanceExplorer(lpUnknown);
+}
+
+/*************************************************************************
+ *      SHGetThreadRef  [SHLWAPI.@]
+ *
+ * Retrieves the per-thread object reference set by SHSetThreadRef
+ * "punk" - Address of a pointer to the IUnknown interface. Returns S_OK if
+ *          successful or E_NOINTERFACE otherwise.
+ */
+HRESULT WINAPI SHGetThreadRef (IUnknown ** ppunk)
+{
+    if (SHLWAPI_ThreadRef_index < 0) return E_NOINTERFACE;
+    *ppunk = (IUnknown *)TlsGetValue(SHLWAPI_ThreadRef_index);
+    return S_OK;
+}
+
+/*************************************************************************
+ *      SHSetThreadRef  [SHLWAPI.@]
+ *
+ * Stores a per-thread reference to a COM object
+ * "punk" - Pointer to the IUnknown interface of the object to
+ *          which you want to store a reference. Returns S_OK if successful
+ *          or an OLE error value.
+ */
+HRESULT WINAPI SHSetThreadRef (IUnknown * punk)
+{
+    if (SHLWAPI_ThreadRef_index < 0) return E_NOINTERFACE;
+    TlsSetValue(SHLWAPI_ThreadRef_index, (LPVOID) punk);
+    return S_OK;
+}