Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[mnordell] 29529: NTSHChangeNotifyRegister completed and to spec
by mnordell＠svn.reactos.org 12 Oct '07

12 Oct '07

Author: mnordell Date: Fri Oct 12 12:15:37 2007 New Revision: 29529 URL: http://svn.reactos.org/svn/reactos?rev=29529&view=rev Log: NTSHChangeNotifyRegister completed and to spec Modified: trunk/reactos/dll/win32/shell32/changenotify.c Modified: trunk/reactos/dll/win32/shell32/changenotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/changeno… ============================================================================== --- trunk/reactos/dll/win32/shell32/changenotify.c (original) +++ trunk/reactos/dll/win32/shell32/changenotify.c Fri Oct 12 12:15:37 2007 @@ -409,21 +409,20 @@ /************************************************************************* * NTSHChangeNotifyRegister [SHELL32.640] * NOTES - * Idlist is an array of structures and Count specifies how many items in the array - * (usually just one I think). - */ -DWORD WINAPI NTSHChangeNotifyRegister( + * Idlist is an array of structures and Count specifies how many items in the array. + * count should always be one when calling SHChangeNotifyRegister, or + * SHChangeNotifyDeregister will not work properly. + */ +ULONG WINAPI NTSHChangeNotifyRegister( HWND hwnd, - LONG events1, - LONG events2, - DWORD msg, + int fSources, + LONG fEvents, + UINT msg, int count, SHChangeNotifyEntry *idlist) { - FIXME("(%p,0x%08x,0x%08x,0x%08x,0x%08x,%p):semi stub.\n", - hwnd,events1,events2,msg,count,idlist); - - return (DWORD) SHChangeNotifyRegister(hwnd, events1, events2, msg, count, idlist); + return SHChangeNotifyRegister(hwnd, fSources | SHCNRF_NewDelivery, + fEvents, msg, count, idlist); } /*************************************************************************

1 0

[jimtabor] 29528: Sorry for this! Shell32 should be a Sync->Port not 100% sync. We needed this for a long time too! Good job janderwald!
by jimtabor＠svn.reactos.org 12 Oct '07

12 Oct '07

Author: jimtabor Date: Fri Oct 12 05:08:06 2007 New Revision: 29528 URL: http://svn.reactos.org/svn/reactos?rev=29528&view=rev Log: Sorry for this! Shell32 should be a Sync->Port not 100% sync. We needed this for a long time too! Good job janderwald! Modified: trunk/reactos/dll/win32/shell32/dialogs.c trunk/reactos/dll/win32/shell32/shell32.spec Modified: trunk/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs.c (original) +++ trunk/reactos/dll/win32/shell32/dialogs.c Fri Oct 12 05:08:06 2007 @@ -406,6 +406,16 @@ return 0; } +/************************************************************************* + * LogoffWindowsDialog [SHELL32.54] + */ + +int WINAPI LogoffWindowsDialog(DWORD uFlags) +{ + ERR("LogoffWindowsDialog is UNIMPLEMENTED\n"); + ExitWindowsEx(EWX_LOGOFF, 0); + return 0; +} /************************************************************************* * RestartDialog [SHELL32.59] Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec Fri Oct 12 05:08:06 2007 @@ -49,6 +49,7 @@ 51 stdcall PathResolve(str long long) PathResolveAW 52 stdcall -noname PathGetArgs(str) PathGetArgsAW 53 stdcall DoEnvironmentSubst(long long) DoEnvironmentSubstAW + 54 stdcall -noname LogoffWindowsDialog(ptr) 55 stdcall -noname PathQuoteSpaces(ptr) PathQuoteSpacesAW 56 stdcall -noname PathUnquoteSpaces(str) PathUnquoteSpacesAW 57 stdcall -noname PathGetDriveNumber(str) PathGetDriveNumberAW

1 0

[jimtabor] 29527: Add notes for NtGdiResetDC and NtGdiOpenDCW.
by jimtabor＠svn.reactos.org 12 Oct '07

12 Oct '07

Author: jimtabor Date: Fri Oct 12 04:47:31 2007 New Revision: 29527 URL: http://svn.reactos.org/svn/reactos?rev=29527&view=rev Log: Add notes for NtGdiResetDC and NtGdiOpenDCW. Modified: trunk/reactos/include/psdk/ntgdi.h Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h (original) +++ trunk/reactos/include/psdk/ntgdi.h Fri Oct 12 04:47:31 2007 @@ -2013,6 +2013,15 @@ OUT OPTIONAL PVOID pvBuf ); +// Note from SDK: +// +// NtGdiResetDC +// The exact size of the buffer at pdm is pdm->dmSize + pdm->dmDriverExtra. +// But this can't be specified with current annotation language. +// +// typedef struct _DRIVER_INFO_2W DRIVER_INFO_2W; +// +// :end note. W32KAPI BOOL APIENTRY @@ -2020,7 +2029,7 @@ IN HDC hdc, IN LPDEVMODEW pdm, OUT PBOOL pbBanding, - IN OPTIONAL VOID *pDriverInfo2, + IN OPTIONAL VOID *pDriverInfo2, // this is "typedef struct _DRIVER_INFO_2W DRIVER_INFO_2W;" OUT VOID *ppUMdhpdev ); @@ -2061,11 +2070,11 @@ APIENTRY NtGdiOpenDCW( IN OPTIONAL PUNICODE_STRING pustrDevice, - IN DEVMODEW *pdm, + IN DEVMODEW *pdm, // See note for NtGdiResetDC IN PUNICODE_STRING pustrLogAddr, IN ULONG iType, IN OPTIONAL HANDLE hspool, - IN OPTIONAL VOID *pDriverInfo2, + IN OPTIONAL VOID *pDriverInfo2, // this is "typedef struct _DRIVER_INFO_2W DRIVER_INFO_2W;" OUT VOID *pUMdhpdev );

1 0

[janderwald] 29526: - start implementing recyclebin (based on Wine's recycle bin implemenation)
by janderwald＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: janderwald Date: Fri Oct 12 03:45:36 2007 New Revision: 29526 URL: http://svn.reactos.org/svn/reactos?rev=29526&view=rev Log: - start implementing recyclebin (based on Wine's recycle bin implemenation) Added: trunk/reactos/dll/win32/shell32/recyclebin.c (with props) Modified: trunk/reactos/dll/win32/shell32/regsvr.c trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shellole.c trunk/reactos/dll/win32/shell32/shlfileop.c Added: 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 (added) +++ trunk/reactos/dll/win32/shell32/recyclebin.c Fri Oct 12 03:45:36 2007 @@ -1,0 +1,570 @@ +/* + * Trash virtual folder support. The trashing engine is implemented in trash.c + * + * Copyright (C) 2006 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#define YDEBUG +#define COBJMACROS +#define NONAMELESSUNION + +#include <stdarg.h> + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "ntquery.h" +#include "shlwapi.h" +#include "shlobj.h" +#include "shresdef.h" +#include "wine/debug.h" + +#include "shell32_main.h" +#include "enumidlist.h" +#include "xdg.h" +#include "recyclebin.h" + +WINE_DEFAULT_DEBUG_CHANNEL(recyclebin); + +typedef struct +{ + int column_name_id; + const GUID *fmtId; + DWORD pid; + int pcsFlags; + int fmt; + int cxChars; +} columninfo; + +static const columninfo RecycleBinColumns[] = +{ + {IDS_SHV_COLUMN1, &FMTID_Storage, PID_STG_NAME, SHCOLSTATE_TYPE_STR|SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 30}, + {IDS_SHV_COLUMN_DELFROM, &FMTID_Displaced, PID_DISPLACED_FROM, SHCOLSTATE_TYPE_STR|SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 30}, + {IDS_SHV_COLUMN_DELDATE, &FMTID_Displaced, PID_DISPLACED_DATE, SHCOLSTATE_TYPE_DATE|SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 20}, + {IDS_SHV_COLUMN2, &FMTID_Storage, PID_STG_SIZE, SHCOLSTATE_TYPE_INT|SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 20}, + {IDS_SHV_COLUMN3, &FMTID_Storage, PID_STG_STORAGETYPE,SHCOLSTATE_TYPE_INT|SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 20}, + {IDS_SHV_COLUMN4, &FMTID_Storage, PID_STG_WRITETIME, SHCOLSTATE_TYPE_DATE|SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 20}, +/* {"creation time", &FMTID_Storage, PID_STG_CREATETIME, SHCOLSTATE_TYPE_DATE, LVCFMT_LEFT, 20}, */ +/* {"attribs", &FMTID_Storage, PID_STG_ATTRIBUTES, SHCOLSTATE_TYPE_STR, LVCFMT_LEFT, 20}, */ +}; + +#define COLUMN_NAME 0 +#define COLUMN_DELFROM 1 +#define COLUMN_DATEDEL 2 +#define COLUMN_SIZE 3 +#define COLUMN_TYPE 4 +#define COLUMN_MTIME 5 + +#define COLUMNS_COUNT 6 + +static HRESULT FormatDateTime(LPWSTR buffer, int size, FILETIME ft) +{ + FILETIME lft; + SYSTEMTIME time; + int ret; + + FileTimeToLocalFileTime(&ft, &lft); + FileTimeToSystemTime(&lft, &time); + + ret = GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, buffer, size); + if (ret>0 && ret<size) + { + /* Append space + time without seconds */ + buffer[ret-1] = ' '; + GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &time, NULL, &buffer[ret], size - ret); + } + + return (ret!=0 ? E_FAIL : S_OK); +} + +/* + * Recycle Bin folder + */ + +typedef struct tagRecycleBin +{ + const IShellFolder2Vtbl *lpVtbl; + const IPersistFolder2Vtbl *lpPersistFolderVtbl; + LONG refCount; + + LPITEMIDLIST pidl; +} RecycleBin; + +static const IShellFolder2Vtbl recycleBinVtbl; +static const IPersistFolder2Vtbl recycleBinPersistVtbl; + +static RecycleBin *impl_from_IPersistFolder(IPersistFolder2 *iface) +{ + return (RecycleBin *)((char *)iface - FIELD_OFFSET(RecycleBin, lpPersistFolderVtbl)); +} + +static void RecycleBin_Destructor(RecycleBin *This); + +HRESULT WINAPI RecycleBin_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppOutput) +{ + RecycleBin *obj; + HRESULT ret; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + obj = SHAlloc(sizeof(RecycleBin)); + if (obj == NULL) + return E_OUTOFMEMORY; + ZeroMemory(obj, sizeof(RecycleBin)); + obj->lpVtbl = &recycleBinVtbl; + obj->lpPersistFolderVtbl = &recycleBinPersistVtbl; + if (FAILED(ret = IUnknown_QueryInterface((IUnknown *)obj, riid, ppOutput))) + { + RecycleBin_Destructor(obj); + return ret; + } +/* InterlockedIncrement(&objCount);*/ + return S_OK; +} + +static void RecycleBin_Destructor(RecycleBin *This) +{ +/* InterlockedDecrement(&objCount);*/ + SHFree(This->pidl); + SHFree(This); +} + +static HRESULT WINAPI RecycleBin_QueryInterface(IShellFolder2 *iface, REFIID riid, void **ppvObject) +{ + RecycleBin *This = (RecycleBin *)iface; + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); + + *ppvObject = NULL; + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IShellFolder) + || IsEqualGUID(riid, &IID_IShellFolder2)) + *ppvObject = This; + + if (IsEqualGUID(riid, &IID_IPersist) || IsEqualGUID(riid, &IID_IPersistFolder) + || IsEqualGUID(riid, &IID_IPersistFolder2)) + *ppvObject = &This->lpPersistFolderVtbl; + + if (*ppvObject != NULL) + { + IUnknown_AddRef((IUnknown *)*ppvObject); + return S_OK; + } + WARN("no interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI RecycleBin_AddRef(IShellFolder2 *iface) +{ + RecycleBin *This = (RecycleBin *)iface; + TRACE("(%p)\n", This); + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI RecycleBin_Release(IShellFolder2 *iface) +{ + RecycleBin *This = (RecycleBin *)iface; + LONG result; + + TRACE("(%p)\n", This); + result = InterlockedDecrement(&This->refCount); + if (result == 0) + { + TRACE("Destroy object\n"); + RecycleBin_Destructor(This); + } + return result; +} + +static HRESULT WINAPI RecycleBin_ParseDisplayName(IShellFolder2 *This, HWND hwnd, LPBC pbc, + LPOLESTR pszDisplayName, ULONG *pchEaten, LPITEMIDLIST *ppidl, + ULONG *pdwAttributes) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +BOOL +WINAPI +CBEnumBitBucket(IN PVOID Context, IN HANDLE hDeletedFile) +{ + PDELETED_FILE_DETAILS_W pFileDetails; + DWORD dwSize = 0; + LPITEMIDLIST pidl = NULL; + BOOL ret; + + TRACE("CBEnumBitBucket entered\n"); + GetDeletedFileDetailsW(hDeletedFile, + 0, + NULL, + &dwSize); + + if (!dwSize) + { + ERR("GetDeletedFileDetailsW failed\n"); + return FALSE; + } + + pidl = SHAlloc(dwSize); + if (!pidl) + { + ERR("No memory\n"); + return FALSE; + } + + pidl->mkid.cb = dwSize; + pidl->mkid.abID[0] = 0; + pFileDetails = (PDELETED_FILE_DETAILS_W) &pidl->mkid.abID[1]; + + if (!GetDeletedFileDetailsW(hDeletedFile, + dwSize, + pFileDetails, + NULL)) + { + ERR("GetDeletedFileDetailsW failed\n"); + SHFree(pidl); + return FALSE; + } + + ret = AddToEnumList((IEnumIDList*)Context, pidl); + return ret; +} + +PDELETED_FILE_DETAILS_W +UnpackDetailsFromPidl(LPITEMIDLIST pidl) +{ + return (PDELETED_FILE_DETAILS_W)&pidl->mkid.abID[1]; +} + +static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SHCONTF grfFlags, IEnumIDList **ppenumIDList) +{ + RecycleBin *This = (RecycleBin *)iface; + IEnumIDList *list; + static const WCHAR szDrive = L'C'; + + TRACE("(%p, %p, %x, %p)\n", This, hwnd, (unsigned int)grfFlags, ppenumIDList); + + if (grfFlags & SHCONTF_NONFOLDERS) + { + TRACE("Starting Enumeration\n"); + *ppenumIDList = NULL; + list = IEnumIDList_Constructor(); + if (list == NULL) + return E_OUTOFMEMORY; + + if (!EnumerateRecycleBinW(szDrive, //FIXME + CBEnumBitBucket, + (PVOID)list)) + { + WARN("Error: EnumerateRecycleBinW failed\n"); + } + *ppenumIDList = list; + } + else + { + *ppenumIDList = IEnumIDList_Constructor(); + if (*ppenumIDList == NULL) + return E_OUTOFMEMORY; + } + + return S_OK; + +} + +static HRESULT WINAPI RecycleBin_BindToObject(IShellFolder2 *This, LPCITEMIDLIST pidl, LPBC pbc, REFIID riid, void **ppv) +{ + FIXME("(%p, %p, %p, %s, %p) - stub\n", This, pidl, pbc, debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecycleBin_BindToStorage(IShellFolder2 *This, LPCITEMIDLIST pidl, LPBC pbc, REFIID riid, void **ppv) +{ + FIXME("(%p, %p, %p, %s, %p) - stub\n", This, pidl, pbc, debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecycleBin_CompareIDs(IShellFolder2 *iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +{ + RecycleBin *This = (RecycleBin *)iface; + + /* TODO */ + TRACE("(%p, %p, %p, %p)\n", This, (void *)lParam, pidl1, pidl2); + if (pidl1->mkid.cb != pidl2->mkid.cb) + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, pidl1->mkid.cb - pidl2->mkid.cb); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (unsigned short)memcmp(pidl1->mkid.abID, pidl2->mkid.abID, pidl1->mkid.cb)); +} + +static HRESULT WINAPI RecycleBin_CreateViewObject(IShellFolder2 *iface, HWND hwndOwner, REFIID riid, void **ppv) +{ + RecycleBin *This = (RecycleBin *)iface; + HRESULT ret; + TRACE("(%p, %p, %s, %p)\n", This, hwndOwner, debugstr_guid(riid), ppv); + + *ppv = NULL; + if (IsEqualGUID(riid, &IID_IShellView)) + { + IShellView *tmp; + CSFV sfv; + + ZeroMemory(&sfv, sizeof(sfv)); + sfv.cbSize = sizeof(sfv); + sfv.pshf = (IShellFolder *)This; + + TRACE("Calling SHCreateShellFolderViewEx\n"); + ret = SHCreateShellFolderViewEx(&sfv, &tmp); + TRACE("Result: %08x, output: %p\n", (unsigned int)ret, tmp); + *ppv = tmp; + return ret; + } + + return E_NOINTERFACE; +} + +static HRESULT WINAPI RecycleBin_GetAttributesOf(IShellFolder2 *This, UINT cidl, LPCITEMIDLIST *apidl, + SFGAOF *rgfInOut) +{ + TRACE("(%p, %d, {%p, ...}, {%x})\n", This, cidl, apidl[0], (unsigned int)*rgfInOut); + *rgfInOut &= SFGAO_CANMOVE|SFGAO_CANDELETE|SFGAO_HASPROPSHEET|SFGAO_FILESYSTEM; + return S_OK; +} + +static HRESULT WINAPI RecycleBin_GetUIObjectOf(IShellFolder2 *This, HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, + REFIID riid, UINT *rgfReserved, void **ppv) +{ + FIXME("(%p, %p, %d, {%p, ...}, %s, %p, %p): stub!\n", This, hwndOwner, cidl, apidl[0], debugstr_guid(riid), rgfReserved, ppv); + *ppv = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI RecycleBin_GetDisplayNameOf(IShellFolder2 *This, LPCITEMIDLIST pidl, SHGDNF uFlags, STRRET *pName) +{ + PDELETED_FILE_DETAILS_W pFileDetails; + TRACE("(%p, %p, %x, %p)\n", This, pidl, (unsigned int)uFlags, pName); + + pFileDetails = UnpackDetailsFromPidl(pidl); + pName->uType = STRRET_WSTR; + pName->u.pOleStr = StrDupW(&pFileDetails->FileName[0]); + if (pName->u.pOleStr == NULL) + return E_OUTOFMEMORY; + + return S_OK; +} + +static HRESULT WINAPI RecycleBin_SetNameOf(IShellFolder2 *This, HWND hwnd, LPCITEMIDLIST pidl, LPCOLESTR pszName, + SHGDNF uFlags, LPITEMIDLIST *ppidlOut) +{ + TRACE("\n"); + return E_FAIL; /* not supported */ +} + +static HRESULT WINAPI RecycleBin_GetClassID(IPersistFolder2 *This, CLSID *pClassID) +{ + TRACE("(%p, %p)\n", This, pClassID); + if (This == NULL || pClassID == NULL) + return E_INVALIDARG; + memcpy(pClassID, &CLSID_RecycleBin, sizeof(CLSID)); + return S_OK; +} + +static HRESULT WINAPI RecycleBin_Initialize(IPersistFolder2 *iface, LPCITEMIDLIST pidl) +{ + RecycleBin *This = impl_from_IPersistFolder(iface); + TRACE("(%p, %p)\n", This, pidl); + + This->pidl = ILClone(pidl); + if (This->pidl == NULL) + return E_OUTOFMEMORY; + return S_OK; +} + +static HRESULT WINAPI RecycleBin_GetCurFolder(IPersistFolder2 *iface, LPITEMIDLIST *ppidl) +{ + RecycleBin *This = impl_from_IPersistFolder(iface); + TRACE("\n"); + *ppidl = ILClone(This->pidl); + return S_OK; +} + +static HRESULT WINAPI RecycleBin_GetDefaultSearchGUID(IShellFolder2 *iface, GUID *pguid) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecycleBin_EnumSearches(IShellFolder2 *iface, IEnumExtraSearch **ppEnum) +{ + FIXME("stub\n"); + *ppEnum = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI RecycleBin_GetDefaultColumn(IShellFolder2 *iface, DWORD dwReserved, ULONG *pSort, ULONG *pDisplay) +{ + RecycleBin *This = (RecycleBin *)iface; + TRACE("(%p, %x, %p, %p)\n", This, (unsigned int)dwReserved, pSort, pDisplay); + *pSort = 0; + *pDisplay = 0; + return S_OK; +} + +static HRESULT WINAPI RecycleBin_GetDefaultColumnState(IShellFolder2 *iface, UINT iColumn, SHCOLSTATEF *pcsFlags) +{ + RecycleBin *This = (RecycleBin *)iface; + TRACE("(%p, %d, %p)\n", This, iColumn, pcsFlags); + if (iColumn < 0 || iColumn >= COLUMNS_COUNT) + return E_INVALIDARG; + *pcsFlags = RecycleBinColumns[iColumn].pcsFlags; + return S_OK; +} + +static HRESULT WINAPI RecycleBin_GetDetailsEx(IShellFolder2 *iface, LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecycleBin_GetDetailsOf(IShellFolder2 *iface, LPCITEMIDLIST pidl, UINT iColumn, LPSHELLDETAILS pDetails) +{ + RecycleBin *This = (RecycleBin *)iface; + PDELETED_FILE_DETAILS_W pFileDetails; + WCHAR buffer[MAX_PATH]; + + TRACE("(%p, %p, %d, %p)\n", This, pidl, iColumn, pDetails); + if (iColumn < 0 || iColumn >= COLUMNS_COUNT) + return E_FAIL; + pDetails->fmt = RecycleBinColumns[iColumn].fmt; + pDetails->cxChar = RecycleBinColumns[iColumn].cxChars; + if (pidl == NULL) + { + pDetails->str.uType = STRRET_WSTR; + LoadStringW(shell32_hInstance, RecycleBinColumns[iColumn].column_name_id, buffer, MAX_PATH); + return SHStrDupW(buffer, &pDetails->str.u.pOleStr); + } + + if (iColumn == COLUMN_NAME) + return RecycleBin_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL, &pDetails->str); + + pFileDetails = UnpackDetailsFromPidl(pidl); + switch (iColumn) + { + case COLUMN_DATEDEL: + FormatDateTime(buffer, MAX_PATH, pFileDetails->DeletionTime); + break; + case COLUMN_DELFROM: + lstrcpyW(buffer, &pFileDetails->FileName[0]); + PathRemoveFileSpecW(buffer); + break; + case COLUMN_SIZE: + StrFormatKBSizeW(pFileDetails->FileSize.QuadPart, buffer, MAX_PATH); + break; + case COLUMN_MTIME: + FormatDateTime(buffer, MAX_PATH, pFileDetails->LastModification); + break; + case COLUMN_TYPE: + /* TODO */ + buffer[0] = 0; + break; + default: + return E_FAIL; + } + + pDetails->str.uType = STRRET_WSTR; + pDetails->str.u.pOleStr = StrDupW(buffer); + return (pDetails->str.u.pOleStr != NULL ? S_OK : E_OUTOFMEMORY); +} + +static HRESULT WINAPI RecycleBin_MapColumnToSCID(IShellFolder2 *iface, UINT iColumn, SHCOLUMNID *pscid) +{ + RecycleBin *This = (RecycleBin *)iface; + TRACE("(%p, %d, %p)\n", This, iColumn, pscid); + if (iColumn<0 || iColumn>=COLUMNS_COUNT) + return E_INVALIDARG; + pscid->fmtid = *RecycleBinColumns[iColumn].fmtId; + pscid->pid = RecycleBinColumns[iColumn].pid; + return S_OK; +} + +static const IShellFolder2Vtbl recycleBinVtbl = +{ + /* IUnknown */ + RecycleBin_QueryInterface, + RecycleBin_AddRef, + RecycleBin_Release, + + /* IShellFolder */ + RecycleBin_ParseDisplayName, + RecycleBin_EnumObjects, + RecycleBin_BindToObject, + RecycleBin_BindToStorage, + RecycleBin_CompareIDs, + RecycleBin_CreateViewObject, + RecycleBin_GetAttributesOf, + RecycleBin_GetUIObjectOf, + RecycleBin_GetDisplayNameOf, + RecycleBin_SetNameOf, + + /* IShellFolder2 */ + RecycleBin_GetDefaultSearchGUID, + RecycleBin_EnumSearches, + RecycleBin_GetDefaultColumn, + RecycleBin_GetDefaultColumnState, + RecycleBin_GetDetailsEx, + RecycleBin_GetDetailsOf, + RecycleBin_MapColumnToSCID +}; + +static HRESULT WINAPI RecycleBin_IPersistFolder2_QueryInterface(IPersistFolder2 *This, REFIID riid, void **ppvObject) +{ + return RecycleBin_QueryInterface((IShellFolder2 *)impl_from_IPersistFolder(This), riid, ppvObject); +} + +static ULONG WINAPI RecycleBin_IPersistFolder2_AddRef(IPersistFolder2 *This) +{ + return RecycleBin_AddRef((IShellFolder2 *)impl_from_IPersistFolder(This)); +} + +static ULONG WINAPI RecycleBin_IPersistFolder2_Release(IPersistFolder2 *This) +{ + return RecycleBin_Release((IShellFolder2 *)impl_from_IPersistFolder(This)); +} + +static const IPersistFolder2Vtbl recycleBinPersistVtbl = +{ + /* IUnknown */ + RecycleBin_IPersistFolder2_QueryInterface, + RecycleBin_IPersistFolder2_AddRef, + RecycleBin_IPersistFolder2_Release, + + /* IPersist */ + RecycleBin_GetClassID, + /* IPersistFolder */ + RecycleBin_Initialize, + /* IPersistFolder2 */ + RecycleBin_GetCurFolder +}; + +/************************************************************************* + * SHUpdateRecycleBinIcon [SHELL32.@] + * + * Undocumented + */ +HRESULT WINAPI SHUpdateRecycleBinIcon(void) +{ + FIXME("stub\n"); + return S_OK; +} Propchange: trunk/reactos/dll/win32/shell32/recyclebin.c ------------------------------------------------------------------------------ svn:eol-style = native 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 12 03:45:36 2007 @@ -680,12 +680,12 @@ wszDesktop, wszMyDocuments }, +#endif { &CLSID_RecycleBin, wszDesktop, wszRecycleBin }, -#endif { NULL } }; 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 12 03:45:36 2007 @@ -2,6 +2,7 @@ <autoregister infsection="OleControlDlls" type="Both" /> <importlibrary definition="shell32.spec.def" /> <include base="shell32">.</include> + <include base="recyclebin">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> @@ -11,6 +12,7 @@ <define name="COM_NO_WINDOWS_H" /> <library>wine</library> <library>uuid</library> + <library>recyclebin</library> <library>ntdll</library> <library>kernel32</library> <library>advapi32</library> @@ -64,4 +66,5 @@ <file>shell32.spec</file> <file>fprop.c</file> <file>drive.c</file> + <file>recyclebin.c</file> </module> 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 12 03:45:36 2007 @@ -74,8 +74,8 @@ {&CLSID_UnixDosFolder, &UnixDosFolder_Constructor}, {&CLSID_FolderShortcut, &FolderShortcut_Constructor}, {&CLSID_MyDocuments, &MyDocuments_Constructor}, +#endif {&CLSID_RecycleBin, &RecycleBin_Constructor}, -#endif {NULL,NULL} }; Modified: trunk/reactos/dll/win32/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.c (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.c Fri Oct 12 03:45:36 2007 @@ -1304,7 +1304,9 @@ /* Windows also checks only the first item */ bTrash = (lpFileOp->fFlags & FOF_ALLOWUNDO); - //&& TRASH_CanTrashFile(flFrom->feFiles[0].szFullPath); +#if 0 + && TRASH_CanTrashFile(flFrom->feFiles[0].szFullPath); +#endif if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (!bTrash && lpFileOp->fFlags & FOF_WANTNUKEWARNING)) if (!confirm_delete_list(lpFileOp->hwnd, lpFileOp->fFlags, bTrash, flFrom))

1 0

[gedmurphy] 29525: Send the right number of bytes when setting an env var spotted by Christian Fasshauer <chrfas at googlemail dot com>
by gedmurphy＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: gedmurphy Date: Fri Oct 12 03:36:31 2007 New Revision: 29525 URL: http://svn.reactos.org/svn/reactos?rev=29525&view=rev Log: Send the right number of bytes when setting an env var spotted by Christian Fasshauer <chrfas at googlemail dot com> Modified: trunk/reactos/dll/cpl/sysdm/environment.c Modified: trunk/reactos/dll/cpl/sysdm/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/environment.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/environment.c (original) +++ trunk/reactos/dll/cpl/sysdm/environment.c Fri Oct 12 03:36:31 2007 @@ -519,7 +519,7 @@ 0, Type, (LPBYTE) VarData->lpRawValue, - (DWORD) (_tcslen(VarData->lpRawValue)* sizeof(TCHAR))+1)) // was _tcsclen. lstrlen? + (DWORD)(_tcslen(VarData->lpRawValue) + 1) * sizeof(TCHAR))) { RegCloseKey(hk); return;

1 0

[dreimer] 29524: Translated the few new lines in this RC.
by dreimer＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: dreimer Date: Fri Oct 12 02:45:18 2007 New Revision: 29524 URL: http://svn.reactos.org/svn/reactos?rev=29524&view=rev Log: Translated the few new lines in this RC. Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc Fri Oct 12 02:45:18 2007 @@ -135,11 +135,11 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Attached", ID_MENU_ATTACHED - MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM "&Angefügt", ID_MENU_ATTACHED + MENUITEM "&Primär", ID_MENU_PRIMARY MENUITEM SEPARATOR - MENUITEM "&Identify", ID_MENU_IDENTIFY - MENUITEM "P&roperties", ID_MENU_PROPERTIES + MENUITEM "&Identifizieren", ID_MENU_IDENTIFY + MENUITEM "&Eigenschaften", ID_MENU_PROPERTIES END END

1 0

[dreimer] 29523: (Very)Small code cleanup for my Cards.dll
by dreimer＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: dreimer Date: Fri Oct 12 02:39:37 2007 New Revision: 29523 URL: http://svn.reactos.org/svn/reactos?rev=29523&view=rev Log: (Very)Small code cleanup for my Cards.dll Modified: trunk/rosapps/cardsbav/cardsbav.h Modified: trunk/rosapps/cardsbav/cardsbav.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/cardsbav.h?rev=29… ============================================================================== --- trunk/rosapps/cardsbav/cardsbav.h (original) +++ trunk/rosapps/cardsbav/cardsbav.h Fri Oct 12 02:39:37 2007 @@ -42,12 +42,6 @@ #define ectGREENO 7 #define ectSAVEEDGESMASK 0x80000000 -/* Microsoft card dimensions */ -/* -#define CARD_WIDTH 110 -#define CARD_HEIGHT 198 -*/ -/* MacSolitaireX's card dimensions */ #define CARD_WIDTH 110 #define CARD_HEIGHT 198

1 0

[mnordell] 29522: Prevent SEGV
by mnordell＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: mnordell Date: Fri Oct 12 02:20:22 2007 New Revision: 29522 URL: http://svn.reactos.org/svn/reactos?rev=29522&view=rev Log: Prevent SEGV Modified: trunk/reactos/dll/win32/user32/misc/exticon.c Modified: trunk/reactos/dll/win32/user32/misc/exticon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/exti… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/exticon.c (original) +++ trunk/reactos/dll/win32/user32/misc/exticon.c Fri Oct 12 02:20:22 2007 @@ -533,7 +533,19 @@ { const IMAGE_RESOURCE_DIRECTORY *xresdir; xresdir = find_entry_by_id(iconresdir, LOWORD(pIconId[i]), rootresdir); + if (!xresdir) + { + WARN("find_entry_by_id failed\n"); + ret = 0xFFFFFFFF; + goto end; + } xresdir = find_entry_default(xresdir, rootresdir); + if (!xresdir) + { + WARN("find_entry_default failed\n"); + ret = 0xFFFFFFFF; + goto end; + } idataent = (PIMAGE_RESOURCE_DATA_ENTRY)xresdir; idata = NULL;

1 0

[dreimer] 29521: Added German Translation of one missed Dialog. Fixed tons of coordinates and sizes to fit all Text of the German and English Translation into the Buttons, Checkboxes and Text Fields. Moved some stuff to better fit into the Dialog. I mainly kept Johannes's nice small format for the Shortcut etc Dialogs, because it looks nice. This only helps to fit in the Text.
by dreimer＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: dreimer Date: Fri Oct 12 02:17:08 2007 New Revision: 29521 URL: http://svn.reactos.org/svn/reactos?rev=29521&view=rev Log: Added German Translation of one missed Dialog. Fixed tons of coordinates and sizes to fit all Text of the German and English Translation into the Buttons, Checkboxes and Text Fields. Moved some stuff to better fit into the Dialog. I mainly kept Johannes's nice small format for the Shortcut etc Dialogs, because it looks nice. This only helps to fit in the Text. Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc trunk/reactos/dll/win32/shell32/shell32_En.rc Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_De.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_De.rc Fri Oct 12 02:17:08 2007 @@ -1,6 +1,7 @@ /* * Copyright 1998 Juergen Schmied * Copyright 2004 Henning Gerhardt + * Copyright 2007 Daniel Reimer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -95,8 +96,8 @@ CAPTION "Verzeichnis auswählen" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP LTEXT "", IDD_TITLE, 4, 4, 180, 12 LTEXT "", IDD_STATUS, 4, 25, 180, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", @@ -105,6 +106,24 @@ 4, 40, 180, 120 } +SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Verzeichnis auswählen" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDD_TITLE, 10, 8, 198, 24 + LTEXT "", IDD_STATUS, 10, 25, 198, 12 + LTEXT "Ordner:", IDD_FOLDER, 10, 156, 40, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 12, 38, 194, 105 + EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Neuen Ordner erstellen", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP +} + SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Meldung" @@ -140,9 +159,9 @@ LTEXT "Geben Sie den Namen eines Programms, eines Ordners, eines Dokuments oder einer Internetressource an.", 12289, 36, 11, 182, 18 LTEXT "&Öffnen:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 - DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Durchsuchen...", 12288, 170, 63, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP + PUSHBUTTON "&Durchsuchen...", 12288, 160, 63, 59, 14, WS_TABSTOP } SHELL_GENERAL_SHORTCUT_DLG DIALOGEX 0, 0, 240, 130 @@ -157,17 +176,17 @@ LTEXT "", 14007, 70, 40, 150, 10 LTEXT "Ziel:", 14008, 10, 55, 45, 10 EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT - LTEXT "&Starten in:",14010, 10, 65, 45, 10 + LTEXT "&Starten in:",14010, 10, 65, 57, 10 EDITTEXT 14011, 70, 65, 150, 10, ES_LEFT - LTEXT "&Tastenkombination:", 14014, 10, 80, 45, 10 + LTEXT "&Kurztasten:", 14014, 10, 80, 57, 10 EDITTEXT 14015, 70, 80, 150, 10, ES_LEFT - LTEXT "Ausführen:", 14016, 10, 90, 45, 10 + LTEXT "Ausführen:", 14016, 10, 90, 57, 10 EDITTEXT 14017, 70, 90, 150, 10 - LTEXT "K&ommentar:", 14018, 10, 100, 45, 10 + LTEXT "K&ommentar:", 14018, 10, 100, 57, 10 EDITTEXT 14019, 70, 100, 150, 10, ES_LEFT - PUSHBUTTON "&Ziel finden...", 14020, 10, 115, 60, 14, ES_LEFT - PUSHBUTTON "I&con wechseln...", 14021, 80, 115, 60, 14, ES_LEFT - PUSHBUTTON "Er&weitert...", 14022, 150, 115, 60, 14, ES_LEFT + PUSHBUTTON "&Ziel finden...", 14020, 10, 115, 63, 14, ES_LEFT + PUSHBUTTON "I&con wechseln...", 14021, 83, 115, 63, 14, ES_LEFT + PUSHBUTTON "Er&weitert...", 14022, 156, 115, 63, 14, ES_LEFT } SHELL_EXTENDED_SHORTCUT_DLG DIALOGEX 0, 0, 230, 150 @@ -175,11 +194,11 @@ CAPTION "Erweiterte Einstellungen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { -LTEXT "Wählen Sie die erweiterten Einstellungen für diese Verknüpfung.", -1, 5, 30, 190, 10 - CHECKBOX "Als anderer Benutzer ausführen", 14000, 30, 50, 150, 10 - LTEXT "Diese Einstellung ermöglicht es, diese Verknüpfung unter\neinem anderen oder Ihrem eingenen Bentzerkonto auszuführen\nwährend der Computer und Ihre Daten vor unautorisierten\nProgrammaktivitäten geschützt werden können.", -1, 50, 60, 200, 40 - CHECKBOX "In getrennten Speicherbereich ausführen", 14001, 30, 100, 90, 10, WS_DISABLED - PUSHBUTTON "OK", IDOK, 25, 120, 40, 15, WS_VISIBLE +LTEXT "Wählen Sie die erweiterten Einstellungen für diese Verknüpfung.", -1, 5, 30, 210, 10 + CHECKBOX "Als anderer Benutzer ausführen", 14000, 25, 50, 150, 10 + LTEXT "Diese Einstellung ermöglicht es, diese Verknüpfung unter einem anderen oder Ihrem eingenen Bentzerkonto auszuführen während der Computer und Ihre Daten vor unautorisierten Programmaktivitäten geschützt werden können.", -1, 50, 60, 175, 40 + CHECKBOX "In getrennten Speicherbereich ausführen", 14001, 25, 100, 150, 10, WS_DISABLED + PUSHBUTTON "OK", IDOK, 25, 120, 50, 15, WS_VISIBLE PUSHBUTTON "Abbrechen", IDCANCEL, 120, 120, 50, 15, WS_VISIBLE } @@ -205,9 +224,9 @@ LTEXT "Zugegriffen:", 14018, 10, 100, 45, 10 LTEXT "", 14019, 70, 100, 150, 10 LTEXT "Attribute:", 14020, 10, 115, 45, 10 - CHECKBOX "&Schreibgeschützt", 14021, 70, 115, 45, 10 - CHECKBOX "&Versteckt", 14022, 130, 115, 50, 10 - CHECKBOX "&Archiv", 14023, 180, 115, 45, 10 + CHECKBOX "&Schreibgeschützt", 14021, 70, 115, 67, 10 + CHECKBOX "&Versteckt", 14022, 140, 115, 50, 10 + CHECKBOX "&Archiv", 14023, 190, 115, 45, 10 } SHELL_FILE_VERSION_DLG DIALOGEX 0, 0, 240, 130 @@ -260,7 +279,7 @@ LTEXT "Laufwerk %s", 14010, 100, 170, 40, 10 PUSHBUTTON "Bereinigen", 14011, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14012, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Laufwerk für schnelle Dateisuche indizieren", 14012, 15, 220, 165, 10, WS_DISABLED } @@ -271,13 +290,13 @@ { GROUPBOX "Fehlerüberprüfung", -1, 5, 5, 230, 60 LTEXT "Bei Wahl dieser Option wird das Volume\nauf Fehler überprüft.", -1, 40, 25, 160, 20 - PUSHBUTTON "Jetzt &prüfen", 14000, 130, 45, 90, 15, WS_TABSTOP + PUSHBUTTON "Jetzt &prüfen...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentierung", -1, 5, 65, 230, 60 LTEXT "Bei Wahl dieser Option werden die Dateien auf\ndem Volume defragmentiert.", -1, 40, 85, 160, 20 - PUSHBUTTON "Jetzt &defragmentieren", 14001, 130, 105, 90, 15, WS_TABSTOP + PUSHBUTTON "Jetzt &defragmentieren...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Sicherung", -1, 5, 130, 230, 60 LTEXT "Bei Wahl dieser Option werden die auf dem\nVolume gespeicherten Dateien gesichert.", -1, 40, 150, 160, 20 - PUSHBUTTON "Jetzt &sichern", 14002, 130, 170, 90, 15, WS_TABSTOP + PUSHBUTTON "Jetzt &sichern...", 14002, 130, 170, 90, 15, WS_TABSTOP } DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 230 @@ -292,16 +311,16 @@ CAPTION "Ausführen als" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { - LTEXT "Which user account do you want to use to run this program?", -1, 30, 30, 170, 10 - CHECKBOX "Aktueller Benutzer %s", 14000, 5, 45, 150, 10 - LTEXT "Computer vor unauthorisierten Programmaktiviäten schützen", -1, 40, 65, 150, 10, WS_DISABLED - CHECKBOX "Diese Einstellung kann Computerviren daran hindern, ihrem\nComputer und/oder Ihren persönlichen Daten zu schaden, aber\nes kann auch Programme daran hindern, Ordnungsgemäß zu arbeiten.", 14001, 40, 80, 150, 10, WS_DISABLED - CHECKBOX "Folgender Benutzer:", 14002, 5, 100, 90, 10 - LTEXT "Benutzername:", -1, 15, 115, 60, 10 + LTEXT "Welches Benutzerkonto wollen Sie zum starten dieser Anwendung verwenden?", -1, 10, 20, 220, 20 + CHECKBOX "Aktueller Benutzer %s", 14000, 10, 45, 150, 10 + LTEXT "Computer vor unauthorisierten Programmaktiviäten schützen", -1, 25, 57, 200, 10, WS_DISABLED + CHECKBOX "Diese Einstellung kann Computerviren daran hindern, ihrem Computer oder Ihren persönlichen Daten zu schaden, aber es kann auch Programme daran hindern, Ordnungsgemäß zu arbeiten.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE + CHECKBOX "Folgender Benutzer:", 14002, 10, 100, 90, 10 + LTEXT "Benutzername:", -1, 20, 115, 60, 10 COMBOBOX 14003, 70, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "...", 14004, 180, 115, 30, 10, WS_TABSTOP - LTEXT "Passwort:", -1, 15, 140, 60, 10 + LTEXT "Passwort:", -1, 20, 140, 60, 10 EDITTEXT 14005, 70, 140, 100, 10, ES_LEFT | WS_BORDER | WS_GROUP PUSHBUTTON "...", 14006, 180, 140, 30, 10, WS_TABSTOP PUSHBUTTON "OK", 14007, 70, 170, 60, 15, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/shell32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_En.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_En.rc Fri Oct 12 02:17:08 2007 @@ -94,8 +94,8 @@ CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP LTEXT "", IDD_TITLE, 4, 4, 180, 12 LTEXT "", IDD_STATUS, 4, 25, 180, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", @@ -117,7 +117,7 @@ WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Make New Folder", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Make New Folder", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP } @@ -157,9 +157,9 @@ LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 - DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 170, 63, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP + PUSHBUTTON "&Browse...", 12288, 160, 63, 59, 14, WS_TABSTOP } SHELL_GENERAL_SHORTCUT_DLG DIALOGEX 0, 0, 240, 130 @@ -174,29 +174,29 @@ LTEXT "", 14007, 70, 40, 150, 10 LTEXT "Target:", 14008, 10, 55, 45, 10 EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT - LTEXT "&Start in:",14010, 10, 65, 45, 10 + LTEXT "&Start in:",14010, 10, 65, 57, 10 EDITTEXT 14011, 70, 65, 150, 10, ES_LEFT - LTEXT "Shortcut &key:", 14014, 10, 80, 45, 10 + LTEXT "Shortcut &key:", 14014, 10, 80, 57, 10 EDITTEXT 14015, 70, 80, 150, 10, ES_LEFT - LTEXT "Run:", 14016, 10, 90, 45, 10 + LTEXT "Run:", 14016, 10, 90, 57, 10 EDITTEXT 14017, 70, 90, 150, 10 - LTEXT "C&omment:", 14018, 10, 100, 45, 10 + LTEXT "C&omment:", 14018, 10, 100, 57, 10 EDITTEXT 14019, 70, 100, 150, 10, ES_LEFT - PUSHBUTTON "&Find Target...", 14020, 10, 115, 60, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 80, 115, 60, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 150, 115, 60, 14, ES_LEFT -} - -SHELL_EXTENDED_SHORTCUT_DLG DIALOGEX 0, 0, 260, 150 + PUSHBUTTON "&Find Target...", 14020, 10, 115, 63, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", 14021, 83, 115, 63, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", 14022, 156, 115, 63, 14, ES_LEFT +} + +SHELL_EXTENDED_SHORTCUT_DLG DIALOGEX 0, 0, 230, 150 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Extended Properties" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { - LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 190, 10 - CHECKBOX "Run with different credentials", 14000, 30, 50, 150, 10 - LTEXT "This option can allow you to run the this shortcut as another\nuser, or continue as yourself while protecting your computer\nand data from unauthorized program activity.", -1, 50, 60, 200, 40 - CHECKBOX "Run in seperate memory space", 14001, 30, 100, 90, 10, WS_DISABLED - PUSHBUTTON "OK", IDOK, 25, 120, 40, 15, WS_VISIBLE + LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 + CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 + CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED + PUSHBUTTON "OK", IDOK, 25, 120, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", IDCANCEL, 120, 120, 50, 15, WS_VISIBLE } @@ -222,9 +222,9 @@ LTEXT "Accessed:", 14018, 10, 100, 45, 10 LTEXT "", 14019, 70, 100, 150, 10 LTEXT "Attributes:", 14020, 10, 115, 45, 10 - CHECKBOX "&Read-only", 14021, 70, 115, 45, 10 - CHECKBOX "&Hidden", 14022, 130, 115, 50, 10 - CHECKBOX "&Archive", 14023, 180, 115, 45, 10 + CHECKBOX "&Read-only", 14021, 70, 115, 67, 10 + CHECKBOX "&Hidden", 14022, 140, 115, 50, 10 + CHECKBOX "&Archive", 14023, 190, 115, 45, 10 } SHELL_FILE_VERSION_DLG DIALOGEX 0, 0, 240, 130 @@ -277,7 +277,7 @@ LTEXT "Drive %s", 14010, 100, 170, 40, 10 PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED } @@ -299,7 +299,7 @@ -DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -311,16 +311,16 @@ CAPTION "Run As" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { - LTEXT "Which user account do you want to use to run this program?", -1, 30, 30, 170, 10 - CHECKBOX "Current User %s", 14000, 5, 45, 150, 10 - LTEXT "Protect my computer and data from unauthorized program activity", -1, 40, 65, 150, 10, WS_DISABLED - CHECKBOX "This option can prevent computer viruses from harming your\ncomputer or personal data, but selecting it might cause the\nprogram to function improperly.", 14001, 40, 80, 150, 10, WS_DISABLED - CHECKBOX "The following user:", 14002, 5, 100, 90, 10 - LTEXT "User name:", -1, 15, 115, 60, 10 + LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20 + CHECKBOX "Current User %s", 14000, 10, 45, 150, 10 + LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED + CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE + CHECKBOX "The following user:", 14002, 10, 100, 90, 10 + LTEXT "User name:", -1, 20, 115, 60, 10 COMBOBOX 14003, 70, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "...", 14004, 180, 115, 30, 10, WS_TABSTOP - LTEXT "Password:", -1, 15, 140, 60, 10 + LTEXT "Password:", -1, 20, 140, 60, 10 EDITTEXT 14005, 70, 140, 100, 10, ES_LEFT | WS_BORDER | WS_GROUP PUSHBUTTON "...", 14006, 180, 140, 30, 10, WS_TABSTOP PUSHBUTTON "OK", 14007, 70, 170, 60, 15, WS_TABSTOP

1 0

[fireball] 29520: - Fix a long standing bug, which prevented NT to work stable (in fact, it died very soon after booting). The bug was in occasional placing Gdt and Idt into a temporary heap, instead of MemoryData marked area of memory. The possibility of this bug was suggested long time ago by Alex, but I didn't believe him back then :) - Now Windows NT works quite good after booting via WinLdr in QEMU.
by fireball＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: fireball Date: Fri Oct 12 01:07:47 2007 New Revision: 29520 URL: http://svn.reactos.org/svn/reactos?rev=29520&view=rev Log: - Fix a long standing bug, which prevented NT to work stable (in fact, it died very soon after booting). The bug was in occasional placing Gdt and Idt into a temporary heap, instead of MemoryData marked area of memory. The possibility of this bug was suggested long time ago by Alex, but I didn't believe him back then :) - Now Windows NT works quite good after booting via WinLdr in QEMU. Modified: branches/winldr/windows/winldr.c Modified: branches/winldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/winldr.c?rev=295… ============================================================================== --- branches/winldr/windows/winldr.c (original) +++ branches/winldr/windows/winldr.c Fri Oct 12 01:07:47 2007 @@ -232,7 +232,7 @@ /* Allocate space for new GDT + IDT */ BlockSize = NUM_GDT*sizeof(KGDTENTRY) + NUM_IDT*sizeof(KIDTENTRY);//FIXME: Use GDT/IDT limits here? NumPages = (BlockSize + MM_PAGE_SIZE - 1) >> MM_PAGE_SHIFT; - *GdtIdt = (PKGDTENTRY)MmAllocateMemory(NumPages * MM_PAGE_SIZE); + *GdtIdt = (PKGDTENTRY)MmAllocateMemoryWithType(NumPages * MM_PAGE_SIZE, LoaderMemoryData); if (*GdtIdt == NULL) {

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
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