Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 19356: Vitaliy Margolen <wine-patch@kievinfo.com>
by gvg＠svn.reactos.com 20 Nov '05

20 Nov '05

Vitaliy Margolen <wine-patch(a)kievinfo.com> - Michael Jung <mjung(a)iss.tu-darmstadt.de> Set all capability flags supported by the shellfolder, disregarding the flag mask given to GetAttributesOf. Unit tests to demonstrate this behaviour. Michael Jung <mjung(a)iss.tu-darmstadt.de> - Added some comments to document unixfs. - Fixed crash in unixfs shellfolder handling with winamp. - Implemented UnixFolder's IPersistPropertyBag::Load method. - Initialize COM prior to displaying the SHBrowseForFolder dialog. - More robust code for querying ShellFolder attributes (some ShellFolders ignore the flag mask in GetAttributesOf). - Remove iconcache pre-initialization hack, it's not necessary any more. - Move target folder initialization to a dedicated function. - Use this function in BindToObject (should be faster). - Special handling for FolderShortcut objects in Initialize method. - Removed a todo_wine from a no longer failing unit test. - Replaced tabs with spaces. Robert Shearman <rob(a)codeweavers.com> - Convert SHELL32_BindToChild to Unicode and fix up the callers. Vincent Bén <vberon(a)mecano.gme.usherb.ca> - Unicodify systray.c. - Move functions a bit to get rid of a static declaration. Dmitry Timoshkov <dmitry(a)codeweavers.com> - Correctly handle flags parameter in SHAddToRecentDocs. Martin Fuchs <martin-fuchs(a)gmx.net> - Correct WINAPI position for MSVC portability. Mike McCormack <mike(a)codeweavers.com> - Partially implement and test the shelllink object's IShellLinkDataList::CopyDataBlock and GetFlags methods. - Use advapi32.CommandLineFromMsiDescriptor to get msi component paths. - Pass the correct verb. Add a space between extra parameters. Wait for ShellExecute to complete. - Handle MSI advertised shortcuts in the shelllink object. - Implement IContextMenu::QueryContextMenu and IContextMenu::InvokeCommand. - Add the IObjectWithSite interface. - Invoke shortcuts through IContextMenu, rather than trying to access them directly. - Fix a problem spotted by Dmitry and another one stopping correctly formatted lnk files from being generated. Modified: trunk/reactos/bootdata/hivecls.inf Modified: trunk/reactos/include/wine/shobjidl.h Modified: trunk/reactos/lib/shell32/Makefile.in Modified: trunk/reactos/lib/shell32/brsfolder.c Modified: trunk/reactos/lib/shell32/cpanelfolder.c Modified: trunk/reactos/lib/shell32/enumidlist.c Modified: trunk/reactos/lib/shell32/iconcache.c Modified: trunk/reactos/lib/shell32/pidl.c Modified: trunk/reactos/lib/shell32/shell.c Modified: trunk/reactos/lib/shell32/shell32_main.h 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/shellstring.c Modified: trunk/reactos/lib/shell32/shfldr.h 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/shlexec.c Modified: trunk/reactos/lib/shell32/shlfileop.c Modified: trunk/reactos/lib/shell32/shlfolder.c Modified: trunk/reactos/lib/shell32/shlmenu.c Modified: trunk/reactos/lib/shell32/systray.c Added: trunk/reactos/w32api/include/appmgmt.h Modified: trunk/reactos/w32api/include/shlobj.h _____ Modified: trunk/reactos/bootdata/hivecls.inf --- trunk/reactos/bootdata/hivecls.inf 2005-11-20 03:16:26 UTC (rev 19355) +++ trunk/reactos/bootdata/hivecls.inf 2005-11-20 08:41:46 UTC (rev 19356) @@ -21,6 +21,7 @@ HKCR,"lnkfile","IsShortcut",0x00000000,"yes" HKCR,"lnkfile\CLSID","",0x00000000,"{00021401-0000-0000-C000-00000000004 6}" HKCR,"lnkfile\shellex\IconHandler","",0x00000000,"{00021401-0000-0000-C0 00-000000000046}" +HKCR,lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-00000 0000046},,, ; shell command files (e.g. "Show Desktop" in quicklaunch bar) HKCR,".scf","",0x00000000,"SHCmdFile" _____ Modified: trunk/reactos/include/wine/shobjidl.h --- trunk/reactos/include/wine/shobjidl.h 2005-11-20 03:16:26 UTC (rev 19355) +++ trunk/reactos/include/wine/shobjidl.h 2005-11-20 08:41:46 UTC (rev 19356) @@ -43,4 +43,13 @@ /*** IShellExecuteHookW methods ***/ #define IShellExecuteHookW_Execute(p,a) (p)->lpVtbl->Execute(p,a) +#ifdef COBJMACROS +/*** IUnknown methods ***/ +#define IShellExtInit_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IShellExtInit_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IShellExtInit_Release(p) (p)->lpVtbl->Release(p) +/*** IShellExtInit methods ***/ +#define IShellExtInit_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c) +#endif + #endif /* __WINE_SHOBJIDL_H */ _____ Modified: trunk/reactos/lib/shell32/Makefile.in --- trunk/reactos/lib/shell32/Makefile.in 2005-11-20 03:16:26 UTC (rev 19355) +++ trunk/reactos/lib/shell32/Makefile.in 2005-11-20 08:41:46 UTC (rev 19356) @@ -6,7 +6,7 @@ MODULE = shell32.dll IMPORTLIB = libshell32.$(IMPLIBEXT) IMPORTS = shlwapi comctl32 user32 gdi32 advapi32 kernel32 ntdll -DELAYIMPORTS = ole32 +DELAYIMPORTS = ole32 oleaut32 EXTRALIBS = -luuid $(LIBUNICODE) C_SRCS = \ _____ Modified: trunk/reactos/lib/shell32/brsfolder.c --- trunk/reactos/lib/shell32/brsfolder.c 2005-11-20 03:16:26 UTC (rev 19355) +++ trunk/reactos/lib/shell32/brsfolder.c 2005-11-20 08:41:46 UTC (rev 19356) @@ -388,7 +388,7 @@ dwAttributes = SFGAO_FILESYSANCESTOR | SFGAO_FILESYSTEM; r = IShellFolder_GetAttributesOf(lptvid->lpsfParent, 1, (LPCITEMIDLIST*)&lptvid->lpi, &dwAttributes); - if (FAILED(r) || !dwAttributes) + if (FAILED(r) || !(dwAttributes & (SFGAO_FILESYSANCESTOR|SFGAO_FILESYSTEM))) bEnabled = FALSE; } if (lpBrowseInfo->ulFlags & BIF_RETURNONLYFSDIRS) @@ -396,8 +396,11 @@ dwAttributes = SFGAO_FOLDER | SFGAO_FILESYSTEM; r = IShellFolder_GetAttributesOf(lptvid->lpsfParent, 1, (LPCITEMIDLIST*)&lptvid->lpi, &dwAttributes); - if (FAILED(r) || (dwAttributes != (SFGAO_FOLDER | SFGAO_FILESYSTEM))) + if (FAILED(r) || + ((dwAttributes & (SFGAO_FOLDER|SFGAO_FILESYSTEM)) != (SFGAO_FOLDER|SFGAO_FILESYSTEM))) + { bEnabled = FALSE; + } } SendMessageW(info->hWnd, BFFM_ENABLEOK, 0, (LPARAM)bEnabled); } @@ -662,21 +665,25 @@ /*********************************************************************** ** * SHBrowseForFolderW [SHELL32.@] * - * NOTES: + * NOTES * crashes when passed a null pointer */ LPITEMIDLIST WINAPI SHBrowseForFolderW (LPBROWSEINFOW lpbi) { browse_info info; DWORD r; + HRESULT hr; info.hWnd = 0; info.pidlRet = NULL; info.lpBrowseInfo = lpbi; info.hwndTreeView = NULL; + hr = CoInitialize(NULL); r = DialogBoxParamW( shell32_hInstance, swBrowseTemplateName, lpbi->hwndOwner, BrsFolderDlgProc, (LPARAM)&info ); + if (SUCCEEDED(hr)) + CoUninitialize(); if (!r) return NULL; _____ Modified: trunk/reactos/lib/shell32/cpanelfolder.c --- trunk/reactos/lib/shell32/cpanelfolder.c 2005-11-20 03:16:26 UTC (rev 19355) +++ trunk/reactos/lib/shell32/cpanelfolder.c 2005-11-20 08:41:46 UTC (rev 19356) @@ -410,7 +410,7 @@ WIN32_FIND_DATAA wfd; HANDLE hFile; - TRACE("(%p)->(flags=0x%08lx) \n",iface,dwFlags); + TRACE("(%p)->(flags=0x%08lx)\n", iface, dwFlags); /* enumerate control panel folders folders */ if (dwFlags & SHCONTF_FOLDERS) _____ Modified: trunk/reactos/lib/shell32/enumidlist.c --- trunk/reactos/lib/shell32/enumidlist.c 2005-11-20 03:16:26 UTC (rev 19355) +++ trunk/reactos/lib/shell32/enumidlist.c 2005-11-20 08:41:46 UTC (rev 19356) @@ -116,7 +116,7 @@ static const WCHAR dot[] = { '.',0 }; static const WCHAR dotdot[] = { '.','.',0 }; - TRACE("(%p)->(path=%s flags=0x%08lx) \n",list,debugstr_w(lpszPath),dwFlags); + TRACE("(%p)->(path=%s flags=0x%08lx)\n", list, debugstr_w(lpszPath), dwFlags); if(!lpszPath || !lpszPath[0]) return FALSE; _____ Modified: trunk/reactos/lib/shell32/iconcache.c --- trunk/reactos/lib/shell32/iconcache.c 2005-11-20 03:16:26 UTC (rev 19355) +++ trunk/reactos/lib/shell32/iconcache.c 2005-11-20 08:41:46 UTC (rev 19356) @@ -365,7 +365,7 @@ if ( INVALID_INDEX == index ) { - ret = SIC_LoadIcon (sSourceFile, dwSourceIndex, dwFlags); + ret = SIC_LoadIcon (sSourceFile, dwSourceIndex, dwFlags); } else { @@ -378,15 +378,10 @@ } /*********************************************************************** ****** * SIC_Initialize [internal] - * - * NOTES - * hack to load the resources from the shell32.dll under a different dll name - * will be removed when the resource-compiler is ready */ BOOL SIC_Initialize(void) { HICON hSm, hLg; - UINT index; int cx_small, cy_small; int cx_large, cy_large; @@ -407,29 +402,27 @@ return(FALSE); } - ShellSmallIconList = ImageList_Create(16,16,ILC_COLOR32|ILC_MASK,0,0x20); - ShellBigIconList = ImageList_Create(32,32,ILC_COLOR32|ILC_MASK,0,0x20); + ShellSmallIconList = ImageList_Create(cx_small,cy_small,ILC_COLOR32|ILC_MASK,0,0x20); + ShellBigIconList = ImageList_Create(cx_large,cy_large,ILC_COLOR32|ILC_MASK,0,0x20); - ImageList_SetBkColor(ShellSmallIconList, CLR_NONE); - ImageList_SetBkColor(ShellBigIconList, CLR_NONE); + ImageList_SetBkColor(ShellSmallIconList, CLR_NONE); + ImageList_SetBkColor(ShellBigIconList, CLR_NONE); - /* - * Wine will extract and cache all shell32 icons here. That's because - * they are unable to extract resources from their built-in DLLs. - * We don't need that, but we still want to make sure that the very - * first icon in the image lists is icon 1 from shell32.dll, since - * that's the default icon. - */ - index = 1; - hSm = (HICON)LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(index), IMAGE_ICON, cx_small, cy_small, LR_SHARED); - hLg = (HICON)LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(index), IMAGE_ICON, cx_large, cy_large, LR_SHARED); + /* Load the document icon, which is used as the default if an icon isn't found. */ + hSm = (HICON)LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT), + IMAGE_ICON, cx_small, cy_small, LR_SHARED); + hLg = (HICON)LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT), + IMAGE_ICON, cx_large, cy_large, LR_SHARED); - if(hSm) - { - SIC_IconAppend (swShell32Name, index - 1, hSm, hLg, 0); - SIC_IconAppend (swShell32Name, -index, hSm, hLg, 0); - } + if (!hSm || !hLg) + { + FIXME("Failed to load IDI_SHELL_DOCUMENT icon!\n"); + return FALSE; + } + SIC_IconAppend (swShell32Name, IDI_SHELL_DOCUMENT-1, hSm, hLg, 0); + SIC_IconAppend (swShell32Name, -IDI_SHELL_DOCUMENT, hSm, hLg, 0); + TRACE("hIconSmall=%p hIconBig=%p\n",ShellSmallIconList, ShellBigIconList); return TRUE; _____ Modified: trunk/reactos/lib/shell32/pidl.c --- trunk/reactos/lib/shell32/pidl.c 2005-11-20 03:16:26 UTC (rev 19355) +++ trunk/reactos/lib/shell32/pidl.c 2005-11-20 08:41:46 UTC (rev 19356) @@ -254,7 +254,7 @@ DWORD len; LPITEMIDLIST pidlNew = NULL; - TRACE("pidl=%p \n",pidl); + TRACE("pidl=%p\n", pidl); pdump(pidl); if (pidl) @@ -885,6 +885,9 @@ * PARAMS * pidl [I] * + * RETURNS + * Nothing + * * NOTES * exported by ordinal */ @@ -903,6 +906,9 @@ * PARAMS * pidl [I] * + * RETURNS + * Nothing + * * NOTES * exported by ordinal. */ @@ -941,6 +947,8 @@ /*********************************************************************** ** * ILCreateFromPathW [SHELL32.190] + * + * See ILCreateFromPathA. */ LPITEMIDLIST WINAPI ILCreateFromPathW (LPCWSTR path) { @@ -1238,6 +1246,8 @@ /*********************************************************************** ** * SHGetPathFromIDListW [SHELL32.@] + * + * See SHGetPathFromIDListA. */ BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST pidl, LPWSTR pszPath) { _____ Modified: trunk/reactos/lib/shell32/shell.c --- trunk/reactos/lib/shell32/shell.c 2005-11-20 03:16:26 UTC (rev 19355) +++ trunk/reactos/lib/shell32/shell.c 2005-11-20 08:41:46 UTC (rev 19356) @@ -335,12 +335,13 @@ * from "DOS" environment. If it is not found the %KEYWORD% is left * intact. If the buffer is too small, str is not modified. * - * str [I] '\0' terminated string with %keyword%. + * PARAMS + * str [I] '\0' terminated string with %keyword%. * [O] '\0' terminated string with %keyword% substituted. - * length [I] size of str. + * length [I] size of str. * - * Return - * str length in the LOWORD and 1 in HIWORD if subst was successful. + * RETURNS + * str length in the LOWORD and 1 in HIWORD if subst was successful. */ DWORD WINAPI DoEnvironmentSubst16(LPSTR str,WORD length) { @@ -625,7 +626,7 @@ seiW.dwHotKey = 0; seiW.hProcess = hProcess; - SHELL_execute( &seiW, SHELL_Execute16, FALSE ); + SHELL_execute( &seiW, SHELL_Execute16 ); if (wVerb) SHFree(wVerb); if (wFile) SHFree(wFile); _____ Modified: trunk/reactos/lib/shell32/shell32_main.h --- trunk/reactos/lib/shell32/shell32_main.h 2005-11-20 03:16:26 UTC (rev 19355) +++ trunk/reactos/lib/shell32/shell32_main.h 2005-11-20 08:41:46 UTC (rev 19356) @@ -213,7 +213,7 @@ typedef UINT_PTR (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, LPSHELLEXECUTEINFOW sei, LPSHELLEXECUTEINFOW sei_out); -BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc, BOOL unicode); +BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc); UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation, LPWSTR lpResult, int resultLen, LPWSTR key, WCHAR **env, LPITEMIDLIST pidl, LPCWSTR args); _____ Modified: trunk/reactos/lib/shell32/shelllink.c --- trunk/reactos/lib/shell32/shelllink.c 2005-11-20 03:16:26 UTC (rev 19355) +++ trunk/reactos/lib/shell32/shelllink.c 2005-11-20 08:41:46 UTC (rev 19356) @@ -51,6 +51,8 @@ #include "shell32_main.h" #include "shlguid.h" #include "shlwapi.h" +#include "msi.h" +#include "appmgmt.h" #include "initguid.h" @@ -120,6 +122,7 @@ static const IShellLinkDataListVtbl dlvt; static const IShellExtInitVtbl eivt; static const IContextMenuVtbl cmvt; +static const IObjectWithSiteVtbl owsvt; /* IShellLink Implementation */ @@ -132,6 +135,7 @@ const IShellLinkDataListVtbl *lpvtblShellLinkDataList; const IShellExtInitVtbl *lpvtblShellExtInit; const IContextMenuVtbl *lpvtblContextMenu; + const IObjectWithSiteVtbl *lpvtblObjectWithSite; LONG ref; @@ -154,7 +158,9 @@ LPWSTR sComponent; volume_info volume; - BOOL bDirty; + BOOL bDirty; + INT iIdOpen; /* id of the "Open" entry in the context menu */ + IUnknown *site; } IShellLinkImpl; static inline IShellLinkImpl *impl_from_IShellLinkW( IShellLinkW *iface ) @@ -187,6 +193,11 @@ return (IShellLinkImpl *)((char*)iface - FIELD_OFFSET(IShellLinkImpl, lpvtblContextMenu)); } +static inline IShellLinkImpl *impl_from_IObjectWithSite( IObjectWithSite *iface ) +{ + return (IShellLinkImpl *)((char*)iface - FIELD_OFFSET(IShellLinkImpl, lpvtblObjectWithSite)); +} + static HRESULT ShellLink_UpdatePath(LPWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir, LPWSTR* psPath); /* strdup on the process heap */ @@ -200,6 +211,16 @@ return p; } +inline static LPWSTR strdupW( LPCWSTR src ) +{ + LPWSTR dest; + if (!src) return NULL; + dest = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(src)+1)*sizeof(WCHAR) ); + if (dest) + lstrcpyW(dest, src); + return dest; +} + /*********************************************************************** *** * ShellLink::QueryInterface implementation */ @@ -237,6 +258,10 @@ { *ppvObj = &(This->lpvtblContextMenu); } + else if(IsEqualIID(riid, &IID_IObjectWithSite)) + { + *ppvObj = &(This->lpvtblObjectWithSite); + } if(*ppvObj) { @@ -280,6 +305,9 @@ HeapFree(GetProcessHeap(), 0, This->sDescription); HeapFree(GetProcessHeap(),0,This->sPath); + if (This->site) + IUnknown_Release( This->site ); + if (This->pPidl) ILFree(This->pPidl); @@ -986,20 +1014,29 @@ return IStream_Write( stm, loc, total_size, &count ); } +static EXP_DARWIN_LINK* shelllink_build_darwinid( LPCWSTR string, DWORD magic ) +{ + EXP_DARWIN_LINK *buffer; + + buffer = LocalAlloc( LMEM_ZEROINIT, sizeof *buffer ); + buffer->dbh.cbSize = sizeof *buffer; + buffer->dbh.dwSignature = magic; + lstrcpynW( buffer->szwDarwinID, string, MAX_PATH ); + WideCharToMultiByte(CP_ACP, 0, string, -1, buffer->szDarwinID, MAX_PATH, NULL, NULL ); + + return buffer; +} + static HRESULT Stream_WriteAdvertiseInfo( IStream* stm, LPCWSTR string, DWORD magic ) { + EXP_DARWIN_LINK *buffer; ULONG count; - EXP_DARWIN_LINK buffer; TRACE("%p\n",stm); - memset( &buffer, 0, sizeof buffer ); - buffer.dbh.cbSize = sizeof buffer; - buffer.dbh.dwSignature = magic; - lstrcpynW( buffer.szwDarwinID, string, MAX_PATH ); - WideCharToMultiByte(CP_ACP, 0, string, -1, buffer.szDarwinID, MAX_PATH, NULL, NULL ); + buffer = shelllink_build_darwinid( string, magic ); - return IStream_Write( stm, &buffer, buffer.dbh.cbSize, &count ); + return IStream_Write( stm, buffer, buffer->dbh.cbSize, &count ); } /*********************************************************************** * @@ -1075,7 +1112,7 @@ return r; } - TRACE("Writing pidl \n"); + TRACE("Writing pidl\n"); /* write the PIDL to the shortcut */ if( This->pPidl ) @@ -1172,8 +1209,11 @@ sl->lpvtblShellLinkDataList = &dlvt; sl->lpvtblShellExtInit = &eivt; sl->lpvtblContextMenu = &cmvt; + sl->lpvtblObjectWithSite = &owsvt; sl->iShowCmd = SW_SHOWNORMAL; sl->bDirty = FALSE; + sl->iIdOpen = -1; + sl->site = NULL; TRACE("(%p)->()\n",sl); @@ -2215,8 +2255,32 @@ static HRESULT WINAPI ShellLink_CopyDataBlock( IShellLinkDataList* iface, DWORD dwSig, void** ppDataBlock ) { - FIXME("\n"); - return E_NOTIMPL; + IShellLinkImpl *This = impl_from_IShellLinkDataList(iface); + LPVOID block = NULL; + HRESULT r = E_FAIL; + + TRACE("%p %08lx %p\n", iface, dwSig, ppDataBlock ); + + switch (dwSig) + { + case EXP_DARWIN_ID_SIG: + if (!This->sComponent) + break; + block = shelllink_build_darwinid( This->sComponent, dwSig ); + r = S_OK; + break; + case EXP_SZ_LINK_SIG: + case NT_CONSOLE_PROPS_SIG: + case NT_FE_CONSOLE_PROPS_SIG: + case EXP_SPECIAL_FOLDER_SIG: + case EXP_SZ_ICON_SIG: + FIXME("valid but unhandled datablock %08lx\n", dwSig); + break; + default: + ERR("unknown datablock %08lx\n", dwSig); + } + *ppDataBlock = block; + return r; } static HRESULT WINAPI @@ -2229,8 +2293,26 @@ static HRESULT WINAPI ShellLink_GetFlags( IShellLinkDataList* iface, DWORD* pdwFlags ) { - FIXME("\n"); - return E_NOTIMPL; + IShellLinkImpl *This = impl_from_IShellLinkDataList(iface); + DWORD flags = 0; + + FIXME("%p %p\n", This, pdwFlags ); + + /* FIXME: add more */ + if (This->sArgs) + flags |= SLDF_HAS_ARGS; + if (This->sComponent) + flags |= SLDF_HAS_DARWINID; + if (This->sIcoPath) + flags |= SLDF_HAS_ICONLOCATION; + if (This->sProduct) + flags |= SLDF_HAS_LOGO3ID; + if (This->pPidl) + flags |= SLDF_HAS_ID_LIST; + + *pdwFlags = flags; + + return S_OK; } static HRESULT WINAPI @@ -2358,21 +2440,139 @@ UINT idCmdFirst, UINT idCmdLast, UINT uFlags ) { IShellLinkImpl *This = impl_from_IContextMenu(iface); + static const WCHAR szOpen[] = { 'O','p','e','n',0 }; + MENUITEMINFOW mii; + int id = 1; - FIXME("%p %p %u %u %u %u\n", This, + TRACE("%p %p %u %u %u %u\n", This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags ); - return E_NOTIMPL; + if ( !hmenu ) + return E_INVALIDARG; + + memset( &mii, 0, sizeof mii ); + mii.cbSize = sizeof mii; + mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE; + mii.dwTypeData = (LPWSTR)szOpen; + mii.cch = strlenW( mii.dwTypeData ); + mii.wID = idCmdFirst + id++; + mii.fState = MFS_DEFAULT | MFS_ENABLED; + mii.fType = MFT_STRING; + if (!InsertMenuItemW( hmenu, indexMenu, TRUE, &mii )) + return E_FAIL; + This->iIdOpen = 0; + + return MAKE_HRESULT( SEVERITY_SUCCESS, 0, id ); } +static LPWSTR +shelllink_get_msi_component_path( LPWSTR component ) +{ + LPWSTR path = NULL; + DWORD r, sz = 0; + + r = CommandLineFromMsiDescriptor( component, NULL, &sz ); + if (r != ERROR_SUCCESS) + return path; + + sz++; + path = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) ); + r = CommandLineFromMsiDescriptor( component, path, &sz ); + if (r != ERROR_SUCCESS) + { + HeapFree( GetProcessHeap(), 0, path ); + path = NULL; + } + + TRACE("returning %s\n", debugstr_w( path ) ); + + return path; +} + static HRESULT WINAPI ShellLink_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici ) { IShellLinkImpl *This = impl_from_IContextMenu(iface); + static const WCHAR szOpen[] = { 'O','p','e','n',0 }; + SHELLEXECUTEINFOW sei; + HWND hwnd = NULL; /* FIXME: get using interface set from IObjectWithSite */ + LPWSTR args = NULL; + LPWSTR path = NULL; + HRESULT r; - FIXME("%p %p\n", This, lpici ); + TRACE("%p %p\n", This, lpici ); - return E_NOTIMPL; + if ( lpici->cbSize < sizeof (CMINVOKECOMMANDINFO) ) + return E_INVALIDARG; + + if ( lpici->lpVerb != MAKEINTRESOURCEA(This->iIdOpen) ) + { + ERR("Unknown id %d != %d\n", (INT)lpici->lpVerb, This->iIdOpen ); + return E_INVALIDARG; + } + + r = IShellLinkW_Resolve( (IShellLinkW*)&(This->lpvtblw), hwnd, 0 ); + if ( FAILED( r ) ) + return r; + + if ( This->sComponent ) + { + path = shelllink_get_msi_component_path( This->sComponent ); + if (!path) + return E_FAIL; + } + else + path = strdupW( This->sPath ); + + if ( lpici->cbSize == sizeof (CMINVOKECOMMANDINFOEX) && + ( lpici->fMask & CMIC_MASK_UNICODE ) ) + { + LPCMINVOKECOMMANDINFOEX iciex = (LPCMINVOKECOMMANDINFOEX) lpici; + DWORD len = 2; + + if ( This->sArgs ) + len += lstrlenW( This->sArgs ); + if ( iciex->lpParametersW ) + len += lstrlenW( iciex->lpParametersW ); + + args = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + args[0] = 0; + if ( This->sArgs ) + lstrcatW( args, This->sArgs ); + if ( iciex->lpParametersW ) + { + static const WCHAR space[] = { ' ', 0 }; + lstrcatW( args, space ); + lstrcatW( args, iciex->lpParametersW ); + } + } + + memset( &sei, 0, sizeof sei ); + sei.cbSize = sizeof sei; + sei.fMask = SEE_MASK_UNICODE | SEE_MASK_NOCLOSEPROCESS; + sei.lpFile = path; + sei.nShow = This->iShowCmd; + sei.lpIDList = This->pPidl; + sei.lpDirectory = This->sWorkDir; + sei.lpParameters = args; + sei.lpVerb = szOpen; + + if( ShellExecuteExW( &sei ) ) + { + if ( sei.hProcess ) + { + WaitForSingleObject( sei.hProcess, 10000 ); + CloseHandle( sei.hProcess ); + } + r = S_OK; + } + else + r = E_FAIL; + + HeapFree( GetProcessHeap(), 0, args ); + HeapFree( GetProcessHeap(), 0, path ); + + return r; } static HRESULT WINAPI @@ -2396,3 +2596,59 @@ ShellLink_InvokeCommand, ShellLink_GetCommandString }; + +static HRESULT WINAPI +ShellLink_ObjectWithSite_QueryInterface( IObjectWithSite* iface, REFIID riid, void** ppvObject ) +{ + IShellLinkImpl *This = impl_from_IObjectWithSite(iface); + return ShellLink_QueryInterface( This, riid, ppvObject ); +} + +static ULONG WINAPI +ShellLink_ObjectWithSite_AddRef( IObjectWithSite* iface ) +{ + IShellLinkImpl *This = impl_from_IObjectWithSite(iface); + return ShellLink_AddRef( This ); +} + +static ULONG WINAPI +ShellLink_ObjectWithSite_Release( IObjectWithSite* iface ) +{ + IShellLinkImpl *This = impl_from_IObjectWithSite(iface); + return ShellLink_Release( This ); +} + +static HRESULT WINAPI +ShellLink_GetSite( IObjectWithSite *iface, REFIID iid, void ** ppvSite ) +{ + IShellLinkImpl *This = impl_from_IObjectWithSite(iface); + + TRACE("%p %s %p\n", This, debugstr_guid( iid ), ppvSite ); + + if ( !This->site ) + return E_FAIL; + return IUnknown_QueryInterface( This->site, iid, ppvSite ); +} + +static HRESULT WINAPI +ShellLink_SetSite( IObjectWithSite *iface, IUnknown *punk ) +{ + IShellLinkImpl *This = impl_from_IObjectWithSite(iface); + + TRACE("%p %p\n", iface, punk); + + if ( punk ) + IUnknown_AddRef( punk ); + This->site = punk; + + return S_OK; +} + +static const IObjectWithSiteVtbl owsvt = +{ + ShellLink_ObjectWithSite_QueryInterface, + ShellLink_ObjectWithSite_AddRef, + ShellLink_ObjectWithSite_Release, + ShellLink_SetSite, + ShellLink_GetSite, +}; _____ Modified: trunk/reactos/lib/shell32/shellole.c --- trunk/reactos/lib/shell32/shellole.c 2005-11-20 03:16:26 UTC (rev 19355) +++ trunk/reactos/lib/shell32/shellole.c 2005-11-20 08:41:46 UTC (rev 19356) @@ -689,8 +689,8 @@ } /*********************************************************************** ** + * DragQueryFileA [SHELL32.@] * DragQueryFile [SHELL32.@] - * DragQueryFileA [SHELL32.@] */ UINT WINAPI DragQueryFileA( HDROP hDrop, _____ Modified: trunk/reactos/lib/shell32/shellord.c --- trunk/reactos/lib/shell32/shellord.c 2005-11-20 03:16:26 UTC (rev 19355) +++ trunk/reactos/lib/shell32/shellord.c 2005-11-20 08:41:46 UTC (rev 19356) @@ -622,12 +622,17 @@ /*********************************************************************** ** * SHAddToRecentDocs [SHELL32.@] * + * Modify (add/clear) Shell's list of recently used documents. + * * PARAMETERS - * uFlags [IN] SHARD_PATH or SHARD_PIDL + * uFlags [IN] SHARD_PATHA, SHARD_PATHW or SHARD_PIDL * pv [IN] string or pidl, NULL clears the list * * NOTES * exported by name + * + * FIXME + * convert to unicode */ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) { @@ -652,6 +657,8 @@ INT ret; DWORD data[64], datalen, type; + TRACE("%04x %p\n", uFlags, pv); + /*FIXME: Document: * RecentDocs MRU data structure seems to be: * +0h document file name w/ terminating 0h @@ -732,7 +739,7 @@ * DeleteFileA(old_lnk_name); * } */ - FIXME("should delete all files in %s\\ \n", link_dir); + FIXME("should delete all files in %s\\\n", link_dir); /* clear MRU list */ @@ -757,15 +764,28 @@ /* Get the pure document name from the input */ - if (uFlags & SHARD_PIDL) { + switch (uFlags) + { + case SHARD_PIDL: SHGetPathFromIDListA((LPCITEMIDLIST) pv, doc_name); + break; + + case SHARD_PATHA: + lstrcpynA(doc_name, (LPCSTR)pv, MAX_PATH); + break; + + case SHARD_PATHW: + WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)pv, -1, doc_name, MAX_PATH, NULL, NULL); + break; + + default: + FIXME("Unsupported flags: %u\n", uFlags); + return; } - else { - lstrcpyA(doc_name, (LPCSTR) pv); - } - TRACE("full document name %s\n", doc_name); + + TRACE("full document name %s\n", debugstr_a(doc_name)); PathStripPathA(doc_name); - TRACE("stripped document name %s\n", doc_name); + TRACE("stripped document name %s\n", debugstr_a(doc_name)); /* *** JOB 1: Update registry for ...\Explorer\RecentDocs list *** */ @@ -902,7 +922,7 @@ } /* Set the document path or pidl */ - if (uFlags & SHARD_PIDL) { + if (uFlags == SHARD_PIDL) { hres = IShellLinkA_SetIDList(psl, (LPCITEMIDLIST) pv); } else { hres = IShellLinkA_SetPath(psl, (LPCSTR) pv); @@ -955,6 +975,12 @@ /*********************************************************************** ** * SHCreateShellFolderViewEx [SHELL32.174] * + * Create a new instance of the default Shell folder view object. + * + * RETURNS + * Success: S_OK + * Failure: error value + * * NOTES * see IShellFolder::CreateViewObject */ @@ -1125,7 +1151,7 @@ HKEY hkey = 0; DWORD type, r; - TRACE("%p %d \n",cs,length); + TRACE("%p %d\n", cs, length); if( (cs == NULL) || (length < (int)sizeof(*cs)) ) return FALSE; @@ -1319,10 +1345,11 @@ /*********************************************************************** * * @ [SHELL32.654] * - * NOTES: first parameter seems to be a pointer (same as passed to WriteCabinetState) - * second one could be a size (0x0c). The size is the same as the structure saved to - * HCU\Software\Microsoft\Windows\CurrentVersion\Explorer\CabinetState - * I'm (js) guessing: this one is just ReadCabinetState ;-) + * NOTES + * first parameter seems to be a pointer (same as passed to WriteCabinetState) + * second one could be a size (0x0c). The size is the same as the structure saved to + * HCU\Software\Microsoft\Windows\CurrentVersion\Explorer\CabinetState + * I'm (js) guessing: this one is just ReadCabinetState ;-) */ HRESULT WINAPI shell32_654 (CABINETSTATE *cs, int length) { @@ -1357,11 +1384,12 @@ * from environment. If it is not found the %KEYWORD% is left * intact. If the buffer is too small, str is not modified. * - * pszString [I] '\0' terminated string with %keyword%. + * PARAMS + * pszString [I] '\0' terminated string with %keyword%. * [O] '\0' terminated string with %keyword% substituted. - * cchString [I] size of str. + * cchString [I] size of str. * - * Return + * RETURNS * cchString length in the HIWORD; * TRUE in LOWORD if subst was successful and FALSE in other case */ @@ -1388,6 +1416,7 @@ /*********************************************************************** * * DoEnvironmentSubstW [SHELL32.@] * + * See DoEnvironmentSubstA. */ DWORD WINAPI DoEnvironmentSubstW(LPWSTR pszString, UINT cchString) { @@ -1398,6 +1427,7 @@ /*********************************************************************** * * DoEnvironmentSubst [SHELL32.53] * + * See DoEnvironmentSubstA. */ DWORD WINAPI DoEnvironmentSubstAW(LPVOID x, UINT y) { @@ -1563,6 +1593,9 @@ * uFlags [I] Flags determining the icon attributes. See notes. * iImageIndex [I] Index of the icon in the system image list. * + * RETURNS + * Nothing + * * NOTES * uFlags can be one or more of the following flags: * GIL_NOTFILENAME - pszHashItem is not a file name. @@ -1573,6 +1606,11 @@ FIXME("%s, %d, 0x%x, %d - stub\n", debugstr_w(pszHashItem), iIndex, uFlags, iImageIndex); } +/********************************************************************** *** + * SHUpdateImageA (SHELL32.191) + * + * See SHUpdateImageW. + */ VOID WINAPI SHUpdateImageA(LPCSTR pszHashItem, INT iIndex, UINT uFlags, INT iImageIndex) { FIXME("%s, %d, 0x%x, %d - stub\n", debugstr_a(pszHashItem), iIndex, uFlags, iImageIndex); _____ Modified: trunk/reactos/lib/shell32/shellpath.c --- trunk/reactos/lib/shell32/shellpath.c 2005-11-20 03:16:26 UTC (rev 19355) +++ trunk/reactos/lib/shell32/shellpath.c 2005-11-20 08:41:46 UTC (rev 19356) @@ -1562,8 +1562,14 @@ /*********************************************************************** ** * SHGetFolderPathW [SHELL32.@] * + * Convert nFolder to path. + * + * RETURNS + * Success: S_OK + * Failure: standard HRESULT error codes. + * * NOTES - * Converts nFolder to path. Most values can be overridden in either + * Most values can be overridden in either * HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders * or in the same location in HKLM. * The registry usage is explained by the following tech note: @@ -1577,13 +1583,13 @@ * http://www.microsoft.com/windows2000/techinfo/reskit/en-us/default.asp?u rl=/windows2000/techinfo/reskit/en-us/regentry/36276.asp * the HKCU paths take precedence over the HKLM paths. * - **********************************************************************/ + */ HRESULT WINAPI SHGetFolderPathW( - HWND hwndOwner, - int nFolder, - HANDLE hToken, - DWORD dwFlags, - LPWSTR pszPath) + HWND hwndOwner, /* [I] owner window */ + int nFolder, /* [I] CSIDL identifing the folder */ + HANDLE hToken, /* [I] access token */ + DWORD dwFlags, /* [I] which path to return */ + LPWSTR pszPath) /* [O] converted path */ { HRESULT hr; WCHAR szBuildPath[MAX_PATH], szTemp[MAX_PATH]; @@ -1689,6 +1695,8 @@ /*********************************************************************** ** * SHGetFolderPathA [SHELL32.@] + * + * See SHGetFolderPathW. */ HRESULT WINAPI SHGetFolderPathA( HWND hwndOwner, @@ -1928,11 +1936,7 @@ /*********************************************************************** ** * SHGetFolderLocation [SHELL32.@] * - * NOTES * Gets the folder locations from the registry and creates a pidl. - * Creates missing reg keys and directories. - * Mostly forwards to SHGetFolderPathW, but a few values of nFolder return - * virtual folders that are handled here. * * PARAMS * hwndOwner [I] @@ -1942,7 +1946,14 @@ * dwReserved [I] must be zero * ppidl [O] PIDL of a special folder * + * RETURNS + * Success: S_OK + * Failure: Standard OLE-defined error result, S_FALSE or E_INVALIDARG + * * NOTES + * Creates missing reg keys and directories. + * Mostly forwards to SHGetFolderPathW, but a few values of nFolder return + * virtual folders that are handled here. */ HRESULT WINAPI SHGetFolderLocation( HWND hwndOwner, _____ Modified: trunk/reactos/lib/shell32/shellstring.c --- trunk/reactos/lib/shell32/shellstring.c 2005-11-20 03:16:26 UTC (rev 19355) +++ trunk/reactos/lib/shell32/shellstring.c 2005-11-20 08:41:46 UTC (rev 19356) @@ -260,7 +260,7 @@ /*********************************************************************** ** * CheckEscapesW [SHELL32.@] * - * see CheckEscapesA + * See CheckEscapesA. */ DWORD WINAPI CheckEscapesW( LPWSTR string, _____ Modified: trunk/reactos/lib/shell32/shfldr.h --- trunk/reactos/lib/shell32/shfldr.h 2005-11-20 03:16:26 UTC (rev 19355) +++ trunk/reactos/lib/shell32/shfldr.h 2005-11-20 08:41:46 UTC (rev 19356) @@ -43,7 +43,7 @@ DWORD dwOutLen); HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, - LPCSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut); + LPCWSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut); [truncated at 1000 lines; 1222 more skipped]

1 0

[ion] 19355: Make the address space mutex unsafe, because sometimes it is acquired at > APC_LEVEL. This makes bugchecks...'work'...again (how ironic).
by ion＠svn.reactos.com 20 Nov '05

20 Nov '05

Make the address space mutex unsafe, because sometimes it is acquired at > APC_LEVEL. This makes bugchecks...'work'...again (how ironic). Modified: trunk/reactos/ntoskrnl/mm/aspace.c _____ Modified: trunk/reactos/ntoskrnl/mm/aspace.c --- trunk/reactos/ntoskrnl/mm/aspace.c 2005-11-19 23:07:32 UTC (rev 19354) +++ trunk/reactos/ntoskrnl/mm/aspace.c 2005-11-20 03:16:26 UTC (rev 19355) @@ -30,7 +30,7 @@ { return; } - ExAcquireFastMutex(&AddressSpace->Lock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&AddressSpace->Lock); } VOID @@ -44,7 +44,7 @@ { return; } - ExReleaseFastMutex(&AddressSpace->Lock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&AddressSpace->Lock); } VOID

1 0

[ion] 19354: Fix hal build
by ion＠svn.reactos.com 19 Nov '05

19 Nov '05

Fix hal build Modified: trunk/reactos/hal/hal/hal.c _____ Modified: trunk/reactos/hal/hal/hal.c --- trunk/reactos/hal/hal/hal.c 2005-11-19 22:32:09 UTC (rev 19353) +++ trunk/reactos/hal/hal/hal.c 2005-11-19 23:07:32 UTC (rev 19354) @@ -18,6 +18,10 @@ #define NDEBUG #include <debug.h> +#undef ExAcquireFastMutex +#undef ExReleaseFastMutex +#undef ExTryToAcquireFastMutex + /* DATA **********************************************************************/ ULONG KdComPortInUse = 0;

1 0

[ion] 19353: - Deprecated
by ion＠svn.reactos.com 19 Nov '05

19 Nov '05

- Deprecated Deleted: trunk/reactos/ntoskrnl/cc/ccmutex.c _____ Deleted: trunk/reactos/ntoskrnl/cc/ccmutex.c --- trunk/reactos/ntoskrnl/cc/ccmutex.c 2005-11-19 22:13:35 UTC (rev 19352) +++ trunk/reactos/ntoskrnl/cc/ccmutex.c 2005-11-19 22:32:09 UTC (rev 19353) @@ -1,89 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/cc/ccmutex.c - * PURPOSE: Implements the Broken Mutex Implementation for the broken Cc - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#include <internal/debug.h> - -/* FUNCTIONS *****************************************************************/ - -VOID -FASTCALL -CcAcquireBrokenMutexUnsafe(PFAST_MUTEX FastMutex) -{ - ASSERT(KeGetCurrentThread() == NULL || - FastMutex->Owner != KeGetCurrentThread()); - ASSERT(KeGetCurrentIrql() == APC_LEVEL || - KeGetCurrentThread() == NULL || - KeGetCurrentThread()->KernelApcDisable); - - InterlockedIncrementUL(&FastMutex->Contention); - while (InterlockedExchange(&FastMutex->Count, 0) == 0) - { - KeWaitForSingleObject(&FastMutex->Gate, - Executive, - KernelMode, - FALSE, - NULL); - } - InterlockedDecrementUL(&FastMutex->Contention); - FastMutex->Owner = KeGetCurrentThread(); -} - -VOID -FASTCALL -CcReleaseBrokenMutexUnsafe(PFAST_MUTEX FastMutex) -{ - ASSERT(KeGetCurrentThread() == NULL || - FastMutex->Owner == KeGetCurrentThread()); - ASSERT(KeGetCurrentIrql() == APC_LEVEL || - KeGetCurrentThread() == NULL || - KeGetCurrentThread()->KernelApcDisable); - - FastMutex->Owner = NULL; - InterlockedExchange(&FastMutex->Count, 1); - if (FastMutex->Contention > 0) - { - KeSetEvent(&FastMutex->Gate, 0, FALSE); - } -} - -VOID -FASTCALL -CcAcquireBrokenMutex(PFAST_MUTEX FastMutex) -{ - KeEnterCriticalRegion(); - CcAcquireBrokenMutexUnsafe(FastMutex); -} - - -VOID -FASTCALL -CcReleaseBrokenMutex(PFAST_MUTEX FastMutex) -{ - CcReleaseBrokenMutexUnsafe(FastMutex); - KeLeaveCriticalRegion(); -} - -BOOLEAN -FASTCALL -CcTryToAcquireBrokenMutex(PFAST_MUTEX FastMutex) -{ - KeEnterCriticalRegion(); - if (InterlockedExchange(&FastMutex->Count, 0) == 1) - { - FastMutex->Owner = KeGetCurrentThread(); - return(TRUE); - } - else - { - KeLeaveCriticalRegion(); - return(FALSE); - } -}

1 0

[ion] 19352: - Reimplement Fast Mutex implementation in HAL/NT to be compatible with the real implementation. (Fast Mutex needs to raise IRQL).
by ion＠svn.reactos.com 19 Nov '05

19 Nov '05

- Reimplement Fast Mutex implementation in HAL/NT to be compatible with the real implementation. (Fast Mutex needs to raise IRQL). - Implement ExEnterCriticalRegionAndAcquireFastMutexUnsafe and ExReleaseFastMutexUnsafeAndLeaveCriticalRegion. - Make win32k use those two new functions so that it can continue running at PASSIVE_LEVEL. - Remove CcBrokenMutex and use the new APIs instead. - Implement and export ntoskrnl version of Fast Mutex - Update headers for new fast-mutex definition and API exports. - Fix RemoveEntryList in NDK. - Add exfuncs.h to NDK. - Fix path in mmtypes.h in NDK to be compatible to how it shoudl be included. Modified: trunk/reactos/hal/halx86/generic/fmutex.c Modified: trunk/reactos/include/ndk/arch/mmtypes.h Added: trunk/reactos/include/ndk/exfuncs.h Modified: trunk/reactos/include/ndk/ntndk.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/win32k/bitmaps.h Modified: trunk/reactos/ntoskrnl/cc/ccmutex.c Modified: trunk/reactos/ntoskrnl/cc/fs.c Modified: trunk/reactos/ntoskrnl/cc/pin.c Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/ex/fmutex.c Modified: trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml Modified: trunk/reactos/subsys/win32k/eng/driverobj.c Modified: trunk/reactos/subsys/win32k/include/inteng.h Modified: trunk/reactos/subsys/win32k/include/text.h Modified: trunk/reactos/subsys/win32k/ntuser/guicheck.c Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c Modified: trunk/reactos/subsys/win32k/ntuser/ntuser.c Modified: trunk/reactos/subsys/win32k/ntuser/ssec.c Modified: trunk/reactos/subsys/win32k/ntuser/timer.c Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/hal/halx86/generic/fmutex.c --- trunk/reactos/hal/halx86/generic/fmutex.c 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/hal/halx86/generic/fmutex.c 2005-11-19 22:13:35 UTC (rev 19352) @@ -1,54 +1,96 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS HAL * FILE: ntoskrnl/hal/x86/fmutex.c - * PURPOSE: Implements fast mutexes - * PROGRAMMER: David Welch (welch(a)cwcom.net) - * Eric Kohl (ekohl(a)rz-online.de) - * UPDATE HISTORY: - * Created 09/06/2000 + * PURPOSE: Deprecated HAL Fast Mutex + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ +/* + * NOTE: Even HAL itself has #defines to use the Exi* APIs inside NTOSKRNL. + * These are only exported here for compatibility with really old + * drivers. Also note that in theory, these can be made much faster + * by using assembly and inlining all the operations, including + * raising and lowering irql. + */ + /* INCLUDES *****************************************************************/ #include <hal.h> #define NDEBUG #include <debug.h> +#undef ExAcquireFastMutex +#undef ExReleaseFastMutex +#undef ExTryToAcquireFastMutex + /* FUNCTIONS *****************************************************************/ -#undef KeEnterCriticalRegion -#undef KeLeaveCriticalRegion -VOID FASTCALL -ExAcquireFastMutex (PFAST_MUTEX FastMutex) +VOID +FASTCALL +ExAcquireFastMutex(PFAST_MUTEX FastMutex) { - KeEnterCriticalRegion(); - ExAcquireFastMutexUnsafe(FastMutex); + KIRQL OldIrql; + + /* Raise IRQL to APC */ + OldIrql = KfRaiseIrql(APC_LEVEL); + + /* Decrease the count */ + if (InterlockedDecrement(&FastMutex->Count)) + { + /* Someone is still holding it, use slow path */ + FastMutex->Contention++; + KeWaitForSingleObject(&FastMutex->Gate, + WrExecutive, + WaitAny, + FALSE, + NULL); + } + + /* Set the owner and IRQL */ + FastMutex->Owner = KeGetCurrentThread(); + FastMutex->OldIrql = OldIrql; } +VOID +FASTCALL +ExReleaseFastMutex(PFAST_MUTEX FastMutex) +{ + /* Erase the owner */ + FastMutex->Owner = (PVOID)1; -VOID FASTCALL -ExReleaseFastMutex (PFAST_MUTEX FastMutex) -{ - ExReleaseFastMutexUnsafe(FastMutex); - KeLeaveCriticalRegion(); + /* Increase the count */ + if (InterlockedIncrement(&FastMutex->Count) <= 0) + { + /* Someone was waiting for it, signal the waiter */ + KeSetEventBoostPriority(&FastMutex->Gate, IO_NO_INCREMENT); + } + + /* Lower IRQL back */ + KfLowerIrql(FastMutex->OldIrql); } +BOOLEAN +FASTCALL +ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) +{ + KIRQL OldIrql; -BOOLEAN FASTCALL -ExTryToAcquireFastMutex (PFAST_MUTEX FastMutex) -{ - KeEnterCriticalRegion(); - if (InterlockedExchange(&FastMutex->Count, 0) == 1) + /* Raise to APC_LEVEL */ + OldIrql = KfRaiseIrql(APC_LEVEL); + + /* Check if we can quickly acquire it */ + if (InterlockedCompareExchange(&FastMutex->Count, 0, 1) == 1) { - FastMutex->Owner = KeGetCurrentThread(); - return(TRUE); + /* We have, set us as owners */ + FastMutex->Owner = KeGetCurrentThread(); + return TRUE; } - else + else { - KeLeaveCriticalRegion(); - return(FALSE); + /* Acquire attempt failed */ + KfLowerIrql(OldIrql); + return FALSE; } } _____ Modified: trunk/reactos/include/ndk/arch/mmtypes.h --- trunk/reactos/include/ndk/arch/mmtypes.h 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/include/ndk/arch/mmtypes.h 2005-11-19 22:13:35 UTC (rev 19352) @@ -10,7 +10,7 @@ #define _ARCH_MMTYPES_H #ifdef _M_IX86 -#include <ndk/i386/mmtypes.h> +#include "./../i386/mmtypes.h" #else #error "Unknown processor" #endif _____ Added: trunk/reactos/include/ndk/exfuncs.h --- trunk/reactos/include/ndk/exfuncs.h 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/include/ndk/exfuncs.h 2005-11-19 22:13:35 UTC (rev 19352) @@ -0,0 +1,26 @@ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/exfuncs.h + * PURPOSE: Prototypes for exported Executive Functions not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ +#ifndef _EXFUNCS_H +#define _EXFUNCS_H + +/* DEPENDENCIES **************************************************************/ + +/* FUNCTION TYPES ************************************************************/ + +/* PROTOTYPES ****************************************************************/ + +VOID +FASTCALL +ExEnterCriticalRegionAndAcquireFastMutexUnsafe(PFAST_MUTEX FastMutex); + +VOID +FASTCALL +ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(PFAST_MUTEX FastMutex); + +#endif _____ Modified: trunk/reactos/include/ndk/ntndk.h --- trunk/reactos/include/ndk/ntndk.h 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/include/ndk/ntndk.h 2005-11-19 22:13:35 UTC (rev 19352) @@ -27,6 +27,7 @@ #include "haltypes.h" /* Hardware Abstraction Layer Types */ #include "halfuncs.h" /* Hardware Abstraction Layer Functions */ #include "inbvfuncs.h" /* Initialization Boot Video Functions */ +#include "exfuncs.h" /* Executive Functions */ #include "iofuncs.h" /* Input/Output Manager Functions */ #include "kefuncs.h" /* Kernel Functions */ #include "mmfuncs.h" /* Memory Manager Functions */ _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/include/ndk/rtltypes.h 2005-11-19 22:13:35 UTC (rev 19352) @@ -175,7 +175,7 @@ OldBlink = Entry->Blink; OldFlink->Blink = OldBlink; OldBlink->Flink = OldFlink; - return (OldFlink == OldBlink); + return (BOOLEAN)(OldFlink == OldBlink); } static __inline _____ Modified: trunk/reactos/include/win32k/bitmaps.h --- trunk/reactos/include/win32k/bitmaps.h 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/include/win32k/bitmaps.h 2005-11-19 22:13:35 UTC (rev 19352) @@ -1,4 +1,3 @@ - #ifndef __WIN32K_BITMAPS_H #define __WIN32K_BITMAPS_H @@ -38,8 +37,8 @@ BOOL INTERNAL_CALL BITMAP_Cleanup(PVOID ObjectBody); BOOL INTERNAL_CALL BITMAPOBJ_InitBitsLock(BITMAPOBJ *pBMObj); -#define BITMAPOBJ_LockBitmapBits(pBMObj) ExAcquireFastMutex((pBMObj)->BitsLock) -#define BITMAPOBJ_UnlockBitmapBits(pBMObj) ExReleaseFastMutex((pBMObj)->BitsLock) +#define BITMAPOBJ_LockBitmapBits(pBMObj) ExEnterCriticalRegionAndAcquireFastMutexUnsafe((pBMObj)->BitsLock) +#define BITMAPOBJ_UnlockBitmapBits(pBMObj) ExReleaseFastMutexUnsafeAndLeaveCriticalRegion((pBMObj)->BitsLock) void INTERNAL_CALL BITMAPOBJ_CleanupBitsLock(BITMAPOBJ *pBMObj); INT FASTCALL BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp); _____ Modified: trunk/reactos/ntoskrnl/cc/ccmutex.c --- trunk/reactos/ntoskrnl/cc/ccmutex.c 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/ntoskrnl/cc/ccmutex.c 2005-11-19 22:13:35 UTC (rev 19352) @@ -26,7 +26,7 @@ InterlockedIncrementUL(&FastMutex->Contention); while (InterlockedExchange(&FastMutex->Count, 0) == 0) { - KeWaitForSingleObject(&FastMutex->Event, + KeWaitForSingleObject(&FastMutex->Gate, Executive, KernelMode, FALSE, @@ -50,7 +50,7 @@ InterlockedExchange(&FastMutex->Count, 1); if (FastMutex->Contention > 0) { - KeSetEvent(&FastMutex->Event, 0, FALSE); + KeSetEvent(&FastMutex->Gate, 0, FALSE); } } _____ Modified: trunk/reactos/ntoskrnl/cc/fs.c --- trunk/reactos/ntoskrnl/cc/fs.c 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/ntoskrnl/cc/fs.c 2005-11-19 22:13:35 UTC (rev 19352) @@ -153,7 +153,7 @@ if (FileSizes->AllocationSize.QuadPart < Bcb->AllocationSize.QuadPart) { InitializeListHead(&FreeListHead); - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); current_entry = Bcb->BcbSegmentListHead.Flink; @@ -186,7 +186,7 @@ Bcb->AllocationSize = FileSizes->AllocationSize; Bcb->FileSize = FileSizes->FileSize; KeReleaseSpinLock(&Bcb->BcbLock, oldirql); - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); current_entry = FreeListHead.Flink; while(current_entry != &FreeListHead) _____ Modified: trunk/reactos/ntoskrnl/cc/pin.c --- trunk/reactos/ntoskrnl/cc/pin.c 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/ntoskrnl/cc/pin.c 2005-11-19 22:13:35 UTC (rev 19352) @@ -236,7 +236,7 @@ IoStatus->Information = 0; if (WriteThrough) { - CcAcquireBrokenMutex(&iBcb->CacheSegment->Lock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&iBcb->CacheSegment->Lock ); if (iBcb->CacheSegment->Dirty) { IoStatus->Status = CcRosFlushCacheSegment(iBcb->CacheSegment); @@ -245,7 +245,7 @@ { IoStatus->Status = STATUS_SUCCESS; } - CcReleaseBrokenMutex(&iBcb->CacheSegment->Lock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&iBcb->CacheSegment->Lock ); } else { _____ Modified: trunk/reactos/ntoskrnl/cc/view.c --- trunk/reactos/ntoskrnl/cc/view.c 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/ntoskrnl/cc/view.c 2005-11-19 22:13:35 UTC (rev 19352) @@ -110,6 +110,23 @@ NTSTATUS CcRosInternalFreeCacheSegment(PCACHE_SEGMENT CacheSeg); +BOOLEAN +FASTCALL +CcTryToAcquireBrokenMutex(PFAST_MUTEX FastMutex) +{ + KeEnterCriticalRegion(); + if (InterlockedExchange(&FastMutex->Count, 0) == 1) + { + FastMutex->Owner = KeGetCurrentThread(); + return(TRUE); + } + else + { + KeLeaveCriticalRegion(); + return(FALSE); + } +} + /* FUNCTIONS *****************************************************************/ VOID @@ -132,7 +149,7 @@ { DPRINT1("Enabling Tracing for CacheMap 0x%p:\n", Bcb ); - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); current_entry = Bcb->BcbSegmentListHead.Flink; @@ -145,7 +162,7 @@ current, current->ReferenceCount, current->Dirty, current->PageOut ); } KeReleaseSpinLock(&Bcb->BcbLock, oldirql); - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); } else { @@ -167,14 +184,14 @@ Status = WriteCacheSegment(CacheSegment); if (NT_SUCCESS(Status)) { - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); KeAcquireSpinLock(&CacheSegment->Bcb->BcbLock, &oldIrql); CacheSegment->Dirty = FALSE; RemoveEntryList(&CacheSegment->DirtySegmentListEntry); DirtyPageCount -= CacheSegment->Bcb->CacheSegmentSize / PAGE_SIZE; CcRosCacheSegmentDecRefCount ( CacheSegment ); KeReleaseSpinLock(&CacheSegment->Bcb->BcbLock, oldIrql); - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); } return(Status); } @@ -195,7 +212,7 @@ (*Count) = 0; - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); WriteCount[0] = WriteCount[1]; WriteCount[1] = WriteCount[2]; @@ -235,13 +252,13 @@ ASSERT(current->Dirty); if (current->ReferenceCount > 1) { - CcReleaseBrokenMutex(&current->Lock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&current->Lock); continue; } - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); PagesPerSegment = current->Bcb->CacheSegmentSize / PAGE_SIZE; Status = CcRosFlushCacheSegment(current); - CcReleaseBrokenMutex(&current->Lock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&current->Lock); if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) { DPRINT1("CC: Failed to flush cache segment.\n"); @@ -251,14 +268,14 @@ (*Count) += PagesPerSegment; Target -= PagesPerSegment; } - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); current_entry = DirtySegmentListHead.Flink; } if (*Count < NewTarget) { WriteCount[1] += (NewTarget - *Count); } - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); DPRINT("CcRosFlushDirtyPages() finished\n"); return(STATUS_SUCCESS); @@ -288,7 +305,7 @@ InitializeListHead(&FreeList); - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); current_entry = CacheSegmentLRUListHead.Flink; while (current_entry != &CacheSegmentLRUListHead && Target > 0) { @@ -320,7 +337,7 @@ last = current; current->PageOut = TRUE; KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); for (i = 0; i < current->Bcb->CacheSegmentSize / PAGE_SIZE; i++) { PFN_TYPE Page; @@ -331,7 +348,7 @@ break; } } - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); KeAcquireSpinLock(&current->Bcb->BcbLock, &oldIrql); CcRosCacheSegmentDecRefCount(current); current->PageOut = FALSE; @@ -342,7 +359,7 @@ KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); } } - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); while (!IsListEmpty(&FreeList)) { @@ -375,7 +392,7 @@ CacheSeg->Valid = Valid; CacheSeg->Dirty = CacheSeg->Dirty || Dirty; - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); if (!WasDirty && CacheSeg->Dirty) { InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); @@ -399,8 +416,8 @@ CcRosCacheSegmentIncRefCount(CacheSeg); } KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - CcReleaseBrokenMutex(&ViewLock); - CcReleaseBrokenMutex(&CacheSeg->Lock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&CacheSeg->Lock); return(STATUS_SUCCESS); } @@ -428,7 +445,7 @@ { CcRosCacheSegmentIncRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - CcAcquireBrokenMutex(&current->Lock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&current->Lock); return(current); } current_entry = current_entry->Flink; @@ -455,10 +472,10 @@ } if (!CacheSeg->Dirty) { - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); DirtyPageCount += Bcb->CacheSegmentSize / PAGE_SIZE; - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); } else { @@ -469,7 +486,7 @@ CacheSeg->Dirty = TRUE; - CcReleaseBrokenMutex(&CacheSeg->Lock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&CacheSeg->Lock); return(STATUS_SUCCESS); } @@ -500,10 +517,10 @@ if (!WasDirty && NowDirty) { - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); DirtyPageCount += Bcb->CacheSegmentSize / PAGE_SIZE; - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); } KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); @@ -518,7 +535,7 @@ } KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - CcReleaseBrokenMutex(&CacheSeg->Lock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&CacheSeg->Lock); return(STATUS_SUCCESS); } @@ -568,8 +585,8 @@ current->DirtySegmentListEntry.Blink = NULL; current->ReferenceCount = 1; ExInitializeFastMutex(&current->Lock); - CcAcquireBrokenMutex(&current->Lock); - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&current->Lock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); *CacheSeg = current; /* There is window between the call to CcRosLookupCacheSegment @@ -598,11 +615,11 @@ current ); } #endif - CcReleaseBrokenMutex(&(*CacheSeg)->Lock); - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&(*CacheSeg)->Lock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); ExFreeToNPagedLookasideList(&CacheSegLookasideList, *CacheSeg); *CacheSeg = current; - CcAcquireBrokenMutex(&current->Lock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&current->Lock); return STATUS_SUCCESS; } if (current->FileOffset < FileOffset) @@ -634,7 +651,7 @@ KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); InsertTailList(&CacheSegmentListHead, &current->CacheSegmentListEntry); InsertTailList(&CacheSegmentLRUListHead, &current->CacheSegmentLRUListEntry); - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); #ifdef CACHE_BITMAP KeAcquireSpinLock(&CiCacheSegMappingRegionLock, &oldIrql); @@ -907,7 +924,7 @@ DPRINT("CcRosFreeCacheSegment(Bcb 0x%p, CacheSeg 0x%p)\n", Bcb, CacheSeg); - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); RemoveEntryList(&CacheSeg->BcbSegmentListEntry); RemoveEntryList(&CacheSeg->CacheSegmentListEntry); @@ -919,7 +936,7 @@ } KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); Status = CcRosInternalFreeCacheSegment(CacheSeg); return(Status); @@ -977,7 +994,7 @@ } } KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - CcReleaseBrokenMutex(&current->Lock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&current->Lock); CcRosCacheSegmentDecRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); } @@ -1018,11 +1035,11 @@ ASSERT(Bcb); Bcb->RefCount++; - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); CcFlushCache(FileObject->SectionObjectPointer, NULL, 0, NULL); - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); Bcb->RefCount--; if (Bcb->RefCount == 0) { @@ -1059,7 +1076,7 @@ #endif KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); ObDereferenceObject (Bcb->FileObject); while (!IsListEmpty(&FreeList)) @@ -1069,7 +1086,7 @@ Status = CcRosInternalFreeCacheSegment(current); } ExFreeToNPagedLookasideList(&BcbLookasideList, Bcb); - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); } return(STATUS_SUCCESS); } @@ -1079,7 +1096,7 @@ CcRosReferenceCache(PFILE_OBJECT FileObject) { PBCB Bcb; - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); Bcb = (PBCB)FileObject->SectionObjectPointer->SharedCacheMap; ASSERT(Bcb); if (Bcb->RefCount == 0) @@ -1094,7 +1111,7 @@ ASSERT(Bcb->BcbRemoveListEntry.Flink == NULL); } Bcb->RefCount++; - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); } VOID @@ -1103,7 +1120,7 @@ { PBCB Bcb; DPRINT("CcRosSetRemoveOnClose()\n"); - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); Bcb = (PBCB)SectionObjectPointer->SharedCacheMap; if (Bcb) { @@ -1113,7 +1130,7 @@ CcRosDeleteFileCache(Bcb->FileObject, Bcb); } } - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); } @@ -1122,7 +1139,7 @@ CcRosDereferenceCache(PFILE_OBJECT FileObject) { PBCB Bcb; - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); Bcb = (PBCB)FileObject->SectionObjectPointer->SharedCacheMap; ASSERT(Bcb); if (Bcb->RefCount > 0) @@ -1142,7 +1159,7 @@ } } } - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); } NTSTATUS STDCALL @@ -1154,7 +1171,7 @@ { PBCB Bcb; - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); if (FileObject->SectionObjectPointer->SharedCacheMap != NULL) { @@ -1181,7 +1198,7 @@ } } } - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); return(STATUS_SUCCESS); } @@ -1192,7 +1209,7 @@ PBCB Bcb; NTSTATUS Status; - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); Bcb = FileObject->SectionObjectPointer->SharedCacheMap; if (Bcb == NULL) @@ -1213,7 +1230,7 @@ } Status = STATUS_SUCCESS; } - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); return Status; } @@ -1232,13 +1249,13 @@ DPRINT("CcRosInitializeFileCache(FileObject 0x%p, Bcb 0x%p, CacheSegmentSize %d)\n", FileObject, Bcb, CacheSegmentSize); - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); if (Bcb == NULL) { Bcb = ExAllocateFromNPagedLookasideList(&BcbLookasideList); if (Bcb == NULL) { - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); return(STATUS_UNSUCCESSFUL); } memset(Bcb, 0, sizeof(BCB)); @@ -1269,7 +1286,7 @@ RemoveEntryList(&Bcb->BcbRemoveListEntry); Bcb->BcbRemoveListEntry.Flink = NULL; } - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); return(STATUS_SUCCESS); } @@ -1324,7 +1341,7 @@ break; } - CcAcquireBrokenMutex(&ViewLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ViewLock); CcTimeStamp++; if (CcTimeStamp >= 30) { @@ -1340,7 +1357,7 @@ CcRosDeleteFileCache(current->FileObject, current); } } - CcReleaseBrokenMutex(&ViewLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); } } _____ Modified: trunk/reactos/ntoskrnl/ex/fmutex.c --- trunk/reactos/ntoskrnl/ex/fmutex.c 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/ntoskrnl/ex/fmutex.c 2005-11-19 22:13:35 UTC (rev 19352) @@ -1,11 +1,9 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel * FILE: ntoskrnl/ex/fmutex.c * PURPOSE: Implements fast mutexes - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ /* INCLUDES *****************************************************************/ @@ -13,49 +11,194 @@ #include <ntoskrnl.h> #include <internal/debug.h> +VOID +FASTCALL +KiAcquireFastMutex(IN PFAST_MUTEX FastMutex); + /* FUNCTIONS *****************************************************************/ /* * @implemented */ -VOID FASTCALL -ExAcquireFastMutexUnsafe(PFAST_MUTEX FastMutex) +VOID +FASTCALL +ExEnterCriticalRegionAndAcquireFastMutexUnsafe(PFAST_MUTEX FastMutex) { - ASSERT(KeGetCurrentThread() == NULL || FastMutex->Owner != KeGetCurrentThread()); - ASSERT(KeGetCurrentIrql() == APC_LEVEL || - KeGetCurrentThread() == NULL || - KeGetCurrentThread()->KernelApcDisable); + PKTHREAD Thread = KeGetCurrentThread(); + + /* Enter the Critical Region */ + KeEnterCriticalRegion(); + ASSERT((KeGetCurrentIrql() == APC_LEVEL) || + (Thread == NULL) || + (Thread->CombinedApcDisable != 0) || + (Thread->Teb == NULL) || + (Thread->Teb >= (PTEB)MM_SYSTEM_RANGE_START)); + ASSERT((Thread == NULL) || (FastMutex->Owner != Thread)); + + /* Decrease the count */ + if (InterlockedDecrement(&FastMutex->Count)) + { + /* Someone is still holding it, use slow path */ + KiAcquireFastMutex(FastMutex); + } + + /* Set the owner */ + FastMutex->Owner = Thread; +} + +/* + * @implemented + */ +VOID +FASTCALL +ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(PFAST_MUTEX FastMutex) +{ + ASSERT((KeGetCurrentIrql() == APC_LEVEL) || + (KeGetCurrentThread() == NULL) || + (KeGetCurrentThread()->CombinedApcDisable != 0) || + (KeGetCurrentThread()->Teb == NULL) || + (KeGetCurrentThread()->Teb >= (PTEB)MM_SYSTEM_RANGE_START)); + ASSERT(FastMutex->Owner == KeGetCurrentThread()); - InterlockedIncrementUL(&FastMutex->Contention); - while (InterlockedExchange(&FastMutex->Count, 0) == 0) - { - KeWaitForSingleObject(&FastMutex->Event, - Executive, - KernelMode, - FALSE, - NULL); - } - InterlockedDecrementUL(&FastMutex->Contention); - FastMutex->Owner = KeGetCurrentThread(); + /* Erase the owner */ + FastMutex->Owner = NULL; + + /* Increase the count */ + if (InterlockedIncrement(&FastMutex->Count) <= 0) + { + /* Someone was waiting for it, signal the waiter */ + KeSetEventBoostPriority(&FastMutex->Gate, IO_NO_INCREMENT); + } + + /* Leave the critical region */ + KeLeaveCriticalRegion(); } /* * @implemented */ -VOID FASTCALL +VOID +FASTCALL +ExAcquireFastMutex(PFAST_MUTEX FastMutex) +{ + ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL); + KIRQL OldIrql; + + /* Raise IRQL to APC */ + OldIrql = KfRaiseIrql(APC_LEVEL); + + /* Decrease the count */ + if (InterlockedDecrement(&FastMutex->Count)) + { + /* Someone is still holding it, use slow path */ + KiAcquireFastMutex(FastMutex); + } + + /* Set the owner and IRQL */ + FastMutex->Owner = KeGetCurrentThread(); + FastMutex->OldIrql = OldIrql; +} + +/* + * @implemented + */ +VOID +FASTCALL +ExReleaseFastMutex (PFAST_MUTEX FastMutex) +{ + ASSERT_IRQL(APC_LEVEL); + + /* Erase the owner */ + FastMutex->Owner = NULL; + + /* Increase the count */ + if (InterlockedIncrement(&FastMutex->Count) <= 0) + { + /* Someone was waiting for it, signal the waiter */ + KeSetEventBoostPriority(&FastMutex->Gate, IO_NO_INCREMENT); + } + + /* Lower IRQL back */ + KfLowerIrql(FastMutex->OldIrql); +} + +/* + * @implemented + */ +VOID +FASTCALL +ExAcquireFastMutexUnsafe(PFAST_MUTEX FastMutex) +{ + PKTHREAD Thread = KeGetCurrentThread(); + ASSERT((KeGetCurrentIrql() == APC_LEVEL) || + (Thread == NULL) || + (Thread->CombinedApcDisable != 0) || + (Thread->Teb == NULL) || + (Thread->Teb >= (PTEB)MM_SYSTEM_RANGE_START)); + ASSERT((Thread == NULL) || (FastMutex->Owner != Thread)); + + /* Decrease the count */ + if (InterlockedDecrement(&FastMutex->Count)) + { + /* Someone is still holding it, use slow path */ + KiAcquireFastMutex(FastMutex); + } + + /* Set the owner */ + FastMutex->Owner = Thread; +} + +/* + * @implemented + */ +VOID +FASTCALL ExReleaseFastMutexUnsafe(PFAST_MUTEX FastMutex) { - ASSERT(KeGetCurrentThread() == NULL || FastMutex->Owner == KeGetCurrentThread()); - ASSERT(KeGetCurrentIrql() == APC_LEVEL || - KeGetCurrentThread() == NULL || - KeGetCurrentThread()->KernelApcDisable); + ASSERT((KeGetCurrentIrql() == APC_LEVEL) || + (KeGetCurrentThread() == NULL) || + (KeGetCurrentThread()->CombinedApcDisable != 0) || + (KeGetCurrentThread()->Teb == NULL) || + (KeGetCurrentThread()->Teb >= (PTEB)MM_SYSTEM_RANGE_START)); + ASSERT(FastMutex->Owner == KeGetCurrentThread()); - FastMutex->Owner = NULL; - InterlockedExchange(&FastMutex->Count, 1); - if (FastMutex->Contention > 0) + /* Erase the owner */ + FastMutex->Owner = NULL; + + /* Increase the count */ + if (InterlockedIncrement(&FastMutex->Count) <= 0) { - KeSetEvent(&FastMutex->Event, 0, FALSE); + /* Someone was waiting for it, signal the waiter */ + KeSetEventBoostPriority(&FastMutex->Gate, IO_NO_INCREMENT); } } +/* + * @implemented + */ +BOOLEAN +FASTCALL +ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) +{ + ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL); + KIRQL OldIrql; + + /* Raise to APC_LEVEL */ + OldIrql = KfRaiseIrql(APC_LEVEL); + + /* Check if we can quickly acquire it */ + if (InterlockedCompareExchange(&FastMutex->Count, 0, 1) == 1) + { + /* We have, set us as owners */ + FastMutex->Owner = KeGetCurrentThread(); + return TRUE; + } + else + { + /* Acquire attempt failed */ + KfLowerIrql(OldIrql); + return FALSE; + } +} + /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/cc.h --- trunk/reactos/ntoskrnl/include/internal/cc.h 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/ntoskrnl/include/internal/cc.h 2005-11-19 22:13:35 UTC (rev 19352) @@ -1,18 +1,6 @@ #ifndef __INCLUDE_INTERNAL_CC_H #define __INCLUDE_INTERNAL_CC_H -VOID -FASTCALL -CcAcquireBrokenMutex(PFAST_MUTEX FastMutex); - -VOID -FASTCALL -CcReleaseBrokenMutex(PFAST_MUTEX FastMutex); - -BOOLEAN -FASTCALL -CcTryToAcquireBrokenMutex(PFAST_MUTEX FastMutex); - typedef struct _BCB { LIST_ENTRY BcbSegmentListHead; _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-11-19 21:07:25 UTC (rev 19351) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-11-19 22:13:35 UTC (rev 19352) @@ -1,11 +1,10 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS project + * PROJECT: ReactOS Kernel * FILE: ntoskrnl/ke/wait.c [truncated at 1000 lines; 539 more skipped]

1 0

[chorns] 19351: Create parent directory before creating the definition file
by chorns＠svn.reactos.com 19 Nov '05

19 Nov '05

Create parent directory before creating the definition file Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-19 19:20:51 UTC (rev 19350) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-19 21:07:25 UTC (rev 19351) @@ -1081,9 +1081,10 @@ CLEAN_FILE(stub_file) fprintf ( fMakefile, - "%s: %s $(WINEBUILD_TARGET)\n", + "%s: %s $(WINEBUILD_TARGET) | %s\n", def_file.c_str (), - dependencies.c_str () ); + dependencies.c_str (), + GetDirectory ( def_file ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" ); fprintf ( fMakefile, "\t%s -o %s --def -E %s\n",

1 0

[weiden] 19350: Add dhcpcapi.dll to the bootcd. Fixes bug 1037
by weiden＠svn.reactos.com 19 Nov '05

19 Nov '05

Add dhcpcapi.dll to the bootcd. Fixes bug 1037 Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/lib/dhcpcapi/dhcpcapi.rc _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-11-19 19:10:13 UTC (rev 19349) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-11-19 19:20:51 UTC (rev 19350) @@ -80,6 +80,7 @@ lib\dbghelp\dbghelp.dll 1 lib\ddraw\ddraw.dll 1 lib\devenum\devenum.dll 1 +lib\dhcpcapi\dhcpcapi.dll 1 lib\dinput\dinput.dll 1 lib\dinput8\dinput8.dll 1 lib\dnsapi\dnsapi.dll 1 Property changes on: trunk/reactos/lib/dhcpcapi/dhcpcapi.def ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/dhcpcapi/dhcpcapi.rc --- trunk/reactos/lib/dhcpcapi/dhcpcapi.rc 2005-11-19 19:10:13 UTC (rev 19349) +++ trunk/reactos/lib/dhcpcapi/dhcpcapi.rc 2005-11-19 19:20:51 UTC (rev 19350) @@ -1,7 +1,7 @@ -#include <windows.h> - -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "DHCP Client API\0" -#define REACTOS_STR_INTERNAL_NAME "dhcpcapi\0" -#define REACTOS_STR_ORIGINAL_FILENAME "dhcpcapi.dll\0" -#include <reactos/version.rc> +#include <windows.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "DHCP Client API\0" +#define REACTOS_STR_INTERNAL_NAME "dhcpcapi\0" +#define REACTOS_STR_ORIGINAL_FILENAME "dhcpcapi.dll\0" +#include <reactos/version.rc> Property changes on: trunk/reactos/lib/dhcpcapi/dhcpcapi.rc ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/reactos/lib/dhcpcapi/dhcpcapi.xml ___________________________________________________________________ Name: svn:eol-style + native

1 0

[fireball] 19349: According to MSDN: "PnP Manager queries a device's BusRelations (child devices) when the device is enumerated".
by fireball＠svn.reactos.com 19 Nov '05

19 Nov '05

According to MSDN: "PnP Manager queries a device's BusRelations (child devices) when the device is enumerated". This change implements this behaviour in reactos (thanks Filip Navara for providing this good idea). Before, querying BusRelations was done only for ACPI/BUS_EXTENDER DeviceType. Modified: trunk/reactos/ntoskrnl/io/device.c _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-11-19 18:58:04 UTC (rev 19348) +++ trunk/reactos/ntoskrnl/io/device.c 2005-11-19 19:10:13 UTC (rev 19349) @@ -121,6 +121,7 @@ } IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED); + IopDeviceNodeSetFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY); } return STATUS_SUCCESS; @@ -153,12 +154,11 @@ } else { - if (Fdo->DeviceType == FILE_DEVICE_BUS_EXTENDER || - Fdo->DeviceType == FILE_DEVICE_ACPI) + if (IopDeviceNodeHasFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY)) { - DPRINT("Bus extender found\n"); - + DPRINT("Device needs enumeration, invalidating bus relations\n"); Status = IopInvalidateDeviceRelations(DeviceNode, BusRelations); + IopDeviceNodeClearFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY); } }

1 0

[navaraf] 19348: Don't bail out for unparsable environment variables.
by navaraf＠svn.reactos.com 19 Nov '05

19 Nov '05

Don't bail out for unparsable environment variables. Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-11-19 18:55:00 UTC (rev 19347) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-11-19 18:58:04 UTC (rev 19348) @@ -1319,11 +1319,11 @@ { UINT envNameLen; LPCTSTR envVal = GetParsedEnvVar ( ip, &envNameLen, bModeSetA ); - if ( !envVal ) - return 1; - ip += envNameLen; - cp = _stpcpy ( cp, envVal ); - continue; + if ( envVal ) + { + ip += envNameLen; + cp = _stpcpy ( cp, envVal ); + } } if (_istcntrl (*ip))

1 0

[navaraf] 19347: Revert r19346.
by navaraf＠svn.reactos.com 19 Nov '05

19 Nov '05

Revert r19346. Modified: branches/cache_manager_rewrite/reactos/subsys/system/cmd/cmd.c _____ Modified: branches/cache_manager_rewrite/reactos/subsys/system/cmd/cmd.c --- branches/cache_manager_rewrite/reactos/subsys/system/cmd/cmd.c 2005-11-19 18:53:38 UTC (rev 19346) +++ branches/cache_manager_rewrite/reactos/subsys/system/cmd/cmd.c 2005-11-19 18:55:00 UTC (rev 19347) @@ -1308,11 +1308,11 @@ { UINT envNameLen; LPCTSTR envVal = GetParsedEnvVar ( ip, &envNameLen, bModeSetA ); - if ( envVal ) - { - ip += envNameLen; - cp = _stpcpy ( cp, envVal ); - } + if ( !envVal ) + return 1; + ip += envNameLen; + cp = _stpcpy ( cp, envVal ); + continue; } if (_istcntrl (*ip))

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs