Sync with trunk r63174.

CORE-8176 #resolve #comment Trunk commit r63174 should fix this issue. I merged from trunk to bring it into Shell-experiments.

svn path=/branches/shell-experiments/; revision=63175

diff --cc base/applications/cmdutils/comp/comp.c
Simple merge

diff --cc base/applications/cmdutils/find/find.c
Simple merge

diff --cc base/applications/mplay32/mplay32.c
Simple merge

diff --cc base/applications/mscutils/devmgmt/mainwnd.c
Simple merge

diff --cc base/applications/mscutils/eventvwr/eventvwr.c
Simple merge

diff --cc base/applications/mspaint/registry.c
Simple merge

diff --cc base/applications/mspaint/winproc.c
Simple merge

diff --cc base/applications/network/dwnl/dwnl.c
Simple merge

diff --cc base/applications/network/ftp/cmds.c
Simple merge

diff --cc base/applications/network/ipconfig/ipconfig.c
Simple merge

diff --cc base/applications/network/telnet/src/ansiprsr.cpp
Simple merge

diff --cc base/applications/notepad/dialog.c
Simple merge

diff --cc base/applications/rapps/available.c
Simple merge

diff --cc base/applications/rapps/loaddlg.c
Simple merge

diff --cc base/applications/regedit/regproc.c
Simple merge

diff --cc base/applications/winhlp32/hlpfile.c
Simple merge

diff --cc base/applications/winver/CMakeLists.txt
Simple merge

diff --cc base/applications/winver/winver.c
Simple merge

diff --cc base/applications/winver/winver.rc
index 0000000,bc853f8..bc853f8
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/winver/winver.rc
+++ b/base/applications/winver/winver.rc

diff --cc base/services/umpnpmgr/umpnpmgr.c
Simple merge

diff --cc base/setup/usetup/mui.c
Simple merge

diff --cc base/setup/usetup/partlist.c
Simple merge

diff --cc base/setup/usetup/partlist.h
Simple merge

diff --cc base/shell/cmd/alias.c
Simple merge

diff --cc base/shell/cmd/cmd.c
Simple merge

diff --cc base/shell/explorer/services/startup.c
Simple merge

diff --cc base/system/msiexec/service.c
Simple merge

diff --cc base/system/services/database.c
Simple merge

diff --cc boot/armllb/os/loader.c
Simple merge

diff --cc boot/bootdata/hivedef.inf
Simple merge

diff --cc boot/bootdata/hivesft.inf
Simple merge

diff --cc boot/bootdata/hivesys.inf
Simple merge

diff --cc boot/bootdata/packages/reactos.dff.in
Simple merge

diff --cc boot/freeldr/freeldr/include/mm.h
Simple merge

diff --cc cmake/gcc.cmake
Simple merge

diff --cc configure.sh
Simple merge

diff --cc dll/cpl/appwiz/addons.c
Simple merge

diff --cc dll/ntdll/ldr/ldrapi.c
Simple merge

diff --cc dll/ntdll/ldr/ldrutils.c
Simple merge

diff --cc dll/win32/atl/CMakeLists.txt
Simple merge

diff --cc dll/win32/atl/atl.c
Simple merge

diff --cc dll/win32/atl/atl.spec
Simple merge

diff --cc dll/win32/atl/atl30.c
Simple merge

diff --cc dll/win32/atl/atl_ax.c
Simple merge

diff --cc dll/win32/atl/atl_classes.idl
Simple merge

diff --cc dll/win32/atl/precomp.h
index 0000000,def51b0..def51b0
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/atl/precomp.h
+++ b/dll/win32/atl/precomp.h

diff --cc dll/win32/atl/registrar.c
Simple merge

diff --cc dll/win32/atl100/CMakeLists.txt
Simple merge

diff --cc dll/win32/atl100/atl100.spec
Simple merge

diff --cc dll/win32/atl100/precomp.h
Simple merge

diff --cc dll/win32/atl80/CMakeLists.txt
Simple merge

diff --cc dll/win32/atl80/atl80.c
Simple merge

diff --cc dll/win32/atl80/atl80.manifest
index 0000000,039a3d6..039a3d6
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/atl80/atl80.manifest
+++ b/dll/win32/atl80/atl80.manifest

diff --cc dll/win32/atl80/atl80.rc
index 0000000,b6ea3d4..b6ea3d4
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/atl80/atl80.rc
+++ b/dll/win32/atl80/atl80.rc

diff --cc dll/win32/atl80/atl80.spec
Simple merge

diff --cc dll/win32/atl80/precomp.h
index 0000000,75f1e41..75f1e41
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/atl80/precomp.h
+++ b/dll/win32/atl80/precomp.h

diff --cc dll/win32/beepmidi/beepmidi.c
Simple merge

diff --cc dll/win32/dbghelp/cpu_arm.c
Simple merge

diff --cc dll/win32/dbghelp/cpu_arm64.c
Simple merge

diff --cc dll/win32/dbghelp/cpu_i386.c
Simple merge

diff --cc dll/win32/dbghelp/cpu_ppc.c
Simple merge

diff --cc dll/win32/dbghelp/cpu_x86_64.c
Simple merge

diff --cc dll/win32/dbghelp/dbghelp.c
Simple merge

diff --cc dll/win32/dbghelp/dbghelp_private.h
Simple merge

diff --cc dll/win32/dbghelp/dwarf.c
Simple merge

diff --cc dll/win32/dbghelp/elf_module.c
Simple merge

diff --cc dll/win32/dbghelp/macho_module.c
Simple merge

diff --cc dll/win32/dbghelp/module.c
Simple merge

diff --cc dll/win32/dbghelp/msc.c
Simple merge

diff --cc dll/win32/dbghelp/storage.c
Simple merge

diff --cc dll/win32/dbghelp/symbol.c
Simple merge

diff --cc dll/win32/hnetcfg/hnetcfg.idl
Simple merge

diff --cc dll/win32/hnetcfg/hnetcfg_tlb.idl
Simple merge

diff --cc dll/win32/ieframe/ieframe.h
Simple merge

diff --cc dll/win32/ieframe/ieframe.rgs
Simple merge

diff --cc dll/win32/ieframe/ieframe_v1.idl
Simple merge

diff --cc dll/win32/ieframe/navigate.c
Simple merge

diff --cc dll/win32/ieframe/shellbrowser.c
Simple merge

diff --cc dll/win32/inseng/inseng.idl
Simple merge

diff --cc dll/win32/msafd/msafd.h
Simple merge

diff --cc dll/win32/msgina/gui.c
Simple merge

diff --cc dll/win32/msgina/resources/reactos.bmp
index 2e45185,4198698..4198698
Binary files differ

diff --cc dll/win32/msgina/resources/reactos.svg
Simple merge

diff --cc dll/win32/mshtml/CMakeLists.txt
Simple merge

diff --cc dll/win32/mshtml/binding.h
Simple merge

diff --cc dll/win32/mshtml/htmlanchor.c
Simple merge

diff --cc dll/win32/mshtml/htmlbody.c
Simple merge

diff --cc dll/win32/mshtml/htmldoc.c
Simple merge

diff --cc dll/win32/mshtml/htmlelem.c
Simple merge

diff --cc dll/win32/mshtml/htmlelem2.c
Simple merge

diff --cc dll/win32/mshtml/htmlevent.c
Simple merge

diff --cc dll/win32/mshtml/htmlevent.h
Simple merge

diff --cc dll/win32/mshtml/htmlform.c
Simple merge

diff --cc dll/win32/mshtml/htmlframebase.c
Simple merge

diff --cc dll/win32/mshtml/htmlselect.c
Simple merge

diff --cc dll/win32/mshtml/htmlstyle.c
Simple merge

diff --cc dll/win32/mshtml/htmlstyle.h
Simple merge

diff --cc dll/win32/mshtml/htmlstyle3.c
Simple merge

diff --cc dll/win32/mshtml/htmlstylesheet.c
Simple merge

diff --cc dll/win32/mshtml/htmltable.c
Simple merge

diff --cc dll/win32/mshtml/htmltablerow.c
Simple merge

diff --cc dll/win32/mshtml/htmlwindow.c
Simple merge

diff --cc dll/win32/mshtml/main.c
Simple merge

diff --cc dll/win32/mshtml/mshtml_classes.idl
Simple merge

diff --cc dll/win32/mshtml/mshtml_private.h
Simple merge

diff --cc dll/win32/mshtml/mutation.c
Simple merge

diff --cc dll/win32/mshtml/navigate.c
Simple merge

diff --cc dll/win32/mshtml/npplugin.c
Simple merge

diff --cc dll/win32/mshtml/nsembed.c
Simple merge

diff --cc dll/win32/mshtml/nsiface.idl
Simple merge

diff --cc dll/win32/mshtml/nsio.c
Simple merge

diff --cc dll/win32/mshtml/olecmd.c
Simple merge

diff --cc dll/win32/mshtml/oleobj.c
Simple merge

diff --cc dll/win32/mshtml/persist.c
Simple merge

diff --cc dll/win32/mshtml/pluginhost.c
Simple merge

diff --cc dll/win32/mshtml/script.c
Simple merge

diff --cc dll/win32/msimtf/msimtf.idl
Simple merge

diff --cc dll/win32/msrle32/msrle32.c
Simple merge

diff --cc dll/win32/msrle32/msrle_private.h
Simple merge

diff --cc dll/win32/mstask/mstask_local.idl
Simple merge

diff --cc dll/win32/msxml/msxml_tlb.idl
Simple merge

diff --cc dll/win32/msxml2/msxml2_tlb.idl
Simple merge

diff --cc dll/win32/msxml4/msxml4_tlb.idl
Simple merge

diff --cc dll/win32/msxml6/msxml6_tlb.idl
Simple merge

diff --cc dll/win32/netapi32/nbcmdqueue.h
Simple merge

diff --cc dll/win32/netapi32/nbnamecache.h
Simple merge

diff --cc dll/win32/netapi32/nbt.c
Simple merge

diff --cc dll/win32/netapi32/netapi32.c
Simple merge

diff --cc dll/win32/netapi32/netapi32.h
Simple merge

diff --cc dll/win32/netapi32/netapi32.spec
Simple merge

diff --cc dll/win32/netapi32/netbios.c
Simple merge

diff --cc dll/win32/netapi32/netbios.h
Simple merge

diff --cc dll/win32/netapi32/wksta.c
Simple merge

diff --cc dll/win32/netcfgx/tcpipconf_notify.c
Simple merge

diff --cc dll/win32/objsel/objsel_classes.idl
Simple merge

diff --cc dll/win32/propsys/propstore.c
Simple merge

diff --cc dll/win32/propsys/propsys.spec
Simple merge

diff --cc dll/win32/propsys/propsys_classes.idl
Simple merge

diff --cc dll/win32/propsys/propsys_main.c
Simple merge

diff --cc dll/win32/propsys/propvar.c
Simple merge

diff --cc dll/win32/psapi/psapi.c
Simple merge

diff --cc dll/win32/pstorec/pstorec_tlb.idl
Simple merge

diff --cc dll/win32/qmgr/CMakeLists.txt
Simple merge

diff --cc dll/win32/qmgr/enum_files.c
Simple merge

diff --cc dll/win32/qmgr/enum_jobs.c
Simple merge

diff --cc dll/win32/qmgr/factory.c
Simple merge

diff --cc dll/win32/qmgr/file.c
Simple merge

diff --cc dll/win32/qmgr/job.c
Simple merge

diff --cc dll/win32/qmgr/qmgr.c
Simple merge

diff --cc dll/win32/qmgr/qmgr.h
Simple merge

diff --cc dll/win32/qmgr/qmgr.rgs
index 0000000,675505e..675505e
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/qmgr/qmgr.rgs
+++ b/dll/win32/qmgr/qmgr.rgs

diff --cc dll/win32/qmgr/qmgr_local.idl
Simple merge

diff --cc dll/win32/qmgr/qmgr_main.c
Simple merge

diff --cc dll/win32/qmgr/rsrc.rc
Simple merge

diff --cc dll/win32/qmgrprxy/qmgrprxy.idl
Simple merge

diff --cc dll/win32/qmgrprxy/qmgrprxy.rgs
Simple merge

diff --cc dll/win32/riched20/CMakeLists.txt
Simple merge

diff --cc dll/win32/riched20/caret.c
Simple merge

diff --cc dll/win32/riched20/editor.c
Simple merge

diff --cc dll/win32/riched20/editor.h
Simple merge

diff --cc dll/win32/riched20/editstr.h
Simple merge

diff --cc dll/win32/riched20/list.c
Simple merge

diff --cc dll/win32/riched20/msvc-thiscall.c
Simple merge

diff --cc dll/win32/riched20/msvc.h
Simple merge

diff --cc dll/win32/riched20/paint.c
Simple merge

diff --cc dll/win32/riched20/reader.c
Simple merge

diff --cc dll/win32/riched20/richole.c
Simple merge

diff --cc dll/win32/riched20/row.c
Simple merge

diff --cc dll/win32/riched20/rtf.h
Simple merge

diff --cc dll/win32/riched20/run.c
Simple merge

diff --cc dll/win32/riched20/string.c
Simple merge

diff --cc dll/win32/riched20/style.c
Simple merge

diff --cc dll/win32/riched20/table.c
Simple merge

diff --cc dll/win32/riched20/txtsrv.c
Simple merge

diff --cc dll/win32/riched20/wrap.c
Simple merge

diff --cc dll/win32/riched20/writer.c
Simple merge

diff --cc dll/win32/rpcrt4/epm.idl
Simple merge

diff --cc dll/win32/rpcrt4/ndr_marshall.c
Simple merge

diff --cc dll/win32/rpcrt4/rpc_message.c
Simple merge

diff --cc dll/win32/rpcrt4/rpc_transport.c
Simple merge

diff --cc dll/win32/rpcrt4/rpcrt4_main.c
Simple merge

diff --cc dll/win32/shdocvw/shdocvw_v1.idl
Simple merge

diff --cc dll/win32/shell32/bitmap_res.rc
Simple merge

diff --cc dll/win32/shell32/res/bitmaps/reactos.bmp
index 0000000,4198698..4198698
mode 000000,100644..100644
Binary files differ

diff --cc dll/win32/shell32/shell32_main.cpp
index 047f918,0000000..bcdd151
mode 100644,000000..100644
--- 1/dll/win32/shell32/shell32_main.cpp
--- /dev/null
+++ b/dll/win32/shell32/shell32_main.cpp
@@@ -1,1563 -1,0 +1,1563 @@@
-                 hLogoBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_SHELL_ABOUT_LOGO_24BPP), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
 +/*
 + *                 Shell basics
 + *
 + * Copyright 1998 Marcus Meissner
 + * Copyright 1998 Juergen Schmied (jsch)  *  <juergen.schmied@metronet.de>
 + *
 + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 + */
 +
 +#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, sizeof(temppsfi), 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)
 + */
 +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");
 +    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 */
 +}

diff --cc dll/win32/shell32/shresdef.h
Simple merge

diff --cc dll/win32/stdole2.tlb/std_ole_v2.idl
Simple merge

diff --cc dll/win32/stdole32.tlb/std_ole_v1.idl
Simple merge

diff --cc dll/win32/sti/sti.rc
Simple merge

diff --cc dll/win32/sti/sti_wia.idl
Simple merge

diff --cc dll/win32/sti/sti_wia.rgs
Simple merge

diff --cc dll/win32/usp10/opentype.c
Simple merge

diff --cc dll/win32/usp10/usp10.c
Simple merge

diff --cc dll/win32/uxtheme/ncscrollbar.c
Simple merge

diff --cc dll/win32/version/version.c
Simple merge

diff --cc dll/win32/wbemprox/builtin.c
Simple merge

diff --cc dll/win32/wbemprox/class.c
Simple merge

diff --cc dll/win32/wbemprox/main.c
Simple merge

diff --cc dll/win32/wbemprox/qualifier.c
Simple merge

diff --cc dll/win32/wbemprox/query.c
Simple merge

diff --cc dll/win32/wbemprox/services.c
Simple merge

diff --cc dll/win32/wbemprox/wbemlocator.c
Simple merge

diff --cc dll/win32/wbemprox/wbemprox.idl
Simple merge

diff --cc dll/win32/wbemprox/wbemprox_private.h
Simple merge

diff --cc dll/win32/wbemprox/wql.tab.c
Simple merge

diff --cc dll/win32/wbemprox/wql.y
Simple merge

diff --cc dll/win32/winhttp/cookie.c
Simple merge

diff --cc dll/win32/winhttp/main.c
Simple merge

diff --cc dll/win32/winhttp/net.c
Simple merge

diff --cc dll/win32/winhttp/request.c
Simple merge

diff --cc dll/win32/winhttp/session.c
Simple merge

diff --cc dll/win32/winhttp/winhttp_private.h
Simple merge

diff --cc dll/win32/winhttp/winhttp_tlb.idl
Simple merge

diff --cc dll/win32/wininet/dialogs.c
Simple merge

diff --cc dll/win32/wininet/ftp.c
Simple merge

diff --cc dll/win32/wininet/http.c
Simple merge

diff --cc dll/win32/wininet/internet.c
Simple merge

diff --cc dll/win32/wininet/internet.h
Simple merge

diff --cc dll/win32/wininet/netconnection.c
Simple merge

diff --cc dll/win32/wininet/utility.c
Simple merge

diff --cc dll/win32/ws2help/context.c
Simple merge

diff --cc dll/win32/wtsapi32/wtsapi32.c
Simple merge

diff --cc dll/win32/wuapi/downloader.c
Simple merge

diff --cc dll/win32/wuapi/installer.c
Simple merge

diff --cc dll/win32/wuapi/main.c
Simple merge

diff --cc dll/win32/wuapi/searcher.c
Simple merge

diff --cc dll/win32/wuapi/session.c
Simple merge

diff --cc dll/win32/wuapi/systeminfo.c
Simple merge

diff --cc dll/win32/wuapi/updates.c
Simple merge

diff --cc dll/win32/wuapi/wuapi_private.h
Simple merge

diff --cc dll/win32/wuapi/wuapi_tlb.idl
Simple merge

diff --cc drivers/base/bootvid/i386/vga.c
Simple merge

diff --cc drivers/base/nmidebug/nmidebug.c
Simple merge

diff --cc drivers/filesystems/fastfat/create.c
Simple merge

diff --cc drivers/filesystems/fs_rec/fs_rec.c
Simple merge

diff --cc drivers/filesystems/npfs/npfs.h
Simple merge

diff --cc drivers/input/i8042prt/i8042prt.c
Simple merge

diff --cc drivers/input/i8042prt/i8042prt.h
Simple merge

diff --cc drivers/input/i8042prt/keyboard.c
Simple merge

diff --cc drivers/input/i8042prt/misc.c
Simple merge

diff --cc drivers/input/i8042prt/mouse.c
Simple merge

diff --cc drivers/input/i8042prt/pnp.c
Simple merge

diff --cc hal/halx86/apic/apic.c
Simple merge

diff --cc hal/halx86/apic/apic.h
Simple merge

diff --cc hal/halx86/apic/rtctimer.c
Simple merge

diff --cc hal/halx86/up/pic.c
Simple merge

diff --cc include/crt/errno.h
Simple merge

diff --cc include/psdk/CMakeLists.txt
Simple merge

diff --cc include/psdk/bits.idl
Simple merge

diff --cc include/psdk/bits3_0.idl
index 0000000,6cf48b7..6cf48b7
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/include/psdk/bits3_0.idl
+++ b/include/psdk/bits3_0.idl

diff --cc include/psdk/driverspecs.h
Simple merge

diff --cc include/psdk/ks.h
Simple merge

diff --cc include/psdk/mshtmdid.h
Simple merge

diff --cc include/psdk/mshtml.idl
Simple merge

diff --cc include/psdk/winnt.h
Simple merge

diff --cc include/reactos/kdros.h
Simple merge

diff --cc include/reactos/libs/pseh/pseh2.h
Simple merge

diff --cc include/reactos/libs/pseh/pseh3.h
Simple merge

diff --cc lib/3rdparty/adns/adns_win32/adns_win32.h
Simple merge

diff --cc lib/3rdparty/cardlib/cardbutton.cpp
Simple merge

diff --cc lib/pseh/dummy.c
Simple merge

diff --cc lib/rtl/actctx.c
Simple merge

diff --cc lib/rtl/heap.c
Simple merge

diff --cc lib/rtl/image.c
Simple merge

diff --cc lib/rtl/rtlavl.h
Simple merge

diff --cc lib/sdk/crt/include/internal/tls.h
Simple merge

diff --cc lib/sdk/crt/signal/xcptinfo.c
Simple merge

diff --cc lib/sdk/crt/stdio/file.c
Simple merge

diff --cc media/doc/README.WINE
Simple merge

diff --cc ntoskrnl/fstub/fstubex.c
Simple merge

diff --cc ntoskrnl/include/internal/i386/trap_x.h
Simple merge

diff --cc ntoskrnl/io/iomgr/iofunc.c
Simple merge

diff --cc ntoskrnl/io/iomgr/irp.c
Simple merge

diff --cc win32ss/drivers/font/bmfd/glyph.c
Simple merge

diff --cc win32ss/gdi/eng/engbrush.c
Simple merge

diff --cc win32ss/gdi/eng/engmisc.c
Simple merge

diff --cc win32ss/gdi/eng/gradient.c
Simple merge

diff --cc win32ss/gdi/eng/pdevobj.c
Simple merge

diff --cc win32ss/gdi/eng/perfcnt.c
Simple merge

diff --cc win32ss/gdi/eng/semaphor.c
Simple merge

diff --cc win32ss/gdi/eng/sort.c
Simple merge

diff --cc win32ss/gdi/eng/string.c
Simple merge

diff --cc win32ss/gdi/eng/stubs.c
Simple merge

diff --cc win32ss/gdi/eng/surface.h
Simple merge

diff --cc win32ss/gdi/eng/transblt.c
Simple merge

diff --cc win32ss/gdi/eng/xlateobj.h
Simple merge

diff --cc win32ss/gdi/gdi32/gdi32.spec
Simple merge

diff --cc win32ss/gdi/ntgdi/brush.h
Simple merge

diff --cc win32ss/gdi/ntgdi/coord.h
Simple merge

diff --cc win32ss/gdi/ntgdi/dc.h
Simple merge

diff --cc win32ss/gdi/ntgdi/dcutil.c
Simple merge

diff --cc win32ss/gdi/ntgdi/freetype.c
Simple merge

diff --cc win32ss/gdi/ntgdi/palette.h
Simple merge

diff --cc win32ss/gdi/ntgdi/path.c
Simple merge

diff --cc win32ss/gdi/ntgdi/rect.h
Simple merge

diff --cc win32ss/gdi/ntgdi/text.h
Simple merge

diff --cc win32ss/include/ntuser.h
Simple merge

diff --cc win32ss/user/ntuser/accelerator.c
Simple merge

diff --cc win32ss/user/ntuser/clipboard.c
Simple merge

diff --cc win32ss/user/ntuser/menu.c
Simple merge

diff --cc win32ss/user/ntuser/menu.h
Simple merge

diff --cc win32ss/user/ntuser/ntstubs.c
Simple merge

diff --cc win32ss/user/ntuser/object.c
Simple merge

diff --cc win32ss/user/ntuser/simplecall.c
Simple merge

diff --cc win32ss/user/ntuser/userfuncs.h
Simple merge

diff --cc win32ss/user/ntuser/window.c
Simple merge

diff --cc win32ss/user/user32/CMakeLists.txt
Simple merge

diff --cc win32ss/user/user32/controls/listbox.c
Simple merge

diff --cc win32ss/user/user32/misc/stubs.c
Simple merge

diff --cc win32ss/user/user32/user32.spec
Simple merge

diff --cc win32ss/user/user32/windows/clipboard.c
Simple merge

diff --cc win32ss/user/user32/windows/menu.c
Simple merge

diff --cc win32ss/user/user32/windows/window.c
Simple merge

diff --cc win32ss/user/winsrv/consrv/condrv/coninput.c
Simple merge

diff --cc win32ss/user/winsrv/consrv/condrv/text.c
Simple merge

diff --cc win32ss/user/winsrv/consrv/settings.c
Simple merge

diff --cc win32ss/user/winsrv/consrv_new/settings.c
Simple merge

diff --cc win32ss/w32ksvc.db
Simple merge

diff --cc win32ss/w32ksvc.h
Simple merge