Author: gadamopoulos
Date: Mon Nov  3 10:38:21 2014
New Revision: 65212

URL: http://svn.reactos.org/svn/reactos?rev=65212&view=rev
Log:
[SHELL32]
- Add shell32.cpp and move there CShell32Module, DllGetVersion, DllMain, 
DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer, 
DllInstall, IDefClFImpl, IDefClF_fnConstructor and SHCreateDefClassObject
- Now shell32_main.cpp and shellole.cpp have code that can be converted back to 
C and synced to wine

Added:
    branches/shell-experiments/dll/win32/shell32/shell32.cpp
      - copied, changed from r65209, 
branches/shell-experiments/dll/win32/shell32/shell32_main.cpp
Modified:
    branches/shell-experiments/dll/win32/shell32/CMakeLists.txt
    branches/shell-experiments/dll/win32/shell32/shell32_main.cpp
    branches/shell-experiments/dll/win32/shell32/shellole.cpp

Modified: branches/shell-experiments/dll/win32/shell32/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shell32/CMakeLists.txt?rev=65212&r1=65211&r2=65212&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/shell32/CMakeLists.txt [iso-8859-1] 
(original)
+++ branches/shell-experiments/dll/win32/shell32/CMakeLists.txt [iso-8859-1] 
Mon Nov  3 10:38:21 2014
@@ -41,6 +41,7 @@
     folders.cpp
     iconcache.cpp
     pidl.cpp
+    shell32.cpp
     shell32_main.cpp
     shellitem.cpp
     shelllink.cpp

Copied: branches/shell-experiments/dll/win32/shell32/shell32.cpp (from r65209, 
branches/shell-experiments/dll/win32/shell32/shell32_main.cpp)
URL: 
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shell32/shell32.cpp?p2=branches/shell-experiments/dll/win32/shell32/shell32.cpp&p1=branches/shell-experiments/dll/win32/shell32/shell32_main.cpp&r1=65209&r2=65212&rev=65212&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/shell32/shell32_main.cpp       
[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/shell32/shell32.cpp    [iso-8859-1] 
Mon Nov  3 10:38:21 2014
@@ -22,1324 +22,127 @@
 #include "precomp.h"
 
 #include "shell32_version.h"
-#include <reactos/version.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
-const char * const SHELL_Authors[] = { "Copyright 1993-"COPYRIGHT_YEAR" WINE 
team", "Copyright 1998-"COPYRIGHT_YEAR" ReactOS Team", 0 };
-
-#define MORE_DEBUG 1
-/*************************************************************************
- * CommandLineToArgvW            [SHELL32.@]
- *
- * We must interpret the quotes in the command line to rebuild the argv
- * array correctly:
- * - arguments are separated by spaces or tabs
- * - quotes serve as optional argument delimiters
- *   '"a b"'   -> 'a b'
- * - escaped quotes must be converted back to '"'
- *   '\"'      -> '"'
- * - consecutive backslashes preceding a quote see their number halved with
- *   the remainder escaping the quote:
- *   2n   backslashes + quote -> n backslashes + quote as an argument delimiter
- *   2n+1 backslashes + quote -> n backslashes + literal quote
- * - backslashes that are not followed by a quote are copied literally:
- *   'a\b'     -> 'a\b'
- *   'a\\b'    -> 'a\\b'
- * - in quoted strings, consecutive quotes see their number divided by three
- *   with the remainder modulo 3 deciding whether to close the string or not.
- *   Note that the opening quote must be counted in the consecutive quotes,
- *   that's the (1+) below:
- *   (1+) 3n   quotes -> n quotes
- *   (1+) 3n+1 quotes -> n quotes plus closes the quoted string
- *   (1+) 3n+2 quotes -> n+1 quotes plus closes the quoted string
- * - in unquoted strings, the first quote opens the quoted string and the
- *   remaining consecutive quotes follow the above rule.
- */
-LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs)
-{
-    DWORD argc;
-    LPWSTR  *argv;
-    LPCWSTR s;
-    LPWSTR d;
-    LPWSTR cmdline;
-    int qcount,bcount;
-
-    if(!numargs)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return NULL;
-    }
-
-    if (*lpCmdline==0)
-    {
-        /* Return the path to the executable */
-        DWORD len, deslen=MAX_PATH, size;
-
-        size = sizeof(LPWSTR) + deslen*sizeof(WCHAR) + sizeof(LPWSTR);
-        for (;;)
-        {
-            if (!(argv = (LPWSTR *)LocalAlloc(LMEM_FIXED, size))) return NULL;
-            len = GetModuleFileNameW(0, (LPWSTR)(argv+1), deslen);
-            if (!len)
-            {
-                LocalFree(argv);
-                return NULL;
-            }
-            if (len < deslen) break;
-            deslen*=2;
-            size = sizeof(LPWSTR) + deslen*sizeof(WCHAR) + sizeof(LPWSTR);
-            LocalFree( argv );
-        }
-        argv[0]=(LPWSTR)(argv+1);
-        *numargs=1;
-
-        return argv;
-    }
-
-    /* --- First count the arguments */
-    argc=1;
-    s=lpCmdline;
-    /* The first argument, the executable path, follows special rules */
-    if (*s=='"')
-    {
-        /* The executable path ends at the next quote, no matter what */
-        s++;
-        while (*s)
-            if (*s++=='"')
-                break;
-    }
-    else
-    {
-        /* The executable path ends at the next space, no matter what */
-        while (*s && *s!=' ' && *s!='\t')
-            s++;
-    }
-    /* skip to the first argument, if any */
-    while (*s==' ' || *s=='\t')
-        s++;
-    if (*s)
-        argc++;
-
-    /* Analyze the remaining arguments */
-    qcount=bcount=0;
-    while (*s)
-    {
-        if ((*s==' ' || *s=='\t') && qcount==0)
-        {
-            /* skip to the next argument and count it if any */
-            while (*s==' ' || *s=='\t')
-                s++;
-            if (*s)
-                argc++;
-            bcount=0;
-        }
-        else if (*s=='\\')
-        {
-            /* '\', count them */
-            bcount++;
-            s++;
-        }
-        else if (*s=='"')
-        {
-            /* '"' */
-            if ((bcount & 1)==0)
-                qcount++; /* unescaped '"' */
-            s++;
-            bcount=0;
-            /* consecutive quotes, see comment in copying code below */
-            while (*s=='"')
-            {
-                qcount++;
-                s++;
-            }
-            qcount=qcount % 3;
-            if (qcount==2)
-                qcount=0;
-        }
-        else
-        {
-            /* a regular character */
-            bcount=0;
-            s++;
-        }
-    }
-
-    /* Allocate in a single lump, the string array, and the strings that go
-     * with it. This way the caller can make a single LocalFree() call to free
-     * both, as per MSDN.
-     */
-    argv=(LPWSTR *)LocalAlloc(LMEM_FIXED, 
argc*sizeof(LPWSTR)+(strlenW(lpCmdline)+1)*sizeof(WCHAR));
-    if (!argv)
-        return NULL;
-    cmdline=(LPWSTR)(argv+argc);
-    strcpyW(cmdline, lpCmdline);
-
-    /* --- Then split and copy the arguments */
-    argv[0]=d=cmdline;
-    argc=1;
-    /* The first argument, the executable path, follows special rules */
-    if (*d=='"')
-    {
-        /* The executable path ends at the next quote, no matter what */
-        s=d+1;
-        while (*s)
-        {
-            if (*s=='"')
-            {
-                s++;
-                break;
-            }
-            *d++=*s++;
-        }
-    }
-    else
-    {
-        /* The executable path ends at the next space, no matter what */
-        while (*d && *d!=' ' && *d!='\t')
-            d++;
-        s=d;
-        if (*s)
-            s++;
-    }
-    /* close the executable path */
-    *d++=0;
-    /* skip to the first argument and initialize it if any */
-    while (*s==' ' || *s=='\t')
-        s++;
-    if (!*s)
-    {
-        /* There are no parameters so we are all done */
-        *numargs=argc;
-        return argv;
-    }
-
-    /* Split and copy the remaining arguments */
-    argv[argc++]=d;
-    qcount=bcount=0;
-    while (*s)
-    {
-        if ((*s==' ' || *s=='\t') && qcount==0)
-        {
-            /* close the argument */
-            *d++=0;
-            bcount=0;
-
-            /* skip to the next one and initialize it if any */
-            do {
-                s++;
-            } while (*s==' ' || *s=='\t');
-            if (*s)
-                argv[argc++]=d;
-        }
-        else if (*s=='\\')
-        {
-            *d++=*s++;
-            bcount++;
-        }
-        else if (*s=='"')
-        {
-            if ((bcount & 1)==0)
-            {
-                /* Preceded by an even number of '\', this is half that
-                 * number of '\', plus a quote which we erase.
-                 */
-                d-=bcount/2;
-                qcount++;
-            }
-            else
-            {
-                /* Preceded by an odd number of '\', this is half that
-                 * number of '\' followed by a '"'
-                 */
-                d=d-bcount/2-1;
-                *d++='"';
-            }
-            s++;
-            bcount=0;
-            /* Now count the number of consecutive quotes. Note that qcount
-             * already takes into account the opening quote if any, as well as
-             * the quote that lead us here.
-             */
-            while (*s=='"')
-            {
-                if (++qcount==3)
-                {
-                    *d++='"';
-                    qcount=0;
-                }
-                s++;
-            }
-            if (qcount==2)
-                qcount=0;
-        }
-        else
-        {
-            /* a regular character */
-            *d++=*s++;
-            bcount=0;
-        }
-    }
-    *d='\0';
-    *numargs=argc;
-
-    return argv;
-}
-
-static DWORD shgfi_get_exe_type(LPCWSTR szFullPath)
-{
-    BOOL status = FALSE;
-    HANDLE hfile;
-    DWORD BinaryType;
-    IMAGE_DOS_HEADER mz_header;
-    IMAGE_NT_HEADERS nt;
-    DWORD len;
-    char magic[4];
-
-    status = GetBinaryTypeW (szFullPath, &BinaryType);
-    if (!status)
-        return 0;
-    if (BinaryType == SCS_DOS_BINARY || BinaryType == SCS_PIF_BINARY)
-        return 0x4d5a;
-
-    hfile = CreateFileW( szFullPath, GENERIC_READ, FILE_SHARE_READ,
-                         NULL, OPEN_EXISTING, 0, 0 );
-    if ( hfile == INVALID_HANDLE_VALUE )
-        return 0;
-
-    /*
-     * The next section is adapted from MODULE_GetBinaryType, as we need
-     * to examine the image header to get OS and version information. We
-     * know from calling GetBinaryTypeA that the image is valid and either
-     * an NE or PE, so much error handling can be omitted.
-     * Seek to the start of the file and read the header information.
-     */
-
-    SetFilePointer( hfile, 0, NULL, SEEK_SET );
-    ReadFile( hfile, &mz_header, sizeof(mz_header), &len, NULL );
-
-    SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET );
-    ReadFile( hfile, magic, sizeof(magic), &len, NULL );
-
-    if ( *(DWORD*)magic == IMAGE_NT_SIGNATURE )
-    {
-        SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET );
-        ReadFile( hfile, &nt, sizeof(nt), &len, NULL );
-        CloseHandle( hfile );
-
-        /* DLL files are not executable and should return 0 */
-        if (nt.FileHeader.Characteristics & IMAGE_FILE_DLL)
-            return 0;
-
-        if (nt.OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI)
-        {
-             return IMAGE_NT_SIGNATURE |
-                   (nt.OptionalHeader.MajorSubsystemVersion << 24) |
-                   (nt.OptionalHeader.MinorSubsystemVersion << 16);
-        }
-        return IMAGE_NT_SIGNATURE;
-    }
-    else if ( *(WORD*)magic == IMAGE_OS2_SIGNATURE )
-    {
-        IMAGE_OS2_HEADER ne;
-        SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET );
-        ReadFile( hfile, &ne, sizeof(ne), &len, NULL );
-        CloseHandle( hfile );
-
-        if (ne.ne_exetyp == 2)
-            return IMAGE_OS2_SIGNATURE | (ne.ne_expver << 16);
-        return 0;
-    }
-    CloseHandle( hfile );
-    return 0;
-}
-
-/*************************************************************************
- * SHELL_IsShortcut        [internal]
- *
- * Decide if an item id list points to a shell shortcut
- */
-BOOL SHELL_IsShortcut(LPCITEMIDLIST pidlLast)
-{
-    char szTemp[MAX_PATH];
-    HKEY keyCls;
-    BOOL ret = FALSE;
-
-    if (_ILGetExtension(pidlLast, szTemp, MAX_PATH) &&
-          HCR_MapTypeToValueA(szTemp, szTemp, MAX_PATH, TRUE))
-    {
-        if (ERROR_SUCCESS == RegOpenKeyExA(HKEY_CLASSES_ROOT, szTemp, 0, 
KEY_QUERY_VALUE, &keyCls))
-        {
-          if (ERROR_SUCCESS == RegQueryValueExA(keyCls, "IsShortcut", NULL, 
NULL, NULL, NULL))
-            ret = TRUE;
-
-          RegCloseKey(keyCls);
-        }
-    }
-
-    return ret;
-}
-
-#define SHGFI_KNOWN_FLAGS \
-    (SHGFI_SMALLICON | SHGFI_OPENICON | SHGFI_SHELLICONSIZE | SHGFI_PIDL | \
-     SHGFI_USEFILEATTRIBUTES | SHGFI_ADDOVERLAYS | SHGFI_OVERLAYINDEX | \
-     SHGFI_ICON | SHGFI_DISPLAYNAME | SHGFI_TYPENAME | SHGFI_ATTRIBUTES | \
-     SHGFI_ICONLOCATION | SHGFI_EXETYPE | SHGFI_SYSICONINDEX | \
-     SHGFI_LINKOVERLAY | SHGFI_SELECTED | SHGFI_ATTR_SPECIFIED)
-
-/*************************************************************************
- * SHGetFileInfoW            [SHELL32.@]
- *
- */
-DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
-                                SHFILEINFOW *psfi, UINT sizeofpsfi, UINT flags 
)
-{
-    WCHAR szLocation[MAX_PATH], szFullPath[MAX_PATH];
-    int iIndex;
-    DWORD_PTR ret = TRUE;
-    DWORD dwAttributes = 0;
-    CComPtr<IShellFolder>        psfParent;
-    CComPtr<IExtractIconW>        pei;
-    LPITEMIDLIST    pidlLast = NULL, pidl = NULL;
-    HRESULT hr = S_OK;
-    BOOL IconNotYetLoaded=TRUE;
-    UINT uGilFlags = 0;
-
-    TRACE("%s fattr=0x%x sfi=%p(attr=0x%08x) size=0x%x flags=0x%x\n",
-          (flags & SHGFI_PIDL)? "pidl" : debugstr_w(path), dwFileAttributes,
-          psfi, psfi->dwAttributes, sizeofpsfi, flags);
-
-    if (!path)
-         return FALSE;
-
-    /* windows initializes these values regardless of the flags */
-    if (psfi != NULL)
-    {
-        psfi->szDisplayName[0] = '\0';
-        psfi->szTypeName[0] = '\0';
-        psfi->iIcon = 0;
-    }
-
-    if (!(flags & SHGFI_PIDL))
-    {
-        /* SHGetFileInfo should work with absolute and relative paths */
-        if (PathIsRelativeW(path))
-        {
-            GetCurrentDirectoryW(MAX_PATH, szLocation);
-            PathCombineW(szFullPath, szLocation, path);
-        }
-        else
-        {
-            lstrcpynW(szFullPath, path, MAX_PATH);
-        }
-    }
-
-    if (flags & SHGFI_EXETYPE)
-    {
-        if (flags != SHGFI_EXETYPE)
-            return 0;
-        return shgfi_get_exe_type(szFullPath);
-    }
-
-    /*
-     * psfi is NULL normally to query EXE type. If it is NULL, none of the
-     * below makes sense anyway. Windows allows this and just returns FALSE
-     */
-    if (psfi == NULL)
-        return FALSE;
-
-    /*
-     * translate the path into a pidl only when SHGFI_USEFILEATTRIBUTES
-     * is not specified.
-     * The pidl functions fail on not existing file names
-     */
-
-    if (flags & SHGFI_PIDL)
-    {
-        pidl = ILClone((LPCITEMIDLIST)path);
-    }
-    else if (!(flags & SHGFI_USEFILEATTRIBUTES))
-    {
-        hr = SHILCreateFromPathW(szFullPath, &pidl, &dwAttributes);
-    }
-
-    if ((flags & SHGFI_PIDL) || !(flags & SHGFI_USEFILEATTRIBUTES))
-    {
-        /* get the parent shellfolder */
-        if (pidl)
-        {
-            hr = SHBindToParent( pidl, IID_PPV_ARG(IShellFolder, &psfParent),
-                                (LPCITEMIDLIST*)&pidlLast );
-            if (SUCCEEDED(hr))
-                pidlLast = ILClone(pidlLast);
-            ILFree(pidl);
-        }
-        else
-        {
-            ERR("pidl is null!\n");
-            return FALSE;
-        }
-    }
-
-    /* get the attributes of the child */
-    if (SUCCEEDED(hr) && (flags & SHGFI_ATTRIBUTES))
-    {
-        if (!(flags & SHGFI_ATTR_SPECIFIED))
-        {
-            psfi->dwAttributes = 0xffffffff;
-        }
-        if (psfParent != NULL)
-            psfParent->GetAttributesOf(1, (LPCITEMIDLIST*)&pidlLast,
-                                      &(psfi->dwAttributes) );
-    }
-
-    /* get the displayname */
-    if (SUCCEEDED(hr) && (flags & SHGFI_DISPLAYNAME))
-    {
-        if (flags & SHGFI_USEFILEATTRIBUTES)
-        {
-            wcscpy (psfi->szDisplayName, PathFindFileNameW(szFullPath));
-        }
-        else
-        {
-            STRRET str;
-            hr = psfParent->GetDisplayNameOf(pidlLast,
-                                                SHGDN_INFOLDER, &str);
-            StrRetToStrNW (psfi->szDisplayName, MAX_PATH, &str, pidlLast);
-        }
-    }
-
-    /* get the type name */
-    if (SUCCEEDED(hr) && (flags & SHGFI_TYPENAME))
-    {
-        static const WCHAR szFile[] = { 'F','i','l','e',0 };
-        static const WCHAR szDashFile[] = { '-','f','i','l','e',0 };
-
-        if (!(flags & SHGFI_USEFILEATTRIBUTES))
-        {
-            char ftype[80];
-
-            _ILGetFileType(pidlLast, ftype, 80);
-            MultiByteToWideChar(CP_ACP, 0, ftype, -1, psfi->szTypeName, 80 );
-        }
-        else
-        {
-            if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-                wcscat (psfi->szTypeName, szFile);
-            else
-            {
-                WCHAR sTemp[64];
-
-                wcscpy(sTemp,PathFindExtensionW(szFullPath));
-                if (!( HCR_MapTypeToValueW(sTemp, sTemp, 64, TRUE) &&
-                    HCR_MapTypeToValueW(sTemp, psfi->szTypeName, 80, FALSE )))
-                {
-                    lstrcpynW (psfi->szTypeName, sTemp, 64);
-                    wcscat (psfi->szTypeName, szDashFile);
-                }
-            }
-        }
-    }
-
-    /* ### icons ###*/
-    if (flags & SHGFI_OPENICON)
-        uGilFlags |= GIL_OPENICON;
-
-    if (flags & SHGFI_LINKOVERLAY)
-        uGilFlags |= GIL_FORSHORTCUT;
-    else if ((flags&SHGFI_ADDOVERLAYS) ||
-             (flags&(SHGFI_ICON|SHGFI_SMALLICON))==SHGFI_ICON)
-    {
-        if (SHELL_IsShortcut(pidlLast))
-            uGilFlags |= GIL_FORSHORTCUT;
-    }
-
-    if (flags & SHGFI_OVERLAYINDEX)
-        FIXME("SHGFI_OVERLAYINDEX unhandled\n");
-
-    if (flags & SHGFI_SELECTED)
-        FIXME("set icon to selected, stub\n");
-
-    if (flags & SHGFI_SHELLICONSIZE)
-        FIXME("set icon to shell size, stub\n");
-
-    /* get the iconlocation */
-    if (SUCCEEDED(hr) && (flags & SHGFI_ICONLOCATION ))
-    {
-        UINT uFlags;
-
-        if (flags & SHGFI_USEFILEATTRIBUTES)
-        {
-            if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-            {
-                wcscpy(psfi->szDisplayName, swShell32Name);
-                psfi->iIcon = -IDI_SHELL_FOLDER;
-            }
-            else
-            {
-                WCHAR* szExt;
-                static const WCHAR p1W[] = {'%','1',0};
-                WCHAR sTemp [MAX_PATH];
-
-                szExt = PathFindExtensionW(szFullPath);
-                TRACE("szExt=%s\n", debugstr_w(szExt));
-                if ( szExt &&
-                     HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) &&
-                     HCR_GetIconW(sTemp, sTemp, NULL, MAX_PATH, &psfi->iIcon))
-                {
-                    if (lstrcmpW(p1W, sTemp))
-                        wcscpy(psfi->szDisplayName, sTemp);
-                    else
-                    {
-                        /* the icon is in the file */
-                        wcscpy(psfi->szDisplayName, szFullPath);
-                    }
-                }
-                else
-                    ret = FALSE;
-            }
-        }
-        else
-        {
-            hr = psfParent->GetUIObjectOf(0, 1,
-                (LPCITEMIDLIST*)&pidlLast, IID_NULL_PPV_ARG(IExtractIconW, 
&pei));
-            if (SUCCEEDED(hr))
-            {
-                hr = pei->GetIconLocation(uGilFlags,
-                    szLocation, MAX_PATH, &iIndex, &uFlags);
-
-                if (uFlags & GIL_NOTFILENAME)
-                    ret = FALSE;
-                else
-                {
-                    wcscpy (psfi->szDisplayName, szLocation);
-                    psfi->iIcon = iIndex;
-                }
-            }
-        }
-    }
-
-    /* get icon index (or load icon)*/
-    if (SUCCEEDED(hr) && (flags & (SHGFI_ICON | SHGFI_SYSICONINDEX)))
-    {
-        if (flags & SHGFI_USEFILEATTRIBUTES && !(flags & SHGFI_PIDL))
-        {
-            WCHAR sTemp [MAX_PATH];
-            WCHAR * szExt;
-            int icon_idx=0;
-
-            lstrcpynW(sTemp, szFullPath, MAX_PATH);
-
-            if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-                psfi->iIcon = SIC_GetIconIndex(swShell32Name, 
-IDI_SHELL_FOLDER, 0);
-            else
-            {
-                static const WCHAR p1W[] = {'%','1',0};
-
-                psfi->iIcon = 0;
-                szExt = PathFindExtensionW(sTemp);
-                if ( szExt &&
-                     HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) &&
-                     HCR_GetIconW(sTemp, sTemp, NULL, MAX_PATH, &icon_idx))
-                {
-                    if (!lstrcmpW(p1W,sTemp))            /* icon is in the 
file */
-                        wcscpy(sTemp, szFullPath);
-
-                    if (flags & SHGFI_SYSICONINDEX)
-                    {
-                        psfi->iIcon = SIC_GetIconIndex(sTemp,icon_idx,0);
-                        if (psfi->iIcon == -1)
-                            psfi->iIcon = 0;
-                    }
-                    else
-                    {
-                        UINT ret;
-                        if (flags & SHGFI_SMALLICON)
-                            ret = PrivateExtractIconsW( sTemp,icon_idx,
-                                GetSystemMetrics( SM_CXSMICON ),
-                                GetSystemMetrics( SM_CYSMICON ),
-                                &psfi->hIcon, 0, 1, 0);
-                        else
-                            ret = PrivateExtractIconsW( sTemp, icon_idx,
-                                GetSystemMetrics( SM_CXICON),
-                                GetSystemMetrics( SM_CYICON),
-                                &psfi->hIcon, 0, 1, 0);
-
-                        if (ret != 0 && ret != 0xFFFFFFFF)
-                        {
-                            IconNotYetLoaded=FALSE;
-                            psfi->iIcon = icon_idx;
-                        }
-                    }
-                }
-            }
-        }
-        else
-        {
-            if (!(PidlToSicIndex(psfParent, pidlLast, !(flags & 
SHGFI_SMALLICON),
-                uGilFlags, &(psfi->iIcon))))
-            {
-                ret = FALSE;
-            }
-        }
-        if (ret && (flags & SHGFI_SYSICONINDEX))
-        {
-            if (flags & SHGFI_SMALLICON)
-                ret = (DWORD_PTR) ShellSmallIconList;
-            else
-                ret = (DWORD_PTR) ShellBigIconList;
-        }
-    }
-
-    /* icon handle */
-    if (SUCCEEDED(hr) && (flags & SHGFI_ICON) && IconNotYetLoaded)
-    {
-        if (flags & SHGFI_SMALLICON)
-            psfi->hIcon = ImageList_GetIcon( ShellSmallIconList, psfi->iIcon, 
ILD_NORMAL);
-        else
-            psfi->hIcon = ImageList_GetIcon( ShellBigIconList, psfi->iIcon, 
ILD_NORMAL);
-    }
-
-    if (flags & ~SHGFI_KNOWN_FLAGS)
-        FIXME("unknown flags %08x\n", flags & ~SHGFI_KNOWN_FLAGS);
-
-    if (hr != S_OK)
-        ret = FALSE;
-
-    SHFree(pidlLast);
-
-#ifdef MORE_DEBUG
-    TRACE ("icon=%p index=0x%08x attr=0x%08x name=%s type=%s ret=0x%08lx\n",
-           psfi->hIcon, psfi->iIcon, psfi->dwAttributes,
-           debugstr_w(psfi->szDisplayName), debugstr_w(psfi->szTypeName), ret);
-#endif
-
-    return ret;
-}
-
-/*************************************************************************
- * SHGetFileInfoA            [SHELL32.@]
- *
- * Note:
- *    MSVBVM60.__vbaNew2 expects this function to return a value in range
- *    1 .. 0x7fff when the function succeeds and flags does not contain
- *    SHGFI_EXETYPE or SHGFI_SYSICONINDEX (see bug 7701)
- */
-DWORD_PTR WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes,
-                                SHFILEINFOA *psfi, UINT sizeofpsfi,
-                                UINT flags )
-{
-    INT len;
-    LPWSTR temppath = NULL;
-    LPCWSTR pathW;
-    DWORD ret;
-    SHFILEINFOW temppsfi;
-
-    if (flags & SHGFI_PIDL)
-    {
-        /* path contains a pidl */
-        pathW = (LPCWSTR)path;
-    }
-    else
-    {
-        len = MultiByteToWideChar(CP_ACP, 0, path, -1, NULL, 0);
-        temppath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));
-        MultiByteToWideChar(CP_ACP, 0, path, -1, temppath, len);
-        pathW = temppath;
-    }
-
-    if (psfi && (flags & SHGFI_ATTR_SPECIFIED))
-        temppsfi.dwAttributes=psfi->dwAttributes;
-
-    if (psfi == NULL)
-        ret = SHGetFileInfoW(pathW, dwFileAttributes, NULL, 0, flags);
-    else
-        ret = SHGetFileInfoW(pathW, dwFileAttributes, &temppsfi, 
sizeof(temppsfi), flags);
-
-    if (psfi)
-    {
-        if(flags & SHGFI_ICON)
-            psfi->hIcon=temppsfi.hIcon;
-        if(flags & (SHGFI_SYSICONINDEX|SHGFI_ICON|SHGFI_ICONLOCATION))
-            psfi->iIcon=temppsfi.iIcon;
-        if(flags & SHGFI_ATTRIBUTES)
-            psfi->dwAttributes=temppsfi.dwAttributes;
-        if(flags & (SHGFI_DISPLAYNAME|SHGFI_ICONLOCATION))
-        {
-            WideCharToMultiByte(CP_ACP, 0, temppsfi.szDisplayName, -1,
-                  psfi->szDisplayName, sizeof(psfi->szDisplayName), NULL, 
NULL);
-        }
-        if(flags & SHGFI_TYPENAME)
-        {
-            WideCharToMultiByte(CP_ACP, 0, temppsfi.szTypeName, -1,
-                  psfi->szTypeName, sizeof(psfi->szTypeName), NULL, NULL);
-        }
-    }
-
-    HeapFree(GetProcessHeap(), 0, temppath);
-
-    return ret;
-}
-
-/*************************************************************************
- * DuplicateIcon            [SHELL32.@]
- */
-EXTERN_C HICON WINAPI DuplicateIcon( HINSTANCE hInstance, HICON hIcon)
-{
-    ICONINFO IconInfo;
-    HICON hDupIcon = 0;
-
-    TRACE("%p %p\n", hInstance, hIcon);
-
-    if (GetIconInfo(hIcon, &IconInfo))
-    {
-        hDupIcon = CreateIconIndirect(&IconInfo);
-
-        /* clean up hbmMask and hbmColor */
-        DeleteObject(IconInfo.hbmMask);
-        DeleteObject(IconInfo.hbmColor);
-    }
-
-    return hDupIcon;
-}
-
-/*************************************************************************
- * ExtractIconA                [SHELL32.@]
- */
-HICON WINAPI ExtractIconA(HINSTANCE hInstance, LPCSTR lpszFile, UINT 
nIconIndex)
-{
-    HICON ret;
-    INT len = MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, NULL, 0);
-    LPWSTR lpwstrFile = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * 
sizeof(WCHAR));
-
-    TRACE("%p %s %d\n", hInstance, lpszFile, nIconIndex);
-
-    MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, lpwstrFile, len);
-    ret = ExtractIconW(hInstance, lpwstrFile, nIconIndex);
-    HeapFree(GetProcessHeap(), 0, lpwstrFile);
-
-    return ret;
-}
-
-/*************************************************************************
- * ExtractIconW                [SHELL32.@]
- */
-HICON WINAPI ExtractIconW(HINSTANCE hInstance, LPCWSTR lpszFile, UINT 
nIconIndex)
-{
-    HICON  hIcon = NULL;
-    UINT ret;
-    UINT cx = GetSystemMetrics(SM_CXICON), cy = GetSystemMetrics(SM_CYICON);
-
-    TRACE("%p %s %d\n", hInstance, debugstr_w(lpszFile), nIconIndex);
-
-    if (nIconIndex == 0xFFFFFFFF)
-    {
-        ret = PrivateExtractIconsW(lpszFile, 0, cx, cy, NULL, NULL, 0, 
LR_DEFAULTCOLOR);
-        if (ret != 0xFFFFFFFF && ret)
-            return (HICON)(UINT_PTR)ret;
-        return NULL;
-    }
-    else
-        ret = PrivateExtractIconsW(lpszFile, nIconIndex, cx, cy, &hIcon, NULL, 
1, LR_DEFAULTCOLOR);
-
-    if (ret == 0xFFFFFFFF)
-        return (HICON)1;
-    else if (ret > 0 && hIcon)
-        return hIcon;
-
-    return NULL;
-}
-
-/*************************************************************************
- * Printer_LoadIconsW        [SHELL32.205]
- */
-EXTERN_C VOID WINAPI Printer_LoadIconsW(LPCWSTR wsPrinterName, HICON * 
pLargeIcon, HICON * pSmallIcon)
-{
-    INT iconindex=IDI_SHELL_PRINTERS_FOLDER;
-
-    TRACE("(%s, %p, %p)\n", debugstr_w(wsPrinterName), pLargeIcon, pSmallIcon);
-
-    /* We should check if wsPrinterName is
-       1. the Default Printer or not
-       2. connected or not
-       3. a Local Printer or a Network-Printer
-       and use different Icons
-    */
-    if((wsPrinterName != NULL) && (wsPrinterName[0] != 0))
-    {
-        FIXME("(select Icon by PrinterName %s not implemented)\n", 
debugstr_w(wsPrinterName));
-    }
-
-    if(pLargeIcon != NULL)
-        *pLargeIcon = (HICON)LoadImageW(shell32_hInstance,
-                                 (LPCWSTR) MAKEINTRESOURCE(iconindex), 
IMAGE_ICON,
-                                 0, 0, LR_DEFAULTCOLOR|LR_DEFAULTSIZE);
-
-    if(pSmallIcon != NULL)
-        *pSmallIcon = (HICON)LoadImageW(shell32_hInstance,
-                                 (LPCWSTR) MAKEINTRESOURCE(iconindex), 
IMAGE_ICON,
-                                 16, 16, LR_DEFAULTCOLOR);
-}
-
-/*************************************************************************
- * Printers_RegisterWindowW        [SHELL32.213]
- * used by "printui.dll":
- * find the Window of the given Type for the specific Printer and
- * return the already existent hwnd or open a new window
- */
-EXTERN_C BOOL WINAPI Printers_RegisterWindowW(LPCWSTR wsPrinter, DWORD dwType,
-            HANDLE * phClassPidl, HWND * phwnd)
-{
-    FIXME("(%s, %x, %p (%p), %p (%p)) stub!\n", debugstr_w(wsPrinter), dwType,
-                phClassPidl, (phClassPidl != NULL) ? *(phClassPidl) : NULL,
-                phwnd, (phwnd != NULL) ? *(phwnd) : NULL);
-
-    return FALSE;
-}
-
-/*************************************************************************
- * Printers_UnregisterWindow      [SHELL32.214]
- */
-EXTERN_C VOID WINAPI Printers_UnregisterWindow(HANDLE hClassPidl, HWND hwnd)
-{
-    FIXME("(%p, %p) stub!\n", hClassPidl, hwnd);
-}
-
-/*************************************************************************/
-
-typedef struct
-{
-    LPCWSTR  szApp;
-    LPCWSTR  szOtherStuff;
-    HICON hIcon;
-} ABOUT_INFO;
-
-#define DROP_FIELD_TOP    (-15)
-#define DROP_FIELD_HEIGHT  15
-
-/*************************************************************************
- * SHAppBarMessage            [SHELL32.@]
- */
-UINT_PTR WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data)
-{
-    int width=data->rc.right - data->rc.left;
-    int height=data->rc.bottom - data->rc.top;
-    RECT rec=data->rc;
-
-    TRACE("msg=%d, data={cb=%d, hwnd=%p, callback=%x, edge=%d, rc=%s, 
lparam=%lx}\n",
-          msg, data->cbSize, data->hWnd, data->uCallbackMessage, data->uEdge,
-          wine_dbgstr_rect(&data->rc), data->lParam);
-
-    switch (msg)
-    {
-        case ABM_GETSTATE:
-            return ABS_ALWAYSONTOP | ABS_AUTOHIDE;
-
-        case ABM_GETTASKBARPOS:
-            GetWindowRect(data->hWnd, &rec);
-            data->rc=rec;
-            return TRUE;
-
-        case ABM_ACTIVATE:
-            SetActiveWindow(data->hWnd);
-            return TRUE;
-
-        case ABM_GETAUTOHIDEBAR:
-            return 0; /* pretend there is no autohide bar */
-
-        case ABM_NEW:
-            /* cbSize, hWnd, and uCallbackMessage are used. All other ignored 
*/
-            
SetWindowPos(data->hWnd,HWND_TOP,0,0,0,0,SWP_SHOWWINDOW|SWP_NOMOVE|SWP_NOSIZE);
-            return TRUE;
-
-        case ABM_QUERYPOS:
-            GetWindowRect(data->hWnd, &(data->rc));
-            return TRUE;
-
-        case ABM_REMOVE:
-            FIXME("ABM_REMOVE broken\n");
-            /* FIXME: this is wrong; should it be DestroyWindow instead? */
-            /*CloseHandle(data->hWnd);*/
-            return TRUE;
-
-        case ABM_SETAUTOHIDEBAR:
-            SetWindowPos(data->hWnd,HWND_TOP,rec.left+1000,rec.top,
-                             width,height,SWP_SHOWWINDOW);
-            return TRUE;
-
-        case ABM_SETPOS:
-            data->uEdge=(ABE_RIGHT | ABE_LEFT);
-            SetWindowPos(data->hWnd,HWND_TOP,data->rc.left,data->rc.top,
-                         width,height,SWP_SHOWWINDOW);
-            return TRUE;
-
-        case ABM_WINDOWPOSCHANGED:
-            return TRUE;
-    }
-
-    return FALSE;
-}
-
-/*************************************************************************
- * SHHelpShortcuts_RunDLLA        [SHELL32.@]
- *
- */
-EXTERN_C DWORD WINAPI SHHelpShortcuts_RunDLLA(DWORD dwArg1, DWORD dwArg2, 
DWORD dwArg3, DWORD dwArg4)
-{
-    FIXME("(%x, %x, %x, %x) stub!\n", dwArg1, dwArg2, dwArg3, dwArg4);
-    return 0;
-}
-
-/*************************************************************************
- * SHHelpShortcuts_RunDLLA        [SHELL32.@]
- *
- */
-EXTERN_C DWORD WINAPI SHHelpShortcuts_RunDLLW(DWORD dwArg1, DWORD dwArg2, 
DWORD dwArg3, DWORD dwArg4)
-{
-    FIXME("(%x, %x, %x, %x) stub!\n", dwArg1, dwArg2, dwArg3, dwArg4);
-    return 0;
-}
-
-/*************************************************************************
- * SHLoadInProc                [SHELL32.@]
- * Create an instance of specified object class from within
- * the shell process and release it immediately
- */
-EXTERN_C HRESULT WINAPI SHLoadInProc (REFCLSID rclsid)
-{
-    CComPtr<IUnknown>            ptr;
-
-    TRACE("%s\n", debugstr_guid(&rclsid));
-
-    CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, (void 
**)&ptr);
-    if (ptr)
-        return S_OK;
-    return DISP_E_MEMBERNOTFOUND;
-}
-
-static VOID SetRegTextData(HWND hWnd, HKEY hKey, LPCWSTR Value, UINT uID)
-{
-    DWORD dwBufferSize;
-    DWORD dwType;
-    LPWSTR lpBuffer;
-
-    if( RegQueryValueExW(hKey, Value, NULL, &dwType, NULL, &dwBufferSize) == 
ERROR_SUCCESS )
-    {
-        if(dwType == REG_SZ)
-        {
-            lpBuffer = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, dwBufferSize);
-
-            if(lpBuffer)
-            {
-                if( RegQueryValueExW(hKey, Value, NULL, &dwType, 
(LPBYTE)lpBuffer, &dwBufferSize) == ERROR_SUCCESS )
-                {
-                    SetDlgItemTextW(hWnd, uID, lpBuffer);
-                }
-
-                HeapFree(GetProcessHeap(), 0, lpBuffer);
-            }
-        }
-    }
-}
-
-INT_PTR CALLBACK AboutAuthorsDlgProc( HWND hWnd, UINT msg, WPARAM wParam, 
LPARAM lParam )
-{
-    switch(msg)
-    {
-        case WM_INITDIALOG:
-        {
-            const char* const *pstr = SHELL_Authors;
-
-            // Add the authors to the list
-            SendDlgItemMessageW( hWnd, IDC_ABOUT_AUTHORS_LISTBOX, 
WM_SETREDRAW, FALSE, 0 );
-
-            while (*pstr)
-            {
-                WCHAR name[64];
-
-                /* authors list is in utf-8 format */
-                MultiByteToWideChar( CP_UTF8, 0, *pstr, -1, name, 
sizeof(name)/sizeof(WCHAR) );
-                SendDlgItemMessageW( hWnd, IDC_ABOUT_AUTHORS_LISTBOX, 
LB_ADDSTRING, (WPARAM)-1, (LPARAM)name );
-                pstr++;
-            }
-
-            SendDlgItemMessageW( hWnd, IDC_ABOUT_AUTHORS_LISTBOX, 
WM_SETREDRAW, TRUE, 0 );
-
-            return TRUE;
-        }
-    }
-
-    return FALSE;
-}
-/*************************************************************************
- * AboutDlgProc            (internal)
- */
-static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, 
LPARAM lParam )
-{
-    static DWORD   cxLogoBmp;
-    static DWORD   cyLogoBmp;
-    static HBITMAP hLogoBmp;
-    static HWND    hWndAuthors;
-
-    switch(msg)
-    {
-        case WM_INITDIALOG:
-        {
-            ABOUT_INFO *info = (ABOUT_INFO *)lParam;
-
-            if (info)
-            {
-                const WCHAR szRegKey[] = L"SOFTWARE\\Microsoft\\Windows 
NT\\CurrentVersion";
-                HKEY hRegKey;
-                MEMORYSTATUSEX MemStat;
-                WCHAR szAppTitle[512];
-                WCHAR szAppTitleTemplate[512];
-                WCHAR szAuthorsText[20];
-
-                // Preload the ROS bitmap
-                hLogoBmp = (HBITMAP)LoadImage(shell32_hInstance, 
MAKEINTRESOURCE(IDB_REACTOS), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
-
-                if(hLogoBmp)
-                {
-                    BITMAP bmpLogo;
-
-                    GetObject( hLogoBmp, sizeof(BITMAP), &bmpLogo );
-
-                    cxLogoBmp = bmpLogo.bmWidth;
-                    cyLogoBmp = bmpLogo.bmHeight;
-                }
-
-                // Set App-specific stuff (icon, app name, szOtherStuff string)
-                SendDlgItemMessageW(hWnd, IDC_ABOUT_ICON, STM_SETICON, 
(WPARAM)info->hIcon, 0);
-
-                GetWindowTextW( hWnd, szAppTitleTemplate, 
sizeof(szAppTitleTemplate) / sizeof(WCHAR) );
-                swprintf( szAppTitle, szAppTitleTemplate, info->szApp );
-                SetWindowTextW( hWnd, szAppTitle );
-
-                SetDlgItemTextW( hWnd, IDC_ABOUT_APPNAME, info->szApp );
-                SetDlgItemTextW( hWnd, IDC_ABOUT_OTHERSTUFF, 
info->szOtherStuff );
-
-                // Set the registered user and organization name
-                if(RegOpenKeyExW( HKEY_LOCAL_MACHINE, szRegKey, 0, 
KEY_QUERY_VALUE, &hRegKey ) == ERROR_SUCCESS)
-                {
-                    SetRegTextData( hWnd, hRegKey, L"RegisteredOwner", 
IDC_ABOUT_REG_USERNAME );
-                    SetRegTextData( hWnd, hRegKey, L"RegisteredOrganization", 
IDC_ABOUT_REG_ORGNAME );
-
-                    RegCloseKey( hRegKey );
-                }
-
-                // Set the value for the installed physical memory
-                MemStat.dwLength = sizeof(MemStat);
-                if( GlobalMemoryStatusEx(&MemStat) )
-                {
-                    WCHAR szBuf[12];
-
-                    if (MemStat.ullTotalPhys > 1024 * 1024 * 1024)
-                    {
-                        double dTotalPhys;
-                        WCHAR szDecimalSeparator[4];
-                        WCHAR szUnits[3];
-
-                        // We're dealing with GBs or more
-                        MemStat.ullTotalPhys /= 1024 * 1024;
-
-                        if (MemStat.ullTotalPhys > 1024 * 1024)
-                        {
-                            // We're dealing with TBs or more
-                            MemStat.ullTotalPhys /= 1024;
-
-                            if (MemStat.ullTotalPhys > 1024 * 1024)
-                            {
-                                // We're dealing with PBs or more
-                                MemStat.ullTotalPhys /= 1024;
-
-                                dTotalPhys = (double)MemStat.ullTotalPhys / 
1024;
-                                wcscpy( szUnits, L"PB" );
-                            }
-                            else
-                            {
-                                dTotalPhys = (double)MemStat.ullTotalPhys / 
1024;
-                                wcscpy( szUnits, L"TB" );
-                            }
-                        }
-                        else
-                        {
-                            dTotalPhys = (double)MemStat.ullTotalPhys / 1024;
-                            wcscpy( szUnits, L"GB" );
-                        }
-
-                        // We need the decimal point of the current locale to 
display the RAM size correctly
-                        if (GetLocaleInfoW(LOCALE_USER_DEFAULT, 
LOCALE_SDECIMAL,
-                            szDecimalSeparator,
-                            sizeof(szDecimalSeparator) / sizeof(WCHAR)) > 0)
-                        {
-                            UCHAR uDecimals;
-                            UINT uIntegral;
-
-                            uIntegral = (UINT)dTotalPhys;
-                            uDecimals = (UCHAR)((UINT)(dTotalPhys * 100) - 
uIntegral * 100);
-
-                            // Display the RAM size with 2 decimals
-                            swprintf(szBuf, L"%u%s%02u %s", uIntegral, 
szDecimalSeparator, uDecimals, szUnits);
-                        }
-                    }
-                    else
-                    {
-                        // We're dealing with MBs, don't show any decimals
-                        swprintf( szBuf, L"%u MB", (UINT)MemStat.ullTotalPhys 
/ 1024 / 1024 );
-                    }
-
-                    SetDlgItemTextW( hWnd, IDC_ABOUT_PHYSMEM, szBuf);
-                }
-
-                // Add the Authors dialog
-                hWndAuthors = CreateDialogW( shell32_hInstance, 
MAKEINTRESOURCEW(IDD_ABOUT_AUTHORS), hWnd, AboutAuthorsDlgProc );
-                LoadStringW( shell32_hInstance, IDS_SHELL_ABOUT_AUTHORS, 
szAuthorsText, sizeof(szAuthorsText) / sizeof(WCHAR) );
-                SetDlgItemTextW( hWnd, IDC_ABOUT_AUTHORS, szAuthorsText );
-            }
-
-            return TRUE;
-        }
-
-        case WM_PAINT:
-        {
-            if(hLogoBmp)
-            {
-                PAINTSTRUCT ps;
-                HDC hdc;
-                HDC hdcMem;
-
-                hdc = BeginPaint(hWnd, &ps);
-                hdcMem = CreateCompatibleDC(hdc);
-
-                if(hdcMem)
-                {
-                    SelectObject(hdcMem, hLogoBmp);
-                    BitBlt(hdc, 0, 0, cxLogoBmp, cyLogoBmp, hdcMem, 0, 0, 
SRCCOPY);
-
-                    DeleteDC(hdcMem);
-                }
-
-                EndPaint(hWnd, &ps);
-            }
-        }; break;
-
-        case WM_COMMAND:
-        {
-            switch(wParam)
-            {
-                case IDOK:
-                case IDCANCEL:
-                    EndDialog(hWnd, TRUE);
-                    return TRUE;
-
-                case IDC_ABOUT_AUTHORS:
-                {
-                    static BOOL bShowingAuthors = FALSE;
-                    WCHAR szAuthorsText[20];
-
-                    if(bShowingAuthors)
-                    {
-                        LoadStringW( shell32_hInstance, 
IDS_SHELL_ABOUT_AUTHORS, szAuthorsText, sizeof(szAuthorsText) / sizeof(WCHAR) );
-                        ShowWindow( hWndAuthors, SW_HIDE );
-                    }
-                    else
-                    {
-                        LoadStringW( shell32_hInstance, IDS_SHELL_ABOUT_BACK, 
szAuthorsText, sizeof(szAuthorsText) / sizeof(WCHAR) );
-                        ShowWindow( hWndAuthors, SW_SHOW );
-                    }
-
-                    SetDlgItemTextW( hWnd, IDC_ABOUT_AUTHORS, szAuthorsText );
-                    bShowingAuthors = !bShowingAuthors;
-                    return TRUE;
-                }
-            }
-        }; break;
-
-        case WM_CLOSE:
-            EndDialog(hWnd, TRUE);
-            break;
-    }
-
-    return FALSE;
-}
-
-
-/*************************************************************************
- * ShellAboutA                [SHELL32.288]
- */
-BOOL WINAPI ShellAboutA( HWND hWnd, LPCSTR szApp, LPCSTR szOtherStuff, HICON 
hIcon )
-{
-    BOOL ret;
-    LPWSTR appW = NULL, otherW = NULL;
-    int len;
-
-    if (szApp)
-    {
-        len = MultiByteToWideChar(CP_ACP, 0, szApp, -1, NULL, 0);
-        appW = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
-        MultiByteToWideChar(CP_ACP, 0, szApp, -1, appW, len);
-    }
-    if (szOtherStuff)
-    {
-        len = MultiByteToWideChar(CP_ACP, 0, szOtherStuff, -1, NULL, 0);
-        otherW = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
-        MultiByteToWideChar(CP_ACP, 0, szOtherStuff, -1, otherW, len);
-    }
-
-    ret = ShellAboutW(hWnd, appW, otherW, hIcon);
-
-    HeapFree(GetProcessHeap(), 0, otherW);
-    HeapFree(GetProcessHeap(), 0, appW);
-    return ret;
-}
-
-
-/*************************************************************************
- * ShellAboutW                [SHELL32.289]
- */
-BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff,
-                         HICON hIcon )
-{
-    ABOUT_INFO info;
-    HRSRC hRes;
-    DLGTEMPLATE *DlgTemplate;
-    BOOL bRet;
-
-    TRACE("\n");
-
-    // DialogBoxIndirectParamW will be called with the hInstance of the 
calling application, so we have to preload the dialog template
-    hRes = FindResourceW(shell32_hInstance, MAKEINTRESOURCEW(IDD_ABOUT), 
(LPWSTR)RT_DIALOG);
-    if(!hRes)
-        return FALSE;
-
-    DlgTemplate = (DLGTEMPLATE *)LoadResource(shell32_hInstance, hRes);
-    if(!DlgTemplate)
-        return FALSE;
-
-    info.szApp        = szApp;
-    info.szOtherStuff = szOtherStuff;
-    info.hIcon        = hIcon ? hIcon : LoadIconW( 0, (LPWSTR)IDI_WINLOGO );
-
-    bRet = DialogBoxIndirectParamW((HINSTANCE)GetWindowLongPtrW( hWnd, 
GWLP_HINSTANCE ),
-                                   DlgTemplate, hWnd, AboutDlgProc, 
(LPARAM)&info );
-    return bRet;
-}
-
-/*************************************************************************
- * FreeIconList (SHELL32.@)
- */
-EXTERN_C void WINAPI FreeIconList( DWORD dw )
-{
-    FIXME("%x: stub\n",dw);
-}
-
-/*************************************************************************
- * SHLoadNonloadedIconOverlayIdentifiers (SHELL32.@)
- */
-EXTERN_C HRESULT WINAPI SHLoadNonloadedIconOverlayIdentifiers(VOID)
-{
-    FIXME("stub\n");
+/**************************************************************************
+ * Default ClassFactory types
+ */
+typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID 
riid, LPVOID* ppvObject);
+HRESULT IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, const 
IID *riidInst, IClassFactory **theFactory);
+
+
+/**************************************************************************
+ * Default ClassFactory Implementation
+ *
+ * SHCreateDefClassObject
+ *
+ * NOTES
+ *  Helper function for dlls without their own classfactory.
+ *  A generic classfactory is returned.
+ *  When the CreateInstance of the cf is called the callback is executed.
+ */
+
+class IDefClFImpl :
+    public CComObjectRootEx<CComMultiThreadModelNoCS>,
+    public IClassFactory
+{
+private:
+    CLSID                    *rclsid;
+    LPFNCREATEINSTANCE        lpfnCI;
+    const IID                *riidInst;
+    LONG                    *pcRefDll;        /* pointer to refcounter in 
external dll (ugrrr...) */
+public:
+    IDefClFImpl();
+    HRESULT Initialize(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, const IID 
*riidInstx);
+
+    // IClassFactory
+    virtual HRESULT WINAPI CreateInstance(IUnknown * pUnkOuter, REFIID riid, 
LPVOID *ppvObject);
+    virtual HRESULT WINAPI LockServer(BOOL fLock);
+
+BEGIN_COM_MAP(IDefClFImpl)
+    COM_INTERFACE_ENTRY_IID(IID_IClassFactory, IClassFactory)
+END_COM_MAP()
+};
+
+IDefClFImpl::IDefClFImpl()
+{
+    lpfnCI = NULL;
+    riidInst = NULL;
+    pcRefDll = NULL;
+    rclsid = NULL;
+}
+
+HRESULT IDefClFImpl::Initialize(LPFNCREATEINSTANCE lpfnCIx, PLONG pcRefDllx, 
const IID *riidInstx)
+{
+    lpfnCI = lpfnCIx;
+    riidInst = riidInstx;
+    pcRefDll = pcRefDllx;
+
+    if (pcRefDll)
+        InterlockedIncrement(pcRefDll);
+
+    TRACE("(%p)%s\n", this, shdebugstr_guid(riidInst));
+    return S_OK;
+}
+
+/******************************************************************************
+ * IDefClF_fnCreateInstance
+ */
+HRESULT WINAPI IDefClFImpl::CreateInstance(IUnknown * pUnkOuter, REFIID riid, 
LPVOID *ppvObject)
+{
+    TRACE("%p->(%p,%s,%p)\n", this, pUnkOuter, shdebugstr_guid(&riid), 
ppvObject);
+
+    *ppvObject = NULL;
+
+    if (riidInst == NULL || IsEqualCLSID(riid, *riidInst) || 
IsEqualCLSID(riid, IID_IUnknown))
+    {
+        return lpfnCI(pUnkOuter, riid, ppvObject);
+    }
+
+    ERR("unknown IID requested %s\n", shdebugstr_guid(&riid));
+    return E_NOINTERFACE;
+}
+
+/******************************************************************************
+ * IDefClF_fnLockServer
+ */
+HRESULT WINAPI IDefClFImpl::LockServer(BOOL fLock)
+{
+    TRACE("%p->(0x%x), not implemented\n", this, fLock);
+    return E_NOTIMPL;
+}
+
+/**************************************************************************
+ *  IDefClF_fnConstructor
+ */
+
+HRESULT IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, const 
IID *riidInst, IClassFactory **theFactory)
+{
+    return ShellObjectCreatorInit<IDefClFImpl>(lpfnCI, pcRefDll, riidInst, 
IID_IClassFactory, theFactory);
+}
+
+/******************************************************************************
+ * SHCreateDefClassObject            [SHELL32.70]
+ */
+HRESULT WINAPI SHCreateDefClassObject(
+    REFIID    riid,
+    LPVOID*    ppv,
+    LPFNCREATEINSTANCE lpfnCI,    /* [in] create instance callback entry */
+    LPDWORD    pcRefDll,        /* [in/out] ref count of the dll */
+    REFIID    riidInst)        /* [in] optional interface to the instance */
+{
+    IClassFactory                *pcf;
+    HRESULT                        hResult;
+
+    TRACE("%s %p %p %p %s\n", shdebugstr_guid(&riid), ppv, lpfnCI, pcRefDll, 
shdebugstr_guid(&riidInst));
+
+    if (!IsEqualCLSID(riid, IID_IClassFactory))
+        return E_NOINTERFACE;
+    hResult = IDefClF_fnConstructor(lpfnCI, (PLONG)pcRefDll, &riidInst, &pcf);
+    if (FAILED(hResult))
+        return hResult;
+    *ppv = pcf;
     return S_OK;
 }
 

Modified: branches/shell-experiments/dll/win32/shell32/shell32_main.cpp
URL: 
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shell32/shell32_main.cpp?rev=65212&r1=65211&r2=65212&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/shell32/shell32_main.cpp       
[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/shell32/shell32_main.cpp       
[iso-8859-1] Mon Nov  3 10:38:21 2014
@@ -21,7 +21,6 @@
 
 #include "precomp.h"
 
-#include "shell32_version.h"
 #include <reactos/version.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
@@ -1342,222 +1341,3 @@
     FIXME("stub\n");
     return S_OK;
 }
-
-class CShell32Module : public CComModule
-{
-public:
-};
-
-
-BEGIN_OBJECT_MAP(ObjectMap)
-    OBJECT_ENTRY(CLSID_ShellFSFolder, CFSFolder)
-    OBJECT_ENTRY(CLSID_MyComputer, CDrivesFolder)
-    OBJECT_ENTRY(CLSID_ShellDesktop, CDesktopFolder)
-    OBJECT_ENTRY(CLSID_ShellItem, CShellItem)
-    OBJECT_ENTRY(CLSID_ShellLink, CShellLink)
-    OBJECT_ENTRY(CLSID_DragDropHelper, CDropTargetHelper)
-    OBJECT_ENTRY(CLSID_ControlPanel, CControlPanelFolder)
-    OBJECT_ENTRY(CLSID_AutoComplete, CAutoComplete)
-    OBJECT_ENTRY(CLSID_MyDocuments, CMyDocsFolder)
-    OBJECT_ENTRY(CLSID_NetworkPlaces, CNetFolder)
-    OBJECT_ENTRY(CLSID_FontsFolderShortcut, CFontsFolder)
-    OBJECT_ENTRY(CLSID_Printers, CPrinterFolder)
-    OBJECT_ENTRY(CLSID_AdminFolderShortcut, CAdminToolsFolder)
-    OBJECT_ENTRY(CLSID_RecycleBin, CRecycleBin)
-    OBJECT_ENTRY(CLSID_OpenWithMenu, COpenWithMenu)
-    OBJECT_ENTRY(CLSID_NewMenu, CNewMenu)
-    OBJECT_ENTRY(CLSID_StartMenu, CStartMenu)
-    OBJECT_ENTRY(CLSID_MenuBandSite, CMenuBandSite)
-    OBJECT_ENTRY(CLSID_MenuBand, CMenuBand)
-    OBJECT_ENTRY(CLSID_MenuDeskBar, CMenuDeskBar)
-    OBJECT_ENTRY(CLSID_ExeDropHandler, CExeDropHandler)
-END_OBJECT_MAP()
-
-CShell32Module                                gModule;
-
-
-/***********************************************************************
- * DllGetVersion [SHELL32.@]
- *
- * Retrieves version information of the 'SHELL32.DLL'
- *
- * PARAMS
- *     pdvi [O] pointer to version information structure.
- *
- * RETURNS
- *     Success: S_OK
- *     Failure: E_INVALIDARG
- *
- * NOTES
- *     Returns version of a shell32.dll from IE4.01 SP1.
- */
-
-STDAPI DllGetVersion(DLLVERSIONINFO *pdvi)
-{
-    /* FIXME: shouldn't these values come from the version resource? */
-    if (pdvi->cbSize == sizeof(DLLVERSIONINFO) ||
-        pdvi->cbSize == sizeof(DLLVERSIONINFO2))
-    {
-        pdvi->dwMajorVersion = WINE_FILEVERSION_MAJOR;
-        pdvi->dwMinorVersion = WINE_FILEVERSION_MINOR;
-        pdvi->dwBuildNumber = WINE_FILEVERSION_BUILD;
-        pdvi->dwPlatformID = WINE_FILEVERSION_PLATFORMID;
-        if (pdvi->cbSize == sizeof(DLLVERSIONINFO2))
-        {
-            DLLVERSIONINFO2 *pdvi2 = (DLLVERSIONINFO2 *)pdvi;
-
-            pdvi2->dwFlags = 0;
-            pdvi2->ullVersion = MAKEDLLVERULL(WINE_FILEVERSION_MAJOR,
-                                              WINE_FILEVERSION_MINOR,
-                                              WINE_FILEVERSION_BUILD,
-                                              WINE_FILEVERSION_PLATFORMID);
-        }
-        TRACE("%u.%u.%u.%u\n",
-              pdvi->dwMajorVersion, pdvi->dwMinorVersion,
-              pdvi->dwBuildNumber, pdvi->dwPlatformID);
-        return S_OK;
-    }
-    else
-    {
-        WARN("wrong DLLVERSIONINFO size from app\n");
-        return E_INVALIDARG;
-    }
-}
-
-/*************************************************************************
- * global variables of the shell32.dll
- * all are once per process
- *
- */
-HINSTANCE    shell32_hInstance;
-HIMAGELIST   ShellSmallIconList = 0;
-HIMAGELIST   ShellBigIconList = 0;
-
-void *operator new (size_t, void *buf)
-{
-    return buf;
-}
-
-/*************************************************************************
- * SHELL32 DllMain
- *
- * NOTES
- *  calling oleinitialize here breaks sone apps.
- */
-STDAPI_(BOOL) DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID fImpLoad)
-{
-    TRACE("%p 0x%x %p\n", hInstance, dwReason, fImpLoad);
-    if (dwReason == DLL_PROCESS_ATTACH)
-    {
-        /* HACK - the global constructors don't run, so I placement new them 
here */
-        new (&gModule) CShell32Module;
-        new (&_AtlWinModule) CAtlWinModule;
-        new (&_AtlBaseModule) CAtlBaseModule;
-        new (&_AtlComModule) CAtlComModule;
-
-        shell32_hInstance = hInstance;
-        gModule.Init(ObjectMap, hInstance, NULL);
-
-        DisableThreadLibraryCalls (hInstance);
-
-        /* get full path to this DLL for IExtractIconW_fnGetIconLocation() */
-        GetModuleFileNameW(hInstance, swShell32Name, MAX_PATH);
-        swShell32Name[MAX_PATH - 1] = '\0';
-
-        /* Initialize comctl32 */
-        INITCOMMONCONTROLSEX InitCtrls;
-        InitCtrls.dwSize = sizeof(INITCOMMONCONTROLSEX);
-        InitCtrls.dwICC = ICC_WIN95_CLASSES | ICC_DATE_CLASSES | 
ICC_USEREX_CLASSES;
-        InitCommonControlsEx(&InitCtrls);
-
-        SIC_Initialize();
-        InitChangeNotifications();
-        InitIconOverlays();
-    }
-    else if (dwReason == DLL_PROCESS_DETACH)
-    {
-        shell32_hInstance = NULL;
-        SIC_Destroy();
-        FreeChangeNotifications();
-        gModule.Term();
-    }
-    return TRUE;
-}
-
-/***********************************************************************
- *              DllCanUnloadNow (SHELL32.@)
- */
-STDAPI DllCanUnloadNow()
-{
-    return gModule.DllCanUnloadNow();
-}
-
-/*************************************************************************
- *              DllGetClassObject     [SHELL32.@]
- *              SHDllGetClassObject   [SHELL32.128]
- */
-STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
-{
-    HRESULT                                hResult;
-
-    TRACE("CLSID:%s,IID:%s\n", shdebugstr_guid(&rclsid), 
shdebugstr_guid(&riid));
-
-    hResult = gModule.DllGetClassObject(rclsid, riid, ppv);
-    TRACE("-- pointer to class factory: %p\n", *ppv);
-    return hResult;
-}
-
-/***********************************************************************
- *              DllRegisterServer (SHELL32.@)
- */
-STDAPI DllRegisterServer()
-{
-    HRESULT hr;
-
-    hr = gModule.DllRegisterServer(FALSE);
-    if (FAILED(hr))
-        return hr;
-
-    hr = gModule.UpdateRegistryFromResource(IDR_FOLDEROPTIONS, TRUE, NULL);
-    if (FAILED(hr))
-        return hr;
-
-    hr = SHELL_RegisterShellFolders();
-    if (FAILED(hr))
-        return hr;
-
-    return S_OK;
-}
-
-/***********************************************************************
- *              DllUnregisterServer (SHELL32.@)
- */
-STDAPI DllUnregisterServer()
-{
-    HRESULT hr;
-
-    hr = gModule.DllUnregisterServer(FALSE);
-    if (FAILED(hr))
-        return hr;
-
-    hr = gModule.UpdateRegistryFromResource(IDR_FOLDEROPTIONS, FALSE, NULL);
-    if (FAILED(hr))
-        return hr;
-
-    return S_OK;
-}
-
-/*************************************************************************
- * DllInstall         [SHELL32.@]
- *
- * PARAMETERS
- *
- *    BOOL bInstall - TRUE for install, FALSE for uninstall
- *    LPCWSTR pszCmdLine - command line (unused by shell32?)
- */
-
-HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline)
-{
-    FIXME("%s %s: stub\n", bInstall ? "TRUE":"FALSE", debugstr_w(cmdline));
-    return S_OK;        /* indicate success */
-}

Modified: branches/shell-experiments/dll/win32/shell32/shellole.cpp
URL: 
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shell32/shellole.cpp?rev=65212&r1=65211&r2=65212&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/shell32/shellole.cpp   [iso-8859-1] 
(original)
+++ branches/shell-experiments/dll/win32/shell32/shellole.cpp   [iso-8859-1] 
Mon Nov  3 10:38:21 2014
@@ -24,12 +24,6 @@
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 static const WCHAR sShell32[12] = 
{'S','H','E','L','L','3','2','.','D','L','L','\0'};
-
-/**************************************************************************
- * Default ClassFactory types
- */
-typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID 
riid, LPVOID* ppvObject);
-HRESULT IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, const 
IID *riidInst, IClassFactory **theFactory);
 
 /* FIXME: this should be SHLWAPI.24 since we can't yet import by ordinal */
 
@@ -274,120 +268,6 @@
     CoTaskMemFree(pv);
 }
 
-/**************************************************************************
- * Default ClassFactory Implementation
- *
- * SHCreateDefClassObject
- *
- * NOTES
- *  Helper function for dlls without their own classfactory.
- *  A generic classfactory is returned.
- *  When the CreateInstance of the cf is called the callback is executed.
- */
-
-class IDefClFImpl :
-    public CComObjectRootEx<CComMultiThreadModelNoCS>,
-    public IClassFactory
-{
-private:
-    CLSID                    *rclsid;
-    LPFNCREATEINSTANCE        lpfnCI;
-    const IID                *riidInst;
-    LONG                    *pcRefDll;        /* pointer to refcounter in 
external dll (ugrrr...) */
-public:
-    IDefClFImpl();
-    HRESULT Initialize(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, const IID 
*riidInstx);
-
-    // IClassFactory
-    virtual HRESULT WINAPI CreateInstance(IUnknown * pUnkOuter, REFIID riid, 
LPVOID *ppvObject);
-    virtual HRESULT WINAPI LockServer(BOOL fLock);
-
-BEGIN_COM_MAP(IDefClFImpl)
-    COM_INTERFACE_ENTRY_IID(IID_IClassFactory, IClassFactory)
-END_COM_MAP()
-};
-
-IDefClFImpl::IDefClFImpl()
-{
-    lpfnCI = NULL;
-    riidInst = NULL;
-    pcRefDll = NULL;
-    rclsid = NULL;
-}
-
-HRESULT IDefClFImpl::Initialize(LPFNCREATEINSTANCE lpfnCIx, PLONG pcRefDllx, 
const IID *riidInstx)
-{
-    lpfnCI = lpfnCIx;
-    riidInst = riidInstx;
-    pcRefDll = pcRefDllx;
-
-    if (pcRefDll)
-        InterlockedIncrement(pcRefDll);
-
-    TRACE("(%p)%s\n", this, shdebugstr_guid(riidInst));
-    return S_OK;
-}
-
-/******************************************************************************
- * IDefClF_fnCreateInstance
- */
-HRESULT WINAPI IDefClFImpl::CreateInstance(IUnknown * pUnkOuter, REFIID riid, 
LPVOID *ppvObject)
-{
-    TRACE("%p->(%p,%s,%p)\n", this, pUnkOuter, shdebugstr_guid(&riid), 
ppvObject);
-
-    *ppvObject = NULL;
-
-    if (riidInst == NULL || IsEqualCLSID(riid, *riidInst) || 
IsEqualCLSID(riid, IID_IUnknown))
-    {
-        return lpfnCI(pUnkOuter, riid, ppvObject);
-    }
-
-    ERR("unknown IID requested %s\n", shdebugstr_guid(&riid));
-    return E_NOINTERFACE;
-}
-
-/******************************************************************************
- * IDefClF_fnLockServer
- */
-HRESULT WINAPI IDefClFImpl::LockServer(BOOL fLock)
-{
-    TRACE("%p->(0x%x), not implemented\n", this, fLock);
-    return E_NOTIMPL;
-}
-
-/**************************************************************************
- *  IDefClF_fnConstructor
- */
-
-HRESULT IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, const 
IID *riidInst, IClassFactory **theFactory)
-{
-    return ShellObjectCreatorInit<IDefClFImpl>(lpfnCI, pcRefDll, riidInst, 
IID_IClassFactory, theFactory);
-}
-
-/******************************************************************************
- * SHCreateDefClassObject            [SHELL32.70]
- */
-HRESULT WINAPI SHCreateDefClassObject(
-    REFIID    riid,
-    LPVOID*    ppv,
-    LPFNCREATEINSTANCE lpfnCI,    /* [in] create instance callback entry */
-    LPDWORD    pcRefDll,        /* [in/out] ref count of the dll */
-    REFIID    riidInst)        /* [in] optional interface to the instance */
-{
-    IClassFactory                *pcf;
-    HRESULT                        hResult;
-
-    TRACE("%s %p %p %p %s\n", shdebugstr_guid(&riid), ppv, lpfnCI, pcRefDll, 
shdebugstr_guid(&riidInst));
-
-    if (!IsEqualCLSID(riid, IID_IClassFactory))
-        return E_NOINTERFACE;
-    hResult = IDefClF_fnConstructor(lpfnCI, (PLONG)pcRefDll, &riidInst, &pcf);
-    if (FAILED(hResult))
-        return hResult;
-    *ppv = pcf;
-    return S_OK;
-}
-
 /*************************************************************************
  *  DragAcceptFiles        [SHELL32.@]
  */


Reply via email to