Ros-diffs November 2014

ros-diffs@reactos.org

18 participants
373 discussions

[akhaldi] 65305: [SHELL32] * Another partial sync of pidl.c with Wine 1.7.27. * Move SHParseDisplayName where it belongs. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 7 10:53:10 2014 New Revision: 65305 URL: http://svn.reactos.org/svn/reactos?rev=65305&view=rev Log: [SHELL32] * Another partial sync of pidl.c with Wine 1.7.27. * Move SHParseDisplayName where it belongs. CORE-8540 Modified: branches/shell-experiments/dll/win32/shell32/shell32.spec branches/shell-experiments/dll/win32/shell32/wine/pidl.c branches/shell-experiments/dll/win32/shell32/wine/shellord.c Modified: branches/shell-experiments/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shell32.spec [iso-8859-1] Fri Nov 7 10:53:10 2014 @@ -119,7 +119,7 @@ 151 stdcall SHLoadOLE(long) 152 stdcall ILGetSize(ptr) 153 stdcall ILGetNext(ptr) -154 stdcall ILAppendID(long long long) ILAppend +154 stdcall ILAppendID(long long long) 155 stdcall ILFree(ptr) 156 stdcall -noname ILGlobalFree(ptr) 157 stdcall ILCreateFromPath(ptr) ILCreateFromPathAW Modified: branches/shell-experiments/dll/win32/shell32/wine/pidl.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/wine/pidl.c [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/wine/pidl.c [iso-8859-1] Fri Nov 7 10:53:10 2014 @@ -47,8 +47,8 @@ WINE_DECLARE_DEBUG_CHANNEL(shell); /* from comctl32.dll */ -EXTERN_C LPVOID WINAPI Alloc(INT); -EXTERN_C BOOL WINAPI Free(LPVOID); +extern LPVOID WINAPI Alloc(INT); +extern BOOL WINAPI Free(LPVOID); static LPSTR _ILGetSTextPointer(LPCITEMIDLIST pidl); static LPWSTR _ILGetTextPointerW(LPCITEMIDLIST pidl); @@ -125,6 +125,7 @@ flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; break; } + if (!*(const WORD*)pidl || type == ILGDN_FORPARSING) { ret = IShellFolder_GetDisplayNameOf(lsf, pidl, flag, &strret); @@ -145,12 +146,15 @@ if(!StrRetToStrNW(path, MAX_PATH, &strret, pidllast)) ret = E_FAIL; } + IShellFolder_Release(psfParent); } } } TRACE("%p %p %s\n", psf, pidl, debugstr_w(path)); + if (!psf) + IShellFolder_Release(lsf); return SUCCEEDED(ret); } @@ -211,7 +215,7 @@ { TRACE_(shell)("pidl=%p\n",pidl); - if (!pidl || !pidl->mkid.cb) + if (_ILIsEmpty(pidl)) return FALSE; ILFindLastID(pidl)->mkid.cb = 0; return TRUE; @@ -566,11 +570,11 @@ } /* child has shorter name than parent */ - if (pParent->mkid.cb || !pChild->mkid.cb) + if (pParent->mkid.cb) return FALSE; /* not immediate descent */ - if ( ILGetNext(pChild)->mkid.cb && bImmediate) + if ((!pChild->mkid.cb || ILGetNext(pChild)->mkid.cb) && bImmediate) return FALSE; return TRUE; @@ -831,7 +835,7 @@ } /************************************************************************* - * ILAppend [SHELL32.154] + * ILAppendID [SHELL32.154] * * Adds the single ItemID item to the ItemIDList indicated by pidl. * If bEnd is FALSE, inserts the item in the front of the list, @@ -845,26 +849,27 @@ * NOTES * Destroys the passed in idlist! (???) */ -LPITEMIDLIST WINAPI ILAppend(LPITEMIDLIST pidl, LPCITEMIDLIST item, BOOL bEnd) +LPITEMIDLIST WINAPI ILAppendID(LPITEMIDLIST pidl, LPCSHITEMID item, BOOL bEnd) { LPITEMIDLIST idlRet; - - WARN("(pidl=%p,pidl=%p,%08u)semi-stub\n", pidl, item, bEnd); + LPCITEMIDLIST itemid = (LPCITEMIDLIST)item; + + WARN("(pidl=%p,pidl=%p,%08u)semi-stub\n",pidl,item,bEnd); pdump (pidl); - pdump (item); + pdump (itemid); if (_ILIsDesktop(pidl)) { - idlRet = ILClone(item); + idlRet = ILClone(itemid); SHFree (pidl); return idlRet; } if (bEnd) - idlRet = ILCombine(pidl, item); + idlRet = ILCombine(pidl, itemid); else - idlRet = ILCombine(item, pidl); + idlRet = ILCombine(itemid, pidl); SHFree(pidl); return idlRet; @@ -1095,7 +1100,7 @@ * the pidl can be a simple one. since we can't get the path out of the pidl * we have to take all data from the pidl */ -HRESULT WINAPI SHGetDataFromIDListA(IShellFolder * psf, LPCITEMIDLIST pidl, +HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID dest, int len) { LPSTR filename, shortname; @@ -1110,12 +1115,12 @@ switch (nFormat) { case SHGDFIL_FINDDATA: - pfd = (WIN32_FIND_DATAA *)dest; + pfd = dest; if (_ILIsDrive(pidl) || _ILIsSpecialFolder(pidl)) return E_INVALIDARG; - if (len < (int)sizeof(WIN32_FIND_DATAA)) + if (len < sizeof(WIN32_FIND_DATAA)) return E_INVALIDARG; ZeroMemory(pfd, sizeof (WIN32_FIND_DATAA)); @@ -1157,7 +1162,7 @@ int nFormat, LPVOID dest, int len) { LPSTR filename, shortname; - WIN32_FIND_DATAW * pfd = (WIN32_FIND_DATAW *)dest; + WIN32_FIND_DATAW * pfd = dest; TRACE_(shell)("sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len); @@ -1169,12 +1174,12 @@ switch (nFormat) { case SHGDFIL_FINDDATA: - pfd = (WIN32_FIND_DATAW *)dest; + pfd = dest; if (_ILIsDrive(pidl)) return E_INVALIDARG; - if (len < (int)sizeof(WIN32_FIND_DATAW)) + if (len < sizeof(WIN32_FIND_DATAW)) return E_INVALIDARG; ZeroMemory(pfd, sizeof (WIN32_FIND_DATAW)); @@ -1263,8 +1268,7 @@ dwAttributes = SFGAO_FILESYSTEM; hr = IShellFolder_GetAttributesOf(psfFolder, 1, &pidlLast, &dwAttributes); - if (FAILED(hr) || !(dwAttributes & SFGAO_FILESYSTEM)) - { + if (FAILED(hr) || !(dwAttributes & SFGAO_FILESYSTEM)) { WARN("Wrong dwAttributes or GetAttributesOf failed: %x\n", hr); IShellFolder_Release(psfFolder); return FALSE; @@ -1324,6 +1328,185 @@ return hr; } +/************************************************************************* + * SHParseDisplayName [shell version 6.0] + */ +HRESULT WINAPI SHParseDisplayName(LPCWSTR pszName, IBindCtx *pbc, + LPITEMIDLIST *ppidl, SFGAOF sfgaoIn, SFGAOF *psfgaoOut) +{ + IShellFolder *psfDesktop; + HRESULT hr=E_FAIL; + ULONG dwAttr=sfgaoIn; + + if(!ppidl) + return E_INVALIDARG; + + if (!pszName || !psfgaoOut) + { + *ppidl = NULL; + return E_INVALIDARG; + } + + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + { + *ppidl = NULL; + return hr; + } + + hr = IShellFolder_ParseDisplayName(psfDesktop, (HWND)NULL, pbc, (LPOLESTR)pszName, (ULONG *)NULL, ppidl, &dwAttr); + + IShellFolder_Release(psfDesktop); + + if (SUCCEEDED(hr)) + *psfgaoOut = dwAttr; + else + *ppidl = NULL; + + return hr; +} + +#ifndef __REACTOS__ + +/************************************************************************* + * SHGetNameFromIDList [SHELL32.@] + */ +HRESULT WINAPI SHGetNameFromIDList(PCIDLIST_ABSOLUTE pidl, SIGDN sigdnName, PWSTR *ppszName) +{ + IShellFolder *psfparent; + LPCITEMIDLIST child_pidl; + STRRET disp_name; + HRESULT ret; + + TRACE("%p 0x%08x %p\n", pidl, sigdnName, ppszName); + + *ppszName = NULL; + ret = SHBindToParent(pidl, &IID_IShellFolder, (void**)&psfparent, &child_pidl); + if(SUCCEEDED(ret)) + { + switch(sigdnName) + { + /* sigdnName & 0xffff */ + case SIGDN_NORMALDISPLAY: /* SHGDN_NORMAL */ + case SIGDN_PARENTRELATIVEPARSING: /* SHGDN_INFOLDER | SHGDN_FORPARSING */ + case SIGDN_PARENTRELATIVEEDITING: /* SHGDN_INFOLDER | SHGDN_FOREDITING */ + case SIGDN_DESKTOPABSOLUTEPARSING: /* SHGDN_FORPARSING */ + case SIGDN_DESKTOPABSOLUTEEDITING: /* SHGDN_FOREDITING | SHGDN_FORADDRESSBAR*/ + case SIGDN_PARENTRELATIVEFORADDRESSBAR: /* SIGDN_INFOLDER | SHGDN_FORADDRESSBAR */ + case SIGDN_PARENTRELATIVE: /* SIGDN_INFOLDER */ + + disp_name.uType = STRRET_WSTR; + ret = IShellFolder_GetDisplayNameOf(psfparent, child_pidl, + sigdnName & 0xffff, + &disp_name); + if(SUCCEEDED(ret)) + ret = StrRetToStrW(&disp_name, pidl, ppszName); + + break; + + case SIGDN_FILESYSPATH: + *ppszName = CoTaskMemAlloc(sizeof(WCHAR)*MAX_PATH); + if(SHGetPathFromIDListW(pidl, *ppszName)) + { + TRACE("Got string %s\n", debugstr_w(*ppszName)); + ret = S_OK; + } + else + { + CoTaskMemFree(*ppszName); + ret = E_INVALIDARG; + } + break; + + case SIGDN_URL: + default: + FIXME("Unsupported SIGDN %x\n", sigdnName); + ret = E_FAIL; + } + + IShellFolder_Release(psfparent); + } + return ret; +} + +/************************************************************************* + * SHGetIDListFromObject [SHELL32.@] + */ +HRESULT WINAPI SHGetIDListFromObject(IUnknown *punk, PIDLIST_ABSOLUTE *ppidl) +{ + IPersistIDList *ppersidl; + IPersistFolder2 *ppf2; + IDataObject *pdo; + IFolderView *pfv; + HRESULT ret; + + if(!punk) + return E_NOINTERFACE; + + *ppidl = NULL; + + /* Try IPersistIDList */ + ret = IUnknown_QueryInterface(punk, &IID_IPersistIDList, (void**)&ppersidl); + if(SUCCEEDED(ret)) + { + TRACE("IPersistIDList (%p)\n", ppersidl); + ret = IPersistIDList_GetIDList(ppersidl, ppidl); + IPersistIDList_Release(ppersidl); + if(SUCCEEDED(ret)) + return ret; + } + + /* Try IPersistFolder2 */ + ret = IUnknown_QueryInterface(punk, &IID_IPersistFolder2, (void**)&ppf2); + if(SUCCEEDED(ret)) + { + TRACE("IPersistFolder2 (%p)\n", ppf2); + ret = IPersistFolder2_GetCurFolder(ppf2, ppidl); + IPersistFolder2_Release(ppf2); + if(SUCCEEDED(ret)) + return ret; + } + + /* Try IDataObject */ + ret = IUnknown_QueryInterface(punk, &IID_IDataObject, (void**)&pdo); + if(SUCCEEDED(ret)) + { + IShellItem *psi; + TRACE("IDataObject (%p)\n", pdo); + ret = SHGetItemFromDataObject(pdo, DOGIF_ONLY_IF_ONE, + &IID_IShellItem, (void**)&psi); + if(SUCCEEDED(ret)) + { + ret = SHGetIDListFromObject((IUnknown*)psi, ppidl); + IShellItem_Release(psi); + } + IDataObject_Release(pdo); + + if(SUCCEEDED(ret)) + return ret; + } + + /* Try IFolderView */ + ret = IUnknown_QueryInterface(punk, &IID_IFolderView, (void**)&pfv); + if(SUCCEEDED(ret)) + { + IShellFolder *psf; + TRACE("IFolderView (%p)\n", pfv); + ret = IFolderView_GetFolder(pfv, &IID_IShellFolder, (void**)&psf); + if(SUCCEEDED(ret)) + { + /* We might be able to get IPersistFolder2 from a shellfolder. */ + ret = SHGetIDListFromObject((IUnknown*)psf, ppidl); + } + IFolderView_Release(pfv); + return ret; + } + + return ret; +} + +#endif /* !__REACTOS__ */ + /************************************************************************** * * internal functions @@ -1583,6 +1766,23 @@ pszDest[0]=toupperW(lpszNew[0]); TRACE("-- create Drive: %s\n", debugstr_a(pszDest)); } + } + return pidlOut; +} + +LPITEMIDLIST _ILCreateEntireNetwork(void) +{ + LPITEMIDLIST pidlOut; + + TRACE("\n"); + + pidlOut = _ILAlloc(PT_NETWORK, FIELD_OFFSET(PIDLDATA, u.network.szNames[sizeof("Entire Network")])); + if (pidlOut) + { + LPPIDLDATA pData = _ILGetDataPointer(pidlOut); + + pData->u.network.dummy = 0; + strcpy(pData->u.network.szNames, "Entire Network"); } return pidlOut; } @@ -1635,7 +1835,7 @@ { TRACE("(%p)\n",pidl); - return pidl && pidl->mkid.cb ? 0 : 1; + return !pidl || !pidl->mkid.cb; } BOOL _ILIsMyDocuments(LPCITEMIDLIST pidl) @@ -1963,7 +2163,7 @@ */ LPPIDLDATA _ILGetDataPointer(LPCITEMIDLIST pidl) { - if(pidl && pidl->mkid.cb != 0x00) + if(!_ILIsEmpty(pidl)) return (LPPIDLDATA)pidl->mkid.abID; return NULL; } @@ -2058,8 +2258,8 @@ case PT_SHARE: return pdata->u.network.szNames; - case PT_CPLAPPLET: - return pdata->u.cpanel.szName; + case PT_CPLAPPLET: + return pdata->u.cpanel.szName; } return NULL; } Modified: branches/shell-experiments/dll/win32/shell32/wine/shellord.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/wine/shellord.c [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/wine/shellord.c [iso-8859-1] Fri Nov 7 10:53:10 2014 @@ -2201,44 +2201,6 @@ } /************************************************************************* - * SHParseDisplayName [shell version 6.0] - */ -HRESULT WINAPI SHParseDisplayName(LPCWSTR pszName, IBindCtx *pbc, - LPITEMIDLIST *ppidl, SFGAOF sfgaoIn, SFGAOF *psfgaoOut) -{ - IShellFolder *psfDesktop; - HRESULT hr=E_FAIL; - ULONG dwAttr=sfgaoIn; - - if(!ppidl) - return E_INVALIDARG; - - if (!pszName || !psfgaoOut) - { - *ppidl = NULL; - return E_INVALIDARG; - } - - hr = SHGetDesktopFolder(&psfDesktop); - if (FAILED(hr)) - { - *ppidl = NULL; - return hr; - } - - hr = IShellFolder_ParseDisplayName(psfDesktop, (HWND)NULL, pbc, (LPOLESTR)pszName, (ULONG *)NULL, ppidl, &dwAttr); - - IShellFolder_Release(psfDesktop); - - if (SUCCEEDED(hr)) - *psfgaoOut = dwAttr; - else - *ppidl = NULL; - - return hr; -} - -/************************************************************************* * SHEmptyRecycleBinA (SHELL32.@) */ HRESULT WINAPI SHEmptyRecycleBinA(HWND hwnd, LPCSTR pszRootPath, DWORD dwFlags)

9 years, 10 months

[aandrejevic] 65304: [FAST486] Store the faulting address in CR2 (PFLA) when a page fault occurs.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Nov 7 00:00:17 2014 New Revision: 65304 URL: http://svn.reactos.org/svn/reactos?rev=65304&view=rev Log: [FAST486] Store the faulting address in CR2 (PFLA) when a page fault occurs. Modified: trunk/reactos/lib/fast486/common.inl Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Fri Nov 7 00:00:17 2014 @@ -170,21 +170,23 @@ /* Get the table entry */ TableEntry.Value = Fast486GetPageTableEntry(State, Page, FALSE); + /* Check if this is the first page */ + if (Page == PAGE_ALIGN(LinearAddress)) + { + /* Start reading from the offset from the beginning of the page */ + PageOffset = PAGE_OFFSET(LinearAddress); + PageLength -= PageOffset; + } + if (!TableEntry.Present || (!TableEntry.Usermode && (Cpl > 0))) { + State->ControlRegisters[FAST486_REG_CR2] = Page + PageOffset; + /* Exception */ Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_PF, TableEntry.Present | (State->Cpl ? 0x04 : 0)); return FALSE; - } - - /* Check if this is the first page */ - if (Page == PAGE_ALIGN(LinearAddress)) - { - /* Start reading from the offset from the beginning of the page */ - PageOffset = PAGE_OFFSET(LinearAddress); - PageLength -= PageOffset; } /* Check if this is the last page */ @@ -237,23 +239,25 @@ /* Get the table entry */ TableEntry.Value = Fast486GetPageTableEntry(State, Page, TRUE); + /* Check if this is the first page */ + if (Page == PAGE_ALIGN(LinearAddress)) + { + /* Start writing from the offset from the beginning of the page */ + PageOffset = PAGE_OFFSET(LinearAddress); + PageLength -= PageOffset; + } + if ((!TableEntry.Present || (!TableEntry.Usermode && (Cpl > 0))) || ((State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_WP) && !TableEntry.Writeable)) { + State->ControlRegisters[FAST486_REG_CR2] = Page + PageOffset; + /* Exception */ Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_PF, TableEntry.Present | 0x02 | (State->Cpl ? 0x04 : 0)); return FALSE; - } - - /* Check if this is the first page */ - if (Page == PAGE_ALIGN(LinearAddress)) - { - /* Start writing from the offset from the beginning of the page */ - PageOffset = PAGE_OFFSET(LinearAddress); - PageLength -= PageOffset; } /* Check if this is the last page */

9 years, 10 months

[khornicek] 65303: [USER32] - use get_best_icon_file_entry's magic to find the correct icon in ICO_ExtractIconExW - thanks Jérôme! - add cursor files support for PrivateExtractIcon(Ex)

by khornicek＠svn.reactos.org

Author: khornicek Date: Thu Nov 6 23:28:28 2014 New Revision: 65303 URL: http://svn.reactos.org/svn/reactos?rev=65303&view=rev Log: [USER32] - use get_best_icon_file_entry's magic to find the correct icon in ICO_ExtractIconExW - thanks Jérôme! - add cursor files support for PrivateExtractIcon(Ex) Modified: trunk/reactos/win32ss/user/user32/misc/exticon.c trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c Modified: trunk/reactos/win32ss/user/user32/misc/exticon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/e… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/exticon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/exticon.c [iso-8859-1] Thu Nov 6 23:28:28 2014 @@ -43,6 +43,16 @@ TRACE("type = 0x%08x count = 0x%08x\n", entry->idType, entry->idCount); } #endif + +#ifndef WINE +DWORD get_best_icon_file_offset(const LPBYTE dir, + DWORD dwFileSize, + int cxDesired, + int cyDesired, + BOOL bIcon, + DWORD fuLoad, + POINT *ptHotSpot); +#endif /********************************************************************** * find_entry_by_id @@ -99,10 +109,10 @@ if (mz_header->e_magic != IMAGE_DOS_SIGNATURE) { - if (mz_header->e_cblp == 1) /* .ICO file ? */ + if (mz_header->e_cblp == 1 || mz_header->e_cblp == 2) /* .ICO or .CUR file ? */ { *retptr = (LPBYTE)-1; /* ICONHEADER.idType, must be 1 */ - return 1; + return mz_header->e_cblp; } else return 0; /* failed */ @@ -361,36 +371,58 @@ } } #else - if (sig == 1) /* .ICO file */ + if (sig == 1 || sig == 2) /* .ICO or .CUR file */ { TRACE("-- icon Signature (0x%08x)\n", sig); if (pData == (BYTE*)-1) { - INT dataOffset; - LPICONIMAGE entry; - CURSORICONDIR *lpcid = (CURSORICONDIR*)peimage; INT cx[2] = {cx1, cx2}, cy[2] = {cy1, cy2}; INT index; - if (lpcid->idType != 1) - return 0; - for(index = 0; index < 2; index++) { - dataOffset = LookupIconIdFromDirectoryEx(peimage, TRUE, cx[index], cy[index], flags); + DWORD dataOffset; + LPBYTE imageData; + POINT hotSpot; + LPICONIMAGE entry; + + dataOffset = get_best_icon_file_offset(peimage, fsizel, cx[index], cy[index], sig == 1, flags, sig == 1 ? NULL : &hotSpot); if (dataOffset) { HICON icon; - entry = (LPICONIMAGE)(peimage + dataOffset); - icon = CreateIconFromResourceEx(peimage + dataOffset, entry->icHeader.biSizeImage, TRUE, 0x00030000, cx[index], cy[index], flags); + WORD *cursorData = NULL; + + imageData = peimage + dataOffset; + entry = (LPICONIMAGE)(imageData); + + if(sig == 2) + { + /* we need to prepend the bitmap data with hot spots for CreateIconFromResourceEx */ + cursorData = HeapAlloc(GetProcessHeap(), 0, entry->icHeader.biSizeImage + 2 * sizeof(WORD)); + + if(!cursorData) + continue; + + cursorData[0] = hotSpot.x; + cursorData[1] = hotSpot.y; + + memcpy(cursorData + 2, imageData, entry->icHeader.biSizeImage); + + imageData = (LPBYTE)cursorData; + } + + icon = CreateIconFromResourceEx(imageData, entry->icHeader.biSizeImage, sig == 1, 0x00030000, cx[index], cy[index], flags); if (icon) { RetPtr[index] = icon; iconCount = 1; } + + if(cursorData != NULL) + HeapFree(GetProcessHeap(), 0, cursorData); } } Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] Thu Nov 6 23:28:28 2014 @@ -436,7 +436,6 @@ #include "poppack.h" -static const CURSORICONFILEDIRENTRY* get_best_icon_file_entry( _In_ const CURSORICONFILEDIR* dir, @@ -521,6 +520,33 @@ /* We found it */ return &dir->idEntries[i-1]; +} + +DWORD +get_best_icon_file_offset( + _In_ const LPBYTE dir, + _In_ DWORD dwFileSize, + _In_ int cxDesired, + _In_ int cyDesired, + _In_ BOOL bIcon, + _In_ DWORD fuLoad, + _Out_ POINT *ptHotSpot +) +{ + const CURSORICONFILEDIRENTRY *entry; + + entry = get_best_icon_file_entry((CURSORICONFILEDIR *) dir, dwFileSize, cxDesired, cyDesired, bIcon, fuLoad); + + if(ptHotSpot) + { + ptHotSpot->x = entry->xHotspot; + ptHotSpot->y = entry->yHotspot; + } + + if(entry) + return entry->dwDIBOffset; + + return 0; }

9 years, 10 months

[pschweitzer] 65302: [NTFS] MagicValues--;

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Nov 6 21:12:54 2014 New Revision: 65302 URL: http://svn.reactos.org/svn/reactos?rev=65302&view=rev Log: [NTFS] MagicValues--; Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Thu Nov 6 21:12:54 2014 @@ -629,7 +629,7 @@ } IndexBuffer = (PINDEX_BUFFER)IndexRecord; - ASSERT(IndexBuffer->Ntfs.Type == 'XDNI'); + ASSERT(IndexBuffer->Ntfs.Type == NRH_INDX_TYPE); ASSERT(IndexBuffer->Header.AllocatedSize + 0x18 == IndexBlockSize); IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.FirstEntryOffset); IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.TotalSizeOfEntries); Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Thu Nov 6 21:12:54 2014 @@ -208,6 +208,7 @@ /* NTFS_RECORD_HEADER.Type */ #define NRH_FILE_TYPE 0x454C4946 /* 'FILE' */ +#define NRH_INDX_TYPE 0x58444E49 /* 'INDX' */ typedef struct _FILE_RECORD_HEADER

9 years, 10 months

[pschweitzer] 65301: [NTFS] Add a sanity check in NtfsFindMftRecord()

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Nov 6 20:54:27 2014 New Revision: 65301 URL: http://svn.reactos.org/svn/reactos?rev=65301&view=rev Log: [NTFS] Add a sanity check in NtfsFindMftRecord() Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Thu Nov 6 20:54:27 2014 @@ -492,7 +492,6 @@ ULONGLONG *OutMFTIndex) { PFILE_RECORD_HEADER MftRecord; - //ULONG Magic; PNTFS_ATTR_CONTEXT IndexRootCtx; PNTFS_ATTR_CONTEXT IndexBitmapCtx; PNTFS_ATTR_CONTEXT IndexAllocationCtx; @@ -520,7 +519,7 @@ if (NT_SUCCESS(ReadFileRecord(Vcb, MFTIndex, MftRecord))) { - //Magic = MftRecord->Magic; + ASSERT(MftRecord->Ntfs.Type == NRH_FILE_TYPE); Status = FindAttribute(Vcb, MftRecord, AttributeIndexRoot, L"$I30", 4, &IndexRootCtx); if (!NT_SUCCESS(Status))

9 years, 10 months

[aandrejevic] 65300: [FAST486] Update the CPL when performing an interrupt.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu Nov 6 20:47:31 2014 New Revision: 65300 URL: http://svn.reactos.org/svn/reactos?rev=65300&view=rev Log: [FAST486] Update the CPL when performing an interrupt. Modified: trunk/reactos/lib/fast486/common.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Thu Nov 6 20:47:31 2014 @@ -310,8 +310,11 @@ goto Cleanup; } + /* Switch to the new privilege level */ + State->Cpl = GET_SEGMENT_RPL(SegmentSelector); + /* Check the new (higher) privilege level */ - switch (GET_SEGMENT_RPL(SegmentSelector)) + switch (State->Cpl) { case 0: {

9 years, 10 months

[akhaldi] 65299: * Sync up to trunk head (r65298).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 6 19:24:18 2014 New Revision: 65299 URL: http://svn.reactos.org/svn/reactos?rev=65299&view=rev Log: * Sync up to trunk head (r65298). Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/drivers/filesystems/fastfat/create.c branches/shell-experiments/drivers/filesystems/fastfat/direntry.c branches/shell-experiments/drivers/filesystems/fastfat/dirwr.c branches/shell-experiments/drivers/filesystems/fastfat/fcb.c branches/shell-experiments/lib/fast486/common.c branches/shell-experiments/lib/fast486/common.inl branches/shell-experiments/lib/fast486/extraops.c branches/shell-experiments/lib/fast486/opcodes.c branches/shell-experiments/lib/fast486/opgroups.c branches/shell-experiments/ntoskrnl/io/iomgr/file.c branches/shell-experiments/win32ss/gdi/ntgdi/fillshap.c branches/shell-experiments/win32ss/user/user32/misc/exticon.c Propchange: branches/shell-experiments/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 6 19:24:18 2014 @@ -19,4 +19,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:61927-65270 +/trunk/reactos:61927-65298 Modified: branches/shell-experiments/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… ============================================================================== --- branches/shell-experiments/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ branches/shell-experiments/drivers/filesystems/fastfat/create.c [iso-8859-1] Thu Nov 6 19:24:18 2014 @@ -565,11 +565,14 @@ LONG idx, FileNameLen; ParentFcb = (FileObject->RelatedFileObject != NULL) ? FileObject->RelatedFileObject->FsContext : NULL; + if (ParentFcb) + { + vfatGrabFCB(DeviceExt, ParentFcb); + } Status = vfatGetFCBForFile(DeviceExt, &ParentFcb, &TargetFcb, &PathNameU); - if (Status == STATUS_SUCCESS) - { - vfatGrabFCB(DeviceExt, ParentFcb); + if (NT_SUCCESS(Status)) + { vfatReleaseFCB(DeviceExt, TargetFcb); Irp->IoStatus.Information = FILE_EXISTS; } @@ -580,7 +583,7 @@ idx = FileObject->FileName.Length / sizeof(WCHAR) - 1; - /* Skip tailing \ - if any */ + /* Skip trailing \ - if any */ if (PathNameU.Buffer[idx] == L'\\') { --idx; @@ -623,6 +626,7 @@ if (NT_SUCCESS(Status)) { pFcb = FileObject->FsContext; + ASSERT(pFcb == ParentFcb); if (pFcb->OpenHandleCount == 0) { @@ -640,7 +644,6 @@ FALSE); if (!NT_SUCCESS(Status)) { - vfatReleaseFCB(DeviceExt, ParentFcb); VfatCloseFile(DeviceExt, FileObject); return Status; } Modified: branches/shell-experiments/drivers/filesystems/fastfat/direntry.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… ============================================================================== --- branches/shell-experiments/drivers/filesystems/fastfat/direntry.c [iso-8859-1] (original) +++ branches/shell-experiments/drivers/filesystems/fastfat/direntry.c [iso-8859-1] Thu Nov 6 19:24:18 2014 @@ -201,12 +201,6 @@ CcUnpinData(*pContext); } - if (!pDirFcb->FileObject) - { - DPRINT1("Buggy FCB (cleaned up)! %S (%d / %u)\n", pDirFcb->PathNameBuffer, pDirFcb->RefCount, pDirFcb->OpenHandleCount); - return STATUS_NO_MORE_ENTRIES; - } - if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart || !CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) { Modified: branches/shell-experiments/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… ============================================================================== --- branches/shell-experiments/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] (original) +++ branches/shell-experiments/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] Thu Nov 6 19:24:18 2014 @@ -166,11 +166,6 @@ if (Context) { CcUnpinData(Context); - } - if (!pDirFcb->FileObject) - { - DPRINT1("Buggy FCB (cleaned up)! %S (%d / %u)\n", pDirFcb->PathNameBuffer, pDirFcb->RefCount, pDirFcb->OpenHandleCount); - return FALSE; } if (!CcPinRead(pDirFcb->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, TRUE, &Context, (PVOID*)&pFatEntry)) Modified: branches/shell-experiments/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… ============================================================================== --- branches/shell-experiments/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ branches/shell-experiments/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Thu Nov 6 19:24:18 2014 @@ -371,21 +371,21 @@ DPRINT("vfatUpdateFCB(%p, %p, %wZ, %wZ, %p)\n", pVCB, Fcb, LongName, ShortName, ParentFcb); - /* Delete old name */ - if (Fcb->PathNameBuffer) - { - ExFreePoolWithTag(Fcb->PathNameBuffer, TAG_FCB); - } - - /* Delete from table */ - vfatDelFCBFromTable(pVCB, Fcb); - /* Get full path name */ Status = vfatMakeFullName(ParentFcb, LongName, ShortName, &Fcb->PathNameU); if (!NT_SUCCESS(Status)) { return Status; } + + /* Delete old name */ + if (Fcb->PathNameBuffer) + { + ExFreePoolWithTag(Fcb->PathNameBuffer, TAG_FCB); + } + + /* Delete from table */ + vfatDelFCBFromTable(pVCB, Fcb); /* Split it properly */ Fcb->PathNameBuffer = Fcb->PathNameU.Buffer; @@ -414,8 +414,8 @@ /* Add to the table */ vfatAddFCBToTable(pVCB, Fcb); - /* If we moved accross directories, dereferenced our old parent - * We also derefence in case we're just renaming since AddFCBToTable references it + /* If we moved across directories, dereference our old parent + * We also dereference in case we're just renaming since AddFCBToTable references it */ vfatReleaseFCB(pVCB, OldParent); @@ -887,7 +887,7 @@ if (parentFCB) { vfatReleaseFCB(pVCB, parentFCB); - parentFCB = 0; + parentFCB = NULL; } // fail if element in FCB is not a directory if (!vfatFCBIsDirectory(FCB)) @@ -910,6 +910,8 @@ if (FileNameU.Length + parentFCB->LongNameU.Length - Length > FileNameU.MaximumLength) { vfatReleaseFCB(pVCB, parentFCB); + *pParentFCB = NULL; + *pFCB = NULL; return STATUS_OBJECT_NAME_INVALID; } RtlMoveMemory(prev + parentFCB->LongNameU.Length / sizeof(WCHAR), curr, Modified: branches/shell-experiments/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/c… ============================================================================== --- branches/shell-experiments/lib/fast486/common.c [iso-8859-1] (original) +++ branches/shell-experiments/lib/fast486/common.c [iso-8859-1] Thu Nov 6 19:24:18 2014 @@ -106,6 +106,13 @@ /* We mustn't prefetch across a page boundary */ State->PrefetchAddress = PAGE_ALIGN(State->PrefetchAddress) | (FAST486_PAGE_SIZE - FAST486_CACHE_SIZE); + + if ((LinearAddress - State->PrefetchAddress + Size) >= FAST486_CACHE_SIZE) + { + /* We can't prefetch without possibly violating page permissions */ + State->PrefetchValid = FALSE; + return Fast486ReadLinearMemory(State, LinearAddress, Buffer, Size); + } } /* Prefetch */ @@ -546,7 +553,12 @@ /* Calculate the limit of the new TSS */ NewTssLimit = NewTssDescriptor.Limit | (NewTssDescriptor.LimitHigh << 16); - if (NewTssDescriptor.Granularity) NewTssLimit <<= 12; + + if (NewTssDescriptor.Granularity) + { + NewTssLimit <<= 12; + NewTssLimit |= 0x00000FFF; + } if (NewTssLimit < sizeof(FAST486_TSS)) { @@ -732,7 +744,12 @@ State->Ldtr.Selector = NewTss.Ldtr; State->Ldtr.Base = GdtEntry.Base | (GdtEntry.BaseMid << 16) | (GdtEntry.BaseHigh << 24); State->Ldtr.Limit = GdtEntry.Limit | (GdtEntry.LimitHigh << 16); - if (GdtEntry.Granularity) State->Ldtr.Limit <<= 12; + + if (GdtEntry.Granularity) + { + State->Ldtr.Limit <<= 12; + State->Ldtr.Limit |= 0x00000FFF; + } } else { Modified: branches/shell-experiments/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/c… ============================================================================== --- branches/shell-experiments/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/shell-experiments/lib/fast486/common.inl [iso-8859-1] Thu Nov 6 19:24:18 2014 @@ -594,16 +594,12 @@ { /* Regular code segment */ - if ((GET_SEGMENT_RPL(Selector) > Fast486GetCurrentPrivLevel(State)) - || (Fast486GetCurrentPrivLevel(State) != GdtEntry.Dpl)) + if ((GET_SEGMENT_RPL(Selector) < Fast486GetCurrentPrivLevel(State))) { Fast486ExceptionWithErrorCode(State, Exception, Selector); return FALSE; } } - - /* Update CPL */ - State->Cpl = GET_SEGMENT_RPL(Selector); } else { @@ -653,7 +649,11 @@ CachedDescriptor->Size = GdtEntry.Size; /* Check for page granularity */ - if (GdtEntry.Granularity) CachedDescriptor->Limit <<= 12; + if (GdtEntry.Granularity) + { + CachedDescriptor->Limit <<= 12; + CachedDescriptor->Limit |= 0x00000FFF; + } } else { @@ -730,6 +730,13 @@ default: { + /* Security check for jumps and calls only */ + if (State->Cpl != Descriptor.Dpl) + { + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Selector); + return FALSE; + } + return TRUE; } } Modified: branches/shell-experiments/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/e… ============================================================================== --- branches/shell-experiments/lib/fast486/extraops.c [iso-8859-1] (original) +++ branches/shell-experiments/lib/fast486/extraops.c [iso-8859-1] Thu Nov 6 19:24:18 2014 @@ -475,7 +475,12 @@ /* Calculate the limit */ Limit = GdtEntry.Limit | (GdtEntry.LimitHigh << 16); - if (GdtEntry.Granularity) Limit <<= 12; + + if (GdtEntry.Granularity) + { + Limit <<= 12; + Limit |= 0x00000FFF; + } /* Set ZF */ State->Flags.Zf = TRUE; Modified: branches/shell-experiments/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/o… ============================================================================== --- branches/shell-experiments/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/shell-experiments/lib/fast486/opcodes.c [iso-8859-1] Thu Nov 6 19:24:18 2014 @@ -4474,6 +4474,63 @@ return; } + if ((State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) && !State->Flags.Vm) + { + INT i; + INT OldCpl = Fast486GetCurrentPrivLevel(State); + ULONG StackPtr; + ULONG StackSel; + + if (GET_SEGMENT_RPL(Segment) > OldCpl) + { + /* Pop ESP */ + if (!Fast486StackPop(State, &StackPtr)) + { + /* Exception */ + return; + } + + /* Pop SS */ + if (!Fast486StackPop(State, &StackSel)) + { + /* Exception */ + return; + } + } + + /* Update the CPL */ + State->Cpl = GET_SEGMENT_RPL(Segment); + + if (State->Cpl > OldCpl) + { + /* Load new SS */ + if (!Fast486LoadSegment(State, FAST486_REG_SS, StackSel)) + { + /* Exception */ + return; + } + + /* Set ESP */ + if (Size) State->GeneralRegs[FAST486_REG_ESP].Long = StackPtr; + else State->GeneralRegs[FAST486_REG_ESP].LowWord = LOWORD(StackPtr); + + /* Check segment security */ + for (i = 0; i < FAST486_NUM_SEG_REGS; i++) + { + /* Don't check CS or SS */ + if ((i == FAST486_REG_CS) || (i == FAST486_REG_SS)) continue; + + if ((State->Cpl > State->SegmentRegs[i].Dpl) + && (!State->SegmentRegs[i].Executable + || !State->SegmentRegs[i].DirConf)) + { + /* Load the NULL descriptor in the segment */ + if (!Fast486LoadSegment(State, i, 0)) return; + } + } + } + } + /* Load new (E)IP, and if necessary, pop the parameters */ if (Size) { @@ -4582,7 +4639,7 @@ /* Check for protected mode */ if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) { - INT Cpl = Fast486GetCurrentPrivLevel(State); + INT OldCpl = Fast486GetCurrentPrivLevel(State); if (State->Flags.Vm) { @@ -4660,7 +4717,7 @@ if (Size) State->InstPtr.Long = InstPtr; else State->InstPtr.LowWord = LOWORD(InstPtr); - if (GET_SEGMENT_RPL(CodeSel) > Cpl) + if (GET_SEGMENT_RPL(CodeSel) > OldCpl) { /* Pop ESP */ if (!Fast486StackPop(State, &StackPtr)) @@ -4675,7 +4732,22 @@ /* Exception */ return; } - + } + + /* Update the CPL */ + State->Cpl = GET_SEGMENT_RPL(CodeSel); + + /* Set the new flags */ + if (Size) State->Flags.Long = NewFlags.Long & PROT_MODE_FLAGS_MASK; + else State->Flags.LowWord = NewFlags.LowWord & PROT_MODE_FLAGS_MASK; + State->Flags.AlwaysSet = TRUE; + + /* Set additional flags */ + if (OldCpl <= State->Flags.Iopl) State->Flags.If = NewFlags.If; + if (OldCpl == 0) State->Flags.Iopl = NewFlags.Iopl; + + if (State->Cpl > OldCpl) + { /* Load new SS */ if (!Fast486LoadSegment(State, FAST486_REG_SS, StackSel)) { @@ -4686,21 +4758,6 @@ /* Set ESP */ if (Size) State->GeneralRegs[FAST486_REG_ESP].Long = StackPtr; else State->GeneralRegs[FAST486_REG_ESP].LowWord = LOWORD(StackPtr); - } - - /* Set the new flags */ - if (Size) State->Flags.Long = NewFlags.Long & PROT_MODE_FLAGS_MASK; - else State->Flags.LowWord = NewFlags.LowWord & PROT_MODE_FLAGS_MASK; - State->Flags.AlwaysSet = TRUE; - - /* Set additional flags */ - if (Cpl <= State->Flags.Iopl) State->Flags.If = NewFlags.If; - if (Cpl == 0) State->Flags.Iopl = NewFlags.Iopl; - - if (GET_SEGMENT_RPL(CodeSel) > Cpl) - { - /* Update the CPL */ - Cpl = Fast486GetCurrentPrivLevel(State); /* Check segment security */ for (i = 0; i < FAST486_NUM_SEG_REGS; i++) @@ -4708,7 +4765,7 @@ /* Don't check CS or SS */ if ((i == FAST486_REG_CS) || (i == FAST486_REG_SS)) continue; - if ((Cpl > State->SegmentRegs[i].Dpl) + if ((State->Cpl > State->SegmentRegs[i].Dpl) && (!State->SegmentRegs[i].Executable || !State->SegmentRegs[i].DirConf)) { Modified: branches/shell-experiments/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/o… ============================================================================== --- branches/shell-experiments/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/shell-experiments/lib/fast486/opgroups.c [iso-8859-1] Thu Nov 6 19:24:18 2014 @@ -1804,7 +1804,12 @@ State->Ldtr.Selector = Selector; State->Ldtr.Base = GdtEntry.Base | (GdtEntry.BaseMid << 16) | (GdtEntry.BaseHigh << 24); State->Ldtr.Limit = GdtEntry.Limit | (GdtEntry.LimitHigh << 16); - if (GdtEntry.Granularity) State->Ldtr.Limit <<= 12; + + if (GdtEntry.Granularity) + { + State->Ldtr.Limit <<= 12; + State->Ldtr.Limit |= 0x00000FFF; + } break; } @@ -1886,7 +1891,12 @@ State->TaskReg.Selector = Selector; State->TaskReg.Base = GdtEntry.Base | (GdtEntry.BaseMid << 16) | (GdtEntry.BaseHigh << 24); State->TaskReg.Limit = GdtEntry.Limit | (GdtEntry.LimitHigh << 16); - if (GdtEntry.Granularity) State->TaskReg.Limit <<= 12; + + if (GdtEntry.Granularity) + { + State->TaskReg.Limit <<= 12; + State->TaskReg.Limit |= 0x00000FFF; + } break; } Modified: branches/shell-experiments/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/i… ============================================================================== --- branches/shell-experiments/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ branches/shell-experiments/ntoskrnl/io/iomgr/file.c [iso-8859-1] Thu Nov 6 19:24:18 2014 @@ -1580,8 +1580,8 @@ if (OpenPacket.ParseCheck != TRUE) { /* Parse failed */ - DPRINT1("IopQueryAttributesFile failed for '%wZ' with 0x%lx\n", - ObjectAttributes->ObjectName, Status); + DPRINT("IopQueryAttributesFile failed for '%wZ' with 0x%lx\n", + ObjectAttributes->ObjectName, Status); return Status; } else Modified: branches/shell-experiments/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… ============================================================================== --- branches/shell-experiments/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Thu Nov 6 19:24:18 2014 @@ -1132,7 +1132,7 @@ goto cleanup; } else - RECTL_vSetRect(&DestRect, 0, psurf->SurfObj.sizlBitmap.cx, 0, psurf->SurfObj.sizlBitmap.cy); + RECTL_vSetRect(&DestRect, 0, 0, psurf->SurfObj.sizlBitmap.cx, psurf->SurfObj.sizlBitmap.cy); DC_vPrepareDCsForBlit(dc, &DestRect, NULL, NULL); Modified: branches/shell-experiments/win32ss/user/user32/misc/exticon.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/user32/misc/exticon.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/user32/misc/exticon.c [iso-8859-1] Thu Nov 6 19:24:18 2014 @@ -112,7 +112,7 @@ } if (*((DWORD*)(peimage + mz_header->e_lfanew)) == IMAGE_NT_SIGNATURE ) return IMAGE_NT_SIGNATURE; -#if 0 +#ifdef WINE if (*((WORD*)(peimage + mz_header->e_lfanew)) == IMAGE_OS2_SIGNATURE ) { IMAGE_OS2_HEADER * ne_header; @@ -132,7 +132,7 @@ #endif return 0; /* failed */ } -#if 0 +#ifdef WINE /************************************************************************* * USER32_LoadResource */ @@ -160,9 +160,6 @@ * * Reads .ico file and build phony ICONDIR struct */ -#define HEADER_SIZE (sizeof(CURSORICONDIR) - sizeof (CURSORICONDIRENTRY)) -#define HEADER_SIZE_FILE (sizeof(icoICONDIR) - sizeof (icoICONDIRENTRY)) - static BYTE * ICO_GetIconDirectory( LPBYTE peimage, LPicoICONDIR* lplpiID, ULONG *uSize ) { CURSORICONDIR * lpcid; /* icon resource in resource-dir format */ @@ -177,7 +174,7 @@ return 0; /* allocate the phony ICONDIR structure */ - *uSize = lpcid->idCount * sizeof(CURSORICONDIRENTRY) + HEADER_SIZE; + *uSize = FIELD_OFFSET(CURSORICONDIR, idEntries[lpcid->idCount]); if( (lpID = HeapAlloc(GetProcessHeap(),0, *uSize) )) { /* copy the header */ @@ -188,7 +185,7 @@ /* copy the entries */ for( i=0; i < lpcid->idCount; i++ ) { - memcpy(&lpID->idEntries[i], &lpcid->idEntries[i], sizeof(CURSORICONDIRENTRY) - 2); + memcpy(&lpID->idEntries[i], &lpcid->idEntries[i], sizeof(CURSORICONDIRENTRY) - 2); lpID->idEntries[i].wResId = i; } @@ -224,7 +221,7 @@ LPBYTE pData; DWORD sig; HANDLE hFile; - UINT16 iconDirCount = 0; //,iconCount = 0; + UINT16 iconDirCount = 0, iconCount = 0; LPBYTE peimage; HANDLE fmapping; DWORD fsizeh,fsizel; @@ -274,8 +271,8 @@ sig = USER32_GetResourceTable(peimage, fsizel, &pData); +#ifdef WINE /* ico file or NE exe/dll*/ -#if 0 if (sig==IMAGE_OS2_SIGNATURE || sig==1) /* .ICO file */ { BYTE *pCIDir = 0; @@ -283,8 +280,9 @@ NE_NAMEINFO *pIconStorage = NULL; NE_NAMEINFO *pIconDir = NULL; LPicoICONDIR lpiID = NULL; - - TRACE("-- OS2/icon Signature (0x%08lx)\n", sig); + ULONG uSize = 0; + + TRACE("-- OS2/icon Signature (0x%08x)\n", sig); if (pData == (BYTE*)-1) { @@ -292,7 +290,7 @@ if (pCIDir) { iconDirCount = 1; iconCount = lpiID->idCount; - TRACE("-- icon found %p 0x%08lx 0x%08x 0x%08x\n", pCIDir, uSize, iconDirCount, iconCount); + TRACE("-- icon found %p 0x%08x 0x%08x 0x%08x\n", pCIDir, uSize, iconDirCount, iconCount); } } else while (pTInfo->type_id && !(pIconStorage && pIconDir)) @@ -317,7 +315,7 @@ if (nIcons == 0) { ret = iconDirCount; - if (lpiID && pCIDir) /* *.ico file, deallocate heap pointer*/ + if (lpiID) /* *.ico file, deallocate heap pointer*/ HeapFree(GetProcessHeap(), 0, pCIDir); } else if (nIconIndex < iconDirCount) @@ -331,9 +329,10 @@ /* .ICO files have only one icon directory */ if (lpiID == NULL) /* not *.ico */ pCIDir = USER32_LoadResource(peimage, pIconDir + i + nIconIndex, *(WORD*)pData, &uSize); - pIconId[i] = LookupIconIdFromDirectoryEx(pCIDir, TRUE, (i & 1) ? cx2 : cx1, (i & 1) ? cy2 : cy1, flags); + pIconId[i] = LookupIconIdFromDirectoryEx(pCIDir, TRUE, cx1, cy1, flags); + if (cx2 && cy2) pIconId[++i] = LookupIconIdFromDirectoryEx(pCIDir, TRUE, cx2, cy2, flags); } - if (lpiID && pCIDir) /* *.ico file, deallocate heap pointer*/ + if (lpiID) /* *.ico file, deallocate heap pointer*/ HeapFree(GetProcessHeap(), 0, pCIDir); for (icon = 0; icon < nIcons; icon++) @@ -347,8 +346,13 @@ pCIDir = USER32_LoadResource(peimage, pIconStorage + i, *(WORD*)pData, &uSize); if (pCIDir) - RetPtr[icon] = (HICON)CreateIconFromResourceEx(pCIDir, uSize, TRUE, 0x00030000, - (icon & 1) ? cx2 : cx1, (icon & 1) ? cy2 : cy1, flags); + { + RetPtr[icon] = CreateIconFromResourceEx(pCIDir, uSize, TRUE, 0x00030000, + cx1, cy1, flags); + if (cx2 && cy2) + RetPtr[++icon] = CreateIconFromResourceEx(pCIDir, uSize, TRUE, 0x00030000, + cx2, cy2, flags); + } else RetPtr[icon] = 0; } @@ -356,54 +360,62 @@ } } } +#else + if (sig == 1) /* .ICO file */ + { + TRACE("-- icon Signature (0x%08x)\n", sig); + + if (pData == (BYTE*)-1) + { + INT dataOffset; + LPICONIMAGE entry; + CURSORICONDIR *lpcid = (CURSORICONDIR*)peimage; + INT cx[2] = {cx1, cx2}, cy[2] = {cy1, cy2}; + INT index; + + if (lpcid->idType != 1) + return 0; + + for(index = 0; index < 2; index++) + { + dataOffset = LookupIconIdFromDirectoryEx(peimage, TRUE, cx[index], cy[index], flags); + + if (dataOffset) + { + HICON icon; + entry = (LPICONIMAGE)(peimage + dataOffset); + icon = CreateIconFromResourceEx(peimage + dataOffset, entry->icHeader.biSizeImage, TRUE, 0x00030000, cx[index], cy[index], flags); + + if (icon) + { + RetPtr[index] = icon; + iconCount = 1; + } + } + } + + } + ret = iconCount; /* return number of retrieved icons */ + } +#endif /* end ico file */ /* exe/dll */ else if( sig == IMAGE_NT_SIGNATURE ) -#endif - if( sig == IMAGE_NT_SIGNATURE ) - { - LPBYTE idata,igdata; - PIMAGE_DOS_HEADER dheader; - PIMAGE_NT_HEADERS pe_header; - PIMAGE_SECTION_HEADER pe_sections; - const IMAGE_RESOURCE_DIRECTORY *rootresdir,*iconresdir,*icongroupresdir; - const IMAGE_RESOURCE_DATA_ENTRY *idataent,*igdataent; - const IMAGE_RESOURCE_DIRECTORY_ENTRY *xresent; - UINT i, j; - - dheader = (PIMAGE_DOS_HEADER)peimage; - pe_header = (PIMAGE_NT_HEADERS)(peimage+dheader->e_lfanew); /* it is a pe header, USER32_GetResourceTable checked that */ - pe_sections = (PIMAGE_SECTION_HEADER)(((char*)pe_header) + sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER) - + pe_header->FileHeader.SizeOfOptionalHeader); - rootresdir = NULL; - - /* search for the root resource directory */ - for (i=0;i<pe_header->FileHeader.NumberOfSections;i++) - { - if (pe_sections[i].Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) - continue; - if (fsizel < pe_sections[i].PointerToRawData+pe_sections[i].SizeOfRawData) { - FIXME("File %s too short (section is at %ld bytes, real size is %ld)\n", - debugstr_w(lpszExeFileName), - pe_sections[i].PointerToRawData+pe_sections[i].SizeOfRawData, - fsizel - ); - goto end; - } - /* FIXME: doesn't work when the resources are not in a separate section */ - if (pe_sections[i].VirtualAddress == pe_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress) - { - rootresdir = (PIMAGE_RESOURCE_DIRECTORY)(peimage+pe_sections[i].PointerToRawData); - break; - } - } - - if (!rootresdir) - { - WARN("haven't found section for resource directory.\n"); - goto end; /* failure */ - } + { + BYTE *idata, *igdata; + const IMAGE_RESOURCE_DIRECTORY *rootresdir, *iconresdir, *icongroupresdir; + const IMAGE_RESOURCE_DATA_ENTRY *idataent, *igdataent; + const IMAGE_RESOURCE_DIRECTORY_ENTRY *xresent; + ULONG size; + UINT i; + + rootresdir = RtlImageDirectoryEntryToData((HMODULE)peimage, FALSE, IMAGE_DIRECTORY_ENTRY_RESOURCE, &size); + if (!rootresdir) + { + WARN("haven't found section for resource directory.\n"); + goto end; + } /* search for the group icon directory */ if (!(icongroupresdir = find_entry_by_id(rootresdir, LOWORD(RT_GROUP_ICON), rootresdir))) @@ -465,37 +477,21 @@ const IMAGE_RESOURCE_DIRECTORY *resdir; /* go down this resource entry, name */ - resdir = (const IMAGE_RESOURCE_DIRECTORY*)((const char *)rootresdir+(xresent->OffsetToDirectory)); + resdir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)rootresdir + xresent->OffsetToDirectory); /* default language (0) */ resdir = find_entry_default(resdir,rootresdir); igdataent = (const IMAGE_RESOURCE_DATA_ENTRY*)resdir; /* lookup address in mapped image for virtual address */ - igdata = NULL; - - for (j=0;j<pe_header->FileHeader.NumberOfSections;j++) - { - if (igdataent->OffsetToData < pe_sections[j].VirtualAddress) - continue; - if (igdataent->OffsetToData+igdataent->Size > pe_sections[j].VirtualAddress+pe_sections[j].SizeOfRawData) - continue; - - if (igdataent->OffsetToData-pe_sections[j].VirtualAddress+pe_sections[j].PointerToRawData+igdataent->Size > fsizel) { - FIXME("overflow in PE lookup (%s has len %ld, have offset %ld), short file?\n", debugstr_w(lpszExeFileName), fsizel, - igdataent->OffsetToData - pe_sections[j].VirtualAddress + pe_sections[j].PointerToRawData + igdataent->Size); - goto end; /* failure */ - } - igdata = peimage+(igdataent->OffsetToData-pe_sections[j].VirtualAddress+pe_sections[j].PointerToRawData); - } - - if (!igdata) + igdata = RtlImageRvaToVa(RtlImageNtHeader((HMODULE)peimage), (HMODULE)peimage, igdataent->OffsetToData, NULL); + if (!igdata) { FIXME("no matching real address for icongroup!\n"); goto end; /* failure */ } pIconId[i] = LookupIconIdFromDirectoryEx(igdata, TRUE, cx1, cy1, flags); - if (cx2 && cy2) pIconId[++i] = LookupIconIdFromDirectoryEx(igdata, TRUE, cx2, cy2, flags); + if (cx2 && cy2) pIconId[++i] = LookupIconIdFromDirectoryEx(igdata, TRUE, cx2, cy2, flags); } if (!(iconresdir=find_entry_by_id(rootresdir,LOWORD(RT_ICON),rootresdir))) @@ -508,32 +504,17 @@ { const IMAGE_RESOURCE_DIRECTORY *xresdir; xresdir = find_entry_by_id(iconresdir, LOWORD(pIconId[i]), rootresdir); - if (!xresdir) - { - WARN("icon entry %d not found\n", LOWORD(pIconId[i])); + if( !xresdir ) + { + WARN("icon entry %d not found\n", LOWORD(pIconId[i])); RetPtr[i]=0; continue; - } + } xresdir = find_entry_default(xresdir, rootresdir); - if (!xresdir) - { - WARN("icon entry %d not found\n", LOWORD(pIconId[i])); - RetPtr[i]=0; - continue; - } idataent = (const IMAGE_RESOURCE_DATA_ENTRY*)xresdir; - idata = NULL; - - /* map virtual to address in image */ - for (j=0;j<pe_header->FileHeader.NumberOfSections;j++) - { - if (idataent->OffsetToData < pe_sections[j].VirtualAddress) - continue; - if (idataent->OffsetToData+idataent->Size > pe_sections[j].VirtualAddress+pe_sections[j].SizeOfRawData) - continue; - idata = peimage+(idataent->OffsetToData-pe_sections[j].VirtualAddress+pe_sections[j].PointerToRawData); - } - if (!idata) + + idata = RtlImageRvaToVa(RtlImageNtHeader((HMODULE)peimage), (HMODULE)peimage, idataent->OffsetToData, NULL); + if (!idata) { WARN("no matching real address found for icondata!\n"); RetPtr[i]=0; @@ -644,7 +625,7 @@ cxsmicon = GetSystemMetrics(SM_CXSMICON); cysmicon = GetSystemMetrics(SM_CYSMICON); - ret = ICO_ExtractIconExW(lpwstrFile, hIcon, nIndex, 2, cxicon | (cxsmicon<<16), + ret = ICO_ExtractIconExW(lpwstrFile, hIcon, nIndex, 2, cxicon | (cxsmicon<<16), cyicon | (cysmicon<<16), NULL, LR_DEFAULTCOLOR); *phIconLarge = hIcon[0]; *phIconSmall = hIcon[1];

9 years, 10 months

[akhaldi] 65298: [SHELL32] * Another partial sync of brsfolder.c with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 6 19:14:58 2014 New Revision: 65298 URL: http://svn.reactos.org/svn/reactos?rev=65298&view=rev Log: [SHELL32] * Another partial sync of brsfolder.c with Wine 1.7.27. CORE-8540 Modified: branches/shell-experiments/dll/win32/shell32/wine/brsfolder.c Modified: branches/shell-experiments/dll/win32/shell32/wine/brsfolder.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] Thu Nov 6 19:14:58 2014 @@ -18,9 +18,7 @@ * FIXME: * - many memory leaks * - many flags unimplemented - * - implement new dialog style "make new folder" button * - implement editbox - * - implement new dialog style resizing */ #define WIN32_NO_STATUS @@ -387,7 +385,9 @@ tvi.lParam = (LPARAM)lptvid; IShellFolder_AddRef(lpsf); - IEnumIDList_AddRef(pEnumIL); +#ifdef __REACTOS__ + IEnumIDList_AddRef(pEnumIL); +#endif lptvid->lpsfParent = lpsf; lptvid->lpi = ILClone(pidl); lptvid->lpifq = pidlParent ? ILCombine(pidlParent, pidl) : ILClone(pidl); @@ -543,7 +543,8 @@ &IID_IShellFolder, (void**)&lpsf2 ); } else { lpsf2 = lptvid->lpsfParent; - r = IShellFolder_AddRef(lpsf2); + IShellFolder_AddRef(lpsf2); + r = S_OK; } if (SUCCEEDED(r)) @@ -831,8 +832,10 @@ switch (id) { case IDOK: +#ifdef __REACTOS__ /* The original pidl is owned by the treeview and will be free'd. */ info->pidlRet = ILClone(info->pidlRet); +#endif if (info->pidlRet == NULL) /* A null pidl would mean a cancel */ info->pidlRet = _ILCreateDesktop(); pdump( info->pidlRet ); @@ -1054,8 +1057,12 @@ return FALSE; } - - +#ifndef __REACTOS__ +static const WCHAR swBrowseTemplateName[] = { + 'S','H','B','R','S','F','O','R','F','O','L','D','E','R','_','M','S','G','B','O','X',0}; +static const WCHAR swNewBrowseTemplateName[] = { + 'S','H','N','E','W','B','R','S','F','O','R','F','O','L','D','E','R','_','M','S','G','B','O','X',0}; +#endif /************************************************************************* * SHBrowseForFolderA [SHELL32.@] @@ -1115,12 +1122,23 @@ browse_info info; DWORD r; HRESULT hr; +#ifdef __REACTOS__ WORD wDlgId; +#else + const WCHAR * templateName; + INITCOMMONCONTROLSEX icex; +#endif info.hWnd = 0; info.pidlRet = NULL; info.lpBrowseInfo = lpbi; info.hwndTreeView = NULL; + +#ifndef __REACTOS__ + icex.dwSize = sizeof( icex ); + icex.dwICC = ICC_TREEVIEW_CLASSES; + InitCommonControlsEx( &icex ); +#endif hr = OleInitialize(NULL);

9 years, 10 months

[khornicek] 65297: [USER32] - add ICO files support for PrivateExtractIcons(Ex) - fixes Juice and ICO files now show their icons in explorer CORE-4021

by khornicek＠svn.reactos.org

Author: khornicek Date: Thu Nov 6 19:11:03 2014 New Revision: 65297 URL: http://svn.reactos.org/svn/reactos?rev=65297&view=rev Log: [USER32] - add ICO files support for PrivateExtractIcons(Ex) - fixes Juice and ICO files now show their icons in explorer CORE-4021 Modified: trunk/reactos/win32ss/user/user32/misc/exticon.c Modified: trunk/reactos/win32ss/user/user32/misc/exticon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/e… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/exticon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/exticon.c [iso-8859-1] Thu Nov 6 19:11:03 2014 @@ -221,7 +221,7 @@ LPBYTE pData; DWORD sig; HANDLE hFile; - UINT16 iconDirCount = 0; //,iconCount = 0; + UINT16 iconDirCount = 0, iconCount = 0; LPBYTE peimage; HANDLE fmapping; DWORD fsizeh,fsizel; @@ -360,12 +360,48 @@ } } } +#else + if (sig == 1) /* .ICO file */ + { + TRACE("-- icon Signature (0x%08x)\n", sig); + + if (pData == (BYTE*)-1) + { + INT dataOffset; + LPICONIMAGE entry; + CURSORICONDIR *lpcid = (CURSORICONDIR*)peimage; + INT cx[2] = {cx1, cx2}, cy[2] = {cy1, cy2}; + INT index; + + if (lpcid->idType != 1) + return 0; + + for(index = 0; index < 2; index++) + { + dataOffset = LookupIconIdFromDirectoryEx(peimage, TRUE, cx[index], cy[index], flags); + + if (dataOffset) + { + HICON icon; + entry = (LPICONIMAGE)(peimage + dataOffset); + icon = CreateIconFromResourceEx(peimage + dataOffset, entry->icHeader.biSizeImage, TRUE, 0x00030000, cx[index], cy[index], flags); + + if (icon) + { + RetPtr[index] = icon; + iconCount = 1; + } + } + } + + } + ret = iconCount; /* return number of retrieved icons */ + } +#endif /* end ico file */ /* exe/dll */ else if( sig == IMAGE_NT_SIGNATURE ) -#endif - if( sig == IMAGE_NT_SIGNATURE ) { BYTE *idata, *igdata; const IMAGE_RESOURCE_DIRECTORY *rootresdir, *iconresdir, *icongroupresdir;

9 years, 10 months

[akhaldi] 65296: [SHELL32] * Partial sync of shell32_main.h with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 6 18:45:30 2014 New Revision: 65296 URL: http://svn.reactos.org/svn/reactos?rev=65296&view=rev Log: [SHELL32] * Partial sync of shell32_main.h with Wine 1.7.27. CORE-8540 Modified: branches/shell-experiments/dll/win32/shell32/wine/shell32_main.h Modified: branches/shell-experiments/dll/win32/shell32/wine/shell32_main.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] Thu Nov 6 18:45:30 2014 @@ -29,33 +29,34 @@ /******************************************* * global SHELL32.DLL variables */ -extern HMODULE huser32; -extern HINSTANCE shell32_hInstance; +extern HMODULE huser32 DECLSPEC_HIDDEN; +extern HINSTANCE shell32_hInstance DECLSPEC_HIDDEN; BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList); /* Iconcache */ #define INVALID_INDEX -1 BOOL SIC_Initialize(void); -void SIC_Destroy(void); -BOOL PidlToSicIndex (IShellFolder * sh, LPCITEMIDLIST pidl, BOOL bBigIcon, UINT uFlags, int * pIndex); -INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags ); +void SIC_Destroy(void) DECLSPEC_HIDDEN; +BOOL PidlToSicIndex (IShellFolder * sh, LPCITEMIDLIST pidl, BOOL bBigIcon, UINT uFlags, int * pIndex) DECLSPEC_HIDDEN; +INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags ) DECLSPEC_HIDDEN; /* Classes Root */ -BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL bPrependDot); -BOOL HCR_GetDefaultVerbW( HKEY hkeyClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len ); -BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len ); +BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL bPrependDot) DECLSPEC_HIDDEN; +BOOL HCR_GetDefaultVerbW( HKEY hkeyClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len ) DECLSPEC_HIDDEN; +BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len ) DECLSPEC_HIDDEN; BOOL HCR_GetIconW(LPCWSTR szClass, LPWSTR szDest, LPCWSTR szName, DWORD len, int* picon_idx); -BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len); +BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len) DECLSPEC_HIDDEN; /* ANSI versions of above functions, supposed to go away as soon as they are not used anymore */ -BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, LONG len, BOOL bPrependDot); +BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, LONG len, BOOL bPrependDot) DECLSPEC_HIDDEN; BOOL HCR_GetIconA(LPCSTR szClass, LPSTR szDest, LPCSTR sName, DWORD len, int* picon_idx); -BOOL HCR_GetClassNameA(REFIID riid, LPSTR szDest, DWORD len); - -BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD dwAttributes); -DWORD WINAPI ParseFieldA(LPCSTR src, DWORD nField, LPSTR dst, DWORD len); -DWORD WINAPI ParseFieldW(LPCWSTR src, DWORD nField, LPWSTR dst, DWORD len); +BOOL HCR_GetClassNameA(REFIID riid, LPSTR szDest, DWORD len) DECLSPEC_HIDDEN; + +BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD dwAttributes) DECLSPEC_HIDDEN; + +DWORD WINAPI ParseFieldA(LPCSTR src, DWORD nField, LPSTR dst, DWORD len) DECLSPEC_HIDDEN; +DWORD WINAPI ParseFieldW(LPCWSTR src, DWORD nField, LPWSTR dst, DWORD len) DECLSPEC_HIDDEN; /**************************************************************************** * Class constructors @@ -72,12 +73,12 @@ HRESULT WINAPI IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, LPVOID * ppv); HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV); -extern HRESULT CPanel_GetIconLocationW(LPCITEMIDLIST, LPWSTR, UINT, int*); -HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize); -HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize); - -LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST); -LPEXTRACTICONW IExtractIconW_Constructor(LPCITEMIDLIST); +extern HRESULT CPanel_GetIconLocationW(LPCITEMIDLIST, LPWSTR, UINT, int*) DECLSPEC_HIDDEN; +HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; +HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; + +LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN; +LPEXTRACTICONW IExtractIconW_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN; /* initialisation for FORMATETC */ #define InitFormatEtc(fe, cf, med) \ @@ -96,14 +97,14 @@ DROPEFFECT_NONE))) -HGLOBAL RenderHDROP(LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); -HGLOBAL RenderSHELLIDLIST (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); -HGLOBAL RenderFILENAMEA (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); -HGLOBAL RenderFILENAMEW (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); +HGLOBAL RenderHDROP(LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) DECLSPEC_HIDDEN; +HGLOBAL RenderSHELLIDLIST (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) DECLSPEC_HIDDEN; +HGLOBAL RenderFILENAMEA (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) DECLSPEC_HIDDEN; +HGLOBAL RenderFILENAMEW (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) DECLSPEC_HIDDEN; /* Change Notification */ -void InitChangeNotifications(void); -void FreeChangeNotifications(void); +void InitChangeNotifications(void) DECLSPEC_HIDDEN; +void FreeChangeNotifications(void) DECLSPEC_HIDDEN; void InitIconOverlays(void); /* file operation */ @@ -169,17 +170,17 @@ #define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) #define HINSTANCE_16(h32) (LOWORD(h32)) -extern WCHAR swShell32Name[MAX_PATH]; - -BOOL UNIXFS_is_rooted_at_desktop(void); -extern const GUID CLSID_UnixFolder; -extern const GUID CLSID_UnixDosFolder; +extern WCHAR swShell32Name[MAX_PATH] DECLSPEC_HIDDEN; + +BOOL UNIXFS_is_rooted_at_desktop(void) DECLSPEC_HIDDEN; +extern const GUID CLSID_UnixFolder DECLSPEC_HIDDEN; +extern const GUID CLSID_UnixDosFolder DECLSPEC_HIDDEN; /* Default shell folder value registration */ -HRESULT SHELL_RegisterShellFolders(void); +HRESULT SHELL_RegisterShellFolders(void) DECLSPEC_HIDDEN; /* Detect Shell Links */ -BOOL SHELL_IsShortcut(LPCITEMIDLIST); +BOOL SHELL_IsShortcut(LPCITEMIDLIST) DECLSPEC_HIDDEN; INT_PTR CALLBACK SH_FileGeneralDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK SH_FileVersionDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

9 years, 10 months

← Newer
1
...
21
22
23
24
25
26
27
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2014