Ros-diffs November 2014

ros-diffs@reactos.org

18 participants
373 discussions

[akhaldi] 65215: [SHELL] * __inline before return type.
by akhaldi＠svn.reactos.org 03 Nov '14

03 Nov '14

Author: akhaldi Date: Mon Nov 3 12:10:23 2014 New Revision: 65215 URL: http://svn.reactos.org/svn/reactos?rev=65215&view=rev Log: [SHELL] * __inline before return type. Modified: branches/shell-experiments/dll/win32/shell32/shfldr.h Modified: branches/shell-experiments/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shfldr.h [iso-8859-1] Mon Nov 3 12:10:23 2014 @@ -52,7 +52,7 @@ HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path); -static int __inline SHELL32_GUIDToStringA (REFGUID guid, LPSTR str) +static __inline int SHELL32_GUIDToStringA (REFGUID guid, LPSTR str) { return sprintf(str, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", guid.Data1, guid.Data2, guid.Data3, @@ -60,7 +60,7 @@ guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]); } -static int __inline SHELL32_GUIDToStringW (REFGUID guid, LPWSTR str) +static __inline int SHELL32_GUIDToStringW (REFGUID guid, LPWSTR str) { static const WCHAR fmtW[] = { '{','%','0','8','l','x','-','%','0','4','x','-','%','0','4','x','-',

1 0

[gadamopoulos] 65214: [EXPLORER_NEW] - Fix build
by gadamopoulos＠svn.reactos.org 03 Nov '14

03 Nov '14

Author: gadamopoulos Date: Mon Nov 3 11:33:23 2014 New Revision: 65214 URL: http://svn.reactos.org/svn/reactos?rev=65214&view=rev Log: [EXPLORER_NEW] - Fix build Modified: branches/shell-experiments/base/shell/explorer-new/trayntfy.cpp Modified: branches/shell-experiments/base/shell/explorer-new/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/trayntfy.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/trayntfy.cpp [iso-8859-1] Mon Nov 3 11:33:23 2014 @@ -120,7 +120,7 @@ class CNotifyToolbar : public CToolbar<NOTIFYICONDATA> { - const int ICON_SIZE = 16; + static const int ICON_SIZE = 16; HIMAGELIST SysIcons; int VisibleButtonCount;

1 0

[akhaldi] 65213: [SHELL32] * Allow shdebugstr_guid() to be used from C code too. * Move shellole.cpp to the wine folder. * Rename shellole.cpp to shellole.c. * Sync shellole.c with Wine 1.7.27. COR...
by akhaldi＠svn.reactos.org 03 Nov '14

03 Nov '14

Author: akhaldi Date: Mon Nov 3 10:52:20 2014 New Revision: 65213 URL: http://svn.reactos.org/svn/reactos?rev=65213&view=rev Log: [SHELL32] * Allow shdebugstr_guid() to be used from C code too. * Move shellole.cpp to the wine folder. * Rename shellole.cpp to shellole.c. * Sync shellole.c with Wine 1.7.27. CORE-8540 Added: branches/shell-experiments/dll/win32/shell32/wine/shellole.c - copied, changed from r65212, branches/shell-experiments/dll/win32/shell32/shellole.cpp Removed: branches/shell-experiments/dll/win32/shell32/shellole.cpp Modified: branches/shell-experiments/dll/win32/shell32/CMakeLists.txt branches/shell-experiments/dll/win32/shell32/debughlp.h Modified: branches/shell-experiments/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- 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:52:20 2014 @@ -45,7 +45,6 @@ shell32_main.cpp shellitem.cpp shelllink.cpp - shellole.cpp shellord.cpp shellpath.cpp shellreg.cpp @@ -77,6 +76,7 @@ add_library(shell32 SHARED ${SOURCE} + wine/shellole.c wine/shellstring.c vista.c shell32.rc Modified: branches/shell-experiments/dll/win32/shell32/debughlp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/debughlp.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/debughlp.h [iso-8859-1] Mon Nov 3 10:52:20 2014 @@ -23,6 +23,9 @@ extern void pdump (LPCITEMIDLIST pidl); extern BOOL pcheck (LPCITEMIDLIST pidl); -extern const char * shdebugstr_guid( const struct _GUID *id ); +#ifdef __cplusplus +extern "C" +#endif +const char * shdebugstr_guid( const struct _GUID *id ); #endif /* __WINE_SHELL32_DEBUGHLP_H */ Removed: branches/shell-experiments/dll/win32/shell32/shellole.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shellole.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shellole.cpp (removed) @@ -1,568 +0,0 @@ -/* - * handling of SHELL32.DLL OLE-Objects - * - * Copyright 1997 Marcus Meissner - * Copyright 1998 Juergen Schmied <juergen.schmied(a)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" - -WINE_DEFAULT_DEBUG_CHANNEL(shell); - -static const WCHAR sShell32[12] = {'S','H','E','L','L','3','2','.','D','L','L','\0'}; - -/* FIXME: this should be SHLWAPI.24 since we can't yet import by ordinal */ - -DWORD WINAPI __SHGUIDToStringW (REFGUID guid, LPWSTR str) -{ - WCHAR sFormat[52] = {'{','%','0','8','l','x','-','%','0','4', - 'x','-','%','0','4','x','-','%','0','2', - 'x','%','0','2','x','-','%','0','2','x', - '%','0','2','x','%','0','2','x','%','0', - '2','x','%','0','2','x','%','0','2','x', - '}','\0'}; - - return swprintf ( str, sFormat, - guid.Data1, guid.Data2, guid.Data3, - guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], - guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7] ); - -} - -/************************************************************************* - * SHCoCreateInstance [SHELL32.102] - * - * Equivalent to CoCreateInstance. Under Windows 9x this function could sometimes - * use the shell32 built-in "mini-COM" without the need to load ole32.dll - see - * SHLoadOLE for details. - * - * Under wine if a "LoadWithoutCOM" value is present or the object resides in - * shell32.dll the function will load the object manually without the help of ole32 - * - * NOTES - * exported by ordinal - * - * SEE ALSO - * CoCreateInstace, SHLoadOLE - */ -HRESULT WINAPI SHCoCreateInstance( - LPCWSTR aclsid, - const CLSID *clsid, - IUnknown * pUnkOuter, - REFIID refiid, - LPVOID *ppv) -{ - DWORD hres; - CLSID iid; - const CLSID * myclsid = clsid; - WCHAR sKeyName[MAX_PATH]; - const WCHAR sCLSID[7] = {'C','L','S','I','D','\\','\0'}; - WCHAR sClassID[60]; - const WCHAR sInProcServer32[16] ={'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2','\0'}; - const WCHAR sLoadWithoutCOM[15] ={'L','o','a','d','W','i','t','h','o','u','t','C','O','M','\0'}; - WCHAR sDllPath[MAX_PATH]; - HKEY hKey; - DWORD dwSize; - BOOLEAN bLoadFromShell32 = FALSE; - BOOLEAN bLoadWithoutCOM = FALSE; - CComPtr<IClassFactory> pcf; - - if(!ppv) return E_POINTER; - *ppv=NULL; - - /* if the clsid is a string, convert it */ - if (!clsid) - { - if (!aclsid) return REGDB_E_CLASSNOTREG; - CLSIDFromString((LPOLESTR)aclsid, &iid); - myclsid = &iid; - } - - TRACE("(%p,%s,unk:%p,%s,%p)\n", - aclsid, shdebugstr_guid(myclsid), pUnkOuter, shdebugstr_guid(&refiid), ppv); - - /* we look up the dll path in the registry */ - __SHGUIDToStringW(*myclsid, sClassID); - wcscpy(sKeyName, sCLSID); - wcscat(sKeyName, sClassID); - wcscat(sKeyName, sInProcServer32); - - if (ERROR_SUCCESS == RegOpenKeyExW(HKEY_CLASSES_ROOT, sKeyName, 0, KEY_READ, &hKey)) { - dwSize = sizeof(sDllPath); - SHQueryValueExW(hKey, NULL, 0,0, sDllPath, &dwSize ); - - /* if a special registry key is set, we load a shell extension without help of OLE32 */ - bLoadWithoutCOM = (ERROR_SUCCESS == SHQueryValueExW(hKey, sLoadWithoutCOM, 0, 0, 0, 0)); - - /* if the com object is inside shell32, omit use of ole32 */ - bLoadFromShell32 = (0==lstrcmpiW( PathFindFileNameW(sDllPath), sShell32)); - - RegCloseKey (hKey); - } else { - /* since we can't find it in the registry we try internally */ - bLoadFromShell32 = TRUE; - } - - TRACE("WithoutCom=%u FromShell=%u\n", bLoadWithoutCOM, bLoadFromShell32); - - /* now we create an instance */ - if (bLoadFromShell32) { - if (! SUCCEEDED(DllGetClassObject(*myclsid, IID_PPV_ARG(IClassFactory, &pcf)))) { - ERR("LoadFromShell failed for CLSID=%s\n", shdebugstr_guid(myclsid)); - } - } else if (bLoadWithoutCOM) { - - /* load an external dll without ole32 */ - HINSTANCE hLibrary; - typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, LPVOID *ppv); - DllGetClassObjectFunc DllGetClassObject; - - if ((hLibrary = LoadLibraryExW(sDllPath, 0, LOAD_WITH_ALTERED_SEARCH_PATH)) == 0) { - ERR("couldn't load InprocServer32 dll %s\n", debugstr_w(sDllPath)); - hres = E_ACCESSDENIED; - goto end; - } else if (!(DllGetClassObject = (DllGetClassObjectFunc)GetProcAddress(hLibrary, "DllGetClassObject"))) { - ERR("couldn't find function DllGetClassObject in %s\n", debugstr_w(sDllPath)); - FreeLibrary( hLibrary ); - hres = E_ACCESSDENIED; - goto end; - } else if (! SUCCEEDED(hres = DllGetClassObject(*myclsid, IID_PPV_ARG(IClassFactory, &pcf)))) { - TRACE("GetClassObject failed 0x%08x\n", hres); - goto end; - } - - } else { - - /* load an external dll in the usual way */ - hres = CoCreateInstance(*myclsid, pUnkOuter, CLSCTX_INPROC_SERVER, refiid, ppv); - goto end; - } - - /* here we should have a ClassFactory */ - if (!pcf) return E_ACCESSDENIED; - - hres = pcf->CreateInstance(pUnkOuter, refiid, ppv); -end: - if(hres!=S_OK) - { - ERR("failed (0x%08x) to create CLSID:%s IID:%s\n", - hres, shdebugstr_guid(myclsid), shdebugstr_guid(&refiid)); - ERR("class not found in registry\n"); - } - - TRACE("-- instance: %p\n",*ppv); - return hres; -} - -/************************************************************************* - * SHCLSIDFromString [SHELL32.147] - * - * Under Windows 9x this was an ANSI version of CLSIDFromString. It also allowed - * to avoid dependency on ole32.dll (see SHLoadOLE for details). - * - * Under Windows NT/2000/XP this is equivalent to CLSIDFromString - * - * NOTES - * exported by ordinal - * - * SEE ALSO - * CLSIDFromString, SHLoadOLE - */ -DWORD WINAPI SHCLSIDFromStringA (LPCSTR clsid, CLSID *id) -{ - WCHAR buffer[40]; - TRACE("(%p(%s) %p)\n", clsid, clsid, id); - if (!MultiByteToWideChar( CP_ACP, 0, clsid, -1, buffer, sizeof(buffer)/sizeof(WCHAR) )) - return CO_E_CLASSSTRING; - return CLSIDFromString( buffer, id ); -} - -DWORD WINAPI SHCLSIDFromStringW (LPCWSTR clsid, CLSID *id) -{ - TRACE("(%p(%s) %p)\n", clsid, debugstr_w(clsid), id); - return CLSIDFromString((LPWSTR)clsid, id); -} - -EXTERN_C DWORD WINAPI SHCLSIDFromStringAW (LPCVOID clsid, CLSID *id) -{ - if (SHELL_OsIsUnicode()) - return SHCLSIDFromStringW ((LPCWSTR)clsid, id); - return SHCLSIDFromStringA ((LPCSTR)clsid, id); -} - -/************************************************************************* - * SHGetMalloc [SHELL32.@] - * - * Equivalent to CoGetMalloc(MEMCTX_TASK, ...). Under Windows 9x this function - * could use the shell32 built-in "mini-COM" without the need to load ole32.dll - - * see SHLoadOLE for details. - * - * PARAMS - * lpmal [O] Destination for IMalloc interface. - * - * RETURNS - * Success: S_OK. lpmal contains the shells IMalloc interface. - * Failure. An HRESULT error code. - * - * SEE ALSO - * CoGetMalloc, SHLoadOLE - */ -HRESULT WINAPI SHGetMalloc(LPMALLOC *lpmal) -{ - TRACE("(%p)\n", lpmal); - return CoGetMalloc(MEMCTX_TASK, lpmal); -} - -/************************************************************************* - * SHAlloc [SHELL32.196] - * - * Equivalent to CoTaskMemAlloc. Under Windows 9x this function could use - * the shell32 built-in "mini-COM" without the need to load ole32.dll - - * see SHLoadOLE for details. - * - * NOTES - * exported by ordinal - * - * SEE ALSO - * CoTaskMemAlloc, SHLoadOLE - */ -LPVOID WINAPI SHAlloc(SIZE_T len) -{ - LPVOID ret; - - ret = CoTaskMemAlloc(len); - TRACE("%u bytes at %p\n",len, ret); - return ret; -} - -/************************************************************************* - * SHFree [SHELL32.195] - * - * Equivalent to CoTaskMemFree. Under Windows 9x this function could use - * the shell32 built-in "mini-COM" without the need to load ole32.dll - - * see SHLoadOLE for details. - * - * NOTES - * exported by ordinal - * - * SEE ALSO - * CoTaskMemFree, SHLoadOLE - */ -void WINAPI SHFree(LPVOID pv) -{ - TRACE("%p\n",pv); - CoTaskMemFree(pv); -} - -/************************************************************************* - * DragAcceptFiles [SHELL32.@] - */ -void WINAPI DragAcceptFiles(HWND hWnd, BOOL b) -{ - LONG exstyle; - - if( !IsWindow(hWnd) ) return; - exstyle = GetWindowLongPtrA(hWnd,GWL_EXSTYLE); - if (b) - exstyle |= WS_EX_ACCEPTFILES; - else - exstyle &= ~WS_EX_ACCEPTFILES; - SetWindowLongPtrA(hWnd,GWL_EXSTYLE,exstyle); -} - -/************************************************************************* - * DragFinish [SHELL32.@] - */ -void WINAPI DragFinish(HDROP h) -{ - TRACE("\n"); - GlobalFree((HGLOBAL)h); -} - -/************************************************************************* - * DragQueryPoint [SHELL32.@] - */ -BOOL WINAPI DragQueryPoint(HDROP hDrop, POINT *p) -{ - DROPFILES *lpDropFileStruct; - BOOL bRet; - - TRACE("\n"); - - lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop); - - *p = lpDropFileStruct->pt; - bRet = lpDropFileStruct->fNC; - - GlobalUnlock(hDrop); - return bRet; -} - -/************************************************************************* - * DragQueryFileA [SHELL32.@] - * DragQueryFile [SHELL32.@] - */ -UINT WINAPI DragQueryFileA( - HDROP hDrop, - UINT lFile, - LPSTR lpszFile, - UINT lLength) -{ - LPSTR lpDrop; - UINT i = 0; - DROPFILES *lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop); - - TRACE("(%p, %x, %p, %u)\n", hDrop,lFile,lpszFile,lLength); - - if(!lpDropFileStruct) goto end; - - lpDrop = (LPSTR) lpDropFileStruct + lpDropFileStruct->pFiles; - - if(lpDropFileStruct->fWide) { - LPWSTR lpszFileW = NULL; - - if(lpszFile) { - lpszFileW = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, lLength*sizeof(WCHAR)); - if(lpszFileW == NULL) { - goto end; - } - } - i = DragQueryFileW(hDrop, lFile, lpszFileW, lLength); - - if(lpszFileW) { - WideCharToMultiByte(CP_ACP, 0, lpszFileW, -1, lpszFile, lLength, 0, NULL); - HeapFree(GetProcessHeap(), 0, lpszFileW); - } - goto end; - } - - while (i++ < lFile) - { - while (*lpDrop++); /* skip filename */ - if (!*lpDrop) - { - i = (lFile == 0xFFFFFFFF) ? i : 0; - goto end; - } - } - - i = strlen(lpDrop); - if (!lpszFile ) goto end; /* needed buffer size */ - lstrcpynA (lpszFile, lpDrop, lLength); -end: - GlobalUnlock(hDrop); - return i; -} - -/************************************************************************* - * DragQueryFileW [SHELL32.@] - */ -UINT WINAPI DragQueryFileW( - HDROP hDrop, - UINT lFile, - LPWSTR lpszwFile, - UINT lLength) -{ - LPWSTR lpwDrop; - UINT i = 0; - DROPFILES *lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop); - - TRACE("(%p, %x, %p, %u)\n", hDrop,lFile,lpszwFile,lLength); - - if(!lpDropFileStruct) goto end; - - lpwDrop = (LPWSTR) ((LPSTR)lpDropFileStruct + lpDropFileStruct->pFiles); - - if(lpDropFileStruct->fWide == FALSE) { - LPSTR lpszFileA = NULL; - - if(lpszwFile) { - lpszFileA = (LPSTR)HeapAlloc(GetProcessHeap(), 0, lLength); - if(lpszFileA == NULL) { - goto end; - } - } - i = DragQueryFileA(hDrop, lFile, lpszFileA, lLength); - - if(lpszFileA) { - MultiByteToWideChar(CP_ACP, 0, lpszFileA, -1, lpszwFile, lLength); - HeapFree(GetProcessHeap(), 0, lpszFileA); - } - goto end; - } - - i = 0; - while (i++ < lFile) - { - while (*lpwDrop++); /* skip filename */ - if (!*lpwDrop) - { - i = (lFile == 0xFFFFFFFF) ? i : 0; - goto end; - } - } - - i = wcslen(lpwDrop); - if ( !lpszwFile) goto end; /* needed buffer size */ - lstrcpynW (lpszwFile, lpwDrop, lLength); -end: - GlobalUnlock(hDrop); - return i; -} - -/************************************************************************* - * SHPropStgCreate [SHELL32.685] - */ -EXTERN_C HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmtid, - const CLSID *pclsid, DWORD grfFlags, DWORD grfMode, - DWORD dwDisposition, IPropertyStorage **ppstg, UINT *puCodePage) -{ - PROPSPEC prop; - PROPVARIANT ret; - HRESULT hres; - - TRACE("%p %s %s %x %x %x %p %p\n", psstg, debugstr_guid(&fmtid), debugstr_guid(pclsid), - grfFlags, grfMode, dwDisposition, ppstg, puCodePage); - - hres = psstg->Open(fmtid, grfMode, ppstg); - - switch (dwDisposition) - { - case CREATE_ALWAYS: - if (SUCCEEDED(hres)) - { - (*ppstg)->Release(); - hres = psstg->Delete(fmtid); - if(FAILED(hres)) - return hres; - hres = E_FAIL; - } - - case OPEN_ALWAYS: - case CREATE_NEW: - if (FAILED(hres)) - hres = psstg->Create(fmtid, pclsid, grfFlags, grfMode, ppstg); - - case OPEN_EXISTING: - if (FAILED(hres)) - return hres; - - if (puCodePage) - { - prop.ulKind = PRSPEC_PROPID; - prop.propid = PID_CODEPAGE; - hres = (*ppstg)->ReadMultiple(1, &prop, &ret); - if (FAILED(hres) || ret.vt!=VT_I2) - *puCodePage = 0; - else - *puCodePage = ret.iVal; - } - } - - return S_OK; -} - -/************************************************************************* - * SHPropStgReadMultiple [SHELL32.688] - */ -EXTERN_C HRESULT WINAPI SHPropStgReadMultiple(IPropertyStorage *pps, UINT uCodePage, - ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar) -{ - STATPROPSETSTG stat; - HRESULT hres; - - FIXME("%p %u %u %p %p\n", pps, uCodePage, cpspec, rgpspec, rgvar); - - memset(rgvar, 0, cpspec*sizeof(PROPVARIANT)); - hres = pps->ReadMultiple(cpspec, rgpspec, rgvar); - if (FAILED(hres)) - return hres; - - if (!uCodePage) - { - PROPSPEC prop; - PROPVARIANT ret; - - prop.ulKind = PRSPEC_PROPID; - prop.propid = PID_CODEPAGE; - hres = pps->ReadMultiple(1, &prop, &ret); - if(FAILED(hres) || ret.vt!=VT_I2) - return S_OK; - - uCodePage = ret.iVal; - } - - hres = pps->Stat(&stat); - if (FAILED(hres)) - return S_OK; - - /* TODO: do something with codepage and stat */ - return S_OK; -} - -/************************************************************************* - * SHPropStgWriteMultiple [SHELL32.689] - */ -EXTERN_C HRESULT WINAPI SHPropStgWriteMultiple(IPropertyStorage *pps, UINT *uCodePage, - ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar, PROPID propidNameFirst) -{ - STATPROPSETSTG stat; - UINT codepage; - HRESULT hres; - - FIXME("%p %p %u %p %p %d\n", pps, uCodePage, cpspec, rgpspec, rgvar, propidNameFirst); - - hres = pps->Stat(&stat); - if (FAILED(hres)) - return hres; - - if (uCodePage && *uCodePage) - codepage = *uCodePage; - else - { - PROPSPEC prop; - PROPVARIANT ret; - - prop.ulKind = PRSPEC_PROPID; - prop.propid = PID_CODEPAGE; - hres = pps->ReadMultiple(1, &prop, &ret); - if (FAILED(hres)) - return hres; - if (ret.vt!=VT_I2 || !ret.iVal) - return E_FAIL; - - codepage = ret.iVal; - if (uCodePage) - *uCodePage = codepage; - } - - /* TODO: do something with codepage and stat */ - - hres = pps->WriteMultiple(cpspec, rgpspec, rgvar, propidNameFirst); - return hres; -} - -/************************************************************************* - * SHCreateQueryCancelAutoPlayMoniker [SHELL32.@] - */ -HRESULT WINAPI SHCreateQueryCancelAutoPlayMoniker(IMoniker **moniker) -{ - TRACE("%p\n", moniker); - - if (!moniker) return E_INVALIDARG; - return CreateClassMoniker(CLSID_QueryCancelAutoPlay, moniker); -} Copied: branches/shell-experiments/dll/win32/shell32/wine/shellole.c (from r65212, branches/shell-experiments/dll/win32/shell32/shellole.cpp) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shellole.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/wine/shellole.c [iso-8859-1] Mon Nov 3 10:52:20 2014 @@ -1,8 +1,8 @@ /* - * handling of SHELL32.DLL OLE-Objects - * - * Copyright 1997 Marcus Meissner - * Copyright 1998 Juergen Schmied <juergen.schmied(a)metronet.de> + * handling of SHELL32.DLL OLE-Objects + * + * Copyright 1997 Marcus Meissner + * Copyright 1998 Juergen Schmied <juergen.schmied(a)metronet.de> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,29 +19,71 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <wine/config.h> + +#include <stdarg.h> +#include <stdlib.h> +#include <string.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COBJMACROS +#define NONAMELESSUNION + +#include <windef.h> +#include <winbase.h> +#include <shellapi.h> +#include <shlobj.h> +#include <shlwapi.h> +#include <debughlp.h> +#include <shell32_main.h> + +#include <wine/debug.h> +#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); -static const WCHAR sShell32[12] = {'S','H','E','L','L','3','2','.','D','L','L','\0'}; - -/* FIXME: this should be SHLWAPI.24 since we can't yet import by ordinal */ - -DWORD WINAPI __SHGUIDToStringW (REFGUID guid, LPWSTR str) -{ - WCHAR sFormat[52] = {'{','%','0','8','l','x','-','%','0','4', - 'x','-','%','0','4','x','-','%','0','2', - 'x','%','0','2','x','-','%','0','2','x', - '%','0','2','x','%','0','2','x','%','0', - '2','x','%','0','2','x','%','0','2','x', - '}','\0'}; - - return swprintf ( str, sFormat, - guid.Data1, guid.Data2, guid.Data3, - guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], - guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7] ); - -} +extern INT WINAPI SHStringFromGUIDW(REFGUID guid, LPWSTR lpszDest, INT cchMax); /* shlwapi.24 */ + +/************************************************************************** + * Default ClassFactory types + */ +typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject); + +#ifndef __REACTOS__ + +static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, REFIID riidInst); + +/* this table contains all CLSIDs of shell32 objects */ +static const struct { + REFIID riid; + LPFNCREATEINSTANCE lpfnCI; +} InterfaceTable[] = { + + {&CLSID_ApplicationAssociationRegistration, ApplicationAssociationRegistration_Constructor}, + {&CLSID_AutoComplete, IAutoComplete_Constructor}, + {&CLSID_ControlPanel, IControlPanel_Constructor}, + {&CLSID_DragDropHelper, IDropTargetHelper_Constructor}, + {&CLSID_FolderShortcut, FolderShortcut_Constructor}, + {&CLSID_MyComputer, ISF_MyComputer_Constructor}, + {&CLSID_MyDocuments, MyDocuments_Constructor}, + {&CLSID_NetworkPlaces, ISF_NetworkPlaces_Constructor}, + {&CLSID_Printers, Printers_Constructor}, + {&CLSID_QueryAssociations, QueryAssociations_Constructor}, + {&CLSID_RecycleBin, RecycleBin_Constructor}, + {&CLSID_ShellDesktop, ISF_Desktop_Constructor}, + {&CLSID_ShellFSFolder, IFSFolder_Constructor}, + {&CLSID_ShellItem, IShellItem_Constructor}, + {&CLSID_ShellLink, IShellLink_Constructor}, + {&CLSID_UnixDosFolder, UnixDosFolder_Constructor}, + {&CLSID_UnixFolder, UnixFolder_Constructor}, + {&CLSID_ExplorerBrowser,ExplorerBrowser_Constructor}, + {&CLSID_KnownFolderManager, KnownFolderManager_Constructor}, + {&CLSID_Shell, IShellDispatch_Constructor}, + {NULL, NULL} +}; + +#endif /* !__REACTOS__ */ /************************************************************************* * SHCoCreateInstance [SHELL32.102] @@ -57,119 +99,143 @@ * exported by ordinal * * SEE ALSO - * CoCreateInstace, SHLoadOLE + * CoCreateInstance, SHLoadOLE */ HRESULT WINAPI SHCoCreateInstance( - LPCWSTR aclsid, - const CLSID *clsid, - IUnknown * pUnkOuter, - REFIID refiid, - LPVOID *ppv) -{ - DWORD hres; - CLSID iid; - const CLSID * myclsid = clsid; - WCHAR sKeyName[MAX_PATH]; - const WCHAR sCLSID[7] = {'C','L','S','I','D','\\','\0'}; - WCHAR sClassID[60]; - const WCHAR sInProcServer32[16] ={'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2','\0'}; - const WCHAR sLoadWithoutCOM[15] ={'L','o','a','d','W','i','t','h','o','u','t','C','O','M','\0'}; - WCHAR sDllPath[MAX_PATH]; - HKEY hKey; - DWORD dwSize; - BOOLEAN bLoadFromShell32 = FALSE; - BOOLEAN bLoadWithoutCOM = FALSE; - CComPtr<IClassFactory> pcf; - - if(!ppv) return E_POINTER; - *ppv=NULL; - - /* if the clsid is a string, convert it */ - if (!clsid) - { - if (!aclsid) return REGDB_E_CLASSNOTREG; - CLSIDFromString((LPOLESTR)aclsid, &iid); - myclsid = &iid; - } - - TRACE("(%p,%s,unk:%p,%s,%p)\n", - aclsid, shdebugstr_guid(myclsid), pUnkOuter, shdebugstr_guid(&refiid), ppv); - - /* we look up the dll path in the registry */ - __SHGUIDToStringW(*myclsid, sClassID); - wcscpy(sKeyName, sCLSID); - wcscat(sKeyName, sClassID); - wcscat(sKeyName, sInProcServer32); - - if (ERROR_SUCCESS == RegOpenKeyExW(HKEY_CLASSES_ROOT, sKeyName, 0, KEY_READ, &hKey)) { - dwSize = sizeof(sDllPath); - SHQueryValueExW(hKey, NULL, 0,0, sDllPath, &dwSize ); - - /* if a special registry key is set, we load a shell extension without help of OLE32 */ - bLoadWithoutCOM = (ERROR_SUCCESS == SHQueryValueExW(hKey, sLoadWithoutCOM, 0, 0, 0, 0)); - - /* if the com object is inside shell32, omit use of ole32 */ - bLoadFromShell32 = (0==lstrcmpiW( PathFindFileNameW(sDllPath), sShell32)); - - RegCloseKey (hKey); - } else { - /* since we can't find it in the registry we try internally */ - bLoadFromShell32 = TRUE; - } - - TRACE("WithoutCom=%u FromShell=%u\n", bLoadWithoutCOM, bLoadFromShell32); - - /* now we create an instance */ - if (bLoadFromShell32) { - if (! SUCCEEDED(DllGetClassObject(*myclsid, IID_PPV_ARG(IClassFactory, &pcf)))) { - ERR("LoadFromShell failed for CLSID=%s\n", shdebugstr_guid(myclsid)); - } - } else if (bLoadWithoutCOM) { - - /* load an external dll without ole32 */ - HINSTANCE hLibrary; - typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, LPVOID *ppv); - DllGetClassObjectFunc DllGetClassObject; - - if ((hLibrary = LoadLibraryExW(sDllPath, 0, LOAD_WITH_ALTERED_SEARCH_PATH)) == 0) { - ERR("couldn't load InprocServer32 dll %s\n", debugstr_w(sDllPath)); - hres = E_ACCESSDENIED; - goto end; - } else if (!(DllGetClassObject = (DllGetClassObjectFunc)GetProcAddress(hLibrary, "DllGetClassObject"))) { - ERR("couldn't find function DllGetClassObject in %s\n", debugstr_w(sDllPath)); - FreeLibrary( hLibrary ); - hres = E_ACCESSDENIED; - goto end; - } else if (! SUCCEEDED(hres = DllGetClassObject(*myclsid, IID_PPV_ARG(IClassFactory, &pcf)))) { - TRACE("GetClassObject failed 0x%08x\n", hres); + LPCWSTR aclsid, + const CLSID *clsid, + LPUNKNOWN pUnkOuter, + REFIID refiid, + LPVOID *ppv) +{ + DWORD hres; + CLSID iid; + const CLSID * myclsid = clsid; + WCHAR sKeyName[MAX_PATH]; + static const WCHAR sCLSID[] = {'C','L','S','I','D','\\','\0'}; + WCHAR sClassID[60]; + static const WCHAR sInProcServer32[] = {'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2','\0'}; + static const WCHAR sLoadWithoutCOM[] = {'L','o','a','d','W','i','t','h','o','u','t','C','O','M','\0'}; + WCHAR sDllPath[MAX_PATH]; + HKEY hKey = 0; + DWORD dwSize; + IClassFactory * pcf = NULL; + + if(!ppv) return E_POINTER; + *ppv=NULL; + + /* if the clsid is a string, convert it */ + if (!clsid) + { + if (!aclsid) return REGDB_E_CLASSNOTREG; + SHCLSIDFromStringW(aclsid, &iid); + myclsid = &iid; + } + + TRACE("(%p,%s,unk:%p,%s,%p)\n", + aclsid,shdebugstr_guid(myclsid),pUnkOuter,shdebugstr_guid(refiid),ppv); + + if (SUCCEEDED(DllGetClassObject(myclsid, &IID_IClassFactory,(LPVOID*)&pcf))) + { + hres = IClassFactory_CreateInstance(pcf, pUnkOuter, refiid, ppv); + IClassFactory_Release(pcf); goto end; } - } else { - - /* load an external dll in the usual way */ - hres = CoCreateInstance(*myclsid, pUnkOuter, CLSCTX_INPROC_SERVER, refiid, ppv); - goto end; - } - - /* here we should have a ClassFactory */ - if (!pcf) return E_ACCESSDENIED; - - hres = pcf->CreateInstance(pUnkOuter, refiid, ppv); + /* we look up the dll path in the registry */ + SHStringFromGUIDW(myclsid, sClassID, sizeof(sClassID)/sizeof(WCHAR)); + lstrcpyW(sKeyName, sCLSID); + lstrcatW(sKeyName, sClassID); + lstrcatW(sKeyName, sInProcServer32); + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, sKeyName, 0, KEY_READ, &hKey)) + return E_ACCESSDENIED; + + /* if a special registry key is set, we load a shell extension without help of OLE32 */ + if (!SHQueryValueExW(hKey, sLoadWithoutCOM, 0, 0, 0, 0)) + { + /* load an external dll without ole32 */ + HANDLE hLibrary; + typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, LPVOID *ppv); + DllGetClassObjectFunc DllGetClassObject; + + dwSize = sizeof(sDllPath); + SHQueryValueExW(hKey, NULL, 0,0, sDllPath, &dwSize ); + + if ((hLibrary = LoadLibraryExW(sDllPath, 0, LOAD_WITH_ALTERED_SEARCH_PATH)) == 0) { + ERR("couldn't load InprocServer32 dll %s\n", debugstr_w(sDllPath)); + hres = E_ACCESSDENIED; + goto end; + } else if (!(DllGetClassObject = (DllGetClassObjectFunc)GetProcAddress(hLibrary, "DllGetClassObject"))) { + ERR("couldn't find function DllGetClassObject in %s\n", debugstr_w(sDllPath)); + FreeLibrary( hLibrary ); + hres = E_ACCESSDENIED; + goto end; + } else if (FAILED(hres = DllGetClassObject(myclsid, &IID_IClassFactory, (LPVOID*)&pcf))) { + TRACE("GetClassObject failed 0x%08x\n", hres); + goto end; + } + + hres = IClassFactory_CreateInstance(pcf, pUnkOuter, refiid, ppv); + IClassFactory_Release(pcf); + } else { + + /* load an external dll in the usual way */ + hres = CoCreateInstance(myclsid, pUnkOuter, CLSCTX_INPROC_SERVER, refiid, ppv); + } + end: - if(hres!=S_OK) - { - ERR("failed (0x%08x) to create CLSID:%s IID:%s\n", - hres, shdebugstr_guid(myclsid), shdebugstr_guid(&refiid)); - ERR("class not found in registry\n"); - } - - TRACE("-- instance: %p\n",*ppv); - return hres; -} - -/************************************************************************* - * SHCLSIDFromString [SHELL32.147] + if (hKey) RegCloseKey(hKey); + if(hres!=S_OK) + { + ERR("failed (0x%08x) to create CLSID:%s IID:%s\n", + hres, shdebugstr_guid(myclsid), shdebugstr_guid(refiid)); + ERR("class not found in registry\n"); + } + + TRACE("-- instance: %p\n",*ppv); + return hres; +} + +#ifndef __REACTOS__ +/************************************************************************* + * DllGetClassObject [SHELL32.@] + * SHDllGetClassObject [SHELL32.128] + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +{ + HRESULT hres = E_OUTOFMEMORY; + IClassFactory * pcf = NULL; + int i; + + TRACE("CLSID:%s,IID:%s\n",shdebugstr_guid(rclsid),shdebugstr_guid(iid)); + + if (!ppv) return E_INVALIDARG; + *ppv = NULL; + + /* search our internal interface table */ + for(i=0;InterfaceTable[i].riid;i++) { + if(IsEqualIID(InterfaceTable[i].riid, rclsid)) { + TRACE("index[%u]\n", i); + pcf = IDefClF_fnConstructor(InterfaceTable[i].lpfnCI, NULL, NULL); + } + } + + if (!pcf) { + FIXME("failed for CLSID=%s\n", shdebugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; + } + + hres = IClassFactory_QueryInterface(pcf, iid, ppv); + IClassFactory_Release(pcf); + + TRACE("-- pointer to class factory: %p\n",*ppv); + return hres; +} +#endif + +/************************************************************************* + * SHCLSIDFromString [SHELL32.147] * * Under Windows 9x this was an ANSI version of CLSIDFromString. It also allowed * to avoid dependency on ole32.dll (see SHLoadOLE for details). @@ -190,26 +256,24 @@ return CO_E_CLASSSTRING; return CLSIDFromString( buffer, id ); } - DWORD WINAPI SHCLSIDFromStringW (LPCWSTR clsid, CLSID *id) { - TRACE("(%p(%s) %p)\n", clsid, debugstr_w(clsid), id); - return CLSIDFromString((LPWSTR)clsid, id); -} - -EXTERN_C DWORD WINAPI SHCLSIDFromStringAW (LPCVOID clsid, CLSID *id) -{ - if (SHELL_OsIsUnicode()) - return SHCLSIDFromStringW ((LPCWSTR)clsid, id); - return SHCLSIDFromStringA ((LPCSTR)clsid, id); -} - -/************************************************************************* - * SHGetMalloc [SHELL32.@] + TRACE("(%p(%s) %p)\n", clsid, debugstr_w(clsid), id); + return CLSIDFromString(clsid, id); +} +DWORD WINAPI SHCLSIDFromStringAW (LPCVOID clsid, CLSID *id) +{ + if (SHELL_OsIsUnicode()) + return SHCLSIDFromStringW (clsid, id); + return SHCLSIDFromStringA (clsid, id); +} + +/************************************************************************* + * SHGetMalloc [SHELL32.@] * * Equivalent to CoGetMalloc(MEMCTX_TASK, ...). Under Windows 9x this function * could use the shell32 built-in "mini-COM" without the need to load ole32.dll - - * see SHLoadOLE for details. + * see SHLoadOLE for details. * * PARAMS * lpmal [O] Destination for IMalloc interface. @@ -223,16 +287,16 @@ */ HRESULT WINAPI SHGetMalloc(LPMALLOC *lpmal) { - TRACE("(%p)\n", lpmal); - return CoGetMalloc(MEMCTX_TASK, lpmal); -} - -/************************************************************************* - * SHAlloc [SHELL32.196] + TRACE("(%p)\n", lpmal); + return CoGetMalloc(MEMCTX_TASK, lpmal); +} + +/************************************************************************* + * SHAlloc [SHELL32.196] * * Equivalent to CoTaskMemAlloc. Under Windows 9x this function could use * the shell32 built-in "mini-COM" without the need to load ole32.dll - - * see SHLoadOLE for details. + * see SHLoadOLE for details. * * NOTES * exported by ordinal @@ -242,19 +306,19 @@ */ LPVOID WINAPI SHAlloc(SIZE_T len) { - LPVOID ret; - - ret = CoTaskMemAlloc(len); - TRACE("%u bytes at %p\n",len, ret); - return ret; -} - -/************************************************************************* - * SHFree [SHELL32.195] + LPVOID ret; + + ret = CoTaskMemAlloc(len); + TRACE("%u bytes at %p\n",len, ret); + return ret; +} + +/************************************************************************* + * SHFree [SHELL32.195] * * Equivalent to CoTaskMemFree. Under Windows 9x this function could use * the shell32 built-in "mini-COM" without the need to load ole32.dll - - * see SHLoadOLE for details. + * see SHLoadOLE for details. * * NOTES * exported by ordinal @@ -264,79 +328,266 @@ */ void WINAPI SHFree(LPVOID pv) { - TRACE("%p\n",pv); - CoTaskMemFree(pv); -} - -/************************************************************************* - * DragAcceptFiles [SHELL32.@] + TRACE("%p\n",pv); + CoTaskMemFree(pv); +} + +#ifndef __REACTOS__ +/************************************************************************* + * SHGetDesktopFolder [SHELL32.@] + */ +HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf) +{ + HRESULT hres; + + TRACE("(%p)\n", psf); + + if(!psf) return E_INVALIDARG; + + *psf = NULL; + hres = ISF_Desktop_Constructor(NULL, &IID_IShellFolder, (LPVOID*)psf); + + TRACE("-- %p->(%p) 0x%08x\n", psf, *psf, hres); + return hres; +} +#endif + +/************************************************************************** + * 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. + */ + +typedef struct +{ + IClassFactory IClassFactory_iface; + LONG ref; + CLSID *rclsid; + LPFNCREATEINSTANCE lpfnCI; + const IID * riidInst; + LONG * pcRefDll; /* pointer to refcounter in external dll (ugrrr...) */ +} IDefClFImpl; + +static inline IDefClFImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IDefClFImpl, IClassFactory_iface); +} + +#ifndef __REACTOS__ + +static const IClassFactoryVtbl dclfvt; + +/************************************************************************** + * IDefClF_fnConstructor + */ + +static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, REFIID riidInst) +{ + IDefClFImpl* lpclf; + + lpclf = HeapAlloc(GetProcessHeap(),0,sizeof(IDefClFImpl)); + lpclf->ref = 1; + lpclf->IClassFactory_iface.lpVtbl = &dclfvt; + lpclf->lpfnCI = lpfnCI; + lpclf->pcRefDll = pcRefDll; + + if (pcRefDll) InterlockedIncrement(pcRefDll); + lpclf->riidInst = riidInst; + + TRACE("(%p)%s\n",lpclf, shdebugstr_guid(riidInst)); + return (LPCLASSFACTORY)lpclf; +} +/************************************************************************** + * IDefClF_fnQueryInterface + */ +static HRESULT WINAPI IDefClF_fnQueryInterface( + LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj) +{ + IDefClFImpl *This = impl_from_IClassFactory(iface); + + TRACE("(%p)->(%s)\n",This,shdebugstr_guid(riid)); + + *ppvObj = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) { + *ppvObj = This; + InterlockedIncrement(&This->ref); + return S_OK; + } + + TRACE("-- E_NOINTERFACE\n"); + return E_NOINTERFACE; +} +/****************************************************************************** + * IDefClF_fnAddRef + */ +static ULONG WINAPI IDefClF_fnAddRef(LPCLASSFACTORY iface) +{ + IDefClFImpl *This = impl_from_IClassFactory(iface); + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(count=%u)\n", This, refCount - 1); + + return refCount; +} +/****************************************************************************** + * IDefClF_fnRelease + */ +static ULONG WINAPI IDefClF_fnRelease(LPCLASSFACTORY iface) +{ + IDefClFImpl *This = impl_from_IClassFactory(iface); + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(count=%u)\n", This, refCount + 1); + + if (!refCount) + { + if (This->pcRefDll) InterlockedDecrement(This->pcRefDll); + + TRACE("-- destroying IClassFactory(%p)\n",This); + HeapFree(GetProcessHeap(),0,This); + return 0; + } + return refCount; +} +/****************************************************************************** + * IDefClF_fnCreateInstance + */ +static HRESULT WINAPI IDefClF_fnCreateInstance( + LPCLASSFACTORY iface, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObject) +{ + IDefClFImpl *This = impl_from_IClassFactory(iface); + + TRACE("%p->(%p,%s,%p)\n",This,pUnkOuter,shdebugstr_guid(riid),ppvObject); + + *ppvObject = NULL; + + if ( This->riidInst==NULL || + IsEqualCLSID(riid, This->riidInst) || + IsEqualCLSID(riid, &IID_IUnknown) ) + { + return This->lpfnCI(pUnkOuter, riid, ppvObject); + } + + ERR("unknown IID requested %s\n",shdebugstr_guid(riid)); + return E_NOINTERFACE; +} +/****************************************************************************** + * IDefClF_fnLockServer + */ +static HRESULT WINAPI IDefClF_fnLockServer(LPCLASSFACTORY iface, BOOL fLock) +{ + IDefClFImpl *This = impl_from_IClassFactory(iface); + TRACE("%p->(0x%x), not implemented\n",This, fLock); + return E_NOTIMPL; +} + +static const IClassFactoryVtbl dclfvt = +{ + IDefClF_fnQueryInterface, + IDefClF_fnAddRef, + IDefClF_fnRelease, + IDefClF_fnCreateInstance, + IDefClF_fnLockServer +}; + +/****************************************************************************** + * 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; + + TRACE("%s %p %p %p %s\n", + shdebugstr_guid(riid), ppv, lpfnCI, pcRefDll, shdebugstr_guid(riidInst)); + + if (! IsEqualCLSID(riid, &IID_IClassFactory) ) return E_NOINTERFACE; + if (! (pcf = IDefClF_fnConstructor(lpfnCI, (PLONG)pcRefDll, riidInst))) return E_OUTOFMEMORY; + *ppv = pcf; + return S_OK; +} + +#endif /* !__REACTOS__ */ + +/************************************************************************* + * DragAcceptFiles [SHELL32.@] */ void WINAPI DragAcceptFiles(HWND hWnd, BOOL b) { - LONG exstyle; - - if( !IsWindow(hWnd) ) return; - exstyle = GetWindowLongPtrA(hWnd,GWL_EXSTYLE); - if (b) - exstyle |= WS_EX_ACCEPTFILES; - else - exstyle &= ~WS_EX_ACCEPTFILES; - SetWindowLongPtrA(hWnd,GWL_EXSTYLE,exstyle); -} - -/************************************************************************* - * DragFinish [SHELL32.@] + LONG exstyle; + + if( !IsWindow(hWnd) ) return; + exstyle = GetWindowLongPtrA(hWnd,GWL_EXSTYLE); + if (b) + exstyle |= WS_EX_ACCEPTFILES; + else + exstyle &= ~WS_EX_ACCEPTFILES; + SetWindowLongPtrA(hWnd,GWL_EXSTYLE,exstyle); +} + +/************************************************************************* + * DragFinish [SHELL32.@] */ void WINAPI DragFinish(HDROP h) { - TRACE("\n"); - GlobalFree((HGLOBAL)h); -} - -/************************************************************************* - * DragQueryPoint [SHELL32.@] + TRACE("\n"); + GlobalFree(h); +} + +/************************************************************************* + * DragQueryPoint [SHELL32.@] */ BOOL WINAPI DragQueryPoint(HDROP hDrop, POINT *p) { DROPFILES *lpDropFileStruct; - BOOL bRet; - - TRACE("\n"); - - lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop); + BOOL bRet; + + TRACE("\n"); + + lpDropFileStruct = GlobalLock(hDrop); *p = lpDropFileStruct->pt; - bRet = lpDropFileStruct->fNC; - - GlobalUnlock(hDrop); - return bRet; -} - -/************************************************************************* - * DragQueryFileA [SHELL32.@] - * DragQueryFile [SHELL32.@] + bRet = lpDropFileStruct->fNC; + + GlobalUnlock(hDrop); + return bRet; +} + +/************************************************************************* + * DragQueryFileA [SHELL32.@] + * DragQueryFile [SHELL32.@] */ UINT WINAPI DragQueryFileA( - HDROP hDrop, - UINT lFile, - LPSTR lpszFile, - UINT lLength) -{ - LPSTR lpDrop; - UINT i = 0; - DROPFILES *lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop); - - TRACE("(%p, %x, %p, %u)\n", hDrop,lFile,lpszFile,lLength); - - if(!lpDropFileStruct) goto end; - - lpDrop = (LPSTR) lpDropFileStruct + lpDropFileStruct->pFiles; + HDROP hDrop, + UINT lFile, + LPSTR lpszFile, + UINT lLength) +{ + LPSTR lpDrop; + UINT i = 0; + DROPFILES *lpDropFileStruct = GlobalLock(hDrop); + + TRACE("(%p, %x, %p, %u)\n", hDrop,lFile,lpszFile,lLength); + + if(!lpDropFileStruct) goto end; + + lpDrop = (LPSTR) lpDropFileStruct + lpDropFileStruct->pFiles; if(lpDropFileStruct->fWide) { LPWSTR lpszFileW = NULL; if(lpszFile) { - lpszFileW = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, lLength*sizeof(WCHAR)); + lpszFileW = HeapAlloc(GetProcessHeap(), 0, lLength*sizeof(WCHAR)); if(lpszFileW == NULL) { goto end; } @@ -350,48 +601,48 @@ goto end; } - while (i++ < lFile) - { - while (*lpDrop++); /* skip filename */ - if (!*lpDrop) - { - i = (lFile == 0xFFFFFFFF) ? i : 0; - goto end; - } - } - - i = strlen(lpDrop); - if (!lpszFile ) goto end; /* needed buffer size */ - lstrcpynA (lpszFile, lpDrop, lLength); + while (i++ < lFile) + { + while (*lpDrop++); /* skip filename */ + if (!*lpDrop) + { + i = (lFile == 0xFFFFFFFF) ? i : 0; + goto end; + } + } + + i = strlen(lpDrop); + if (!lpszFile ) goto end; /* needed buffer size */ + lstrcpynA (lpszFile, lpDrop, lLength); end: - GlobalUnlock(hDrop); - return i; -} - -/************************************************************************* - * DragQueryFileW [SHELL32.@] + GlobalUnlock(hDrop); + return i; +} + +/************************************************************************* + * DragQueryFileW [SHELL32.@] */ UINT WINAPI DragQueryFileW( - HDROP hDrop, - UINT lFile, - LPWSTR lpszwFile, - UINT lLength) -{ - LPWSTR lpwDrop; - UINT i = 0; - DROPFILES *lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop); - - TRACE("(%p, %x, %p, %u)\n", hDrop,lFile,lpszwFile,lLength); - - if(!lpDropFileStruct) goto end; - - lpwDrop = (LPWSTR) ((LPSTR)lpDropFileStruct + lpDropFileStruct->pFiles); + HDROP hDrop, + UINT lFile, + LPWSTR lpszwFile, + UINT lLength) +{ + LPWSTR lpwDrop; + UINT i = 0; + DROPFILES *lpDropFileStruct = GlobalLock(hDrop); + + TRACE("(%p, %x, %p, %u)\n", hDrop,lFile,lpszwFile,lLength); + + if(!lpDropFileStruct) goto end; + + lpwDrop = (LPWSTR) ((LPSTR)lpDropFileStruct + lpDropFileStruct->pFiles); if(lpDropFileStruct->fWide == FALSE) { LPSTR lpszFileA = NULL; if(lpszwFile) { - lpszFileA = (LPSTR)HeapAlloc(GetProcessHeap(), 0, lLength); + lpszFileA = HeapAlloc(GetProcessHeap(), 0, lLength); if(lpszFileA == NULL) { goto end; } @@ -405,82 +656,80 @@ goto end; } - i = 0; - while (i++ < lFile) - { - while (*lpwDrop++); /* skip filename */ - if (!*lpwDrop) - { - i = (lFile == 0xFFFFFFFF) ? i : 0; - goto end; - } - } - - i = wcslen(lpwDrop); - if ( !lpszwFile) goto end; /* needed buffer size */ - lstrcpynW (lpszwFile, lpwDrop, lLength); + i = 0; + while (i++ < lFile) + { + while (*lpwDrop++); /* skip filename */ + if (!*lpwDrop) + { + i = (lFile == 0xFFFFFFFF) ? i : 0; + goto end; + } + } + + i = strlenW(lpwDrop); + if ( !lpszwFile) goto end; /* needed buffer size */ + lstrcpynW (lpszwFile, lpwDrop, lLength); end: - GlobalUnlock(hDrop); - return i; + GlobalUnlock(hDrop); + return i; } /************************************************************************* * SHPropStgCreate [SHELL32.685] */ -EXTERN_C HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmtid, - const CLSID *pclsid, DWORD grfFlags, DWORD grfMode, - DWORD dwDisposition, IPropertyStorage **ppstg, UINT *puCodePage) +HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmtid, + const CLSID *pclsid, DWORD grfFlags, DWORD grfMode, + DWORD dwDisposition, IPropertyStorage **ppstg, UINT *puCodePage) { PROPSPEC prop; PROPVARIANT ret; HRESULT hres; - TRACE("%p %s %s %x %x %x %p %p\n", psstg, debugstr_guid(&fmtid), debugstr_guid(pclsid), - grfFlags, grfMode, dwDisposition, ppstg, puCodePage); - - hres = psstg->Open(fmtid, grfMode, ppstg); - - switch (dwDisposition) - { - case CREATE_ALWAYS: - if (SUCCEEDED(hres)) - { - (*ppstg)->Release(); - hres = psstg->Delete(fmtid); - if(FAILED(hres)) - return hres; - hres = E_FAIL; - } - - case OPEN_ALWAYS: - case CREATE_NEW: - if (FAILED(hres)) - hres = psstg->Create(fmtid, pclsid, grfFlags, grfMode, ppstg); - - case OPEN_EXISTING: - if (FAILED(hres)) - return hres; - - if (puCodePage) - { - prop.ulKind = PRSPEC_PROPID; - prop.propid = PID_CODEPAGE; - hres = (*ppstg)->ReadMultiple(1, &prop, &ret); - if (FAILED(hres) || ret.vt!=VT_I2) - *puCodePage = 0; - else - *puCodePage = ret.iVal; - } - } - - return S_OK; + TRACE("%p %s %s %x %x %x %p %p\n", psstg, debugstr_guid(fmtid), debugstr_guid(pclsid), + grfFlags, grfMode, dwDisposition, ppstg, puCodePage); + + hres = IPropertySetStorage_Open(psstg, fmtid, grfMode, ppstg); + + switch(dwDisposition) { + case CREATE_ALWAYS: + if(SUCCEEDED(hres)) { + IPropertyStorage_Release(*ppstg); + hres = IPropertySetStorage_Delete(psstg, fmtid); + if(FAILED(hres)) + return hres; + hres = E_FAIL; + } + + case OPEN_ALWAYS: + case CREATE_NEW: + if(FAILED(hres)) + hres = IPropertySetStorage_Create(psstg, fmtid, pclsid, + grfFlags, grfMode, ppstg); + + case OPEN_EXISTING: + if(FAILED(hres)) + return hres; + + if(puCodePage) { + prop.ulKind = PRSPEC_PROPID; + prop.u.propid = PID_CODEPAGE; + hres = IPropertyStorage_ReadMultiple(*ppstg, 1, &prop, &ret); + if(FAILED(hres) || ret.vt!=VT_I2) + *puCodePage = 0; + else + *puCodePage = ret.u.iVal; + } + } + + return S_OK; } /************************************************************************* * SHPropStgReadMultiple [SHELL32.688] */ -EXTERN_C HRESULT WINAPI SHPropStgReadMultiple(IPropertyStorage *pps, UINT uCodePage, - ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar) +HRESULT WINAPI SHPropStgReadMultiple(IPropertyStorage *pps, UINT uCodePage, + ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar) { STATPROPSETSTG stat; HRESULT hres; @@ -488,26 +737,25 @@ FIXME("%p %u %u %p %p\n", pps, uCodePage, cpspec, rgpspec, rgvar); memset(rgvar, 0, cpspec*sizeof(PROPVARIANT)); - hres = pps->ReadMultiple(cpspec, rgpspec, rgvar); - if (FAILED(hres)) + hres = IPropertyStorage_ReadMultiple(pps, cpspec, rgpspec, rgvar); + if(FAILED(hres)) return hres; - if (!uCodePage) - { + if(!uCodePage) { PROPSPEC prop; PROPVARIANT ret; prop.ulKind = PRSPEC_PROPID; - prop.propid = PID_CODEPAGE; - hres = pps->ReadMultiple(1, &prop, &ret); + prop.u.propid = PID_CODEPAGE; + hres = IPropertyStorage_ReadMultiple(pps, 1, &prop, &ret); if(FAILED(hres) || ret.vt!=VT_I2) return S_OK; - uCodePage = ret.iVal; + uCodePage = ret.u.iVal; } - hres = pps->Stat(&stat); - if (FAILED(hres)) + hres = IPropertyStorage_Stat(pps, &stat); + if(FAILED(hres)) return S_OK; /* TODO: do something with codepage and stat */ @@ -517,8 +765,8 @@ /************************************************************************* * SHPropStgWriteMultiple [SHELL32.689] */ -EXTERN_C HRESULT WINAPI SHPropStgWriteMultiple(IPropertyStorage *pps, UINT *uCodePage, - ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar, PROPID propidNameFirst) +HRESULT WINAPI SHPropStgWriteMultiple(IPropertyStorage *pps, UINT *uCodePage, + ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar, PROPID propidNameFirst) { STATPROPSETSTG stat; UINT codepage; @@ -526,33 +774,32 @@ FIXME("%p %p %u %p %p %d\n", pps, uCodePage, cpspec, rgpspec, rgvar, propidNameFirst); - hres = pps->Stat(&stat); - if (FAILED(hres)) + hres = IPropertyStorage_Stat(pps, &stat); + if(FAILED(hres)) return hres; - if (uCodePage && *uCodePage) + if(uCodePage && *uCodePage) codepage = *uCodePage; - else - { + else { PROPSPEC prop; PROPVARIANT ret; prop.ulKind = PRSPEC_PROPID; - prop.propid = PID_CODEPAGE; - hres = pps->ReadMultiple(1, &prop, &ret); - if (FAILED(hres)) + prop.u.propid = PID_CODEPAGE; + hres = IPropertyStorage_ReadMultiple(pps, 1, &prop, &ret); + if(FAILED(hres)) return hres; - if (ret.vt!=VT_I2 || !ret.iVal) + if(ret.vt!=VT_I2 || !ret.u.iVal) return E_FAIL; - codepage = ret.iVal; - if (uCodePage) + codepage = ret.u.iVal; + if(uCodePage) *uCodePage = codepage; } /* TODO: do something with codepage and stat */ - hres = pps->WriteMultiple(cpspec, rgpspec, rgvar, propidNameFirst); + hres = IPropertyStorage_WriteMultiple(pps, cpspec, rgpspec, rgvar, propidNameFirst); return hres; } @@ -564,5 +811,5 @@ TRACE("%p\n", moniker); if (!moniker) return E_INVALIDARG; - return CreateClassMoniker(CLSID_QueryCancelAutoPlay, moniker); -} + return CreateClassMoniker(&CLSID_QueryCancelAutoPlay, moniker); +}

1 0

[gadamopoulos] 65212: [SHELL32] - Add shell32.cpp and move there CShell32Module, DllGetVersion, DllMain, DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer, DllInstall, IDef...
by gadamopoulos＠svn.reactos.org 03 Nov '14

03 Nov '14

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/she… ============================================================================== --- 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/she… ============================================================================== --- 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/she… ============================================================================== --- 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/she… ============================================================================== --- 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.@] */

1 0

[gadamopoulos] 65211: [SHELL32] - Move SHGetDesktopFolder to desktop.cpp
by gadamopoulos＠svn.reactos.org 03 Nov '14

03 Nov '14

Author: gadamopoulos Date: Mon Nov 3 10:12:24 2014 New Revision: 65211 URL: http://svn.reactos.org/svn/reactos?rev=65211&view=rev Log: [SHELL32] - Move SHGetDesktopFolder to desktop.cpp Modified: branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp branches/shell-experiments/dll/win32/shell32/shellole.cpp Modified: branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] Mon Nov 3 10:12:24 2014 @@ -1507,4 +1507,20 @@ ERR("GetDisplayNameOf failed: %x\n", hr); return hr; +} + +/************************************************************************* + * SHGetDesktopFolder [SHELL32.@] + */ +HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf) +{ + HRESULT hres = S_OK; + TRACE("\n"); + + if(!psf) return E_INVALIDARG; + *psf = NULL; + hres = CDesktopFolder::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellFolder, psf)); + + TRACE("-- %p->(%p)\n",psf, *psf); + return hres; } Modified: branches/shell-experiments/dll/win32/shell32/shellole.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- 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:12:24 2014 @@ -274,21 +274,6 @@ CoTaskMemFree(pv); } -/************************************************************************* - * SHGetDesktopFolder [SHELL32.@] - */ -HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf) -{ - HRESULT hres = S_OK; - TRACE("\n"); - - if(!psf) return E_INVALIDARG; - *psf = NULL; - hres = CDesktopFolder::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellFolder, psf)); - - TRACE("-- %p->(%p)\n",psf, *psf); - return hres; -} /************************************************************************** * Default ClassFactory Implementation *

1 0

[jgardou] 65210: [NTOS/PS] - Do not leak a reference to the process object when setting quotas.
by jgardou＠svn.reactos.org 03 Nov '14

03 Nov '14

Author: jgardou Date: Mon Nov 3 09:52:08 2014 New Revision: 65210 URL: http://svn.reactos.org/svn/reactos?rev=65210&view=rev Log: [NTOS/PS] - Do not leak a reference to the process object when setting quotas. Modified: trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/ps/quota.c Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] Mon Nov 3 09:52:08 2014 @@ -303,7 +303,7 @@ NTSTATUS NTAPI PspSetQuotaLimits( - _In_ HANDLE ProcessHandle, + _In_ PEPROCESS Process, _In_ ULONG Unused, _In_ PVOID QuotaLimits, _In_ ULONG QuotaLimitsLength, Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=65… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Mon Nov 3 09:52:08 2014 @@ -1528,6 +1528,7 @@ /* Validate the number */ if ((BasePriority > HIGH_PRIORITY) || (BasePriority <= LOW_PRIORITY)) { + ObDereferenceObject(Process); return STATUS_INVALID_PARAMETER; } @@ -1918,11 +1919,12 @@ case ProcessQuotaLimits: - return PspSetQuotaLimits(ProcessHandle, + Status = PspSetQuotaLimits(Process, 1, ProcessInformation, ProcessInformationLength, PreviousMode); + break; case ProcessWorkingSetWatch: DPRINT1("WS watch not implemented\n"); Modified: trunk/reactos/ntoskrnl/ps/quota.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/quota.c?rev=65… ============================================================================== --- trunk/reactos/ntoskrnl/ps/quota.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/quota.c [iso-8859-1] Mon Nov 3 09:52:08 2014 @@ -292,14 +292,13 @@ NTSTATUS NTAPI PspSetQuotaLimits( - _In_ HANDLE ProcessHandle, + _In_ PEPROCESS Process, _In_ ULONG Unused, _In_ PVOID QuotaLimits, _In_ ULONG QuotaLimitsLength, _In_ KPROCESSOR_MODE PreviousMode) { QUOTA_LIMITS_EX CapturedQuotaLimits; - PEPROCESS Process; PEPROCESS_QUOTA_BLOCK QuotaBlock, OldQuotaBlock; BOOLEAN IncreaseOkay; KAPC_STATE SavedApcState; @@ -368,19 +367,6 @@ } _SEH2_END; - /* Reference the process */ - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_SET_QUOTA, - PsProcessType, - PreviousMode, - (PVOID*)&Process, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to reference process handle: 0x%lx\n", Status); - return Status; - } - /* Check the caller changes the working set size limits */ if ((CapturedQuotaLimits.MinimumWorkingSetSize != 0) && (CapturedQuotaLimits.MaximumWorkingSetSize != 0)) @@ -418,7 +404,6 @@ /* Check if the caller has the required privilege */ if (!SeSinglePrivilegeCheck(SeIncreaseQuotaPrivilege, PreviousMode)) { - ObDereferenceObject(Process); return STATUS_PRIVILEGE_NOT_HELD; } @@ -460,8 +445,6 @@ Status = STATUS_SUCCESS; } - /* Dereference the process and return the status */ - ObDereferenceObject(Process); return Status; }

1 0

[dquintana] 65209: [EXPLORER-NEW] * Rename a few I<x>Impl to C<x> * Refactor the toolbar code of notification area into its own class. * Also refactor away the code specific to the toolbar control ...
by dquintana＠svn.reactos.org 03 Nov '14

03 Nov '14

Author: dquintana Date: Mon Nov 3 04:16:56 2014 New Revision: 65209 URL: http://svn.reactos.org/svn/reactos?rev=65209&view=rev Log: [EXPLORER-NEW] * Rename a few I<x>Impl to C<x> * Refactor the toolbar code of notification area into its own class. * Also refactor away the code specific to the toolbar control into a CToolbar class. Todo: move the CToolbar class into some header file. Modified: branches/shell-experiments/base/shell/explorer-new/taskband.cpp branches/shell-experiments/base/shell/explorer-new/tbsite.cpp branches/shell-experiments/base/shell/explorer-new/trayntfy.cpp branches/shell-experiments/base/shell/explorer-new/traywnd.cpp Modified: branches/shell-experiments/base/shell/explorer-new/taskband.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/taskband.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/taskband.cpp [iso-8859-1] Mon Nov 3 04:16:56 2014 @@ -26,8 +26,8 @@ const GUID CLSID_ITaskBand = { 0x68284FAA, 0x6A48, 0x11D0, { 0x8C, 0x78, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xB4 } }; -class ITaskBandImpl : - public CComCoClass<ITaskBandImpl>, +class CTaskBand : + public CComCoClass<CTaskBand>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IObjectWithSite, public ITaskBand, @@ -44,14 +44,14 @@ DWORD dwBandID; public: - ITaskBandImpl() : + CTaskBand() : hWnd(NULL), dwBandID(0) { } - virtual ~ITaskBandImpl() { } + virtual ~CTaskBand() { } virtual HRESULT STDMETHODCALLTYPE GetRebarBandID( OUT DWORD *pdwBandID) @@ -386,10 +386,10 @@ return S_OK; } - DECLARE_NOT_AGGREGATABLE(ITaskBandImpl) + DECLARE_NOT_AGGREGATABLE(CTaskBand) DECLARE_PROTECT_FINAL_CONSTRUCT() - BEGIN_COM_MAP(ITaskBandImpl) + BEGIN_COM_MAP(CTaskBand) COM_INTERFACE_ENTRY2_IID(IID_IOleWindow, IOleWindow, IDeskBand) COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand) COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) @@ -404,7 +404,7 @@ { HRESULT hr; - ITaskBandImpl * tb = new CComObject<ITaskBandImpl>(); + CTaskBand * tb = new CComObject<CTaskBand>(); if (!tb) return NULL; Modified: branches/shell-experiments/base/shell/explorer-new/tbsite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/tbsite.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/tbsite.cpp [iso-8859-1] Mon Nov 3 04:16:56 2014 @@ -30,7 +30,7 @@ // WARNING: Can't use ATL for this class due to our ATL not fully supporting the AGGREGATION functions needed for this class to be an "outer" class // it works just fine this way. -class ITrayBandSiteImpl : +class CTrayBandSite : public ITrayBandSite, public IBandSite, public IBandSiteStreamCallback @@ -109,13 +109,13 @@ } public: - ITrayBandSiteImpl() : + CTrayBandSite() : m_RefCount(0), hWndRebar(NULL) { } - virtual ~ITrayBandSiteImpl() { } + virtual ~CTrayBandSite() { } virtual HRESULT STDMETHODCALLTYPE OnLoad( IN OUT IStream *pStm, @@ -816,7 +816,7 @@ { HRESULT hr; - ITrayBandSiteImpl * tb = new ITrayBandSiteImpl(); + CTrayBandSite * tb = new CTrayBandSite(); if (!tb) return NULL; Modified: branches/shell-experiments/base/shell/explorer-new/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/trayntfy.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/trayntfy.cpp [iso-8859-1] Mon Nov 3 04:16:56 2014 @@ -28,14 +28,6 @@ */ static const WCHAR szSysPagerWndClass [] = TEXT("SysPager"); -typedef struct _NOTIFY_ITEM -{ - struct _NOTIFY_ITEM *next; - INT Index; - INT IconIndex; - NOTIFYICONDATA iconData; -} NOTIFY_ITEM, *PNOTIFY_ITEM, **PPNOTIFY_ITEM; - // Data comes from shell32/systray.cpp -> TrayNotifyCDS_Dummy typedef struct _SYS_PAGER_COPY_DATA { @@ -44,235 +36,281 @@ NOTIFYICONDATA nicon_data; } SYS_PAGER_COPY_DATA, *PSYS_PAGER_COPY_DATA; -class CSysPagerWnd : - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public CWindowImpl < CSysPagerWnd, CWindow, CControlWinTraits > +template<typename TItemData> +class CToolbar : + public CWindowImpl < CToolbar<TItemData>, CWindow, CControlWinTraits> { - CContainedWindow NotificationBar; - - HWND hWndToolbar; + +public: + int GetItemCount() + { + return SendMessage(TB_BUTTONCOUNT); + } + + DWORD GetButton(int index, TBBUTTON * btn) + { + return SendMessage(TB_GETBUTTON, index, (LPARAM)btn); + } + + DWORD AddButton(TBBUTTON * btn) + { + return SendMessage(TB_ADDBUTTONS, 1, (LPARAM) btn); + } + + DWORD AddButtons(int count, TBBUTTON * buttons) + { + return SendMessage(TB_ADDBUTTONS, count, (LPARAM) btn); + } + + DWORD InsertButton(int insertAt, TBBUTTON * btn) + { + return SendMessage(TB_INSERTBUTTON, insertAt, (LPARAM) btn); + } + + DWORD MoveButton(int oldIndex, int newIndex) + { + return SendMessage(TB_MOVEBUTTON, oldIndex, newIndex); + } + + DWORD DeleteButton(int index) + { + return SendMessage(TB_DELETEBUTTON, index, 0); + } + + DWORD GetButtonInfo(int cmdId, TBBUTTONINFO * info) + { + return SendMessage(TB_GETBUTTONINFO, cmdId, (LPARAM) info); + } + + DWORD SetButtonInfo(int cmdId, TBBUTTONINFO * info) + { + return SendMessage(TB_SETBUTTONINFO, cmdId, (LPARAM) info); + } + +public: + DWORD SetButtonSize(int w, int h) + { + return SendMessage(TB_SETBUTTONSIZE, 0, MAKELONG(w, h)); + } + +public: + DWORD AutoSize() + { + return SendMessage(TB_AUTOSIZE); + } + +public: + TItemData * GetItemData(int index) + { + TBBUTTON btn; + GetButton(index, &btn); + return (TItemData*) btn.dwData; + } + + DWORD SetItemData(int index, TItemData * data) + { + TBBUTTONINFO info = { 0 }; + info.cbSize = sizeof(info); + info.dwMask = TBIF_BYINDEX | TBIF_LPARAM; + info.lParam = (DWORD_PTR) data; + return SetButtonInfo(index, &info); + } +}; + +class CNotifyToolbar : + public CToolbar<NOTIFYICONDATA> +{ + const int ICON_SIZE = 16; + HIMAGELIST SysIcons; - PNOTIFY_ITEM NotifyItems; - INT ButtonCount; - INT VisibleButtonCount; + int VisibleButtonCount; public: - CSysPagerWnd() : - NotificationBar(this, 1), - hWndToolbar(NULL), + CNotifyToolbar() : SysIcons(NULL), - NotifyItems(NULL), - ButtonCount(0), VisibleButtonCount(0) { } - virtual ~CSysPagerWnd() { } - - PNOTIFY_ITEM CreateNotifyItemData() - { - PNOTIFY_ITEM *findNotifyPointer = &NotifyItems; - PNOTIFY_ITEM notifyItem; - - notifyItem = (PNOTIFY_ITEM) HeapAlloc(hProcessHeap, HEAP_ZERO_MEMORY, sizeof(*notifyItem)); - if (notifyItem == NULL) - return NULL; - - notifyItem->next = NULL; - - while (*findNotifyPointer != NULL) - { - findNotifyPointer = &(*findNotifyPointer)->next; - } - - *findNotifyPointer = notifyItem; - - return notifyItem; - } - - PPNOTIFY_ITEM FindPPNotifyItemByIconData(IN CONST NOTIFYICONDATA *iconData) - { - PPNOTIFY_ITEM findNotifyPointer = &NotifyItems; - - while (*findNotifyPointer != NULL) - { - if ((*findNotifyPointer)->iconData.hWnd == iconData->hWnd && - (*findNotifyPointer)->iconData.uID == iconData->uID) - { - return findNotifyPointer; - } - findNotifyPointer = &(*findNotifyPointer)->next; - } - - return NULL; - } - - PPNOTIFY_ITEM FindPPNotifyItemByIndex(IN WORD wIndex) - { - PPNOTIFY_ITEM findNotifyPointer = &NotifyItems; - - while (*findNotifyPointer != NULL) - { - if ((*findNotifyPointer)->Index == wIndex) - { - return findNotifyPointer; - } - findNotifyPointer = &(*findNotifyPointer)->next; - } - - return NULL; + + ~CNotifyToolbar() + { + } + + int GetVisibleItemCount() + { + return VisibleButtonCount; + } + + int FindItemByIconData(IN CONST NOTIFYICONDATA *iconData, NOTIFYICONDATA ** pdata) + { + int count = GetItemCount(); + + for (int i = 0; i < count; i++) + { + NOTIFYICONDATA * data; + + data = GetItemData(i); + + if (data->hWnd == iconData->hWnd && + data->uID == iconData->uID) + { + if (pdata) + *pdata = data; + return i; + } + } + + return -1; + } + + VOID AddButton(IN CONST NOTIFYICONDATA *iconData) + { + TBBUTTON tbBtn; + NOTIFYICONDATA * notifyItem; + WCHAR text [] = TEXT(""); + + notifyItem = new NOTIFYICONDATA(); + ZeroMemory(notifyItem, sizeof(*notifyItem)); + + notifyItem->hWnd = iconData->hWnd; + notifyItem->uID = iconData->uID; + + tbBtn.fsState = TBSTATE_ENABLED; + tbBtn.fsStyle = BTNS_NOPREFIX; + tbBtn.dwData = (DWORD_PTR)notifyItem; + tbBtn.iString = (INT_PTR) text; + tbBtn.idCommand = GetItemCount(); + + if (iconData->uFlags & NIF_MESSAGE) + { + notifyItem->uCallbackMessage = iconData->uCallbackMessage; + } + + if (iconData->uFlags & NIF_ICON) + { + tbBtn.iBitmap = ImageList_AddIcon(SysIcons, iconData->hIcon); + } + + if (iconData->uFlags & NIF_TIP) + { + StringCchCopy(notifyItem->szTip, _countof(notifyItem->szTip), iconData->szTip); + } + + VisibleButtonCount++; + if (iconData->uFlags & NIF_STATE) + { + notifyItem->dwState &= ~iconData->dwStateMask; + notifyItem->dwState |= (iconData->dwState & iconData->dwStateMask); + if (notifyItem->dwState & NIS_HIDDEN) + { + tbBtn.fsState |= TBSTATE_HIDDEN; + VisibleButtonCount--; + } + + } + + /* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */ + + CToolbar::AddButton(&tbBtn); + SetButtonSize(ICON_SIZE, ICON_SIZE); } VOID UpdateButton(IN CONST NOTIFYICONDATA *iconData) { + NOTIFYICONDATA * notifyItem; TBBUTTONINFO tbbi = { 0 }; - PNOTIFY_ITEM notifyItem; - PPNOTIFY_ITEM NotifyPointer; - - NotifyPointer = FindPPNotifyItemByIconData(iconData); - notifyItem = *NotifyPointer; + + int index = FindItemByIconData(iconData, &notifyItem); + if (index < 0) + { + AddButton(iconData); + return; + } tbbi.cbSize = sizeof(tbbi); + tbbi.dwMask = TBIF_BYINDEX | TBIF_STATE; + GetButtonInfo(index, &tbbi); + tbbi.dwMask = TBIF_BYINDEX | TBIF_COMMAND; - tbbi.idCommand = notifyItem->Index; + tbbi.idCommand = index; if (iconData->uFlags & NIF_MESSAGE) { - notifyItem->iconData.uCallbackMessage = iconData->uCallbackMessage; + notifyItem->uCallbackMessage = iconData->uCallbackMessage; } if (iconData->uFlags & NIF_ICON) { tbbi.dwMask |= TBIF_IMAGE; - notifyItem->IconIndex = tbbi.iImage = ImageList_AddIcon(SysIcons, iconData->hIcon); + tbbi.iImage = ImageList_AddIcon(SysIcons, iconData->hIcon); } if (iconData->uFlags & NIF_TIP) { - StringCchCopy(notifyItem->iconData.szTip, _countof(notifyItem->iconData.szTip), iconData->szTip); + StringCchCopy(notifyItem->szTip, _countof(notifyItem->szTip), iconData->szTip); } if (iconData->uFlags & NIF_STATE) { if (iconData->dwStateMask & NIS_HIDDEN && - (notifyItem->iconData.dwState & NIS_HIDDEN) != (iconData->dwState & NIS_HIDDEN)) + (notifyItem->dwState & NIS_HIDDEN) != (iconData->dwState & NIS_HIDDEN)) { tbbi.dwMask |= TBIF_STATE; if (iconData->dwState & NIS_HIDDEN) { - tbbi.fsState |= TBSTATE_HIDDEN; - VisibleButtonCount--; + if ((tbbi.fsState & TBSTATE_HIDDEN) == 0) + { + tbbi.fsState |= TBSTATE_HIDDEN; + VisibleButtonCount--; + } } else { - tbbi.fsState &= ~TBSTATE_HIDDEN; - VisibleButtonCount++; + if ((tbbi.fsState & TBSTATE_HIDDEN) != 0) + { + tbbi.fsState &= ~TBSTATE_HIDDEN; + VisibleButtonCount++; + } } } - notifyItem->iconData.dwState &= ~iconData->dwStateMask; - notifyItem->iconData.dwState |= (iconData->dwState & iconData->dwStateMask); + notifyItem->dwState &= ~iconData->dwStateMask; + notifyItem->dwState |= (iconData->dwState & iconData->dwStateMask); } /* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */ - NotificationBar.SendMessageW(TB_SETBUTTONINFO, (WPARAM) notifyItem->Index, (LPARAM) &tbbi); - } - - VOID AddButton(IN CONST NOTIFYICONDATA *iconData) - { - TBBUTTON tbBtn; - PNOTIFY_ITEM notifyItem; - WCHAR text [] = TEXT(""); - - notifyItem = CreateNotifyItemData(); - - notifyItem->next = NULL; - notifyItem->Index = ButtonCount; - ButtonCount++; - VisibleButtonCount++; - - notifyItem->iconData.hWnd = iconData->hWnd; - notifyItem->iconData.uID = iconData->uID; - - tbBtn.fsState = TBSTATE_ENABLED; - tbBtn.fsStyle = BTNS_NOPREFIX; - tbBtn.dwData = notifyItem->Index; - - tbBtn.iString = (INT_PTR) text; - tbBtn.idCommand = notifyItem->Index; - - if (iconData->uFlags & NIF_MESSAGE) - { - notifyItem->iconData.uCallbackMessage = iconData->uCallbackMessage; - } - - if (iconData->uFlags & NIF_ICON) - { - notifyItem->IconIndex = tbBtn.iBitmap = ImageList_AddIcon(SysIcons, iconData->hIcon); - } - - /* TODO: support NIF_TIP */ - - if (iconData->uFlags & NIF_STATE) - { - notifyItem->iconData.dwState &= ~iconData->dwStateMask; - notifyItem->iconData.dwState |= (iconData->dwState & iconData->dwStateMask); - if (notifyItem->iconData.dwState & NIS_HIDDEN) - { - tbBtn.fsState |= TBSTATE_HIDDEN; - VisibleButtonCount--; - } - - } - - /* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */ - - NotificationBar.SendMessageW(TB_INSERTBUTTON, notifyItem->Index, (LPARAM) &tbBtn); - - NotificationBar.SendMessageW(TB_SETBUTTONSIZE, 0, MAKELONG(16, 16)); + SetButtonInfo(index, &tbbi); } VOID RemoveButton(IN CONST NOTIFYICONDATA *iconData) { - PPNOTIFY_ITEM NotifyPointer; - - NotifyPointer = FindPPNotifyItemByIconData(iconData); - if (NotifyPointer) - { - PNOTIFY_ITEM deleteItem; - PNOTIFY_ITEM updateItem; - deleteItem = *NotifyPointer; - - NotificationBar.SendMessageW(TB_DELETEBUTTON, deleteItem->Index, 0); - - *NotifyPointer = updateItem = deleteItem->next; - - if (!(deleteItem->iconData.dwState & NIS_HIDDEN)) - VisibleButtonCount--; - HeapFree(hProcessHeap, - 0, - deleteItem); - ButtonCount--; - - while (updateItem != NULL) - { - TBBUTTONINFO tbbi; - updateItem->Index--; - tbbi.cbSize = sizeof(tbbi); - tbbi.dwMask = TBIF_BYINDEX | TBIF_COMMAND; - tbbi.idCommand = updateItem->Index; - - NotificationBar.SendMessageW(TB_SETBUTTONINFO, updateItem->Index, (LPARAM) &tbbi); - - updateItem = updateItem->next; - } - } - } + NOTIFYICONDATA * notifyItem; + TBBUTTONINFO tbbi = { 0 }; + + int index = FindItemByIconData(iconData, &notifyItem); + if (index < 0) + return; + + DeleteButton(index); + delete notifyItem; + } + + VOID GetTooltip(int index, LPTSTR szTip, DWORD cchTip) + { + NOTIFYICONDATA * notifyItem; + notifyItem = GetItemData(index); + + if (notifyItem) + { + StringCchCopy(szTip, cchTip, notifyItem->szTip); + } + } + +private: VOID SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wParam) { - PPNOTIFY_ITEM NotifyPointer; - static LPCWSTR eventNames [] = { L"WM_MOUSEMOVE", L"WM_LBUTTONDOWN", @@ -290,66 +328,63 @@ L"WM_XBUTTONDBLCLK" }; - NotifyPointer = FindPPNotifyItemByIndex(wIndex); - if (!NotifyPointer) - return; - - PNOTIFY_ITEM notifyItem = *NotifyPointer; - - if (!::IsWindow(notifyItem->iconData.hWnd)) + NOTIFYICONDATA * notifyItem = GetItemData(wIndex); + + if (!::IsWindow(notifyItem->hWnd)) return; if (uMsg >= WM_MOUSEFIRST && uMsg <= WM_MOUSELAST) { DbgPrint("Sending message %S from button %d to %p (msg=%x, w=%x, l=%x)...\n", eventNames[uMsg - WM_MOUSEFIRST], wIndex, - notifyItem->iconData.hWnd, notifyItem->iconData.uCallbackMessage, notifyItem->iconData.uID, uMsg); + notifyItem->hWnd, notifyItem->uCallbackMessage, notifyItem->uID, uMsg); } DWORD pid; - GetWindowThreadProcessId(notifyItem->iconData.hWnd, &pid); + GetWindowThreadProcessId(notifyItem->hWnd, &pid); if (pid == GetCurrentProcessId() || (uMsg >= WM_MOUSEFIRST && uMsg <= WM_MOUSELAST)) { - PostMessage(notifyItem->iconData.hWnd, - notifyItem->iconData.uCallbackMessage, - notifyItem->iconData.uID, - uMsg); + PostMessage(notifyItem->hWnd, + notifyItem->uCallbackMessage, + notifyItem->uID, + uMsg); } else { - SendMessage(notifyItem->iconData.hWnd, - notifyItem->iconData.uCallbackMessage, - notifyItem->iconData.uID, - uMsg); - } - } - - LRESULT DrawBackground(HDC hdc) - { - RECT rect; - - GetClientRect(&rect); - DrawThemeParentBackground(m_hWnd, hdc, &rect); - - return TRUE; - } - - LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) - { - HDC hdc = (HDC) wParam; - - if (!IsAppThemed()) - { - bHandled = FALSE; - return 0; - } - - return DrawBackground(hdc); - } - - LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + SendMessage(notifyItem->hWnd, + notifyItem->uCallbackMessage, + notifyItem->uID, + uMsg); + } + } + + LRESULT OnMouseEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + POINT pt; + INT iBtn; + + pt.x = LOWORD(lParam); + pt.y = HIWORD(lParam); + + iBtn = (INT) SendMessageW(TB_HITTEST, 0, (LPARAM) &pt); + + if (iBtn >= 0) + { + SendMouseEvent(iBtn, uMsg, wParam); + } + + bHandled = FALSE; + return FALSE; + } + +public: + BEGIN_MSG_MAP(CNotifyToolbar) + MESSAGE_RANGE_HANDLER(WM_MOUSEFIRST, WM_MOUSELAST, OnMouseEvent) + END_MSG_MAP() + + void Initialize(HWND hWndParent) { DWORD styles = WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | @@ -357,37 +392,75 @@ CCS_TOP | CCS_NORESIZE | CCS_NOPARENTALIGN | CCS_NODIVIDER; DWORD exStyles = WS_EX_TOOLWINDOW; - hWndToolbar = CreateWindowEx(exStyles, - TOOLBARCLASSNAME, - NULL, - styles, - 0, - 0, - 0, - 0, - m_hWnd, - NULL, - hExplorerInstance, - NULL); + HWND hWndToolbar = CreateWindowEx(exStyles, + TOOLBARCLASSNAME, + NULL, + styles, + 0, + 0, + 0, + 0, + hWndParent, + NULL, + hExplorerInstance, + NULL); if (hWndToolbar != NULL) { - SIZE BtnSize; - - NotificationBar.SubclassWindow(hWndToolbar); + SubclassWindow(hWndToolbar); SetWindowTheme(hWndToolbar, L"TrayNotify", NULL); /* Identify the version we're using */ - NotificationBar.SendMessageW(TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + SendMessageW(TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); SysIcons = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 0, 1000); - NotificationBar.SendMessageW(TB_SETIMAGELIST, 0, (LPARAM) SysIcons); - - BtnSize.cx = BtnSize.cy = 18; - NotificationBar.SendMessageW(TB_SETBUTTONSIZE, 0, MAKELONG(BtnSize.cx, BtnSize.cy)); - - } - + SendMessageW(TB_SETIMAGELIST, 0, (LPARAM) SysIcons); + + SetButtonSize(ICON_SIZE, ICON_SIZE); + } + } +}; + +class CSysPagerWnd : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public CWindowImpl < CSysPagerWnd, CWindow, CControlWinTraits > +{ + CNotifyToolbar * Toolbar; + +public: + CSysPagerWnd() : + Toolbar(NULL) + { + } + virtual ~CSysPagerWnd() { } + + LRESULT DrawBackground(HDC hdc) + { + RECT rect; + + GetClientRect(&rect); + DrawThemeParentBackground(m_hWnd, hdc, &rect); + + return TRUE; + } + + LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + HDC hdc = (HDC) wParam; + + if (!IsAppThemed()) + { + bHandled = FALSE; + return 0; + } + + return DrawBackground(hdc); + } + + LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + Toolbar = new CNotifyToolbar(); + Toolbar->Initialize(m_hWnd); return TRUE; } @@ -411,33 +484,17 @@ { case NIM_ADD: { - PPNOTIFY_ITEM NotifyPointer; - - NotifyPointer = FindPPNotifyItemByIconData(iconData); - if (!NotifyPointer) - { - AddButton(iconData); - } + Toolbar->AddButton(iconData); break; } case NIM_MODIFY: { - PPNOTIFY_ITEM NotifyPointer; - - NotifyPointer = FindPPNotifyItemByIconData(iconData); - if (!NotifyPointer) - { - AddButton(iconData); - } - else - { - UpdateButton(iconData); - } + Toolbar->UpdateButton(iconData); break; } case NIM_DELETE: { - RemoveButton(iconData); + Toolbar->RemoveButton(iconData); break; } default: @@ -458,6 +515,7 @@ { INT rows = 0; TBMETRICS tbm; + int VisibleButtonCount = Toolbar->GetVisibleItemCount(); if (wParam) /* horizontal */ { @@ -480,23 +538,13 @@ tbm.cxButtonSpacing = 0; tbm.cyButtonSpacing = 0; - NotificationBar.SendMessageW(TB_SETMETRICS, 0, (LPARAM) &tbm); - } - - LRESULT OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) - { - return TRUE; + Toolbar->SendMessageW(TB_SETMETRICS, 0, (LPARAM) &tbm); } LRESULT OnGetInfoTip(INT uCode, LPNMHDR hdr, BOOL& bHandled) { NMTBGETINFOTIPW * nmtip = (NMTBGETINFOTIPW *) hdr; - PPNOTIFY_ITEM ptr = FindPPNotifyItemByIndex(nmtip->iItem); - if (ptr) - { - PNOTIFY_ITEM item = *ptr; - StringCchCopy(nmtip->pszText, nmtip->cchTextMax, item->iconData.szTip); - } + Toolbar->GetTooltip(nmtip->iItem, nmtip->pszText, nmtip->cchTextMax); return TRUE; } @@ -523,41 +571,23 @@ Ret = DefWindowProc(uMsg, wParam, lParam); - if (hWndToolbar != NULL && hWndToolbar != m_hWnd) - { - NotificationBar.SetWindowPos(NULL, 0, 0, szClient.cx, szClient.cy, SWP_NOZORDER); - - NotificationBar.SendMessageW(TB_AUTOSIZE); + if (Toolbar) + { + Toolbar->SetWindowPos(NULL, 0, 0, szClient.cx, szClient.cy, SWP_NOZORDER); + + Toolbar->AutoSize(); RECT rc; - NotificationBar.GetClientRect(&rc); + Toolbar->GetClientRect(&rc); SIZE szBar = { rc.right - rc.left, rc.bottom - rc.top }; INT xOff = (szClient.cx - szBar.cx) / 2; INT yOff = (szClient.cy - szBar.cy) / 2; - NotificationBar.SetWindowPos(NULL, xOff, yOff, szBar.cx, szBar.cy, SWP_NOZORDER); + Toolbar->SetWindowPos(NULL, xOff, yOff, szBar.cx, szBar.cy, SWP_NOZORDER); } return Ret; - } - - LRESULT OnMouseEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) - { - POINT pt; - INT iBtn; - - pt.x = LOWORD(lParam); - pt.y = HIWORD(lParam); - - iBtn = (INT) NotificationBar.SendMessageW(TB_HITTEST, 0, (LPARAM) &pt); - - if (iBtn >= 0) - { - SendMouseEvent(iBtn, uMsg, wParam); - } - - return FALSE; } DECLARE_WND_CLASS_EX(szSysPagerWndClass, CS_DBLCLKS, COLOR_3DFACE) @@ -568,17 +598,11 @@ MESSAGE_HANDLER(WM_SIZE, OnSize) NOTIFY_CODE_HANDLER(TBN_GETINFOTIPW, OnGetInfoTip) NOTIFY_CODE_HANDLER(NM_CUSTOMDRAW, OnCustomDraw) - ALT_MSG_MAP(1) - MESSAGE_RANGE_HANDLER(WM_MOUSEFIRST, WM_MOUSELAST, OnMouseEvent) END_MSG_MAP() HWND _Init(IN HWND hWndParent, IN BOOL bVisible) { DWORD dwStyle; - - NotifyItems = NULL; - ButtonCount = 0; - VisibleButtonCount = 0; /* Create the window. The tray window is going to move it to the correct position and resize it as needed. */ Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/traywnd.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/traywnd.cpp [iso-8859-1] Mon Nov 3 04:16:56 2014 @@ -53,10 +53,10 @@ const GUID IID_IShellDesktopTray = { 0x213e2df9, 0x9a14, 0x4328, { 0x99, 0xb1, 0x69, 0x61, 0xf9, 0x14, 0x3c, 0xe9 } }; -class ITrayWindowImpl : - public CComCoClass<ITrayWindowImpl>, +class CTrayWindow : + public CComCoClass<CTrayWindow>, public CComObjectRootEx<CComMultiThreadModelNoCS>, - public CWindowImpl < ITrayWindowImpl, CWindow, CControlWinTraits >, + public CWindowImpl < CTrayWindow, CWindow, CControlWinTraits >, public ITrayWindow, public IShellDesktopTray { @@ -119,7 +119,7 @@ HDPA hdpaShellServices; public: - ITrayWindowImpl() : + CTrayWindow() : TaskbarTheme(NULL), hWndDesktop(NULL), hwndStart(NULL), @@ -151,7 +151,7 @@ ZeroMemory(&MouseTrackingInfo, sizeof(MouseTrackingInfo)); } - virtual ~ITrayWindowImpl() + virtual ~CTrayWindow() { (void) InterlockedExchangePointer((PVOID*) &m_hWnd, NULL); @@ -1683,7 +1683,7 @@ static DWORD WINAPI s_TrayPropertiesThread(IN OUT PVOID pParam) { - ITrayWindowImpl *This = (ITrayWindowImpl*) pParam; + CTrayWindow *This = (CTrayWindow*) pParam; return This->TrayPropertiesThread(); } @@ -1950,7 +1950,7 @@ static DWORD WINAPI s_RunFileDlgThread(IN OUT PVOID pParam) { - ITrayWindowImpl * This = (ITrayWindowImpl*) pParam; + CTrayWindow * This = (CTrayWindow*) pParam; return This->RunFileDlgThread(); } @@ -2790,7 +2790,7 @@ DECLARE_WND_CLASS_EX(szTrayWndClass, CS_DBLCLKS, COLOR_3DFACE) - BEGIN_MSG_MAP(ITrayWindowImpl) + BEGIN_MSG_MAP(CTrayWindow) if (StartMenuBand != NULL) { MSG Msg; @@ -2848,7 +2848,7 @@ IN PVOID *ppcmContext, IN PVOID Context OPTIONAL) { - ITrayWindowImpl *This = (ITrayWindowImpl *) Context; + CTrayWindow *This = (CTrayWindow *) Context; IContextMenu *pcm = NULL; HMENU hPopup; @@ -2892,7 +2892,7 @@ IN PVOID pcmContext OPTIONAL, IN PVOID Context OPTIONAL) { - ITrayWindowImpl *This = (ITrayWindowImpl *) Context; + CTrayWindow *This = (CTrayWindow *) Context; IContextMenu *pcm = (IContextMenu *) pcmContext; if (uiCmdId != 0) @@ -3035,21 +3035,21 @@ Position = (DWORD) -1; } - DECLARE_NOT_AGGREGATABLE(ITrayWindowImpl) + DECLARE_NOT_AGGREGATABLE(CTrayWindow) DECLARE_PROTECT_FINAL_CONSTRUCT() - BEGIN_COM_MAP(ITrayWindowImpl) + BEGIN_COM_MAP(CTrayWindow) /*COM_INTERFACE_ENTRY_IID(IID_ITrayWindow, ITrayWindow)*/ COM_INTERFACE_ENTRY_IID(IID_IShellDesktopTray, IShellDesktopTray) END_COM_MAP() }; const TRAYWINDOW_CTXMENU TrayWindowCtxMenu = { - ITrayWindowImpl::CreateTrayWindowContextMenu, - ITrayWindowImpl::OnTrayWindowContextMenuCommand + CTrayWindow::CreateTrayWindowContextMenu, + CTrayWindow::OnTrayWindowContextMenuCommand }; -ITrayWindowImpl * g_TrayWindow; +CTrayWindow * g_TrayWindow; HRESULT Tray_OnStartMenuDismissed() @@ -3060,7 +3060,7 @@ HRESULT CreateTrayWindow(ITrayWindow ** ppTray) { - CComPtr<ITrayWindowImpl> Tray = new CComObject<ITrayWindowImpl>(); + CComPtr<CTrayWindow> Tray = new CComObject<CTrayWindow>(); if (Tray == NULL) return E_OUTOFMEMORY;

1 0

[gadamopoulos] 65208: [SHELL32] - Remove an old todo file that described the things that were implemented in the shell-experiments branch
by gadamopoulos＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: gadamopoulos Date: Sun Nov 2 23:50:54 2014 New Revision: 65208 URL: http://svn.reactos.org/svn/reactos?rev=65208&view=rev Log: [SHELL32] - Remove an old todo file that described the things that were implemented in the shell-experiments branch Removed: branches/shell-experiments/dll/win32/shell32/TODO.txt Removed: branches/shell-experiments/dll/win32/shell32/TODO.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/TODO.txt [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/TODO.txt (removed) @@ -1,5 +0,0 @@ -toolband -basebar -menuband -menubandsite -menudeskbar

1 0

[gadamopoulos] 65207: [SHELL32] - Move shellstring.c to a new folder called wine. More files should be moved there eventually.
by gadamopoulos＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: gadamopoulos Date: Sun Nov 2 23:41:24 2014 New Revision: 65207 URL: http://svn.reactos.org/svn/reactos?rev=65207&view=rev Log: [SHELL32] - Move shellstring.c to a new folder called wine. More files should be moved there eventually. Added: branches/shell-experiments/dll/win32/shell32/wine/ (with props) branches/shell-experiments/dll/win32/shell32/wine/shellstring.c - copied unchanged from r65200, branches/shell-experiments/dll/win32/shell32/shellstring.c Removed: branches/shell-experiments/dll/win32/shell32/shellstring.c Modified: branches/shell-experiments/dll/win32/shell32/CMakeLists.txt Modified: branches/shell-experiments/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sun Nov 2 23:41:24 2014 @@ -76,7 +76,7 @@ add_library(shell32 SHARED ${SOURCE} - shellstring.c + wine/shellstring.c vista.c shell32.rc ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c Removed: branches/shell-experiments/dll/win32/shell32/shellstring.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shellstring.c [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shellstring.c (removed) @@ -1,279 +0,0 @@ -/* - * Copyright 2000 Juergen Schmied - * - * 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 - */ - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -#include <shlobj.h> -#include <shlwapi.h> -#include <wine/unicode.h> -#include <wine/debug.h> - -#include "shell32_main.h" -#include "undocshell.h" - -WINE_DEFAULT_DEBUG_CHANNEL(shell); - -/************************* STRRET functions ****************************/ - -static const char *debugstr_strret(STRRET *s) -{ - switch (s->uType) - { - case STRRET_WSTR: - return "STRRET_WSTR"; - case STRRET_CSTR: - return "STRRET_CSTR"; - case STRRET_OFFSET: - return "STRRET_OFFSET"; - default: - return "STRRET_???"; - } -} - -BOOL WINAPI StrRetToStrNA(LPSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl) -{ - TRACE("dest=%p len=0x%x strret=%p(%s) pidl=%p\n", dest, len, src, debugstr_strret(src), pidl); - - if (!dest) - return FALSE; - - switch (src->uType) - { - case STRRET_WSTR: - WideCharToMultiByte(CP_ACP, 0, src->u.pOleStr, -1, dest, len, NULL, NULL); - CoTaskMemFree(src->u.pOleStr); - break; - case STRRET_CSTR: - lstrcpynA(dest, src->u.cStr, len); - break; - case STRRET_OFFSET: - lstrcpynA(dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len); - break; - default: - FIXME("unknown type %u!\n", src->uType); - if (len) - *dest = '\0'; - return FALSE; - } - TRACE("-- %s\n", debugstr_a(dest) ); - return TRUE; -} - -/************************************************************************/ - -BOOL WINAPI StrRetToStrNW(LPWSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl) -{ - TRACE("dest=%p len=0x%x strret=%p(%s) pidl=%p\n", dest, len, src, debugstr_strret(src), pidl); - - if (!dest) - return FALSE; - - switch (src->uType) - { - case STRRET_WSTR: - lstrcpynW(dest, src->u.pOleStr, len); - CoTaskMemFree(src->u.pOleStr); - break; - case STRRET_CSTR: - if (!MultiByteToWideChar(CP_ACP, 0, src->u.cStr, -1, dest, len) && len) - dest[len-1] = 0; - break; - case STRRET_OFFSET: - if (!MultiByteToWideChar(CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->u.uOffset, -1, dest, len) - && len) - dest[len-1] = 0; - break; - default: - FIXME("unknown type %u!\n", src->uType); - if (len) - *dest = '\0'; - return FALSE; - } - return TRUE; -} - - -/************************************************************************* - * StrRetToStrN [SHELL32.96] - * - * converts a STRRET to a normal string - * - * NOTES - * the pidl is for STRRET OFFSET - */ -BOOL WINAPI StrRetToStrNAW(LPVOID dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl) -{ - if(SHELL_OsIsUnicode()) - return StrRetToStrNW(dest, len, src, pidl); - else - return StrRetToStrNA(dest, len, src, pidl); -} - -/************************* OLESTR functions ****************************/ - -/************************************************************************ - * StrToOleStr [SHELL32.163] - * - */ -static int StrToOleStrA (LPWSTR lpWideCharStr, LPCSTR lpMultiByteString) -{ - TRACE("(%p, %p %s)\n", - lpWideCharStr, lpMultiByteString, debugstr_a(lpMultiByteString)); - - return MultiByteToWideChar(CP_ACP, 0, lpMultiByteString, -1, lpWideCharStr, MAX_PATH); - -} -static int StrToOleStrW (LPWSTR lpWideCharStr, LPCWSTR lpWString) -{ - TRACE("(%p, %p %s)\n", - lpWideCharStr, lpWString, debugstr_w(lpWString)); - - strcpyW (lpWideCharStr, lpWString ); - return strlenW(lpWideCharStr); -} - -BOOL WINAPI StrToOleStrAW (LPWSTR lpWideCharStr, LPCVOID lpString) -{ - if (SHELL_OsIsUnicode()) - return StrToOleStrW (lpWideCharStr, lpString); - return StrToOleStrA (lpWideCharStr, lpString); -} - -/************************************************************************* - * StrToOleStrN [SHELL32.79] - * lpMulti, nMulti, nWide [IN] - * lpWide [OUT] - */ -static BOOL StrToOleStrNA (LPWSTR lpWide, INT nWide, LPCSTR lpStrA, INT nStr) -{ - TRACE("(%p, %x, %s, %x)\n", lpWide, nWide, debugstr_an(lpStrA,nStr), nStr); - return MultiByteToWideChar (CP_ACP, 0, lpStrA, nStr, lpWide, nWide); -} -static BOOL StrToOleStrNW (LPWSTR lpWide, INT nWide, LPCWSTR lpStrW, INT nStr) -{ - TRACE("(%p, %x, %s, %x)\n", lpWide, nWide, debugstr_wn(lpStrW, nStr), nStr); - - if (lstrcpynW (lpWide, lpStrW, nWide)) - { return lstrlenW (lpWide); - } - return FALSE; -} - -BOOL WINAPI StrToOleStrNAW (LPWSTR lpWide, INT nWide, LPCVOID lpStr, INT nStr) -{ - if (SHELL_OsIsUnicode()) - return StrToOleStrNW (lpWide, nWide, lpStr, nStr); - return StrToOleStrNA (lpWide, nWide, lpStr, nStr); -} - -/************************************************************************* - * OleStrToStrN [SHELL32.78] - */ -static BOOL OleStrToStrNA (LPSTR lpStr, INT nStr, LPCWSTR lpOle, INT nOle) -{ - TRACE("(%p, %x, %s, %x)\n", lpStr, nStr, debugstr_wn(lpOle,nOle), nOle); - return WideCharToMultiByte (CP_ACP, 0, lpOle, nOle, lpStr, nStr, NULL, NULL); -} - -static BOOL OleStrToStrNW (LPWSTR lpwStr, INT nwStr, LPCWSTR lpOle, INT nOle) -{ - TRACE("(%p, %x, %s, %x)\n", lpwStr, nwStr, debugstr_wn(lpOle,nOle), nOle); - - if (lstrcpynW ( lpwStr, lpOle, nwStr)) - { return lstrlenW (lpwStr); - } - return FALSE; -} - -BOOL WINAPI OleStrToStrNAW (LPVOID lpOut, INT nOut, LPCVOID lpIn, INT nIn) -{ - if (SHELL_OsIsUnicode()) - return OleStrToStrNW (lpOut, nOut, lpIn, nIn); - return OleStrToStrNA (lpOut, nOut, lpIn, nIn); -} - - -/************************************************************************* - * CheckEscapesA [SHELL32.@] - * - * Checks a string for special characters which are not allowed in a path - * and encloses it in quotes if that is the case. - * - * PARAMS - * string [I/O] string to check and on return eventually quoted - * len [I] length of string - * - * RETURNS - * length of actual string - * - * NOTES - * Not really sure if this function returns actually a value at all. - */ -DWORD WINAPI CheckEscapesA( - LPSTR string, /* [I/O] string to check ??*/ - DWORD len) /* [I] is 0 */ -{ - LPWSTR wString; - DWORD ret = 0; - - TRACE("(%s %d)\n", debugstr_a(string), len); - wString = LocalAlloc(LPTR, len * sizeof(WCHAR)); - if (wString) - { - MultiByteToWideChar(CP_ACP, 0, string, len, wString, len); - ret = CheckEscapesW(wString, len); - WideCharToMultiByte(CP_ACP, 0, wString, len, string, len, NULL, NULL); - LocalFree(wString); - } - return ret; -} - -static const WCHAR strEscapedChars[] = {' ','"',',',';','^',0}; - -/************************************************************************* - * CheckEscapesW [SHELL32.@] - * - * See CheckEscapesA. - */ -DWORD WINAPI CheckEscapesW( - LPWSTR string, - DWORD len) -{ - DWORD size = lstrlenW(string); - LPWSTR s, d; - - TRACE("(%s %d) stub\n", debugstr_w(string), len); - - if (StrPBrkW(string, strEscapedChars) && size + 2 <= len) - { - s = &string[size - 1]; - d = &string[size + 2]; - *d-- = 0; - *d-- = '"'; - for (;d > string;) - *d-- = *s--; - *d = '"'; - return size + 2; - } - return size; -} Propchange: branches/shell-experiments/dll/win32/shell32/wine/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Nov 2 23:41:24 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/shell-experiments/dll/win32/shell32/wine/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/shell-experiments/dll/win32/shell32/wine/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/shell-experiments/dll/win32/shell32/wine/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[gadamopoulos] 65206: [SHELL32] - Move files that implement dialogs and property sheets in dialogs folder
by gadamopoulos＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: gadamopoulos Date: Sun Nov 2 23:30:48 2014 New Revision: 65206 URL: http://svn.reactos.org/svn/reactos?rev=65206&view=rev Log: [SHELL32] - Move files that implement dialogs and property sheets in dialogs folder Added: branches/shell-experiments/dll/win32/shell32/dialogs/ (with props) branches/shell-experiments/dll/win32/shell32/dialogs/dialogs.cpp - copied unchanged from r65200, branches/shell-experiments/dll/win32/shell32/dialogs.cpp branches/shell-experiments/dll/win32/shell32/dialogs/drive.cpp - copied unchanged from r65200, branches/shell-experiments/dll/win32/shell32/drive.cpp branches/shell-experiments/dll/win32/shell32/dialogs/drvdefext.cpp - copied unchanged from r65200, branches/shell-experiments/dll/win32/shell32/drvdefext.cpp branches/shell-experiments/dll/win32/shell32/dialogs/filedefext.cpp - copied unchanged from r65200, branches/shell-experiments/dll/win32/shell32/filedefext.cpp branches/shell-experiments/dll/win32/shell32/dialogs/folder_options.cpp - copied unchanged from r65200, branches/shell-experiments/dll/win32/shell32/folder_options.cpp branches/shell-experiments/dll/win32/shell32/dialogs/fprop.cpp - copied unchanged from r65200, branches/shell-experiments/dll/win32/shell32/fprop.cpp Removed: branches/shell-experiments/dll/win32/shell32/dialogs.cpp branches/shell-experiments/dll/win32/shell32/drive.cpp branches/shell-experiments/dll/win32/shell32/drvdefext.cpp branches/shell-experiments/dll/win32/shell32/filedefext.cpp branches/shell-experiments/dll/win32/shell32/folder_options.cpp branches/shell-experiments/dll/win32/shell32/fprop.cpp Modified: branches/shell-experiments/dll/win32/shell32/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell-experiments/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/drive.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/drvdefext.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/filedefext.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folder_options.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/fprop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she…

1 0

← Newer
1
...
30
31
32
33
34
35
36
37
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2014