Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[tkreuzer] 65052: [WIN32K] - Fail in NtGdiCreateClientObj, when the object type is not valid. This is based on Windows behavior, only more strict. Windows allows to set the stock bit and reuse coun...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Oct 27 20:40:11 2014 New Revision: 65052 URL: http://svn.reactos.org/svn/reactos?rev=65052&view=rev Log: [WIN32K] - Fail in NtGdiCreateClientObj, when the object type is not valid. This is based on Windows behavior, only more strict. Windows allows to set the stock bit and reuse count, which is probably not what we want. Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Mon Oct 27 20:40:11 2014 @@ -1272,6 +1272,15 @@ POBJ pObject; HANDLE handle; + /* Check if ulType is valid */ + if ((ulType != GDILoObjType_LO_METAFILE16_TYPE) && + (ulType != GDILoObjType_LO_METAFILE_TYPE) && + (ulType != GDILoObjType_LO_METADC16_TYPE)) + { + DPRINT1("NtGdiCreateClientObj: Invalid object type 0x%lx.\n", ulType); + return NULL; + } + /* Allocate a new object */ pObject = GDIOBJ_AllocateObject(GDIObjType_CLIENTOBJ_TYPE, sizeof(CLIENTOBJ), @@ -1281,9 +1290,6 @@ DPRINT1("NtGdiCreateClientObj: Could not allocate a clientobj.\n"); return NULL; } - - /* Mask out everything that would change the type in a wrong manner */ - ulType &= (GDI_HANDLE_TYPE_MASK & ~GDI_HANDLE_BASETYPE_MASK); /* Set the real object type */ pObject->hHmgr = UlongToHandle(ulType | GDILoObjType_LO_CLIENTOBJ_TYPE);

9 years, 10 months

[gadamopoulos] 65051: [SHELL32] - Rewrite the monstrosity that was supposed to open control panel items. Still not really correct but works.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Oct 27 18:26:09 2014 New Revision: 65051 URL: http://svn.reactos.org/svn/reactos?rev=65051&view=rev Log: [SHELL32] - Rewrite the monstrosity that was supposed to open control panel items. Still not really correct but works. Modified: branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp branches/shell-experiments/dll/win32/shell32/folders/cpanel.h Modified: branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] Mon Oct 27 18:26:09 2014 @@ -763,126 +763,6 @@ return S_OK; } - -/************************************************************************** -* IShellExecuteHookW Implementation -*/ - -static HRESULT -ExecuteAppletFromCLSID(LPOLESTR pOleStr) -{ - WCHAR wszBuf[128], wszCmd[MAX_PATH]; - DWORD cbCmd = sizeof(wszCmd); - - StringCbPrintfW(wszBuf, sizeof(wszBuf), L"CLSID\\%s\\shell\\open\\command", pOleStr); - - if (RegGetValueW(HKEY_CLASSES_ROOT, wszBuf, NULL, RRF_RT_REG_SZ, NULL, (PVOID)wszCmd, &cbCmd) != ERROR_SUCCESS) - { - ERR("RegGetValueW(%ls) failed with %u\n", wszBuf, GetLastError()); - return E_FAIL; - } - - if (!ExpandEnvironmentStringsW(wszCmd, wszBuf, _countof(wszBuf))) - return E_FAIL; - - PROCESS_INFORMATION pi; - STARTUPINFOW si; - ZeroMemory(&si, sizeof(si)); - si.cb = sizeof(si); - if (!CreateProcessW(NULL, wszBuf, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) - return E_FAIL; - - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); - return S_OK; -} - -EXTERN_C void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow); - -HRESULT WINAPI CControlPanelFolder::ExecuteFromIdList(LPCITEMIDLIST pidl) -{ - PIDLCPanelStruct *pCPanel = _ILGetCPanelPointer(ILFindLastID(pidl)); - - if (!pCPanel) - { - /* Is it GUID to control panel applet? */ - IID *piid = _ILGetGUIDPointer(ILFindLastID(pidl)); - if (!piid) - return E_INVALIDARG; - - /* Start it */ - LPOLESTR pOleStr; - if (StringFromCLSID(*piid, &pOleStr) == S_OK) - { - HRESULT hr = ExecuteAppletFromCLSID(pOleStr); - CoTaskMemFree(pOleStr); - return hr; - } - - ERR("Cannot open cpanel applet\n"); - return E_INVALIDARG; - } - - /* Build control panel applet cmd - Note: we pass the applet name to Control_RunDLL to distinguish between multiple applets in one .cpl file */ - WCHAR wszCmd[2*MAX_PATH]; - WCHAR wszAppletName[MAX_PATH]; - - if(!MultiByteToWideChar(CP_ACP, 0, pCPanel->szName + pCPanel->offsDispName, -1, wszAppletName, MAX_PATH)) - return E_FAIL; - - StringCbPrintfW(wszCmd, sizeof(wszCmd), L"rundll32 shell32.dll,Control_RunDLL \"%hs\",\"%ls\"", pCPanel->szName, wszAppletName); - - /* Start the applet */ - TRACE("Run cpl %ls\n", wszCmd); - STARTUPINFO si; - PROCESS_INFORMATION pi; - ZeroMemory(&si, sizeof(si)); - si.cb = sizeof(si); - if (!CreateProcessW(NULL, wszCmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) - return E_FAIL; - - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); - return S_OK; -} - -HRESULT WINAPI CControlPanelFolder::Execute(LPSHELLEXECUTEINFOW psei) -{ - TRACE("(%p)->execute(%p)\n", this, psei); - - if (!psei) - return E_INVALIDARG; - - if (!(psei->fMask & SEE_MASK_IDLIST)) - { - FIXME("no idlist given!\n"); - return E_FAIL; - } - - return ExecuteFromIdList((LPCITEMIDLIST)psei->lpIDList); -} - -/************************************************************************** -* IShellExecuteHookA Implementation -*/ - -HRESULT WINAPI CControlPanelFolder::Execute(LPSHELLEXECUTEINFOA psei) -{ - TRACE("(%p)->execute(%p)\n", this, psei); - - if (!psei) - return E_INVALIDARG; - - if (!(psei->fMask & SEE_MASK_IDLIST)) - { - FIXME("no idlist given!\n"); - return E_FAIL; - } - - return ExecuteFromIdList((LPCITEMIDLIST)psei->lpIDList); -} - /************************************************************************** * IContextMenu2 Implementation */ @@ -929,30 +809,38 @@ */ HRESULT WINAPI CControlPanelFolder::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) { - SHELLEXECUTEINFOW sei; WCHAR szPath[MAX_PATH]; char szTarget[MAX_PATH]; STRRET strret; WCHAR* pszPath; INT Length, cLength; - PIDLCPanelStruct *pcpanel; CComPtr<IPersistFile> ppf; CComPtr<IShellLinkA> isl; HRESULT hResult; + PIDLCPanelStruct *pcpanel = _ILGetCPanelPointer(apidl[0]); + TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n", this, lpcmi, lpcmi->lpVerb, lpcmi->hwnd); if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_OPEN)) //FIXME { - ZeroMemory(&sei, sizeof(sei)); - sei.cbSize = sizeof(sei); - sei.fMask = SEE_MASK_INVOKEIDLIST; - sei.lpIDList = ILCombine(pidlRoot, apidl[0]); - sei.hwnd = lpcmi->hwnd; - sei.nShow = SW_SHOWNORMAL; - sei.lpVerb = L"open"; -ERR("here\n"); - return Execute(&sei); + LPITEMIDLIST lpIDList = ILCombine(pidlRoot, apidl[0]); + + if (!pcpanel) + { + /* UGLY HACK! */ + LPSHELLBROWSER lpSB = (LPSHELLBROWSER)SendMessageW(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); + HRESULT hr; + + if (lpSB == NULL) + return E_FAIL; + + hr = lpSB->BrowseObject(lpIDList, 0); + return hr; + } + + /* Note: we pass the applet name to Control_RunDLL to distinguish between multiple applets in one .cpl file */ + ShellExecuteA(NULL, "cplopen", pcpanel->szName, pcpanel->szName + pcpanel->offsDispName, NULL, 0); } else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_CREATELINK)) //FIXME { Modified: branches/shell-experiments/dll/win32/shell32/folders/cpanel.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/cpanel.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/cpanel.h [iso-8859-1] Mon Oct 27 18:26:09 2014 @@ -27,8 +27,6 @@ public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, public IPersistFolder2, - public IShellExecuteHookA, - public IShellExecuteHookW, public IContextMenu2 { private: @@ -75,12 +73,6 @@ // IPersistFolder2 virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); - // IShellExecuteHookW - virtual HRESULT WINAPI Execute(LPSHELLEXECUTEINFOW psei); - - // IShellExecuteHookA - virtual HRESULT WINAPI Execute(LPSHELLEXECUTEINFOA psei); - // IContextMenu virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); @@ -100,8 +92,6 @@ COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) - COM_INTERFACE_ENTRY_IID(IID_IShellExecuteHookA, IShellExecuteHookA) - COM_INTERFACE_ENTRY_IID(IID_IShellExecuteHookW, IShellExecuteHookW) COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) END_COM_MAP()

9 years, 10 months

[zguo] 65049: [0.3.17] Set version number for release.

by zguo＠svn.reactos.org

Author: zguo Date: Mon Oct 27 17:23:05 2014 New Revision: 65049 URL: http://svn.reactos.org/svn/reactos?rev=65049&view=rev Log: [0.3.17] Set version number for release. Modified: branches/0.3.17/reactos/include/reactos/version.cmake Modified: branches/0.3.17/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/include/reactos/… ============================================================================== --- branches/0.3.17/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/0.3.17/reactos/include/reactos/version.cmake [iso-8859-1] Mon Oct 27 17:23:05 2014 @@ -32,11 +32,11 @@ today(KERNEL_VERSION_BUILD) set(KERNEL_VERSION_MAJOR "0") -set(KERNEL_VERSION_MINOR "4") -set(KERNEL_VERSION_PATCH_LEVEL "0") +set(KERNEL_VERSION_MINOR "3") +set(KERNEL_VERSION_PATCH_LEVEL "17") set(COPYRIGHT_YEAR "2014") # KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or "" (for the release) -set(KERNEL_VERSION_BUILD_TYPE "SVN") +set(KERNEL_VERSION_BUILD_TYPE "") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}")

9 years, 10 months

[akhaldi] 65050: [ADVAPI32] * Update GetTrusteeForm{A, W}(). CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 27 17:23:05 2014 New Revision: 65050 URL: http://svn.reactos.org/svn/reactos?rev=65050&view=rev Log: [ADVAPI32] * Update GetTrusteeForm{A,W}(). CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Mon Oct 27 17:23:05 2014 @@ -2037,25 +2037,32 @@ pTrustee->ptstrName = name; } -/****************************************************************************** - * GetTrusteeFormW [ADVAPI32.@] - */ -TRUSTEE_FORM WINAPI -GetTrusteeFormA(PTRUSTEE_A pTrustee) -{ - return pTrustee->TrusteeForm; -} - - -/****************************************************************************** - * GetTrusteeFormW [ADVAPI32.@] - */ -TRUSTEE_FORM WINAPI -GetTrusteeFormW(PTRUSTEE_W pTrustee) -{ - return pTrustee->TrusteeForm; -} - +/****************************************************************************** + * GetTrusteeFormA [ADVAPI32.@] + */ +TRUSTEE_FORM WINAPI GetTrusteeFormA(PTRUSTEEA pTrustee) +{ + TRACE("(%p)\n", pTrustee); + + if (!pTrustee) + return TRUSTEE_BAD_FORM; + + return pTrustee->TrusteeForm; +} + +/****************************************************************************** + * GetTrusteeFormW [ADVAPI32.@] + */ +TRUSTEE_FORM WINAPI GetTrusteeFormW(PTRUSTEEW pTrustee) +{ + TRACE("(%p)\n", pTrustee); + + if (!pTrustee) + return TRUSTEE_BAD_FORM; + + return pTrustee->TrusteeForm; +} + /****************************************************************************** * GetTrusteeNameA [ADVAPI32.@] */

9 years, 10 months

[zguo] 65048: [NTFS] Cherrypick additional NTFS related fixes, including ability to browse NTFS volume.

by zguo＠svn.reactos.org

Author: zguo Date: Mon Oct 27 17:18:17 2014 New Revision: 65048 URL: http://svn.reactos.org/svn/reactos?rev=65048&view=rev Log: [NTFS] Cherrypick additional NTFS related fixes, including ability to browse NTFS volume. Modified: branches/0.3.17/reactos/ (props changed) branches/0.3.17/reactos/drivers/filesystems/ntfs/attrib.c branches/0.3.17/reactos/drivers/filesystems/ntfs/dirctl.c branches/0.3.17/reactos/drivers/filesystems/ntfs/fcb.c branches/0.3.17/reactos/drivers/filesystems/ntfs/mft.c branches/0.3.17/reactos/drivers/filesystems/ntfs/ntfs.h Propchange: branches/0.3.17/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 27 17:18:17 2014 @@ -18,4 +18,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:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64855-64856,64859,64908-64909,64976 +/trunk/reactos:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64855-64856,64859,64908-64909,64976,65025-65028,65041 Modified: branches/0.3.17/reactos/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/drivers/filesyst… ============================================================================== --- branches/0.3.17/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/0.3.17/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Mon Oct 27 17:18:17 2014 @@ -287,16 +287,25 @@ } PFILENAME_ATTRIBUTE -GetFileNameFromRecord(PFILE_RECORD_HEADER FileRecord) +GetFileNameFromRecord(PFILE_RECORD_HEADER FileRecord, UCHAR NameType) { PNTFS_ATTR_RECORD Attribute; + PFILENAME_ATTRIBUTE Name; Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && Attribute->Type != AttributeEnd) { if (Attribute->Type == AttributeFileName) - return (PFILENAME_ATTRIBUTE)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); + { + Name = (PFILENAME_ATTRIBUTE)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); + if (Name->NameType == NameType || + (Name->NameType == NTFS_FILE_NAME_WIN32_AND_DOS && NameType == NTFS_FILE_NAME_WIN32) || + (Name->NameType == NTFS_FILE_NAME_WIN32_AND_DOS && NameType == NTFS_FILE_NAME_DOS)) + { + return Name; + } + } Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); } Modified: branches/0.3.17/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/drivers/filesyst… ============================================================================== --- branches/0.3.17/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ branches/0.3.17/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Mon Oct 27 17:18:17 2014 @@ -135,7 +135,7 @@ DPRINT("NtfsGetNameInformation() called\n"); - FileName = GetFileNameFromRecord(FileRecord); + FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); ASSERT(FileName != NULL); Length = FileName->NameLength * sizeof (WCHAR); @@ -163,7 +163,7 @@ DPRINT("NtfsGetDirectoryInformation() called\n"); - FileName = GetFileNameFromRecord(FileRecord); + FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); ASSERT(FileName != NULL); Length = FileName->NameLength * sizeof (WCHAR); @@ -204,7 +204,7 @@ DPRINT("NtfsGetFullDirectoryInformation() called\n"); - FileName = GetFileNameFromRecord(FileRecord); + FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); ASSERT(FileName != NULL); Length = FileName->NameLength * sizeof (WCHAR); @@ -242,12 +242,13 @@ ULONG BufferLength) { ULONG Length; - PFILENAME_ATTRIBUTE FileName; + PFILENAME_ATTRIBUTE FileName, ShortFileName; DPRINT("NtfsGetBothDirectoryInformation() called\n"); - FileName = GetFileNameFromRecord(FileRecord); + FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); ASSERT(FileName != NULL); + ShortFileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_DOS); Length = FileName->NameLength * sizeof (WCHAR); if ((sizeof(FILE_BOTH_DIR_INFORMATION) + Length) > BufferLength) @@ -258,6 +259,19 @@ ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + Length, sizeof(ULONG)); RtlCopyMemory(Info->FileName, FileName->Name, Length); + if (ShortFileName) + { + /* Should we upcase the filename? */ + ASSERT(ShortFileName->NameLength <= ARRAYSIZE(Info->ShortName)); + Info->ShortNameLength = ShortFileName->NameLength * sizeof(WCHAR); + RtlCopyMemory(Info->ShortName, ShortFileName->Name, Info->ShortNameLength); + } + else + { + Info->ShortName[0] = 0; + Info->ShortNameLength = 0; + } + Info->CreationTime.QuadPart = FileName->CreationTime; Info->LastAccessTime.QuadPart = FileName->LastAccessTime; Info->LastWriteTime.QuadPart = FileName->LastWriteTime; @@ -271,9 +285,6 @@ // Info->FileIndex=; Info->EaSize = 0; - - Info->ShortName[0] = 0; - Info->ShortNameLength = 0; return STATUS_SUCCESS; } Modified: branches/0.3.17/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/drivers/filesyst… ============================================================================== --- branches/0.3.17/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ branches/0.3.17/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Mon Oct 27 17:18:17 2014 @@ -289,7 +289,7 @@ return NULL; } - FileName = GetFileNameFromRecord(MftRecord); + FileName = GetFileNameFromRecord(MftRecord, NTFS_FILE_NAME_WIN32); if (!FileName) { ExFreePoolWithTag(MftRecord, TAG_NTFS); @@ -391,7 +391,7 @@ DPRINT1("NtfsMakeFCBFromDirEntry(%p, %p, %wZ, %p, %p)\n", Vcb, DirectoryFCB, Name, Record, fileFCB); - FileName = GetFileNameFromRecord(Record); + FileName = GetFileNameFromRecord(Record, NTFS_FILE_NAME_WIN32); if (!FileName) { return STATUS_OBJECT_NAME_NOT_FOUND; // Not sure that's the best here Modified: branches/0.3.17/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/drivers/filesyst… ============================================================================== --- branches/0.3.17/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/0.3.17/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Mon Oct 27 17:18:17 2014 @@ -85,7 +85,7 @@ PCWSTR Name, ULONG NameLength) { - DPRINT1("FindAttributeHelper(%p, %p, %p, 0x%x, %S, %u)\n", Vcb, AttrRecord, AttrRecordEnd, Type, Name, NameLength); + DPRINT("FindAttributeHelper(%p, %p, %p, 0x%x, %S, %u)\n", Vcb, AttrRecord, AttrRecordEnd, Type, Name, NameLength); while (AttrRecord < AttrRecordEnd) { @@ -146,7 +146,7 @@ PWCHAR AttrName; AttrName = (PWCHAR)((PCHAR)AttrRecord + AttrRecord->NameOffset); - DPRINT("%s, %s\n", AttrName, Name); + DPRINT("%.*S, %.*S\n", AttrRecord->NameLength, AttrName, NameLength, Name); if (RtlCompareMemory(AttrName, Name, NameLength << 1) == (NameLength << 1)) { /* Found it, fill up the context and return. */ @@ -180,7 +180,7 @@ PNTFS_ATTR_RECORD AttrRecord; PNTFS_ATTR_RECORD AttrRecordEnd; - DPRINT1("FindAttribute(%p, %p, %u, %S, %u, %p)\n", Vcb, MftRecord, Type, Name, NameLength, AttrCtx); + DPRINT("FindAttribute(%p, %p, 0x%x, %S, %u, %p)\n", Vcb, MftRecord, Type, Name, NameLength, AttrCtx); AttrRecord = (PNTFS_ATTR_RECORD)((PCHAR)MftRecord + MftRecord->AttributeOffset); AttrRecordEnd = (PNTFS_ATTR_RECORD)((PCHAR)MftRecord + Vcb->NtfsInfo.BytesPerFileRecord); @@ -397,12 +397,12 @@ { ULONGLONG BytesRead; - DPRINT1("ReadFileRecord(%p, %I64x, %p)\n", Vcb, index, file); + DPRINT("ReadFileRecord(%p, %I64x, %p)\n", Vcb, index, file); BytesRead = ReadAttribute(Vcb, Vcb->MFTContext, index * Vcb->NtfsInfo.BytesPerFileRecord, (PCHAR)file, Vcb->NtfsInfo.BytesPerFileRecord); if (BytesRead != Vcb->NtfsInfo.BytesPerFileRecord) { - DPRINT1("ReadFileRecord failed: %u read, %u expected\n", BytesRead, Vcb->NtfsInfo.BytesPerFileRecord); + DPRINT1("ReadFileRecord failed: %I64u read, %u expected\n", BytesRead, Vcb->NtfsInfo.BytesPerFileRecord); return STATUS_PARTIAL_COPY; } @@ -469,7 +469,7 @@ EntryName.Buffer = IndexEntry->FileName.Name; EntryName.Length = - EntryName.MaximumLength = IndexEntry->FileName.NameLength; + EntryName.MaximumLength = IndexEntry->FileName.NameLength * sizeof(WCHAR); if (DirSearch) { @@ -477,7 +477,7 @@ } else { - return (RtlCompareUnicodeString(FileName, &EntryName, (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX)) == TRUE); + return (RtlCompareUnicodeString(FileName, &EntryName, (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX)) == 0); } } @@ -507,7 +507,7 @@ NTSTATUS Status; ULONG CurrentEntry = 0; - DPRINT1("NtfsFindMftRecord(%p, %I64d, %wZ, %p, %u, %p)\n", Vcb, MFTIndex, FileName, FirstEntry, DirSearch, OutMFTIndex); + DPRINT("NtfsFindMftRecord(%p, %I64d, %wZ, %p, %u, %p)\n", Vcb, MFTIndex, FileName, FirstEntry, DirSearch, OutMFTIndex); MftRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, @@ -631,9 +631,9 @@ IndexBuffer = (PINDEX_BUFFER)IndexRecord; ASSERT(IndexBuffer->Ntfs.Type == 'XDNI'); ASSERT(IndexBuffer->Header.AllocatedSize + 0x18 == IndexBlockSize); - IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)(&IndexBuffer->Header + IndexBuffer->Header.FirstEntryOffset); - IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)(&IndexBuffer->Header + IndexBuffer->Header.TotalSizeOfEntries); - //ASSERT(IndexEntryEnd <= (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexBuffer + IndexBlockSize)); FIXME: Why doesn't it work? + IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.FirstEntryOffset); + IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.TotalSizeOfEntries); + ASSERT(IndexEntryEnd <= (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexBuffer + IndexBlockSize)); while (IndexEntry < IndexEntryEnd && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) @@ -653,6 +653,7 @@ } ++CurrentEntry; + ASSERT(IndexEntry->Length >= sizeof(INDEX_ENTRY_ATTRIBUTE)); IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)IndexEntry + IndexEntry->Length); } @@ -686,13 +687,13 @@ NTSTATUS Status; ULONG FirstEntry = 0; - DPRINT1("NtfsLookupFileAt(%p, %wZ, %p, %p, %I64x)\n", Vcb, PathName, FileRecord, DataContext, CurrentMFTIndex); + DPRINT("NtfsLookupFileAt(%p, %wZ, %p, %p, %I64x)\n", Vcb, PathName, FileRecord, DataContext, CurrentMFTIndex); FsRtlDissectName(*PathName, &Current, &Remaining); while (Current.Length != 0) { - DPRINT1("Current: %wZ\n", &Current); + DPRINT("Current: %wZ\n", &Current); Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, &Current, &FirstEntry, FALSE, &CurrentMFTIndex); if (!NT_SUCCESS(Status)) @@ -701,7 +702,7 @@ } if (Remaining.Length == 0) - return STATUS_OBJECT_PATH_NOT_FOUND; + break; FsRtlDissectName(Current, &Current, &Remaining); } @@ -762,11 +763,12 @@ { NTSTATUS Status; - DPRINT1("NtfsFindFileAt(%p, %wZ, %p, %p, %p, %p, %I64x)\n", Vcb, SearchPattern, FirstEntry, FileRecord, DataContext, MFTIndex, CurrentMFTIndex); + DPRINT("NtfsFindFileAt(%p, %wZ, %p, %p, %p, %p, %I64x)\n", Vcb, SearchPattern, FirstEntry, FileRecord, DataContext, MFTIndex, CurrentMFTIndex); Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, SearchPattern, FirstEntry, TRUE, &CurrentMFTIndex); if (!NT_SUCCESS(Status)) { + DPRINT("NtfsFindFileAt: NtfsFindMftRecord() failed with status 0x%08lx\n", Status); return Status; } Modified: branches/0.3.17/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/drivers/filesyst… ============================================================================== --- branches/0.3.17/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/0.3.17/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Mon Oct 27 17:18:17 2014 @@ -448,7 +448,7 @@ NtfsDumpFileAttributes(PFILE_RECORD_HEADER FileRecord); PFILENAME_ATTRIBUTE -GetFileNameFromRecord(PFILE_RECORD_HEADER FileRecord); +GetFileNameFromRecord(PFILE_RECORD_HEADER FileRecord, UCHAR NameType); /* blockdev.c */

9 years, 10 months

[zguo] 65047: [WIN32K] Cherrypick margin fix for menus. CORE-8667

by zguo＠svn.reactos.org

Author: zguo Date: Mon Oct 27 17:15:09 2014 New Revision: 65047 URL: http://svn.reactos.org/svn/reactos?rev=65047&view=rev Log: [WIN32K] Cherrypick margin fix for menus. CORE-8667 Modified: branches/0.3.17/reactos/ (props changed) branches/0.3.17/reactos/win32ss/user/ntuser/menu.c branches/0.3.17/reactos/win32ss/user/user32/windows/menu.c Propchange: branches/0.3.17/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 27 17:15:09 2014 @@ -18,4 +18,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:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64855-64856,64859,64908-64909 +/trunk/reactos:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64855-64856,64859,64908-64909,64976 Modified: branches/0.3.17/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/win32ss/user/ntu… ============================================================================== --- branches/0.3.17/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ branches/0.3.17/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Mon Oct 27 17:15:09 2014 @@ -649,7 +649,7 @@ lpmi->cyMenu = Menu->cyMenu; lpmi->spwndNotify = Menu->spwndNotify; lpmi->cxTextAlign = Menu->cxTextAlign; - lpmi->iTop = Menu->iMaxTop; + lpmi->iTop = Menu->iTop; lpmi->iMaxTop = Menu->iMaxTop; lpmi->dwArrowsOn = Menu->dwArrowsOn; Modified: branches/0.3.17/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/win32ss/user/use… ============================================================================== --- branches/0.3.17/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ branches/0.3.17/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Mon Oct 27 17:15:09 2014 @@ -43,7 +43,7 @@ #define MENU_COL_SPACE 4 /* top and bottom margins for popup menus */ -#define MENU_TOP_MARGIN 3 +#define MENU_TOP_MARGIN 2 //3 #define MENU_BOTTOM_MARGIN 2 #define MENU_TYPE_MASK (MF_STRING | MF_BITMAP | MF_OWNERDRAW | MF_SEPARATOR) @@ -395,7 +395,7 @@ MenuInfo->cyMenu = pMenu->cyMenu; MenuInfo->spwndNotify = pMenu->spwndNotify; MenuInfo->cxTextAlign = pMenu->cxTextAlign; - MenuInfo->iTop = pMenu->iMaxTop; + MenuInfo->iTop = pMenu->iTop; MenuInfo->iMaxTop = pMenu->iMaxTop; MenuInfo->dwArrowsOn = pMenu->dwArrowsOn; @@ -1301,7 +1301,7 @@ orgX = maxX; //if( lpitem.fType & (MF_MENUBREAK | MF_MENUBARBREAK)) // orgX += MENU_COL_SPACE; - orgY = 2;//MENU_TOP_MARGIN; + orgY = MENU_TOP_MARGIN; maxTab = maxTabWidth = 0; /* Parse items until column break or end of menu */

9 years, 10 months

[zguo] 65046: [UNIATA] Update version of UNIATA to 45b1 for 0.3.17.

by zguo＠svn.reactos.org

Author: zguo Date: Mon Oct 27 17:10:31 2014 New Revision: 65046 URL: http://svn.reactos.org/svn/reactos?rev=65046&view=rev Log: [UNIATA] Update version of UNIATA to 45b1 for 0.3.17. Modified: branches/0.3.17/reactos/ (props changed) branches/0.3.17/reactos/drivers/storage/ide/uniata/id_ata.cpp branches/0.3.17/reactos/drivers/storage/ide/uniata/id_dma.cpp branches/0.3.17/reactos/drivers/storage/ide/uniata/id_sata.cpp branches/0.3.17/reactos/drivers/storage/ide/uniata/uniata_ver.h Propchange: branches/0.3.17/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 27 17:10:31 2014 @@ -18,4 +18,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:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64859,64908-64909 +/trunk/reactos:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64855-64856,64859,64908-64909 Modified: branches/0.3.17/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/drivers/storage/… ============================================================================== --- branches/0.3.17/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ branches/0.3.17/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Mon Oct 27 17:10:31 2014 @@ -1692,7 +1692,7 @@ deviceExtension->FullIdentifyData.NVCache_Version )); - KdPrint2((PRINT_PREFIX "R-rate %#x\n", + KdPrint2((PRINT_PREFIX "R-rate %d\n", deviceExtension->FullIdentifyData.NominalMediaRotationRate )); @@ -5071,9 +5071,9 @@ if(AtaReq->retry < MAX_RETRIES) { //fallback_pio: if(!(deviceExtension->HwFlags & UNIATA_AHCI)) { - AtaReq->Flags &= ~REQ_FLAG_DMA_OPERATION; + //AtaReq->Flags &= ~REQ_FLAG_DMA_OPERATION; + // Downrate will happen in AtapiDmaReinit(), try UDMA-2 for HDD only AtaReq->Flags |= REQ_FLAG_FORCE_DOWNRATE; -// LunExt->DeviceFlags |= DFLAGS_FORCE_DOWNRATE; } AtaReq->ReqState = REQ_STATE_QUEUED; goto reenqueue_req; @@ -5093,6 +5093,7 @@ ((error >> 4) == SCSI_SENSE_HARDWARE_ERROR)) { if(AtaReq->retry < MAX_RETRIES) { //fallback_pio: + // Downrate will happen in AtapiDmaReinit(), use PIO immediately for ATAPI AtaReq->Flags &= ~REQ_FLAG_DMA_OPERATION; AtaReq->Flags |= REQ_FLAG_FORCE_DOWNRATE; // LunExt->DeviceFlags |= DFLAGS_FORCE_DOWNRATE; @@ -5449,6 +5450,7 @@ chan->ChannelCtrlFlags &= ~CTRFLAGS_DMA_OPERATION; goto CompleteRequest; } +continue_read_drq: // Ensure that this is a read command. if (srb->SrbFlags & SRB_FLAGS_DATA_IN) { @@ -5489,7 +5491,6 @@ } } } - } else { KdPrint2((PRINT_PREFIX "IdeIntr: Read %#x Dwords\n", wordCount/2)); @@ -5580,6 +5581,12 @@ status = SRB_STATUS_SUCCESS; goto CompleteRequest; + } + } else { + if(!atapiDev && !DataOverrun && (srb->SrbFlags & SRB_FLAGS_DATA_IN) && + (statusByte == (IDE_STATUS_IDLE | IDE_STATUS_DRQ))) { + KdPrint2((PRINT_PREFIX " HDD read data ready \n")); + goto continue_read_drq; } } } @@ -6689,6 +6696,7 @@ // Adjust buffer address and words left count. AtaReq->WordsLeft -= wordCount; AtaReq->DataBuffer += wordCount; + AtaReq->WordsTransfered += wordCount; // Wait for interrupt. return SRB_STATUS_PENDING; Modified: branches/0.3.17/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/drivers/storage/… ============================================================================== --- branches/0.3.17/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ branches/0.3.17/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Mon Oct 27 17:10:31 2014 @@ -587,10 +587,8 @@ case ATA_PROMISE_ID: if(ChipType == PRNEW) { ULONG Channel = deviceExtension->Channel + lChannel; + if(chan->ChannelCtrlFlags & CTRFLAGS_LBA48) { - AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, - AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) | - (Channel ? 0x08 : 0x02)); AtapiWritePortEx4(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),(Channel ? 0x24 : 0x20), ((Srb->SrbFlags & SRB_FLAGS_DATA_IN) ? 0x05000000 : 0x06000000) | (Srb->DataTransferLength >> 1) ); @@ -659,10 +657,12 @@ case ATA_PROMISE_ID: if(ChipType == PRNEW) { ULONG Channel = deviceExtension->Channel + lChannel; +/* + AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, + AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) & + ~(Channel ? 0x08 : 0x02)); +*/ if(chan->ChannelCtrlFlags & CTRFLAGS_LBA48) { - AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, - AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) & - ~(Channel ? 0x08 : 0x02)); AtapiWritePortEx4(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),(Channel ? 0x24 : 0x20), 0 ); @@ -1555,10 +1555,13 @@ return; break; } - case ATA_PROMISE_ID: + case ATA_PROMISE_ID: { /***********/ /* Promise */ /***********/ + + UCHAR sel66 = Channel ? 0x08: 0x02; + if(ChipType < PRTX) { if (isAtapi) { udmamode = @@ -1566,12 +1569,29 @@ } } for(i=udmamode; i>=0; i--) { + + if(ChipType == PRNEW) { + if(i>2) { + AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, + AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) | + sel66); + } else { + AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, + AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) & + ~sel66); + } + } + if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_UDMA0 + i)) { promise_timing(deviceExtension, dev, (UCHAR)(ATA_UDMA + i)); // ??? return; } } - + if(ChipType == PRNEW) { + AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, + AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) & + ~sel66); + } for(i=wdmamode; i>=0; i--) { if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_WDMA0 + i)) { promise_timing(deviceExtension, dev, (UCHAR)(ATA_WDMA0+i)); @@ -1587,7 +1607,7 @@ AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); promise_timing(deviceExtension, dev, ATA_PIO0 + apiomode); return; - break; + break; } case ATA_ATI_ID: KdPrint2((PRINT_PREFIX "ATI\n")); Modified: branches/0.3.17/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/drivers/storage/… ============================================================================== --- branches/0.3.17/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ branches/0.3.17/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Mon Oct 27 17:10:31 2014 @@ -968,6 +968,12 @@ KdPrint2((PRINT_PREFIX "\n")); /* get the number of HW channels */ + + /* CAP.NOP sometimes indicate the index of the last enabled + * port, at other times, that of the last possible port, so + * determining the maximum port number requires looking at + * both CAP.NOP and PI. + */ PI = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_PI); deviceExtension->AHCI_PI = PI; KdPrint2((PRINT_PREFIX " AHCI PI %#x\n", PI)); Modified: branches/0.3.17/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/drivers/storage/… ============================================================================== --- branches/0.3.17/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] (original) +++ branches/0.3.17/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] Mon Oct 27 17:10:31 2014 @@ -1,10 +1,10 @@ -#define UNIATA_VER_STR "45a8" -#define UNIATA_VER_DOT 0.45.1.8 +#define UNIATA_VER_STR "45b1" +#define UNIATA_VER_DOT 0.45.2.1 #define UNIATA_VER_MJ 0 #define UNIATA_VER_MN 45 -#define UNIATA_VER_SUB_MJ 1 -#define UNIATA_VER_SUB_MN 8 -#define UNIATA_VER_DOT_COMMA 0,45,1,8 -#define UNIATA_VER_DOT_STR "0.45.1.8" +#define UNIATA_VER_SUB_MJ 2 +#define UNIATA_VER_SUB_MN 1 +#define UNIATA_VER_DOT_COMMA 0,45,2,1 +#define UNIATA_VER_DOT_STR "0.45.2.1" #define UNIATA_VER_YEAR 2014 #define UNIATA_VER_YEAR_STR "2014"

9 years, 10 months

[akhaldi] 65045: [ADVAPI32] * Remove unused MAX_GUID_STRING_LEN and RECORD. * Remove some unneeded forward declarations. * Reorder ACEFLAG to reduce difference to Wine. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 27 17:00:41 2014 New Revision: 65045 URL: http://svn.reactos.org/svn/reactos?rev=65045&view=rev Log: [ADVAPI32] * Remove unused MAX_GUID_STRING_LEN and RECORD. * Remove some unneeded forward declarations. * Reorder ACEFLAG to reduce difference to Wine. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Mon Oct 27 17:00:41 2014 @@ -16,26 +16,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); -static DWORD ComputeStringSidSize(LPCWSTR StringSid); static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes); -#define MAX_GUID_STRING_LEN 39 - -BOOL WINAPI -AddAuditAccessAceEx(PACL pAcl, - DWORD dwAceRevision, - DWORD AceFlags, - DWORD dwAccessMask, - PSID pSid, - BOOL bAuditSuccess, - BOOL bAuditFailure); - -typedef struct RECORD -{ - LPCWSTR key; - DWORD value; -} RECORD; - +typedef struct _ACEFLAG +{ + LPCWSTR wstr; + DWORD value; +} ACEFLAG, *LPACEFLAG; typedef struct _MAX_SID { @@ -52,12 +39,6 @@ WELL_KNOWN_SID_TYPE Type; MAX_SID Sid; } WELLKNOWNSID; - -typedef struct _ACEFLAG -{ - LPCWSTR wstr; - DWORD value; -} ACEFLAG, *LPACEFLAG; static const WELLKNOWNSID WellKnownSids[] = {

9 years, 10 months

[akhaldi] 65044: [ADVAPI32] * Zap SidTable.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 27 16:30:45 2014 New Revision: 65044 URL: http://svn.reactos.org/svn/reactos?rev=65044&view=rev Log: [ADVAPI32] * Zap SidTable. Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Mon Oct 27 16:30:45 2014 @@ -236,49 +236,6 @@ return NT_SUCCESS(status); } -static const RECORD SidTable[] = -{ - { SDDL_ACCOUNT_OPERATORS, WinBuiltinAccountOperatorsSid }, - { SDDL_ALIAS_PREW2KCOMPACC, WinBuiltinPreWindows2000CompatibleAccessSid }, - { SDDL_ANONYMOUS, WinAnonymousSid }, - { SDDL_AUTHENTICATED_USERS, WinAuthenticatedUserSid }, - { SDDL_BUILTIN_ADMINISTRATORS, WinBuiltinAdministratorsSid }, - { SDDL_BUILTIN_GUESTS, WinBuiltinGuestsSid }, - { SDDL_BACKUP_OPERATORS, WinBuiltinBackupOperatorsSid }, - { SDDL_BUILTIN_USERS, WinBuiltinUsersSid }, - { SDDL_CERT_SERV_ADMINISTRATORS, WinAccountCertAdminsSid /* FIXME: DOMAIN_GROUP_RID_CERT_ADMINS */ }, - { SDDL_CREATOR_GROUP, WinCreatorGroupSid }, - { SDDL_CREATOR_OWNER, WinCreatorOwnerSid }, - { SDDL_DOMAIN_ADMINISTRATORS, WinAccountDomainAdminsSid /* FIXME: DOMAIN_GROUP_RID_ADMINS */ }, - { SDDL_DOMAIN_COMPUTERS, WinAccountComputersSid /* FIXME: DOMAIN_GROUP_RID_COMPUTERS */ }, - { SDDL_DOMAIN_DOMAIN_CONTROLLERS, WinAccountControllersSid /* FIXME: DOMAIN_GROUP_RID_CONTROLLERS */ }, - { SDDL_DOMAIN_GUESTS, WinAccountDomainGuestsSid /* FIXME: DOMAIN_GROUP_RID_GUESTS */ }, - { SDDL_DOMAIN_USERS, WinAccountDomainUsersSid /* FIXME: DOMAIN_GROUP_RID_USERS */ }, - { SDDL_ENTERPRISE_ADMINS, WinAccountEnterpriseAdminsSid /* FIXME: DOMAIN_GROUP_RID_ENTERPRISE_ADMINS */ }, - { SDDL_ENTERPRISE_DOMAIN_CONTROLLERS, WinEnterpriseControllersSid }, - { SDDL_EVERYONE, WinWorldSid }, - { SDDL_GROUP_POLICY_ADMINS, WinAccountPolicyAdminsSid /* FIXME: DOMAIN_GROUP_RID_POLICY_ADMINS */ }, - { SDDL_INTERACTIVE, WinInteractiveSid }, - { SDDL_LOCAL_ADMIN, WinAccountAdministratorSid /* FIXME: DOMAIN_USER_RID_ADMIN */ }, - { SDDL_LOCAL_GUEST, WinAccountGuestSid /* FIXME: DOMAIN_USER_RID_GUEST */ }, - { SDDL_LOCAL_SERVICE, WinLocalServiceSid }, - { SDDL_LOCAL_SYSTEM, WinLocalSystemSid }, - { SDDL_NETWORK, WinNetworkSid }, - { SDDL_NETWORK_CONFIGURATION_OPS, WinBuiltinNetworkConfigurationOperatorsSid }, - { SDDL_NETWORK_SERVICE, WinNetworkServiceSid }, - { SDDL_PRINTER_OPERATORS, WinBuiltinPrintOperatorsSid }, - { SDDL_PERSONAL_SELF, WinSelfSid }, - { SDDL_POWER_USERS, WinBuiltinPowerUsersSid }, - { SDDL_RAS_SERVERS, WinAccountRasAndIasServersSid /* FIXME: DOMAIN_ALIAS_RID_RAS_SERVERS */ }, - { SDDL_REMOTE_DESKTOP, WinBuiltinRemoteDesktopUsersSid }, - { SDDL_REPLICATOR, WinBuiltinReplicatorSid }, - { SDDL_RESTRICTED_CODE, WinRestrictedCodeSid }, - { SDDL_SCHEMA_ADMINISTRATORS, WinAccountSchemaAdminsSid /* FIXME: DOMAIN_GROUP_RID_SCHEMA_ADMINS */ }, - { SDDL_SERVER_OPERATORS, WinBuiltinSystemOperatorsSid }, - { SDDL_SERVICE, WinServiceSid }, - { NULL, 0 }, -}; - static LPWSTR SERV_dup( LPCSTR str ) { UINT len;

9 years, 10 months

[pschweitzer] 65043: [FASTFAT] Don't leak reference in case of share access failure.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Oct 27 13:39:03 2014 New Revision: 65043 URL: http://svn.reactos.org/svn/reactos?rev=65043&view=rev Log: [FASTFAT] Don't leak reference in case of share access failure. Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Mon Oct 27 13:39:03 2014 @@ -443,9 +443,9 @@ PVFATFCB pFcb = NULL; PVFATFCB ParentFcb = NULL; PWCHAR c, last; - BOOLEAN PagingFileCreate = FALSE; + BOOLEAN PagingFileCreate; BOOLEAN Dots; - BOOLEAN OpenTargetDir = FALSE; + BOOLEAN OpenTargetDir; UNICODE_STRING FileNameU; UNICODE_STRING PathNameU; ULONG Attributes; @@ -633,6 +633,7 @@ FALSE); if (!NT_SUCCESS(Status)) { + vfatReleaseFCB(DeviceExt, ParentFcb); VfatCloseFile(DeviceExt, FileObject); return Status; }

9 years, 10 months

← Newer
1
...
9
10
11
12
13
14
15
...
73
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 October 2014