Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 15579: Sync to Wine-20050524:
by gvg＠svn.reactos.com 28 May '05

28 May '05

Sync to Wine-20050524: Alexandre Julliard <julliard(a)winehq.org> - Added rules for building import libraries in the individual dll makefiles, and added support for building a .def.a static import library too. Vincent Beron <vberon(a)mecano.gme.usherb.ca> - Provide minimal API documentation in advapi/eventlog.c to silence some winapi_check output. - Move around functions in riched20, richedit and rpcrt4 to achieve the same goal. Modified: trunk/reactos/lib/richedit/Makefile.in Modified: trunk/reactos/lib/richedit/richedit.c _____ Modified: trunk/reactos/lib/richedit/Makefile.in --- trunk/reactos/lib/richedit/Makefile.in 2005-05-28 14:40:26 UTC (rev 15578) +++ trunk/reactos/lib/richedit/Makefile.in 2005-05-28 14:42:07 UTC (rev 15579) @@ -3,6 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = riched32.dll +IMPORTLIB = libriched32.$(IMPLIBEXT) IMPORTS = riched20 user32 kernel32 C_SRCS = \ _____ Modified: trunk/reactos/lib/richedit/richedit.c --- trunk/reactos/lib/richedit/richedit.c 2005-05-28 14:40:26 UTC (rev 15578) +++ trunk/reactos/lib/richedit/richedit.c 2005-05-28 14:42:07 UTC (rev 15579) @@ -40,26 +40,6 @@ extern LRESULT WINAPI RichEdit10ANSIWndProc(HWND, UINT, WPARAM, LPARAM); -/********************************************************************** * - * DllGetVersion [RICHED32.2] - * - * Retrieves version information - */ -HRESULT WINAPI RICHED32_DllGetVersion (DLLVERSIONINFO *pdvi) -{ - TRACE("\n"); - - if (pdvi->cbSize != sizeof(DLLVERSIONINFO)) - return E_INVALIDARG; - - pdvi->dwMajorVersion = 4; - pdvi->dwMinorVersion = 0; - pdvi->dwBuildNumber = 0; - pdvi->dwPlatformID = 0; - - return S_OK; -} - /* Unregisters the window class. */ static BOOL RICHED32_Unregister(void) { @@ -104,3 +84,23 @@ } return TRUE; } + +/********************************************************************** * + * DllGetVersion [RICHED32.2] + * + * Retrieves version information + */ +HRESULT WINAPI RICHED32_DllGetVersion (DLLVERSIONINFO *pdvi) +{ + TRACE("\n"); + + if (pdvi->cbSize != sizeof(DLLVERSIONINFO)) + return E_INVALIDARG; + + pdvi->dwMajorVersion = 4; + pdvi->dwMinorVersion = 0; + pdvi->dwBuildNumber = 0; + pdvi->dwPlatformID = 0; + + return S_OK; +}

1 0

[gvg] 15578: Sync to Wine-20050524:
by gvg＠svn.reactos.com 28 May '05

28 May '05

Sync to Wine-20050524: Alexandre Julliard <julliard(a)winehq.org> - Added rules for building import libraries in the individual dll makefiles, and added support for building a .def.a static import library too. Ivan Leo Puoti <ivanleo(a)gmail.com> - Fix crash in ME_GetRunSizeCommon(). Turn a FIXME into a TRACE. Michael Stefaniuc <mstefani(a)redhat.de> - Change an assert to a WARN. Hannu Valtonen <Hannu.Valtonen(a)hut.fi> - Use correct background color for the whole richedit control. - Implement EM_LINESCROLL message handling - Fix a problem with scrolling over the end of the text in WM_WHEELMOUSE. Vincent Beron <vberon(a)mecano.gme.usherb.ca> - Provide minimal API documentation in advapi/eventlog.c to silence some winapi_check output. - Move around functions in riched20, richedit and rpcrt4 to achieve the same goal. Krzysztof Foltman <wdev(a)foltman.com> - Added stubs for a couple of missing 2.0 and 3.0 messages. Phil Krylov <phil(a)newstar.rinet.ru> - Fixed an error in my previous commit which caused an infinite loop in IE6 installer. Modified: trunk/reactos/lib/riched20/Makefile.in Modified: trunk/reactos/lib/riched20/editor.c Modified: trunk/reactos/lib/riched20/paint.c Modified: trunk/reactos/lib/riched20/run.c Modified: trunk/reactos/lib/riched20/style.c _____ Modified: trunk/reactos/lib/riched20/Makefile.in --- trunk/reactos/lib/riched20/Makefile.in 2005-05-28 12:43:26 UTC (rev 15577) +++ trunk/reactos/lib/riched20/Makefile.in 2005-05-28 14:40:26 UTC (rev 15578) @@ -3,6 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = riched20.dll +IMPORTLIB = libriched20.$(IMPLIBEXT) IMPORTS = user32 gdi32 kernel32 EXTRALIBS = -luuid _____ Modified: trunk/reactos/lib/riched20/editor.c --- trunk/reactos/lib/riched20/editor.c 2005-05-28 12:43:26 UTC (rev 15577) +++ trunk/reactos/lib/riched20/editor.c 2005-05-28 14:40:26 UTC (rev 15578) @@ -38,7 +38,10 @@ - EM_FINDWORDBREAK - EM_FMTLINES - EM_FORMATRANGE + - EM_GETAUTOURLDETECT 2.0 + - EM_GETBIDIOPTIONS 3.0 - EM_GETCHARFORMAT (partly done) + - EM_GETEDITSTYLE + EM_GETEVENTMASK - EM_GETFIRSTVISIBLELINE - EM_GETIMECOLOR 1.0asian @@ -53,24 +56,30 @@ - EM_GETOLEINTERFACE - EM_GETOPTIONS + EM_GETPARAFORMAT + - EM_GETPASSWORDCHAR 2.0 - EM_GETPUNCTUATION 1.0asian - EM_GETRECT - EM_GETREDONAME 2.0 + EM_GETSEL + EM_GETSELTEXT (ANSI&Unicode) + - EM_GETSCROLLPOS 3.0 ! - EM_GETTHUMB + - EM_GETTEXTEX 2.0 + - EM_GETTEXTLENGTHEX - EM_GETTEXTMODE 2.0 ? + EM_GETTEXTRANGE (ANSI&Unicode) + - EM_GETTYPOGRAPHYOPTIONS 3.0 - EM_GETUNDONAME - EM_GETWORDBREAKPROC - EM_GETWORDBREAKPROCEX - EM_GETWORDWRAPMODE 1.0asian + - EM_SETZOOM 3.0 - EM_HIDESELECTION - EM_LIMITTEXT - EM_LINEFROMCHAR - EM_LINEINDEX - EM_LINELENGTH - - EM_LINESCROLL + + EM_LINESCROLL - EM_PASTESPECIAL - EM_POSFROMCHARS + EM_REDO 2.0 @@ -79,9 +88,12 @@ - EM_SCROLL - EM_SCROLLCARET - EM_SELECTIONTYPE + - EM_SETBIDIOPTIONS 3.0 + EM_SETBKGNDCOLOR - EM_SETCHARFORMAT (partly done, no ANSI) + - EM_SETEDITSTYLE + EM_SETEVENTMASK (few notifications supported) + - EM_SETFONTSIZE - EM_SETIMECOLOR 1.0asian - EM_SETIMEOPTIONS 1.0asian - EM_SETLANGOPTIONS 2.0 @@ -89,18 +101,26 @@ + EM_SETMODIFY (not sure if implementation is correct) - EM_SETOLECALLBACK - EM_SETOPTIONS + - EM_SETPALETTE 2.0 + EM_SETPARAFORMAT + - EM_SETPASSWORDCHAR 2.0 - EM_SETPUNCTUATION 1.0asian + EM_SETREADONLY no beep on modification attempt - EM_SETRECT - EM_SETRECTNP (EM_SETRECT without repainting) - not supported in RICHEDIT + EM_SETSEL + - EM_SETSCROLLPOS 3.0 + - EM_SETTABSTOPS 3.0 - EM_SETTARGETDEVICE + - EM_SETTEXTEX 3.0 - EM_SETTEXTMODE 2.0 + - EM_SETTYPOGRAPHYOPTIONS 3.0 - EM_SETUNDOLIMIT 2.0 - EM_SETWORDBREAKPROC - EM_SETWORDBREAKPROCEX - EM_SETWORDWRAPMODE 1.0asian + - EM_SETZOOM 3.0 + - EM_SHOWSCROLLBAR 2.0 - EM_STOPGROUPTYPING 2.0 + EM_STREAMIN (can't fall back to text when the RTF isn't really RTF) + EM_STREAMOUT @@ -268,6 +288,7 @@ ME_InsertTextFromCursor(editor, 0, pText, nWideChars, style); if (stream->dwSize < STREAMIN_BUFFER_SIZE) break; + stream->dwSize = 0; } while(1); ME_CommitUndo(editor); ME_Repaint(editor); @@ -485,7 +506,7 @@ int nEventMask = editor->nEventMask; ME_InStream inStream; - TRACE("%p %p\n", stream, editor->hWnd); + TRACE("stream==%p hWnd==%p format==0x%X\n", stream, editor->hWnd, (UINT)format); editor->nEventMask = 0; ME_GetSelection(editor, &from, &to); @@ -740,6 +761,33 @@ FREE_OBJ(editor); } +static WCHAR wszClassName[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '2', '0', 'W', 0}; +static WCHAR wszClassName50[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '5', '0', 'W', 0}; + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("\n"); + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + me_heap = HeapCreate (0, 0x10000, 0); + ME_RegisterEditorClass(hinstDLL); + break; + + case DLL_PROCESS_DETACH: + UnregisterClassW(wszClassName, 0); + UnregisterClassW(wszClassName50, 0); + UnregisterClassA("RichEdit20A", 0); + UnregisterClassA("RichEdit50A", 0); + HeapDestroy (me_heap); + me_heap = NULL; + break; + } + return TRUE; +} + + #define UNSUPPORTED_MSG(e) \ case e: \ FIXME(#e ": stub\n"); \ @@ -766,6 +814,9 @@ UNSUPPORTED_MSG(EM_FINDWORDBREAK) UNSUPPORTED_MSG(EM_FMTLINES) UNSUPPORTED_MSG(EM_FORMATRANGE) + UNSUPPORTED_MSG(EM_GETAUTOURLDETECT) + UNSUPPORTED_MSG(EM_GETBIDIOPTIONS) + UNSUPPORTED_MSG(EM_GETEDITSTYLE) UNSUPPORTED_MSG(EM_GETFIRSTVISIBLELINE) UNSUPPORTED_MSG(EM_GETIMECOMPMODE) /* UNSUPPORTED_MSG(EM_GETIMESTATUS) missing in Wine headers */ @@ -775,34 +826,50 @@ UNSUPPORTED_MSG(EM_GETLINECOUNT) /* UNSUPPORTED_MSG(EM_GETOLEINTERFACE) separate stub */ UNSUPPORTED_MSG(EM_GETOPTIONS) + UNSUPPORTED_MSG(EM_GETPASSWORDCHAR) UNSUPPORTED_MSG(EM_GETRECT) UNSUPPORTED_MSG(EM_GETREDONAME) + UNSUPPORTED_MSG(EM_GETSCROLLPOS) + UNSUPPORTED_MSG(EM_GETTEXTEX) + UNSUPPORTED_MSG(EM_GETTEXTLENGTHEX) UNSUPPORTED_MSG(EM_GETTEXTMODE) + UNSUPPORTED_MSG(EM_GETTYPOGRAPHYOPTIONS) UNSUPPORTED_MSG(EM_GETUNDONAME) UNSUPPORTED_MSG(EM_GETWORDBREAKPROC) UNSUPPORTED_MSG(EM_GETWORDBREAKPROCEX) + UNSUPPORTED_MSG(EM_GETZOOM) UNSUPPORTED_MSG(EM_HIDESELECTION) UNSUPPORTED_MSG(EM_LIMITTEXT) /* also known as EM_SETLIMITTEXT */ UNSUPPORTED_MSG(EM_LINEFROMCHAR) UNSUPPORTED_MSG(EM_LINEINDEX) UNSUPPORTED_MSG(EM_LINELENGTH) - UNSUPPORTED_MSG(EM_LINESCROLL) UNSUPPORTED_MSG(EM_PASTESPECIAL) /* UNSUPPORTED_MSG(EM_POSFROMCHARS) missing in Wine headers */ UNSUPPORTED_MSG(EM_REQUESTRESIZE) UNSUPPORTED_MSG(EM_SCROLL) UNSUPPORTED_MSG(EM_SCROLLCARET) UNSUPPORTED_MSG(EM_SELECTIONTYPE) + UNSUPPORTED_MSG(EM_SETBIDIOPTIONS) + UNSUPPORTED_MSG(EM_SETEDITSTYLE) + UNSUPPORTED_MSG(EM_SETFONTSIZE) UNSUPPORTED_MSG(EM_SETLANGOPTIONS) UNSUPPORTED_MSG(EM_SETOLECALLBACK) UNSUPPORTED_MSG(EM_SETOPTIONS) + UNSUPPORTED_MSG(EM_SETPALETTE) + UNSUPPORTED_MSG(EM_SETPASSWORDCHAR) UNSUPPORTED_MSG(EM_SETRECT) UNSUPPORTED_MSG(EM_SETRECTNP) + UNSUPPORTED_MSG(EM_SETSCROLLPOS) + UNSUPPORTED_MSG(EM_SETTABSTOPS) UNSUPPORTED_MSG(EM_SETTARGETDEVICE) + UNSUPPORTED_MSG(EM_SETTEXTEX) UNSUPPORTED_MSG(EM_SETTEXTMODE) + UNSUPPORTED_MSG(EM_SETTYPOGRAPHYOPTIONS) UNSUPPORTED_MSG(EM_SETUNDOLIMIT) UNSUPPORTED_MSG(EM_SETWORDBREAKPROC) UNSUPPORTED_MSG(EM_SETWORDBREAKPROCEX) + UNSUPPORTED_MSG(EM_SHOWSCROLLBAR) + UNSUPPORTED_MSG(EM_SETZOOM) UNSUPPORTED_MSG(WM_SETFONT) UNSUPPORTED_MSG(WM_STYLECHANGING) UNSUPPORTED_MSG(WM_STYLECHANGED) @@ -950,6 +1017,22 @@ case EM_GETPARAFORMAT: ME_GetSelectionParaFormat(editor, (PARAFORMAT2 *)lParam); return 0; + case EM_LINESCROLL: + { + int nPos = editor->nScrollPosY, nEnd= editor->nTotalLength - editor->sizeWindow.cy; + nPos += 8 * lParam; /* FIXME follow the original */ + if (nPos>=nEnd) + nPos = nEnd; + if (nPos<0) + nPos = 0; + if (nPos != editor->nScrollPosY) { + ScrollWindow(hWnd, 0, editor->nScrollPosY-nPos, NULL, NULL); + editor->nScrollPosY = nPos; + SetScrollPos(hWnd, SB_VERT, nPos, TRUE); + UpdateWindow(hWnd); + } + return TRUE; /* Should return false if a single line richedit control */ + } case WM_CLEAR: { int from, to; @@ -1246,16 +1329,15 @@ } case WM_MOUSEWHEEL: { - int gcWheelDelta = 0, nPos = editor->nScrollPosY; + int gcWheelDelta = 0, nPos = editor->nScrollPosY, nEnd = editor->nTotalLength - editor->sizeWindow.cy; UINT pulScrollLines; - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); gcWheelDelta -= GET_WHEEL_DELTA_WPARAM(wParam); if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines) - nPos += pulScrollLines * (gcWheelDelta / WHEEL_DELTA) * 8; - if(nPos>=editor->nTotalLength) - nPos = editor->nTotalLength - 1; - if (nPos<0) + nPos += pulScrollLines * (gcWheelDelta / WHEEL_DELTA) * 8; /* FIXME follow the original */ + if (nPos>=nEnd) + nPos = nEnd; + if (nPos<0) nPos = 0; if (nPos != editor->nScrollPosY) { ScrollWindow(hWnd, 0, editor->nScrollPosY-nPos, NULL, NULL); @@ -1376,9 +1458,6 @@ return nWritten; } -static WCHAR wszClassName[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '2', '0', 'W', 0}; -static WCHAR wszClassName50[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '5', '0', 'W', 0}; - void ME_RegisterEditorClass(HINSTANCE hInstance) { BOOL bResult; @@ -1417,30 +1496,6 @@ bResult = RegisterClassA(&wcA); assert(bResult); } - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("\n"); - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - me_heap = HeapCreate (0, 0x10000, 0); - ME_RegisterEditorClass(hinstDLL); - break; - - case DLL_PROCESS_DETACH: - UnregisterClassW(wszClassName, 0); - UnregisterClassW(wszClassName50, 0); - UnregisterClassA("RichEdit20A", 0); - UnregisterClassA("RichEdit50A", 0); - HeapDestroy (me_heap); - me_heap = NULL; - break; - } - return TRUE; -} - /****************************************************************** * CreateTextServices (RICHED20.4) * _____ Modified: trunk/reactos/lib/riched20/paint.c --- trunk/reactos/lib/riched20/paint.c 2005-05-28 12:43:26 UTC (rev 15577) +++ trunk/reactos/lib/riched20/paint.c 2005-05-28 14:40:26 UTC (rev 15578) @@ -76,23 +76,19 @@ if (rcUpdate->bottom < ye) ye = rcUpdate->bottom; } - - rc.left = xs; /* FIXME remove if it's not necessary anymore */ - rc.top = c.pt.y; - rc.right = xe; - rc.bottom = c.pt.y+1; - FillRect(hDC, &rc, (HBRUSH)GetStockObject(BLACK_BRUSH)); - if (ys == c.pt.y) /* don't overwrite the top bar */ - ys++; if (ye>ys) { + HBRUSH hbr; + hbr = CreateSolidBrush(ME_GetBackColor(c.editor)); rc.left = xs; rc.top = ys; rc.right = xe; rc.bottom = ye; - /* this is not supposed to be gray, I know, but lets keep it gray for now for debugging purposes */ - FillRect(hDC, &rc, (HBRUSH)GetStockObject(LTGRAY_BRUSH)); + FillRect(hDC, &rc, hbr); + DeleteObject(hbr); } + if (ys == c.pt.y) /* don't overwrite the top bar */ + ys++; } editor->nLastTotalLength = editor->nTotalLength; ME_DestroyContext(&c); _____ Modified: trunk/reactos/lib/riched20/run.c --- trunk/reactos/lib/riched20/run.c 2005-05-28 12:43:26 UTC (rev 15577) +++ trunk/reactos/lib/riched20/run.c 2005-05-28 14:40:26 UTC (rev 15578) @@ -466,8 +466,6 @@ * in practice */ ME_GetTextExtent(c, run->strText->szData, nLen, run->style, &size); - assert(run->style->tm.tmAscent>0); - assert(run->style->tm.tmDescent>0); *pAscent = run->style->tm.tmAscent; *pDescent = run->style->tm.tmDescent; size.cy = *pAscent + *pDescent; @@ -519,7 +517,8 @@ int nEnd = ME_StrVLen(run->strText); SIZE size = ME_GetRunSizeCommon(c, para, run, nEnd, &run->nAscent, &run->nDescent); run->nWidth = size.cx; - assert(size.cx); + if (!size.cx) + WARN("size.cx == 0\n"); } void ME_MustBeWrapped(ME_Context *c, ME_DisplayItem *para) _____ Modified: trunk/reactos/lib/riched20/style.c --- trunk/reactos/lib/riched20/style.c 2005-05-28 12:43:26 UTC (rev 15577) +++ trunk/reactos/lib/riched20/style.c 2005-05-28 14:40:26 UTC (rev 15578) @@ -383,7 +383,7 @@ TRACE("destroy style %p, total refs=%d\n", s, all_refs); else TRACE("release style %p, new refs=%d, total refs=%d\n", s, s->nRefs, all_refs); - if (!all_refs) FIXME("all style references freed (good!)\n"); + if (!all_refs) TRACE("all style references freed (good!)\n"); assert(s->nRefs>=0); if (!s->nRefs) ME_DestroyStyle(s);

1 0

[greatlrd] 15577: Implement NtGdiAnimatePalette (partly ripped from Wine)
by greatlrd＠svn.reactos.com 28 May '05

28 May '05

Implement NtGdiAnimatePalette (partly ripped from Wine) by hpussin Modified: trunk/reactos/lib/gdi32/gdi32.def Modified: trunk/reactos/lib/gdi32/misc/stubs.c Modified: trunk/reactos/subsys/win32k/objects/color.c _____ Modified: trunk/reactos/lib/gdi32/gdi32.def --- trunk/reactos/lib/gdi32/gdi32.def 2005-05-28 12:15:11 UTC (rev 15576) +++ trunk/reactos/lib/gdi32/gdi32.def 2005-05-28 12:43:26 UTC (rev 15577) @@ -17,7 +17,7 @@ AddFontResourceW@4 AddFontResourceTracking@8 AngleArc@24 -AnimatePalette@16 +AnimatePalette@16=NtGdiAnimatePalette@16 AnyLinkedFonts@0 Arc@36=NtGdiArc@36 ArcTo@36=NtGdiArcTo@36 _____ Modified: trunk/reactos/lib/gdi32/misc/stubs.c --- trunk/reactos/lib/gdi32/misc/stubs.c 2005-05-28 12:15:11 UTC (rev 15576) +++ trunk/reactos/lib/gdi32/misc/stubs.c 2005-05-28 12:43:26 UTC (rev 15577) @@ -13,25 +13,10 @@ #define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__); -/* - * @unimplemented - */ -BOOL -STDCALL -AnimatePalette( - HPALETTE a0, - UINT a1, - UINT a2, - CONST PALETTEENTRY *a3 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} + /* * @unimplemented */ _____ Modified: trunk/reactos/subsys/win32k/objects/color.c --- trunk/reactos/subsys/win32k/objects/color.c 2005-05-28 12:15:11 UTC (rev 15576) +++ trunk/reactos/subsys/win32k/objects/color.c 2005-05-28 12:43:26 UTC (rev 15577) @@ -70,12 +70,57 @@ return (const PALETTEENTRY*)&COLOR_sysPalTemplate; } -BOOL STDCALL NtGdiAnimatePalette(HPALETTE hPalette, UINT uStartIndex, - UINT uEntries, CONST PPALETTEENTRY ppe) +BOOL STDCALL NtGdiAnimatePalette(HPALETTE hPal, UINT StartIndex, + UINT NumEntries, CONST PPALETTEENTRY PaletteColors) { - UNIMPLEMENTED; - SetLastWin32Error(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + if( hPal != NtGdiGetStockObject(DEFAULT_PALETTE) ) + { + PPALGDI palPtr; + UINT pal_entries; + HDC hDC; + PDC dc; + HWND hHwd; + const PALETTEENTRY *pptr = PaletteColors; + + palPtr = (PPALGDI)PALETTE_LockPalette(hPal); + if (!palPtr) return FALSE; + + pal_entries = palPtr->NumColors; + if (StartIndex >= pal_entries) + { + PALETTE_UnlockPalette(hPal); + return FALSE; + } + if (StartIndex+NumEntries > pal_entries) NumEntries = pal_entries - StartIndex; + + for (NumEntries += StartIndex; StartIndex < NumEntries; StartIndex++, pptr++) { + /* According to MSDN, only animate PC_RESERVED colours */ + if (palPtr->IndexedColors[StartIndex].peFlags & PC_RESERVED) { + memcpy( &palPtr->IndexedColors[StartIndex], pptr, + sizeof(PALETTEENTRY) ); + PALETTE_ValidateFlags(&palPtr->IndexedColors[StartIndex], 1); + } + } + + PALETTE_UnlockPalette(hPal); + + /* Immediately apply the new palette if current window uses it */ + hHwd = NtUserGetDesktopWindow(); + hDC = (HDC)NtUserGetWindowDC(hHwd); + dc = DC_LockDc(hDC); + if (NULL != dc) + { + if (dc->w.hPalette == hPal) + { + DC_UnlockDc(hDC); + NtGdiRealizePalette(hDC); + } + else + DC_UnlockDc(hDC); + } + NtUserReleaseDC(hHwd,hDC); + } + return TRUE; } HPALETTE STDCALL NtGdiCreateHalftonePalette(HDC hDC)

1 0

[mbosma] 15576: discription of the lists
by mbosma＠svn.reactos.com 28 May '05

28 May '05

discription of the lists Modified: trunk/irc/ArchBlackmann/readme.txt _____ Modified: trunk/irc/ArchBlackmann/readme.txt --- trunk/irc/ArchBlackmann/readme.txt 2005-05-28 11:38:11 UTC (rev 15575) +++ trunk/irc/ArchBlackmann/readme.txt 2005-05-28 12:15:11 UTC (rev 15576) @@ -1,20 +1,44 @@ This doc can be also found on the wiki. -ArchBlackman is a IRC-Chat bot. He has been coded by Royce3 and currently DrFred (mbosma) runs him. +ArchBlackman is a IRC-Chat bot of the #reactos irc channel. He has been coded by Royce3 and DrFred (mbosma) currently runs him. -If some one use a swear word he'll tell him not to do so. You can also ask him something technical about reactos. :) -He also knows some commands. You can give him one like this "ArchBlackmann: !grovel". (don't forget to address him) +If some one use a swear word he'll tell him not to do so and you can also ask him something technical about reactos. :) -* !grovel - This is the only command that non ops can do (No Parameter) -* !kiss <person> -* !hug <person> -* !give <someone> <something> -* !say <something> - You can tell him to say something on the channel via PrivateMessage +Besides this he also knows some commands. The systax for giving him commands "ArchBlackmann: !grovel". (don't forget to address him) -* !add <list> <item> -* !remove <list> <item> + - !grovel - This is the only command that non ops can do (No Parameter) + - !kiss <person> + - !hug <person> + - !give <someone> <something> + - !say <something> - You can tell him to say something on the channel via PrivateMessage -The lists are the same as the text files. Most of the lists are not used directly, but by the other lists. Like this: +ArchBlackmann know what he should say from some text files. They can be found on the svn-dir. But can also edit them online if you are op using: + + - !add <list> <item> + - !remove <list> <item> + +List that are used directly to create responses are: + + - tech - here are the sentces ArchBlackmann sais when he finds his name + - curse - this are the curses he looks for + - cursecop - this the responces to them + - grovel - this is said when a op does the grovel command + - nogrovel - this when someone else does it + +The remaining lists are not used directly, but by the other lists. + +They are: + + - dev + - func + - irql + - module + - period + - status + - stru + - type + +And they are used like this: /me thinks %s is smarter than %dev% \ No newline at end of file

1 0

[navaraf] 15575: There's no point in keeping two almost identical packet drivers in the SVN.
by navaraf＠svn.reactos.com 28 May '05

28 May '05

There's no point in keeping two almost identical packet drivers in the SVN. Deleted: trunk/reactos/drivers/net/packet/

1 0

[navaraf] 15574: Bye, bye "include/net/" directory...
by navaraf＠svn.reactos.com 28 May '05

28 May '05

Bye, bye "include/net/" directory... Deleted: trunk/reactos/include/net/

1 0

[navaraf] 15573: - Move LAN headers out of main include directory.
by navaraf＠svn.reactos.com 28 May '05

28 May '05

- Move LAN headers out of main include directory. - Add few missing functions to ndis.h. Added: trunk/reactos/drivers/net/lan/include/net_lan.h Added: trunk/reactos/drivers/net/lan/include/net_wh.h Modified: trunk/reactos/drivers/net/lan/include/precomp.h Modified: trunk/reactos/drivers/net/lan/lan/lan.c Modified: trunk/reactos/drivers/net/lan/makefile Deleted: trunk/reactos/include/net/lan.h Deleted: trunk/reactos/include/net/wh.h Modified: trunk/reactos/w32api/include/ddk/ndis.h _____ Copied: trunk/reactos/drivers/net/lan/include/net_lan.h (from rev 15495, trunk/reactos/include/net/lan.h) --- trunk/reactos/include/net/lan.h 2005-05-25 14:25:19 UTC (rev 15495) +++ trunk/reactos/drivers/net/lan/include/net_lan.h 2005-05-28 11:30:26 UTC (rev 15573) @@ -0,0 +1,79 @@ +#ifndef _NET_LAN_H + +#include "net_wh.h" + +#define FSCTL_LAN_BASE FILE_DEVICE_NETWORK +#define _LAN_CONTROL_CODE(Function, Method) \ + CTL_CODE(FSCTL_LAN_BASE, Function, Method, FILE_WRITE_ACCESS) + +#define LAN_ENUM_ADAPTERS 0 +#define LAN_BUFFERED_MODE 1 +#define LAN_ADAPTER_INFO 2 + +#define IOCTL_IF_ENUM_ADAPTERS \ + _LAN_CONTROL_CODE(LAN_ENUM_ADAPTERS,METHOD_BUFFERED) +#define IOCTL_IF_BUFFERED_MODE \ + _LAN_CONTROL_CODE(LAN_BUFFERED_MODE,METHOD_BUFFERED) +#define IOCTL_IF_ADAPTER_INFO \ + _LAN_CONTROL_CODE(LAN_ADAPTER_INFO,METHOD_BUFFERED) + +typedef struct _LAN_PACKET_HEADER_T { + UINT Adapter; + UINT AddressType; + UINT AddressLen; + UINT PacketType; + PVOID Mdl; +} LAN_PACKET_HEADER_T, *PLAN_PACKET_HEADER_T; + +typedef struct _LAN_PACKET_HEADER { + LAN_PACKET_HEADER_T Fixed; + CHAR Address[1]; +} LAN_PACKET_HEADER, *PLAN_PACKET_HEADER; + +typedef struct _LAN_ADDRESS { + UINT Adapter; + UINT Flags; + USHORT AddressType; + USHORT AddressLen; + USHORT HWAddressType; + USHORT HWAddressLen; + CHAR Address[1]; +} LAN_ADDRESS, *PLAN_ADDRESS; + +typedef struct _LAN_ADAPTER_INFO_S { + UINT Index; + UINT Media; + UINT Speed; + USHORT AddressLen; + USHORT Overhead; + USHORT MTU; + USHORT RegKeySize; +} LAN_ADAPTER_INFO_S, *PLAN_ADAPTER_INFO_S; + +#define LAN_DATA_PTR(PH) \ + ((PH)->Address + (PH)->Fixed.AddressLen) +#define LAN_ALLOC_SIZE(AddrLen,PayloadLen) \ + (sizeof(LAN_PACKET_HEADER_T) + (AddrLen) + (PayloadLen)) +#define LAN_PAYLOAD_SIZE(PH,Size) \ + (Size - (PH)->Fixed.AddressLen - sizeof(LAN_PACKET_HEADER_T)) + +#define LAN_ADDR_SIZE(AddrLen,HWAddrLen) \ + (sizeof(LAN_ADDRESS) - 1 + (AddrLen) + (HWAddrLen)) +#define LAN_ADDR_PTR(LA) \ + ((LA)->Address) +#define LAN_HWADDR_PTR(LA) \ + ((LA)->Address + (LA)->AddressLen) + +#define LAN_EA_INFO_SIZE(NumTypes) \ + sizeof(FILE_FULL_EA_INFORMATION) + (6 + sizeof(USHORT) * NumTypes) +#define LAN_FILL_EA_INFO(Ea,NumTypes,Types) \ + { \ + RtlCopyMemory( (Ea)->EaName, "TYPES", 6 ); \ + (Ea)->EaNameLength = 6; \ + (Ea)->EaValueLength = sizeof(USHORT) * (NumTypes); \ + RtlCopyMemory( (Ea)->EaName + (Ea)->EaNameLength, \ + (Types), \ + sizeof(USHORT) * (NumTypes) ); \ + } + +#endif/*_NET_LAN_H*/ _____ Copied: trunk/reactos/drivers/net/lan/include/net_wh.h (from rev 15495, trunk/reactos/include/net/wh.h) _____ Modified: trunk/reactos/drivers/net/lan/include/precomp.h --- trunk/reactos/drivers/net/lan/include/precomp.h 2005-05-28 11:15:08 UTC (rev 15572) +++ trunk/reactos/drivers/net/lan/include/precomp.h 2005-05-28 11:30:26 UTC (rev 15573) @@ -8,7 +8,7 @@ #include <roscfg.h> #include <debug.h> #include <pseh.h> -#include "net/lan.h" +#include "net_lan.h" #include "lan.h" #endif/*_LAN_PRECOMP_H*/ _____ Modified: trunk/reactos/drivers/net/lan/lan/lan.c --- trunk/reactos/drivers/net/lan/lan/lan.c 2005-05-28 11:15:08 UTC (rev 15572) +++ trunk/reactos/drivers/net/lan/lan/lan.c 2005-05-28 11:30:26 UTC (rev 15573) @@ -1208,7 +1208,6 @@ { PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); NTSTATUS Status = STATUS_SUCCESS; - PFILE_OBJECT FileObject = IrpSp->FileObject; LA_DbgPrint(MID_TRACE,("LanDispatch: %d\n", IrpSp->MajorFunction)); if( IrpSp->MajorFunction != IRP_MJ_CREATE) { _____ Modified: trunk/reactos/drivers/net/lan/makefile --- trunk/reactos/drivers/net/lan/makefile 2005-05-28 11:15:08 UTC (rev 15572) +++ trunk/reactos/drivers/net/lan/makefile 2005-05-28 11:30:26 UTC (rev 15573) @@ -13,6 +13,7 @@ # -DMEMTRACK TARGET_CFLAGS = \ -D__USE_W32API \ + -D_SEH_NO_NATIVE_NLG \ -DNDIS40 \ -DMEMTRACK \ -Wall -Werror \ @@ -20,9 +21,11 @@ -I$(PATH_TO_TOP)/w32api/include \ -I$(PATH_TO_TOP)/include -TARGET_DDKLIBS = ndis.a \ - $(PATH_TO_TOP)/dk/w32/lib/pseh.a +TARGET_DDKLIBS = ndis.a +TARGET_LIBS = \ + $(PATH_TO_TOP)/dk/w32/lib/libpseh.a + TARGET_CLEAN = \ lan/*.o _____ Deleted: trunk/reactos/include/net/lan.h --- trunk/reactos/include/net/lan.h 2005-05-28 11:15:08 UTC (rev 15572) +++ trunk/reactos/include/net/lan.h 2005-05-28 11:30:26 UTC (rev 15573) @@ -1,79 +0,0 @@ -#ifndef _NET_LAN_H - -#include "net/wh.h" - -#define FSCTL_LAN_BASE FILE_DEVICE_NETWORK -#define _LAN_CONTROL_CODE(Function, Method) \ - CTL_CODE(FSCTL_LAN_BASE, Function, Method, FILE_WRITE_ACCESS) - -#define LAN_ENUM_ADAPTERS 0 -#define LAN_BUFFERED_MODE 1 -#define LAN_ADAPTER_INFO 2 - -#define IOCTL_IF_ENUM_ADAPTERS \ - _LAN_CONTROL_CODE(LAN_ENUM_ADAPTERS,METHOD_BUFFERED) -#define IOCTL_IF_BUFFERED_MODE \ - _LAN_CONTROL_CODE(LAN_BUFFERED_MODE,METHOD_BUFFERED) -#define IOCTL_IF_ADAPTER_INFO \ - _LAN_CONTROL_CODE(LAN_ADAPTER_INFO,METHOD_BUFFERED) - -typedef struct _LAN_PACKET_HEADER_T { - UINT Adapter; - UINT AddressType; - UINT AddressLen; - UINT PacketType; - PVOID Mdl; -} LAN_PACKET_HEADER_T, *PLAN_PACKET_HEADER_T; - -typedef struct _LAN_PACKET_HEADER { - LAN_PACKET_HEADER_T Fixed; - CHAR Address[1]; -} LAN_PACKET_HEADER, *PLAN_PACKET_HEADER; - -typedef struct _LAN_ADDRESS { - UINT Adapter; - UINT Flags; - USHORT AddressType; - USHORT AddressLen; - USHORT HWAddressType; - USHORT HWAddressLen; - CHAR Address[1]; -} LAN_ADDRESS, *PLAN_ADDRESS; - -typedef struct _LAN_ADAPTER_INFO_S { - UINT Index; - UINT Media; - UINT Speed; - USHORT AddressLen; - USHORT Overhead; - USHORT MTU; - USHORT RegKeySize; -} LAN_ADAPTER_INFO_S, *PLAN_ADAPTER_INFO_S; - -#define LAN_DATA_PTR(PH) \ - ((PH)->Address + (PH)->Fixed.AddressLen) -#define LAN_ALLOC_SIZE(AddrLen,PayloadLen) \ - (sizeof(LAN_PACKET_HEADER_T) + (AddrLen) + (PayloadLen)) -#define LAN_PAYLOAD_SIZE(PH,Size) \ - (Size - (PH)->Fixed.AddressLen - sizeof(LAN_PACKET_HEADER_T)) - -#define LAN_ADDR_SIZE(AddrLen,HWAddrLen) \ - (sizeof(LAN_ADDRESS) - 1 + (AddrLen) + (HWAddrLen)) -#define LAN_ADDR_PTR(LA) \ - ((LA)->Address) -#define LAN_HWADDR_PTR(LA) \ - ((LA)->Address + (LA)->AddressLen) - -#define LAN_EA_INFO_SIZE(NumTypes) \ - sizeof(FILE_FULL_EA_INFORMATION) + (6 + sizeof(USHORT) * NumTypes) -#define LAN_FILL_EA_INFO(Ea,NumTypes,Types) \ - { \ - RtlCopyMemory( (Ea)->EaName, "TYPES", 6 ); \ - (Ea)->EaNameLength = 6; \ - (Ea)->EaValueLength = sizeof(USHORT) * (NumTypes); \ - RtlCopyMemory( (Ea)->EaName + (Ea)->EaNameLength, \ - (Types), \ - sizeof(USHORT) * (NumTypes) ); \ - } - -#endif/*_NET_LAN_H*/ _____ Deleted: trunk/reactos/include/net/wh.h --- trunk/reactos/include/net/wh.h 2005-05-28 11:15:08 UTC (rev 15572) +++ trunk/reactos/include/net/wh.h 2005-05-28 11:30:26 UTC (rev 15573) @@ -1,50 +0,0 @@ -#ifndef _NET_WH_H -#define _NET_WH_H - -#ifdef i386 - -/* DWORD network to host byte order conversion for i386 */ -#define DN2H(dw) \ - ((((dw) & 0xFF000000L) >> 24) | \ - (((dw) & 0x00FF0000L) >> 8) | \ - (((dw) & 0x0000FF00L) << 8) | \ - (((dw) & 0x000000FFL) << 24)) - -/* DWORD host to network byte order conversion for i386 */ -#define DH2N(dw) \ - ((((dw) & 0xFF000000L) >> 24) | \ - (((dw) & 0x00FF0000L) >> 8) | \ - (((dw) & 0x0000FF00L) << 8) | \ - (((dw) & 0x000000FFL) << 24)) - -/* WORD network to host order conversion for i386 */ -#define WN2H(w) \ - ((((w) & 0xFF00) >> 8) | \ - (((w) & 0x00FF) << 8)) - -/* WORD host to network byte order conversion for i386 */ -#define WH2N(w) \ - ((((w) & 0xFF00) >> 8) | \ - (((w) & 0x00FF) << 8)) - -#else /* i386 */ - -/* DWORD network to host byte order conversion for other architectures */ -#define DN2H(dw) \ - (dw) - -/* DWORD host to network byte order conversion for other architectures */ -#define DH2N(dw) \ - (dw) - -/* WORD network to host order conversion for other architectures */ -#define WN2H(w) \ - (w) - -/* WORD host to network byte order conversion for other architectures */ -#define WH2N(w) \ - (w) - -#endif /* i386 */ - -#endif/*_NET_WH_H*/ _____ Modified: trunk/reactos/w32api/include/ddk/ndis.h --- trunk/reactos/w32api/include/ddk/ndis.h 2005-05-28 11:15:08 UTC (rev 15572) +++ trunk/reactos/w32api/include/ddk/ndis.h 2005-05-28 11:30:26 UTC (rev 15573) @@ -3066,6 +3066,11 @@ #endif NDISAPI +CCHAR +DDKAPI +NdisSystemProcessorCount(VOID); + +NDISAPI VOID DDKAPI NdisGetCurrentProcessorCpuUsage( @@ -5169,6 +5174,35 @@ +/* Event functions */ + +NDISAPI +VOID +DDKAPI +NdisInitializeEvent( + IN PNDIS_EVENT Event); + +NDISAPI +VOID +DDKAPI +NdisSetEvent( + IN PNDIS_EVENT Event); + +NDISAPI +VOID +DDKAPI +NdisResetEvent( + IN PNDIS_EVENT Event); + +NDISAPI +BOOLEAN +DDKAPI +NdisWaitEvent( + IN PNDIS_EVENT Event, + IN UINT Timeout); + + + /* NDIS intermediate miniport structures */ typedef VOID (DDKAPI *W_MINIPORT_CALLBACK)(

1 0

[navaraf] 15572: Remove old NDIS headers.
by navaraf＠svn.reactos.com 28 May '05

28 May '05

Remove old NDIS headers. Deleted: trunk/reactos/include/ndis.h Deleted: trunk/reactos/include/net/ndis.h Deleted: trunk/reactos/include/net/ndisoid.h Deleted: trunk/reactos/include/net/ntddndis.h _____ Deleted: trunk/reactos/include/ndis.h --- trunk/reactos/include/ndis.h 2005-05-28 11:10:27 UTC (rev 15571) +++ trunk/reactos/include/ndis.h 2005-05-28 11:15:08 UTC (rev 15572) @@ -1 +0,0 @@ -#include "net/ndis.h" _____ Deleted: trunk/reactos/include/net/ndis.h --- trunk/reactos/include/net/ndis.h 2005-05-28 11:10:27 UTC (rev 15571) +++ trunk/reactos/include/net/ndis.h 2005-05-28 11:15:08 UTC (rev 15572) @@ -1,5697 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS NDIS library - * FILE: include/net/ndis.h - * PURPOSE: Structures used by NDIS drivers - * DEFINES: i386 - Target platform is i386 - * NDIS_WRAPPER - Define only for NDIS wrapper library - * NDIS_MINIPORT_DRIVER - Define only for NDIS miniport drivers - * NDIS40 - Use NDIS 4.0 structures by default - * NDIS50 - Use NDIS 5.0 structures by default - * NDIS_WDM - Include wdm.h (currently just pulls in ntddk.h) - * - * NOTES: If NDIS_WDM is not defined, ntddk.h is included instead - * - * I have removed the following standard flag, used for building binary-compatible - * drivers for windows 98 and windows me: - * - * BINARY_COMPATIBLE - 0 = Use macros for some features - * - 1 = Use imports for features not available - * - * rationale: you're never going to use *this* ndis.h to build a driver for win9x. You'll - * use the MS ddk. This assumption drammatically simplifies ndis.h. - * - * There have been lots of instances of stdcall/cdecl mismatches, particularly in the - * callback routines. I have now nailed them all to STDCALL, which is what they ought to - * be. If you cross-check with the ndis.h from the MS DDK, you'll note that the compiler - * is set to a default calling conveition of stdcall with the /Gz command-line switch. - * There are only a few functions that should actually be cdecl: - * - DbgPrint() - * - DbgPrintReturnControlC() - * - NdisWriteErrorLogEntry() - * - * All other functions declared in ndis.h should be stdcall. - * - * TODO: - * - finish sanitizing NDIS40 and NDIS50; think about NDIS51 - * - make sure everything is stdcall - */ - -#ifndef __NDIS_H -#define __NDIS_H - -#if __GNUC__ >=3 -#pragma GCC system_header -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#pragma pack(push,4) - -#include "ntddk.h" -#include "ntddndis.h" -#include <ddk/netpnp.h> - -#ifdef NDIS50 -#undef NDIS40 -#define NDIS40 -#endif - -#ifndef UNALIGNED -#define UNALIGNED -#endif - -#ifndef FASTCALL -#define FASTCALL __attribute__((fastcall)) -#endif - -/* The NDIS library exports functions. NDIS miniport drivers import functions */ -#ifdef NDIS_WRAPPER - -#ifdef _MSC_VER -#define DDKAPI __declspec(dllexport) -#else -#define DDKAPI STDCALL /* MS ndis.h is 100% stdcall due to compiler flag /Gz */ -#endif - -#else /* NDIS_WRAPPER */ - -#ifdef _MSC_VER -#define DDKAPI __declspec(dllimport) -#else -#define DDKAPI STDCALL -#endif - -#endif /* NDIS_WRAPPER */ - -/* support NDIS_WDM and MAC drivers */ -#if defined (NDIS_WDM) -#include <wdm.h> -#else -#include <ntddk.h> -#endif - -/* Assert stuff */ -#ifdef DBG -VOID -STDCALL -RtlAssert ( - PVOID FailedAssertion, - PVOID FileName, - ULONG LineNumber, - PCHAR Message - ); - -#define ASSERT( exp ) if (!(exp)) RtlAssert( #exp, __FILE__, __LINE__, NULL ) -#define ASSERTMSG( msg, exp ) if (!(exp)) RtlAssert( #exp, __FILE__, __LINE__, msg ) -#define PAGED_CODE() if (KeGetCurrentIrql() > APC_LEVEL) ASSERT(0); - -#else -#define ASSERT( exp ) -#define ASSERTMSG( msg, exp ) -#define PAGED_CODE() -#endif /* DBG */ - -/* Base types */ - -#define IN -#define OUT -#define OPTIONAL - -typedef CONST CHAR *PCSTR; - -typedef struct _DMA_CONFIGURATION_BYTE0 -{ - UCHAR Channel:3; - UCHAR Reserved:3; - UCHAR Shared:1; - UCHAR MoreEntries:1; -} DMA_CONFIGURATION_BYTE0; - -typedef struct _DMA_CONFIGURATION_BYTE1 -{ - UCHAR Reserved0:2; - UCHAR TransferSize:2; - UCHAR Timing:2; - UCHAR Reserved1:2; -} DMA_CONFIGURATION_BYTE1; - - -typedef struct _EISA_MEMORY_TYPE -{ - UCHAR ReadWrite:1; - UCHAR Cached:1; - UCHAR Reserved0:1; - UCHAR Type:2; - UCHAR Shared:1; - UCHAR Reserved1:1; - UCHAR MoreEntries:1; -} EISA_MEMORY_TYPE, *PEISA_MEMORY_TYPE; - -typedef struct _EISA_MEMORY_CONFIGURATION -{ - EISA_MEMORY_TYPE ConfigurationByte; - UCHAR DataSize; - USHORT AddressLowWord; - UCHAR AddressHighByte; - USHORT MemorySize; -} EISA_MEMORY_CONFIGURATION, *PEISA_MEMORY_CONFIGURATION; - - -typedef struct _EISA_IRQ_DESCRIPTOR -{ - UCHAR Interrupt:4; - UCHAR Reserved:1; - UCHAR LevelTriggered:1; - UCHAR Shared:1; - UCHAR MoreEntries:1; -} EISA_IRQ_DESCRIPTOR, *PEISA_IRQ_DESCRIPTOR; - -typedef struct _EISA_IRQ_CONFIGURATION -{ - EISA_IRQ_DESCRIPTOR ConfigurationByte; - UCHAR Reserved; -} EISA_IRQ_CONFIGURATION, *PEISA_IRQ_CONFIGURATION; - -typedef struct _EISA_DMA_CONFIGURATION -{ - DMA_CONFIGURATION_BYTE0 ConfigurationByte0; - DMA_CONFIGURATION_BYTE1 ConfigurationByte1; -} EISA_DMA_CONFIGURATION, *PEISA_DMA_CONFIGURATION; - - -typedef struct _EISA_PORT_DESCRIPTOR -{ - UCHAR NumberPorts:5; - UCHAR Reserved:1; - UCHAR Shared:1; - UCHAR MoreEntries:1; -} EISA_PORT_DESCRIPTOR, *PEISA_PORT_DESCRIPTOR; - -typedef struct _EISA_PORT_CONFIGURATION -{ - EISA_PORT_DESCRIPTOR Configuration; - USHORT PortAddress; -} EISA_PORT_CONFIGURATION, *PEISA_PORT_CONFIGURATION; - -typedef struct _CM_EISA_SLOT_INFORMATION -{ - UCHAR ReturnCode; - UCHAR ReturnFlags; - UCHAR MajorRevision; - UCHAR MinorRevision; - USHORT Checksum; - UCHAR NumberFunctions; - UCHAR FunctionInformation; - ULONG CompressedId; -} CM_EISA_SLOT_INFORMATION, *PCM_EISA_SLOT_INFORMATION; - -typedef struct _CM_EISA_FUNCTION_INFORMATION -{ - ULONG CompressedId; - UCHAR IdSlotFlags1; - UCHAR IdSlotFlags2; - UCHAR MinorRevision; - UCHAR MajorRevision; - UCHAR Selections[26]; - UCHAR FunctionFlags; - UCHAR TypeString[80]; - EISA_MEMORY_CONFIGURATION EisaMemory[9]; - EISA_IRQ_CONFIGURATION EisaIrq[7]; - EISA_DMA_CONFIGURATION EisaDma[4]; - EISA_PORT_CONFIGURATION EisaPort[20]; - UCHAR InitializationData[60]; -} CM_EISA_FUNCTION_INFORMATION, *PCM_EISA_FUNCTION_INFORMATION; - -ULONG CDECL DbgPrint( - PCH Format, - ...); - - -/* Core kernel functions */ - -VOID -STDCALL -KeStallExecutionProcessor( - ULONG MicroSeconds); - - -#include <ddk/netevent.h> -#include "ndisoid.h" -#include "ntddndis.h" - - -#if !defined(_MSC_VER) -#ifndef GUID_DEFINED -#define GUID_DEFINED -typedef struct _GUID { - ULONG Data1; - USHORT Data2; - USHORT Data3; - UCHAR Data4[8]; -} GUID; -#endif /* _GUID_DEFINED */ -#endif /* _MSC_VER */ - - -/* NDIS base types */ - -typedef struct _NDIS_SPIN_LOCK { - KSPIN_LOCK SpinLock; - KIRQL OldIrql; -} NDIS_SPIN_LOCK, * PNDIS_SPIN_LOCK; - -typedef struct _NDIS_EVENT { - KEVENT Event; -} NDIS_EVENT, *PNDIS_EVENT; - -typedef PVOID NDIS_HANDLE, *PNDIS_HANDLE; -typedef int NDIS_STATUS, *PNDIS_STATUS; - -typedef UNICODE_STRING NDIS_STRING, *PNDIS_STRING; - -typedef MDL NDIS_BUFFER, *PNDIS_BUFFER; - -/* NDIS_STATUS constants */ -#define NDIS_STATUS_SUCCESS ((NDIS_STATUS)STATUS_SUCCESS) -#define NDIS_STATUS_PENDING ((NDIS_STATUS)STATUS_PENDING) -#define NDIS_STATUS_NOT_RECOGNIZED ((NDIS_STATUS)0x00010001L) -#define NDIS_STATUS_NOT_COPIED ((NDIS_STATUS)0x00010002L) -#define NDIS_STATUS_NOT_ACCEPTED ((NDIS_STATUS)0x00010003L) -#define NDIS_STATUS_CALL_ACTIVE ((NDIS_STATUS)0x00010007L) -#define NDIS_STATUS_ONLINE ((NDIS_STATUS)0x40010003L) -#define NDIS_STATUS_RESET_START ((NDIS_STATUS)0x40010004L) -#define NDIS_STATUS_RESET_END ((NDIS_STATUS)0x40010005L) -#define NDIS_STATUS_RING_STATUS ((NDIS_STATUS)0x40010006L) -#define NDIS_STATUS_CLOSED ((NDIS_STATUS)0x40010007L) -#define NDIS_STATUS_WAN_LINE_UP ((NDIS_STATUS)0x40010008L) -#define NDIS_STATUS_WAN_LINE_DOWN ((NDIS_STATUS)0x40010009L) -#define NDIS_STATUS_WAN_FRAGMENT ((NDIS_STATUS)0x4001000AL) -#define NDIS_STATUS_MEDIA_CONNECT ((NDIS_STATUS)0x4001000BL) -#define NDIS_STATUS_MEDIA_DISCONNECT ((NDIS_STATUS)0x4001000CL) -#define NDIS_STATUS_HARDWARE_LINE_UP ((NDIS_STATUS)0x4001000DL) -#define NDIS_STATUS_HARDWARE_LINE_DOWN ((NDIS_STATUS)0x4001000EL) -#define NDIS_STATUS_INTERFACE_UP ((NDIS_STATUS)0x4001000FL) -#define NDIS_STATUS_INTERFACE_DOWN ((NDIS_STATUS)0x40010010L) -#define NDIS_STATUS_MEDIA_BUSY ((NDIS_STATUS)0x40010011L) -#define NDIS_STATUS_WW_INDICATION ((NDIS_STATUS)0x40010012L) -#define NDIS_STATUS_TAPI_INDICATION ((NDIS_STATUS)0x40010080L) - -#define NDIS_STATUS_NOT_RESETTABLE ((NDIS_STATUS)0x80010001L) -#define NDIS_STATUS_SOFT_ERRORS ((NDIS_STATUS)0x80010003L) -#define NDIS_STATUS_HARD_ERRORS ((NDIS_STATUS)0x80010004L) -#define NDIS_STATUS_BUFFER_OVERFLOW ((NDIS_STATUS)STATUS_BUFFER_OVERFLOW) - -#define NDIS_STATUS_FAILURE ((NDIS_STATUS)STATUS_UNSUCCESSFUL) -#define NDIS_STATUS_RESOURCES ((NDIS_STATUS)STATUS_INSUFFICIENT_RESOURCES) -#define NDIS_STATUS_CLOSING ((NDIS_STATUS)0xC0010002L) -#define NDIS_STATUS_BAD_VERSION ((NDIS_STATUS)0xC0010004L) -#define NDIS_STATUS_BAD_CHARACTERISTICS ((NDIS_STATUS)0xC0010005L) -#define NDIS_STATUS_ADAPTER_NOT_FOUND ((NDIS_STATUS)0xC0010006L) -#define NDIS_STATUS_OPEN_FAILED ((NDIS_STATUS)0xC0010007L) -#define NDIS_STATUS_DEVICE_FAILED ((NDIS_STATUS)0xC0010008L) -#define NDIS_STATUS_MULTICAST_FULL ((NDIS_STATUS)0xC0010009L) -#define NDIS_STATUS_MULTICAST_EXISTS ((NDIS_STATUS)0xC001000AL) -#define NDIS_STATUS_MULTICAST_NOT_FOUND ((NDIS_STATUS)0xC001000BL) -#define NDIS_STATUS_REQUEST_ABORTED ((NDIS_STATUS)0xC001000CL) -#define NDIS_STATUS_RESET_IN_PROGRESS ((NDIS_STATUS)0xC001000DL) -#define NDIS_STATUS_CLOSING_INDICATING ((NDIS_STATUS)0xC001000EL) -#define NDIS_STATUS_NOT_SUPPORTED ((NDIS_STATUS)STATUS_NOT_SUPPORTED) -#define NDIS_STATUS_INVALID_PACKET ((NDIS_STATUS)0xC001000FL) -#define NDIS_STATUS_OPEN_LIST_FULL ((NDIS_STATUS)0xC0010010L) -#define NDIS_STATUS_ADAPTER_NOT_READY ((NDIS_STATUS)0xC0010011L) -#define NDIS_STATUS_ADAPTER_NOT_OPEN ((NDIS_STATUS)0xC0010012L) -#define NDIS_STATUS_NOT_INDICATING ((NDIS_STATUS)0xC0010013L) -#define NDIS_STATUS_INVALID_LENGTH ((NDIS_STATUS)0xC0010014L) -#define NDIS_STATUS_INVALID_DATA ((NDIS_STATUS)0xC0010015L) -#define NDIS_STATUS_BUFFER_TOO_SHORT ((NDIS_STATUS)0xC0010016L) -#define NDIS_STATUS_INVALID_OID ((NDIS_STATUS)0xC0010017L) -#define NDIS_STATUS_ADAPTER_REMOVED ((NDIS_STATUS)0xC0010018L) -#define NDIS_STATUS_UNSUPPORTED_MEDIA ((NDIS_STATUS)0xC0010019L) -#define NDIS_STATUS_GROUP_ADDRESS_IN_USE ((NDIS_STATUS)0xC001001AL) -#define NDIS_STATUS_FILE_NOT_FOUND ((NDIS_STATUS)0xC001001BL) -#define NDIS_STATUS_ERROR_READING_FILE ((NDIS_STATUS)0xC001001CL) -#define NDIS_STATUS_ALREADY_MAPPED ((NDIS_STATUS)0xC001001DL) -#define NDIS_STATUS_RESOURCE_CONFLICT ((NDIS_STATUS)0xC001001EL) -#define NDIS_STATUS_NO_CABLE ((NDIS_STATUS)0xC001001FL) - -#define NDIS_STATUS_INVALID_SAP ((NDIS_STATUS)0xC0010020L) -#define NDIS_STATUS_SAP_IN_USE ((NDIS_STATUS)0xC0010021L) -#define NDIS_STATUS_INVALID_ADDRESS ((NDIS_STATUS)0xC0010022L) -#define NDIS_STATUS_VC_NOT_ACTIVATED ((NDIS_STATUS)0xC0010023L) -#define NDIS_STATUS_DEST_OUT_OF_ORDER ((NDIS_STATUS)0xC0010024L) -#define NDIS_STATUS_VC_NOT_AVAILABLE ((NDIS_STATUS)0xC0010025L) -#define NDIS_STATUS_CELLRATE_NOT_AVAILABLE ((NDIS_STATUS)0xC0010026L) -#define NDIS_STATUS_INCOMPATABLE_QOS ((NDIS_STATUS)0xC0010027L) -#define NDIS_STATUS_AAL_PARAMS_UNSUPPORTED ((NDIS_STATUS)0xC0010028L) -#define NDIS_STATUS_NO_ROUTE_TO_DESTINATION ((NDIS_STATUS)0xC0010029L) - -#define NDIS_STATUS_TOKEN_RING_OPEN_ERROR ((NDIS_STATUS)0xC0011000L) - - -/* NDIS error codes for error logging */ - -#define NDIS_ERROR_CODE ULONG - -#define NDIS_ERROR_CODE_RESOURCE_CONFLICT EVENT_NDIS_RESOURCE_CONFLICT -#define NDIS_ERROR_CODE_OUT_OF_RESOURCES EVENT_NDIS_OUT_OF_RESOURCE -#define NDIS_ERROR_CODE_HARDWARE_FAILURE EVENT_NDIS_HARDWARE_FAILURE -#define NDIS_ERROR_CODE_ADAPTER_NOT_FOUND EVENT_NDIS_ADAPTER_NOT_FOUND -#define NDIS_ERROR_CODE_INTERRUPT_CONNECT EVENT_NDIS_INTERRUPT_CONNECT -#define NDIS_ERROR_CODE_DRIVER_FAILURE EVENT_NDIS_DRIVER_FAILURE -#define NDIS_ERROR_CODE_BAD_VERSION EVENT_NDIS_BAD_VERSION -#define NDIS_ERROR_CODE_TIMEOUT EVENT_NDIS_TIMEOUT -#define NDIS_ERROR_CODE_NETWORK_ADDRESS EVENT_NDIS_NETWORK_ADDRESS -#define NDIS_ERROR_CODE_UNSUPPORTED_CONFIGURATION EVENT_NDIS_UNSUPPORTED_CONFIGURATION -#define NDIS_ERROR_CODE_INVALID_VALUE_FROM_ADAPTER EVENT_NDIS_INVALID_VALUE_FROM_ADAPTER -#define NDIS_ERROR_CODE_MISSING_CONFIGURATION_PARAMETER EVENT_NDIS_MISSING_CONFIGURATION_PARAMETER -#define NDIS_ERROR_CODE_BAD_IO_BASE_ADDRESS EVENT_NDIS_BAD_IO_BASE_ADDRESS -#define NDIS_ERROR_CODE_RECEIVE_SPACE_SMALL EVENT_NDIS_RECEIVE_SPACE_SMALL -#define NDIS_ERROR_CODE_ADAPTER_DISABLED EVENT_NDIS_ADAPTER_DISABLED - - -/* Memory allocation flags. Used by Ndis[Allocate|Free]Memory */ -#define NDIS_MEMORY_CONTIGUOUS 0x00000001 -#define NDIS_MEMORY_NONCACHED 0x00000002 - -/* NIC attribute flags. Used by NdisMSetAttributes(Ex) */ -#define NDIS_ATTRIBUTE_IGNORE_PACKET_TIMEOUT 0x00000001 -#define NDIS_ATTRIBUTE_IGNORE_REQUEST_TIMEOUT 0x00000002 -#define NDIS_ATTRIBUTE_IGNORE_TOKEN_RING_ERRORS 0x00000004 -#define NDIS_ATTRIBUTE_BUS_MASTER 0x00000008 -#define NDIS_ATTRIBUTE_INTERMEDIATE_DRIVER 0x00000010 -#define NDIS_ATTRIBUTE_DESERIALIZE 0x00000020 - - -#define MAXIMUM_PROCESSORS 32 - -/* Lock */ - -typedef union _NDIS_RW_LOCK_REFCOUNT { - UINT RefCount; - UCHAR cacheLine[16]; -} NDIS_RW_LOCK_REFCOUNT; - -typedef struct _NDIS_RW_LOCK { - union { - struct { - KSPIN_LOCK SpinLock; - PVOID Context; - } s; - UCHAR Reserved[16]; - } u; - - NDIS_RW_LOCK_REFCOUNT RefCount[MAXIMUM_PROCESSORS]; -} NDIS_RW_LOCK, *PNDIS_RW_LOCK; - -typedef struct _LOCK_STATE { - USHORT LockState; - KIRQL OldIrql; -} LOCK_STATE, *PLOCK_STATE; - - - -/* Timer */ - -typedef VOID -(*PNDIS_TIMER_FUNCTION)( - IN PVOID SystemSpecific1, - IN PVOID FunctionContext, - IN PVOID SystemSpecific2, - IN PVOID SystemSpecific3); - -typedef struct _NDIS_TIMER { - KTIMER Timer; - KDPC Dpc; -} NDIS_TIMER, *PNDIS_TIMER; - -VOID -DDKAPI -NdisInitializeTimer( - IN OUT PNDIS_TIMER Timer, - IN PNDIS_TIMER_FUNCTION TimerFunction, - IN PVOID FunctionContext); - -VOID -DDKAPI -NdisSetTimer( - IN PNDIS_TIMER Timer, - IN UINT MillisecondsToDelay); - -/* Hardware */ - -typedef CM_MCA_POS_DATA NDIS_MCA_POS_DATA, *PNDIS_MCA_POS_DATA; -typedef CM_EISA_SLOT_INFORMATION NDIS_EISA_SLOT_INFORMATION, *PNDIS_EISA_SLOT_INFORMATION; -typedef CM_EISA_FUNCTION_INFORMATION NDIS_EISA_FUNCTION_INFORMATION, *PNDIS_EISA_FUNCTION_INFORMATION; -typedef CM_PARTIAL_RESOURCE_LIST NDIS_RESOURCE_LIST, *PNDIS_RESOURCE_LIST; - -/* Hardware status codes (OID_GEN_HARDWARE_STATUS) */ -typedef enum _NDIS_HARDWARE_STATUS { - NdisHardwareStatusReady, - NdisHardwareStatusInitializing, - NdisHardwareStatusReset, - NdisHardwareStatusClosing, - NdisHardwareStatusNotReady -} NDIS_HARDWARE_STATUS, *PNDIS_HARDWARE_STATUS; - -/* OID_GEN_GET_TIME_CAPS */ -typedef struct _GEN_GET_TIME_CAPS { - ULONG Flags; - ULONG ClockPrecision; -} GEN_GET_TIME_CAPS, *PGEN_GET_TIME_CAPS; - -/* Flag bits */ -#define READABLE_LOCAL_CLOCK 0x00000001 -#define CLOCK_NETWORK_DERIVED 0x00000002 -#define CLOCK_PRECISION 0x00000004 -#define RECEIVE_TIME_INDICATION_CAPABLE 0x00000008 -#define TIMED_SEND_CAPABLE 0x00000010 -#define TIME_STAMP_CAPABLE 0x00000020 - -/* OID_GEN_GET_NETCARD_TIME */ -typedef struct _GEN_GET_NETCARD_TIME { - ULONGLONG ReadTime; -} GEN_GET_NETCARD_TIME, *PGEN_GET_NETCARD_TIME; - -/* NDIS driver medium (OID_GEN_MEDIA_SUPPORTED / OID_GEN_MEDIA_IN_USE) */ -typedef enum _NDIS_MEDIUM { - NdisMedium802_3, - NdisMedium802_5, - NdisMediumFddi, - NdisMediumWan, - NdisMediumLocalTalk, - NdisMediumDix, /* Defined for convenience, not a real medium */ - NdisMediumArcnetRaw, - NdisMediumArcnet878_2, - NdisMediumAtm, - NdisMediumWirelessWan, - NdisMediumIrda, - NdisMediumBpc, - NdisMediumCoWan, - NdisMedium1394, - NdisMediumMax -} NDIS_MEDIUM, *PNDIS_MEDIUM; - -/* NDIS packet filter bits (OID_GEN_CURRENT_PACKET_FILTER) */ -#define NDIS_PACKET_TYPE_DIRECTED 0x00000001 -#define NDIS_PACKET_TYPE_MULTICAST 0x00000002 -#define NDIS_PACKET_TYPE_ALL_MULTICAST 0x00000004 -#define NDIS_PACKET_TYPE_BROADCAST 0x00000008 -#define NDIS_PACKET_TYPE_SOURCE_ROUTING 0x00000010 -#define NDIS_PACKET_TYPE_PROMISCUOUS 0x00000020 -#define NDIS_PACKET_TYPE_SMT 0x00000040 -#define NDIS_PACKET_TYPE_ALL_LOCAL 0x00000080 -#define NDIS_PACKET_TYPE_GROUP 0x00001000 -#define NDIS_PACKET_TYPE_ALL_FUNCTIONAL 0x00002000 -#define NDIS_PACKET_TYPE_FUNCTIONAL 0x00004000 -#define NDIS_PACKET_TYPE_MAC_FRAME 0x00008000 - -/* NDIS protocol option bits (OID_GEN_PROTOCOL_OPTIONS) */ -#define NDIS_PROT_OPTION_ESTIMATED_LENGTH 0x00000001 -#define NDIS_PROT_OPTION_NO_LOOPBACK 0x00000002 -#define NDIS_PROT_OPTION_NO_RSVD_ON_RCVPKT 0x00000004 - -/* NDIS MAC option bits (OID_GEN_MAC_OPTIONS) */ -#define NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA 0x00000001 -#define NDIS_MAC_OPTION_RECEIVE_SERIALIZED 0x00000002 -#define NDIS_MAC_OPTION_TRANSFERS_NOT_PEND 0x00000004 -#define NDIS_MAC_OPTION_NO_LOOPBACK 0x00000008 -#define NDIS_MAC_OPTION_FULL_DUPLEX 0x00000010 -#define NDIS_MAC_OPTION_EOTX_INDICATION 0x00000020 -#define NDIS_MAC_OPTION_8021P_PRIORITY 0x00000040 -#define NDIS_MAC_OPTION_RESERVED 0x80000000 - -/* State of the LAN media (OID_GEN_MEDIA_CONNECT_STATUS) */ -typedef enum _NDIS_MEDIA_STATE { - NdisMediaStateConnected, - NdisMediaStateDisconnected -} NDIS_MEDIA_STATE, *PNDIS_MEDIA_STATE; - -/* OID_GEN_SUPPORTED_GUIDS */ -typedef struct _NDIS_GUID { - GUID Guid; - union { - NDIS_OID Oid; - NDIS_STATUS Status; - } u; - ULONG Size; - ULONG Flags; -} NDIS_GUID, *PNDIS_GUID; - -#define NDIS_GUID_TO_OID 0x00000001 -#define NDIS_GUID_TO_STATUS 0x00000002 -#define NDIS_GUID_ANSI_STRING 0x00000004 -#define NDIS_GUID_UNICODE_STRING 0x00000008 -#define NDIS_GUID_ARRAY 0x00000010 - - -typedef struct _NDIS_PACKET_POOL { - NDIS_SPIN_LOCK SpinLock; - struct _NDIS_PACKET *FreeList; - UINT PacketLength; - UCHAR Buffer[1]; -} NDIS_PACKET_POOL, * PNDIS_PACKET_POOL; - -typedef struct _NDIS_PACKET_PRIVATE { - UINT PhysicalCount; - UINT TotalLength; - PNDIS_BUFFER Head; - PNDIS_BUFFER Tail; - PNDIS_PACKET_POOL Pool; - UINT Count; - ULONG Flags; /* See fPACKET_xxx bits below */ - BOOLEAN ValidCounts; - UCHAR NdisPacketFlags; - USHORT NdisPacketOobOffset; -} NDIS_PACKET_PRIVATE, * PNDIS_PACKET_PRIVATE; - -#define fPACKET_CONTAINS_MEDIA_SPECIFIC_INFO 0x40 -#define fPACKET_ALLOCATED_BY_NDIS 0x80 - -typedef struct _NDIS_PACKET { - NDIS_PACKET_PRIVATE Private; - union { - struct { - UCHAR MiniportReserved[2*sizeof(PVOID)]; - UCHAR WrapperReserved[2*sizeof(PVOID)]; - } s1; - struct { - UCHAR MiniportReservedEx[3*sizeof(PVOID)]; - UCHAR WrapperReservedEx[sizeof(PVOID)]; - } s2; - struct { - UCHAR MacReserved[4*sizeof(PVOID)]; - } s3; - } u; - ULONG_PTR Reserved[2]; - UCHAR ProtocolReserved[1]; -} NDIS_PACKET, *PNDIS_PACKET, **PPNDIS_PACKET; - -typedef struct _NDIS_PACKET_OOB_DATA { - union { - ULONGLONG TimeToSend; - ULONGLONG TimeSent; - } u; - ULONGLONG TimeReceived; - UINT HeaderSize; - UINT SizeMediaSpecificInfo; - PVOID MediaSpecificInformation; - NDIS_STATUS Status; -} NDIS_PACKET_OOB_DATA, *PNDIS_PACKET_OOB_DATA; - -typedef struct _NDIS_PM_PACKET_PATTERN { - ULONG Priority; - ULONG Reserved; - ULONG MaskSize; - ULONG PatternOffset; - ULONG PatternSize; - ULONG PatternFlags; -} NDIS_PM_PACKET_PATTERN, *PNDIS_PM_PACKET_PATTERN; - - -/* Request types used by NdisRequest */ -typedef enum _NDIS_REQUEST_TYPE { - NdisRequestQueryInformation, - NdisRequestSetInformation, - NdisRequestQueryStatistics, - NdisRequestOpen, - NdisRequestClose, - NdisRequestSend, - NdisRequestTransferData, - NdisRequestReset, - NdisRequestGeneric1, - NdisRequestGeneric2, - NdisRequestGeneric3, - NdisRequestGeneric4 -} NDIS_REQUEST_TYPE, *PNDIS_REQUEST_TYPE; - -typedef struct _NDIS_REQUEST { - UCHAR MacReserved[16]; - NDIS_REQUEST_TYPE RequestType; - union _DATA { - struct QUERY_INFORMATION { - NDIS_OID Oid; - PVOID InformationBuffer; - UINT InformationBufferLength; - UINT BytesWritten; - UINT BytesNeeded; - } QUERY_INFORMATION; - struct SET_INFORMATION { - NDIS_OID Oid; - PVOID InformationBuffer; - UINT InformationBufferLength; - UINT BytesRead; - UINT BytesNeeded; - } SET_INFORMATION; - } DATA; -#ifdef NDIS50 - UCHAR NdisReserved[36]; - union { - UCHAR CallMgrReserved[8]; - UCHAR ProtocolReserved[8]; - }; - UCHAR MiniportReserved[8]; -#endif -} NDIS_REQUEST, *PNDIS_REQUEST; - - - -/* Wide Area Networks definitions */ - -typedef struct _NDIS_WAN_PACKET { - LIST_ENTRY WanPacketQueue; - PUCHAR CurrentBuffer; - ULONG CurrentLength; - PUCHAR StartBuffer; - PUCHAR EndBuffer; - PVOID ProtocolReserved1; - PVOID ProtocolReserved2; - PVOID ProtocolReserved3; - PVOID ProtocolReserved4; - PVOID MacReserved1; - PVOID MacReserved2; - PVOID MacReserved3; - PVOID MacReserved4; -} NDIS_WAN_PACKET, *PNDIS_WAN_PACKET; - - - -/* DMA channel information */ - -typedef struct _NDIS_DMA_DESCRIPTION { - BOOLEAN DemandMode; - BOOLEAN AutoInitialize; - BOOLEAN DmaChannelSpecified; - DMA_WIDTH DmaWidth; - DMA_SPEED DmaSpeed; - ULONG DmaPort; - ULONG DmaChannel; -} NDIS_DMA_DESCRIPTION, *PNDIS_DMA_DESCRIPTION; - -typedef struct _NDIS_DMA_BLOCK { - PVOID MapRegisterBase; - KEVENT AllocationEvent; - PADAPTER_OBJECT SystemAdapterObject; - BOOLEAN InProgress; -} NDIS_DMA_BLOCK, *PNDIS_DMA_BLOCK; - -#define NDIS_DMA_24BITS 0 -#define NDIS_DMA_32BITS 1 -#define NDIS_DMA_64BITS 2 - -/* Possible hardware architecture */ -typedef enum _NDIS_INTERFACE_TYPE { - NdisInterfaceInternal = Internal, - NdisInterfaceIsa = Isa, - NdisInterfaceEisa = Eisa, - NdisInterfaceMca = MicroChannel, - NdisInterfaceTurboChannel = TurboChannel, - NdisInterfacePci = PCIBus, - NdisInterfacePcMcia = PCMCIABus -} NDIS_INTERFACE_TYPE, *PNDIS_INTERFACE_TYPE; - -#define NdisInterruptLevelSensitive LevelSensitive -#define NdisInterruptLatched Latched -typedef KINTERRUPT_MODE NDIS_INTERRUPT_MODE, *PNDIS_INTERRUPT_MODE; - -typedef enum _NDIS_PROCESSOR_TYPE { - NdisProcessorX86, - NdisProcessorMips, - NdisProcessorAlpha, - NdisProcessorPpc -} NDIS_PROCESSOR_TYPE, *PNDIS_PROCESSOR_TYPE; - -typedef enum _NDIS_ENVIRONMENT_TYPE { - NdisEnvironmentWindows, - NdisEnvironmentWindowsNt -} NDIS_ENVIRONMENT_TYPE, *PNDIS_ENVIRONMENT_TYPE; - -typedef enum _NDIS_PARAMETER_TYPE { - NdisParameterInteger, - NdisParameterHexInteger, - NdisParameterString, - NdisParameterMultiString, - NdisParameterBinary -} NDIS_PARAMETER_TYPE, *PNDIS_PARAMETER_TYPE; - -typedef struct { - USHORT Length; - PVOID Buffer; -} BINARY_DATA; - -typedef struct _NDIS_CONFIGURATION_PARAMETER { - NDIS_PARAMETER_TYPE ParameterType; - union { - ULONG IntegerData; - NDIS_STRING StringData; - BINARY_DATA BinaryData; - } ParameterData; -} NDIS_CONFIGURATION_PARAMETER, *PNDIS_CONFIGURATION_PARAMETER; - - -typedef PHYSICAL_ADDRESS NDIS_PHYSICAL_ADDRESS, *PNDIS_PHYSICAL_ADDRESS; - -typedef struct _NDIS_PHYSICAL_ADDRESS_UNIT { - NDIS_PHYSICAL_ADDRESS PhysicalAddress; - UINT Length; -} NDIS_PHYSICAL_ADDRESS_UNIT, *PNDIS_PHYSICAL_ADDRESS_UNIT; - - -typedef VOID -(STDCALL *ADAPTER_SHUTDOWN_HANDLER)( - IN PVOID ShutdownContext); - - - -//#ifdef NDIS_WRAPPER - -typedef struct _OID_LIST OID_LIST, *POID_LIST; - -/* PnP state */ - -typedef enum _NDIS_PNP_DEVICE_STATE { - NdisPnPDeviceAdded, - NdisPnPDeviceStarted, - NdisPnPDeviceQueryStopped, - NdisPnPDeviceStopped, - NdisPnPDeviceQueryRemoved, - NdisPnPDeviceRemoved, - NdisPnPDeviceSurpriseRemoved -} NDIS_PNP_DEVICE_STATE; - -#define NDIS_DEVICE_NOT_STOPPABLE 0x00000001 -#define NDIS_DEVICE_NOT_REMOVEABLE 0x00000002 -#define NDIS_DEVICE_NOT_SUSPENDABLE 0x00000004 -#define NDIS_DEVICE_DISABLE_PM 0x00000008 -#define NDIS_DEVICE_DISABLE_WAKE_UP 0x00000010 -#define NDIS_DEVICE_DISABLE_WAKE_ON_RECONNECT 0x00000020 - -//#endif /* NDIS_WRAPPER */ - - -typedef struct _ATM_ADDRESS ATM_ADDRESS, *PATM_ADDRESS; - - -/* OID_GEN_NETWORK_LAYER_ADDRESSES */ -typedef struct _NETWORK_ADDRESS { - USHORT AddressLength; - USHORT AddressType; - UCHAR Address[1]; -} NETWORK_ADDRESS, *PNETWORK_ADDRESS; - -typedef struct _NETWORK_ADDRESS_LIST { - LONG AddressCount; - USHORT AddressType; - NETWORK_ADDRESS Address[1]; -} NETWORK_ADDRESS_LIST, *PNETWORK_ADDRESS_LIST; - -/* Protocol types supported by NDIS */ -#define NDIS_PROTOCOL_ID_DEFAULT 0x00 -#define NDIS_PROTOCOL_ID_TCP_IP 0x02 -#define NDIS_PROTOCOL_ID_IPX 0x06 -#define NDIS_PROTOCOL_ID_NBF 0x07 -#define NDIS_PROTOCOL_ID_MAX 0x0F -#define NDIS_PROTOCOL_ID_MASK 0x0F - - -/* OID_GEN_TRANSPORT_HEADER_OFFSET */ -typedef struct _TRANSPORT_HEADER_OFFSET { - USHORT ProtocolType; - USHORT HeaderOffset; -} TRANSPORT_HEADER_OFFSET, *PTRANSPORT_HEADER_OFFSET; - - -/* OID_GEN_CO_LINK_SPEED / OID_GEN_CO_MINIMUM_LINK_SPEED */ -typedef struct _NDIS_CO_LINK_SPEED { - ULONG Outbound; - ULONG Inbound; -} NDIS_CO_LINK_SPEED, *PNDIS_CO_LINK_SPEED; - - -typedef enum _NDIS_AF { - CO_ADDRESS_FAMILY_Q2931 = 1, - CO_ADDRESS_FAMILY_SPANS, -} NDIS_AF, *PNDIS_AF; - -typedef struct { - NDIS_AF AddressFamily; - ULONG MajorVersion; - ULONG MinorVersion; -} CO_ADDRESS_FAMILY, *PCO_ADDRESS_FAMILY; - -typedef enum { - BestEffortService, - PredictiveService, - GuaranteedService -} GUARANTEE; - -typedef struct _CO_FLOW_PARAMETERS { - ULONG TokenRate; /* In Bytes/sec */ - ULONG TokenBucketSize; /* In Bytes */ - ULONG PeakBandwidth; /* In Bytes/sec */ - ULONG Latency; /* In microseconds */ - ULONG DelayVariation; /* In microseconds */ - GUARANTEE LevelOfGuarantee; /* Guaranteed, Predictive or Best Effort */ - ULONG CostOfCall; /* Reserved for future use, */ - /* must be set to 0 now */ - ULONG NetworkAvailability; /* read-only: 1 if accessible, 0 if not */ - ULONG MaxSduSize; /* In Bytes */ -} CO_FLOW_PARAMETERS, *PCO_FLOW_PARAMETERS; - -typedef struct _CO_SPECIFIC_PARAMETERS { - ULONG ParamType; - ULONG Length; - UCHAR Parameters[1]; -} CO_SPECIFIC_PARAMETERS, *PCO_SPECIFIC_PARAMETERS; - -typedef struct _CO_CALL_MANAGER_PARAMETERS { - CO_FLOW_PARAMETERS Transmit; - CO_FLOW_PARAMETERS Receive; - CO_SPECIFIC_PARAMETERS CallMgrSpecific; -} CO_CALL_MANAGER_PARAMETERS, *PCO_CALL_MANAGER_PARAMETERS; - -/* CO_MEDIA_PARAMETERS.Flags constants */ -#define RECEIVE_TIME_INDICATION 0x00000001 -#define USE_TIME_STAMPS 0x00000002 -#define TRANSMIT_VC 0x00000004 -#define RECEIVE_VC 0x00000008 -#define INDICATE_ERRED_PACKETS 0x00000010 -#define INDICATE_END_OF_TX 0x00000020 -#define RESERVE_RESOURCES_VC 0x00000040 -#define ROUND_DOWN_FLOW 0x00000080 -#define ROUND_UP_FLOW 0x00000100 - -typedef struct _CO_MEDIA_PARAMETERS { - ULONG Flags; - ULONG ReceivePriority; - ULONG ReceiveSizeHint; - CO_SPECIFIC_PARAMETERS MediaSpecific; -} CO_MEDIA_PARAMETERS, *PCO_MEDIA_PARAMETERS; - -typedef struct _CO_CALL_PARAMETERS { - ULONG Flags; - PCO_CALL_MANAGER_PARAMETERS CallMgrParameters; - PCO_MEDIA_PARAMETERS MediaParameters; -} CO_CALL_PARAMETERS, *PCO_CALL_PARAMETERS; - -typedef struct _CO_SAP { - ULONG SapType; - ULONG SapLength; - UCHAR Sap[1]; -} CO_SAP, *PCO_SAP; - -typedef struct _NDIS_IPSEC_PACKET_INFO { - union { - struct { - NDIS_HANDLE OffloadHandle; - NDIS_HANDLE NextOffloadHandle; - } Transmit; - struct { - ULONG SA_DELETE_REQ:1; - ULONG CRYPTO_DONE:1; - ULONG NEXT_CRYPTO_DONE:1; - ULONG CryptoStatus; - } Receive; - } u; -} NDIS_IPSEC_PACKET_INFO, *PNDIS_IPSEC_PACKET_INFO; - - -#if 0 - -/* Plug and play and power management */ - -/* PnP and PM event codes */ -typedef enum _NET_PNP_EVENT_CODE { - NetEventSetPower, - NetEventQueryPower, - NetEventQueryRemoveDevice, - NetEventCancelRemoveDevice, - NetEventReconfigure, - NetEventBindList, - NetEventBindsComplete, - NetEventPnPCapabilities, - NetEventMaximum -} NET_PNP_EVENT_CODE, *PNET_PNP_EVENT_CODE; - -/* Networking PnP event indication structure */ -typedef struct _NET_PNP_EVENT { - /* Event code */ - NET_PNP_EVENT_CODE NetEvent; - /* Event specific data */ - PVOID Buffer; - /* Length of event specific data */ - ULONG BufferLength; - - /* Reserved areas */ - ULONG_PTR NdisReserved[4]; - ULONG_PTR TransportReserved[4]; - ULONG_PTR TdiReserved[4]; - ULONG_PTR TdiClientReserved[4]; -} NET_PNP_EVENT, *PNET_PNP_EVENT; - -/* Device power state structure */ -typedef enum _NET_DEVICE_POWER_STATE { - NetDeviceStateUnspecified = 0, - NetDeviceStateD0, - NetDeviceStateD1, - NetDeviceStateD2, - NetDeviceStateD3, - NetDeviceStateMaximum -} NET_DEVICE_POWER_STATE, *PNET_DEVICE_POWER_STATE; - -#endif - -/* Call Manager */ - -typedef NDIS_STATUS STDCALL_FUNC (*CO_CREATE_VC_HANDLER)( - IN NDIS_HANDLE ProtocolAfContext, - IN NDIS_HANDLE NdisVcHandle, - OUT PNDIS_HANDLE ProtocolVcContext); - -typedef NDIS_STATUS STDCALL_FUNC (*CO_DELETE_VC_HANDLER)( - IN NDIS_HANDLE ProtocolVcContext); - -typedef NDIS_STATUS STDCALL_FUNC (*CO_REQUEST_HANDLER)( - IN NDIS_HANDLE ProtocolAfContext, - IN NDIS_HANDLE ProtocolVcContext OPTIONAL, - IN NDIS_HANDLE ProtocolPartyContext OPTIONAL, - IN OUT PNDIS_REQUEST NdisRequest); - -typedef VOID STDCALL_FUNC (*CO_REQUEST_COMPLETE_HANDLER)( - IN NDIS_STATUS Status, - IN NDIS_HANDLE ProtocolAfContext OPTIONAL, - IN NDIS_HANDLE ProtocolVcContext OPTIONAL, - IN NDIS_HANDLE ProtocolPartyContext OPTIONAL, - IN PNDIS_REQUEST NdisRequest); - - [truncated at 1000 lines; 5238 more skipped]

1 0

[navaraf] 15571: Cleanup AFD headers a bit.
by navaraf＠svn.reactos.com 28 May '05

28 May '05

Cleanup AFD headers a bit. Modified: trunk/reactos/drivers/net/afd/afd/main.c Modified: trunk/reactos/drivers/net/afd/include/afd.h _____ Modified: trunk/reactos/drivers/net/afd/afd/main.c --- trunk/reactos/drivers/net/afd/afd/main.c 2005-05-28 11:09:53 UTC (rev 15570) +++ trunk/reactos/drivers/net/afd/afd/main.c 2005-05-28 11:10:27 UTC (rev 15571) @@ -488,7 +488,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) { PDEVICE_OBJECT DeviceObject; - UNICODE_STRING wstrDeviceName; + UNICODE_STRING wstrDeviceName = RTL_CONSTANT_STRING(L"\\Device\\Afd"); PAFD_DEVICE_EXTENSION DeviceExt; NTSTATUS Status; @@ -500,9 +500,6 @@ DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = AfdDispatch; DriverObject->DriverUnload = AfdUnload; - /* create afd device */ - RtlRosInitUnicodeStringFromLiteral(&wstrDeviceName, L"\\Device\\Afd"); - Status = IoCreateDevice ( DriverObject, sizeof(AFD_DEVICE_EXTENSION), _____ Modified: trunk/reactos/drivers/net/afd/include/afd.h --- trunk/reactos/drivers/net/afd/include/afd.h 2005-05-28 11:09:53 UTC (rev 15570) +++ trunk/reactos/drivers/net/afd/include/afd.h 2005-05-28 11:10:27 UTC (rev 15571) @@ -17,22 +17,9 @@ #include <tdikrnl.h> #include <tdiinfo.h> #include <string.h> -#include <ndis.h> +#include <winsock2.h> #include <shared.h> -#ifndef _MSC_VER -#include <roscfg.h> -#include <rosrtl/string.h> -#include <winsock2.h> -#include <ddk/tdi.h> -#include <ddk/ndis.h> -#include <tcpmisc.h> -#include <tcpioctl.h> -#else -#include <ntdef.h> -#define STDCALL -#endif - #ifndef MIN #define MIN(x,y) (((x)<(y))?(x):(y)) #endif

1 0

[navaraf] 15570: Use W32API.
by navaraf＠svn.reactos.com 28 May '05

28 May '05

Use W32API. Modified: trunk/reactos/drivers/net/npf/Makefile Modified: trunk/reactos/drivers/net/npf/dump.c Modified: trunk/reactos/drivers/net/npf/jitter.c Modified: trunk/reactos/drivers/net/npf/openclos.c Modified: trunk/reactos/drivers/net/npf/packet.c Modified: trunk/reactos/drivers/net/npf/packet.h Modified: trunk/reactos/drivers/net/npf/read.c Modified: trunk/reactos/drivers/net/npf/win_bpf.h Modified: trunk/reactos/drivers/net/npf/write.c _____ Modified: trunk/reactos/drivers/net/npf/Makefile --- trunk/reactos/drivers/net/npf/Makefile 2005-05-28 11:09:34 UTC (rev 15569) +++ trunk/reactos/drivers/net/npf/Makefile 2005-05-28 11:09:53 UTC (rev 15570) @@ -7,9 +7,9 @@ TARGET_NAME = npf -#TARGET_CFLAGS = -DDBG -DWIN_NT_DRIVER -DKQPC_TS -I$(PATH_TO_TOP)/ntoskrnl/include +#TARGET_CFLAGS = -D__USE_W32API -D_TIMEVAL_DEFINED -DDBG -DWIN_NT_DRIVER -DKQPC_TS -I$(PATH_TO_TOP)/ntoskrnl/include -TARGET_CFLAGS = -DDBG -DWIN_NT_DRIVER -DKQPC_TS -DUSE_KLOCKS -I$(PATH_TO_TOP)/ntoskrnl/include -Wall -Werror +TARGET_CFLAGS = -D__USE_W32API -D_TIMEVAL_DEFINED -DDBG -DWIN_NT_DRIVER -DKQPC_TS -DUSE_KLOCKS -I$(PATH_TO_TOP)/ntoskrnl/include -Wall -Werror TARGET_DDKLIBS = ndis.a _____ Modified: trunk/reactos/drivers/net/npf/dump.c --- trunk/reactos/drivers/net/npf/dump.c 2005-05-28 11:09:34 UTC (rev 15569) +++ trunk/reactos/drivers/net/npf/dump.c 2005-05-28 11:09:53 UTC (rev 15570) @@ -26,7 +26,7 @@ #include "ndis.h" #else #include <ddk/ntddk.h> -#include <net/ndis.h> +#include <ddk/ndis.h> //#define PsGetCurrentProcess() IoGetCurrentProcess() #ifndef PsGetCurrentThread #define PsGetCurrentThread() ((PETHREAD) (KeGetCurrentThread())) _____ Modified: trunk/reactos/drivers/net/npf/jitter.c --- trunk/reactos/drivers/net/npf/jitter.c 2005-05-28 11:09:34 UTC (rev 15569) +++ trunk/reactos/drivers/net/npf/jitter.c 2005-05-28 11:09:53 UTC (rev 15570) @@ -26,7 +26,7 @@ #include "ndis.h" #else #include <ddk/ntddk.h> -#include <net/ndis.h> +#include <ddk/ndis.h> #endif #include "packet.h" _____ Modified: trunk/reactos/drivers/net/npf/openclos.c --- trunk/reactos/drivers/net/npf/openclos.c 2005-05-28 11:09:34 UTC (rev 15569) +++ trunk/reactos/drivers/net/npf/openclos.c 2005-05-28 11:09:53 UTC (rev 15570) @@ -25,7 +25,7 @@ #include "ndis.h" #else #include <ddk/ntddk.h> -#include <net/ndis.h> +#include <ddk/ndis.h> #endif #include "debug.h" #include "packet.h" _____ Modified: trunk/reactos/drivers/net/npf/packet.c --- trunk/reactos/drivers/net/npf/packet.c 2005-05-28 11:09:34 UTC (rev 15569) +++ trunk/reactos/drivers/net/npf/packet.c 2005-05-28 11:09:53 UTC (rev 15570) @@ -26,7 +26,7 @@ #include "ndis.h" #else #include <ddk/ntddk.h> -#include <net/ndis.h> +#include <ddk/ndis.h> #endif #include "ntddpack.h" @@ -114,27 +114,14 @@ ProtocolChar.MajorNdisVersion = 3; #endif ProtocolChar.MinorNdisVersion = 0; -#ifndef __GNUC__ ProtocolChar.Reserved = 0; -#else - ProtocolChar.u1.Reserved = 0; -#endif ProtocolChar.OpenAdapterCompleteHandler = NPF_OpenAdapterComplete; ProtocolChar.CloseAdapterCompleteHandler = NPF_CloseAdapterComplete; -#ifndef __GNUC__ ProtocolChar.SendCompleteHandler = NPF_SendComplete; ProtocolChar.TransferDataCompleteHandler = NPF_TransferDataComplete; -#else - ProtocolChar.u2.SendCompleteHandler = NPF_SendComplete; - ProtocolChar.u3.TransferDataCompleteHandler = NPF_TransferDataComplete; -#endif ProtocolChar.ResetCompleteHandler = NPF_ResetComplete; ProtocolChar.RequestCompleteHandler = NPF_RequestComplete; -#ifndef __GNUC__ ProtocolChar.ReceiveHandler = NPF_tap; -#else - ProtocolChar.u4.ReceiveHandler = NPF_tap; -#endif ProtocolChar.ReceiveCompleteHandler = NPF_ReceiveComplete; ProtocolChar.StatusHandler = NPF_Status; ProtocolChar.StatusCompleteHandler = NPF_StatusComplete; _____ Modified: trunk/reactos/drivers/net/npf/packet.h --- trunk/reactos/drivers/net/npf/packet.h 2005-05-28 11:09:34 UTC (rev 15569) +++ trunk/reactos/drivers/net/npf/packet.h 2005-05-28 11:09:53 UTC (rev 15570) @@ -32,13 +32,9 @@ #define NTKERNEL ///< Forces the compilation of the jitter with kernel calls -#ifdef __GNUC__ +struct bpf_insn; #undef EXIT_SUCCESS #undef EXIT_FAILURE -#define UNICODE_NULL ((WCHAR)0) // winnt -#include "win_bpf.h" -#include <internal/ps.h> -#endif #include "jitter.h" #include "tme.h" _____ Modified: trunk/reactos/drivers/net/npf/read.c --- trunk/reactos/drivers/net/npf/read.c 2005-05-28 11:09:34 UTC (rev 15569) +++ trunk/reactos/drivers/net/npf/read.c 2005-05-28 11:09:53 UTC (rev 15570) @@ -26,10 +26,8 @@ #include <ndis.h> #else #include <ddk/ntddk.h> -#include <net/ndis.h> +#include <ddk/ndis.h> -#define NdisMoveMappedMemory(Destination,Source,Length) RtlCopyMemory(Destination,Source,Length) -#define NdisZeroMappedMemory(Destination,Length) RtlZeroMemory(Destination,Length) #define NdisReinitializePacket(Packet) \ { \ (Packet)->Private.Head = (PNDIS_BUFFER)NULL; \ _____ Modified: trunk/reactos/drivers/net/npf/win_bpf.h --- trunk/reactos/drivers/net/npf/win_bpf.h 2005-05-28 11:09:34 UTC (rev 15569) +++ trunk/reactos/drivers/net/npf/win_bpf.h 2005-05-28 11:09:53 UTC (rev 15570) @@ -47,7 +47,7 @@ typedef UCHAR u_char; typedef USHORT u_short; -typedef ULONG u_int; +typedef UINT u_int; typedef LONG bpf_int32; typedef ULONG bpf_u_int32; typedef ULONG u_int32; _____ Modified: trunk/reactos/drivers/net/npf/write.c --- trunk/reactos/drivers/net/npf/write.c 2005-05-28 11:09:34 UTC (rev 15569) +++ trunk/reactos/drivers/net/npf/write.c 2005-05-28 11:09:53 UTC (rev 15570) @@ -26,7 +26,7 @@ #include "ndis.h" #else #include <ddk/ntddk.h> -#include <net/ndis.h> +#include <ddk/ndis.h> #define NdisReinitializePacket(Packet) \ { \ (Packet)->Private.Head = (PNDIS_BUFFER)NULL; \

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