Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

by gvg＠svn.reactos.com

Set eol-style Added: vendor/wine/dlls/shell32/Wine-20050211/ Modified: vendor/wine/dlls/shell32/Wine-20050211/Makefile.in Modified: vendor/wine/dlls/shell32/Wine-20050211/autocomplete.c Modified: vendor/wine/dlls/shell32/Wine-20050211/brsfolder.c Modified: vendor/wine/dlls/shell32/Wine-20050211/changenotify.c Modified: vendor/wine/dlls/shell32/Wine-20050211/classes.c Modified: vendor/wine/dlls/shell32/Wine-20050211/clipboard.c Modified: vendor/wine/dlls/shell32/Wine-20050211/control.c Modified: vendor/wine/dlls/shell32/Wine-20050211/cpanel.h Modified: vendor/wine/dlls/shell32/Wine-20050211/cpanelfolder.c Modified: vendor/wine/dlls/shell32/Wine-20050211/dataobject.c Modified: vendor/wine/dlls/shell32/Wine-20050211/debughlp.c Modified: vendor/wine/dlls/shell32/Wine-20050211/debughlp.h Modified: vendor/wine/dlls/shell32/Wine-20050211/dialogs.c Modified: vendor/wine/dlls/shell32/Wine-20050211/dragdrophelper.c Modified: vendor/wine/dlls/shell32/Wine-20050211/enumidlist.c Modified: vendor/wine/dlls/shell32/Wine-20050211/enumidlist.h Modified: vendor/wine/dlls/shell32/Wine-20050211/folders.c Modified: vendor/wine/dlls/shell32/Wine-20050211/iconcache.c Modified: vendor/wine/dlls/shell32/Wine-20050211/memorystream.c Modified: vendor/wine/dlls/shell32/Wine-20050211/pidl.c Modified: vendor/wine/dlls/shell32/Wine-20050211/pidl.h Modified: vendor/wine/dlls/shell32/Wine-20050211/regsvr.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shell.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shell.spec Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32.spec Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Ca.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Cn.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Cs.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Da.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_De.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_En.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Eo.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Es.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Fi.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Fr.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Hu.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_It.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Ja.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Ko.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Nl.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_No.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Pl.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Pt.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Ru.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Si.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Sk.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Sv.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Uk.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Wa.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_Zh.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_main.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_main.h Modified: vendor/wine/dlls/shell32/Wine-20050211/shell32_xx.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shellfolder.h Modified: vendor/wine/dlls/shell32/Wine-20050211/shelllink.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shellole.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shellord.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shellpath.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shellreg.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shellstring.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shfldr.h Modified: vendor/wine/dlls/shell32/Wine-20050211/shfldr_desktop.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shfldr_fs.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shfldr_mycomp.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shlexec.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shlfileop.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shlfolder.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shlfsbind.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shlmenu.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shlview.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shpolicy.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shres.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/shresdef.h Modified: vendor/wine/dlls/shell32/Wine-20050211/shv_bg_cmenu.c Modified: vendor/wine/dlls/shell32/Wine-20050211/shv_item_cmenu.c Modified: vendor/wine/dlls/shell32/Wine-20050211/systray.c Modified: vendor/wine/dlls/shell32/Wine-20050211/undocshell.h Modified: vendor/wine/dlls/shell32/Wine-20050211/version.h Modified: vendor/wine/dlls/shell32/Wine-20050211/version.rc Modified: vendor/wine/dlls/shell32/Wine-20050211/version16.rc Modified: vendor/wine/dlls/shell32/current/Makefile.in Modified: vendor/wine/dlls/shell32/current/autocomplete.c Modified: vendor/wine/dlls/shell32/current/brsfolder.c Modified: vendor/wine/dlls/shell32/current/changenotify.c Modified: vendor/wine/dlls/shell32/current/classes.c Modified: vendor/wine/dlls/shell32/current/clipboard.c Modified: vendor/wine/dlls/shell32/current/control.c Modified: vendor/wine/dlls/shell32/current/cpanel.h Modified: vendor/wine/dlls/shell32/current/cpanelfolder.c Modified: vendor/wine/dlls/shell32/current/dataobject.c Modified: vendor/wine/dlls/shell32/current/debughlp.c Modified: vendor/wine/dlls/shell32/current/debughlp.h Modified: vendor/wine/dlls/shell32/current/dialogs.c Modified: vendor/wine/dlls/shell32/current/dragdrophelper.c Modified: vendor/wine/dlls/shell32/current/enumidlist.c Modified: vendor/wine/dlls/shell32/current/enumidlist.h Modified: vendor/wine/dlls/shell32/current/folders.c Modified: vendor/wine/dlls/shell32/current/iconcache.c Modified: vendor/wine/dlls/shell32/current/memorystream.c [truncated at 100 lines; 61 more skipped] _____ Copied: vendor/wine/dlls/shell32/Wine-20050211 (from rev 13545, vendor/wine/dlls/shell32/current) _____ Modified: vendor/wine/dlls/shell32/Wine-20050211/Makefile.in --- vendor/wine/dlls/shell32/current/Makefile.in 2005-02-13 22:50:03 UTC (rev 13545) +++ vendor/wine/dlls/shell32/Wine-20050211/Makefile.in 2005-02-13 22:54:35 UTC (rev 13546) @@ -1,92 +1,92 @@ -EXTRADEFS = -D_SHELL32_ -DCOM_NO_WINDOWS_H -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = shell32.dll -IMPORTS = shlwapi comctl32 user32 gdi32 advapi32 kernel32 -DELAYIMPORTS = ole32 -EXTRALIBS = -luuid $(LIBUNICODE) - -C_SRCS = \ - authors.c \ - autocomplete.c \ - brsfolder.c \ - changenotify.c \ - classes.c \ - clipboard.c \ - control.c \ - cpanelfolder.c \ - dataobject.c \ - debughlp.c \ - dialogs.c \ - dragdrophelper.c \ - enumidlist.c \ - folders.c \ - iconcache.c \ - memorystream.c \ - pidl.c \ - regsvr.c \ - shell32_main.c \ - shelllink.c \ - shellole.c \ - shellord.c \ - shellpath.c \ - shellreg.c \ - shellstring.c \ - shfldr_desktop.c \ - shfldr_fs.c \ - shfldr_mycomp.c \ - shlexec.c \ - shlfileop.c \ - shlfolder.c \ - shlfsbind.c \ - shlmenu.c \ - shlview.c \ - shpolicy.c \ - shv_bg_cmenu.c \ - shv_item_cmenu.c \ - systray.c - -RC_SRCS = shres.rc -RC_BINSRC = shres.rc -RC_BINARIES = \ - cdrom.ico \ - desktop.ico \ - document.ico \ - drive.ico \ - floppy.ico \ - folder.ico \ - folder_open.ico \ - mycomputer.ico \ - netdrive.ico \ - netdrive2.ico \ - ramdisk.ico - -C_SRCS16 = shell.c -RC_SRCS16 = version16.rc -SPEC_SRCS16 = shell.spec - -SUBDIRS = tests - -@MAKE_DLL_RULES@ - -# Special rules for 16-bit resource files - -version16.res: version16.rc - $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc - -shell.spec.c: shell.spec version16.res - $(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --main-module $(MODULE) --res version16.res --dll $(SRCDIR)/shell.spec - -authors.c: $(TOPSRCDIR)/AUTHORS - (LC_ALL=C; export LC_ALL; echo 'const char * const SHELL_Authors[] = {' && \ - sed -e '1,2d' -e 's/$.*$/ \"\1\",/' $(TOPSRCDIR)/AUTHORS && \ - echo ' 0 };') >$@ || ($(RM) $@ && false) - -depend: authors.c - -clean:: - $(RM) authors.c - -### Dependencies: +EXTRADEFS = -D_SHELL32_ -DCOM_NO_WINDOWS_H +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = shell32.dll +IMPORTS = shlwapi comctl32 user32 gdi32 advapi32 kernel32 +DELAYIMPORTS = ole32 +EXTRALIBS = -luuid $(LIBUNICODE) + +C_SRCS = \ + authors.c \ + autocomplete.c \ + brsfolder.c \ + changenotify.c \ + classes.c \ + clipboard.c \ + control.c \ + cpanelfolder.c \ + dataobject.c \ + debughlp.c \ + dialogs.c \ + dragdrophelper.c \ + enumidlist.c \ + folders.c \ + iconcache.c \ + memorystream.c \ + pidl.c \ + regsvr.c \ + shell32_main.c \ + shelllink.c \ + shellole.c \ + shellord.c \ + shellpath.c \ + shellreg.c \ + shellstring.c \ + shfldr_desktop.c \ + shfldr_fs.c \ + shfldr_mycomp.c \ + shlexec.c \ + shlfileop.c \ + shlfolder.c \ + shlfsbind.c \ + shlmenu.c \ + shlview.c \ + shpolicy.c \ + shv_bg_cmenu.c \ + shv_item_cmenu.c \ + systray.c + +RC_SRCS = shres.rc +RC_BINSRC = shres.rc +RC_BINARIES = \ + cdrom.ico \ + desktop.ico \ + document.ico \ + drive.ico \ + floppy.ico \ + folder.ico \ + folder_open.ico \ + mycomputer.ico \ + netdrive.ico \ + netdrive2.ico \ + ramdisk.ico + +C_SRCS16 = shell.c +RC_SRCS16 = version16.rc +SPEC_SRCS16 = shell.spec + +SUBDIRS = tests + +@MAKE_DLL_RULES@ + +# Special rules for 16-bit resource files + +version16.res: version16.rc + $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc + +shell.spec.c: shell.spec version16.res + $(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --main-module $(MODULE) --res version16.res --dll $(SRCDIR)/shell.spec + +authors.c: $(TOPSRCDIR)/AUTHORS + (LC_ALL=C; export LC_ALL; echo 'const char * const SHELL_Authors[] = {' && \ + sed -e '1,2d' -e 's/$.*$/ \"\1\",/' $(TOPSRCDIR)/AUTHORS && \ + echo ' 0 };') >$@ || ($(RM) $@ && false) + +depend: authors.c + +clean:: + $(RM) authors.c + +### Dependencies: Property changes on: vendor/wine/dlls/shell32/Wine-20050211/Makefile.in ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: vendor/wine/dlls/shell32/Wine-20050211/autocomplete.c --- vendor/wine/dlls/shell32/current/autocomplete.c 2005-02-13 22:50:03 UTC (rev 13545) +++ vendor/wine/dlls/shell32/Wine-20050211/autocomplete.c 2005-02-13 22:54:35 UTC (rev 13546) @@ -1,646 +1,646 @@ -/* - * AutoComplete interfaces implementation. - * - * Copyright 2004 Maxime BellengÚ <maxime.bellenge(a)laposte.net> - * - * 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 - */ - -/* - Implemented: - - ACO_AUTOAPPEND style - - ACO_AUTOSUGGEST style - - ACO_UPDOWNKEYDROPSLIST style - - - Handle pwzsRegKeyPath and pwszQuickComplete in Init - - TODO: - - implement ACO_SEARCH style - - implement ACO_FILTERPREFIXES style - - implement ACO_USETAB style - - implement ACO_RTLREADING style - - */ -#include "config.h" - -#include <stdarg.h> -#include <stdlib.h> -#include <string.h> - -#define COBJMACROS - -#include "wine/debug.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "undocshell.h" -#include "shlwapi.h" -#include "winerror.h" -#include "objbase.h" - -#include "pidl.h" -#include "shlguid.h" -#include "shlobj.h" -#include "shldisp.h" -#include "debughlp.h" - -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(shell); - -typedef struct -{ - IAutoCompleteVtbl *lpVtbl; - IAutoComplete2Vtbl *lpvtblAutoComplete2; - DWORD ref; - BOOL enabled; - HWND hwndEdit; - HWND hwndListBox; - WNDPROC wpOrigEditProc; - WNDPROC wpOrigLBoxProc; - WCHAR *txtbackup; - WCHAR *quickComplete; - IEnumString *enumstr; - AUTOCOMPLETEOPTIONS options; -} IAutoCompleteImpl; - -static struct IAutoCompleteVtbl acvt; -static struct IAutoComplete2Vtbl ac2vt; - -#define _IAutoComplete2_Offset ((int)(&(((IAutoCompleteImpl*)0)->lpvtblAutoComplete2))) -#define _ICOM_THIS_From_IAutoComplete2(class, name) class* This = (class*)(((char*)name)-_IAutoComplete2_Offset); - -/* - converts This to a interface pointer -*/ -#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) -#define _IAutoComplete2_(This) (IAutoComplete2*)&(This->lpvtblAutoComplete2) - -static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - -/********************************************************************** **** - * IAutoComplete_Constructor - */ -HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) -{ - IAutoCompleteImpl *lpac; - - if (pUnkOuter && !IsEqualIID (riid, &IID_IUnknown)) - return CLASS_E_NOAGGREGATION; - - lpac = (IAutoCompleteImpl*)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, sizeof(IAutoCompleteImpl)); - if (!lpac) - return E_OUTOFMEMORY; - - lpac->ref = 1; - lpac->lpVtbl = &acvt; - lpac->lpvtblAutoComplete2 = &ac2vt; - lpac->enabled = TRUE; - lpac->enumstr = NULL; - lpac->options = ACO_AUTOAPPEND; - lpac->wpOrigEditProc = NULL; - lpac->hwndListBox = NULL; - lpac->txtbackup = NULL; - lpac->quickComplete = NULL; - - if (!SUCCEEDED (IUnknown_QueryInterface (_IUnknown_ (lpac), riid, ppv))) { - IUnknown_Release (_IUnknown_ (lpac)); - return E_NOINTERFACE; - } - - TRACE("-- (%p)->\n",lpac); - - return S_OK; -} - -/********************************************************************** **** - * AutoComplete_QueryInterface - */ -static HRESULT WINAPI IAutoComplete_fnQueryInterface( - IAutoComplete * iface, - REFIID riid, - LPVOID *ppvObj) -{ - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; - - TRACE("(%p)->(\n\tIID:\t%s,%p)\n", This, shdebugstr_guid(riid), ppvObj); - *ppvObj = NULL; - - if(IsEqualIID(riid, &IID_IUnknown)) - { - *ppvObj = This; - } - else if(IsEqualIID(riid, &IID_IAutoComplete)) - { - *ppvObj = (IAutoComplete*)This; - } - else if(IsEqualIID(riid, &IID_IAutoComplete2)) - { - *ppvObj = _IAutoComplete2_ (This); - } - - if (*ppvObj) - { - IAutoComplete_AddRef((IAutoComplete*)*ppvObj); - TRACE("-- Interface: (%p)->(%p)\n", ppvObj, *ppvObj); - return S_OK; - } - TRACE("-- Interface: E_NOINTERFACE\n"); - return E_NOINTERFACE; -} - -/********************************************************************** ******** - * IAutoComplete_fnAddRef - */ -static ULONG WINAPI IAutoComplete_fnAddRef( - IAutoComplete * iface) -{ - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE("(%p)->(%lu)\n", This, refCount - 1); - - return refCount; -} - -/********************************************************************** ******** - * IAutoComplete_fnRelease - */ -static ULONG WINAPI IAutoComplete_fnRelease( - IAutoComplete * iface) -{ - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(%lu)\n", This, refCount + 1); - - if (!refCount) { - TRACE(" destroying IAutoComplete(%p)\n",This); - HeapFree(GetProcessHeap(), 0, This->quickComplete); - HeapFree(GetProcessHeap(), 0, This->txtbackup); - if (This->hwndListBox) - DestroyWindow(This->hwndListBox); - if (This->enumstr) - IEnumString_Release(This->enumstr); - HeapFree(GetProcessHeap(), 0, This); - } - return refCount; -} - -/********************************************************************** ******** - * IAutoComplete_fnEnable - */ -static HRESULT WINAPI IAutoComplete_fnEnable( - IAutoComplete * iface, - BOOL fEnable) -{ - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; - - HRESULT hr = S_OK; - - TRACE("(%p)->(%s)\n", This, (fEnable)?"true":"false"); - - This->enabled = fEnable; - - return hr; -} - -/********************************************************************** ******** - * IAutoComplete_fnInit - */ -static HRESULT WINAPI IAutoComplete_fnInit( - IAutoComplete * iface, - HWND hwndEdit, - IUnknown *punkACL, - LPCOLESTR pwzsRegKeyPath, - LPCOLESTR pwszQuickComplete) -{ - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; - static const WCHAR lbName[] = {'L','i','s','t','B','o','x',0}; - - TRACE("(%p)->(0x%08lx, %p, %s, %s)\n", - This, (long)hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete)); - - if (This->options & ACO_AUTOSUGGEST) TRACE(" ACO_AUTOSUGGEST\n"); - if (This->options & ACO_AUTOAPPEND) TRACE(" ACO_AUTOAPPEND\n"); - if (This->options & ACO_SEARCH) FIXME(" ACO_SEARCH not supported\n"); - if (This->options & ACO_FILTERPREFIXES) FIXME(" ACO_FILTERPREFIXES not supported\n"); - if (This->options & ACO_USETAB) FIXME(" ACO_USETAB not supported\n"); - if (This->options & ACO_UPDOWNKEYDROPSLIST) TRACE(" ACO_UPDOWNKEYDROPSLIST\n"); - if (This->options & ACO_RTLREADING) FIXME(" ACO_RTLREADING not supported\n"); - - This->hwndEdit = hwndEdit; - - if (!SUCCEEDED (IUnknown_QueryInterface (punkACL, &IID_IEnumString, (LPVOID*)&This->enumstr))) { - TRACE("No IEnumString interface\n"); - return E_NOINTERFACE; - } - - This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW( hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); - SetWindowLongPtrW( hwndEdit, GWLP_USERDATA, (LONG_PTR)This); - - if (This->options & ACO_AUTOSUGGEST) { - HWND hwndParent; - - hwndParent = GetParent(This->hwndEdit); - - /* FIXME : The listbox should be resizable with the mouse. WS_THICKFRAME looks ugly */ - This->hwndListBox = CreateWindowExW(0, lbName, NULL, - WS_BORDER | WS_CHILD | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - hwndParent, NULL, - (HINSTANCE)GetWindowLongPtrW( hwndParent, GWLP_HINSTANCE ), NULL); - - if (This->hwndListBox) { - This->wpOrigLBoxProc = (WNDPROC) SetWindowLongPtrW( This->hwndListBox, GWLP_WNDPROC, (LONG_PTR) ACLBoxSubclassProc); - SetWindowLongPtrW( This->hwndListBox, GWLP_USERDATA, (LONG_PTR)This); - } - } - - if (pwzsRegKeyPath) { - WCHAR *key; - WCHAR result[MAX_PATH]; - WCHAR *value; - HKEY hKey = 0; - LONG res; - LONG len; - - /* pwszRegKeyPath contains the key as well as the value, so we split */ - key = (WCHAR*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (lstrlenW(pwzsRegKeyPath)+1)*sizeof(WCHAR)); - strcpyW(key, pwzsRegKeyPath); - value = strrchrW(key, '\\'); - *value = 0; - value++; - /* Now value contains the value and buffer the key */ - res = RegOpenKeyExW(HKEY_CURRENT_USER, key, 0, KEY_READ, &hKey); - if (res != ERROR_SUCCESS) { - /* if the key is not found, MSDN states we must seek in HKEY_LOCAL_MACHINE */ - res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); - } - if (res == ERROR_SUCCESS) { - res = RegQueryValueW(hKey, value, result, &len); - if (res == ERROR_SUCCESS) { - This->quickComplete = (WCHAR*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len*sizeof(WCHAR)); - strcpyW(This->quickComplete, result); - } - RegCloseKey(hKey); - } - HeapFree(GetProcessHeap(), 0, key); - } - - if ((pwszQuickComplete) && (!This->quickComplete)) { - This->quickComplete = (WCHAR*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (lstrlenW(pwszQuickComplete)+1)*sizeof(WCHAR)); - lstrcpyW(This->quickComplete, pwszQuickComplete); - } - - return S_OK; -} - -/********************************************************************** **** - * IAutoComplete_fnVTable - */ -static IAutoCompleteVtbl acvt = -{ - IAutoComplete_fnQueryInterface, - IAutoComplete_fnAddRef, - IAutoComplete_fnRelease, - IAutoComplete_fnInit, - IAutoComplete_fnEnable, -}; - -/********************************************************************** **** - * AutoComplete2_QueryInterface - */ -static HRESULT WINAPI IAutoComplete2_fnQueryInterface( - IAutoComplete2 * iface, - REFIID riid, - LPVOID *ppvObj) -{ - _ICOM_THIS_From_IAutoComplete2(IAutoCompleteImpl, iface); - - TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); - - return IAutoComplete_QueryInterface((IAutoComplete*)This, riid, ppvObj); -} - -/********************************************************************** ******** - * IAutoComplete2_fnAddRef - */ -static ULONG WINAPI IAutoComplete2_fnAddRef( - IAutoComplete2 * iface) -{ - _ICOM_THIS_From_IAutoComplete2(IAutoCompleteImpl,iface); - - TRACE ("(%p)->(count=%lu)\n", This, This->ref); - - return IAutoComplete2_AddRef((IAutoComplete*)This); -} - -/********************************************************************** ******** - * IAutoComplete2_fnRelease - */ -static ULONG WINAPI IAutoComplete2_fnRelease( - IAutoComplete2 * iface) -{ - _ICOM_THIS_From_IAutoComplete2(IAutoCompleteImpl,iface); - - TRACE ("(%p)->(count=%lu)\n", This, This->ref); - - return IAutoComplete_Release((IAutoComplete*)This); -} - -/********************************************************************** ******** - * IAutoComplete2_fnEnable - */ -static HRESULT WINAPI IAutoComplete2_fnEnable( - IAutoComplete2 * iface, - BOOL fEnable) -{ - _ICOM_THIS_From_IAutoComplete2(IAutoCompleteImpl, iface); - - TRACE ("(%p)->(%s)\n", This, (fEnable)?"true":"false"); - - return IAutoComplete_Enable((IAutoComplete*)This, fEnable); -} - -/********************************************************************** ******** - * IAutoComplete2_fnInit - */ -static HRESULT WINAPI IAutoComplete2_fnInit( - IAutoComplete2 * iface, - HWND hwndEdit, - IUnknown *punkACL, - LPCOLESTR pwzsRegKeyPath, - LPCOLESTR pwszQuickComplete) -{ - _ICOM_THIS_From_IAutoComplete2(IAutoCompleteImpl, iface); - - TRACE("(%p)\n", This); - - return IAutoComplete_Init((IAutoComplete*)This, hwndEdit, punkACL, pwzsRegKeyPath, pwszQuickComplete); -} - -/********************************************************************** **** - * IAutoComplete_fnGetOptions - */ -static HRESULT WINAPI IAutoComplete2_fnGetOptions( - IAutoComplete2 * iface, - DWORD *pdwFlag) -{ - HRESULT hr = S_OK; - - _ICOM_THIS_From_IAutoComplete2(IAutoCompleteImpl, iface); - - TRACE("(%p) -> (%p)\n", This, pdwFlag); - - *pdwFlag = This->options; - - return hr; -} - -/********************************************************************** **** - * IAutoComplete_fnSetOptions - */ -static HRESULT WINAPI IAutoComplete2_fnSetOptions( - IAutoComplete2 * iface, - DWORD dwFlag) -{ - HRESULT hr = S_OK; - - _ICOM_THIS_From_IAutoComplete2(IAutoCompleteImpl, iface); - - TRACE("(%p) -> (0x%lx)\n", This, dwFlag); - - This->options = dwFlag; - - return hr; -} - -/********************************************************************** **** - * IAutoComplete2_fnVTable - */ -static IAutoComplete2Vtbl ac2vt = -{ - IAutoComplete2_fnQueryInterface, - IAutoComplete2_fnAddRef, - IAutoComplete2_fnRelease, - IAutoComplete2_fnInit, - IAutoComplete2_fnEnable, - /* IAutoComplete2 */ - IAutoComplete2_fnSetOptions, - IAutoComplete2_fnGetOptions, -}; - -/* - Window procedure for autocompletion - */ -static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - IAutoCompleteImpl *This = (IAutoCompleteImpl *)GetWindowLongPtrW(hwnd, GWLP_USERDATA); - LPOLESTR strs; - HRESULT hr; - WCHAR hwndText[255]; - WCHAR *hwndQCText; - RECT r; - BOOL control, filled, displayall = FALSE; - int cpt, height, sel; - - if (!This->enabled) return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); - - switch (uMsg) - { - case CB_SHOWDROPDOWN: - ShowWindow(This->hwndListBox, SW_HIDE); - break; - case WM_KILLFOCUS: - if ((This->options && ACO_AUTOSUGGEST) && - ((HWND)wParam != This->hwndListBox)) - { - ShowWindow(This->hwndListBox, SW_HIDE); - } - break; - case WM_KEYUP: - - GetWindowTextW( hwnd, (LPWSTR)hwndText, 255); - - switch(wParam) { - case VK_RETURN: - /* If quickComplete is set and control is pressed, replace the string */ - control = GetKeyState(VK_CONTROL) & 0x8000; - if (control && This->quickComplete) { - hwndQCText = (WCHAR*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - (lstrlenW(This->quickComplete)+lstrlenW(hwndText))*sizeof(WCHAR)); - sel = sprintfW(hwndQCText, This->quickComplete, hwndText); - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)hwndQCText); - SendMessageW(hwnd, EM_SETSEL, 0, sel); - HeapFree(GetProcessHeap(), 0, hwndQCText); - } - - ShowWindow(This->hwndListBox, SW_HIDE); - return 0; - case VK_LEFT: - case VK_RIGHT: - return 0; - case VK_UP: - case VK_DOWN: - /* Two cases here : - - if the listbox is not visible, displays it - with all the entries if the style ACO_UPDOWNKEYDROPSLIST - is present but does not select anything. - - if the listbox is visible, change the selection - */ - if ( (This->options & (ACO_AUTOSUGGEST | ACO_UPDOWNKEYDROPSLIST)) - && (!IsWindowVisible(This->hwndListBox) && (! *hwndText)) ) - { - /* We must dispays all the entries */ - displayall = TRUE; - } else { - if (IsWindowVisible(This->hwndListBox)) { - int count; - - count = SendMessageW(This->hwndListBox, LB_GETCOUNT, 0, 0); - /* Change the selection */ - sel = SendMessageW(This->hwndListBox, LB_GETCURSEL, 0, 0); - if (wParam == VK_UP) - sel = ((sel-1)<0)?count-1:sel-1; - else - sel = ((sel+1)>= count)?-1:sel+1; - SendMessageW(This->hwndListBox, LB_SETCURSEL, sel, 0); - if (sel != -1) { - WCHAR *msg; - int len; - - len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, (LPARAM)NULL); - msg = (WCHAR*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len+1)*sizeof(WCHAR)); - SendMessageW(This->hwndListBox, LB_GETTEXT, sel, (LPARAM)msg); - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)msg); - SendMessageW(hwnd, EM_SETSEL, lstrlenW(msg), lstrlenW(msg)); - HeapFree(GetProcessHeap(), 0, msg); - } else { - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)This->txtbackup); - SendMessageW(hwnd, EM_SETSEL, lstrlenW(This->txtbackup), lstrlenW(This->txtbackup)); - } - } - return 0; - } - break; - case VK_BACK: - case VK_DELETE: - if ((! *hwndText) && (This->options & ACO_AUTOSUGGEST)) { - ShowWindow(This->hwndListBox, SW_HIDE); - return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); - } - if (This->options & ACO_AUTOAPPEND) { - DWORD b; - SendMessageW(hwnd, EM_GETSEL, (WPARAM)&b, (LPARAM)NULL); - if (b>1) { - hwndText[b-1] = '\0'; - } else { - hwndText[0] = '\0'; - SetWindowTextW(hwnd, hwndText); - } - } - break; - default: - ; - } - - SendMessageW(This->hwndListBox, LB_RESETCONTENT, 0, 0); - - HeapFree(GetProcessHeap(), 0, This->txtbackup); - This->txtbackup = (WCHAR*) HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, (lstrlenW(hwndText)+1)*sizeof(WCHAR)); - lstrcpyW(This->txtbackup, hwndText); - - /* Returns if there is no text to search and we doesn't want to display all the entries */ - if ((!displayall) && (! *hwndText) ) - break; - - IEnumString_Reset(This->enumstr); - filled = FALSE; - for(cpt = 0;;) { - hr = IEnumString_Next(This->enumstr, 1, &strs, NULL); - if (hr != S_OK) - break; - - if ((LPWSTR)strstrW(strs, hwndText) == strs) { - - if (This->options & ACO_AUTOAPPEND) { - SetWindowTextW(hwnd, strs); - SendMessageW(hwnd, EM_SETSEL, lstrlenW(hwndText), lstrlenW(strs)); - break; - } - - if (This->options & ACO_AUTOSUGGEST) { - SendMessageW(This->hwndListBox, LB_ADDSTRING, 0, (LPARAM)strs); - filled = TRUE; - cpt++; - } - } - } - - if (This->options & ACO_AUTOSUGGEST) { - if (filled) { - height = SendMessageW(This->hwndListBox, LB_GETITEMHEIGHT, 0, 0); - SendMessageW(This->hwndListBox, LB_CARETOFF, 0, 0); - GetWindowRect(hwnd, &r); - SetParent(This->hwndListBox, HWND_DESKTOP); - /* It seems that Windows XP displays 7 lines at most - and otherwise displays a vertical scroll bar */ - SetWindowPos(This->hwndListBox, HWND_TOP, - r.left, r.bottom + 1, r.right - r.left, min(height * 7, height*(cpt+1)), - SWP_SHOWWINDOW ); - } else { - ShowWindow(This->hwndListBox, SW_HIDE); - } - } - - break; - default: - return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); - - } - - return 0; -} - -static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - IAutoCompleteImpl *This = (IAutoCompleteImpl *)GetWindowLongPtrW(hwnd, GWLP_USERDATA); - WCHAR *msg; - int sel = -1, len; - - switch (uMsg) { - case WM_MOUSEMOVE: - sel = SendMessageW(hwnd, LB_ITEMFROMPOINT, 0, lParam); - SendMessageW(hwnd, LB_SETCURSEL, (WPARAM)sel, (LPARAM)0); - break; - case WM_LBUTTONDOWN: - len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, (LPARAM)NULL); - msg = (WCHAR*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len+1)*sizeof(WCHAR)); - sel = (INT)SendMessageW(hwnd, LB_GETCURSEL, 0, 0); - SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); - SendMessageW(This->hwndEdit, WM_SETTEXT, 0, (LPARAM)msg); - SendMessageW(This->hwndEdit, EM_SETSEL, 0, lstrlenW(msg)); - ShowWindow(hwnd, SW_HIDE); - HeapFree(GetProcessHeap(), 0, msg); - break; - default: - return CallWindowProcW(This->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); - } - return 0; -} +/* + * AutoComplete interfaces implementation. + * + * Copyright 2004 Maxime BellengÚ <maxime.bellenge(a)laposte.net> + * + * 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 + */ + +/* + Implemented: + - ACO_AUTOAPPEND style + - ACO_AUTOSUGGEST style + - ACO_UPDOWNKEYDROPSLIST style + + - Handle pwzsRegKeyPath and pwszQuickComplete in Init + + TODO: + - implement ACO_SEARCH style + - implement ACO_FILTERPREFIXES style + - implement ACO_USETAB style + - implement ACO_RTLREADING style + + */ +#include "config.h" + +#include <stdarg.h> +#include <stdlib.h> +#include <string.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "undocshell.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" + +#include "pidl.h" +#include "shlguid.h" +#include "shlobj.h" +#include "shldisp.h" +#include "debughlp.h" + +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +typedef struct +{ + IAutoCompleteVtbl *lpVtbl; + IAutoComplete2Vtbl *lpvtblAutoComplete2; + DWORD ref; + BOOL enabled; + HWND hwndEdit; + HWND hwndListBox; + WNDPROC wpOrigEditProc; + WNDPROC wpOrigLBoxProc; + WCHAR *txtbackup; + WCHAR *quickComplete; + IEnumString *enumstr; + AUTOCOMPLETEOPTIONS options; +} IAutoCompleteImpl; + +static struct IAutoCompleteVtbl acvt; +static struct IAutoComplete2Vtbl ac2vt; + +#define _IAutoComplete2_Offset ((int)(&(((IAutoCompleteImpl*)0)->lpvtblAutoComplete2))) +#define _ICOM_THIS_From_IAutoComplete2(class, name) class* This = (class*)(((char*)name)-_IAutoComplete2_Offset); + +/* + converts This to a interface pointer +*/ +#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) +#define _IAutoComplete2_(This) (IAutoComplete2*)&(This->lpvtblAutoComplete2) + +static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + +/********************************************************************** **** + * IAutoComplete_Constructor + */ +HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) +{ + IAutoCompleteImpl *lpac; + + if (pUnkOuter && !IsEqualIID (riid, &IID_IUnknown)) + return CLASS_E_NOAGGREGATION; + + lpac = (IAutoCompleteImpl*)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, sizeof(IAutoCompleteImpl)); + if (!lpac) + return E_OUTOFMEMORY; + + lpac->ref = 1; + lpac->lpVtbl = &acvt; + lpac->lpvtblAutoComplete2 = &ac2vt; + lpac->enabled = TRUE; + lpac->enumstr = NULL; + lpac->options = ACO_AUTOAPPEND; + lpac->wpOrigEditProc = NULL; + lpac->hwndListBox = NULL; + lpac->txtbackup = NULL; + lpac->quickComplete = NULL; + + if (!SUCCEEDED (IUnknown_QueryInterface (_IUnknown_ (lpac), riid, ppv))) { + IUnknown_Release (_IUnknown_ (lpac)); + return E_NOINTERFACE; + } + + TRACE("-- (%p)->\n",lpac); + + return S_OK; +} + +/********************************************************************** **** + * AutoComplete_QueryInterface + */ +static HRESULT WINAPI IAutoComplete_fnQueryInterface( + IAutoComplete * iface, + REFIID riid, + LPVOID *ppvObj) +{ + IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; + + TRACE("(%p)->(\n\tIID:\t%s,%p)\n", This, shdebugstr_guid(riid), ppvObj); + *ppvObj = NULL; + + if(IsEqualIID(riid, &IID_IUnknown)) + { + *ppvObj = This; + } + else if(IsEqualIID(riid, &IID_IAutoComplete)) + { + *ppvObj = (IAutoComplete*)This; + } + else if(IsEqualIID(riid, &IID_IAutoComplete2)) + { + *ppvObj = _IAutoComplete2_ (This); + } + [truncated at 1000 lines; 182469 more skipped]

20 years, 3 months

[gvg] 13545: Need to fix eol-style

by gvg＠svn.reactos.com

Need to fix eol-style Deleted: vendor/wine/dlls/shell32/Wine-20050211/

20 years, 3 months

[gvg] 13544: Sync to Wine-20050211

by gvg＠svn.reactos.com

Sync to Wine-20050211 James Hawkins <truiken(a)gmail.com> - Use Interlocked* instead of ++/-- in AddRef/Release. - Use only stored result of Interlocked* in AddRef/Release. - Expand TRACEs to display the ref count. Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Mike McCormack <mike(a)codeweavers.com> - Implement GetAdvise and SetAdvise. Henning Gerhardt <henning.gerhardt(a)web.de> - A small spelling fix and a small update (thank to Andreas Mohr). - Update German resources. Joris Huizer <jorishuizer(a)planet.nl> - add file_operation_delete - add file_operation_checkFlags - use these in SHFileOperationW replacing inline code Modified: trunk/reactos/lib/shell32/autocomplete.c Modified: trunk/reactos/lib/shell32/cpanelfolder.c Modified: trunk/reactos/lib/shell32/dataobject.c Modified: trunk/reactos/lib/shell32/dragdrophelper.c Modified: trunk/reactos/lib/shell32/enumidlist.c Modified: trunk/reactos/lib/shell32/folders.c Modified: trunk/reactos/lib/shell32/memorystream.c Modified: trunk/reactos/lib/shell32/pidl.c Modified: trunk/reactos/lib/shell32/shell32_De.rc Modified: trunk/reactos/lib/shell32/shelllink.c Modified: trunk/reactos/lib/shell32/shellole.c Modified: trunk/reactos/lib/shell32/shellord.c Modified: trunk/reactos/lib/shell32/shellpath.c Modified: trunk/reactos/lib/shell32/shfldr_desktop.c Modified: trunk/reactos/lib/shell32/shfldr_fs.c Modified: trunk/reactos/lib/shell32/shfldr_mycomp.c Modified: trunk/reactos/lib/shell32/shlfileop.c Modified: trunk/reactos/lib/shell32/shlfsbind.c Modified: trunk/reactos/lib/shell32/shlview.c Modified: trunk/reactos/lib/shell32/shv_bg_cmenu.c Modified: trunk/reactos/lib/shell32/shv_item_cmenu.c _____ Modified: trunk/reactos/lib/shell32/autocomplete.c --- trunk/reactos/lib/shell32/autocomplete.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/autocomplete.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -170,9 +170,11 @@ IAutoComplete * iface) { IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%lu)\n",This,This->ref); - return ++(This->ref); + TRACE("(%p)->(%lu)\n", This, refCount - 1); + + return refCount; } /*********************************************************************** ******* @@ -182,10 +184,11 @@ IAutoComplete * iface) { IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%lu)\n",This,This->ref); + TRACE("(%p)->(%lu)\n", This, refCount + 1); - if (!--(This->ref)) { + if (!refCount) { TRACE(" destroying IAutoComplete(%p)\n",This); HeapFree(GetProcessHeap(), 0, This->quickComplete); HeapFree(GetProcessHeap(), 0, This->txtbackup); @@ -194,9 +197,8 @@ if (This->enumstr) IEnumString_Release(This->enumstr); HeapFree(GetProcessHeap(), 0, This); - return 0; } - return This->ref; + return refCount; } /*********************************************************************** ******* _____ Modified: trunk/reactos/lib/shell32/cpanelfolder.c --- trunk/reactos/lib/shell32/cpanelfolder.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/cpanelfolder.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -181,26 +181,27 @@ static ULONG WINAPI ISF_ControlPanel_fnAddRef(IShellFolder2 * iface) { ICPanelImpl *This = (ICPanelImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, This->ref); + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); - return ++(This->ref); + return refCount; } static ULONG WINAPI ISF_ControlPanel_fnRelease(IShellFolder2 * iface) { ICPanelImpl *This = (ICPanelImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, This->ref); + TRACE("(%p)->(count=%lu)\n", This, refCount + 1); - if (!--(This->ref)) { + if (!refCount) { TRACE("-- destroying IShellFolder(%p)\n", This); if (This->pidlRoot) SHFree(This->pidlRoot); LocalFree((HLOCAL) This); - return 0; } - return This->ref; + return refCount; } /*********************************************************************** *** _____ Modified: trunk/reactos/lib/shell32/dataobject.c --- trunk/reactos/lib/shell32/dataobject.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/dataobject.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -124,16 +124,21 @@ static ULONG WINAPI IEnumFORMATETC_fnAddRef(LPENUMFORMATETC iface) { IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; - TRACE("(%p)->(count=%lu)\n",This, This->ref); - return ++(This->ref); + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + + return refCount; } static ULONG WINAPI IEnumFORMATETC_fnRelease(LPENUMFORMATETC iface) { IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; - TRACE("(%p)->()\n",This); + ULONG refCount = InterlockedDecrement(&This->ref); - if (!--(This->ref)) + TRACE("(%p)->(%lu)\n", This, refCount + 1); + + if (!refCount) { TRACE(" destroying IEnumFORMATETC(%p)\n",This); if (This->pFmt) @@ -143,7 +148,7 @@ HeapFree(GetProcessHeap(),0,This); return 0; } - return This->ref; + return refCount; } static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, FORMATETC *rgelt, ULONG *pceltFethed) @@ -291,8 +296,11 @@ static ULONG WINAPI IDataObject_fnAddRef(LPDATAOBJECT iface) { IDataObjectImpl *This = (IDataObjectImpl *)iface; - TRACE("(%p)->(count=%lu)\n",This, This->ref); - return ++(This->ref); + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + + return refCount; } /*********************************************************************** *** @@ -301,17 +309,18 @@ static ULONG WINAPI IDataObject_fnRelease(LPDATAOBJECT iface) { IDataObjectImpl *This = (IDataObjectImpl *)iface; - TRACE("(%p)->()\n",This); + ULONG refCount = InterlockedDecrement(&This->ref); - if (!--(This->ref)) + TRACE("(%p)->(%lu)\n", This, refCount + 1); + + if (!refCount) { TRACE(" destroying IDataObject(%p)\n",This); _ILFreeaPidl(This->apidl, This->cidl); ILFree(This->pidl), HeapFree(GetProcessHeap(),0,This); - return 0; } - return This->ref; + return refCount; } /*********************************************************************** *** _____ Modified: trunk/reactos/lib/shell32/dragdrophelper.c --- trunk/reactos/lib/shell32/dragdrophelper.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/dragdrophelper.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -113,24 +113,26 @@ static ULONG WINAPI IDropTargetHelper_fnAddRef (IDropTargetHelper * iface) { IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); - return ++(This->ref); + return refCount; } static ULONG WINAPI IDropTargetHelper_fnRelease (IDropTargetHelper * iface) { IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); - if (!--(This->ref)) { + if (!refCount) { TRACE("-- destroying (%p)\n", This); LocalFree ((HLOCAL) This); return 0; } - return This->ref; + return refCount; } static HRESULT WINAPI IDropTargetHelper_fnDragEnter ( _____ Modified: trunk/reactos/lib/shell32/enumidlist.c --- trunk/reactos/lib/shell32/enumidlist.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/enumidlist.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -240,8 +240,11 @@ IEnumIDList * iface) { IEnumIDListImpl *This = (IEnumIDListImpl *)iface; - TRACE("(%p)->(%lu)\n",This,This->ref); - return ++(This->ref); + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(%lu)\n", This, refCount - 1); + + return refCount; } /*********************************************************************** ******* * IEnumIDList_fnRelease @@ -250,16 +253,16 @@ IEnumIDList * iface) { IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%lu)\n",This,This->ref); + TRACE("(%p)->(%lu)\n", This, refCount + 1); - if (!--(This->ref)) { + if (!refCount) { TRACE(" destroying IEnumIDList(%p)\n",This); DeleteList((IEnumIDList*)This); HeapFree(GetProcessHeap(),0,This); - return 0; } - return This->ref; + return refCount; } /*********************************************************************** *** _____ Modified: trunk/reactos/lib/shell32/folders.c --- trunk/reactos/lib/shell32/folders.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/folders.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -130,10 +130,11 @@ static ULONG WINAPI IExtractIconW_fnAddRef(IExtractIconW * iface) { IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n",This, This->ref ); + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); - return ++(This->ref); + return refCount; } /*********************************************************************** *** * IExtractIconW_Release @@ -141,17 +142,18 @@ static ULONG WINAPI IExtractIconW_fnRelease(IExtractIconW * iface) { IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->()\n",This); + TRACE("(%p)->(count=%lu)\n", This, refCount + 1); - if (!--(This->ref)) + if (!refCount) { TRACE(" destroying IExtractIcon(%p)\n",This); SHFree(This->pidl); HeapFree(GetProcessHeap(),0,This); return 0; } - return This->ref; + return refCount; } static HRESULT getIconLocationForFolder(IExtractIconW *iface, UINT uFlags, _____ Modified: trunk/reactos/lib/shell32/memorystream.c --- trunk/reactos/lib/shell32/memorystream.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/memorystream.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -127,10 +127,11 @@ static ULONG WINAPI IStream_fnAddRef(IStream *iface) { ISHFileStream *This = (ISHFileStream *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n",This, This->ref); + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); - return ++(This->ref); + return refCount; } /*********************************************************************** *** @@ -139,16 +140,17 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface) { ISHFileStream *This = (ISHFileStream *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->()\n",This); + TRACE("(%p)->(count=%lu)\n", This, refCount + 1); - if (!--(This->ref)) + if (!refCount) { TRACE(" destroying SHFileStream (%p)\n",This); CloseHandle(This->handle); HeapFree(GetProcessHeap(),0,This); } - return This->ref; + return refCount; } static HRESULT WINAPI IStream_fnRead (IStream * iface, void* pv, ULONG cb, ULONG* pcbRead) _____ Modified: trunk/reactos/lib/shell32/pidl.c --- trunk/reactos/lib/shell32/pidl.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/pidl.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -977,7 +977,7 @@ * IShellFolder uses that FileSystem Bind Data object of the BindContext * to pass data about the current path element to the next object. This * is used to avoid having to verify the current path element on disk, so - * that creating an ItemIDList from a non-existent path still can work. + * that creating an ItemIDList from a nonexistent path still can work. */ static HRESULT WINAPI _ILParsePathW(LPCWSTR path, LPWIN32_FIND_DATAW lpFindFile, BOOL bBindCtx, LPITEMIDLIST *ppidl, LPDWORD prgfInOut) @@ -1024,7 +1024,7 @@ * SHSimpleIDListFromPath [SHELL32.162] * * Creates a simple ItemIDList from a path and returns it. This function - * does not fail on non-existent paths. + * does not fail on nonexistent paths. * * PARAMS * path [I] path to parse and convert into an ItemIDList _____ Modified: trunk/reactos/lib/shell32/shell32_De.rc --- trunk/reactos/lib/shell32/shell32_De.rc 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/shell32_De.rc 2005-02-13 22:42:47 UTC (rev 13544) @@ -188,3 +188,35 @@ IDS_SHUTDOWN_TITLE "Anhalten" IDS_SHUTDOWN_PROMPT "M÷chten Sie die aktuelle ReactOS Sitzung beenden ?" } + +/* shell folder path default values */ +STRINGTABLE DISCARDABLE +{ + IDS_PROGRAMS "Startmen³\\Programme" + IDS_PERSONAL "Eigene Dateien" + IDS_FAVORITES "Favoriten" + IDS_STARTUP "Startmen³\\Programme\\Autostart" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" + IDS_STARTMENU "Startmen³" + IDS_MYMUSIC "Eigene Dateien\\Meine Musik" + IDS_MYVIDEO "Eigene Dateien\\Meine Videos" + IDS_DESKTOPDIRECTORY "Desktop" + IDS_NETHOOD "Netzwerkumgebung" + IDS_TEMPLATES "Vorlagen" + IDS_APPDATA "Anwendungsdaten" + IDS_PRINTHOOD "Druckumgebung" + IDS_LOCAL_APPDATA "Lokale Einstellungen\\Anwendungsdaten" + IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_COOKIES "Cookies" + IDS_HISTORY "Verlauf" + IDS_PROGRAM_FILES "Programme" + IDS_MYPICTURES "Eigene Dateien\\Eigene Bilder" + IDS_PROGRAM_FILES_COMMON "Programme\\Gemeinsame Dateien" + IDS_COMMON_DOCUMENTS "Dokumente" + IDS_ADMINTOOLS "Startmen³\\Programme\\Verwaltung" + IDS_COMMON_MUSIC "Dokumente\\Eigene Musik" + IDS_COMMON_PICTURES "Dokumente\\Eigene Bilder" + IDS_COMMON_VIDEO "Dokumente\\Eigene Videos" + IDS_CDBURN_AREA "Lokale Einstellungen\\Anwendungsdaten\\Microsoft\\CD Burning" +} _____ Modified: trunk/reactos/lib/shell32/shelllink.c --- trunk/reactos/lib/shell32/shelllink.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/shelllink.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -974,10 +974,11 @@ static ULONG WINAPI IShellLinkA_fnAddRef(IShellLinkA * iface) { IShellLinkImpl *This = (IShellLinkImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n",This,This->ref); + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); - return ++(This->ref); + return refCount; } /*********************************************************************** ******* * IShellLinkA_Release @@ -985,11 +986,12 @@ static ULONG WINAPI IShellLinkA_fnRelease(IShellLinkA * iface) { IShellLinkImpl *This = (IShellLinkImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%lu)\n",This,This->ref); + TRACE("(%p)->(count=%lu)\n", This, refCount + 1); - if (--(This->ref)) - return This->ref; + if (refCount) + return refCount; TRACE("-- destroying IShellLink(%p)\n",This); _____ Modified: trunk/reactos/lib/shell32/shellole.c --- trunk/reactos/lib/shell32/shellole.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/shellole.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -556,9 +556,11 @@ static ULONG WINAPI IDefClF_fnAddRef(LPCLASSFACTORY iface) { IDefClFImpl *This = (IDefClFImpl *)iface; - TRACE("(%p)->(count=%lu)\n",This,This->ref); + ULONG refCount = InterlockedIncrement(&This->ref); - return InterlockedIncrement(&This->ref); + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + + return refCount; } /*********************************************************************** ******* * IDefClF_fnRelease @@ -566,9 +568,11 @@ static ULONG WINAPI IDefClF_fnRelease(LPCLASSFACTORY iface) { IDefClFImpl *This = (IDefClFImpl *)iface; - TRACE("(%p)->(count=%lu)\n",This,This->ref); + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(count=%lu)\n", This, refCount + 1); - if (!InterlockedDecrement(&This->ref)) + if (!refCount) { if (This->pcRefDll) InterlockedDecrement(This->pcRefDll); @@ -576,7 +580,7 @@ HeapFree(GetProcessHeap(),0,This); return 0; } - return This->ref; + return refCount; } /*********************************************************************** ******* * IDefClF_fnCreateInstance _____ Modified: trunk/reactos/lib/shell32/shellord.c --- trunk/reactos/lib/shell32/shellord.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/shellord.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -673,7 +673,7 @@ if (ret == ERROR_SUCCESS) { if (!( (type == REG_DWORD) || ((type == REG_BINARY) && (datalen == 4)) )) { - ERR("Error policy data for \"NoRecentDocsHistory\" not formated correctly, type=%ld, len=%ld\n", + ERR("Error policy data for \"NoRecentDocsHistory\" not formatted correctly, type=%ld, len=%ld\n", type, datalen); return; } _____ Modified: trunk/reactos/lib/shell32/shellpath.c --- trunk/reactos/lib/shell32/shellpath.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/shellpath.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -1995,7 +1995,7 @@ else if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) { /* unlike SHGetFolderPath, SHGetFolderLocation in shell32 - * version 6.0 returns E_FAIL for non-existing paths + * version 6.0 returns E_FAIL for nonexistent paths */ hr = E_FAIL; } _____ Modified: trunk/reactos/lib/shell32/shfldr_desktop.c --- trunk/reactos/lib/shell32/shfldr_desktop.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/shfldr_desktop.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -157,19 +157,21 @@ static ULONG WINAPI ISF_Desktop_fnAddRef (IShellFolder2 * iface) { IGenericSFImpl *This = (IGenericSFImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); - return ++(This->ref); + return refCount; } static ULONG WINAPI ISF_Desktop_fnRelease (IShellFolder2 * iface) { IGenericSFImpl *This = (IGenericSFImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); - if (!--(This->ref)) { + if (!refCount) { TRACE ("-- destroying IShellFolder(%p)\n", This); if (This->pidlRoot) SHFree (This->pidlRoot); @@ -178,7 +180,7 @@ LocalFree ((HLOCAL) This); return 0; } - return This->ref; + return refCount; } /*********************************************************************** *** _____ Modified: trunk/reactos/lib/shell32/shfldr_fs.c --- trunk/reactos/lib/shell32/shfldr_fs.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/shfldr_fs.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -173,19 +173,21 @@ static ULONG WINAPI IUnknown_fnAddRef (IUnknown * iface) { IGenericSFImpl *This = (IGenericSFImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); - return ++(This->ref); + return refCount; } static ULONG WINAPI IUnknown_fnRelease (IUnknown * iface) { IGenericSFImpl *This = (IGenericSFImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); - if (!--(This->ref)) { + if (!refCount) { TRACE ("-- destroying IShellFolder(%p)\n", This); if (This->pidlRoot) @@ -193,9 +195,8 @@ if (This->sPathTarget) SHFree (This->sPathTarget); LocalFree ((HLOCAL) This); - return 0; } - return This->ref; + return refCount; } static IUnknownVtbl unkvt = _____ Modified: trunk/reactos/lib/shell32/shfldr_mycomp.c --- trunk/reactos/lib/shell32/shfldr_mycomp.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/shfldr_mycomp.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -160,26 +160,27 @@ static ULONG WINAPI ISF_MyComputer_fnAddRef (IShellFolder2 * iface) { IGenericSFImpl *This = (IGenericSFImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); - return ++(This->ref); + return refCount; } static ULONG WINAPI ISF_MyComputer_fnRelease (IShellFolder2 * iface) { IGenericSFImpl *This = (IGenericSFImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); - if (!--(This->ref)) { + if (!refCount) { TRACE ("-- destroying IShellFolder(%p)\n", This); if (This->pidlRoot) SHFree (This->pidlRoot); LocalFree ((HLOCAL) This); - return 0; } - return This->ref; + return refCount; } /*********************************************************************** *** _____ Modified: trunk/reactos/lib/shell32/shlfileop.c --- trunk/reactos/lib/shell32/shlfileop.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/shlfileop.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -861,6 +861,90 @@ #define ERROR_SHELL_INTERNAL_FILE_NOT_FOUND 1026 #define HIGH_ADR (LPWSTR)0xffffffff +static int file_operation_delete( WIN32_FIND_DATAW *wfd,SHFILEOPSTRUCTW nFileOp, LPWSTR pFromFile,LPWSTR pTempFrom,HANDLE *hFind) + +{ + LPWSTR lpFileName; + BOOL b_Mask = (NULL != StrPBrkW(&pFromFile[1], wWildcardChars)); + int retCode = 0; + do + { + lpFileName = wfd->cAlternateFileName; + if (!lpFileName[0]) + lpFileName = wfd->cFileName; + if (IsDotDir(lpFileName) || + ((b_Mask) && IsAttribDir(wfd->dwFileAttributes) && (nFileOp.fFlags & FOF_FILESONLY))) + continue; + SHFileStrCpyCatW(&pFromFile[1], lpFileName, NULL); + /* TODO: Check the SHELL_DeleteFileOrDirectoryW() function in shell32.dll */ + if (IsAttribFile(wfd->dwFileAttributes)) + { + if(SHNotifyDeleteFileW(pTempFrom) != ERROR_SUCCESS) + { + nFileOp.fAnyOperationsAborted = TRUE; + retCode = 0x78; /* value unknown */ + } + } + else if(!SHELL_DeleteDirectoryW(pTempFrom, (!(nFileOp.fFlags & FOF_NOCONFIRMATION)))) + { + nFileOp.fAnyOperationsAborted = TRUE; + retCode = 0x79; /* value unknown */ + } + } + while (!nFileOp.fAnyOperationsAborted && FindNextFileW(*hFind,wfd)); + FindClose(*hFind); + *hFind = INVALID_HANDLE_VALUE; + return retCode; +} + +/* + * Summary of flags: + * + * implemented flags: + * FOF_MULTIDESTFILES, FOF_NOCONFIRMATION, FOF_FILESONLY + * + * unimplememented and ignored flags: + * FOF_CONFIRMMOUSE, FOF_SILENT, FOF_NOCONFIRMMKDIR, + * FOF_SIMPLEPROGRESS, FOF_NOCOPYSECURITYATTRIBS + * + * partially implemented, breaks if file exists: + * FOF_RENAMEONCOLLISION + * + * unimplemented and break if any other flag set: + * FOF_ALLOWUNDO, FOF_WANTMAPPINGHANDLE + */ + +static int file_operation_checkFlags(SHFILEOPSTRUCTW nFileOp) +{ + FILEOP_FLAGS OFl = ((FILEOP_FLAGS)nFileOp.fFlags & 0xfff); + long FuncSwitch = (nFileOp.wFunc & FO_MASK); + long level= nFileOp.wFunc >> 4; + + TRACE("%s level=%ld nFileOp.fFlags=0x%x\n", + debug_shfileops_action(FuncSwitch), level, nFileOp.fFlags); + /* OFl &= (-1 - (FOF_MULTIDESTFILES | FOF_FILESONLY)); */ + /* OFl ^= (FOF_SILENT | FOF_NOCONFIRMATION | FOF_SIMPLEPROGRESS | FOF_NOCONFIRMMKDIR); */ + OFl &= (~(FOF_MULTIDESTFILES | FOF_NOCONFIRMATION | FOF_FILESONLY)); /* implemented */ + OFl ^= (FOF_SILENT | FOF_NOCONFIRMMKDIR | FOF_NOERRORUI | FOF_NOCOPYSECURITYATTRIBS); /* ignored, if one */ + OFl &= (~FOF_SIMPLEPROGRESS); /* ignored, only with FOF_SILENT */ + if (OFl) + { + if (OFl & (~(FOF_CONFIRMMOUSE | FOF_SILENT | FOF_RENAMEONCOLLISION | + FOF_NOCONFIRMMKDIR | FOF_NOERRORUI | FOF_NOCOPYSECURITYATTRIBS))) + { + TRACE("%s level=%ld lpFileOp->fFlags=0x%x not implemented, Aborted=TRUE, stub\n", + debug_shfileops_action(FuncSwitch), level, OFl); + return 0x403; /* 1027, we need an extension to shlfileop */ + } + else + { + TRACE("%s level=%ld lpFileOp->fFlags=0x%x not fully implemented, stub\n", + debug_shfileops_action(FuncSwitch), level, OFl); + } + } + return 0; +} + /*********************************************************************** ** * SHFileOperationW [SHELL32.@] * @@ -884,8 +968,6 @@ int retCode = 0; DWORD ToAttr; DWORD ToPathAttr; - DWORD FromPathAttr; - FILEOP_FLAGS OFl = ((FILEOP_FLAGS)lpFileOp->fFlags & 0xfff); BOOL b_Multi = (nFileOp.fFlags & FOF_MULTIDESTFILES); @@ -904,6 +986,8 @@ long FuncSwitch = (nFileOp.wFunc & FO_MASK); long level= nFileOp.wFunc>>4; + int ret; + /* default no error */ nFileOp.fAnyOperationsAborted = FALSE; @@ -932,47 +1016,12 @@ * create dir 0 0 0 0 0 0 1 0 */ - /* - * Summary of flags: - * - * implemented flags: - * FOF_MULTIDESTFILES, FOF_NOCONFIRMATION, FOF_FILESONLY - * - * unimplememented and ignored flags: - * FOF_CONFIRMMOUSE, FOF_SILENT, FOF_NOCONFIRMMKDIR, - * FOF_SIMPLEPROGRESS, FOF_NOCOPYSECURITYATTRIBS - * - * partially implemented, breaks if file exists: - * FOF_RENAMEONCOLLISION - * - * unimplemented and break if any other flag set: - * FOF_ALLOWUNDO, FOF_WANTMAPPINGHANDLE - */ - - TRACE("%s level=%ld nFileOp.fFlags=0x%x\n", - debug_shfileops_action(FuncSwitch), level, lpFileOp->fFlags); - - /* OFl &= (-1 - (FOF_MULTIDESTFILES | FOF_FILESONLY)); */ - /* OFl ^= (FOF_SILENT | FOF_NOCONFIRMATION | FOF_SIMPLEPROGRESS | FOF_NOCONFIRMMKDIR); */ - OFl &= (~(FOF_MULTIDESTFILES | FOF_NOCONFIRMATION | FOF_FILESONLY)); /* implemented */ - OFl ^= (FOF_SILENT | FOF_NOCONFIRMMKDIR | FOF_NOERRORUI | FOF_NOCOPYSECURITYATTRIBS); /* ignored, if one */ - OFl &= (~FOF_SIMPLEPROGRESS); /* ignored, only with FOF_SILENT */ - if (OFl) + ret = file_operation_checkFlags(nFileOp); + if (ret != 0) { - if (OFl & (~(FOF_CONFIRMMOUSE | FOF_SILENT | FOF_RENAMEONCOLLISION | - FOF_NOCONFIRMMKDIR | FOF_NOERRORUI | FOF_NOCOPYSECURITYATTRIBS))) - { - TRACE("%s level=%ld lpFileOp->fFlags=0x%x not implemented, Aborted=TRUE, stub\n", - debug_shfileops_action(FuncSwitch), level, OFl); - retCode = 0x403; /* 1027, we need an extension to shlfileop */ - goto shfileop_end; - } - else - { - TRACE("%s level=%ld lpFileOp->fFlags=0x%x not fully implemented, stub\n", - debug_shfileops_action(FuncSwitch), level, OFl); - } - } + retCode = ret; + goto shfileop_end; + } if ((pNextFrom) && (!(b_MultiTo) || (pNextTo))) { @@ -1055,12 +1104,13 @@ goto shfileop_end; } } - + hFind = FindFirstFileW(pFrom, &wfd); if (INVALID_HANDLE_VALUE == hFind) { if ((FO_DELETE == FuncSwitch) && (b_Mask)) { + DWORD FromPathAttr; pFromFile[0] = '\0'; FromPathAttr = GetFileAttributesW(pTempFrom); pFromFile[0] = '\\'; @@ -1080,37 +1130,13 @@ /* ??? b_Mask = (!SHFileStrICmpA(&pFromFile[1], &wfd.cFileName[0], HIGH_ADR, HIGH_ADR)); */ if (!pTo) /* FO_DELETE */ { - do + ret = file_operation_delete(&wfd,nFileOp,pFromFile,pTempFrom,&hFind); + /* if ret is not 0, nFileOp.fAnyOperationsAborted is TRUE */ + if (ret != 0) { - lpFileName = wfd.cAlternateFileName; - if (!lpFileName[0]) - lpFileName = wfd.cFileName; - if (IsDotDir(lpFileName) || - ((b_Mask) && IsAttribDir(wfd.dwFileAttributes) && (nFileOp.fFlags & FOF_FILESONLY))) - continue; - SHFileStrCpyCatW(&pFromFile[1], lpFileName, NULL); - /* TODO: Check the SHELL_DeleteFileOrDirectoryW() function in shell32.dll */ - if (IsAttribFile(wfd.dwFileAttributes)) - { - if(SHNotifyDeleteFileW(pTempFrom) != ERROR_SUCCESS) - { - nFileOp.fAnyOperationsAborted = TRUE; - retCode = 0x78; /* value unknown */ - } - } - else - { - if(!SHELL_DeleteDirectoryW(pTempFrom, (!(nFileOp.fFlags & FOF_NOCONFIRMATION)))) - { - nFileOp.fAnyOperationsAborted = TRUE; - retCode = 0x79; /* value unknown */ - } - } - } while (!nFileOp.fAnyOperationsAborted && FindNextFileW(hFind, &wfd)); - FindClose(hFind); - hFind = INVALID_HANDLE_VALUE; - if (nFileOp.fAnyOperationsAborted) - goto shfileop_end; + retCode = ret; + goto shfileop_end; + } continue; } /* FO_DELETE ends, pTo must be always valid from here */ _____ Modified: trunk/reactos/lib/shell32/shlfsbind.c --- trunk/reactos/lib/shell32/shlfsbind.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/shlfsbind.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -179,22 +179,26 @@ static ULONG WINAPI IFileSystemBindData_fnAddRef(IFileSystemBindData *iface) { IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface; - TRACE("(%p)\n", This); - return InterlockedIncrement(&This->ref); + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(count=%li)\n", This, refCount - 1); + + return refCount; } static ULONG WINAPI IFileSystemBindData_fnRelease(IFileSystemBindData *iface) { IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface; - TRACE("(%p)\n", This); + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(count=%li)\n", This, refCount + 1); - if (!InterlockedDecrement(&This->ref)) + if (!refCount) { TRACE(" destroying ISFBindPidl(%p)\n",This); HeapFree(GetProcessHeap(), 0, This); - return 0; } - return This->ref; + return refCount; } static HRESULT WINAPI IFileSystemBindData_fnGetFindData(IFileSystemBindData *iface, WIN32_FIND_DATAW *pfd) _____ Modified: trunk/reactos/lib/shell32/shlview.c --- trunk/reactos/lib/shell32/shlview.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/shlview.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -97,6 +97,9 @@ LISTVIEW_SORT_INFO ListViewSortInfo; ULONG hNotify; /* change notification handle */ HANDLE hAccel; + DWORD dwAspects; + DWORD dwAdvf; + IAdviseSink *pAdvSink; } IShellViewImpl; static struct IShellViewVtbl svvt; @@ -1639,10 +1642,11 @@ static ULONG WINAPI IShellView_fnAddRef(IShellView * iface) { IShellViewImpl *This = (IShellViewImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n",This,This->ref); + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); - return ++(This->ref); + return refCount; } /********************************************************** * IShellView_Release @@ -1650,10 +1654,11 @@ static ULONG WINAPI IShellView_fnRelease(IShellView * iface) { IShellViewImpl *This = (IShellViewImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->()\n",This); + TRACE("(%p)->(count=%li)\n", This, refCount + 1); - if (!--(This->ref)) + if (!refCount) { TRACE(" destroying IShellView(%p)\n",This); @@ -1665,13 +1670,15 @@ if(This->pSF2Parent) IShellFolder2_Release(This->pSF2Parent); - if (This->apidl) + if(This->apidl) SHFree(This->apidl); + if(This->pAdvSink) + IAdviseSink_Release(This->pAdvSink); + HeapFree(GetProcessHeap(),0,This); - return 0; } - return This->ref; + return refCount; } /********************************************************** @@ -2374,10 +2381,17 @@ _ICOM_THIS_From_IViewObject(IShellViewImpl, iface); - FIXME("Stub: This=%p\n",This); + FIXME("partial stub: %p %08lx %08lx %p\n", + This, aspects, advf, pAdvSink); - return E_NOTIMPL; + /* FIXME: we set the AdviseSink, but never use it to send any advice */ + This->pAdvSink = pAdvSink; + This->dwAspects = aspects; + This->dwAdvf = advf; + + return S_OK; } + static HRESULT WINAPI ISVViewObject_GetAdvise( IViewObject *iface, DWORD* pAspects, @@ -2387,9 +2401,20 @@ _ICOM_THIS_From_IViewObject(IShellViewImpl, iface); - FIXME("Stub: This=%p\n",This); + TRACE("This=%p pAspects=%p pAdvf=%p ppAdvSink=%p\n", + This, pAspects, pAdvf, ppAdvSink); - return E_NOTIMPL; + if( ppAdvSink ) + { + IAdviseSink_AddRef( This->pAdvSink ); + *ppAdvSink = This->pAdvSink; + } + if( pAspects ) + *pAspects = This->dwAspects; + if( pAdvf ) + *pAdvf = This->dwAdvf; + + return S_OK; } _____ Modified: trunk/reactos/lib/shell32/shv_bg_cmenu.c --- trunk/reactos/lib/shell32/shv_bg_cmenu.c 2005-02-13 22:08:14 UTC (rev 13543) +++ trunk/reactos/lib/shell32/shv_bg_cmenu.c 2005-02-13 22:42:47 UTC (rev 13544) @@ -106,10 +106,11 @@ static ULONG WINAPI ISVBgCm_fnAddRef(IContextMenu2 *iface) { BgCmImpl *This = (BgCmImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n",This, This->ref); + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); - return ++(This->ref); + return refCount; } /*********************************************************************** *** @@ -118,10 +119,11 @@ static ULONG WINAPI ISVBgCm_fnRelease(IContextMenu2 *iface) { BgCmImpl *This = (BgCmImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->()\n",This); + TRACE("(%p)->(count=%li)\n", This, refCount + 1); - if (!--(This->ref)) + if (!refCount) { TRACE(" destroying IContextMenu(%p)\n",This); @@ -129,10 +131,8 @@ IShellFolder_Release(This->pSFParent); HeapFree(GetProcessHeap(),0,This); - return 0; } - - return This->ref; + return refCount; } [truncated at 1000 lines; 45 more skipped]

20 years, 3 months

[hbirr] 13543: Created cache_manager_rewrite branch

by hbirr＠svn.reactos.com

Created cache_manager_rewrite branch Added: branches/cache_manager_rewrite/reactos/ _____ Copied: branches/cache_manager_rewrite/reactos (from rev 13542, trunk/reactos)

20 years, 3 months

[hbirr] 13542: Created cache_manager_rewrite branch

by hbirr＠svn.reactos.com

Created cache_manager_rewrite branch Added: branches/cache_manager_rewrite/

20 years, 3 months

[weiden] 13541: fixed wrong buffer check in NtDuplicateToken and added buffer checks in NtOpenThreadTokenEx

by weiden＠svn.reactos.com

fixed wrong buffer check in NtDuplicateToken and added buffer checks in NtOpenThreadTokenEx Modified: trunk/reactos/ntoskrnl/se/token.c _____ Modified: trunk/reactos/ntoskrnl/se/token.c --- trunk/reactos/ntoskrnl/se/token.c 2005-02-13 21:32:50 UTC (rev 13540) +++ trunk/reactos/ntoskrnl/se/token.c 2005-02-13 22:00:36 UTC (rev 13541) @@ -136,27 +136,6 @@ PVOID EndMem; PTOKEN AccessToken; NTSTATUS Status; - - if(PreviousMode != KernelMode) - { - Status = STATUS_SUCCESS; - _SEH_TRY - { - ProbeForWrite(NewAccessToken, - sizeof(TOKEN), - sizeof(ULONG)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } Status = ObCreateObject(PreviousMode, SepTokenObjectType, @@ -263,17 +242,8 @@ if ( NT_SUCCESS(Status) ) { - _SEH_TRY - { - *NewAccessToken = AccessToken; - Status = STATUS_SUCCESS; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - return Status; + *NewAccessToken = AccessToken; + return(STATUS_SUCCESS); } ObDereferenceObject(AccessToken); @@ -1068,11 +1038,33 @@ OUT PHANDLE NewTokenHandle) { KPROCESSOR_MODE PreviousMode; + HANDLE hToken; PTOKEN Token; PTOKEN NewToken; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PreviousMode = KeGetPreviousMode(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(NewTokenHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + Status = ObReferenceObjectByHandle(ExistingTokenHandle, TOKEN_DUPLICATE, SepTokenObjectType, @@ -1108,17 +1100,24 @@ DesiredAccess, 0, NULL, - NewTokenHandle); + &hToken); ObDereferenceObject(NewToken); - if (!NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { - DPRINT1("Failed to create token handle (Status %lx)\n"); - return Status; + _SEH_TRY + { + *NewTokenHandle = hToken; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } - return STATUS_SUCCESS; + return Status; } @@ -1846,6 +1845,7 @@ OUT PHANDLE TokenHandle) { PETHREAD Thread; + HANDLE hToken; PTOKEN Token, NewToken, PrimaryToken; BOOLEAN CopyOnOpen, EffectiveOnly; SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; @@ -1853,7 +1853,30 @@ OBJECT_ATTRIBUTES ObjectAttributes; SECURITY_DESCRIPTOR SecurityDescriptor; PACL Dacl = NULL; - NTSTATUS Status; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(TokenHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } /* * At first open the thread token for information access and verify @@ -1861,7 +1884,7 @@ */ Status = ObReferenceObjectByHandle(ThreadHandle, THREAD_QUERY_INFORMATION, - PsThreadType, UserMode, (PVOID*)&Thread, + PsThreadType, PreviousMode, (PVOID*)&Thread, NULL); if (!NT_SUCCESS(Status)) { @@ -1896,7 +1919,7 @@ if (CopyOnOpen) { Status = ObReferenceObjectByHandle(ThreadHandle, THREAD_ALL_ACCESS, - PsThreadType, UserMode, + PsThreadType, PreviousMode, (PVOID*)&Thread, NULL); if (!NT_SUCCESS(Status)) { @@ -1945,7 +1968,7 @@ } Status = ObInsertObject(NewToken, NULL, DesiredAccess, 0, NULL, - TokenHandle); + &hToken); ObfDereferenceObject(NewToken); } @@ -1953,7 +1976,7 @@ { Status = ObOpenObjectByPointer(Token, HandleAttributes, NULL, DesiredAccess, SepTokenObjectType, - ExGetPreviousMode(), TokenHandle); + PreviousMode, &hToken); } ObfDereferenceObject(Token); @@ -1963,6 +1986,19 @@ PsRestoreImpersonation(PsGetCurrentThread(), &ImpersonationState); } + if(NT_SUCCESS(Status)) + { + _SEH_TRY + { + *TokenHandle = hToken; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + return Status; }

20 years, 3 months

[hbirr] 13540: - Silence a debug message.

by hbirr＠svn.reactos.com

- Silence a debug message. Modified: trunk/reactos/lib/kernel32/file/file.c _____ Modified: trunk/reactos/lib/kernel32/file/file.c --- trunk/reactos/lib/kernel32/file/file.c 2005-02-13 21:32:41 UTC (rev 13539) +++ trunk/reactos/lib/kernel32/file/file.c 2005-02-13 21:32:50 UTC (rev 13540) @@ -731,7 +731,7 @@ RtlFreeUnicodeString (&FileName); if (!NT_SUCCESS (Status)) { - DPRINT1 ("NtOpenFile() failed %x (Status %lx)\n", &ObjectAttributes, Status); + DPRINT ("NtOpenFile() failed %x (Status %lx)\n", &ObjectAttributes, Status); SetLastErrorByStatus (Status); return FALSE; }

20 years, 3 months

[ea] 13539: LPC message type LPC_CONNECTION_REFUSED does not exist in NT.

by ea＠svn.reactos.com

LPC message type LPC_CONNECTION_REFUSED does not exist in NT. Modified: trunk/reactos/include/ntos/zwtypes.h _____ Modified: trunk/reactos/include/ntos/zwtypes.h --- trunk/reactos/include/ntos/zwtypes.h 2005-02-13 21:31:34 UTC (rev 13538) +++ trunk/reactos/include/ntos/zwtypes.h 2005-02-13 21:32:41 UTC (rev 13539) @@ -1742,7 +1742,7 @@ LPC_DEBUG_EVENT = 0x8, LPC_ERROR_EVENT = 0x9, LPC_CONNECTION_REQUEST = 0xa, - LPC_CONNECTION_REFUSED = 0xb + LPC_CONNECTION_REFUSED = 0xb /* ReactOS only */ } LPC_TYPE, *PLPC_TYPE;

20 years, 3 months

[ea] 13538: NtAcceptConnectPort signature fixed.

by ea＠svn.reactos.com

NtAcceptConnectPort signature fixed. Modified: trunk/reactos/include/ntos/zw.h _____ Modified: trunk/reactos/include/ntos/zw.h --- trunk/reactos/include/ntos/zw.h 2005-02-13 21:18:37 UTC (rev 13537) +++ trunk/reactos/include/ntos/zw.h 2005-02-13 21:31:34 UTC (rev 13538) @@ -108,12 +108,12 @@ #ifndef __USE_NT_LPC__ NTSTATUS STDCALL -NtAcceptConnectPort (PHANDLE PortHandle, - HANDLE NamedPortHandle, - PLPC_MESSAGE ServerReply, - BOOLEAN AcceptIt, - PLPC_SECTION_WRITE WriteMap, - PLPC_SECTION_READ ReadMap); +NtAcceptConnectPort (OUT PHANDLE PortHandle, + IN PVOID Context, + IN PLPC_MESSAGE ServerReply, + IN BOOLEAN AcceptIt, + IN PLPC_SECTION_WRITE WriteMap, + IN PLPC_SECTION_READ ReadMap); #else NTSTATUS STDCALL NtAcceptConnectPort (PHANDLE PortHandle,

20 years, 3 months

[ea] 13537: Fix OriginalCopyright.

by ea＠svn.reactos.com

Fix OriginalCopyright. Modified: trunk/reactos/include/reactos/version.rc _____ Modified: trunk/reactos/include/reactos/version.rc --- trunk/reactos/include/reactos/version.rc 2005-02-13 21:17:34 UTC (rev 13536) +++ trunk/reactos/include/reactos/version.rc 2005-02-13 21:18:37 UTC (rev 13537) @@ -111,9 +111,9 @@ VALUE "FileDescription", REACTOS_STR_FILE_DESCRIPTION VALUE "FileVersion", REACTOS_STR_FILE_VERSION VALUE "InternalName", REACTOS_STR_INTERNAL_NAME -#ifdef REACTOS_ORIGINAL_COPYRIGHT +#ifdef REACTOS_STR_ORIGINAL_COPYRIGHT VALUE "OriginalCopyright", REACTOS_STR_ORIGINAL_COPYRIGHT -#endif /* REACTOS_ORIGINAL_COPYRIGHT */ +#endif /* REACTOS_STR_ORIGINAL_COPYRIGHT */ VALUE "LegalCopyright", REACTOS_STR_LEGAL_COPYRIGHT VALUE "OriginalFilename", REACTOS_STR_ORIGINAL_FILENAME VALUE "ProductName", REACTOS_STR_PRODUCT_NAME

20 years, 3 months

← Newer
1
...
22
23
24
25
26
27
28
...
42
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 February 2005