Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 37014: sync riched20 with wine 1.1.7
by cwittich＠svn.reactos.org 27 Oct '08

27 Oct '08

Author: cwittich Date: Mon Oct 27 03:10:25 2008 New Revision: 37014 URL: http://svn.reactos.org/svn/reactos?rev=37014&view=rev Log: sync riched20 with wine 1.1.7 Modified: trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/editstr.h trunk/reactos/dll/win32/riched20/paint.c trunk/reactos/dll/win32/riched20/para.c trunk/reactos/dll/win32/riched20/reader.c trunk/reactos/dll/win32/riched20/string.c trunk/reactos/dll/win32/riched20/table.c trunk/reactos/dll/win32/riched20/txtsrv.c trunk/reactos/dll/win32/riched20/undo.c trunk/reactos/dll/win32/riched20/wrap.c trunk/reactos/dll/win32/riched20/writer.c Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -101,6 +101,7 @@ - EM_SETIMEOPTIONS 1.0asian - EM_SETLANGOPTIONS 2.0 - EM_SETLIMITTEXT + - EM_SETMARGINS + EM_SETMODIFY (not sure if implementation is correct) - EM_SETOLECALLBACK + EM_SETOPTIONS (partially implemented) @@ -1937,6 +1938,93 @@ return -1; } +typedef struct tagME_GlobalDestStruct +{ + HGLOBAL hData; + int nLength; +} ME_GlobalDestStruct; + +static DWORD CALLBACK ME_ReadFromHGLOBALUnicode(DWORD_PTR dwCookie, LPBYTE lpBuff, LONG cb, LONG *pcb) +{ + ME_GlobalDestStruct *pData = (ME_GlobalDestStruct *)dwCookie; + int i; + WORD *pSrc, *pDest; + + cb = cb >> 1; + pDest = (WORD *)lpBuff; + pSrc = (WORD *)GlobalLock(pData->hData); + for (i = 0; i<cb && pSrc[pData->nLength+i]; i++) { + pDest[i] = pSrc[pData->nLength+i]; + } + pData->nLength += i; + *pcb = 2*i; + GlobalUnlock(pData->hData); + return 0; +} + +static DWORD CALLBACK ME_ReadFromHGLOBALRTF(DWORD_PTR dwCookie, LPBYTE lpBuff, LONG cb, LONG *pcb) +{ + ME_GlobalDestStruct *pData = (ME_GlobalDestStruct *)dwCookie; + int i; + BYTE *pSrc, *pDest; + + pDest = lpBuff; + pSrc = (BYTE *)GlobalLock(pData->hData); + for (i = 0; i<cb && pSrc[pData->nLength+i]; i++) { + pDest[i] = pSrc[pData->nLength+i]; + } + pData->nLength += i; + *pcb = i; + GlobalUnlock(pData->hData); + return 0; +} + +static BOOL ME_Paste(ME_TextEditor *editor) +{ + DWORD dwFormat = 0; + EDITSTREAM es; + ME_GlobalDestStruct gds; + UINT nRTFFormat = RegisterClipboardFormatA("Rich Text Format"); + UINT cf = 0; + + if (IsClipboardFormatAvailable(nRTFFormat)) + cf = nRTFFormat, dwFormat = SF_RTF; + else if (IsClipboardFormatAvailable(CF_UNICODETEXT)) + cf = CF_UNICODETEXT, dwFormat = SF_TEXT|SF_UNICODE; + else + return FALSE; + + if (!OpenClipboard(editor->hWnd)) + return FALSE; + gds.hData = GetClipboardData(cf); + gds.nLength = 0; + es.dwCookie = (DWORD)&gds; + es.pfnCallback = dwFormat == SF_RTF ? ME_ReadFromHGLOBALRTF : ME_ReadFromHGLOBALUnicode; + ME_StreamIn(editor, dwFormat|SFF_SELECTION, &es, FALSE); + + CloseClipboard(); + return TRUE; +} + +static BOOL ME_Copy(ME_TextEditor *editor, CHARRANGE *range) +{ + LPDATAOBJECT dataObj = NULL; + HRESULT hr = S_OK; + + if (editor->cPasswordMask) + return FALSE; /* Copying or Cutting masked text isn't allowed */ + + if(editor->lpOleCallback) + hr = IRichEditOleCallback_GetClipboardData(editor->lpOleCallback, range, RECO_COPY, &dataObj); + if(FAILED(hr) || !dataObj) + hr = ME_GetDataObject(editor, range, &dataObj); + if(SUCCEEDED(hr)) { + hr = OleSetClipboard(dataObj); + IDataObject_Release(dataObj); + } + return SUCCEEDED(hr) != 0; +} + /* helper to send a msg filter notification */ static BOOL ME_FilterEvent(ME_TextEditor *editor, UINT msg, WPARAM* wParam, LPARAM* lParam) @@ -2022,6 +2110,49 @@ ME_UpdateRepaint(editor); ME_SendRequestResize(editor, FALSE); return TRUE; + case 'A': + if (ctrl_is_down) + { + ME_SetSelection(editor, 0, -1); + return TRUE; + } + break; + case 'V': + if (ctrl_is_down) + return ME_Paste(editor); + break; + case 'C': + case 'X': + if (ctrl_is_down) + { + CHARRANGE range; + BOOL result; + + ME_GetSelection(editor, &range.cpMin, &range.cpMax); + result = ME_Copy(editor, &range); + if (result && nKey == 'X') + { + ME_InternalDeleteText(editor, range.cpMin, range.cpMax-range.cpMin, FALSE); + ME_CommitUndo(editor); + ME_UpdateRepaint(editor); + } + return result; + } + break; + case 'Z': + if (ctrl_is_down) + { + ME_Undo(editor); + return TRUE; + } + break; + case 'Y': + if (ctrl_is_down) + { + ME_Redo(editor); + return TRUE; + } + break; default: if (nKey != VK_SHIFT && nKey != VK_CONTROL && nKey && nKey != VK_MENU) @@ -2103,10 +2234,29 @@ POINT pt; BOOL isExact; int offset; + SCROLLBARINFO sbi; DWORD messagePos = GetMessagePos(); pt.x = (short)LOWORD(messagePos); pt.y = (short)HIWORD(messagePos); + + sbi.cbSize = sizeof(sbi); + GetScrollBarInfo(editor->hWnd, OBJID_HSCROLL, &sbi); + if (!(sbi.rgstate[0] & (STATE_SYSTEM_INVISIBLE|STATE_SYSTEM_OFFSCREEN)) && + PtInRect(&sbi.rcScrollBar, pt)) + { + SetCursor(LoadCursorW(NULL, (WCHAR*)IDC_ARROW)); + return TRUE; + } + sbi.cbSize = sizeof(sbi); + GetScrollBarInfo(editor->hWnd, OBJID_VSCROLL, &sbi); + if (!(sbi.rgstate[0] & (STATE_SYSTEM_INVISIBLE|STATE_SYSTEM_OFFSCREEN)) && + PtInRect(&sbi.rcScrollBar, pt)) + { + SetCursor(LoadCursorW(NULL, (WCHAR*)IDC_ARROW)); + return TRUE; + } ScreenToClient(editor->hWnd, &pt); + if ((GetWindowLongW(editor->hWnd, GWL_STYLE) & ES_SELECTIONBAR) && (pt.x < editor->selofs || (editor->nSelectionType == stLine && GetCapture() == editor->hWnd))) @@ -2209,8 +2359,7 @@ ed->nParagraphs = 1; ed->nLastSelStart = ed->nLastSelEnd = 0; ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); - ed->bRedraw = TRUE; - ed->bWordWrap = (GetWindowLongW(hWnd, GWL_STYLE) & WS_HSCROLL) ? FALSE : TRUE; + ed->bWordWrap = (GetWindowLongW(hWnd, GWL_STYLE) & (WS_HSCROLL|ES_AUTOHSCROLL)) ? FALSE : TRUE; ed->bHideSelection = FALSE; ed->nInvalidOfs = -1; ed->pfnWordBreak = NULL; @@ -2250,48 +2399,6 @@ return ed; } - -typedef struct tagME_GlobalDestStruct -{ - HGLOBAL hData; - int nLength; -} ME_GlobalDestStruct; - -static DWORD CALLBACK ME_ReadFromHGLOBALUnicode(DWORD_PTR dwCookie, LPBYTE lpBuff, LONG cb, LONG *pcb) -{ - ME_GlobalDestStruct *pData = (ME_GlobalDestStruct *)dwCookie; - int i; - WORD *pSrc, *pDest; - - cb = cb >> 1; - pDest = (WORD *)lpBuff; - pSrc = (WORD *)GlobalLock(pData->hData); - for (i = 0; i<cb && pSrc[pData->nLength+i]; i++) { - pDest[i] = pSrc[pData->nLength+i]; - } - pData->nLength += i; - *pcb = 2*i; - GlobalUnlock(pData->hData); - return 0; -} - -static DWORD CALLBACK ME_ReadFromHGLOBALRTF(DWORD_PTR dwCookie, LPBYTE lpBuff, LONG cb, LONG *pcb) -{ - ME_GlobalDestStruct *pData = (ME_GlobalDestStruct *)dwCookie; - int i; - BYTE *pSrc, *pDest; - - pDest = lpBuff; - pSrc = (BYTE *)GlobalLock(pData->hData); - for (i = 0; i<cb && pSrc[pData->nLength+i]; i++) { - pDest[i] = pSrc[pData->nLength+i]; - } - pData->nLength += i; - *pcb = i; - GlobalUnlock(pData->hData); - return 0; -} - void ME_DestroyEditor(ME_TextEditor *editor) { @@ -2530,6 +2637,7 @@ UNSUPPORTED_MSG(EM_SETEDITSTYLE) UNSUPPORTED_MSG(EM_SETFONTSIZE) UNSUPPORTED_MSG(EM_SETLANGOPTIONS) + UNSUPPORTED_MSG(EM_SETMARGINS) UNSUPPORTED_MSG(EM_SETPALETTE) UNSUPPORTED_MSG(EM_SETTABSTOPS) UNSUPPORTED_MSG(EM_SETTYPOGRAPHYOPTIONS) @@ -2741,8 +2849,9 @@ ME_GetSelection(editor, &from, &to); style = ME_GetSelectionInsertStyle(editor); ME_InternalDeleteText(editor, from, to - from, FALSE); - if (pStruct->codepage != 1200 && lParam && !strncmp((char *)lParam, "{\\rtf", 5)) - ME_StreamInRTFString(editor, 1, (char *)lParam); + if (pStruct->codepage != 1200 && lParam && + (!strncmp((char *)lParam, "{\\rtf", 5) || !strncmp((char *)lParam, "{\\urtf}", 6))) + ME_StreamInRTFString(editor, 1, (char *)lParam); else ME_InsertTextFromCursor(editor, 0, wszText, len, style); ME_ReleaseStyle(style); @@ -2750,8 +2859,9 @@ } else { ME_InternalDeleteText(editor, 0, ME_GetTextLength(editor), FALSE); - if (pStruct->codepage != 1200 && lParam && !strncmp((char *)lParam, "{\\rtf", 5)) - ME_StreamInRTFString(editor, 0, (char *)lParam); + if (pStruct->codepage != 1200 && lParam && + (!strncmp((char *)lParam, "{\\rtf", 5) || !strncmp((char *)lParam, "{\\urtf}", 6))) + ME_StreamInRTFString(editor, 0, (char *)lParam); else ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); len = 1; @@ -2785,11 +2895,8 @@ editor->rgbBackColor = lParam; editor->hbrBackground = CreateSolidBrush(editor->rgbBackColor); } - if (editor->bRedraw) - { - InvalidateRect(hWnd, NULL, TRUE); - UpdateWindow(hWnd); - } + InvalidateRect(hWnd, NULL, TRUE); + UpdateWindow(hWnd); return lColor; } case EM_GETMODIFY: @@ -3047,51 +3154,15 @@ return FALSE; } case WM_PASTE: - { - DWORD dwFormat = 0; - EDITSTREAM es; - ME_GlobalDestStruct gds; - UINT nRTFFormat = RegisterClipboardFormatA("Rich Text Format"); - UINT cf = 0; - - if (IsClipboardFormatAvailable(nRTFFormat)) - cf = nRTFFormat, dwFormat = SF_RTF; - else if (IsClipboardFormatAvailable(CF_UNICODETEXT)) - cf = CF_UNICODETEXT, dwFormat = SF_TEXT|SF_UNICODE; - else - return 0; - - if (!OpenClipboard(hWnd)) - return 0; - gds.hData = GetClipboardData(cf); - gds.nLength = 0; - es.dwCookie = (DWORD)&gds; - es.pfnCallback = dwFormat == SF_RTF ? ME_ReadFromHGLOBALRTF : ME_ReadFromHGLOBALUnicode; - ME_StreamIn(editor, dwFormat|SFF_SELECTION, &es, FALSE); - - CloseClipboard(); + ME_Paste(editor); return 0; - } case WM_CUT: case WM_COPY: { - LPDATAOBJECT dataObj = NULL; CHARRANGE range; - HRESULT hr = S_OK; - - if (editor->cPasswordMask) - return 0; /* Copying or Cutting masked text isn't allowed */ - ME_GetSelection(editor, &range.cpMin, &range.cpMax); - if(editor->lpOleCallback) - hr = IRichEditOleCallback_GetClipboardData(editor->lpOleCallback, &range, RECO_COPY, &dataObj); - if(FAILED(hr) || !dataObj) - hr = ME_GetDataObject(editor, &range, &dataObj); - if(SUCCEEDED(hr)) { - hr = OleSetClipboard(dataObj); - IDataObject_Release(dataObj); - } - if (SUCCEEDED(hr) && msg == WM_CUT) + + if (ME_Copy(editor, &range) && msg == WM_CUT) { ME_InternalDeleteText(editor, range.cpMin, range.cpMax-range.cpMin, FALSE); ME_CommitUndo(editor); @@ -3472,18 +3543,15 @@ if (wParam >= 0x40000) nCharOfs = lParam; nLength = ME_GetTextLength(editor); - - if (nCharOfs < nLength) { - ME_RunOfsFromCharOfs(editor, nCharOfs, &pRun, &nOffset); - assert(pRun->type == diRun); - pt.y = pRun->member.run.pt.y; - pt.x = pRun->member.run.pt.x + ME_PointFromChar(editor, &pRun->member.run, nOffset); - pt.y += ME_GetParagraph(pRun)->member.para.pt.y; - } else { - pt.x = 0; - pt.y = editor->pBuffer->pLast->member.para.pt.y; - } + nCharOfs = min(nCharOfs, nLength); + + ME_RunOfsFromCharOfs(editor, nCharOfs, &pRun, &nOffset); + assert(pRun->type == diRun); + pt.y = pRun->member.run.pt.y; + pt.x = pRun->member.run.pt.x + ME_PointFromChar(editor, &pRun->member.run, nOffset); + pt.y += ME_GetParagraph(pRun)->member.para.pt.y; pt.x += editor->selofs; + pt.x++; /* for some reason native offsets x by one */ si.cbSize = sizeof(si); si.fMask = SIF_POS; @@ -3581,7 +3649,6 @@ goto do_default; break; case WM_PAINT: - if (editor->bRedraw) { HDC hDC; PAINTSTRUCT ps; @@ -3604,14 +3671,11 @@ return 0; case WM_ERASEBKGND: { - if (editor->bRedraw) - { - HDC hDC = (HDC)wParam; - RECT rc; - if (GetUpdateRect(hWnd,&rc,TRUE)) - { - FillRect(hDC, &rc, editor->hbrBackground); - } + HDC hDC = (HDC)wParam; + RECT rc; + if (GetUpdateRect(hWnd,&rc,TRUE)) + { + FillRect(hDC, &rc, editor->hbrBackground); } return 1; } @@ -3642,36 +3706,11 @@ MultiByteToWideChar(CP_ACP, 0, &charA, 1, &wstr, 1); } - switch (wstr) - { - case 1: /* Ctrl-A */ - ME_SetSelection(editor, 0, -1); - return 0; - case 3: /* Ctrl-C */ - SendMessageW(editor->hWnd, WM_COPY, 0, 0); - return 0; - } - if (GetWindowLongW(editor->hWnd, GWL_STYLE) & ES_READONLY) { MessageBeep(MB_ICONERROR); return 0; /* FIXME really 0 ? */ } - switch (wstr) - { - case 22: /* Ctrl-V */ - SendMessageW(editor->hWnd, WM_PASTE, 0, 0); - return 0; - case 24: /* Ctrl-X */ - SendMessageW(editor->hWnd, WM_CUT, 0, 0); - return 0; - case 25: /* Ctrl-Y */ - SendMessageW(editor->hWnd, EM_REDO, 0, 0); - return 0; - case 26: /* Ctrl-Z */ - SendMessageW(editor->hWnd, EM_UNDO, 0, 0); - return 0; - } if (((unsigned)wstr)>=' ' || (wstr=='\r' && (GetWindowLongW(hWnd, GWL_STYLE) & ES_MULTILINE)) || wstr=='\t') { @@ -3930,9 +3969,7 @@ ME_SendRequestResize(editor, TRUE); return 0; case WM_SETREDRAW: - if ((editor->bRedraw = wParam)) - ME_RewrapRepaint(editor); - return 0; + return DefWindowProcW(hWnd, msg, wParam, lParam); case WM_SIZE: { GetClientRect(hWnd, &editor->rcFormat); Modified: trunk/reactos/dll/win32/riched20/editstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editstr… ============================================================================== --- trunk/reactos/dll/win32/riched20/editstr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editstr.h [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -351,7 +351,6 @@ ME_FontCacheItem pFontCache[HFONT_CACHE_SIZE]; int nZoomNumerator, nZoomDenominator; RECT rcFormat; - BOOL bRedraw; BOOL bWordWrap; int nInvalidOfs; int nTextLimit; @@ -401,7 +400,7 @@ int nAvailWidth; int nRow; POINT pt; - BOOL bOverflown; + BOOL bOverflown, bWordWrap; ME_DisplayItem *pRowStart; ME_DisplayItem *pLastSplittableRun; Modified: trunk/reactos/dll/win32/riched20/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/paint.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/paint.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/paint.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -147,6 +147,8 @@ ME_UpdateScrollBar(editor); FIXME("ME_Repaint had to call ME_WrapMarkedParagraphs\n"); } + if (!IsWindowVisible(editor->hWnd)) + return; if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) ME_SendOldNotify(editor, EN_UPDATE); UpdateWindow(editor->hWnd); @@ -159,7 +161,6 @@ BOOL wrappedParagraphs; wrappedParagraphs = ME_WrapMarkedParagraphs(editor); - if (!editor->bRedraw) return; if (wrappedParagraphs) ME_UpdateScrollBar(editor); @@ -185,12 +186,9 @@ * looks, but not content. Like resizing. */ ME_MarkAllForWrapping(editor); - if (editor->bRedraw) - { - ME_WrapMarkedParagraphs(editor); - ME_UpdateScrollBar(editor); - ME_Repaint(editor); - } + ME_WrapMarkedParagraphs(editor); + ME_UpdateScrollBar(editor); + ME_Repaint(editor); } int ME_twips2pointsX(ME_Context *c, int x) @@ -1074,17 +1072,14 @@ si.nPos = 0; } - nNewPos = SetScrollInfo(editor->hWnd, SB_VERT, &si, editor->bRedraw); + nNewPos = SetScrollInfo(editor->hWnd, SB_VERT, &si, TRUE); editor->vert_si.nPos = nNewPos; nActualScroll = nOrigPos - nNewPos; - if (editor->bRedraw) - { - if (abs(nActualScroll) > editor->sizeWindow.cy) - InvalidateRect(editor->hWnd, NULL, TRUE); - else - ScrollWindowEx(editor->hWnd, 0, nActualScroll, NULL, NULL, NULL, NULL, SW_INVALIDATE); - ME_Repaint(editor); - } + if (abs(nActualScroll) > editor->sizeWindow.cy) + InvalidateRect(editor->hWnd, NULL, TRUE); + else + ScrollWindowEx(editor->hWnd, 0, nActualScroll, NULL, NULL, NULL, NULL, SW_INVALIDATE); + ME_Repaint(editor); hWnd = editor->hWnd; winStyle = GetWindowLongW(hWnd, GWL_STYLE); @@ -1099,7 +1094,7 @@ } - void ME_UpdateScrollBar(ME_TextEditor *editor) +void ME_UpdateScrollBar(ME_TextEditor *editor) { /* Note that this is the only function that should ever call SetScrolLInfo * with SIF_PAGE or SIF_RANGE. SetScrollPos and SetScrollRange should never Modified: trunk/reactos/dll/win32/riched20/para.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/para.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/para.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/para.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -287,6 +287,7 @@ { ME_AddUndoItem(editor, diUndoSetParagraphFormat, tp); *tp->member.para.pFmt = *pNext->member.para.pFmt; + tp->member.para.border = pNext->member.para.border; } if (!editor->bEmulateVersion10) { /* v4.1 */ Modified: trunk/reactos/dll/win32/riched20/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/reader.… ============================================================================== --- trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -109,7 +109,7 @@ if (stream->dwSize == 0) return EOF; } - ch = stream->buffer[stream->dwUsed++]; + ch = (unsigned char)stream->buffer[stream->dwUsed++]; if (!ch) return EOF; return ch; Modified: trunk/reactos/dll/win32/riched20/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/string.… ============================================================================== --- trunk/reactos/dll/win32/riched20/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/string.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -304,6 +304,8 @@ /* FIXME: Native also knows about punctuation */ TRACE("s==%s, start==%d, len==%d, code==%d\n", debugstr_wn(s, len), start, len, code); + /* convert number of bytes to number of characters. */ + len /= sizeof(WCHAR); switch (code) { case WB_ISDELIMITER: @@ -330,11 +332,23 @@ int ME_CallWordBreakProc(ME_TextEditor *editor, ME_String *str, INT start, INT code) { - /* FIXME: ANSIfy the string when bEmulateVersion10 is TRUE */ - if (!editor->pfnWordBreak) - return ME_WordBreakProc(str->szData, start, str->nLen, code); - else - return editor->pfnWordBreak(str->szData, start, str->nLen, code); + if (!editor->pfnWordBreak) { + return ME_WordBreakProc(str->szData, start, str->nLen*sizeof(WCHAR), code); + } else if (!editor->bEmulateVersion10) { + /* MSDN lied about the third parameter for EditWordBreakProc being the number + * of characters, it is actually the number of bytes of the string. */ + return editor->pfnWordBreak(str->szData, start, str->nLen*sizeof(WCHAR), code); + } else { + int result; + int buffer_size = WideCharToMultiByte(CP_ACP, 0, str->szData, str->nLen, + NULL, 0, NULL, NULL); + char *buffer = (char*)heap_alloc(buffer_size); + WideCharToMultiByte(CP_ACP, 0, str->szData, str->nLen, + buffer, buffer_size, NULL, NULL); + result = editor->pfnWordBreak(str->szData, start, str->nLen, code); + heap_free(buffer); + return result; + } } LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz) Modified: trunk/reactos/dll/win32/riched20/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/table.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/table.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/table.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -392,9 +392,10 @@ assert(table_row); assert(table_row->type == diParagraph); if (!editor->bEmulateVersion10) { /* v4.1 */ - ME_DisplayItem *insertedCell, *para, *cell; + ME_DisplayItem *insertedCell, *para, *cell, *prevTableEnd; cell = ME_FindItemFwd(ME_GetTableRowStart(table_row), diCell); - run = ME_GetTableRowEnd(table_row)->member.para.next_para; + prevTableEnd = ME_GetTableRowEnd(table_row); + run = prevTableEnd->member.para.next_para; run = ME_FindItemFwd(run, diRun); editor->pCursors[0].pRun = run; editor->pCursors[0].nOffset = 0; @@ -412,7 +413,8 @@ insertedCell->member.cell.nRightBoundary = cell->member.cell.nRightBoundary; insertedCell->member.cell.border = cell->member.cell.border; }; - ME_InsertTableRowEndFromCursor(editor); + para = ME_InsertTableRowEndFromCursor(editor); + *para->member.para.pFmt = *prevTableEnd->member.para.pFmt; /* return the table row start for the inserted paragraph */ return ME_FindItemFwd(cell, diParagraph)->member.para.next_para; } else { /* v1.0 - 3.0 */ Modified: trunk/reactos/dll/win32/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txtsrv.… ============================================================================== --- trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -57,6 +57,7 @@ ITextHost *pMyHost; LONG ref; CRITICAL_SECTION csTxtSrv; + char spare[256]; } ITextServicesImpl; static const ITextServicesVtbl textservices_Vtbl; Modified: trunk/reactos/dll/win32/riched20/undo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/undo.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/undo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/undo.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -96,6 +96,7 @@ pItem->member.para.pFmt->cbSize = sizeof(PARAFORMAT2); pItem->member.para.pFmt->dwMask = 0; *pItem->member.para.pFmt = *pdi->member.para.pFmt; + pItem->member.para.border = pdi->member.para.border; pItem->member.para.nFlags = prev_para->member.para.nFlags & ~MEPF_CELL; pItem->member.para.pCell = NULL; break; @@ -293,6 +294,7 @@ para = ME_FindItemBack(tmp.pRun, diParagraph); ME_AddUndoItem(editor, diUndoSetParagraphFormat, para); *para->member.para.pFmt = *pItem->member.para.pFmt; + para->member.para.border = pItem->member.para.border; break; } case diUndoSetCharFormat: @@ -343,12 +345,14 @@ new_para->member.para.nFlags |= MEPF_ROWSTART; assert(pItem->member.para.pFmt->cbSize == sizeof(PARAFORMAT2)); *new_para->member.para.pFmt = *pItem->member.para.pFmt; + new_para->member.para.border = pItem->member.para.border; if (pItem->member.para.pCell) { ME_DisplayItem *pItemCell, *pCell; pItemCell = pItem->member.para.pCell; pCell = new_para->member.para.pCell; pCell->member.cell.nRightBoundary = pItemCell->member.cell.nRightBoundary; + pCell->member.cell.border = pItemCell->member.cell.border; } break; } Modified: trunk/reactos/dll/win32/riched20/wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/wrap.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/wrap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/wrap.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -50,8 +50,10 @@ wc->pRowStart = NULL; wc->bOverflown = FALSE; wc->pLastSplittableRun = NULL; + wc->bWordWrap = wc->context->editor->bWordWrap; if (para->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND)) { wc->nAvailWidth = 0; + wc->bWordWrap = FALSE; if (para->member.para.nFlags & MEPF_ROWEND) { ME_Cell *cell = &ME_FindItemBack(para, diCell)->member.cell; @@ -73,11 +75,11 @@ wc->nAvailWidth = cell->nWidth - (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin; - } else if (wc->context->editor->bWordWrap) { + wc->bWordWrap = TRUE; + } else { wc->nAvailWidth = wc->context->rcView.right - wc->context->rcView.left - - (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin; - } else { - wc->nAvailWidth = ~0u >> 1; + - (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin + - wc->context->editor->selofs; } wc->pt.x = wc->context->pt.x; if (wc->context->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ @@ -148,9 +150,9 @@ assert(para->member.para.pFmt->dwMask & PFM_ALIGNMENT); align = para->member.para.pFmt->wAlignment; if (align == PFA_CENTER) - shift = (wc->nAvailWidth-width)/2; + shift = max((wc->nAvailWidth-width)/2, 0); if (align == PFA_RIGHT) - shift = wc->nAvailWidth-width; + shift = max(wc->nAvailWidth-width, 0); for (p = wc->pRowStart; p!=pEnd; p = p->next) { if (p->type==diRun) { /* FIXME add more run types */ @@ -377,7 +379,8 @@ } /* will current run fit? */ - if (wc->pt.x + run->nWidth - wc->context->pt.x > wc->nAvailWidth) + if (wc->bWordWrap && + wc->pt.x + run->nWidth - wc->context->pt.x > wc->nAvailWidth) { int loc = wc->context->pt.x + wc->nAvailWidth - wc->pt.x; /* total white run ? */ @@ -416,9 +419,11 @@ { if (run->nFlags & MERF_STARTWHITE) { - /* we had only spaces so far, so we must be on the first line of the - * paragraph, since no other lines of the paragraph start with spaces. */ - assert(!wc->nRow); + /* We had only spaces so far, so we must be on the first line of the + * paragraph (or the first line after MERF_ENDROW forced the line + * break within the paragraph), since no other lines of the paragraph + * start with spaces. */ + /* The lines will only contain spaces, and the rest of the run will * overflow onto the next line. */ wc->bOverflown = TRUE; @@ -730,30 +735,31 @@ return bModified; } -void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor) { +void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor) +{ ME_Context c; + RECT rc; + int ofs; + ME_DisplayItem *item; ME_InitContext(&c, editor, GetDC(editor->hWnd)); - if (editor->bRedraw) - { - RECT rc = c.rcView; - int ofs = ME_GetYScrollPos(editor); - - ME_DisplayItem *item = editor->pBuffer->pFirst; - while(item != editor->pBuffer->pLast) { - if (item->member.para.nFlags & MEPF_REPAINT) { - rc.top = item->member.para.pt.y - ofs; - rc.bottom = item->member.para.pt.y + item->member.para.nHeight - ofs; - InvalidateRect(editor->hWnd, &rc, TRUE); - } - item = item->member.para.next_para; - } - if (editor->nTotalLength < editor->nLastTotalLength) - { - rc.top = editor->nTotalLength - ofs; - rc.bottom = editor->nLastTotalLength - ofs; + rc = c.rcView; + ofs = ME_GetYScrollPos(editor); + + item = editor->pBuffer->pFirst; + while(item != editor->pBuffer->pLast) { + if (item->member.para.nFlags & MEPF_REPAINT) { + rc.top = item->member.para.pt.y - ofs; + rc.bottom = item->member.para.pt.y + item->member.para.nHeight - ofs; InvalidateRect(editor->hWnd, &rc, TRUE); } + item = item->member.para.next_para; + } + if (editor->nTotalLength < editor->nLastTotalLength) + { + rc.top = editor->nTotalLength - ofs; + rc.bottom = editor->nLastTotalLength - ofs; + InvalidateRect(editor->hWnd, &rc, TRUE); } ME_DestroyContext(&c, editor->hWnd); } Modified: trunk/reactos/dll/win32/riched20/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/writer.… ============================================================================== --- trunk/reactos/dll/win32/riched20/writer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/writer.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -196,11 +196,14 @@ static BOOL -ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, const ME_DisplayItem *pLastRun) +ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, + ME_DisplayItem *pLastRun) { ME_DisplayItem *item = pFirstRun; ME_FontTableItem *table = pStream->fonttbl; int i; + ME_DisplayItem *pLastPara = ME_GetParagraph(pLastRun); + ME_DisplayItem *pCell = NULL; do { CHARFORMAT2W *fmt = &item->member.run.style->fmt; @@ -214,7 +217,7 @@ if (table[i].bCharSet == bCharSet && (table[i].szFaceName == face || !lstrcmpW(table[i].szFaceName, face))) break; - if (i == pStream->nFontTblLen) { + if (i == pStream->nFontTblLen && i < STREAMOUT_FONTTBL_SIZE) { table[i].bCharSet = bCharSet; table[i].szFaceName = face; pStream->nFontTblLen++; @@ -226,7 +229,7 @@ for (i = 1; i < pStream->nColorTblLen; i++) if (pStream->colortbl[i] == crColor) break; - if (i == pStream->nColorTblLen) { + if (i == pStream->nColorTblLen && i < STREAMOUT_COLORTBL_SIZE) { pStream->colortbl[i] = crColor; pStream->nColorTblLen++; } @@ -236,7 +239,7 @@ for (i = 1; i < pStream->nColorTblLen; i++) if (pStream->colortbl[i] == crColor) break; - if (i == pStream->nColorTblLen) { + if (i == pStream->nColorTblLen && i < STREAMOUT_COLORTBL_SIZE) { pStream->colortbl[i] = crColor; pStream->nColorTblLen++; } @@ -245,6 +248,38 @@ if (item == pLastRun) break; item = ME_FindItemFwd(item, diRun); + } while (item); + item = ME_GetParagraph(pFirstRun); + do { + if (item->member.para.pCell && item->member.para.pCell) + { + pCell = item->member.para.pCell; + if (pCell) + { + ME_Border* borders[4] = { &pCell->member.cell.border.top, + &pCell->member.cell.border.left, + &pCell->member.cell.border.bottom, + &pCell->member.cell.border.right }; + for (i = 0; i < 4; i++) + { + if (borders[i]->width > 0) + { + int j; + COLORREF crColor = borders[i]->colorRef; + for (j = 1; j < pStream->nColorTblLen; j++) + if (pStream->colortbl[j] == crColor) + break; + if (j == pStream->nColorTblLen && j < STREAMOUT_COLORTBL_SIZE) { + pStream->colortbl[j] = crColor; + pStream->nColorTblLen++; + } + } + } + } + } + if (item == pLastPara) + break; + item = item->member.para.next_para; } while (item); if (!ME_StreamOutPrint(pStream, "{\\fonttbl")) @@ -286,30 +321,78 @@ static BOOL ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream, - const ME_DisplayItem *para) + ME_DisplayItem *para) { ME_DisplayItem *cell; char props[STREAMOUT_BUFFER_SIZE] = ""; + int i; + const char sideChar[4] = {'t','l','b','r'}; if (!ME_StreamOutPrint(pStream, "\\trowd")) return FALSE; if (!editor->bEmulateVersion10) { /* v4.1 */ - assert(para->member.para.nFlags & MEPF_ROWSTART); + PARAFORMAT2 *pFmt = ME_GetTableRowEnd(para)->member.para.pFmt; + para = ME_GetTableRowStart(para); cell = para->member.para.next_para->member.para.pCell; assert(cell); + if (pFmt->dxOffset) + sprintf(props + strlen(props), "\\trgaph%d", pFmt->dxOffset); + if (pFmt->dxStartIndent) + sprintf(props + strlen(props), "\\trleft%d", pFmt->dxStartIndent); do { + ME_Border* borders[4] = { &cell->member.cell.border.top, + &cell->member.cell.border.left, + &cell->member.cell.border.bottom, + &cell->member.cell.border.right }; + for (i = 0; i < 4; i++) + { + if (borders[i]->width) + { + int j; + COLORREF crColor = borders[i]->colorRef; + sprintf(props + strlen(props), "\\clbrdr%c", sideChar[i]); + sprintf(props + strlen(props), "\\brdrs"); + sprintf(props + strlen(props), "\\brdrw%d", borders[i]->width); + for (j = 1; j < pStream->nColorTblLen; j++) { + if (pStream->colortbl[j] == crColor) { + sprintf(props + strlen(props), "\\brdrcf%u", j); + break; + } + } + } + } sprintf(props + strlen(props), "\\cellx%d", cell->member.cell.nRightBoundary); cell = cell->member.cell.next_cell; } while (cell->member.cell.next_cell); } else { /* v1.0 - 3.0 */ + const ME_Border* borders[4] = { &para->member.para.border.top, + &para->member.para.border.left, + &para->member.para.border.bottom, + &para->member.para.border.right }; PARAFORMAT2 *pFmt = para->member.para.pFmt; - int i; assert(!(para->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND|MEPF_CELL))); if (pFmt->dxOffset) sprintf(props + strlen(props), "\\trgaph%d", pFmt->dxOffset); if (pFmt->dxStartIndent) sprintf(props + strlen(props), "\\trleft%d", pFmt->dxStartIndent); + for (i = 0; i < 4; i++) + { + if (borders[i]->width) + { + int j; + COLORREF crColor = borders[i]->colorRef; + sprintf(props + strlen(props), "\\trbrdr%c", sideChar[i]); + sprintf(props + strlen(props), "\\brdrs"); + sprintf(props + strlen(props), "\\brdrw%d", borders[i]->width); + for (j = 1; j < pStream->nColorTblLen; j++) { + if (pStream->colortbl[j] == crColor) { + sprintf(props + strlen(props), "\\brdrcf%u", j); + break; + } + } + } + } for (i = 0; i < pFmt->cTabCount; i++) { sprintf(props + strlen(props), "\\cellx%d", pFmt->rgxTabs[i] & 0x00FFFFFF); @@ -727,7 +810,7 @@ } } else if (p->member.para.nFlags & MEPF_ROWEND) { pStream->nNestingLevel--; - if (pStream->nNestingLevel > 1) { + if (pStream->nNestingLevel >= 1) { if (!ME_StreamOutPrint(pStream, "{\\*\\nesttableprops")) return FALSE; if (!ME_StreamOutRTFTableProps(editor, pStream, p))

1 0

[cwittich] 37013: set correct timezone in 2nd stage patch by hto See issue #3822 for more details.
by cwittich＠svn.reactos.org 27 Oct '08

27 Oct '08

Author: cwittich Date: Mon Oct 27 02:56:33 2008 New Revision: 37013 URL: http://svn.reactos.org/svn/reactos?rev=37013&view=rev Log: set correct timezone in 2nd stage patch by hto See issue #3822 for more details. Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Mon Oct 27 02:56:33 2008 @@ -1137,7 +1137,7 @@ LPTSTR Ptr; LPTSTR End; BOOL bFound = FALSE; - int iLanguageID; + unsigned long iLanguageID; if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"), @@ -1158,7 +1158,7 @@ return FALSE; } - iLanguageID = _ttoi(szLanguageIdString); + iLanguageID = _tcstoul(szLanguageIdString, NULL, 16); RegCloseKey(hKey); if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, @@ -1205,7 +1205,7 @@ while (*Ptr != 0) { Length = _tcslen(Ptr); - if (_ttoi(Ptr) == iLanguageID) + if (_tcstoul(Ptr, NULL, 16) == iLanguageID) bFound = TRUE; Ptr = Ptr + Length + 1;

1 0

[pschweitzer] 37012: FsRtlNotifyVolumeEvent: - IoReportTargetDeviceChangeAsynchronous is only called for mount event. For the rest, call IoReportTargetDeviceChange - Fixed a mistake in status return (even if it's not perfect, because of the FIXME)
by pschweitzer＠svn.reactos.org 27 Oct '08

27 Oct '08

Author: pschweitzer Date: Mon Oct 27 02:34:02 2008 New Revision: 37012 URL: http://svn.reactos.org/svn/reactos?rev=37012&view=rev Log: FsRtlNotifyVolumeEvent: - IoReportTargetDeviceChangeAsynchronous is only called for mount event. For the rest, call IoReportTargetDeviceChange - Fixed a mistake in status return (even if it's not perfect, because of the FIXME) Modified: branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c [iso-8859-1] Mon Oct 27 02:34:02 2008 @@ -39,10 +39,11 @@ IN ULONG EventCode) { LPGUID Guid = NULL; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status = STATUS_INVALID_PARAMETER; PDEVICE_OBJECT DeviceObject = NULL; TARGET_DEVICE_CUSTOM_NOTIFICATION Notification; + /* FIXME: We should call IoGetRelatedTargetDevice here */ DeviceObject = IoGetRelatedDeviceObject(FileObject); if (DeviceObject) { @@ -85,20 +86,26 @@ Guid = (LPGUID)&GUID_IO_VOLUME_UNLOCK; break; } - default: - { - Status = STATUS_INVALID_PARAMETER; - break; - } } if (Guid) { /* Copy GUID to notification structure and then report the change */ RtlCopyMemory(&(Notification.Event), Guid, sizeof(GUID)); - IoReportTargetDeviceChangeAsynchronous(DeviceObject, - &Notification, - NULL, - NULL); + + if (EventCode == FSRTL_VOLUME_MOUNT) + { + IoReportTargetDeviceChangeAsynchronous(DeviceObject, + &Notification, + NULL, + NULL); + } + else + { + IoReportTargetDeviceChange(DeviceObject, + &Notification); + } + + Status = STATUS_SUCCESS; } ObfDereferenceObject(DeviceObject); }

1 0

[cgutman] 37011: - Merge aicom-network-fixes up to r37010 - Most of the port allocation problems are now fixed
by cgutman＠svn.reactos.org 27 Oct '08

27 Oct '08

Author: cgutman Date: Mon Oct 27 00:16:14 2008 New Revision: 37011 URL: http://svn.reactos.org/svn/reactos?rev=37011&view=rev Log: - Merge aicom-network-fixes up to r37010 - Most of the port allocation problems are now fixed Modified: trunk/reactos/drivers/network/tcpip/include/ports.h trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/lib/drivers/ip/network/ports.c trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c trunk/reactos/lib/drivers/ip/transport/udp/udp.c Modified: trunk/reactos/drivers/network/tcpip/include/ports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/ports.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/ports.h [iso-8859-1] Mon Oct 27 00:16:14 2008 @@ -16,7 +16,6 @@ PVOID ProtoBitBuffer; UINT StartingPort; UINT PortsToOversee; - UINT LastAllocatedPort; FAST_MUTEX Mutex; } PORT_SET, *PPORT_SET; Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Mon Oct 27 00:16:14 2008 @@ -285,6 +285,14 @@ case IPPROTO_TCP: AddrFile->Port = TCPAllocatePort(Address->Address[0].Address[0].sin_port); + + if (Address->Address[0].Address[0].sin_port && + AddrFile->Port != Address->Address[0].Address[0].sin_port) + { + ExFreePool(AddrFile); + return STATUS_INVALID_PARAMETER; + } + AddrFile->Send = NULL; /* TCPSendData */ break; @@ -292,6 +300,14 @@ TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); AddrFile->Port = UDPAllocatePort(Address->Address[0].Address[0].sin_port); + + if (Address->Address[0].Address[0].sin_port && + AddrFile->Port != Address->Address[0].Address[0].sin_port) + { + ExFreePool(AddrFile); + return STATUS_INVALID_PARAMETER; + } + TI_DbgPrint(MID_TRACE,("Setting port %d (wanted %d)\n", AddrFile->Port, Address->Address[0].Address[0].sin_port)); Modified: trunk/reactos/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/por… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ports.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ports.c [iso-8859-1] Mon Oct 27 00:16:14 2008 @@ -15,8 +15,7 @@ UINT PortsToManage ) { PortSet->StartingPort = StartingPort; PortSet->PortsToOversee = PortsToManage; - PortSet->LastAllocatedPort = PortSet->StartingPort + - PortSet->PortsToOversee - 1; + PortSet->ProtoBitBuffer = PoolAllocateBuffer( (PortSet->PortsToOversee + 7) / 8 ); if(!PortSet->ProtoBitBuffer) return STATUS_INSUFFICIENT_RESOURCES; @@ -43,8 +42,13 @@ BOOLEAN Clear; Port = htons(Port); - ASSERT(Port >= PortSet->StartingPort); - ASSERT(Port < PortSet->StartingPort + PortSet->PortsToOversee); + + if ((Port < PortSet->StartingPort) || + (Port >= PortSet->StartingPort + PortSet->PortsToOversee)) + { + return FALSE; + } + Port -= PortSet->StartingPort; ExAcquireFastMutex( &PortSet->Mutex ); @@ -57,64 +61,41 @@ ULONG AllocateAnyPort( PPORT_SET PortSet ) { ULONG AllocatedPort; - ULONG Next; - - if (PortSet->StartingPort + PortSet->PortsToOversee <= - PortSet->LastAllocatedPort + 1) { - Next = PortSet->StartingPort; - } else { - Next = PortSet->LastAllocatedPort + 1; - } - Next -= PortSet->StartingPort; ExAcquireFastMutex( &PortSet->Mutex ); - AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, Next ); + AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, 0 ); if( AllocatedPort != (ULONG)-1 ) { RtlSetBit( &PortSet->ProtoBitmap, AllocatedPort ); AllocatedPort += PortSet->StartingPort; - PortSet->LastAllocatedPort = AllocatedPort; + ExReleaseFastMutex( &PortSet->Mutex ); + return htons(AllocatedPort); } ExReleaseFastMutex( &PortSet->Mutex ); - AllocatedPort = htons(AllocatedPort); - - ASSERT(AllocatedPort >= PortSet->StartingPort); - ASSERT(AllocatedPort < PortSet->StartingPort + PortSet->PortsToOversee); - - return AllocatedPort; + return -1; } ULONG AllocatePortFromRange( PPORT_SET PortSet, ULONG Lowest, ULONG Highest ) { ULONG AllocatedPort; - ULONG Next; - if (PortSet->StartingPort + PortSet->PortsToOversee <= - PortSet->LastAllocatedPort + 1) { - Next = PortSet->StartingPort; - } else { - Next = PortSet->LastAllocatedPort + 1; + if ((Lowest < PortSet->StartingPort) || + (Highest >= PortSet->StartingPort + PortSet->PortsToOversee)) + { + return -1; } - if (Next < Lowest || Highest <= Next) { - Next = Lowest; - } - Next -= PortSet->StartingPort; + Lowest -= PortSet->StartingPort; Highest -= PortSet->StartingPort; ExAcquireFastMutex( &PortSet->Mutex ); - AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, Next ); - if( AllocatedPort != (ULONG)-1 && AllocatedPort >= Lowest && - AllocatedPort <= Highest) { + AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, Lowest ); + if( AllocatedPort != (ULONG)-1 && AllocatedPort <= Highest) { RtlSetBit( &PortSet->ProtoBitmap, AllocatedPort ); AllocatedPort += PortSet->StartingPort; - PortSet->LastAllocatedPort = AllocatedPort; + ExReleaseFastMutex( &PortSet->Mutex ); + return htons(AllocatedPort); } ExReleaseFastMutex( &PortSet->Mutex ); - AllocatedPort = htons(AllocatedPort); - - ASSERT(AllocatedPort >= PortSet->StartingPort); - ASSERT(AllocatedPort < PortSet->StartingPort + PortSet->PortsToOversee); - - return AllocatedPort; + return -1; } Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/r… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Mon Oct 27 00:16:14 2008 @@ -223,8 +223,10 @@ TI_DbgPrint(MID_TRACE,("About to get route to destination\n")); - if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) + if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) { + FreeNdisPacket(Packet.NdisPacket); return STATUS_UNSUCCESSFUL; + } TI_DbgPrint(MID_TRACE,("About to send datagram\n")); Modified: trunk/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/u… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Mon Oct 27 00:16:14 2008 @@ -33,15 +33,19 @@ */ { PUDP_HEADER UDPHeader; + NTSTATUS Status; TI_DbgPrint(MID_TRACE, ("Packet: %x NdisPacket %x\n", IPPacket, IPPacket->NdisPacket)); - AddGenericHeaderIPv4 + Status = AddGenericHeaderIPv4 ( RemoteAddress, RemotePort, LocalAddress, LocalPort, IPPacket, DataLength, IPPROTO_UDP, sizeof(UDP_HEADER), (PVOID *)&UDPHeader ); + + if (!NT_SUCCESS(Status)) + return Status; /* Build UDP header */ UDPHeader = (PUDP_HEADER)((ULONG_PTR)IPPacket->Data - sizeof(UDP_HEADER)); @@ -195,8 +199,10 @@ if( !NT_SUCCESS(Status) ) return Status; - if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) + if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) { + FreeNdisPacket(Packet.NdisPacket); return STATUS_UNSUCCESSFUL; + } IPSendDatagram( &Packet, NCE, UDPSendPacketComplete, NULL ); @@ -305,7 +311,7 @@ NTSTATUS Status; - Status = PortsStartup( &UDPPorts, 1, 0xfffe ); + Status = PortsStartup( &UDPPorts, 1, UDP_STARTING_PORT + UDP_DYNAMIC_PORTS ); if( !NT_SUCCESS(Status) ) return Status;

1 0

[cgutman] 37010: - Fix several port issues - We don't allocate ports out of range anymore - Dhcp doesn't crash when run from the command line anymore
by cgutman＠svn.reactos.org 27 Oct '08

27 Oct '08

Author: cgutman Date: Sun Oct 26 23:30:53 2008 New Revision: 37010 URL: http://svn.reactos.org/svn/reactos?rev=37010&view=rev Log: - Fix several port issues - We don't allocate ports out of range anymore - Dhcp doesn't crash when run from the command line anymore Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ports.c branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] Sun Oct 26 23:30:53 2008 @@ -44,7 +44,7 @@ Port = htons(Port); if ((Port < PortSet->StartingPort) || - (Port > PortSet->StartingPort + PortSet->PortsToOversee)) + (Port >= PortSet->StartingPort + PortSet->PortsToOversee)) { return FALSE; } @@ -67,19 +67,19 @@ if( AllocatedPort != (ULONG)-1 ) { RtlSetBit( &PortSet->ProtoBitmap, AllocatedPort ); AllocatedPort += PortSet->StartingPort; + ExReleaseFastMutex( &PortSet->Mutex ); + return htons(AllocatedPort); } ExReleaseFastMutex( &PortSet->Mutex ); - AllocatedPort = htons(AllocatedPort); - - return AllocatedPort; + return -1; } ULONG AllocatePortFromRange( PPORT_SET PortSet, ULONG Lowest, ULONG Highest ) { ULONG AllocatedPort; if ((Lowest < PortSet->StartingPort) || - (Highest > PortSet->StartingPort + PortSet->PortsToOversee)) + (Highest >= PortSet->StartingPort + PortSet->PortsToOversee)) { return -1; } @@ -92,10 +92,10 @@ if( AllocatedPort != (ULONG)-1 && AllocatedPort <= Highest) { RtlSetBit( &PortSet->ProtoBitmap, AllocatedPort ); AllocatedPort += PortSet->StartingPort; + ExReleaseFastMutex( &PortSet->Mutex ); + return htons(AllocatedPort); } ExReleaseFastMutex( &PortSet->Mutex ); - AllocatedPort = htons(AllocatedPort); - - return AllocatedPort; + return -1; } Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Sun Oct 26 23:30:53 2008 @@ -311,7 +311,7 @@ NTSTATUS Status; - Status = PortsStartup( &UDPPorts, 1, 0xfffe ); + Status = PortsStartup( &UDPPorts, 1, UDP_STARTING_PORT + UDP_DYNAMIC_PORTS ); if( !NT_SUCCESS(Status) ) return Status;

1 0

[cgutman] 37009: - Check that we got the port that we wanted if we specified one
by cgutman＠svn.reactos.org 27 Oct '08

27 Oct '08

Author: cgutman Date: Sun Oct 26 22:26:21 2008 New Revision: 37009 URL: http://svn.reactos.org/svn/reactos?rev=37009&view=rev Log: - Check that we got the port that we wanted if we specified one Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Sun Oct 26 22:26:21 2008 @@ -285,6 +285,14 @@ case IPPROTO_TCP: AddrFile->Port = TCPAllocatePort(Address->Address[0].Address[0].sin_port); + + if (Address->Address[0].Address[0].sin_port && + AddrFile->Port != Address->Address[0].Address[0].sin_port) + { + ExFreePool(AddrFile); + return STATUS_INVALID_PARAMETER; + } + AddrFile->Send = NULL; /* TCPSendData */ break; @@ -292,6 +300,14 @@ TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); AddrFile->Port = UDPAllocatePort(Address->Address[0].Address[0].sin_port); + + if (Address->Address[0].Address[0].sin_port && + AddrFile->Port != Address->Address[0].Address[0].sin_port) + { + ExFreePool(AddrFile); + return STATUS_INVALID_PARAMETER; + } + TI_DbgPrint(MID_TRACE,("Setting port %d (wanted %d)\n", AddrFile->Port, Address->Address[0].Address[0].sin_port));

1 0

[tkreuzer] 37008: - Add TEB_SELF to asm.h - fix loading of TEB in fiber code This commit is dedicated to Alex
by tkreuzer＠svn.reactos.org 27 Oct '08

27 Oct '08

Author: tkreuzer Date: Sun Oct 26 21:48:54 2008 New Revision: 37008 URL: http://svn.reactos.org/svn/reactos?rev=37008&view=rev Log: - Add TEB_SELF to asm.h - fix loading of TEB in fiber code This commit is dedicated to Alex Modified: trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S [iso-8859-1] Sun Oct 26 21:48:54 2008 @@ -17,7 +17,7 @@ _SwitchToFiber@4: /* Get the TEB */ - mov edx, fs:[KGDT_R3_TEB] + mov edx, fs:[TEB_SELF] /* Get the Fiber */ mov eax, [edx+TEB_FIBER_DATA] Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=3700… ============================================================================== --- trunk/reactos/include/ndk/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/asm.h [iso-8859-1] Sun Oct 26 21:48:54 2008 @@ -412,6 +412,7 @@ #define TEB_STACK_BASE 0x4 #define TEB_STACK_LIMIT 0x8 #define TEB_FIBER_DATA 0x10 +#define TEB_SELF 0x18 #define TEB_PEB 0x30 #define TEB_EXCEPTION_CODE 0x1A4 #define TEB_ACTIVATION_CONTEXT_STACK_POINTER 0x1A8

1 0

[ekohl] 37007: ERR -> TRACE
by ekohl＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: ekohl Date: Sun Oct 26 17:57:31 2008 New Revision: 37007 URL: http://svn.reactos.org/svn/reactos?rev=37007&view=rev Log: ERR -> TRACE Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sun Oct 26 17:57:31 2008 @@ -28,7 +28,7 @@ UCHAR *pszStringBinding; RPC_STATUS status; - ERR("SVCCTL_HANDLEA_bind() called\n"); + TRACE("SVCCTL_HANDLEA_bind() called\n"); status = RpcStringBindingComposeA((UCHAR *)szMachineName, (UCHAR *)"ncacn_np", @@ -66,7 +66,7 @@ { RPC_STATUS status; - ERR("SVCCTL_HANDLEA_unbind() called\n"); + TRACE("SVCCTL_HANDLEA_unbind() called\n"); status = RpcBindingFree(&hBinding); if (status) @@ -83,8 +83,7 @@ LPWSTR pszStringBinding; RPC_STATUS status; - ERR("SVCCTL_HANDLEW_bind() called\n"); - + TRACE("SVCCTL_HANDLEW_bind() called\n"); status = RpcStringBindingComposeW(szMachineName, L"ncacn_np", @@ -122,7 +121,7 @@ { RPC_STATUS status; - ERR("SVCCTL_HANDLEW_unbind() called\n"); + TRACE("SVCCTL_HANDLEW_unbind() called\n"); status = RpcBindingFree(&hBinding); if (status) @@ -139,8 +138,7 @@ LPWSTR pszStringBinding; RPC_STATUS status; - ERR("RPC_SERVICE_STATUS_HANDLE_bind() called\n"); - + TRACE("RPC_SERVICE_STATUS_HANDLE_bind() called\n"); status = RpcStringBindingComposeW(NULL, L"ncacn_np", @@ -178,7 +176,7 @@ { RPC_STATUS status; - ERR("RPC_SERVICE_STATUS_HANDLE_unbind() called\n"); + TRACE("RPC_SERVICE_STATUS_HANDLE_unbind() called\n"); status = RpcBindingFree(&hBinding); if (status)

1 0

[ekohl] 37006: LSA: Get rid of the globally created binding handle and use the WIDL-generated custom binding handles and context handles instead.
by ekohl＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: ekohl Date: Sun Oct 26 17:53:30 2008 New Revision: 37006 URL: http://svn.reactos.org/svn/reactos?rev=37006&view=rev Log: LSA: Get rid of the globally created binding handle and use the WIDL-generated custom binding handles and context handles instead. Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/include/reactos/idl/lsa.idl Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sun Oct 26 17:53:30 2008 @@ -16,34 +16,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); -static handle_t LSABindingHandle = NULL; - -static VOID -LSAHandleUnbind(handle_t *Handle) -{ - RPC_STATUS status; - - if (*Handle == NULL) - return; - - status = RpcBindingFree(Handle); - if (status) - { - TRACE("RpcBindingFree returned 0x%x\n", status); - } -} - -static VOID -LSAHandleBind(VOID) -{ + +handle_t __RPC_USER +PLSAPR_SERVER_NAME_bind(PLSAPR_SERVER_NAME pszSystemName) +{ + handle_t hBinding = NULL; LPWSTR pszStringBinding; RPC_STATUS status; - handle_t Handle; - - if (LSABindingHandle != NULL) - return; - - status = RpcStringBindingComposeW(NULL, + + TRACE("PLSAPR_SERVER_NAME_bind() called\n"); + + status = RpcStringBindingComposeW(pszSystemName, L"ncacn_np", NULL, L"\\pipe\\lsarpc", @@ -52,12 +35,12 @@ if (status) { TRACE("RpcStringBindingCompose returned 0x%x\n", status); - return; + return NULL; } /* Set the binding handle that will be used to bind to the server. */ status = RpcBindingFromStringBindingW(pszStringBinding, - &Handle); + &hBinding); if (status) { TRACE("RpcBindingFromStringBinding returned 0x%x\n", status); @@ -69,11 +52,22 @@ TRACE("RpcStringFree returned 0x%x\n", status); } - if (InterlockedCompareExchangePointer(&LSABindingHandle, - (PVOID)Handle, - NULL) != NULL) - { - LSAHandleUnbind(&Handle); + return hBinding; +} + + +void __RPC_USER +PLSAPR_SERVER_NAME_unbind(PLSAPR_SERVER_NAME pszSystemName, + handle_t hBinding) +{ + RPC_STATUS status; + + TRACE("PLSAPR_SERVER_NAME_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { + TRACE("RpcBindingFree returned 0x%x\n", status); } } @@ -90,10 +84,7 @@ if (ObjectHandle == (LSA_HANDLE)0xcafe) return STATUS_SUCCESS; - LSAHandleBind(); - - return LsarClose(LSABindingHandle, - (unsigned long *)&ObjectHandle); + return LsarClose((PLSAPR_HANDLE)&ObjectHandle); } @@ -105,10 +96,7 @@ { TRACE("LsaDelete(0x%p) called\n", ObjectHandle); - LSAHandleBind(); - - return LsarDelete(LSABindingHandle, - (unsigned long)ObjectHandle); + return LsarDelete((LSAPR_HANDLE)ObjectHandle); } Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Oct 26 17:53:30 2008 @@ -123,9 +123,14 @@ } +void __RPC_USER LSAPR_HANDLE_rundown(LSAPR_HANDLE hHandle) +{ + +} + + /* Function 0 */ NTSTATUS LsarClose( - handle_t hBinding, LSAPR_HANDLE *ObjectHandle) { #if 0 @@ -153,7 +158,6 @@ /* Function 1 */ NTSTATUS LsarDelete( - handle_t hBinding, LSAPR_HANDLE ObjectHandle) { /* Deprecated */ @@ -163,7 +167,6 @@ /* Function 2 */ NTSTATUS LsarEnumeratePrivileges( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, DWORD *EnumerationContext, PLSAPR_PRIVILEGE_ENUM_BUFFER EnumerationBuffer, @@ -176,7 +179,6 @@ /* Function 3 */ NTSTATUS LsarQuerySecurityObject( - handle_t hBinding, LSAPR_HANDLE ObjectHandle, SECURITY_INFORMATION SecurityInformation, PLSAPR_SR_SECURITY_DESCRIPTOR *SecurityDescriptor) @@ -188,7 +190,6 @@ /* Function 4 */ NTSTATUS LsarSetSecurityObject( - handle_t hBinding, LSAPR_HANDLE ObjectHandle, SECURITY_INFORMATION SecurityInformation, PLSAPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor) @@ -200,7 +201,7 @@ /* Function 5 */ NTSTATUS LsarChangePassword( - handle_t hBinding, + handle_t hBinding, /* FIXME */ PRPC_UNICODE_STRING String1, PRPC_UNICODE_STRING String2, PRPC_UNICODE_STRING String3, @@ -214,7 +215,6 @@ /* Function 6 */ NTSTATUS LsarOpenPolicy( - handle_t hBinding, LPWSTR SystemName, PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, ACCESS_MASK DesiredAccess, @@ -227,7 +227,6 @@ /* Function 7 */ NTSTATUS LsarQueryInformationPolicy( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, unsigned long PolicyInformation) @@ -239,7 +238,6 @@ /* Function 8 */ NTSTATUS LsarSetInformationPolicy( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, unsigned long *PolicyInformation) @@ -251,7 +249,6 @@ /* Function 9 */ NTSTATUS LsarClearAuditLog( - handle_t hBinding, LSAPR_HANDLE ObjectHandle) { /* Deprecated */ @@ -261,7 +258,7 @@ /* Function 10 */ NTSTATUS LsarCreateAccount( - handle_t hBinding, + LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, ACCESS_MASK DesiredAccess, LSAPR_HANDLE *AccountHandle) @@ -273,7 +270,6 @@ /* Function 11 */ NTSTATUS LsarEnumerateAccounts( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, DWORD *EnumerationContext, PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer, @@ -286,7 +282,6 @@ /* Function 12 */ NTSTATUS LsarCreateTrustedDomain( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PLSAPR_TRUST_INFORMATION TrustedDomainInformation, ACCESS_MASK DesiredAccess, @@ -299,7 +294,6 @@ /* Function 13 */ NTSTATUS LsarEnumerateTrustedDomains( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, DWORD *EnumerationContext, PLSAPR_TRUSTED_ENUM_BUFFER EnumerationBuffer, @@ -312,7 +306,6 @@ /* Function 14 */ NTSTATUS LsarLookupNames( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, DWORD Count, PRPC_UNICODE_STRING Names, @@ -328,7 +321,6 @@ /* Function 15 */ NTSTATUS LsarLookupSids( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -343,7 +335,6 @@ /* Function 16 */ NTSTATUS LsarCreateSecret( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING SecretName, ACCESS_MASK DesiredAccess, @@ -356,7 +347,6 @@ /* Function 17 */ NTSTATUS LsarOpenAccount( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, ACCESS_MASK DesiredAccess, @@ -369,7 +359,6 @@ /* Function 18 */ NTSTATUS LsarEnumeratePrivilegesAccount( - handle_t hBinding, LSAPR_HANDLE AccountHandle, PLSAPR_PRIVILEGE_SET *Privileges) { @@ -380,7 +369,6 @@ /* Function 19 */ NTSTATUS LsarAddPrivilegesToAccount( - handle_t hBinding, LSAPR_HANDLE AccountHandle, PLSAPR_PRIVILEGE_SET Privileges) { @@ -391,7 +379,6 @@ /* Function 20 */ NTSTATUS LsarRemovePrivilegesFromAccount( - handle_t hBinding, LSAPR_HANDLE AccountHandle, BOOL AllPrivileges, PLSAPR_PRIVILEGE_SET Privileges) @@ -403,7 +390,6 @@ /* Function 21 */ NTSTATUS LsarGetQuotasForAccount( - handle_t hBinding, LSAPR_HANDLE AccountHandle, PQUOTA_LIMITS QuotaLimits) { @@ -414,7 +400,6 @@ /* Function 22 */ NTSTATUS LsarSetQuotasForAccount( - handle_t hBinding, LSAPR_HANDLE AccountHandle, PQUOTA_LIMITS QuotaLimits) { @@ -425,7 +410,6 @@ /* Function 23 */ NTSTATUS LsarGetSystemAccessAccount( - handle_t hBinding, LSAPR_HANDLE AccountHandle, ACCESS_MASK *SystemAccess) { @@ -436,7 +420,6 @@ /* Function 24 */ NTSTATUS LsarSetSystemAccessAccount( - handle_t hBinding, LSAPR_HANDLE AccountHandle, ACCESS_MASK SystemAccess) { @@ -447,7 +430,6 @@ /* Function 25 */ NTSTATUS LsarOpenTrustedDomain( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_SID TrustedDomainSid, ACCESS_MASK DesiredAccess, @@ -460,7 +442,6 @@ /* Function 26 */ NTSTATUS LsarQueryInfoTrustedDomain( - handle_t hBinding, LSAPR_HANDLE TrustedDomainHandle, TRUSTED_INFORMATION_CLASS InformationClass, PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation) @@ -472,7 +453,6 @@ /* Function 27 */ NTSTATUS LsarSetInformationTrustedDomain( - handle_t hBinding, LSAPR_HANDLE TrustedDomainHandle, TRUSTED_INFORMATION_CLASS InformationClass, PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation) @@ -484,7 +464,6 @@ /* Function 28 */ NTSTATUS LsarOpenSecret( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING SecretName, ACCESS_MASK DesiredAccess, @@ -497,7 +476,6 @@ /* Function 29 */ NTSTATUS LsarSetSecret( - handle_t hBinding, LSAPR_HANDLE *SecretHandle, PLSAPR_CR_CIPHER_VALUE EncryptedCurrentValue, PLSAPR_CR_CIPHER_VALUE EncryptedOldValue) @@ -509,7 +487,6 @@ /* Function 30 */ NTSTATUS LsarQuerySecret( - handle_t hBinding, LSAPR_HANDLE SecretHandle, PLSAPR_CR_CIPHER_VALUE *EncryptedCurrentValue, PLARGE_INTEGER CurrentValueSetTime, @@ -523,7 +500,6 @@ /* Function 31 */ NTSTATUS LsarLookupPrivilegeValue( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING Name, PLUID Value) @@ -535,7 +511,6 @@ /* Function 32 */ NTSTATUS LsarLookupPrivilegeName( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PLUID Value, PRPC_UNICODE_STRING *Name) @@ -547,7 +522,7 @@ /* Function 33 */ NTSTATUS LsarLookupPrivilegeDisplayName( - handle_t hBinding, + LSAPR_HANDLE PolicyHandle, /* FIXME */ USHORT *LanguageReturned) { UNIMPLEMENTED; @@ -557,7 +532,6 @@ /* Function 34 */ NTSTATUS LsarDeleteObject( - handle_t hBinding, LSAPR_HANDLE *ObjectHandle) { UNIMPLEMENTED; @@ -567,7 +541,6 @@ /* Function 35 */ NTSTATUS LsarEnumerateAccountsWithUserRight( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING UserRight, PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer) @@ -579,7 +552,6 @@ /* Function 36 */ NTSTATUS LsarEnmuerateAccountRights( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, PLSAPR_USER_RIGHT_SET UserRights) @@ -591,7 +563,6 @@ /* Function 37 */ NTSTATUS LsarAddAccountRights( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, PLSAPR_USER_RIGHT_SET UserRights) @@ -603,7 +574,6 @@ /* Function 38 */ NTSTATUS LsarRemoveAccountRights( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, BOOL AllRights, @@ -616,7 +586,6 @@ /* Function 39 */ NTSTATUS LsarQueryTrustedDomainInfo( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_SID TrustedDomainSid, TRUSTED_INFORMATION_CLASS InformationClass, @@ -629,7 +598,6 @@ /* Function 40 */ NTSTATUS LsarSetTrustedDomainInfo( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_SID TrustedDomainSid, TRUSTED_INFORMATION_CLASS InformationClass, @@ -642,7 +610,6 @@ /* Function 41 */ NTSTATUS LsarDeleteTrustedDomain( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_SID TrustedDomainSid) { @@ -653,7 +620,6 @@ /* Function 42 */ NTSTATUS LsarStorePrivateData( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING KeyName, PLSAPR_CR_CIPHER_VALUE EncryptedData) @@ -665,7 +631,6 @@ /* Function 43 */ NTSTATUS LsarRetrievePrivateData( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING KeyName, PLSAPR_CR_CIPHER_VALUE *EncryptedData) @@ -677,7 +642,6 @@ /* Function 44 */ NTSTATUS LsarOpenPolicy2( - handle_t hBinding, LPWSTR SystemName, PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, ACCESS_MASK DesiredAccess, @@ -690,7 +654,6 @@ /* Function 45 */ NTSTATUS LsarGetUserName( - handle_t hBinding, LPWSTR SystemName, PRPC_UNICODE_STRING *UserName, PRPC_UNICODE_STRING *DomainName) @@ -702,7 +665,6 @@ /* Function 46 */ NTSTATUS LsarQueryInformationPolicy2( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, unsigned long *PolicyInformation) @@ -714,7 +676,6 @@ /* Function 47 */ NTSTATUS LsarSetInformationPolicy2( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, unsigned long PolicyInformation) @@ -726,7 +687,6 @@ /* Function 48 */ NTSTATUS LsarQueryTrustedDomainInfoByName( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING TrustedDomainName, POLICY_INFORMATION_CLASS InformationClass, @@ -739,7 +699,6 @@ /* Function 49 */ NTSTATUS LsarSetTrustedDomainInfoByName( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING TrustedDomainName, POLICY_INFORMATION_CLASS InformationClass, @@ -752,7 +711,6 @@ /* Function 50 */ NTSTATUS LsarEnumerateTrustedDomainsEx( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, DWORD *EnumerationContext, PLSAPR_TRUSTED_ENUM_BUFFER_EX EnumerationBuffer, @@ -765,7 +723,6 @@ /* Function 51 */ NTSTATUS LsarCreateTrustedDomainEx( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION AuthentificationInformation, @@ -779,7 +736,6 @@ /* Function 52 */ NTSTATUS LsarSetPolicyReplicationHandle( - handle_t hBinding, PLSAPR_HANDLE PolicyHandle) { /* Deprecated */ @@ -789,7 +745,6 @@ /* Function 53 */ NTSTATUS LsarQueryDomainInformationPolicy( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, unsigned long *PolicyInformation) @@ -801,7 +756,6 @@ /* Function 54 */ NTSTATUS LsarSetDomainInformationPolicy( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, unsigned long PolicyInformation) @@ -813,7 +767,6 @@ /* Function 55 */ NTSTATUS LsarOpenTrustedDomainByName( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING TrustedDomainName, ACCESS_MASK DesiredAccess, @@ -835,7 +788,6 @@ /* Function 57 */ NTSTATUS LsarLookupSids2( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -852,7 +804,6 @@ /* Function 58 */ NTSTATUS LsarLookupNames2( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, DWORD Count, PRPC_UNICODE_STRING Names, @@ -870,7 +821,6 @@ /* Function 59 */ NTSTATUS LsarCreateTrustedDomainEx2( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION_INTERNAL AuthentificationInformation, @@ -956,7 +906,6 @@ /* Function 68 */ NTSTATUS LsarLookupNames3( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, DWORD Count, PRPC_UNICODE_STRING Names, @@ -1010,7 +959,6 @@ /* Function 73 */ NTSTATUS LsarQueryForestTrustInformation( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PLSA_UNICODE_STRING TrustedDomainName, LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, @@ -1023,7 +971,6 @@ /* Function 74 */ NTSTATUS LsarSetForestTrustInformation( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PLSA_UNICODE_STRING TrustedDomainName, LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, @@ -1114,5 +1061,4 @@ return STATUS_NOT_IMPLEMENTED; } - /* EOF */ Modified: trunk/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.id… ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Sun Oct 26 17:53:30 2008 @@ -4,7 +4,9 @@ #include <ms-dtyp.idl> -typedef /*[context_handle]*/ unsigned long LSAPR_HANDLE; +typedef [handle] LPWSTR PLSAPR_SERVER_NAME; + +typedef [context_handle] PVOID LSAPR_HANDLE; typedef LSAPR_HANDLE *PLSAPR_HANDLE; cpp_quote("#ifndef _WINNT_H") @@ -599,17 +601,14 @@ { /* Function 0 */ NTSTATUS LsarClose( - [in] handle_t hBinding, [in, out] LSAPR_HANDLE *ObjectHandle); /* Function 1 */ NTSTATUS LsarDelete( - [in] handle_t hBinding, [in] LSAPR_HANDLE ObjectHandle); /* Function 2 */ NTSTATUS LsarEnumeratePrivileges( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in, out] DWORD *EnumerationContext, [out] PLSAPR_PRIVILEGE_ENUM_BUFFER EnumerationBuffer, @@ -617,21 +616,19 @@ /* Function 3 */ NTSTATUS LsarQuerySecurityObject( - [in] handle_t hBinding, [in] LSAPR_HANDLE ObjectHandle, [in] SECURITY_INFORMATION SecurityInformation, [out] PLSAPR_SR_SECURITY_DESCRIPTOR *SecurityDescriptor); /* Function 4 */ NTSTATUS LsarSetSecurityObject( - [in] handle_t hBinding, [in] LSAPR_HANDLE ObjectHandle, [in] SECURITY_INFORMATION SecurityInformation, [in] PLSAPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor); /* Function 5 */ NTSTATUS LsarChangePassword( - [in] handle_t hBinding, + [in] handle_t hBinding, /* FIXME */ [in] PRPC_UNICODE_STRING String1, [in] PRPC_UNICODE_STRING String2, [in] PRPC_UNICODE_STRING String3, @@ -640,15 +637,13 @@ /* Function 6 */ NTSTATUS LsarOpenPolicy( - [in] handle_t hBinding, - [in, unique] LPWSTR SystemName, + [in, unique] PLSAPR_SERVER_NAME SystemName, [in] PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *PolicyHandle); /* Function 7 */ NTSTATUS LsarQueryInformationPolicy( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [in] unsigned long PolicyInformation); @@ -656,7 +651,6 @@ /* Function 8 */ NTSTATUS LsarSetInformationPolicy( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [out] unsigned long *PolicyInformation); @@ -664,19 +658,17 @@ /* Function 9 */ NTSTATUS LsarClearAuditLog( - [in] handle_t hBinding, [in] LSAPR_HANDLE ObjectHandle); /* Function 10 */ NTSTATUS LsarCreateAccount( - [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *AccountHandle); /* Function 11 */ NTSTATUS LsarEnumerateAccounts( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in, out] DWORD *EnumerationContext, [out] PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer, @@ -684,7 +676,6 @@ /* Function 12 */ NTSTATUS LsarCreateTrustedDomain( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_TRUST_INFORMATION TrustedDomainInformation, [in] ACCESS_MASK DesiredAccess, @@ -692,7 +683,6 @@ /* Function 13 */ NTSTATUS LsarEnumerateTrustedDomains( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in, out] DWORD *EnumerationContext, [out] PLSAPR_TRUSTED_ENUM_BUFFER EnumerationBuffer, @@ -700,7 +690,6 @@ /* Function 14 */ NTSTATUS LsarLookupNames( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names, @@ -711,7 +700,6 @@ /* Function 15 */ NTSTATUS LsarLookupSids( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -721,7 +709,6 @@ /* Function 16 */ NTSTATUS LsarCreateSecret( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING SecretName, [in] ACCESS_MASK DesiredAccess, @@ -729,7 +716,6 @@ /* Function 17 */ NTSTATUS LsarOpenAccount( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [in] ACCESS_MASK DesiredAccess, @@ -737,50 +723,42 @@ /* Function 18 */ NTSTATUS LsarEnumeratePrivilegesAccount( - [in] handle_t hBinding, [in] LSAPR_HANDLE AccountHandle, [out] PLSAPR_PRIVILEGE_SET *Privileges); /* Function 19 */ NTSTATUS LsarAddPrivilegesToAccount( - [in] handle_t hBinding, [in] LSAPR_HANDLE AccountHandle, [in] PLSAPR_PRIVILEGE_SET Privileges); /* Function 20 */ NTSTATUS LsarRemovePrivilegesFromAccount( - [in] handle_t hBinding, [in] LSAPR_HANDLE AccountHandle, [in] BOOL AllPrivileges, [in, unique] PLSAPR_PRIVILEGE_SET Privileges); /* Function 21 */ NTSTATUS LsarGetQuotasForAccount( - [in] handle_t hBinding, [in] LSAPR_HANDLE AccountHandle, [out] PQUOTA_LIMITS QuotaLimits); /* Function 22 */ NTSTATUS LsarSetQuotasForAccount( - [in] handle_t hBinding, [in] LSAPR_HANDLE AccountHandle, [in] PQUOTA_LIMITS QuotaLimits); /* Function 23 */ NTSTATUS LsarGetSystemAccessAccount( - [in] handle_t hBinding, [in] LSAPR_HANDLE AccountHandle, [out] ACCESS_MASK *SystemAccess); /* Function 24 */ NTSTATUS LsarSetSystemAccessAccount( - [in] handle_t hBinding, [in] LSAPR_HANDLE AccountHandle, [in] ACCESS_MASK SystemAccess); /* Function 25 */ NTSTATUS LsarOpenTrustedDomain( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID TrustedDomainSid, [in] ACCESS_MASK DesiredAccess, @@ -788,21 +766,18 @@ /* Function 26 */ NTSTATUS LsarQueryInfoTrustedDomain( - [in] handle_t hBinding, [in] LSAPR_HANDLE TrustedDomainHandle, [in] TRUSTED_INFORMATION_CLASS InformationClass, [out, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation); /* Function 27 */ NTSTATUS LsarSetInformationTrustedDomain( - [in] handle_t hBinding, [in] LSAPR_HANDLE TrustedDomainHandle, [in] TRUSTED_INFORMATION_CLASS InformationClass, [in, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation); /* Function 28 */ NTSTATUS LsarOpenSecret( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING SecretName, [in] ACCESS_MASK DesiredAccess, @@ -810,14 +785,12 @@ /* Function 29 */ NTSTATUS LsarSetSecret( - [in] handle_t hBinding, [in] LSAPR_HANDLE *SecretHandle, [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedCurrentValue, [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedOldValue); /* Function 30 */ NTSTATUS LsarQuerySecret( - [in] handle_t hBinding, [in] LSAPR_HANDLE SecretHandle, [in, out, unique] PLSAPR_CR_CIPHER_VALUE *EncryptedCurrentValue, [in, out, unique] PLARGE_INTEGER CurrentValueSetTime, @@ -826,23 +799,20 @@ /* Function 31 */ NTSTATUS LsarLookupPrivilegeValue( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING Name, [out] PLUID Value); /* Function 32 */ NTSTATUS LsarLookupPrivilegeName( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PLUID Value, [out] PRPC_UNICODE_STRING *Name); /* Function 33 */ NTSTATUS LsarLookupPrivilegeDisplayName( - [in] handle_t hBinding, - /*[in] LSAPR_HANDLE PolicyHandle, - [in] PRPC_UNICODE_STRING Name, + [in] LSAPR_HANDLE PolicyHandle, /* FIXME */ + /*[in] PRPC_UNICODE_STRING Name, [in] USHORT ClientLanguage, [in] USHORT ClientSystemDefaultLanguage, [out] PRPC_UNICODE_STRING *DisplayName,*/ @@ -850,35 +820,30 @@ /* Function 34 */ NTSTATUS LsarDeleteObject( - [in] handle_t hBinding, [in, out] LSAPR_HANDLE *ObjectHandle); cpp_quote("#if _WIN32_WINNT >= 0x0351") /* Function 35 */ NTSTATUS LsarEnumerateAccountsWithUserRight( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in, unique] PRPC_UNICODE_STRING UserRight, [out] PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer); /* Function 36 */ NTSTATUS LsarEnmuerateAccountRights( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [out] PLSAPR_USER_RIGHT_SET UserRights); /* Function 37 */ NTSTATUS LsarAddAccountRights( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [in] PLSAPR_USER_RIGHT_SET UserRights); /* Function 38 */ NTSTATUS LsarRemoveAccountRights( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [in] BOOL AllRights, @@ -886,7 +851,6 @@ /* Function 39 */ NTSTATUS LsarQueryTrustedDomainInfo( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID TrustedDomainSid, [in] TRUSTED_INFORMATION_CLASS InformationClass, @@ -894,7 +858,6 @@ /* Function 40 */ NTSTATUS LsarSetTrustedDomainInfo( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID TrustedDomainSid, [in] TRUSTED_INFORMATION_CLASS InformationClass, @@ -902,36 +865,31 @@ /* Function 41 */ NTSTATUS LsarDeleteTrustedDomain( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID TrustedDomainSid); /* Function 42 */ NTSTATUS LsarStorePrivateData( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING KeyName, [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedData); /* Function 43 */ NTSTATUS LsarRetrievePrivateData( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING KeyName, [in, out] PLSAPR_CR_CIPHER_VALUE *EncryptedData); /* Function 44 */ NTSTATUS LsarOpenPolicy2( - [in] handle_t hBinding, - [in, unique, string] LPWSTR SystemName, + [in, unique, string] PLSAPR_SERVER_NAME SystemName, [in] PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *PolicyHandle); /* Function 45 */ NTSTATUS LsarGetUserName( - [in] handle_t hBinding, - [in, unique, string] LPWSTR SystemName, + [in, unique, string] PLSAPR_SERVER_NAME SystemName, [in, out] PRPC_UNICODE_STRING *UserName, [in, out, unique] PRPC_UNICODE_STRING *DomainName); @@ -939,7 +897,6 @@ /* Function 46 */ NTSTATUS LsarQueryInformationPolicy2( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [out] unsigned long *PolicyInformation); @@ -947,7 +904,6 @@ /* Function 47 */ NTSTATUS LsarSetInformationPolicy2( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [in] unsigned long PolicyInformation); @@ -955,7 +911,6 @@ /* Function 48 */ NTSTATUS LsarQueryTrustedDomainInfoByName( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING TrustedDomainName, [in] POLICY_INFORMATION_CLASS InformationClass, @@ -964,7 +919,6 @@ /* Function 49 */ NTSTATUS LsarSetTrustedDomainInfoByName( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING TrustedDomainName, [in] POLICY_INFORMATION_CLASS InformationClass, @@ -973,7 +927,6 @@ /* Function 50 */ NTSTATUS LsarEnumerateTrustedDomainsEx( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in, out] DWORD *EnumerationContext, [out] PLSAPR_TRUSTED_ENUM_BUFFER_EX EnumerationBuffer, @@ -981,7 +934,6 @@ /* Function 51 */ NTSTATUS LsarCreateTrustedDomainEx( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, [in] PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION AuthentificationInformation, @@ -990,12 +942,10 @@ /* Function 52 */ NTSTATUS LsarSetPolicyReplicationHandle( - [in] handle_t hBinding, [in, out] PLSAPR_HANDLE PolicyHandle); /* Function 53 */ NTSTATUS LsarQueryDomainInformationPolicy( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [out] unsigned long *PolicyInformation); @@ -1003,7 +953,6 @@ /* Function 54 */ NTSTATUS LsarSetDomainInformationPolicy( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [in] unsigned long PolicyInformation); @@ -1011,7 +960,6 @@ /* Function 55 */ NTSTATUS LsarOpenTrustedDomainByName( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING TrustedDomainName, [in] ACCESS_MASK DesiredAccess, @@ -1023,7 +971,6 @@ /* Function 57 */ NTSTATUS LsarLookupSids2( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -1035,7 +982,6 @@ /* Function 58 */ NTSTATUS LsarLookupNames2( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names, @@ -1048,7 +994,6 @@ /* Function 59 */ NTSTATUS LsarCreateTrustedDomainEx2( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, [in] PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION_INTERNAL AuthentificationInformation, @@ -1091,7 +1036,6 @@ /* Function 68 */ NTSTATUS LsarLookupNames3( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names, @@ -1120,7 +1064,6 @@ /* Function 73 */ NTSTATUS LsarQueryForestTrustInformation( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PLSA_UNICODE_STRING TrustedDomainName, [in] LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, @@ -1128,7 +1071,6 @@ /* Function 74 */ NTSTATUS LsarSetForestTrustInformation( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PLSA_UNICODE_STRING TrustedDomainName, [in] LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, @@ -1142,7 +1084,7 @@ /* Function 76 */ NTSTATUS LsarLookupSids3( - [in] handle_t hBinding, + [in] handle_t hBinding, /* FIXME */ [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, [in, out] PLSAPR_TRANSLATED_NAMES_EX TranslatedNames, @@ -1153,7 +1095,7 @@ /* Function 77 */ NTSTATUS LsarLookupNames4( - [in] handle_t hBinding, + [in] handle_t hBinding, /* FIXME */ [in] handle_t RpcHandle, [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names,

1 0

[cgutman] 37005: - Fix a leak - Fail if the port is out of range
by cgutman＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: cgutman Date: Sun Oct 26 16:44:18 2008 New Revision: 37005 URL: http://svn.reactos.org/svn/reactos?rev=37005&view=rev Log: - Fix a leak - Fail if the port is out of range Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ports.c branches/aicom-network-fixes/lib/drivers/ip/transport/rawip/rawip.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] Sun Oct 26 16:44:18 2008 @@ -78,12 +78,11 @@ ULONG AllocatePortFromRange( PPORT_SET PortSet, ULONG Lowest, ULONG Highest ) { ULONG AllocatedPort; - - if (Lowest < PortSet->StartingPort) - Lowest = PortSet->StartingPort; - - if (Highest > PortSet->StartingPort + PortSet->PortsToOversee) - Highest = PortSet->StartingPort + PortSet->PortsToOversee; + if ((Lowest < PortSet->StartingPort) || + (Highest > PortSet->StartingPort + PortSet->PortsToOversee)) + { + return -1; + } Lowest -= PortSet->StartingPort; Highest -= PortSet->StartingPort; Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Sun Oct 26 16:44:18 2008 @@ -223,8 +223,10 @@ TI_DbgPrint(MID_TRACE,("About to get route to destination\n")); - if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) + if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) { + FreeNdisPacket(Packet.NdisPacket); return STATUS_UNSUCCESSFUL; + } TI_DbgPrint(MID_TRACE,("About to send datagram\n"));

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs