Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

[gvg] 13475: - Fix quoting of .cpl filename.

by gvg＠svn.reactos.com

- Fix quoting of .cpl filename. - Use "cplopen" verb to execute .cpl files. Modified: trunk/reactos/lib/shell32/cpanelfolder.c _____ Modified: trunk/reactos/lib/shell32/cpanelfolder.c --- trunk/reactos/lib/shell32/cpanelfolder.c 2005-02-09 08:38:46 UTC (rev 13474) +++ trunk/reactos/lib/shell32/cpanelfolder.c 2005-02-09 17:33:36 UTC (rev 13475) @@ -1,1091 +1,1095 @@ -/* - * Control panel folder - * - * Copyright 2003 Martin Fuchs - * - * 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 "ole2.h" -#include "shlguid.h" - -#include "cpanel.h" -#include "enumidlist.h" -#include "pidl.h" -#include "undocshell.h" -#include "shell32_main.h" -#include "shresdef.h" -#include "shlwapi.h" -#include "wine/debug.h" -#include "debughlp.h" -#include "shfldr.h" - -WINE_DEFAULT_DEBUG_CHANNEL(shell); - -/********************************************************************** * -* control panel implementation in shell namespace -*/ - -typedef struct { - IShellFolder2Vtbl *lpVtbl; - DWORD ref; - IPersistFolder2Vtbl *lpVtblPersistFolder2; - IShellExecuteHookWVtbl *lpVtblShellExecuteHookW; - IShellExecuteHookAVtbl *lpVtblShellExecuteHookA; - - IUnknown *pUnkOuter; /* used for aggregation */ - - /* both paths are parsible from the desktop */ - LPITEMIDLIST pidlRoot; /* absolute pidl */ - int dwAttributes; /* attributes returned by GetAttributesOf FIXME: use it */ -} ICPanelImpl; - -static IShellFolder2Vtbl vt_ShellFolder2; -static IPersistFolder2Vtbl vt_PersistFolder2; -static IShellExecuteHookWVtbl vt_ShellExecuteHookW; -static IShellExecuteHookAVtbl vt_ShellExecuteHookA; - -#define _IPersistFolder2_Offset ((int)(&(((ICPanelImpl*)0)->lpVtblPersistFolder2))) -#define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); - -#define IShellExecuteHookW_Offset ((int)(&(((ICPanelImpl*)0)->lpVtblShellExecuteHookW))) -#define _ICOM_THIS_From_IShellExecuteHookW(class, name) class* This = (class*)(((char*)name)-IShellExecuteHookW_Offset); - -#define IShellExecuteHookA_Offset ((int)(&(((ICPanelImpl*)0)->lpVtblShellExecuteHookA))) -#define _ICOM_THIS_From_IShellExecuteHookA(class, name) class* This = (class*)(((char*)name)-IShellExecuteHookA_Offset); - - -/* - converts This to a interface pointer -*/ -#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) -#define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl) -#define _IShellFolder2_(This) (IShellFolder2*)&(This->lpVtbl) - -#define _IPersist_(This) (IPersist*)&(This->lpVtblPersistFolder2) -#define _IPersistFolder_(This) (IPersistFolder*)&(This->lpVtblPersistFolder2) -#define _IPersistFolder2_(This) (IPersistFolder2*)&(This->lpVtblPersistFolder2) -#define _IShellExecuteHookW_(This) (IShellExecuteHookW*)&(This->lpVtblShellExecuteHookW) -#define _IShellExecuteHookA_(This) (IShellExecuteHookA*)&(This->lpVtblShellExecuteHookA) - -/********************************************************************** * -* IShellFolder [ControlPanel] implementation -*/ - -static shvheader ControlPanelSFHeader[] = { - {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},/*FIXME*/ - {IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 200},/*FIXME*/ -}; - -#define CONROLPANELSHELLVIEWCOLUMNS 2 - -/********************************************************************** **** -* IControlPanel_Constructor -*/ -HRESULT WINAPI IControlPanel_Constructor(IUnknown* pUnkOuter, REFIID riid, LPVOID * ppv) -{ - ICPanelImpl *sf; - - TRACE("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid(riid)); - - if (!ppv) - return E_POINTER; - if (pUnkOuter && !IsEqualIID (riid, &IID_IUnknown)) - return CLASS_E_NOAGGREGATION; - - sf = (ICPanelImpl *) LocalAlloc(GMEM_ZEROINIT, sizeof(ICPanelImpl)); - if (!sf) - return E_OUTOFMEMORY; - - sf->ref = 0; - sf->lpVtbl = &vt_ShellFolder2; - sf->lpVtblPersistFolder2 = &vt_PersistFolder2; - sf->lpVtblShellExecuteHookW = &vt_ShellExecuteHookW; - sf->lpVtblShellExecuteHookA = &vt_ShellExecuteHookA; - sf->pidlRoot = _ILCreateControlPanel(); /* my qualified pidl */ - sf->pUnkOuter = pUnkOuter ? pUnkOuter : _IUnknown_ (sf); - - if (!SUCCEEDED(IUnknown_QueryInterface(_IUnknown_(sf), riid, ppv))) { - IUnknown_Release(_IUnknown_(sf)); - return E_NOINTERFACE; - } - - TRACE("--(%p)\n", sf); - return S_OK; -} - -/********************************************************************** **** - * ISF_ControlPanel_fnQueryInterface - * - * NOTES supports not IPersist/IPersistFolder - */ -static HRESULT WINAPI ISF_ControlPanel_fnQueryInterface(IShellFolder2 * iface, REFIID riid, LPVOID * ppvObject) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - - TRACE("(%p)->(%s,%p)\n", This, shdebugstr_guid(riid), ppvObject); - - *ppvObject = NULL; - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IShellFolder) || IsEqualIID(riid, &IID_IShellFolder2)) - *ppvObject = This; - else if (IsEqualIID(riid, &IID_IPersist) || - IsEqualIID(riid, &IID_IPersistFolder) || IsEqualIID(riid, &IID_IPersistFolder2)) - *ppvObject = _IPersistFolder2_(This); - else if (IsEqualIID(riid, &IID_IShellExecuteHookW)) - *ppvObject = _IShellExecuteHookW_(This); - else if (IsEqualIID(riid, &IID_IShellExecuteHookA)) - *ppvObject = _IShellExecuteHookA_(This); - - if (*ppvObject) { - IUnknown_AddRef((IUnknown *)(*ppvObject)); - TRACE("-- Interface:(%p)->(%p)\n", ppvObject, *ppvObject); - return S_OK; - } - TRACE("-- Interface: E_NOINTERFACE\n"); - return E_NOINTERFACE; -} - -static ULONG WINAPI ISF_ControlPanel_fnAddRef(IShellFolder2 * iface) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - - TRACE("(%p)->(count=%lu)\n", This, This->ref); - - return ++(This->ref); -} - -static ULONG WINAPI ISF_ControlPanel_fnRelease(IShellFolder2 * iface) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - - TRACE("(%p)->(count=%lu)\n", This, This->ref); - - if (!--(This->ref)) { - TRACE("-- destroying IShellFolder(%p)\n", This); - if (This->pidlRoot) - SHFree(This->pidlRoot); - LocalFree((HLOCAL) This); - return 0; - } - return This->ref; -} - -/********************************************************************** **** -* ISF_ControlPanel_fnParseDisplayName -*/ -static HRESULT WINAPI -ISF_ControlPanel_fnParseDisplayName(IShellFolder2 * iface, - HWND hwndOwner, - LPBC pbc, - LPOLESTR lpszDisplayName, - DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - - HRESULT hr = E_INVALIDARG; - - FIXME("(%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; - - TRACE("(%p)->(-- ret=0x%08lx)\n", This, hr); - - return hr; -} - -static LPITEMIDLIST _ILCreateCPanelApplet(LPCSTR name, LPCSTR displayName, - LPCSTR comment, int iconIdx) -{ - PIDLCPanelStruct *p; - LPITEMIDLIST pidl; - PIDLDATA tmp; - int size0 = (char*)&tmp.u.cpanel.szName-(char*)&tmp.u.cpanel; - int size = size0; - int l; - - tmp.type = PT_CPLAPPLET; - tmp.u.cpanel.dummy = 0; - tmp.u.cpanel.iconIdx = iconIdx; - - l = strlen(name); - size += l+1; - - tmp.u.cpanel.offsDispName = l+1; - l = strlen(displayName); - size += l+1; - - tmp.u.cpanel.offsComment = tmp.u.cpanel.offsDispName+1+l; - l = strlen(comment); - size += l+1; - - pidl = SHAlloc(size+4); - if (!pidl) - return NULL; - - pidl->mkid.cb = size+2; - memcpy(pidl->mkid.abID, &tmp, 2+size0); - - p = &((PIDLDATA*)pidl->mkid.abID)->u.cpanel; - strcpy(p->szName, name); - strcpy(p->szName+tmp.u.cpanel.offsDispName, displayName); - strcpy(p->szName+tmp.u.cpanel.offsComment, comment); - - *(WORD*)((char*)pidl+(size+2)) = 0; - - pcheck(pidl); - - return pidl; -} - -/********************************************************************** **** - * _ILGetCPanelPointer() - * gets a pointer to the control panel struct stored in the pidl - */ -static PIDLCPanelStruct* _ILGetCPanelPointer(LPCITEMIDLIST pidl) -{ - LPPIDLDATA pdata = _ILGetDataPointer(pidl); - - if (pdata && pdata->type==PT_CPLAPPLET) - return (PIDLCPanelStruct*)&(pdata->u.cpanel); - - return NULL; -} - - /*********************************************************************** *** - * ISF_ControlPanel_fnEnumObjects - */ -static BOOL SHELL_RegisterCPanelApp(IEnumIDList* list, LPCSTR path) -{ - LPITEMIDLIST pidl; - CPlApplet* applet; - CPanel panel; - CPLINFO info; - unsigned i; - int iconIdx; - - char displayName[MAX_PATH]; - char comment[MAX_PATH]; - - WCHAR wpath[MAX_PATH]; - - MultiByteToWideChar(CP_ACP, 0, path, -1, wpath, MAX_PATH); - - panel.first = NULL; - applet = Control_LoadApplet(0, wpath, &panel); - - if (applet) - { - for(i=0; i<applet->count; ++i) - { - WideCharToMultiByte(CP_ACP, 0, applet->info[i].szName, -1, displayName, MAX_PATH, 0, 0); - WideCharToMultiByte(CP_ACP, 0, applet->info[i].szInfo, -1, comment, MAX_PATH, 0, 0); - - applet->proc(0, CPL_INQUIRE, i, (LPARAM)&info); - - if (info.idIcon > 0) - iconIdx = -info.idIcon; /* negative icon index instead of icon number */ - else - iconIdx = 0; - - pidl = _ILCreateCPanelApplet(path, displayName, comment, iconIdx); - - if (pidl) - AddToEnumList(list, pidl); - } - Control_UnloadApplet(applet); - } - return TRUE; -} - -static int SHELL_RegisterRegistryCPanelApps(IEnumIDList* list, HKEY hkey_root, LPCSTR szRepPath) -{ - char name[MAX_PATH]; - char value[MAX_PATH]; - HKEY hkey; - - int cnt = 0; - - if (RegOpenKeyA(hkey_root, szRepPath, &hkey) == ERROR_SUCCESS) - { - int idx = 0; - - for(;; ++idx) - { - DWORD nameLen = MAX_PATH; - DWORD valueLen = MAX_PATH; - - if (RegEnumValueA(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)&value, &valueLen) != ERROR_SUCCESS) - break; - - if (SHELL_RegisterCPanelApp(list, value)) - ++cnt; - } - RegCloseKey(hkey); - } - - return cnt; -} - -static int SHELL_RegisterCPanelFolders(IEnumIDList* list, HKEY hkey_root, LPCSTR szRepPath) -{ - char name[MAX_PATH]; - HKEY hkey; - - int cnt = 0; - - if (RegOpenKeyA(hkey_root, szRepPath, &hkey) == ERROR_SUCCESS) - { - int idx = 0; - for(;; ++idx) - { - if (RegEnumKeyA(hkey, idx, name, MAX_PATH) != ERROR_SUCCESS) - break; - - if (*name == '{') - { - LPITEMIDLIST pidl = _ILCreateGuidFromStrA(name); - - if (pidl && AddToEnumList(list, pidl)) - ++cnt; - } - } - - RegCloseKey(hkey); - } - - return cnt; -} - -/********************************************************************** **** - * CreateCPanelEnumList() - */ -static BOOL CreateCPanelEnumList( - IEnumIDList * iface, - DWORD dwFlags) -{ - CHAR szPath[MAX_PATH]; - WIN32_FIND_DATAA wfd; - HANDLE hFile; - - TRACE("(%p)->(flags=0x%08lx) \n",iface,dwFlags); - - /* enumerate control panel folders folders */ - if (dwFlags & SHCONTF_FOLDERS) - SHELL_RegisterCPanelFolders(iface, HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\N ameSpace"); - - /* enumerate the control panel applets */ - if (dwFlags & SHCONTF_NONFOLDERS) - { - LPSTR p; - - GetSystemDirectoryA(szPath, MAX_PATH); - p = PathAddBackslashA(szPath); - strcpy(p, "*.cpl"); - - TRACE("-- (%p)-> enumerate SHCONTF_NONFOLDERS of %s\n",iface,debugstr_a(szPath)); - hFile = FindFirstFileA(szPath, &wfd); - - if (hFile != INVALID_HANDLE_VALUE) - { - do - { - if (!(dwFlags & SHCONTF_INCLUDEHIDDEN) && (wfd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)) - continue; - - if (!(wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { - strcpy(p, wfd.cFileName); - SHELL_RegisterCPanelApp((IEnumIDList*)iface, szPath); - } - } while(FindNextFileA(hFile, &wfd)); - FindClose(hFile); - } - - SHELL_RegisterRegistryCPanelApps((IEnumIDList*)iface, HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); - SHELL_RegisterRegistryCPanelApps((IEnumIDList*)iface, HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); - } - return TRUE; -} - -/********************************************************************** **** -* ISF_ControlPanel_fnEnumObjects -*/ -static HRESULT WINAPI -ISF_ControlPanel_fnEnumObjects(IShellFolder2 * iface, HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - - TRACE("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); - - *ppEnumIDList = IEnumIDList_Constructor(); - if (*ppEnumIDList) - CreateCPanelEnumList(*ppEnumIDList, dwFlags); - - TRACE("--(%p)->(new ID List: %p)\n", This, *ppEnumIDList); - - return(*ppEnumIDList) ? S_OK : E_OUTOFMEMORY; -} - -/********************************************************************** **** -* ISF_ControlPanel_fnBindToObject -*/ -static HRESULT WINAPI -ISF_ControlPanel_fnBindToObject(IShellFolder2 * iface, LPCITEMIDLIST pidl, - LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - - TRACE("(%p)->(pidl=%p,%p,%s,%p)\n", This, pidl, pbcReserved, shdebugstr_guid(riid), ppvOut); - - return SHELL32_BindToChild(This->pidlRoot, NULL, pidl, riid, ppvOut); -} - -/********************************************************************** **** -* ISF_ControlPanel_fnBindToStorage -*/ -static HRESULT WINAPI -ISF_ControlPanel_fnBindToStorage(IShellFolder2 * iface, - LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - - FIXME("(%p)->(pidl=%p,%p,%s,%p) stub\n", This, pidl, pbcReserved, shdebugstr_guid(riid), ppvOut); - - *ppvOut = NULL; - return E_NOTIMPL; -} - -/********************************************************************** **** -* ISF_ControlPanel_fnCompareIDs -*/ - -static HRESULT WINAPI -ISF_ControlPanel_fnCompareIDs(IShellFolder2 * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - - int nReturn; - - TRACE("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); - nReturn = SHELL32_CompareIDs(_IShellFolder_(This), lParam, pidl1, pidl2); - TRACE("-- %i\n", nReturn); - return nReturn; -} - -/********************************************************************** **** -* ISF_ControlPanel_fnCreateViewObject -*/ -static HRESULT WINAPI -ISF_ControlPanel_fnCreateViewObject(IShellFolder2 * iface, HWND hwndOwner, REFIID riid, LPVOID * ppvOut) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - - LPSHELLVIEW pShellView; - HRESULT hr = E_INVALIDARG; - - TRACE("(%p)->(hwnd=%p,%s,%p)\n", This, hwndOwner, shdebugstr_guid(riid), ppvOut); - - if (ppvOut) { - *ppvOut = NULL; - - if (IsEqualIID(riid, &IID_IDropTarget)) { - WARN("IDropTarget not implemented\n"); - hr = E_NOTIMPL; - } else if (IsEqualIID(riid, &IID_IContextMenu)) { - WARN("IContextMenu not implemented\n"); - hr = E_NOTIMPL; - } else if (IsEqualIID(riid, &IID_IShellView)) { - pShellView = IShellView_Constructor((IShellFolder *) iface); - if (pShellView) { - hr = IShellView_QueryInterface(pShellView, riid, ppvOut); - IShellView_Release(pShellView); - } - } - } - TRACE("--(%p)->(interface=%p)\n", This, ppvOut); - return hr; -} - -/********************************************************************** **** -* ISF_ControlPanel_fnGetAttributesOf -*/ -static HRESULT WINAPI -ISF_ControlPanel_fnGetAttributesOf(IShellFolder2 * iface, UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - - HRESULT hr = S_OK; - - TRACE("(%p)->(cidl=%d apidl=%p mask=0x%08lx)\n", This, cidl, apidl, *rgfInOut); - - if ((!cidl) ||(!apidl) ||(!rgfInOut)) - return E_INVALIDARG; - - if (*rgfInOut == 0) - *rgfInOut = ~0; - - while(cidl > 0 && *apidl) { - pdump(*apidl); - SHELL32_GetItemAttributes(_IShellFolder_(This), *apidl, rgfInOut); - apidl++; - cidl--; - } - - TRACE("-- result=0x%08lx\n", *rgfInOut); - return hr; -} - -/********************************************************************** **** -* ISF_ControlPanel_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_ControlPanel_fnGetUIObjectOf(IShellFolder2 * iface, - HWND hwndOwner, - UINT cidl, LPCITEMIDLIST * apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - - LPITEMIDLIST pidl; - 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) { - *ppvOut = NULL; - - if (IsEqualIID(riid, &IID_IContextMenu) &&(cidl >= 1)) { - pObj = (LPUNKNOWN) ISvItemCm_Constructor((IShellFolder *) iface, This->pidlRoot, apidl, cidl); - hr = S_OK; - } else if (IsEqualIID(riid, &IID_IDataObject) &&(cidl >= 1)) { - pObj = (LPUNKNOWN) IDataObject_Constructor(hwndOwner, This->pidlRoot, apidl, cidl); - hr = S_OK; - } else if (IsEqualIID(riid, &IID_IExtractIconA) &&(cidl == 1)) { - pidl = ILCombine(This->pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconA_Constructor(pidl); - SHFree(pidl); - hr = S_OK; - } else if (IsEqualIID(riid, &IID_IExtractIconW) &&(cidl == 1)) { - pidl = ILCombine(This->pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconW_Constructor(pidl); - SHFree(pidl); - hr = S_OK; - } else if ((IsEqualIID(riid,&IID_IShellLinkW) || IsEqualIID(riid,&IID_IShellLinkA)) - && (cidl == 1)) { - pidl = ILCombine(This->pidlRoot, apidl[0]); - hr = IShellLink_ConstructFromFile(NULL, riid, pidl,(LPVOID*)&pObj); - SHFree(pidl); - } else { - hr = E_NOINTERFACE; - } - - if (SUCCEEDED(hr) && !pObj) - hr = E_OUTOFMEMORY; - - *ppvOut = pObj; - } - TRACE("(%p)->hr=0x%08lx\n", This, hr); - return hr; -} - -/********************************************************************** **** -* ISF_ControlPanel_fnGetDisplayNameOf -*/ -static HRESULT WINAPI ISF_ControlPanel_fnGetDisplayNameOf(IShellFolder2 * iface, LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - - CHAR szPath[MAX_PATH*2]; - PIDLCPanelStruct* pcpanel; - - *szPath = '\0'; - - TRACE("(%p)->(pidl=%p,0x%08lx,%p)\n", This, pidl, dwFlags, strRet); - pdump(pidl); - - if (!pidl || !strRet) - return E_INVALIDARG; - - pcpanel = _ILGetCPanelPointer(pidl); - - if (pcpanel) { - lstrcpyA(szPath, pcpanel->szName+pcpanel->offsDispName); - - if (!(dwFlags & SHGDN_FORPARSING)) - FIXME("retrieve display name from control panel app\n"); - } - /* take names of special folders only if its only this folder */ - else if (_ILIsSpecialFolder(pidl)) { - BOOL bSimplePidl = _ILIsPidlSimple(pidl); - - if (bSimplePidl) { - _ILSimpleGetText(pidl, szPath, MAX_PATH); /* append my own path */ - } else { - FIXME("special pidl\n"); - } - - if ((dwFlags & SHGDN_FORPARSING) && !bSimplePidl) { /* go deeper if needed */ - int len = 0; - - PathAddBackslashA(szPath); /*FIXME*/ - len = lstrlenA(szPath); - - if (!SUCCEEDED - (SHELL32_GetDisplayNameOfChild(iface, pidl, dwFlags | SHGDN_INFOLDER, szPath + len, MAX_PATH - len))) - return E_OUTOFMEMORY; - } - } - - strRet->uType = STRRET_CSTR; - lstrcpynA(strRet->u.cStr, szPath, MAX_PATH); - - TRACE("--(%p)->(%s)\n", This, szPath); - return S_OK; -} - -/********************************************************************** **** -* ISF_ControlPanel_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_ControlPanel_fnSetNameOf(IShellFolder2 * iface, HWND hwndOwner, LPCITEMIDLIST pidl, /*simple pidl */ - LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) -{ - ICPanelImpl *This = (ICPanelImpl *)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_ControlPanel_fnGetDefaultSearchGUID(IShellFolder2 * iface, GUID * pguid) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - FIXME("(%p)\n", This); - return E_NOTIMPL; -} -static HRESULT WINAPI ISF_ControlPanel_fnEnumSearches(IShellFolder2 * iface, IEnumExtraSearch ** ppenum) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - FIXME("(%p)\n", This); - return E_NOTIMPL; -} -static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultColumn(IShellFolder2 * iface, DWORD dwRes, ULONG * pSort, ULONG * pDisplay) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - - TRACE("(%p)\n", This); - - if (pSort) *pSort = 0; - if (pDisplay) *pDisplay = 0; - return S_OK; -} -static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultColumnState(IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - - TRACE("(%p)\n", This); - - if (!pcsFlags || iColumn >= CONROLPANELSHELLVIEWCOLUMNS) return E_INVALIDARG; - *pcsFlags = ControlPanelSFHeader[iColumn].pcsFlags; - return S_OK; -} -static HRESULT WINAPI ISF_ControlPanel_fnGetDetailsEx(IShellFolder2 * iface, LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI ISF_ControlPanel_fnGetDetailsOf(IShellFolder2 * iface, LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - HRESULT hr; - - TRACE("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); - - if (!psd || iColumn >= CONROLPANELSHELLVIEWCOLUMNS) - return E_INVALIDARG; - - if (!pidl) { - psd->fmt = ControlPanelSFHeader[iColumn].fmt; - psd->cxChar = ControlPanelSFHeader[iColumn].cxChar; - psd->str.uType = STRRET_CSTR; - LoadStringA(shell32_hInstance, ControlPanelSFHeader[iColumn].colnameid, psd->str.u.cStr, MAX_PATH); - return S_OK; - } else { - psd->str.u.cStr[0] = 0x00; - psd->str.uType = STRRET_CSTR; - switch(iColumn) { - case 0: /* name */ - hr = IShellFolder_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); - break; - case 1: /* comment */ - _ILGetFileType(pidl, psd->str.u.cStr, MAX_PATH); - break; - } - hr = S_OK; - } - - return hr; -} -static HRESULT WINAPI ISF_ControlPanel_fnMapColumnToSCID(IShellFolder2 * iface, UINT column, SHCOLUMNID * pscid) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static IShellFolder2Vtbl vt_ShellFolder2 = -{ - - ISF_ControlPanel_fnQueryInterface, - ISF_ControlPanel_fnAddRef, - ISF_ControlPanel_fnRelease, - ISF_ControlPanel_fnParseDisplayName, - ISF_ControlPanel_fnEnumObjects, - ISF_ControlPanel_fnBindToObject, - ISF_ControlPanel_fnBindToStorage, - ISF_ControlPanel_fnCompareIDs, - ISF_ControlPanel_fnCreateViewObject, - ISF_ControlPanel_fnGetAttributesOf, - ISF_ControlPanel_fnGetUIObjectOf, - ISF_ControlPanel_fnGetDisplayNameOf, - ISF_ControlPanel_fnSetNameOf, - - /* ShellFolder2 */ - ISF_ControlPanel_fnGetDefaultSearchGUID, - ISF_ControlPanel_fnEnumSearches, - ISF_ControlPanel_fnGetDefaultColumn, - ISF_ControlPanel_fnGetDefaultColumnState, - ISF_ControlPanel_fnGetDetailsEx, - ISF_ControlPanel_fnGetDetailsOf, - ISF_ControlPanel_fnMapColumnToSCID -}; - -/********************************************************************** ** - * ICPanel_PersistFolder2_QueryInterface - */ -static HRESULT WINAPI ICPanel_PersistFolder2_QueryInterface(IPersistFolder2 * iface, REFIID iid, LPVOID * ppvObject) -{ - _ICOM_THIS_From_IPersistFolder2(ICPanelImpl, iface); - - TRACE("(%p)\n", This); - - return IUnknown_QueryInterface(_IUnknown_(This), iid, ppvObject); -} - -/********************************************************************** ** - * ICPanel_PersistFolder2_AddRef - */ -static ULONG WINAPI ICPanel_PersistFolder2_AddRef(IPersistFolder2 * iface) -{ - _ICOM_THIS_From_IPersistFolder2(ICPanelImpl, iface); - - TRACE("(%p)->(count=%lu)\n", This, This->ref); - - return IUnknown_AddRef(_IUnknown_(This)); -} - -/********************************************************************** ** - * ISFPersistFolder_Release - */ -static ULONG WINAPI ICPanel_PersistFolder2_Release(IPersistFolder2 * iface) -{ - _ICOM_THIS_From_IPersistFolder2(ICPanelImpl, iface); - - TRACE("(%p)->(count=%lu)\n", This, This->ref); - - return IUnknown_Release(_IUnknown_(This)); -} - -/********************************************************************** ** - * ICPanel_PersistFolder2_GetClassID - */ -static HRESULT WINAPI ICPanel_PersistFolder2_GetClassID(IPersistFolder2 * iface, CLSID * lpClassId) -{ - _ICOM_THIS_From_IPersistFolder2(ICPanelImpl, iface); - - TRACE("(%p)\n", This); - - if (!lpClassId) - return E_POINTER; - *lpClassId = CLSID_ControlPanel; - - return S_OK; -} - -/********************************************************************** ** - * ICPanel_PersistFolder2_Initialize - * - * NOTES: it makes no sense to change the pidl - */ -static HRESULT WINAPI ICPanel_PersistFolder2_Initialize(IPersistFolder2 * iface, LPCITEMIDLIST pidl) -{ - _ICOM_THIS_From_IPersistFolder2(ICPanelImpl, iface); - TRACE("(%p)->(%p)\n", This, pidl); - return E_NOTIMPL; -} - -/********************************************************************** **** - * IPersistFolder2_fnGetCurFolder - */ -static HRESULT WINAPI ICPanel_PersistFolder2_GetCurFolder(IPersistFolder2 * iface, LPITEMIDLIST * pidl) -{ - _ICOM_THIS_From_IPersistFolder2(ICPanelImpl, iface); - - TRACE("(%p)->(%p)\n", This, pidl); - - if (!pidl) - return E_POINTER; - *pidl = ILClone(This->pidlRoot); - return S_OK; -} - -static IPersistFolder2Vtbl vt_PersistFolder2 = -{ - - ICPanel_PersistFolder2_QueryInterface, - ICPanel_PersistFolder2_AddRef, - ICPanel_PersistFolder2_Release, - ICPanel_PersistFolder2_GetClassID, - ICPanel_PersistFolder2_Initialize, - ICPanel_PersistFolder2_GetCurFolder -}; - -HRESULT WINAPI CPanel_GetIconLocationA(LPITEMIDLIST pidl, LPSTR szIconFile, UINT cchMax, int* piIndex) -{ - PIDLCPanelStruct* pcpanel = _ILGetCPanelPointer(pidl); - - if (!pcpanel) - return E_INVALIDARG; - - lstrcpyA(szIconFile, pcpanel->szName); - *piIndex = pcpanel->iconIdx!=-1? pcpanel->iconIdx: 0; - - return S_OK; -} - -HRESULT WINAPI CPanel_GetIconLocationW(LPITEMIDLIST pidl, LPWSTR szIconFile, UINT cchMax, int* piIndex) -{ - PIDLCPanelStruct* pcpanel = _ILGetCPanelPointer(pidl); - - if (!pcpanel) - return E_INVALIDARG; - - MultiByteToWideChar(CP_ACP, 0, pcpanel->szName, -1, szIconFile, cchMax); - *piIndex = pcpanel->iconIdx!=-1? pcpanel->iconIdx: 0; - - return S_OK; -} - - -/********************************************************************** **** -* IShellExecuteHookW Implementation -*/ - -static HRESULT WINAPI IShellExecuteHookW_fnQueryInterface(IShellExecuteHookW* iface, REFIID riid, void** ppvObject) -{ - _ICOM_THIS_From_IShellExecuteHookW(ICPanelImpl, iface); - - TRACE("(%p)->(count=%lu)\n", This, This->ref); - - return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject); -} - -static ULONG STDMETHODCALLTYPE IShellExecuteHookW_fnAddRef(IShellExecuteHookW* iface) -{ - _ICOM_THIS_From_IShellExecuteHookW(ICPanelImpl, iface); - - TRACE("(%p)->(count=%lu)\n", This, This->ref); - - return IUnknown_AddRef(This->pUnkOuter); -} - -static ULONG STDMETHODCALLTYPE IShellExecuteHookW_fnRelease(IShellExecuteHookW* iface) -{ - _ICOM_THIS_From_IShellExecuteHookW(ICPanelImpl, iface); - - TRACE("(%p)\n", This); - - return IUnknown_Release(This->pUnkOuter); -} - -static HRESULT WINAPI IShellExecuteHookW_fnExecute(IShellExecuteHookW* iface, LPSHELLEXECUTEINFOW psei) -{ - ICPanelImpl *This = (ICPanelImpl *)iface; - - SHELLEXECUTEINFOW sei_tmp; - PIDLCPanelStruct* pcpanel; - WCHAR path[MAX_PATH]; - BOOL ret; - int l; - - TRACE("(%p)->execute(%p)\n", This, psei); - - if (!psei) - return E_INVALIDARG; - - pcpanel = _ILGetCPanelPointer(ILFindLastID(psei->lpIDList)); - - if (!pcpanel) - return E_INVALIDARG; - - path[0] = '\"'; - l = 1 + MultiByteToWideChar(CP_ACP, 0, pcpanel->szName, -1, path+1, MAX_PATH); - - /* pass applet name to Control_RunDLL to distinguish between applets in one .cpl file */ - path[++l] = '"'; - path[++l] = ' '; - - MultiByteToWideChar(CP_ACP, 0, pcpanel->szName+pcpanel->offsDispName, -1, path+l, MAX_PATH); - - memcpy(&sei_tmp, psei, sizeof(sei_tmp)); - sei_tmp.lpFile = path; - sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST; [truncated at 1000 lines; 1191 more skipped]

19 years, 10 months

[arty] 13474: Made a nice function CantReadMore which tells if we can't possibly fill

by arty＠svn.reactos.com

Made a nice function CantReadMore which tells if we can't possibly fill the buffer any longer, and don't have waiting data. Return an EOF in every case where a read could hit EOF from tcpip, Return a hard error thereafter. Modified: trunk/reactos/drivers/net/afd/afd/read.c _____ Modified: trunk/reactos/drivers/net/afd/afd/read.c --- trunk/reactos/drivers/net/afd/afd/read.c 2005-02-08 22:52:16 UTC (rev 13473) +++ trunk/reactos/drivers/net/afd/afd/read.c 2005-02-09 08:38:46 UTC (rev 13474) @@ -28,6 +28,13 @@ static VOID ProcessClose( PAFD_FCB FCB ); +BOOLEAN CantReadMore( PAFD_FCB FCB ) { + UINT BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed; + + return !BytesAvailable && + (FCB->PollState & (AFD_EVENT_CLOSE | AFD_EVENT_DISCONNECT)); +} + NTSTATUS TryToSatisfyRecvRequestFromBuffer( PAFD_FCB FCB, PAFD_RECV_INFO RecvReq, PUINT TotalBytesCopied ) { @@ -41,7 +48,7 @@ AFD_DbgPrint(MID_TRACE,("Called, BytesAvailable = %d\n", BytesAvailable)); - if( FCB->PollState & AFD_EVENT_CLOSE ) return STATUS_SUCCESS; + if( CantReadMore(FCB) ) return STATUS_SUCCESS; if( !BytesAvailable ) return STATUS_PENDING; Map = (PAFD_MAPBUF)(RecvReq->BufferArray + RecvReq->BufferCount); @@ -213,6 +220,24 @@ Status = STATUS_SUCCESS; } else { + /* Success here means that we got an EOF. Close all pending reads + * with EOF. Data won't have been available before. */ + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { + NextIrpEntry = + RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); + NextIrp = + CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + + AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, + TotalBytesCopied)); + UnlockBuffers( RecvReq->BufferArray, + RecvReq->BufferCount, FALSE ); + NextIrp->IoStatus.Status = Status; + NextIrp->IoStatus.Information = 0; + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } ProcessClose( FCB ); } @@ -272,7 +297,7 @@ /* Check if we're not closed down yet */ - if( !(FCB->PollState & AFD_EVENT_CLOSE ) ) { + if( !CantReadMore(FCB) ) { AFD_DbgPrint(MID_TRACE,("Not EOF yet\n")); if( FCB->ReceiveIrp.InFlightRequest ) { AFD_DbgPrint(MID_TRACE,("We're waiting on a previous irp\n")); @@ -288,6 +313,9 @@ Status = STATUS_END_OF_FILE; ProcessClose( FCB ); + + return UnlockAndMaybeComplete + ( FCB, STATUS_SUCCESS, Irp, 0, NULL, FALSE); } if( NT_SUCCESS(Status) ) {

19 years, 10 months

[gvg] 13473: - Add entry for .cpl files

by gvg＠svn.reactos.com

- Add entry for .cpl files - Disable recycle bin for now Modified: trunk/reactos/bootdata/hivecls.inf _____ Modified: trunk/reactos/bootdata/hivecls.inf --- trunk/reactos/bootdata/hivecls.inf 2005-02-08 22:50:55 UTC (rev 13472) +++ trunk/reactos/bootdata/hivecls.inf 2005-02-08 22:52:16 UTC (rev 13473) @@ -32,6 +32,11 @@ HKCR,"InternetShortcut\shell\open\command","",0x00000000,"rundll32.exe shdocvw.dll,OpenURL %l" HKCR,"InternetShortcut\DefaultIcon","",0x00020000,"%SystemRoot%\system32 \url.dll,0" +; Control Panel extensions +HKCR,".cpl","",0x00000000,"cplfile" +HKCR,"cplfile\shell\cplopen","",0x00000000,"Open with Control Panel" +HKCR,"cplfile\shell\cplopen\command","",0x00020000,"%SystemRoot%\system 32\rundll32.exe shell32.dll,Control_RunDLL %1,%*" + ; install notepad as handler for .txt files HKCR,".txt","",0x00000000,"txtfile" HKCR,".txt","Content Type",0x00000000,"text/plain" @@ -68,20 +73,21 @@ HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}\InProcServer32","",0x 00020000,"%SystemRoot%\system32\shell32.dll" HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}\InProcServer32","Thre adingModel",0x00000000,"Apartment" -HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","",0x00000000,"Recy cle Bin" -HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","LocalizedString",0 x00020000,"@%SystemRoot%\system32\shell32.dll,-8964" -HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","InfoTip",0x0002000 0,"@%SystemRoot%\system32\shell32.dll,-22915" -HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","IntroText",0x00020 000,"@%SystemRoot%\system32\shell32.dll,-31748" -HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","SortOrderIndex",0x 00010001,0x00000060 -HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","",0x00 020000,"%SystemRoot%\System32\shell32.dll,31" -HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","Empty" ,0x00020000,"%SystemRoot%\System32\shell32.dll,31" -HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","Full", 0x00020000,"%SystemRoot%\System32\shell32.dll,32" -HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\InProcServer32","",0 x00020000,"%SystemRoot%\system32\shell32.dll" -HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\InProcServer32","Thr eadingModel",0x00000000,"Apartment" -HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\ShellFolder","Attrib utes",0x00010001,0x20000140 -HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\ShellFolder","CallFo rAttributes",0x00010001,0x00000040 -HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\shellex\ContextMenuH andlers\{645FF040-5081-101B-9F08-00AA002F954E}","",0x00000000,"" -HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\shellex\PropertyShee tHandlers\{645FF040-5081-101B-9F08-00AA002F954E}","",0x00000000,"" +; Recycle bin is not implemented (yet???) +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","",0x00000000,"Rec ycle Bin" +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","LocalizedString", 0x00020000,"@%SystemRoot%\system32\shell32.dll,-8964" +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","InfoTip",0x000200 00,"@%SystemRoot%\system32\shell32.dll,-22915" +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","IntroText",0x0002 0000,"@%SystemRoot%\system32\shell32.dll,-31748" +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","SortOrderIndex",0 x00010001,0x00000060 +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","",0x0 0020000,"%SystemRoot%\System32\shell32.dll,31" +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","Empty ",0x00020000,"%SystemRoot%\System32\shell32.dll,31" +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","Full" ,0x00020000,"%SystemRoot%\System32\shell32.dll,32" +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\InProcServer32","", 0x00020000,"%SystemRoot%\system32\shell32.dll" +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\InProcServer32","Th readingModel",0x00000000,"Apartment" +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\ShellFolder","Attri butes",0x00010001,0x20000140 +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\ShellFolder","CallF orAttributes",0x00010001,0x00000040 +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\shellex\ContextMenu Handlers\{645FF040-5081-101B-9F08-00AA002F954E}","",0x00000000,"" +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\shellex\PropertyShe etHandlers\{645FF040-5081-101B-9F08-00AA002F954E}","",0x00000000,"" HKCR,"CLSID\{00000320-0000-0000-C000-000000000046}","",0x00000000,"PSFac toryBuffer" HKCR,"CLSID\{00000320-0000-0000-C000-000000000046}\InProcServer32","",0x 00000000,"ole32.dll"

19 years, 10 months

[sedwards] 13472: define _MAX_PATH as well

by sedwards＠svn.reactos.com

define _MAX_PATH as well Modified: branches/xmlbuildsystem/reactos/tools/rbuild/pch.h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/pch.h --- branches/xmlbuildsystem/reactos/tools/rbuild/pch.h 2005-02-08 22:23:05 UTC (rev 13471) +++ branches/xmlbuildsystem/reactos/tools/rbuild/pch.h 2005-02-08 22:50:55 UTC (rev 13472) @@ -34,6 +34,7 @@ #define _isnan __isnan #define stricmp strcasecmp #define MAX_PATH PATH_MAX +#define _MAX_PATH PATH_MAX #endif #endif//PCH_H

19 years, 10 months

[gvg] 13471: Prefer SEE_MASK_IDLIST, since that one is actually implemented in shell32...

by gvg＠svn.reactos.com

Prefer SEE_MASK_IDLIST, since that one is actually implemented in shell32... Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-02-08 22:21:16 UTC (rev 13470) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-02-08 22:23:05 UTC (rev 13471) @@ -1254,7 +1254,7 @@ SHELLEXECUTEINFO shexinfo; shexinfo.cbSize = sizeof(SHELLEXECUTEINFO); - shexinfo.fMask = SEE_MASK_INVOKEIDLIST; // SEE_MASK_IDLIST is also possible. + shexinfo.fMask = SEE_MASK_IDLIST; // SEE_MASK_INVOKEIDLIST is also possible. shexinfo.hwnd = hparent; shexinfo.lpVerb = NULL; shexinfo.lpFile = NULL;

19 years, 10 months

[chorns] 13470: Generate reactos.cab

by chorns＠svn.reactos.com

Generate reactos.cab Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rmkdir.c Modified: branches/xmlbuildsystem/reactos/tools/tools.xml _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-02-08 22:11:27 UTC (rev 13469) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-02-08 22:21:16 UTC (rev 13470) @@ -161,12 +161,12 @@ void MingwBackend::GenerateGlobalVariables () const { -#ifdef WIN32 fprintf ( fMakefile, "host_gcc = gcc\n" ); fprintf ( fMakefile, "host_gpp = g++\n" ); fprintf ( fMakefile, "host_ld = ld\n" ); fprintf ( fMakefile, "host_ar = ar\n" ); fprintf ( fMakefile, "host_objcopy = objcopy\n" ); +#ifdef WIN32 fprintf ( fMakefile, "rm = del /f /q\n" ); fprintf ( fMakefile, "gcc = gcc\n" ); fprintf ( fMakefile, "gpp = g++\n" ); @@ -176,11 +176,6 @@ fprintf ( fMakefile, "dlltool = dlltool\n" ); fprintf ( fMakefile, "windres = windres\n" ); #else - fprintf ( fMakefile, "host_gcc = gcc\n" ); - fprintf ( fMakefile, "host_gpp = g++\n" ); - fprintf ( fMakefile, "host_ld = ld\n" ); - fprintf ( fMakefile, "host_ar = ar\n" ); - fprintf ( fMakefile, "host_objcopy = objcopy\n" ); fprintf ( fMakefile, "rm = rm -f\n" ); fprintf ( fMakefile, "gcc = mingw32-gcc\n" ); fprintf ( fMakefile, "gpp = mingw32-g++\n" ); @@ -190,12 +185,12 @@ fprintf ( fMakefile, "dlltool = mingw32-dlltool\n" ); fprintf ( fMakefile, "windres = mingw32-windres\n" ); #endif - fprintf ( fMakefile, "mkdir = tools%crmkdir\n", CSEP ); + fprintf ( fMakefile, "mkdir = tools" SSEP "rmkdir" EXEPOSTFIX "\n" ); fprintf ( fMakefile, "NUL=NUL\n" ); - fprintf ( fMakefile, "winebuild = tools" SSEP "winebuild" SSEP "winebuild\n" ); - fprintf ( fMakefile, "bin2res = tools" SSEP "bin2res" SSEP "bin2res\n" ); - fprintf ( fMakefile, "cabman = tools" SSEP "cabman" SSEP "cabman\n" ); - fprintf ( fMakefile, "cdmake = tools" SSEP "cdmake" SSEP "cdmake\n" ); + fprintf ( fMakefile, "winebuild = tools" SSEP "winebuild" SSEP "winebuild" EXEPOSTFIX "\n" ); + fprintf ( fMakefile, "bin2res = tools" SSEP "bin2res" SSEP "bin2res" EXEPOSTFIX "\n" ); + fprintf ( fMakefile, "cabman = tools" SSEP "cabman" SSEP "cabman" EXEPOSTFIX "\n" ); + fprintf ( fMakefile, "cdmake = tools" SSEP "cdmake" SSEP "cdmake" EXEPOSTFIX "\n" ); fprintf ( fMakefile, "\n" ); GenerateGlobalCFlagsAndProperties ( "=", _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-02-08 22:11:27 UTC (rev 13469) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-02-08 22:21:16 UTC (rev 13470) @@ -53,10 +53,10 @@ } const string & -MingwModuleHandler::PassThruCacheDirectory( const string &file ) const +MingwModuleHandler::PassThruCacheDirectory ( const string &file ) const { - directory_set.insert( ReplaceExtension( GetDirectory( file ), "" ) ); - return file; + directory_set.insert ( GetDirectory ( file ) ); + return file; } void @@ -87,20 +87,10 @@ } string -MingwModuleHandler::GetDirectory ( const string& filename ) -{ - size_t index = filename.find_last_of ( CSEP ); - if (index == string::npos) - return "."; - else - return filename.substr ( 0, index ); -} - -string MingwModuleHandler::GetBasename ( const string& filename ) const { size_t index = filename.find_last_of ( '.' ); - if (index != string::npos) + if ( index != string::npos ) return filename.substr ( 0, index ); return ""; } @@ -111,7 +101,7 @@ string extension = GetExtension ( filename ); if ( extension == ".spec" || extension == "SPEC" ) { - string basename = GetBasename( filename ); + string basename = GetBasename ( filename ); return basename + ".stubs.c"; } else @@ -187,7 +177,7 @@ { string dependencies = GetImportLibraryDependencies ( module ); string s = GetModuleDependencies ( module ); - if (s.length () > 0) + if ( s.length () > 0 ) { dependencies += " "; dependencies += s; @@ -208,13 +198,13 @@ sourceFilenames += " " + GetActualSourceFilename ( module.files[i]->name ); } vector<If*> ifs = module.ifs; - for ( i = 0; i < ifs.size(); i++ ) + for ( i = 0; i < ifs.size (); i++ ) { size_t j; If& rIf = *ifs[i]; - for ( j = 0; j < rIf.ifs.size(); j++ ) + for ( j = 0; j < rIf.ifs.size (); j++ ) ifs.push_back ( rIf.ifs[j] ); - for ( j = 0; j < rIf.files.size(); j++ ) + for ( j = 0; j < rIf.files.size (); j++ ) { if ( includeGeneratedFiles || !IsGeneratedFile ( *rIf.files[j] ) ) sourceFilenames += " " + GetActualSourceFilename ( rIf.files[j]->name ); @@ -248,8 +238,7 @@ newExtension = ".stubs.o"; else newExtension = ".o"; - return FixupTargetFilename ( - ReplaceExtension ( sourceFilename, newExtension ) ); + return FixupTargetFilename ( ReplaceExtension ( sourceFilename, newExtension ) ); } string @@ -269,34 +258,34 @@ } void -MingwModuleHandler::GenerateDirectoryTargets() const +MingwModuleHandler::GenerateDirectoryTargets () const { + if ( directory_set.size () == 0 ) + return; + set_string::iterator i; - fprintf( fMakefile, "ifneq ($(ROS_INTERMEDIATE),)\ndirectories::" ); + fprintf ( fMakefile, "directories::" ); - for ( i = directory_set.begin(); - i != directory_set.end(); + for ( i = directory_set.begin (); + i != directory_set.end (); i++ ) { - fprintf ( fMakefile, " %s", i->c_str() ); + fprintf ( fMakefile, " %s", i->c_str () ); } - fprintf( fMakefile, "\n\n" ); + fprintf ( fMakefile, "\n\n" ); - for ( i = directory_set.begin(); - i != directory_set.end(); + for ( i = directory_set.begin (); + i != directory_set.end (); i++ ) { - fprintf ( fMakefile, "%s ", i->c_str() ); + fprintf ( fMakefile, "%s ", i->c_str () ); } fprintf ( fMakefile, - "::\n\t${mkdir} $@\n\n" - "else\n" - "directories::\n\n" - "endif\n\n" ); + "::\n\t${mkdir} $@\n\n" ); - directory_set.clear(); + directory_set.clear (); } string @@ -351,7 +340,7 @@ for ( size_t i = 0; i < includes.size (); i++ ) { Include& include = *includes[i]; - if (parameters.length () > 0) + if ( parameters.length () > 0 ) parameters += " "; parameters += "-I" + include.directory; } @@ -1264,6 +1253,8 @@ bool MingwModuleHandler::IsCPlusPlusModule ( const Module& module ) const { + if ( module.HasFileWithExtensions ( ".cc", ".CC" ) ) + return true; if ( module.HasFileWithExtensions ( ".cxx", ".CXX" ) ) return true; if ( module.HasFileWithExtensions ( ".cpp", ".CPP" ) ) @@ -1949,28 +1940,37 @@ void MingwIsoModuleHandler::GenerateIsoModuleTarget ( const Module& module ) { - string isoboot = "$(ROS_INTERMEDIATE)" + FixupTargetFilename ( "boot/freeldr/bootsect/isoboot.o" ); + string bootcdDirectory = "cd"; + string isoboot = FixupTargetFilename ( "boot/freeldr/bootsect/isoboot.o" ); + string bootcdReactosNoFixup = bootcdDirectory + "/reactos"; + string bootcdReactos = FixupTargetFilename ( bootcdReactosNoFixup ); + PassThruCacheDirectory ( bootcdReactos + SSEP ); + string reactosInf = FixupTargetFilename ( bootcdReactosNoFixup + "/reactos.inf" ); + string reactosDff = NormalizeFilename ( "bootdata/packages/reactos.dff" ); fprintf ( fMakefile, ".PHONY: %s\n\n", module.name.c_str ()); fprintf ( fMakefile, - "%s: all %s\n", + "%s: all %s %s\n", module.name.c_str (), - isoboot.c_str () ); + isoboot.c_str (), + bootcdReactos.c_str () ); fprintf ( fMakefile, - "\t${cabman} /C %s /L $(ROS_INTERMEDIATE)%s /I\n", - FixupTargetFilename ( "bootdata/packages/reactos.dff" ).c_str (), - FixupTargetFilename ( "bootcd/reactos" ).c_str () ); + "\t${cabman} /C %s /L %s /I\n", + reactosDff.c_str (), + bootcdReactos.c_str () ); fprintf ( fMakefile, - "\t${cabman} /C %s /RC $(ROS_INTERMEDIATE)%s /L $(BOOTCD_DIR)reactos /N\n", - FixupTargetFilename ( "bootdata/packages/reactos.dff" ).c_str (), - FixupTargetFilename ( "bootcd/reactos/reactos.inf" ).c_str () ); + "\t${cabman} /C %s /RC %s /L %s /N\n", + reactosDff.c_str (), + reactosInf.c_str (), + bootcdReactos.c_str () ); fprintf ( fMakefile, - "\t- ${rm} $(ROS_INTERMEDIATE)%s\n", - FixupTargetFilename ( "bootcd/reactos/reactos.inf" ).c_str () ); + "\t- ${rm} %s\n", + reactosInf.c_str () ); fprintf ( fMakefile, - "\t${cdmake} -v -m -b %s $(ROS_INTERMEDIATE)bootcd REACTOS ReactOS.iso\n", - isoboot.c_str () ); + "\t${cdmake} -v -m -b %s %s REACTOS ReactOS.iso\n", + isoboot.c_str (), + bootcdDirectory.c_str () ); fprintf ( fMakefile, "\n" ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-02-08 22:11:27 UTC (rev 13469) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-02-08 22:21:16 UTC (rev 13470) @@ -23,7 +23,6 @@ virtual void Process ( const Module& module ) = 0; void GenerateDirectoryTargets () const; static std::string GetObjectFilename ( const std::string& sourceFilename ); - static std::string GetDirectory ( const std::string& filename ); protected: const std::string &PassThruCacheDirectory ( const std::string &f ) const; std::string GetWorkingDirectory () const; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-02-08 22:11:27 UTC (rev 13469) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-02-08 22:21:16 UTC (rev 13470) @@ -32,6 +32,16 @@ } string +GetDirectory ( const string& filename ) +{ + size_t index = filename.find_last_of ( CSEP ); + if ( index == string::npos ) + return filename; + else + return filename.substr ( 0, index ); +} + +string NormalizeFilename ( const string& filename ) { Path path; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-02-08 22:11:27 UTC (rev 13469) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-02-08 22:21:16 UTC (rev 13470) @@ -440,6 +440,9 @@ GetExtension ( const std::string& filename ); extern std::string +GetDirectory ( const std::string& filename ); + +extern std::string NormalizeFilename ( const std::string& filename ); #endif /* __RBUILD_H */ _____ Modified: branches/xmlbuildsystem/reactos/tools/rmkdir.c --- branches/xmlbuildsystem/reactos/tools/rmkdir.c 2005-02-08 22:11:27 UTC (rev 13469) +++ branches/xmlbuildsystem/reactos/tools/rmkdir.c 2005-02-08 22:21:16 UTC (rev 13470) @@ -10,15 +10,13 @@ #include <sys/types.h> #endif -#ifdef UNIX_PATHS -#define DIR_SEPARATOR_CHAR '/' -#define DIR_SEPARATOR_STRING "/" -#else -#ifdef DOS_PATHS +#if defined(WIN32) #define DIR_SEPARATOR_CHAR '\\' #define DIR_SEPARATOR_STRING "\\" +#else +#define DIR_SEPARATOR_CHAR '/' +#define DIR_SEPARATOR_STRING "/" #endif -#endif char* convert_path(char* origpath) { _____ Modified: branches/xmlbuildsystem/reactos/tools/tools.xml --- branches/xmlbuildsystem/reactos/tools/tools.xml 2005-02-08 22:11:27 UTC (rev 13469) +++ branches/xmlbuildsystem/reactos/tools/tools.xml 2005-02-08 22:21:16 UTC (rev 13470) @@ -19,3 +19,6 @@ <directory name="winebuild"> <xi:include href="winebuild/winebuild.xml" /> </directory> +<module name="rmkdir" type="buildtool"> + <file>rmkdir.c</file> +</module>

19 years, 10 months

[gvg] 13469: You can't execute a DLL

by gvg＠svn.reactos.com

You can't execute a DLL Modified: trunk/reactos/lib/kernel32/process/create.c _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-02-08 21:27:49 UTC (rev 13468) +++ trunk/reactos/lib/kernel32/process/create.c 2005-02-08 22:11:27 UTC (rev 13469) @@ -1011,7 +1011,30 @@ lpProcessInformation); } ///////////////////////////////////////// + /* + * Get some information about the executable + */ + Status = ZwQuerySection(hSection, + SectionImageInformation, + &Sii, + sizeof(Sii), + &i); + if (! NT_SUCCESS(Status)) + { + NtClose(hSection); + SetLastErrorByStatus(Status); + return FALSE; + } + + if (0 != (Sii.Characteristics & IMAGE_FILE_DLL)) + { + NtClose(hSection); + SetLastError(ERROR_BAD_EXE_FORMAT); + return FALSE; + } + + /* * Initialize the process object attributes */ @@ -1133,16 +1156,6 @@ DUPLICATE_SAME_ACCESS); /* FIXME - handle failure!!!!! */ } - - /* - * Get some information about the executable - */ - Status = ZwQuerySection(hSection, - SectionImageInformation, - &Sii, - sizeof(Sii), - &i); - /* FIXME - handle failure!!!!! */ /* * Close the section

19 years, 10 months

[gvg] 13468: Hervé Poussineau <poussine@freesurf.fr>

by gvg＠svn.reactos.com

Hervé Poussineau <poussine(a)freesurf.fr> Initialize default partition size to maximum size. Modified: trunk/reactos/subsys/system/usetup/usetup.c _____ Modified: trunk/reactos/subsys/system/usetup/usetup.c --- trunk/reactos/subsys/system/usetup/usetup.c 2005-02-08 18:58:59 UTC (rev 13467) +++ trunk/reactos/subsys/system/usetup/usetup.c 2005-02-08 21:27:49 UTC (rev 13468) @@ -1710,8 +1710,8 @@ strlen (Buffer), coPos); - Buffer[0] = 0; - Index = 0; + sprintf(Buffer, "%d", MaxSize); + Index = strlen(Buffer); DrawInputField (PARTITION_SIZE_INPUT_FIELD_LENGTH, iLeft, iTop,

19 years, 10 months

[gvg] 13467: Set eol-style

by gvg＠svn.reactos.com

Set eol-style Modified: trunk/reactos/apps/utils/net/ftp/cmds.c Modified: trunk/reactos/apps/utils/net/ftp/domacro.c Modified: trunk/reactos/apps/utils/net/ftp/fake.c Modified: trunk/reactos/apps/utils/net/ftp/fake.h Modified: trunk/reactos/apps/utils/net/ftp/ftp.c Modified: trunk/reactos/apps/utils/net/ftp/ftp.mak Modified: trunk/reactos/apps/utils/net/ftp/ftp.mak.orig Modified: trunk/reactos/apps/utils/net/ftp/ftp_var.h Modified: trunk/reactos/apps/utils/net/ftp/main.c Modified: trunk/reactos/apps/utils/net/ftp/prototypes.h Modified: trunk/reactos/apps/utils/net/ftp/ruserpass.c _____ Modified: trunk/reactos/apps/utils/net/ftp/cmds.c --- trunk/reactos/apps/utils/net/ftp/cmds.c 2005-02-08 17:10:19 UTC (rev 13466) +++ trunk/reactos/apps/utils/net/ftp/cmds.c 2005-02-08 18:58:59 UTC (rev 13467) @@ -1,2376 +1,2376 @@ -/* - * Copyright (c) 1985, 1989 Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms are permitted - * provided that the above copyright notice and this paragraph are - * duplicated in all such forms and that any documentation, - * advertising materials, and other materials related to such - * distribution and use acknowledge that the software was developed - * by the University of California, Berkeley. The name of the - * University may not be used to endorse or promote products derived - * from this software without specific prior written permission. - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -#ifndef lint -static char sccsid[] = "@(#)cmds.c 5.18 (Berkeley) 4/20/89"; -#endif /* not lint */ - -/* - * FTP User Program -- Command Routines. - */ -//#include <sys/param.h> -//#include <sys/wait.h> -#include <sys/stat.h> -#if !defined(WIN32) -#include <sys/socket.h> -#include <arpa/ftp.h> -#include <netinet/in.h> -#include <netdb.h> -#else -#include <winsock.h> -#endif - -#include <signal.h> -#include <direct.h> -#include <stdio.h> -#include <errno.h> -#include <ctype.h> -#include <time.h> - -#include "ftp_var.h" -#include "pathnames.h" -#include "prototypes.h" - -extern char *globerr; -extern char **glob(); -extern char home[]; -extern char *remglob(); -extern char *getenv(); -extern int allbinary; -extern off_t restart_point; -extern char reply_string[]; - -char *mname; -jmp_buf jabort; -char *dotrans(), *domap(); - -extern short portnum; -extern char *hostname; -extern int autologin; -/* - * Connect to peer server and - * auto-login, if possible. - */ -void setpeer(int argc, char *argv[]) -{ - char *host, *hookup(); - - if (connected) { - printf("Already connected to %s, use close first.\n", - hostname); - (void) fflush(stdout); - code = -1; - return; - } - if (argc < 2) { - (void) strcat(line, " "); - printf("(to) "); - (void) fflush(stdout); - (void) gets(&line[strlen(line)]); - makeargv(); - argc = margc; - argv = margv; - } - if (argc > 3) { - printf("usage: %s host-name [port]\n", argv[0]); - (void) fflush(stdout); - code = -1; - return; - } - if (argc > 2) { - portnum = atoi(argv[2]); - if (portnum <= 0) { - printf("%s: bad port number-- %s\n", argv[1], argv[2]); - printf ("usage: %s host-name [port]\n", argv[0]); - (void) fflush(stdout); - code = -1; - return; - } - portnum = htons(portnum); - } - host = hookup(argv[1], portnum); - if (host) { -#if defined(unix) && NBBY == 8 - int overbose; -#endif - connected = 1; - if (autologin) - (void) login(argv[1]); - -#if defined(unix) && NBBY == 8 -/* - * this ifdef is to keep someone form "porting" this to an incompatible - * system and not checking this out. This way they have to think about it. - */ - overbose = verbose; - if (debug == 0) - verbose = -1; - allbinary = 0; - if (command("SYST") == COMPLETE && overbose) { - register char *cp, c; - cp = index(reply_string+4, ' '); - if (cp == NULL) - cp = index(reply_string+4, '\r'); - if (cp) { - if (cp[-1] == '.') - cp--; - c = *cp; - *cp = '\0'; - } - - printf("Remote system type is %s.\n", - reply_string+4); - if (cp) - *cp = c; - } - if (!strncmp(reply_string, "215 UNIX Type: L8", 17)) { - setbinary(); - /* allbinary = 1; this violates the RFC */ - if (overbose) - printf("Using %s mode to transfer files.\n", - typename); - } else if (overbose && - !strncmp(reply_string, "215 TOPS20", 10)) { - printf( -"Remember to set tenex mode when transfering binary files from this machine.\n"); - } - verbose = overbose; -#endif /* unix */ - } - (void) fflush(stdout); -} - -struct types { - char *t_name; - char *t_mode; - int t_type; - char *t_arg; -} types[] = { - { "ascii", "A", TYPE_A, 0 }, - { "binary", "I", TYPE_I, 0 }, - { "image", "I", TYPE_I, 0 }, - { "ebcdic", "E", TYPE_E, 0 }, - { "tenex", "L", TYPE_L, bytename }, - 0 -}; - -/* - * Set transfer type. - */ -void settype(argc, argv) - char *argv[]; -{ - register struct types *p; - int comret; - - if (argc > 2) { - char *sep; - - printf("usage: %s [", argv[0]); - sep = " "; - for (p = types; p->t_name; p++) { - printf("%s%s", sep, p->t_name); - if (*sep == ' ') - sep = " | "; - } - printf(" ]\n"); - (void) fflush(stdout); - code = -1; - return; - } - if (argc < 2) { - printf("Using %s mode to transfer files.\n", typename); - (void) fflush(stdout); - code = 0; - return; - } - for (p = types; p->t_name; p++) - if (strcmp(argv[1], p->t_name) == 0) - break; - if (p->t_name == 0) { - printf("%s: unknown mode\n", argv[1]); - (void) fflush(stdout); - code = -1; - return; - } - if ((p->t_arg != NULL) && (*(p->t_arg) != '\0')) - comret = command ("TYPE %s %s", p->t_mode, p->t_arg); - else - comret = command("TYPE %s", p->t_mode); - if (comret == COMPLETE) { - (void) strcpy(typename, p->t_name); - type = p->t_type; - } -} - -char *stype[] = { - "type", - "", - 0 -}; - -/* - * Set binary transfer type. - */ -/*VARARGS*/ -void setbinary() -{ - stype[1] = "binary"; - settype(2, stype); -} - -/* - * Set ascii transfer type. - */ -/*VARARGS*/ -void setascii() -{ - stype[1] = "ascii"; - settype(2, stype); -} - -/* - * Set tenex transfer type. - */ -/*VARARGS*/ -void settenex() -{ - stype[1] = "tenex"; - settype(2, stype); -} - -/* - * Set ebcdic transfer type. - */ -/*VARARGS*/ -void setebcdic() -{ - stype[1] = "ebcdic"; - settype(2, stype); -} - -/* - * Set file transfer mode. - */ -#if 0 -/*ARGSUSED*/ -void setmode(argc, argv) - char *argv[]; -{ - - printf("We only support %s mode, sorry.\n", modename); - (void) fflush(stdout); - code = -1; -} -#endif - -/* - * Set file transfer format. - */ -/*ARGSUSED*/ -void setform(argc, argv) - char *argv[]; -{ - - printf("We only support %s format, sorry.\n", formname); - (void) fflush(stdout); - code = -1; -} - -/* - * Set file transfer structure. - */ -/*ARGSUSED*/ -void setstruct(argc, argv) - char *argv[]; -{ - - printf("We only support %s structure, sorry.\n", structname); - (void) fflush(stdout); - code = -1; -} - -/* - * Send a single file. - */ -void put(argc, argv) - int argc; - char *argv[]; -{ - char *cmd; - int loc = 0; - char *oldargv1, *oldargv2; - - if (argc == 2) { - argc++; - argv[2] = argv[1]; - loc++; - } - if (argc < 2) { - (void) strcat(line, " "); - printf("(local-file) "); - (void) fflush(stdout); - (void) gets(&line[strlen(line)]); - makeargv(); - argc = margc; - argv = margv; - } - if (argc < 2) { -usage: - printf("usage:%s local-file remote-file\n", argv[0]); - (void) fflush(stdout); - code = -1; - return; - } - if (argc < 3) { - (void) strcat(line, " "); - printf("(remote-file) "); - (void) fflush(stdout); - (void) gets(&line[strlen(line)]); - makeargv(); - argc = margc; - argv = margv; - } - if (argc < 3) - goto usage; - oldargv1 = argv[1]; - oldargv2 = argv[2]; - if (!globulize(&argv[1])) { - code = -1; - return; - } - /* - * If "globulize" modifies argv[1], and argv[2] is a copy of - * the old argv[1], make it a copy of the new argv[1]. - */ - if (argv[1] != oldargv1 && argv[2] == oldargv1) { - argv[2] = argv[1]; - } - cmd = (argv[0][0] == 'a') ? "APPE" : ((sunique) ? "STOU" : "STOR"); - if (loc && ntflag) { - argv[2] = dotrans(argv[2]); - } - if (loc && mapflag) { - argv[2] = domap(argv[2]); - } - sendrequest(cmd, argv[1], argv[2], - argv[1] != oldargv1 || argv[2] != oldargv2); -} - -/* - * Send multiple files. - */ -void mput(argc, argv) - char *argv[]; -{ - register int i; - int ointer; - void mabort(); - extern jmp_buf jabort; - char *tp; - - if (argc < 2) { - (void) strcat(line, " "); - printf("(local-files) "); - (void) fflush(stdout); - (void) gets(&line[strlen(line)]); - makeargv(); - argc = margc; - argv = margv; - } - if (argc < 2) { - printf("usage:%s local-files\n", argv[0]); - (void) fflush(stdout); - code = -1; - return; - } - mname = argv[0]; - mflag = 1; -// oldintr = signal(SIGINT, mabort); - (void) setjmp(jabort); - if (proxy) { - char *cp, *tp2, tmpbuf[MAXPATHLEN]; - - while ((cp = remglob(argv,0)) != NULL) { - if (*cp == 0) { - mflag = 0; - continue; - } - if (mflag && confirm(argv[0], cp)) { - tp = cp; - if (mcase) { - while (*tp && !islower(*tp)) { - tp++; - } - if (!*tp) { - tp = cp; - tp2 = tmpbuf; - while ((*tp2 = *tp) != (int) NULL) { - if (isupper(*tp2)) { - *tp2 = 'a' + *tp2 - 'A'; - } - tp++; - tp2++; - } - } - tp = tmpbuf; - } - if (ntflag) { - tp = dotrans(tp); - } - if (mapflag) { - tp = domap(tp); - } - sendrequest((sunique) ? "STOU" : "STOR", - cp, tp, cp != tp || !interactive); - if (!mflag && fromatty) { - ointer = interactive; - interactive = 1; - if (confirm("Continue with","mput")) { - mflag++; - } - interactive = ointer; - } - } - } -// (void) signal(SIGINT, oldintr); - mflag = 0; - return; - } - for (i = 1; i < argc; i++) { - register char **cpp, **gargs; - - if (!doglob) { - if (mflag && confirm(argv[0], argv[i])) { - tp = (ntflag) ? dotrans(argv[i]) : argv[i]; - tp = (mapflag) ? domap(tp) : tp; - sendrequest((sunique) ? "STOU" : "STOR", - argv[i], tp, tp != argv[i] || !interactive); - if (!mflag && fromatty) { - ointer = interactive; - interactive = 1; - if (confirm("Continue with","mput")) { - mflag++; - } - interactive = ointer; - } - } - continue; - } - gargs = glob(argv[i]); - if (globerr != NULL) { - printf("%s\n", globerr); - (void) fflush(stdout); - if (gargs) { - blkfree(gargs); - free((char *)gargs); - } - continue; - } - for (cpp = gargs; cpp && *cpp != NULL; cpp++) { - if (mflag && confirm(argv[0], *cpp)) { - tp = (ntflag) ? dotrans(*cpp) : *cpp; - tp = (mapflag) ? domap(tp) : tp; - sendrequest((sunique) ? "STOU" : "STOR", - *cpp, tp, *cpp != tp || !interactive); - if (!mflag && fromatty) { - ointer = interactive; - interactive = 1; - if (confirm("Continue with","mput")) { - mflag++; - } - interactive = ointer; - } - } - } - if (gargs != NULL) { - blkfree(gargs); - free((char *)gargs); - } - } -// (void) signal(SIGINT, oldintr); - mflag = 0; -} - -void reget(argc, argv) - char *argv[]; -{ - (void) getit(argc, argv, 1, "r+w"); -} - -void get(argc, argv) - char *argv[]; -{ - (void) getit(argc, argv, 0, restart_point ? "r+w" : "w" ); -} - -/* - * Receive one file. - */ -int getit(argc, argv, restartit, mode) - char *argv[]; - char *mode; -{ - int loc = 0; - char *oldargv1, *oldargv2; - - if (argc == 2) { - argc++; - argv[2] = argv[1]; - loc++; - } - if (argc < 2) { - (void) strcat(line, " "); - printf("(remote-file) "); - (void) fflush(stdout); - (void) gets(&line[strlen(line)]); - makeargv(); - argc = margc; - argv = margv; - } - if (argc < 2) { -usage: - printf("usage: %s remote-file [ local-file ]\n", argv[0]); - (void) fflush(stdout); - code = -1; - return (0); - } - if (argc < 3) { - (void) strcat(line, " "); - printf("(local-file) "); - (void) fflush(stdout); - (void) gets(&line[strlen(line)]); - makeargv(); - argc = margc; - argv = margv; - } - if (argc < 3) - goto usage; - oldargv1 = argv[1]; - oldargv2 = argv[2]; - if (!globulize(&argv[2])) { - code = -1; - return (0); - } - if (loc && mcase) { - char *tp = argv[1], *tp2, tmpbuf[MAXPATHLEN]; - - while (*tp && !islower(*tp)) { - tp++; - } - if (!*tp) { - tp = argv[2]; - tp2 = tmpbuf; - while ((*tp2 = *tp) != (int) NULL) { - if (isupper(*tp2)) { - *tp2 = 'a' + *tp2 - 'A'; - } - tp++; - tp2++; - } - argv[2] = tmpbuf; - } - } - if (loc && ntflag) - argv[2] = dotrans(argv[2]); - if (loc && mapflag) - argv[2] = domap(argv[2]); - if (restartit) { - struct stat stbuf; - int ret; - - ret = stat(argv[2], &stbuf); - if (restartit == 1) { - if (ret < 0) { - perror(argv[2]); - return (0); - } - restart_point = stbuf.st_size; - } else { - if (ret == 0) { - int overbose; - - overbose = verbose; - if (debug == 0) - verbose = -1; - if (command("MDTM %s", argv[1]) == COMPLETE) { - int yy, mo, day, hour, min, sec; - struct tm *tm; - verbose = overbose; - sscanf(reply_string, - "%*s %04d%02d%02d%02d%02d%02d", - &yy, &mo, &day, &hour, &min, &sec); - tm = gmtime(&stbuf.st_mtime); - tm->tm_mon++; - if (tm->tm_year > yy%100) - return (1); - else if (tm->tm_year == yy%100) { - if (tm->tm_mon > mo) - return (1); - } else if (tm->tm_mon == mo) { - if (tm->tm_mday > day) - return (1); - } else if (tm->tm_mday == day) { - if (tm->tm_hour > hour) - return (1); - } else if (tm->tm_hour == hour) { - if (tm->tm_min > min) - return (1); - } else if (tm->tm_min == min) { - if (tm->tm_sec > sec) - return (1); - } - } else { - printf("%s\n", reply_string); - (void) fflush(stdout); - verbose = overbose; - return (0); - } - } - } - } - - recvrequest("RETR", argv[2], argv[1], mode, - argv[1] != oldargv1 || argv[2] != oldargv2); - restart_point = 0; - return (0); -} - -void -mabort() -{ - int ointer; - extern jmp_buf jabort; - - printf("\n"); - (void) fflush(stdout); - if (mflag && fromatty) { - ointer = interactive; - interactive = 1; - if (confirm("Continue with", mname)) { - interactive = ointer; - longjmp(jabort,0); - } - interactive = ointer; - } - mflag = 0; - longjmp(jabort,0); -} - -/* - * Get multiple files. - */ -void mget(argc, argv) - char *argv[]; -{ - char *cp, *tp, *tp2, tmpbuf[MAXPATHLEN]; - int ointer; - void mabort(); - extern jmp_buf jabort; - - if (argc < 2) { - (void) strcat(line, " "); - printf("(remote-files) "); - (void) fflush(stdout); - (void) gets(&line[strlen(line)]); - makeargv(); - argc = margc; - argv = margv; - } - if (argc < 2) { - printf("usage:%s remote-files\n", argv[0]); - (void) fflush(stdout); - code = -1; - return; - } - mname = argv[0]; - mflag = 1; -// oldintr = signal(SIGINT,mabort); - (void) setjmp(jabort); - while ((cp = remglob(argv,proxy)) != NULL) { - if (*cp == '\0') { - mflag = 0; - continue; - } - if (mflag && confirm(argv[0], cp)) { - tp = cp; - if (mcase) { - while (*tp && !islower(*tp)) { - tp++; - } - if (!*tp) { - tp = cp; - tp2 = tmpbuf; - while ((*tp2 = *tp) != (int) NULL) { - if (isupper(*tp2)) { - *tp2 = 'a' + *tp2 - 'A'; - } - tp++; - tp2++; - } - } - tp = tmpbuf; - } - if (ntflag) { - tp = dotrans(tp); - } - if (mapflag) { - tp = domap(tp); - } - recvrequest("RETR", tp, cp, "w", - tp != cp || !interactive); - if (!mflag && fromatty) { - ointer = interactive; - interactive = 1; - if (confirm("Continue with","mget")) { - mflag++; - } - interactive = ointer; - } - } - } -// (void) signal(SIGINT,oldintr); - mflag = 0; -} - -char * -remglob(argv,doswitch) - char *argv[]; - int doswitch; -{ - char temp[16]; - static char buf[MAXPATHLEN]; - static FILE *ftemp = NULL; - static char **args; - int oldverbose, oldhash; - char *cp, *mode; - - if (!mflag) { - if (!doglob) { - args = NULL; - } - else { - if (ftemp) { - (void) fclose(ftemp); - ftemp = NULL; - } - } - return(NULL); - } - if (!doglob) { - if (args == NULL) - args = argv; - if ((cp = *++args) == NULL) - args = NULL; - return (cp); - } - if (ftemp == NULL) { - (void) strcpy(temp, _PATH_TMP); - (void) mktemp(temp); - oldverbose = verbose, verbose = 0; - oldhash = hash, hash = 0; - if (doswitch) { - pswitch(!proxy); - } - for (mode = "w"; *++argv != NULL; mode = "a") - recvrequest ("NLST", temp, *argv, mode, 0); - if (doswitch) { - pswitch(!proxy); - } - verbose = oldverbose; hash = oldhash; - ftemp = fopen(temp, "r"); - (void) unlink(temp); - if (ftemp == NULL) { - printf("can't find list of remote files, oops\n"); - (void) fflush(stdout); - return (NULL); - } - } - if (fgets(buf, sizeof (buf), ftemp) == NULL) { - (void) fclose(ftemp), ftemp = NULL; - return (NULL); - } - if ((cp = index(buf, '\n')) != NULL) - *cp = '\0'; - return (buf); -} - -char * -onoff(bool) - int bool; -{ - - return (bool ? "on" : "off"); -} - -/* - * Show status. - */ -/*ARGSUSED*/ -void status(argc, argv) - char *argv[]; -{ - int i; - - if (connected) - printf("Connected to %s.\n", hostname); - else - printf("Not connected.\n"); - if (!proxy) { - pswitch(1); - if (connected) { - printf("Connected for proxy commands to %s.\n", hostname); - } - else { - printf("No proxy connection.\n"); - } - pswitch(0); - } - printf("Mode: %s; Type: %s; Form: %s; Structure: %s\n", - modename, typename, formname, structname); - printf("Verbose: %s; Bell: %s; Prompting: %s; Globbing: %s\n", - onoff(verbose), onoff(bell), onoff(interactive), - onoff(doglob)); - printf("Store unique: %s; Receive unique: %s\n", onoff(sunique), - onoff(runique)); - printf("Case: %s; CR stripping: %s\n",onoff(mcase),onoff(crflag)); - if (ntflag) { - printf("Ntrans: (in) %s (out) %s\n", ntin,ntout); - } - else { - printf("Ntrans: off\n"); - } - if (mapflag) { - printf("Nmap: (in) %s (out) %s\n", mapin, mapout); - } - else { - printf("Nmap: off\n"); - } - printf("Hash mark printing: %s; Use of PORT cmds: %s\n", - onoff(hash), onoff(sendport)); - if (macnum > 0) { - printf("Macros:\n"); - for (i=0; i<macnum; i++) { - printf("\t%s\n",macros[i].mac_name); - } - } - (void) fflush(stdout); - code = 0; -} - -/* - * Set beep on cmd completed mode. - */ -/*VARARGS*/ -void setbell() -{ - - bell = !bell; - printf("Bell mode %s.\n", onoff(bell)); - (void) fflush(stdout); - code = bell; -} - -/* - * Turn on packet tracing. - */ -/*VARARGS*/ -void settrace() -{ - - trace = !trace; - printf("Packet tracing %s.\n", onoff(trace)); - (void) fflush(stdout); - code = trace; -} - -/* - * Toggle hash mark printing during transfers. - */ -/*VARARGS*/ -void sethash() -{ - - hash = !hash; - printf("Hash mark printing %s", onoff(hash)); - code = hash; - if (hash) - printf(" (%d bytes/hash mark)", 1024); - printf(".\n"); - (void) fflush(stdout); -} - -/* - * Turn on printing of server echo's. - */ -/*VARARGS*/ -void setverbose() -{ - - verbose = !verbose; - printf("Verbose mode %s.\n", onoff(verbose)); - (void) fflush(stdout); - code = verbose; -} - -/* - * Toggle PORT cmd use before each data connection. - */ -/*VARARGS*/ -void setport() -{ - - sendport = !sendport; - printf("Use of PORT cmds %s.\n", onoff(sendport)); - (void) fflush(stdout); - code = sendport; -} - -/* - * Turn on interactive prompting - * during mget, mput, and mdelete. - */ -/*VARARGS*/ -void setprompt() -{ - - interactive = !interactive; - printf("Interactive mode %s.\n", onoff(interactive)); - (void) fflush(stdout); - code = interactive; -} - -/* - * Toggle metacharacter interpretation - * on local file names. - */ -/*VARARGS*/ -void setglob() -{ - - doglob = !doglob; - printf("Globbing %s.\n", onoff(doglob)); - (void) fflush(stdout); - code = doglob; -} - -/* - * Set debugging mode on/off and/or - * set level of debugging. - */ -/*VARARGS*/ -void setdebug(argc, argv) - char *argv[]; -{ - int val; - - if (argc > 1) { - val = atoi(argv[1]); - if (val < 0) { - printf("%s: bad debugging value.\n", argv[1]); - (void) fflush(stdout); - code = -1; - return; - } - } else - val = !debug; - debug = val; - if (debug) - options |= SO_DEBUG; - else - options &= ~SO_DEBUG; [truncated at 1000 lines; 11909 more skipped]

19 years, 10 months

[arty] 13466: There's no need to link ntdll here.

by arty＠svn.reactos.com

There's no need to link ntdll here. Modified: trunk/reactos/apps/utils/net/ftp/makefile _____ Modified: trunk/reactos/apps/utils/net/ftp/makefile --- trunk/reactos/apps/utils/net/ftp/makefile 2005-02-08 14:46:44 UTC (rev 13465) +++ trunk/reactos/apps/utils/net/ftp/makefile 2005-02-08 17:10:19 UTC (rev 13466) @@ -8,7 +8,8 @@ TARGET_INSTALLDIR = system32 -TARGET_SDKLIBS = ws2_32.a iphlpapi.a ntdll.a +TARGET_SDKLIBS = ws2_32.a iphlpapi.a +# ntdll.a TARGET_OBJECTS = \ cmds.o \

19 years, 10 months

← Newer
1
...
29
30
31
32
33
34
35
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2005