Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[hpoussin] 29680: Const-ify Define class
by hpoussin＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: hpoussin Date: Fri Oct 19 17:20:27 2007 New Revision: 29680 URL: http://svn.reactos.org/svn/reactos?rev=29680&view=rev Log: Const-ify Define class Modified: trunk/reactos/tools/rbuild/define.cpp trunk/reactos/tools/rbuild/project.dtd trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/define.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/define.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/define.cpp (original) +++ trunk/reactos/tools/rbuild/define.cpp Fri Oct 19 17:20:27 2007 @@ -33,7 +33,7 @@ } Define::Define ( const Project& project, - const Module* module, + const Module* module, const XMLElement& defineNode ) : project(project), module(module), @@ -43,16 +43,16 @@ } Define::Define ( const Project& project, - const Module* module, - const std::string name_, - const std::string backend_) + const Module* module, + const std::string& name_, + const std::string& backend_) : project(project), module(module), node(NULL) { name = name_; value = ""; - backend = backend_; + backend = backend_; } Define::~Define () @@ -63,13 +63,12 @@ Define::Initialize() { const XMLAttribute* att = node->GetAttribute ( "name", true ); - const XMLAttribute* empty = node->GetAttribute ( "empty", false ); - const XMLAttribute* bck = node->GetAttribute ( "backend", false ); + const XMLAttribute* bck = node->GetAttribute ( "backend", false ); assert(att); name = att->value; - value = node->value; - if ( bck ) backend = bck->value; - if( empty ) value = " "; + value = node->value; + if ( bck ) + backend = bck->value; } void Modified: trunk/reactos/tools/rbuild/project.dtd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.dtd?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.dtd (original) +++ trunk/reactos/tools/rbuild/project.dtd Fri Oct 19 17:20:27 2007 @@ -37,8 +37,6 @@ <!ELEMENT define (#PCDATA)> <!ATTLIST define name %CIdentifier; #REQUIRED - value %Text; #IMPLIED - empty (true) #IMPLIED > <!ELEMENT directory (compilationunit*|directory*|group*|cdfile|file*|if*|ifnot*|module+|pch*|xi:include*)+> Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Fri Oct 19 17:20:27 2007 @@ -434,8 +434,8 @@ const XMLElement& defineNode ); Define ( const Project& project, const Module* module, - const std::string name_, - const std::string backend_ = "" ); + const std::string& name_, + const std::string& backend_ = "" ); ~Define(); void ProcessXML(); private:

1 0

[janderwald] 29679: - fix creating context menu entry for shortcut - add static context menu entry (under windows xp sp2 it is defined under ".lnk", however this is a little mess to define static handlers in one place and dynamic in another)
by janderwald＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: janderwald Date: Fri Oct 19 17:01:55 2007 New Revision: 29679 URL: http://svn.reactos.org/svn/reactos?rev=29679&view=rev Log: - fix creating context menu entry for shortcut - add static context menu entry (under windows xp sp2 it is defined under ".lnk", however this is a little mess to define static handlers in one place and dynamic in another) Modified: trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf (original) +++ trunk/reactos/boot/bootdata/hivecls.inf Fri Oct 19 17:01:55 2007 @@ -115,7 +115,8 @@ HKCR,"lnkfile","IsShortcut",0x00000000,"yes" HKCR,"lnkfile\CLSID","",0x00000000,"{00021401-0000-0000-C000-000000000046}" HKCR,"lnkfile\shellex\IconHandler","",0x00000000,"{00021401-0000-0000-C000-000000000046}" -HKCR,lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046},,, +HKCR,"lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046}","",0x00000000,"" +HKCR,"lnkfile\shellnew","",0x00020000,"%SystemRoot%\system32\rundll32.exe appwiz.cpl,NewLinkHere %1" ; Text Documents HKCR,".log","",0x00000000,"txtfile"

1 0

[janderwald] 29678: Author: Evan Teran <evan.teran@gmail.com> - Fix typo in GlobalAlloc parameters.
by janderwald＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: janderwald Date: Fri Oct 19 15:15:50 2007 New Revision: 29678 URL: http://svn.reactos.org/svn/reactos?rev=29678&view=rev Log: Author: Evan Teran <evan.teran(a)gmail.com> - Fix typo in GlobalAlloc parameters. Modified: trunk/reactos/dll/win32/shell32/shell32_main.c Modified: trunk/reactos/dll/win32/shell32/shell32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.c (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.c Fri Oct 19 15:15:50 2007 @@ -97,7 +97,7 @@ /* Return the path to the executable */ DWORD len, size=16; - hargv=GlobalAlloc(size, 0); + hargv=GlobalAlloc(0, size); argv=GlobalLock(hargv); for (;;) {

1 0

[janderwald] 29677: - add printer folder - patch by Huw D M Davies (http://www.winehq.org/pipermail/wine-patches/2005-April/016926.html) - register bitbucket context menu extension
by janderwald＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: janderwald Date: Fri Oct 19 15:03:05 2007 New Revision: 29677 URL: http://svn.reactos.org/svn/reactos?rev=29677&view=rev Log: - add printer folder - patch by Huw D M Davies (http://www.winehq.org/pipermail/wine-patches/2005-April/016926.html) - register bitbucket context menu extension Added: trunk/reactos/dll/win32/shell32/shfldr_printers.c (with props) Modified: trunk/reactos/dll/win32/shell32/recyclebin.c trunk/reactos/dll/win32/shell32/regsvr.c trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shellole.c Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c Fri Oct 19 15:03:05 2007 @@ -175,7 +175,7 @@ || IsEqualGUID(riid, &IID_IPersistFolder2)) *ppvObject = &This->lpPersistFolderVtbl; - if (IsEqualGUID(riid, &IID_IContextMenu)) + if (IsEqualIID(riid, &IID_IContextMenu)) *ppvObject = &This->lpCmt; if (*ppvObject != NULL) @@ -586,6 +586,12 @@ FIXME("stub\n"); return S_OK; } + +/************************************************************************* + * BitBucket context menu + * + */ + static HRESULT WINAPI RecycleBin_IContextMenu_QueryInterface( IContextMenu* iface, REFIID riid, void** ppvObject ) { @@ -622,16 +628,17 @@ return E_INVALIDARG; memset( &mii, 0, sizeof(mii) ); - mii.cbSize = sizeof (mii); + mii.cbSize = sizeof(mii); mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE; mii.dwTypeData = (LPWSTR)szOpen; mii.cch = strlenW( mii.dwTypeData ); mii.wID = idCmdFirst + id++; mii.fState = MFS_ENABLED; mii.fType = MFT_STRING; + if (!InsertMenuItemW( hmenu, indexMenu, TRUE, &mii )) return E_FAIL; - This->iIdOpen = 0; + This->iIdOpen = 1; mii.fState = MFS_ENABLED; mii.dwTypeData = (LPWSTR)szEmpty; @@ -642,9 +649,7 @@ TRACE("RecycleBin_IContextMenu_QueryContextMenu failed to insert item properties"); return E_FAIL; } - This->iIdEmpty = 1; - id++; - + This->iIdEmpty = 2; mii.fState = MFS_ENABLED; mii.dwTypeData = (LPWSTR)szProperties; mii.cch = strlenW( mii.dwTypeData ); @@ -654,9 +659,7 @@ TRACE("RecycleBin_IContextMenu_QueryContextMenu failed to insert item properties"); return E_FAIL; } - This->iIdProperties = 2; - id++; - + This->iIdProperties = 3; return MAKE_HRESULT( SEVERITY_SUCCESS, 0, id ); } @@ -665,9 +668,16 @@ { RecycleBin * This = impl_from_IContextMenu(iface); - TRACE("%p %p\n", This, lpici ); - - return E_FAIL; + TRACE("%p %p verb %p\n", This, lpici, lpici->lpVerb); + + if ( lpici->lpVerb == MAKEINTRESOURCEA(This->iIdProperties)) + { + WCHAR szDrive = 'C'; + SH_ShowRecycleBinProperties(szDrive); + return S_OK; + } + + return S_OK; } static HRESULT WINAPI Modified: trunk/reactos/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… ============================================================================== --- trunk/reactos/dll/win32/shell32/regsvr.c (original) +++ trunk/reactos/dll/win32/shell32/regsvr.c Fri Oct 19 15:03:05 2007 @@ -75,6 +75,7 @@ LPCSTR clsid_str; /* can be NULL to omit */ LPCSTR progid; /* can be NULL to omit */ UINT idDefaultIcon; /* can be 0 to omit */ +// CLSID const *clsid_menu; /* can be NULL to omit */ }; /* flags for regsvr_coclass.flags */ @@ -131,6 +132,7 @@ 'a', 'u', 'l', 't', 'M', 'e', 'n', 'u', 0 }; static WCHAR const defaulticon_keyname[] = { 'D','e','f','a','u','l','t','I','c','o','n',0}; +static WCHAR const contextmenu_keyname[] = { 'C', 'o', 'n', 't', 'e', 'x', 't', 'M', 'e', 'n', 'u', 'H', 'a', 'n', 'd', 'l', 'e', 'r', 's', 0 }; static char const tmodel_valuename[] = "ThreadingModel"; static char const wfparsing_valuename[] = "WantsFORPARSING"; static char const attributes_valuename[] = "Attributes"; @@ -375,6 +377,28 @@ RegCloseKey(progid_key); if (res != ERROR_SUCCESS) goto error_close_clsid_key; } + if (IsEqualIID(list->clsid, &CLSID_RecycleBin)) {//if (list->clsid_menu) { + HKEY shellex_key, cmenu_key, menuhandler_key; + res = RegCreateKeyExW(clsid_key, shellex_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &shellex_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + res = RegCreateKeyExW(shellex_key, contextmenu_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &cmenu_key, NULL); + if (res != ERROR_SUCCESS) { + RegCloseKey(shellex_key); + goto error_close_clsid_key; + } + + StringFromGUID2(list->clsid, buf, 39); //clsid_menu + res = RegCreateKeyExW(cmenu_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &menuhandler_key, NULL); + RegCloseKey(menuhandler_key); + RegCloseKey(cmenu_key); + RegCloseKey(shellex_key); + } error_close_clsid_key: RegCloseKey(clsid_key); @@ -555,6 +579,13 @@ "shell32.dll", "Apartment" }, + { &CLSID_Printers, + "Printers & Fax", + 0, + NULL, + "shell32.dll", + "Apartment" + }, { &CLSID_MyComputer, "My Computer", IDS_MYCOMPUTER, @@ -634,6 +665,7 @@ NULL, NULL, IDI_SHELL_FULL_RECYCLE_BIN +// &CLSID_RecycleBin }, { &CLSID_ShellFSFolder, "Shell File System Folder", Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild Fri Oct 19 15:03:05 2007 @@ -24,6 +24,7 @@ <library>version</library> <library>devmgr</library> <library>rtl</library> + <library>winspool</library> <file>authors.c</file> <file>autocomplete.c</file> <file>brsfolder.c</file> @@ -52,6 +53,7 @@ <file>shfldr_desktop.c</file> <file>shfldr_fs.c</file> <file>shfldr_mycomp.c</file> + <file>shfldr_printers.c</file> <file>shlexec.c</file> <file>shlfileop.c</file> <file>shlfolder.c</file> Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h Fri Oct 19 15:03:05 2007 @@ -90,6 +90,7 @@ HRESULT WINAPI IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, LPVOID * ppv); HRESULT WINAPI ISF_Desktop_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI ISF_MyComputer_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); +HRESULT WINAPI ISF_Printers_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV); HRESULT WINAPI IControlPanel_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); Modified: trunk/reactos/dll/win32/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.c (original) +++ trunk/reactos/dll/win32/shell32/shellole.c Fri Oct 19 15:03:05 2007 @@ -75,6 +75,7 @@ {&CLSID_FolderShortcut, &FolderShortcut_Constructor}, {&CLSID_MyDocuments, &MyDocuments_Constructor}, #endif + {&CLSID_Printers, &ISF_Printers_Constructor}, {&CLSID_RecycleBin, &RecycleBin_Constructor}, {NULL,NULL} }; Added: trunk/reactos/dll/win32/shell32/shfldr_printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_p… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_printers.c (added) +++ trunk/reactos/dll/win32/shell32/shfldr_printers.c Fri Oct 19 15:03:05 2007 @@ -1,0 +1,847 @@ +/* + * Virtual Printers Folder + * + * Copyright 1997 Marcus Meissner + * Copyright 1998, 1999, 2002 Juergen Schmied + * Copyright 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdlib.h> +#include <string.h> +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "wingdi.h" +#include "winuser.h" +#include "winspool.h" + +#include "ole2.h" +#include "shlguid.h" + +#include "enumidlist.h" +#include "pidl.h" +#include "undocshell.h" +#include "shell32_main.h" +#include "shresdef.h" +#include "shlwapi.h" +#include "shellfolder.h" +#include "wine/debug.h" +#include "debughlp.h" +#include "shfldr.h" +#include "shresdef.h" + +WINE_DEFAULT_DEBUG_CHANNEL (shell); + +/*********************************************************************** + * Printers_IExtractIconW implementation + */ +typedef struct +{ + IExtractIconWVtbl *lpVtbl; + IExtractIconAVtbl *lpvtblExtractIconA; + volatile LONG ref; + LPITEMIDLIST pidl; +} IExtractIconWImpl; + +#define _IExtractIconA_Offset ((int)(&(((IExtractIconWImpl*)0)->lpvtblExtractIconA))) +#define _ICOM_THIS_From_IExtractIconA(class, name) class* This = (class*)(((char*)name)-_IExtractIconA_Offset); + +/************************************************************************** + * IExtractIconW_QueryInterface + */ +static HRESULT WINAPI IEI_Printers_fnQueryInterface(IExtractIconW *iface, REFIID riid, LPVOID *ppvObj) +{ + IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + + TRACE("(%p)->(\n\tIID:\t%s,%p)\n", This, debugstr_guid(riid), ppvObj); + + *ppvObj = NULL; + + if (IsEqualIID(riid, &IID_IUnknown)) + { + *ppvObj = This; + } + else if (IsEqualIID(riid, &IID_IExtractIconW)) + { + *ppvObj = (IExtractIconW*)This; + } + else if (IsEqualIID(riid, &IID_IExtractIconA)) + { + *ppvObj = (IExtractIconA*)&(This->lpvtblExtractIconA); + } + + if(*ppvObj) + { + IExtractIconW_AddRef((IExtractIconW*) *ppvObj); + TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj); + return S_OK; + } + TRACE("-- Interface: E_NOINTERFACE\n"); + return E_NOINTERFACE; +} + +/************************************************************************** + * IExtractIconW_AddRef + */ +static ULONG WINAPI IEI_Printers_fnAddRef(IExtractIconW * iface) +{ + IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + + return refCount; +} + +/************************************************************************** + * IExtractIconW_Release + */ +static ULONG WINAPI IEI_Printers_fnRelease(IExtractIconW * iface) +{ + IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(count=%lu)\n", This, refCount + 1); + + if (!refCount) + { + TRACE(" destroying IExtractIcon(%p)\n",This); + SHFree(This->pidl); + HeapFree(GetProcessHeap(),0,This); + return 0; + } + return refCount; +} + +/************************************************************************** + * IExtractIconW_GetIconLocation + * + * mapping filetype to icon + */ +static HRESULT WINAPI IEI_Printers_fnGetIconLocation( + IExtractIconW * iface, + UINT uFlags, /* GIL_ flags */ + LPWSTR szIconFile, + UINT cchMax, + int *piIndex, + UINT *pwFlags) /* returned GIL_ flags */ +{ + IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + + TRACE("(%p) (flags=%u %p %u %p %p)\n", This, uFlags, szIconFile, cchMax, piIndex, pwFlags); + + if (pwFlags) + *pwFlags = 0; + + lstrcpynW(szIconFile, swShell32Name, cchMax); + *piIndex = -IDI_SHELL_PRINTER; /* FIXME: other icons for default, network, print to file */ + + TRACE("-- %s %x\n", debugstr_w(szIconFile), *piIndex); + return NOERROR; +} + +/************************************************************************** + * IExtractIconW_Extract + */ +static HRESULT WINAPI IEI_Printers_fnExtract(IExtractIconW *iface, LPCWSTR pszFile, + UINT nIconIndex, HICON *phiconLarge, + HICON *phiconSmall, UINT nIconSize) +{ + IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + int index; + + FIXME("(%p) (file=%p index=%d %p %p size=%x) semi-stub\n", This, debugstr_w(pszFile), + (signed)nIconIndex, phiconLarge, phiconSmall, nIconSize); + + index = SIC_GetIconIndex(pszFile, nIconIndex, 0); + + if (phiconLarge) + *phiconLarge = ImageList_GetIcon(ShellBigIconList, index, ILD_TRANSPARENT); + + if (phiconSmall) + *phiconSmall = ImageList_GetIcon(ShellSmallIconList, index, ILD_TRANSPARENT); + + return S_OK; +} + +static struct IExtractIconWVtbl eivt = +{ + IEI_Printers_fnQueryInterface, + IEI_Printers_fnAddRef, + IEI_Printers_fnRelease, + IEI_Printers_fnGetIconLocation, + IEI_Printers_fnExtract +}; + +/************************************************************************** + * IExtractIconA_QueryInterface + */ +static HRESULT WINAPI IEIA_Printers_fnQueryInterface(IExtractIconA * iface, REFIID riid, LPVOID *ppvObj) +{ + _ICOM_THIS_From_IExtractIconA(IExtractIconW, iface); + + return IExtractIconW_QueryInterface(This, riid, ppvObj); +} + +/************************************************************************** + * IExtractIconA_AddRef + */ +static ULONG WINAPI IEIA_Printers_fnAddRef(IExtractIconA * iface) +{ + _ICOM_THIS_From_IExtractIconA(IExtractIconW, iface); + + return IExtractIconW_AddRef(This); +} +/************************************************************************** + * IExtractIconA_Release + */ +static ULONG WINAPI IEIA_Printers_fnRelease(IExtractIconA * iface) +{ + _ICOM_THIS_From_IExtractIconA(IExtractIconW, iface); + + return IExtractIconW_AddRef(This); +} + +/************************************************************************** + * IExtractIconA_GetIconLocation + */ +static HRESULT WINAPI IEIA_Printers_fnGetIconLocation( + IExtractIconA * iface, + UINT uFlags, + LPSTR szIconFile, + UINT cchMax, + int * piIndex, + UINT * pwFlags) +{ + HRESULT ret; + LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, cchMax * sizeof(WCHAR)); + _ICOM_THIS_From_IExtractIconA(IExtractIconW, iface); + + TRACE("(%p) (flags=%u %p %u %p %p)\n", This, uFlags, szIconFile, cchMax, piIndex, pwFlags); + + ret = IExtractIconW_GetIconLocation(This, uFlags, lpwstrFile, cchMax, piIndex, pwFlags); + WideCharToMultiByte(CP_ACP, 0, lpwstrFile, -1, szIconFile, cchMax, NULL, NULL); + HeapFree(GetProcessHeap(), 0, lpwstrFile); + + TRACE("-- %s %x\n", szIconFile, *piIndex); + return ret; +} +/************************************************************************** + * IExtractIconA_Extract + */ +static HRESULT WINAPI IEIA_Printers_fnExtract(IExtractIconA *iface, LPCSTR pszFile, + UINT nIconIndex, HICON *phiconLarge, + HICON *phiconSmall, UINT nIconSize) +{ + HRESULT ret; + INT len = MultiByteToWideChar(CP_ACP, 0, pszFile, -1, NULL, 0); + LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + _ICOM_THIS_From_IExtractIconA(IExtractIconW, iface); + + TRACE("(%p) (file=%p index=%u %p %p size=%u)\n", This, pszFile, nIconIndex, phiconLarge, phiconSmall, nIconSize); + + MultiByteToWideChar(CP_ACP, 0, pszFile, -1, lpwstrFile, len); + ret = IExtractIconW_Extract(This, lpwstrFile, nIconIndex, phiconLarge, phiconSmall, nIconSize); + HeapFree(GetProcessHeap(), 0, lpwstrFile); + return ret; +} + +static struct IExtractIconAVtbl eiavt = +{ + IEIA_Printers_fnQueryInterface, + IEIA_Printers_fnAddRef, + IEIA_Printers_fnRelease, + IEIA_Printers_fnGetIconLocation, + IEIA_Printers_fnExtract +}; + +/************************************************************************** + * IExtractIcon_Constructor + */ +static IUnknown *IEI_Printers_Constructor(LPCITEMIDLIST pidl) +{ + IExtractIconWImpl* ei; + + TRACE("%p\n", pidl); + + ei = HeapAlloc(GetProcessHeap(),0,sizeof(IExtractIconWImpl)); + ei->ref = 1; + ei->lpVtbl = &eivt; + ei->lpvtblExtractIconA = &eiavt; + ei->pidl=ILClone(pidl); + + pdump(pidl); + + TRACE("(%p)\n", ei); + return (IUnknown *)ei; +} + +/*********************************************************************** + * Printers folder implementation + */ + +typedef struct { + IShellFolder2Vtbl *lpVtbl; + IPersistFolder2Vtbl *lpVtblPersistFolder2; + + DWORD ref; + + CLSID *pclsid; + + LPITEMIDLIST pidlRoot; /* absolute pidl */ + + int dwAttributes; /* attributes returned by GetAttributesOf FIXME: use it */ +} IGenericSFImpl; + +#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) +#define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); + +#define _IUnknown_(This) (IShellFolder*)&(This->lpVtbl) +#define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl) + +#define _IPersist_(This) (IPersist*)&(This->lpVtblPersistFolder2) +#define _IPersistFolder_(This) (IPersistFolder*)&(This->lpVtblPersistFolder2) +#define _IPersistFolder2_(This) (IPersistFolder2*)&(This->lpVtblPersistFolder2) + +/************************************************************************** + * ISF_Printers_fnQueryInterface + * + * NOTE does not support IPersist/IPersistFolder + */ +static HRESULT WINAPI ISF_Printers_fnQueryInterface( + IShellFolder2 * iface, REFIID riid, LPVOID * ppvObj) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); + + *ppvObj = NULL; + + if (IsEqualIID (riid, &IID_IUnknown) || + IsEqualIID (riid, &IID_IShellFolder) || + IsEqualIID (riid, &IID_IShellFolder2)) + { + *ppvObj = This; + } + + else if (IsEqualIID (riid, &IID_IPersist) || + IsEqualIID (riid, &IID_IPersistFolder) || + IsEqualIID (riid, &IID_IPersistFolder2)) + { + *ppvObj = _IPersistFolder2_ (This); + } + + if (*ppvObj) + { + IUnknown_AddRef ((IUnknown *) (*ppvObj)); + TRACE ("-- Interface: (%p)->(%p)\n", ppvObj, *ppvObj); + return S_OK; + } + TRACE ("-- Interface: E_NOINTERFACE\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ISF_Printers_fnAddRef (IShellFolder2 * iface) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); + + return refCount; +} + +static ULONG WINAPI ISF_Printers_fnRelease (IShellFolder2 * iface) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); + + if (!refCount) + { + TRACE ("-- destroying IShellFolder(%p)\n", This); + if (This->pidlRoot) + SHFree (This->pidlRoot); + LocalFree ((HLOCAL) This); + return 0; + } + return refCount; +} + +/************************************************************************** + * ISF_Printers_fnParseDisplayName + * + * This is E_NOTIMPL in Windows too. + */ +static HRESULT WINAPI ISF_Printers_fnParseDisplayName (IShellFolder2 * iface, + HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, + DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", + This, hwndOwner, pbc, lpszDisplayName, debugstr_w(lpszDisplayName), + pchEaten, ppidl, pdwAttributes); + + *ppidl = 0; + if (pchEaten) + *pchEaten = 0; + + return E_NOTIMPL; +} + +/************************************************************************** + * CreatePrintersEnumList() + */ +static BOOL CreatePrintersEnumList(IEnumIDList *list, DWORD dwFlags) +{ + BOOL ret = TRUE; + + TRACE("(%p)->(flags=0x%08lx) \n",list,dwFlags); + + /* enumerate the folders */ + if (dwFlags & SHCONTF_NONFOLDERS) + { + DWORD needed, num, i; + PRINTER_INFO_4W *pi; + + EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 4, NULL, 0, &needed, &num); + pi = HeapAlloc(GetProcessHeap(), 0, needed); + if(!EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 4, (LPBYTE)pi, needed, &needed, &num)) { + HeapFree(GetProcessHeap(), 0, pi); + return FALSE; + } + + for(i = 0; i < num; i++) { + DWORD len = strlenW(pi[i].pPrinterName); + LPITEMIDLIST pidl = _ILAlloc(PT_VALUEW, (len + 1) * sizeof(WCHAR)); + LPPIDLDATA data = _ILGetDataPointer(pidl); + memcpy(data->u.valueW.name, pi[i].pPrinterName, (len + 1) * sizeof(WCHAR)); + AddToEnumList(list, pidl); + } + + HeapFree(GetProcessHeap(), 0, pi); + } + return ret; +} + +/************************************************************************** + * ISF_Printers_fnEnumObjects + */ +static HRESULT WINAPI ISF_Printers_fnEnumObjects (IShellFolder2 * iface, + HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", + This, hwndOwner, dwFlags, ppEnumIDList); + + if(!ppEnumIDList) return E_OUTOFMEMORY; + *ppEnumIDList = IEnumIDList_Constructor(); + if (*ppEnumIDList) + CreatePrintersEnumList(*ppEnumIDList, dwFlags); + + TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); + + return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY; +} + +/************************************************************************** + * ISF_Printers_fnBindToObject + */ +static HRESULT WINAPI ISF_Printers_fnBindToObject (IShellFolder2 * iface, + LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(pidl=%p,%p,%s,%p)\n", + This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); + + return E_NOTIMPL; +} + +/************************************************************************** + * ISF_Printers_fnBindToStorage + */ +static HRESULT WINAPI ISF_Printers_fnBindToStorage (IShellFolder2 * iface, + LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(pidl=%p,%p,%s,%p) stub\n", + This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); + + *ppvOut = NULL; + return E_NOTIMPL; +} + +/************************************************************************** + * ISF_Printers_fnCompareIDs + */ +static HRESULT WINAPI ISF_Printers_fnCompareIDs (IShellFolder2 * iface, + LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p): stub\n", This, lParam, pidl1, pidl2); + return E_NOTIMPL; +} + +/************************************************************************** + * ISF_Printers_fnCreateViewObject + */ +static HRESULT WINAPI ISF_Printers_fnCreateViewObject (IShellFolder2 * iface, + HWND hwndOwner, REFIID riid, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(hwnd=%p,%s,%p): stub\n", + This, hwndOwner, shdebugstr_guid (riid), ppvOut); + + return E_NOTIMPL; +} + +/************************************************************************** + * ISF_Printers_fnGetAttributesOf + */ +static HRESULT WINAPI ISF_Printers_fnGetAttributesOf (IShellFolder2 * iface, + UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(cidl=%d apidl=%p mask=0x%08lx): stub\n", + This, cidl, apidl, *rgfInOut); + + return E_NOTIMPL; +} + +/************************************************************************** + * ISF_Printers_fnGetUIObjectOf + * + * PARAMETERS + * HWND hwndOwner, //[in ] Parent window for any output + * UINT cidl, //[in ] array size + * LPCITEMIDLIST* apidl, //[in ] simple pidl array + * REFIID riid, //[in ] Requested Interface + * UINT* prgfInOut, //[ ] reserved + * LPVOID* ppvObject) //[out] Resulting Interface + * + */ +static HRESULT WINAPI ISF_Printers_fnGetUIObjectOf (IShellFolder2 * iface, + HWND hwndOwner, UINT cidl, LPCITEMIDLIST * apidl, + REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + IUnknown *pObj = NULL; + HRESULT hr = E_INVALIDARG; + + TRACE ("(%p)->(%p,%u,apidl=%p,%s,%p,%p)\n", + This, hwndOwner, cidl, apidl, shdebugstr_guid (riid), prgfInOut, ppvOut); + + if (!ppvOut) + return hr; + + *ppvOut = NULL; + + if ((IsEqualIID (riid, &IID_IExtractIconA) || IsEqualIID(riid, &IID_IExtractIconW)) && (cidl == 1)) + { + IUnknown *pUnk = IEI_Printers_Constructor(apidl[0]); + hr = IUnknown_QueryInterface(pUnk, riid, (void**)&pObj); + IUnknown_Release(pUnk); + } + else + hr = E_NOINTERFACE; + + if (SUCCEEDED(hr) && !pObj) + hr = E_OUTOFMEMORY; + + *ppvOut = pObj; + TRACE ("(%p)->hr=0x%08lx\n", This, hr); + return hr; +} + +/************************************************************************** + * ISF_Printers_fnGetDisplayNameOf + * + */ +static HRESULT WINAPI ISF_Printers_fnGetDisplayNameOf (IShellFolder2 * iface, + LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + WCHAR *name; + DWORD len; + + TRACE ("(%p)->(pidl=%p,0x%08lx,%p)\n", This, pidl, dwFlags, strRet); + pdump (pidl); + + if (!strRet) + return E_INVALIDARG; + + name = _ILGetDataPointer(pidl)->u.valueW.name; + len = strlenW(name); + + strRet->uType = STRRET_WSTR; + strRet->u.pOleStr = SHAlloc((len + 1) * sizeof(WCHAR)); + memcpy(strRet->u.pOleStr, name, (len + 1) * sizeof(WCHAR)); + + TRACE("ret %s\n", debugstr_w(strRet->u.pOleStr)); + + return S_OK; +} + +/************************************************************************** + * ISF_Printers_fnSetNameOf + * Changes the name of a file object or subfolder, possibly changing its item + * identifier in the process. + * + * PARAMETERS + * HWND hwndOwner, //[in ] Owner window for output + * LPCITEMIDLIST pidl, //[in ] simple pidl of item to change + * LPCOLESTR lpszName, //[in ] the items new display name + * DWORD dwFlags, //[in ] SHGNO formatting flags + * LPITEMIDLIST* ppidlOut) //[out] simple pidl returned + */ +static HRESULT WINAPI ISF_Printers_fnSetNameOf (IShellFolder2 * iface, + HWND hwndOwner, LPCITEMIDLIST pidl, /* simple pidl */ + LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, + debugstr_w (lpName), dwFlags, pPidlOut); + + return E_FAIL; +} + +static HRESULT WINAPI ISF_Printers_fnGetDefaultSearchGUID(IShellFolder2 *iface, + GUID * pguid) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_Printers_fnEnumSearches (IShellFolder2 *iface, + IEnumExtraSearch ** ppenum) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + FIXME ("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_Printers_fnGetDefaultColumn (IShellFolder2 * iface, + DWORD dwRes, ULONG * pSort, ULONG * pDisplay) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p): stub\n", This); + + return E_NOTIMPL; +} +static HRESULT WINAPI ISF_Printers_fnGetDefaultColumnState ( + IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_Printers_fnGetDetailsEx (IShellFolder2 * iface, + LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + FIXME ("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_Printers_fnGetDetailsOf (IShellFolder2 * iface, + LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(%p %i %p): stub\n", This, pidl, iColumn, psd); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_Printers_fnMapColumnToSCID ( + IShellFolder2 * iface, UINT column, SHCOLUMNID * pscid) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + FIXME ("(%p): stub\n", This); + return E_NOTIMPL; +} + +static IShellFolder2Vtbl vt_ShellFolder2 = +{ + ISF_Printers_fnQueryInterface, + ISF_Printers_fnAddRef, + ISF_Printers_fnRelease, + ISF_Printers_fnParseDisplayName, + ISF_Printers_fnEnumObjects, + ISF_Printers_fnBindToObject, + ISF_Printers_fnBindToStorage, + ISF_Printers_fnCompareIDs, + ISF_Printers_fnCreateViewObject, + ISF_Printers_fnGetAttributesOf, + ISF_Printers_fnGetUIObjectOf, + ISF_Printers_fnGetDisplayNameOf, + ISF_Printers_fnSetNameOf, + /* ShellFolder2 */ + ISF_Printers_fnGetDefaultSearchGUID, + ISF_Printers_fnEnumSearches, + ISF_Printers_fnGetDefaultColumn, + ISF_Printers_fnGetDefaultColumnState, + ISF_Printers_fnGetDetailsEx, + ISF_Printers_fnGetDetailsOf, + ISF_Printers_fnMapColumnToSCID +}; + +/************************************************************************ + * IPF_Printers_QueryInterface + */ +static HRESULT WINAPI IPF_Printers_QueryInterface ( + IPersistFolder2 * iface, REFIID iid, LPVOID * ppvObj) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)\n", This); + + return IUnknown_QueryInterface (_IUnknown_ (This), iid, ppvObj); +} + +/************************************************************************ + * IPF_Printers_AddRef + */ +static ULONG WINAPI IPF_Printers_AddRef (IPersistFolder2 * iface) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)->(count=%lu)\n", This, This->ref); + + return IUnknown_AddRef (_IUnknown_ (This)); +} + +/************************************************************************ + * IPF_Printers_Release + */ +static ULONG WINAPI IPF_Printers_Release (IPersistFolder2 * iface) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)->(count=%lu)\n", This, This->ref); + + return IUnknown_Release (_IUnknown_ (This)); +} + +/************************************************************************ + * IPF_Printers_GetClassID + */ +static HRESULT WINAPI IPF_Printers_GetClassID ( + IPersistFolder2 * iface, CLSID * lpClassId) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)\n", This); + + *lpClassId = CLSID_Printers; + + return S_OK; +} + +/************************************************************************ + * IPF_Printers_Initialize + * + */ +static HRESULT WINAPI IPF_Printers_Initialize ( + IPersistFolder2 * iface, LPCITEMIDLIST pidl) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + FIXME ("(%p)->(%p): stub\n", This, pidl); + return E_NOTIMPL; +} + +/************************************************************************** + * IPF_Printers_fnGetCurFolder + */ +static HRESULT WINAPI IPF_Printers_GetCurFolder ( + IPersistFolder2 * iface, LPITEMIDLIST * pidl) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)->(%p)\n", This, pidl); + + *pidl = ILClone (This->pidlRoot); + return S_OK; +} + +static IPersistFolder2Vtbl vt_PersistFolder2 = +{ + IPF_Printers_QueryInterface, + IPF_Printers_AddRef, + IPF_Printers_Release, + IPF_Printers_GetClassID, + IPF_Printers_Initialize, + IPF_Printers_GetCurFolder +}; + +/************************************************************************** + * ISF_Printers_Constructor + */ +HRESULT WINAPI ISF_Printers_Constructor ( + IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) +{ + IGenericSFImpl *sf; + HRESULT hr; + + TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid)); + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + sf = HeapAlloc( GetProcessHeap(), 0, sizeof(*sf) ); + if (!sf) + return E_OUTOFMEMORY; + + sf->ref = 1; + sf->lpVtbl = &vt_ShellFolder2; + sf->lpVtblPersistFolder2 = &vt_PersistFolder2; + + sf->pidlRoot = _ILCreatePrinters(); /* my qualified pidl */ + + hr = IUnknown_QueryInterface( _IUnknown_(sf), riid, ppv ); + IUnknown_Release( _IUnknown_(sf) ); + + TRACE ("--(%p)\n", *ppv); + return hr; +} Propchange: trunk/reactos/dll/win32/shell32/shfldr_printers.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 29676: - load dynamic IContextMenu extensions from registry - it uses the key shellex\ContextMenuHandlers\{CLSID} to load extensions - make SHCreateDefaultContextMenu use default IContextMenu implementation - TBD for static IContextMenu extensions and for creating a new object of that type (ShellNew) - code currently if 0' out
by janderwald＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: janderwald Date: Fri Oct 19 14:52:07 2007 New Revision: 29676 URL: http://svn.reactos.org/svn/reactos?rev=29676&view=rev Log: - load dynamic IContextMenu extensions from registry - it uses the key shellex\ContextMenuHandlers\{CLSID} to load extensions - make SHCreateDefaultContextMenu use default IContextMenu implementation - TBD for static IContextMenu extensions and for creating a new object of that type (ShellNew) - code currently if 0' out Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Fri Oct 19 14:52:07 2007 @@ -35,7 +35,7 @@ #include "shell32_main.h" #include "shellfolder.h" - +#include "debughlp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); /* ugly hack for cut&paste files */ @@ -52,8 +52,13 @@ LPITEMIDLIST *apidl; /* array of child pidls */ UINT cidl; BOOL bAllValues; + IContextMenu ** ecmenu; + UINT esize; + UINT ecount; } ItemCmImpl; +UINT +SH_EnumerateDynamicContextHandlerForKey(LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj); static const IContextMenu2Vtbl cmvt; @@ -209,6 +214,67 @@ InsertMenuItemA( hmenu, indexMenu, fByPosition, &mii); } +BOOL +SH_EnlargeContextMenuArray(ItemCmImpl *This, UINT newsize) +{ + BOOL ret = FALSE; + + if (This->ecmenu == NULL) + { + This->ecmenu = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, sizeof(IContextMenu*) *10); + if(This->ecmenu) + ret = TRUE; + This->ecount = 0; + This->esize = 10; + } + else + { + IContextMenu ** newcmenu = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IContextMenu*)*newsize); + if (newcmenu) + { + memcpy(newcmenu, This->ecmenu, This->ecount * sizeof(IContextMenu*)); + HeapFree(GetProcessHeap(), 0, This->ecmenu); + This->ecmenu = newcmenu; + ret = TRUE; + } + } + return ret; +} + +VOID +SH_LoadContextMenuHandlers(ItemCmImpl *This, IDataObject * pDataObj) +{ + UINT i; + WCHAR buffer[111]; + char ebuf[10]; + HRESULT hr; + + for (i = 0; i < This->cidl; i++) + { + GUID * guid = _ILGetGUIDPointer(This->apidl[i]); + if (guid) + { + LPOLESTR pwszCLSID; + static const WCHAR CLSID[] = { 'C','L','S','I','D','\\',0 }; + wcscpy(buffer, CLSID); + hr = StringFromCLSID(guid, &pwszCLSID); + if (hr == S_OK) + { + memcpy(&buffer[6], pwszCLSID, 38 * sizeof(WCHAR)); + SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj); + } + } + + if (_ILGetExtension(This->apidl[i], ebuf, sizeof(ebuf) / sizeof(char))) + { + buffer[0] = L'\0'; + if (MultiByteToWideChar(CP_ACP, 0, ebuf, -1, buffer, 111)) + SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj); + } + } + +} + /************************************************************************** * ISvItemCm_fnQueryContextMenu() * FIXME: load menu MENU_SHV_FILE out of resources instead if creating @@ -222,7 +288,10 @@ UINT idCmdLast, UINT uFlags) { - ItemCmImpl *This = (ItemCmImpl *)iface; + IDataObject * pDataObj; + ItemCmImpl *This = (ItemCmImpl *)iface; + USHORT lastindex = 0; + TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); @@ -260,9 +329,18 @@ _InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_PROPERTIES, MFT_STRING, "&Properties", MFS_ENABLED); - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (FCIDM_SHVIEWLAST)); - } - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); + lastindex = FCIDM_SHVIEWLAST; + } +#if 0 + pDataObj = IDataObject_Constructor(NULL, This->pidl, This->apidl, This->cidl); + if (pDataObj) + { + SH_LoadContextMenuHandlers(This, pDataObj); + pDataObj->Release (); + } +#endif + + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, lastindex); } /************************************************************************** @@ -600,6 +678,93 @@ ISvItemCm_fnHandleMenuMsg }; +HRESULT +SH_LoadDynamicContextMenuHandler(HKEY hKey, LPCWSTR szClass, IContextMenu** ppv, IDataObject * pDataObj) +{ + HRESULT hr; + IContextMenu * cmobj; + IShellExtInit *shext; + + hr = SHCoCreateInstance(szClass, NULL, NULL, &IID_IContextMenu, (void**)&cmobj); + if (hr != S_OK) + { + TRACE("SHCoCreateInstance failed\n"); + return hr; + } + + hr = cmobj->lpVtbl->QueryInterface(cmobj, &IID_IShellExtInit, (void**)&shext); + if (hr != S_OK) + { + TRACE("Failed to query for interface IID_IShellExtInit\n"); + cmobj->lpVtbl->Release(cmobj); + return FALSE; + } + + hr = shext->lpVtbl->Initialize(shext, NULL, pDataObj, hKey); + if (hr != S_OK) + { + TRACE("Failed to initialize shell extension\n"); + shext->lpVtbl->Release(shext); + cmobj->lpVtbl->Release(cmobj); + } + else + { + *ppv = cmobj; + } + + return hr; +} + +UINT +SH_EnumerateDynamicContextHandlerForKey(LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj) +{ + HKEY hKey; + WCHAR szKey[MAX_PATH]; + WCHAR szName[MAX_PATH]; + DWORD dwIndex, dwName; + LONG res; + HRESULT hResult; + IContextMenu * cmobj; + UINT index; + static const WCHAR szShellEx[] = { '\\','s','h','e','l','l','e','x','\\','C','o','n','t','e','x','t','M','e','n','u','H','a','n','d','l','e','r','s',0 }; + + wcscpy(szKey, szFileClass); + wcscat(szKey, szShellEx); + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + { + TRACE("RegOpenKeyExW failed for key %s\n", debugstr_w(szKey)); + return 0; + } + + dwIndex = 0; + index = 0; + do + { + dwName = MAX_PATH; + res = RegEnumKeyExW(hKey, dwIndex, szName, &dwName, NULL, NULL, NULL, NULL); + if (res == ERROR_SUCCESS) + { + hResult = SH_LoadDynamicContextMenuHandler(hKey, szName, &cmobj, pDataObj); + if (hResult == S_OK) + { + if (This->ecount + 1 > This->esize) + { + if (!SH_EnlargeContextMenuArray(This, max(This->esize * 2, 10))) + break; + } + + This->ecmenu[This->ecount] = cmobj; + This->ecount++; + } + } + dwIndex++; + }while(res == ERROR_SUCCESS); + + RegCloseKey(hKey); + return index; +} + /************************************************************************* * SHCreateDefaultContextMenu [SHELL32.325] Vista API * @@ -610,7 +775,18 @@ REFIID riid, void **ppv) { - return E_FAIL; + HRESULT hr; + IContextMenu2 * pcm; + + if (pdcm->cidl > 0) + pcm = ISvItemCm_Constructor( pdcm->psf, pdcm->pidlFolder, pdcm->apidl, pdcm->cidl ); + else + pcm = ISvBgCm_Constructor( pdcm->psf, TRUE ); + + hr = S_OK; + *ppv = pcm; + + return hr; } /************************************************************************* @@ -630,6 +806,7 @@ IContextMenu **ppcm) { DEFCONTEXTMENU pdcm; + HRESULT hr; pdcm.hwnd = hwnd; pdcm.pcmcb = NULL; //FIXME @@ -641,5 +818,6 @@ pdcm.cKeys = nKeys; pdcm.aKeys = ahkeyClsKeys; - return SHCreateDefaultContextMenu(&pdcm, &IID_IContextMenu, (void**)ppcm); -} + hr = SHCreateDefaultContextMenu(&pdcm, &IID_IContextMenu, (void**)ppcm); + return hr; +}

1 0

[dreimer] 29675: Update Russian LangFile of options.exe (thx to towerr once more) STILL a problem which causes the resources to be displayed wrong. Set EOL:Style native Remove trailing Spaces
by dreimer＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: dreimer Date: Fri Oct 19 13:52:23 2007 New Revision: 29675 URL: http://svn.reactos.org/svn/reactos?rev=29675&view=rev Log: Update Russian LangFile of options.exe (thx to towerr once more) STILL a problem which causes the resources to be displayed wrong. Set EOL:Style native Remove trailing Spaces Added: trunk/tools/RosBE-Windows/Tools/config/rsrc.rc (with props) Modified: trunk/tools/RosBE-Windows/Root/Build-Multi.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/Build.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/ChangeLog.txt (contents, props changed) trunk/tools/RosBE-Windows/Root/Clean.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/Config.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/Help.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/LICENSE.txt (contents, props changed) trunk/tools/RosBE-Windows/Root/README.txt (contents, props changed) trunk/tools/RosBE-Windows/Root/RosBE.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/RosBE.mac (contents, props changed) trunk/tools/RosBE-Windows/Root/TimeDate.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/sSVN.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/scut.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/srclist.xml (contents, props changed) trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh (contents, props changed) trunk/tools/RosBE-Windows/RosBE.Files-Miscellaneous.nsh (contents, props changed) trunk/tools/RosBE-Windows/RosBE.nsi (contents, props changed) trunk/tools/RosBE-Windows/RosSourceDir.ini (contents, props changed) trunk/tools/RosBE-Windows/RosSourceDir.nsh (contents, props changed) trunk/tools/RosBE-Windows/Tools/buildtime.c (contents, props changed) trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc (contents, props changed) trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc trunk/tools/RosBE-Windows/Tools/config/makefile (contents, props changed) trunk/tools/RosBE-Windows/Tools/config/options.exe.Manifest (contents, props changed) trunk/tools/RosBE-Windows/Tools/config/options.rc (contents, props changed) trunk/tools/RosBE-Windows/Tools/cpucount.c (contents, props changed) trunk/tools/RosBE-Windows/Tools/cutz.cmd (contents, props changed) trunk/tools/RosBE-Windows/Tools/echoh.c (contents, props changed) trunk/tools/RosBE-Windows/Tools/flash.c (contents, props changed) trunk/tools/RosBE-Windows/Tools/getdate.c (contents, props changed) trunk/tools/RosBE-Windows/Tools/info.txt (contents, props changed) trunk/tools/RosBE-Windows/Tools/makefile (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/tools/RosBE-Windows/Root/Build-Multi.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Mul… Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… Modified: trunk/tools/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Clean.cmd… Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… Modified: trunk/tools/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/LICENSE.t… Modified: trunk/tools/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.tx… Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.mac… Modified: trunk/tools/RosBE-Windows/Root/TimeDate.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/TimeDate.… Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… Modified: trunk/tools/RosBE-Windows/Root/srclist.xml URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/srclist.x… Modified: trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.Files-4.… Modified: trunk/tools/RosBE-Windows/RosBE.Files-Miscellaneous.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.Files-Mi… Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… Modified: trunk/tools/RosBE-Windows/RosSourceDir.ini URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosSourceDir.i… Modified: trunk/tools/RosBE-Windows/RosSourceDir.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosSourceDir.n… Modified: trunk/tools/RosBE-Windows/Tools/buildtime.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/buildtim… Modified: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… Modified: trunk/tools/RosBE-Windows/Tools/config/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/m… Modified: trunk/tools/RosBE-Windows/Tools/config/options.exe.Manifest URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… Modified: trunk/tools/RosBE-Windows/Tools/config/options.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… Added: trunk/tools/RosBE-Windows/Tools/config/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/r… Modified: trunk/tools/RosBE-Windows/Tools/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/cpucount… Modified: trunk/tools/RosBE-Windows/Tools/cutz.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/cutz.cmd… Modified: trunk/tools/RosBE-Windows/Tools/echoh.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/echoh.c?… Modified: trunk/tools/RosBE-Windows/Tools/flash.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/flash.c?… Modified: trunk/tools/RosBE-Windows/Tools/getdate.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/getdate.… Modified: trunk/tools/RosBE-Windows/Tools/info.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/info.txt… Modified: trunk/tools/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/makefile…

1 0

[mnordell] 29674: [FORMATTING] Misuse of TAB. Converted to spaces.
by mnordell＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: mnordell Date: Fri Oct 19 11:50:59 2007 New Revision: 29674 URL: http://svn.reactos.org/svn/reactos?rev=29674&view=rev Log: [FORMATTING] Misuse of TAB. Converted to spaces. Modified: trunk/reactos/drivers/filesystems/vfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/vfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/f… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/vfat/fsctl.c Fri Oct 19 11:50:59 2007 @@ -31,14 +31,14 @@ /* FUNCTIONS ****************************************************************/ #define CACHEPAGESIZE(pDeviceExt) ((pDeviceExt)->FatInfo.BytesPerCluster > PAGE_SIZE ? \ - (pDeviceExt)->FatInfo.BytesPerCluster : PAGE_SIZE) + (pDeviceExt)->FatInfo.BytesPerCluster : PAGE_SIZE) #define VOLUME_IS_DIRTY 0x00000001 static NTSTATUS VfatHasFileSystem(PDEVICE_OBJECT DeviceToMount, - PBOOLEAN RecognizedFS, - PFATINFO pFatInfo) + PBOOLEAN RecognizedFS, + PFATINFO pFatInfo) { NTSTATUS Status; PARTITION_INFORMATION PartitionInfo; @@ -57,12 +57,12 @@ Size = sizeof(DISK_GEOMETRY); Status = VfatBlockDeviceIoControl(DeviceToMount, - IOCTL_DISK_GET_DRIVE_GEOMETRY, - NULL, - 0, - &DiskGeometry, - &Size, - FALSE); + IOCTL_DISK_GET_DRIVE_GEOMETRY, + NULL, + 0, + &DiskGeometry, + &Size, + FALSE); if (!NT_SUCCESS(Status)) { DPRINT("VfatBlockDeviceIoControl faild (%x)\n", Status); @@ -74,12 +74,12 @@ // We have found a hard disk Size = sizeof(PARTITION_INFORMATION); Status = VfatBlockDeviceIoControl(DeviceToMount, - IOCTL_DISK_GET_PARTITION_INFO, - NULL, - 0, - &PartitionInfo, - &Size, - FALSE); + IOCTL_DISK_GET_PARTITION_INFO, + NULL, + 0, + &PartitionInfo, + &Size, + FALSE); if (!NT_SUCCESS(Status)) { DPRINT("VfatBlockDeviceIoControl faild (%x)\n", Status); @@ -150,10 +150,10 @@ *RecognizedFS = FALSE; } if (*RecognizedFS && - Boot->BytesPerSector != 512 && - Boot->BytesPerSector != 1024 && + Boot->BytesPerSector != 512 && + Boot->BytesPerSector != 1024 && Boot->BytesPerSector != 2048 && - Boot->BytesPerSector != 4096) + Boot->BytesPerSector != 4096) { DPRINT1("BytesPerSector %d\n", Boot->BytesPerSector); *RecognizedFS = FALSE; @@ -161,7 +161,7 @@ if (*RecognizedFS && Boot->FATCount != 1 && - Boot->FATCount != 2) + Boot->FATCount != 2) { DPRINT1("FATCount %d\n", Boot->FATCount); *RecognizedFS = FALSE; @@ -239,9 +239,9 @@ FatInfo.RootCluster = FatInfo.rootStart / FatInfo.SectorsPerCluster; } if (PartitionInfoIsValid && - FatInfo.Sectors > PartitionInfo.PartitionLength.QuadPart / FatInfo.BytesPerSector) + FatInfo.Sectors > PartitionInfo.PartitionLength.QuadPart / FatInfo.BytesPerSector) { - CHECKPOINT1; + CHECKPOINT1; *RecognizedFS = FALSE; } @@ -322,7 +322,7 @@ FatInfo.dataStart = FatInfo.rootStart + FatInfo.rootDirectorySectors; FatInfo.NumberOfClusters = (FatInfo.Sectors - FatInfo.dataStart) / FatInfo.SectorsPerCluster; - if (pFatInfo && *RecognizedFS) + if (pFatInfo && *RecognizedFS) { *pFatInfo = FatInfo; } @@ -337,7 +337,7 @@ static NTSTATUS VfatMountDevice(PDEVICE_EXTENSION DeviceExt, - PDEVICE_OBJECT DeviceToMount) + PDEVICE_OBJECT DeviceToMount) /* * FUNCTION: Mounts the device */ @@ -421,12 +421,12 @@ HashTableSize = FCB_HASH_TABLE_SIZE; DPRINT("VFAT: Recognized volume\n"); Status = IoCreateDevice(VfatGlobalData->DriverObject, - ROUND_UP(sizeof (DEVICE_EXTENSION), sizeof(ULONG)) + sizeof(HASHENTRY*) * HashTableSize, - NULL, - FILE_DEVICE_FILE_SYSTEM, - 0, - FALSE, - &DeviceObject); + ROUND_UP(sizeof (DEVICE_EXTENSION), sizeof(ULONG)) + sizeof(HASHENTRY*) * HashTableSize, + NULL, + FILE_DEVICE_FILE_SYSTEM, + 0, + FALSE, + &DeviceObject); if (!NT_SUCCESS(Status)) { goto ByeBye; @@ -635,12 +635,12 @@ DeviceToVerify = IrpContext->Stack->Parameters.VerifyVolume.DeviceObject; Status = VfatBlockDeviceIoControl(DeviceToVerify, - IOCTL_DISK_CHECK_VERIFY, - NULL, - 0, - NULL, - 0, - TRUE); + IOCTL_DISK_CHECK_VERIFY, + NULL, + 0, + NULL, + 0, + TRUE); DeviceToVerify->Flags &= ~DO_VERIFY_VOLUME; if (!NT_SUCCESS(Status) && Status != STATUS_VERIFY_REQUIRED) { @@ -660,13 +660,13 @@ * FIXME: * Preformated floppy disks have very often a serial number of 0000:0000. * We should calculate a crc sum over the sectors from the root directory as secondary volume number. - * Each write to the root directory must update this crc sum. + * Each write to the root directory must update this crc sum. */ } else - { - Status = STATUS_WRONG_VOLUME; + { + Status = STATUS_WRONG_VOLUME; } } @@ -733,7 +733,7 @@ CurrentCluster = FirstCluster = vfatDirEntryGetFirstCluster(DeviceExt, &Fcb->entry); Status = OffsetToCluster(DeviceExt, FirstCluster, Vcn.u.LowPart * DeviceExt->FatInfo.BytesPerCluster, - &CurrentCluster, FALSE); + &CurrentCluster, FALSE); if (!NT_SUCCESS(Status)) { goto ByeBye; @@ -757,13 +757,13 @@ if (LastCluster + 1 != CurrentCluster) { - RetrievalPointers->Extents[RetrievalPointers->ExtentCount].NextVcn = Vcn; - RetrievalPointers->ExtentCount++; - if (RetrievalPointers->ExtentCount < MaxExtentCount) - { - RetrievalPointers->Extents[RetrievalPointers->ExtentCount].Lcn.u.HighPart = 0; - RetrievalPointers->Extents[RetrievalPointers->ExtentCount].Lcn.u.LowPart = CurrentCluster - 2; - } + RetrievalPointers->Extents[RetrievalPointers->ExtentCount].NextVcn = Vcn; + RetrievalPointers->ExtentCount++; + if (RetrievalPointers->ExtentCount < MaxExtentCount) + { + RetrievalPointers->Extents[RetrievalPointers->ExtentCount].Lcn.u.HighPart = 0; + RetrievalPointers->Extents[RetrievalPointers->ExtentCount].Lcn.u.LowPart = CurrentCluster - 2; + } } } @@ -878,45 +878,45 @@ { case IRP_MN_USER_FS_REQUEST: switch(IrpContext->Stack->Parameters.DeviceIoControl.IoControlCode) - { - case FSCTL_GET_VOLUME_BITMAP: + { + case FSCTL_GET_VOLUME_BITMAP: Status = VfatGetVolumeBitmap(IrpContext); - break; - case FSCTL_GET_RETRIEVAL_POINTERS: + break; + case FSCTL_GET_RETRIEVAL_POINTERS: Status = VfatGetRetrievalPointers(IrpContext); - break; - case FSCTL_MOVE_FILE: - Status = VfatMoveFile(IrpContext); - break; + break; + case FSCTL_MOVE_FILE: + Status = VfatMoveFile(IrpContext); + break; #ifdef USE_ROS_CC_AND_FS - case FSCTL_ROS_QUERY_LCN_MAPPING: - Status = VfatRosQueryLcnMapping(IrpContext); - break; + case FSCTL_ROS_QUERY_LCN_MAPPING: + Status = VfatRosQueryLcnMapping(IrpContext); + break; #endif - case FSCTL_IS_VOLUME_DIRTY: - Status = VfatIsVolumeDirty(IrpContext); - break; - case FSCTL_MARK_VOLUME_DIRTY: - Status = VfatMarkVolumeDirty(IrpContext); - break; - default: - Status = STATUS_INVALID_DEVICE_REQUEST; - } - break; + case FSCTL_IS_VOLUME_DIRTY: + Status = VfatIsVolumeDirty(IrpContext); + break; + case FSCTL_MARK_VOLUME_DIRTY: + Status = VfatMarkVolumeDirty(IrpContext); + break; + default: + Status = STATUS_INVALID_DEVICE_REQUEST; + } + break; case IRP_MN_MOUNT_VOLUME: Status = VfatMount(IrpContext); - break; + break; case IRP_MN_VERIFY_VOLUME: - DPRINT("VFATFS: IRP_MN_VERIFY_VOLUME\n"); - Status = VfatVerify(IrpContext); - break; + DPRINT("VFATFS: IRP_MN_VERIFY_VOLUME\n"); + Status = VfatVerify(IrpContext); + break; default: - DPRINT("VFAT FSC: MinorFunction %d\n", IrpContext->MinorFunction); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; + DPRINT("VFAT FSC: MinorFunction %d\n", IrpContext->MinorFunction); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; } IrpContext->Irp->IoStatus.Status = Status;

1 0

[arty] 29673: Uncaught error when moving to trunk. Thanks gdb.
by arty＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: arty Date: Fri Oct 19 11:47:21 2007 New Revision: 29673 URL: http://svn.reactos.org/svn/reactos?rev=29673&view=rev Log: Uncaught error when moving to trunk. Thanks gdb. Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Fri Oct 19 11:47:21 2007 @@ -635,6 +635,7 @@ PULONG ModuleSize) { ULONG LocalModuleSize; + ULONG_PTR ThisModuleBase = NextModuleBase; PLOADER_MODULE ModuleData; LPSTR NameBuffer; LPSTR TempName; @@ -682,7 +683,7 @@ *ModuleSize = LocalModuleSize; } - return NextModuleBase; + return ThisModuleBase; } PVOID

1 0

[arty] 29672: Debug DbgBreakPoint and drop to GDB on program trap.
by arty＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: arty Date: Fri Oct 19 11:22:01 2007 New Revision: 29672 URL: http://svn.reactos.org/svn/reactos?rev=29672&view=rev Log: Debug DbgBreakPoint and drop to GDB on program trap. Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c trunk/reactos/lib/ppcmmu/gdblib.c trunk/reactos/lib/ppcmmu/mmuobject.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Fri Oct 19 11:22:01 2007 @@ -514,7 +514,7 @@ } extern int _bss; -typedef unsigned int uint32_t; +//typedef unsigned int uint32_t; void PpcDefaultMachVtbl() { @@ -661,5 +661,5 @@ } void DbgBreakPoint() { - ofw_exit(); -} + __asm__("twi 31,0,0"); +} Modified: trunk/reactos/lib/ppcmmu/gdblib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/gdblib.c?rev=29… ============================================================================== --- trunk/reactos/lib/ppcmmu/gdblib.c (original) +++ trunk/reactos/lib/ppcmmu/gdblib.c Fri Oct 19 11:22:01 2007 @@ -249,42 +249,24 @@ PacketSent = 0; - do { - if (!count) - { - SerialWrite('$'); - for (i = 0; i < DataOutAddr; i++) - { - SerialWrite(DataOutBuffer[i]); - } - SerialWrite('#'); - SerialWrite(hex[(DataOutCsum >> 4) & 15]); - SerialWrite(hex[DataOutCsum & 15]); - } - while(count-- != 0) - { - if (chr(serport)) - { - ch = SerialRead(); - break; - } - } - - switch (ch) - { - default: - break; - - case '-': - count = 0; - break; - - case '+': - PacketSent = 1; - break; - } - } while(PacketSent != 1); -} + SerialWrite('$'); + for (i = 0; i < DataOutAddr; i++) + { + SerialWrite(DataOutBuffer[i]); + } + SerialWrite('#'); + SerialWrite(hex[(DataOutCsum >> 4) & 15]); + SerialWrite(hex[DataOutCsum & 15]); + + while(!chr(serport) && ((ch = SerialRead()) != '+') && (ch != '$')); + if (ch == '$') + { + ParseState = 0; + DataInAddr = 0; + ComputedCsum = 0; + } +} + void PacketWriteString(char *str) { @@ -481,8 +463,7 @@ { Signal = n; RegisterSaveArea = tf; - if (SendSignal) - PacketWriteSignal(Signal); + PacketWriteSignal(Signal); SendSignal = 0; Continue = 0; while(!Continue) SerialInterrupt(n, tf); Modified: trunk/reactos/lib/ppcmmu/mmuobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/mmuobject.c?rev… ============================================================================== --- trunk/reactos/lib/ppcmmu/mmuobject.c (original) +++ trunk/reactos/lib/ppcmmu/mmuobject.c Fri Oct 19 11:22:01 2007 @@ -304,6 +304,9 @@ /* Serial Interrupt */ callback[5] = SerialInterrupt; + /* Program Exception */ + callback[6] = TakeException; + /* Floating point exception */ callback[8] = fpenable;

1 0

[weiden] 29671: Destroy created pen after use (fixes a GDI object leak)
by weiden＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: weiden Date: Fri Oct 19 08:51:07 2007 New Revision: 29671 URL: http://svn.reactos.org/svn/reactos?rev=29671&view=rev Log: Destroy created pen after use (fixes a GDI object leak) Modified: trunk/reactos/dll/cpl/desk/monslctl.c Modified: trunk/reactos/dll/cpl/desk/monslctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.c (original) +++ trunk/reactos/dll/cpl/desk/monslctl.c Fri Oct 19 08:51:07 2007 @@ -922,6 +922,8 @@ hpOldFg); SelectObject(hDC, hbOldBk); + + DeleteObject(hpFg); } static VOID

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
71
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 October 2007