Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 42159: - Don't link win32csr to win32k syscalls library.
by fireball＠svn.reactos.org 23 Jul '09

23 Jul '09

Author: fireball Date: Thu Jul 23 21:24:45 2009 New Revision: 42159 URL: http://svn.reactos.org/svn/reactos?rev=42159&view=rev Log: - Don't link win32csr to win32k syscalls library. Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] Thu Jul 23 21:24:45 2009 @@ -13,7 +13,6 @@ <library>user32</library> <library>gdi32</library> <library>advapi32</library> - <library>win32ksys</library> <library>psapi</library> <pch>w32csr.h</pch> <file>alias.c</file>

1 0

[fireball] 42158: - Convert color from COLORREF to device's color space. Fixes RGB/BGR issue with text output, brushes and pens. - Don't use a stack allocated BRUSHOBJ for text output, because other routines may rely on it being a real BRUSHGDI object. Create a pen for text output instead (once per TextOut call, an optimisation could be to move that to DC structure and create once).
by fireball＠svn.reactos.org 23 Jul '09

23 Jul '09

Author: fireball Date: Thu Jul 23 21:20:00 2009 New Revision: 42158 URL: http://svn.reactos.org/svn/reactos?rev=42158&view=rev Log: - Convert color from COLORREF to device's color space. Fixes RGB/BGR issue with text output, brushes and pens. - Don't use a stack allocated BRUSHOBJ for text output, because other routines may rely on it being a real BRUSHGDI object. Create a pen for text output instead (once per TextOut call, an optimisation could be to move that to DC structure and create once). Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c [iso-8859-1] Thu Jul 23 21:20:00 2009 @@ -34,6 +34,8 @@ static const BYTE PatternDashDot[] = {0xFF, 0x81, 0xC0}; static const BYTE PatternDashDotDot[] = {0xFF, 0x8E, 0x38};*/ PBRUSHGDI pBrush; + XLATEOBJ *pXlate; + HPALETTE hPalette; /* Allocate memory for the object */ pBrush = EngAllocMem(FL_ZERO_MEMORY, sizeof(BRUSHGDI), TAG_BRUSHOBJ); @@ -82,7 +84,12 @@ case PS_SOLID: pBrush->flAttrs |= GDIBRUSH_IS_SOLID; - pBrush->BrushObj.iSolidColor = ulColor; + + // FIXME: Take hDIBPalette in account if it exists! + hPalette = pPrimarySurface->DevInfo.hpalDefault; + pXlate = IntEngCreateXlate(0, PAL_RGB, hPalette, NULL); + pBrush->BrushObj.iSolidColor = XLATEOBJ_iXlate(pXlate, ulColor); + EngDeleteXlate(pXlate); break; case PS_ALTERNATE: @@ -135,6 +142,8 @@ GreCreateSolidBrush(COLORREF crColor) { PBRUSHGDI pBrush; + XLATEOBJ *pXlate; + HPALETTE hPalette; /* Allocate memory for the object */ pBrush = EngAllocMem(FL_ZERO_MEMORY, sizeof(BRUSHGDI), TAG_BRUSHOBJ); @@ -144,7 +153,11 @@ pBrush->flAttrs |= GDIBRUSH_IS_SOLID; /* Set color */ - pBrush->BrushObj.iSolidColor = crColor; + // FIXME: Take hDIBPalette in account if it exists! + hPalette = pPrimarySurface->DevInfo.hpalDefault; + pXlate = IntEngCreateXlate(0, PAL_RGB, hPalette, NULL); + pBrush->BrushObj.iSolidColor = XLATEOBJ_iXlate(pXlate, crColor); + EngDeleteXlate(pXlate); /* Return newly created brush */ return pBrush; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] Thu Jul 23 21:20:00 2009 @@ -15,7 +15,7 @@ /* PRIVATE FUNCTIONS *********************************************************/ static void SharpGlyphMono(PDC physDev, INT x, INT y, - void *bitmap, GlyphInfo *gi) + void *bitmap, GlyphInfo *gi, BRUSHGDI *pTextBrush) { #if 1 unsigned char *srcLine = bitmap, *src; @@ -26,10 +26,6 @@ int w; int xspan, lenspan; RECTL rcBounds; - BRUSHOBJ textBrush; - - RtlZeroMemory(&textBrush, sizeof(textBrush)); - textBrush.iSolidColor = physDev->crForegroundClr; x -= gi->x; y -= gi->y; @@ -64,7 +60,7 @@ rcBounds.right = xspan+lenspan; rcBounds.bottom = y+1; GreLineTo(&physDev->pBitmap->SurfObj, NULL, - &textBrush, + &pTextBrush->BrushObj, xspan, y, xspan + lenspan, @@ -143,13 +139,14 @@ AA_Type aa_type = AA_None; INT idx; /*double*/ int cosEsc = 1, sinEsc = 0; - - //wine_tsx11_lock(); - //XSetForeground( gdi_display, physDev->gc, textPixel ); + BRUSHGDI *pTextPen; + + /* Create pen for text output */ + pTextPen = GreCreatePen(PS_SOLID, 1, 0, pDC->crForegroundClr, 0, 0, 0, NULL, 0, TRUE); if(aa_type == AA_None || pDC->pBitmap->SurfObj.iBitmapFormat == BMF_1BPP) { - void (* sharp_glyph_fn)(PDC, INT, INT, void *, GlyphInfo *); + void (* sharp_glyph_fn)(PDC, INT, INT, void *, GlyphInfo *, BRUSHGDI *); //if(aa_type == AA_None) sharp_glyph_fn = SharpGlyphMono; @@ -160,7 +157,8 @@ sharp_glyph_fn(pDC, pDC->rcDcRect.left + pDC->rcVport.left + x + xoff, pDC->rcDcRect.top + pDC->rcVport.top + y + yoff, formatEntry->bitmaps[wstr[idx]], - &formatEntry->gis[wstr[idx]]); + &formatEntry->gis[wstr[idx]], + pTextPen); if(lpDx) { offset += lpDx[idx]; xoff = offset * cosEsc; @@ -282,7 +280,8 @@ #endif } //no_image: - //wine_tsx11_unlock(); + + GreFreeBrush(pTextPen); } /* EOF */

1 0

[dreimer] 42157: Fixed config in batch and ps + loading of the flags on startup in batch. Testers would be very appreciated. tbd more testing, fix small bug in the updater
by dreimer＠svn.reactos.org 23 Jul '09

23 Jul '09

Author: dreimer Date: Thu Jul 23 17:54:27 2009 New Revision: 42157 URL: http://svn.reactos.org/svn/reactos?rev=42157&view=rev Log: Fixed config in batch and ps + loading of the flags on startup in batch. Testers would be very appreciated. tbd more testing, fix small bug in the updater Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Thu Jul 23 17:54:27 2009 @@ -9,8 +9,8 @@ $host.ui.RawUI.WindowTitle = "ReactOS Build Configurator" -if (!(Test-Path "%APPDATA%\RosBE\RBUILDFLAGS.FLG")) { - $RBUILDFLAGS > "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" +if (!(Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG")) { + "-da" > "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" } function settitle { @@ -22,7 +22,7 @@ "Be verbose." "Default is: no" "" - $VERBOSE_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" "-v") + $VERBOSE_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-v") if ("$VERBOSE_B" -eq "") { $VERBOSE_B = "no" } else { @@ -41,7 +41,7 @@ "Delete generated files as soon as they are not needed anymore." "Default is: no" "" - $CLEAN_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" "-c") + $CLEAN_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-c") if ("$CLEAN_B" -eq "") { $CLEAN_B = "no" } else { @@ -60,8 +60,8 @@ "Disable/Enable automatic dependencies." "Default is: yes" "" - $DEPENDS_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" "-df") - $DEPENDS_B2 = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" "-dd") + $DEPENDS_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-df") + $DEPENDS_B2 = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-dd") if (!("$DEPENDS_B" -eq "")) { $DEPENDS_B = "full" } elseif (!("$DEPENDS_B2" -eq "")) { @@ -86,7 +86,7 @@ "Use precompiled headers." "Default is: yes" "" - $PRECHEADER_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" "-hd") + $PRECHEADER_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-hd") if ("$PRECHEADER_B" -eq "") { $PRECHEADER_B = "yes" } else { @@ -106,7 +106,7 @@ "the directories." "Default is: no" "" - $MAKEDIR_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" "-mi") + $MAKEDIR_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-mi") if ("$MAKEDIR_B" -eq "") { $MAKEDIR_B = "no" } else { @@ -125,7 +125,7 @@ "Generate proxy makefiles in source tree instead of the output tree." "Default is: no" "" - $PROXYMAKE_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" "-ps") + $PROXYMAKE_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-ps") if ("$PROXYMAKE_B" -eq "") { $PROXYMAKE_B = "no" } else { @@ -144,7 +144,7 @@ "Use compilation units." "Default is: yes" "" - $COMPUNITS_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" "-ud") + $COMPUNITS_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-ud") if ("$COMPUNITS_B" -eq "") { $COMPUNITS_B = "yes" } else { @@ -163,7 +163,7 @@ "Input XML." "Default is: no" "" - $XML_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" "-r") + $XML_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-r") if ("$XML_B" -eq "") { $XML_B = "no" } else { @@ -178,7 +178,7 @@ $RBUILDFLAGS = "$RBUILDFLAGS" + " -r" } clear-host - $RBUILDFLAGS > "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" + "$RBUILDFLAGS" > "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" $ENV:ROS_RBUILDFLAGS = $RBUILDFLAGS } Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Thu Jul 23 17:54:27 2009 @@ -15,8 +15,8 @@ setlocal enabledelayedexpansion title ReactOS Build Configurator -if not exists "%APPDATA%\RosBE\RBUILDFLAGS.FLG" ( - echo %RBUILDFLAGS% > "%APPDATA%\RosBE\RBUILDFLAGS.FLG" +if not exist "%APPDATA%\RosBE\RBUILDFLAGS.FLG" ( + echo -da> "%APPDATA%\RosBE\RBUILDFLAGS.FLG" ) :: Receive the first Parameter and decide what to do. @@ -74,18 +74,18 @@ echo Be verbose. echo Default is: no echo. - for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG" | find "-v""`) do set VERBOSE_B=%%i - if "%VERBOSE_B%" == "" ( + for /f "usebackq tokens=* delims= " %%i in (`"echo %ROS_RBUILDFLAGS% | find "-v""`) do set VERBOSE_B=%%i + if "!VERBOSE_B!" == "" ( set VERBOSE_B=no ) else ( set VERBOSE_B=yes ) - echo Right now: %VERBOSE_B% + echo Right now: !VERBOSE_B! set /p VERBOSE="(yes), (no)" - if "%VERBOSE%" == "" ( - set VERBOSE=%VERBOSE_B% - ) - if "%VERBOSE%" == "yes" ( + if "!VERBOSE!" == "" ( + set VERBOSE=!VERBOSE_B! + ) + if "!VERBOSE!" == "yes" ( set RBUILDFLAGS=-v ) cls @@ -93,63 +93,62 @@ echo Delete generated files as soon as they are not needed anymore. echo Default is: no echo. - for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG" | find "-c""`) do set CLEAN_B=%%i - if "%CLEAN_B%" == "" ( + for /f "usebackq tokens=* delims= " %%i in (`"echo %ROS_RBUILDFLAGS% | find "-c""`) do set CLEAN_B=%%i + if "!CLEAN_B!" == "" ( set CLEAN_B=no ) else ( set CLEAN_B=yes ) - echo Right now: %CLEAN_B% + echo Right now: !CLEAN_B! set /p CLEAN="(yes), (no)" - if "%CLEAN%" == "" ( - set CLEAN=%CLEAN_B% - ) - if "%CLEAN%" == "yes" ( - set RBUILDFLAGS=%RBUILDFLAGS% -c + if "!CLEAN!" == "" ( + set CLEAN=!CLEAN_B! + ) + if "!CLEAN!" == "yes" ( + set RBUILDFLAGS=!RBUILDFLAGS! -c ) cls echo Disable/Enable automatic dependencies. echo Default is: yes echo. - for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG" | find "-df""`) do set DEPENDS_B=%%i - for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG" | find "-dd""`) do set DEPENDS_B2=%%i - ) - if not "%DEPENDS_B%" == "" ( + for /f "usebackq tokens=* delims= " %%i in (`"echo %ROS_RBUILDFLAGS% | find "-df""`) do set DEPENDS_B=%%i + for /f "usebackq tokens=* delims= " %%i in (`"echo %ROS_RBUILDFLAGS% | find "-dd""`) do set DEPENDS_B2=%%i + if not "!DEPENDS_B!" == "" ( set DEPENDS_B=full - ) else if not "%DEPENDS_B2%" == "" ( + ) else if not "!DEPENDS_B2!" == "" ( set DEPENDS_B=no ) else ( set DEPENDS_B=yes ) - echo Right now: %DEPENDS_B% + echo Right now: !DEPENDS_B! set /p DEPENDS="(full), (yes), (no)" - if "%DEPENDS%" == "" ( - set DEPENDS=%DEPENDS_B% - ) - if "%DEPENDS%" == "full" ( - set RBUILDFLAGS=%RBUILDFLAGS% -df - ) else if "%DEPENDS%" == "no" ( - set RBUILDFLAGS=%RBUILDFLAGS% -dd + if "!DEPENDS!" == "" ( + set DEPENDS=!DEPENDS_B! + ) + if "!DEPENDS!" == "full" ( + set RBUILDFLAGS=!RBUILDFLAGS! -df + ) else if "!DEPENDS!" == "no" ( + set RBUILDFLAGS=!RBUILDFLAGS! -dd ) cls echo Use precompiled headers. echo Default is: yes echo. - for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG" | find "-hd""`) do set PRECHEADER_B=%%i - if "%PRECHEADER_B%" == "" ( + for /f "usebackq tokens=* delims= " %%i in (`"echo %ROS_RBUILDFLAGS% | find "-hd""`) do set PRECHEADER_B=%%i + if "!PRECHEADER_B!" == "" ( set PRECHEADER_B=yes ) else ( set PRECHEADER_B=no ) - echo Right now: %PRECHEADER_B% + echo Right now: !PRECHEADER_B! set /p PRECHEADER="(yes), (no)" - if "%PRECHEADER%" == "" ( - set PRECHEADER=%PRECHEADER_B% - ) - if "%PRECHEADER%" == "no" ( - set RBUILDFLAGS=%RBUILDFLAGS% -hd + if "!PRECHEADER!" == "" ( + set PRECHEADER=!PRECHEADER_B! + ) + if "!PRECHEADER!" == "no" ( + set RBUILDFLAGS=!RBUILDFLAGS! -hd ) cls @@ -157,80 +156,80 @@ echo the directories. echo Default is: no echo. - for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG" | find "-mi""`) do set MAKEDIR_B=%%i - if "%MAKEDIR_B%" == "" ( + for /f "usebackq tokens=* delims= " %%i in (`"echo %ROS_RBUILDFLAGS% | find "-mi""`) do set MAKEDIR_B=%%i + if "!MAKEDIR_B!" == "" ( set MAKEDIR_B=no ) else ( set MAKEDIR_B=yes ) - echo Right now: %MAKEDIR_B% + echo Right now: !MAKEDIR_B! set /p MAKEDIR="(yes), (no)" - if "%MAKEDIR%" == "" ( - set MAKEDIR=%MAKEDIR_B% - ) - if "%MAKEDIR%" == "yes" ( - set RBUILDFLAGS=%RBUILDFLAGS% -mi + if "!MAKEDIR!" == "" ( + set MAKEDIR=!MAKEDIR_B! + ) + if "!MAKEDIR!" == "yes" ( + set RBUILDFLAGS=!RBUILDFLAGS! -mi ) cls echo Generate proxy makefiles in source tree instead of the output tree. echo Default is: no echo. - for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG" | find "-ps""`) do set PROXYMAKE_B=%%i - if "%PROXYMAKE_B%" == "" ( + for /f "usebackq tokens=* delims= " %%i in (`"echo %ROS_RBUILDFLAGS% | find "-ps""`) do set PROXYMAKE_B=%%i + if "!PROXYMAKE_B!" == "" ( set PROXYMAKE_B=no ) else ( set PROXYMAKE_B=yes ) - echo Right now: %PROXYMAKE_B% + echo Right now: !PROXYMAKE_B! set /p PROXYMAKE="(yes), (no)" - if "%PROXYMAKE%" == "" ( - set PROXYMAKE=%PROXYMAKE_B% - ) - if "%PROXYMAKE%" == "yes" ( - set RBUILDFLAGS=%RBUILDFLAGS% -ps + if "!PROXYMAKE!" == "" ( + set PROXYMAKE=!PROXYMAKE_B! + ) + if "!PROXYMAKE!" == "yes" ( + set RBUILDFLAGS=!RBUILDFLAGS! -ps ) cls echo Use compilation units. echo Default is: yes echo. - for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG" | find "-ud""`) do set COMPUNITS_B=%%i - if "%COMPUNITS_B%" == "" ( + for /f "usebackq tokens=* delims= " %%i in (`"echo %ROS_RBUILDFLAGS% | find "-ud""`) do set COMPUNITS_B=%%i + if "!COMPUNITS_B!" == "" ( set COMPUNITS_B=yes ) else ( set COMPUNITS_B=no ) - echo Right now: %COMPUNITS_B% + echo Right now: !COMPUNITS_B! set /p COMPUNITS="(yes), (no)" - if "%COMPUNITS%" == "" ( - set COMPUNITS=%COMPUNITS_B% - ) - if "%COMPUNITS%" == "no" ( - set RBUILDFLAGS=%RBUILDFLAGS% -ud + if "!COMPUNITS!" == "" ( + set COMPUNITS=!COMPUNITS_B! + ) + if "!COMPUNITS!" == "no" ( + set RBUILDFLAGS=!RBUILDFLAGS! -ud ) cls echo Input XML. echo Default is: no echo. - for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG" | find "-r""`) do set XML_B=%%i - if "%XML_B%" == "" ( + for /f "usebackq tokens=* delims= " %%i in (`"echo %ROS_RBUILDFLAGS% | find "-r""`) do set XML_B=%%i + if "!XML_B!" == "" ( set XML_B=no ) else ( set XML_B=yes ) - echo Right now: %XML_B% + echo Right now: !XML_B! set /p XML="(yes), (no)" - if "%XML%" == "" ( - set XML=%XML_B% - ) - if "%XML%" == "yes" ( - set RBUILDFLAGS=%RBUILDFLAGS% -r - ) - cls - echo %RBUILDFLAGS% > "%APPDATA%\RosBE\RBUILDFLAGS.FLG" - %ROS_RBUILDFLAGS% = %RBUILDFLAGS% + if "!XML!" == "" ( + set XML=!XML_B! + ) + if "!XML!" == "yes" ( + set RBUILDFLAGS=!RBUILDFLAGS! -r + ) + cls + echo !RBUILDFLAGS! > "%APPDATA%\RosBE\RBUILDFLAGS.FLG" + set ROS_RBUILDFLAGS=!RBUILDFLAGS! goto :NOK ) @@ -460,4 +459,4 @@ :NOK title ReactOS Build Environment %_ROSBE_VERSION% -endlocal +endlocal & set ROS_RBUILDFLAGS=%RBUILDFLAGS% Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Thu Jul 23 17:54:27 2009 @@ -70,7 +70,7 @@ ) if exist "%APPDATA%\RosBE\RBUILDFLAGS.FLG" ( - for /f "usebackq" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG""`) do set ROS_RBUILDFLAGS=%%i + for /f "usebackq tokens=* delims= " %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG""`) do set ROS_RBUILDFLAGS=%%i ) :: Check if RosBE data directory exists, if not, create it.

1 0

[janderwald] 42156: [KS] - Implement KsAcquireDevice, KsReleaseDevice, KsTerminateDevice - Fix unimplemented tags - Use double in spec for functions taking longlong arguments [[Colin Finck]]
by janderwald＠svn.reactos.org 23 Jul '09

23 Jul '09

Author: janderwald Date: Thu Jul 23 17:19:46 2009 New Revision: 42156 URL: http://svn.reactos.org/svn/reactos?rev=42156&view=rev Log: [KS] - Implement KsAcquireDevice, KsReleaseDevice, KsTerminateDevice - Fix unimplemented tags - Use double in spec for functions taking longlong arguments [[Colin Finck]] Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/device.c trunk/reactos/drivers/ksfilter/ks/filter.c trunk/reactos/drivers/ksfilter/ks/ks.spec Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Thu Jul 23 17:19:46 2009 @@ -1220,7 +1220,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI VOID @@ -1228,8 +1228,64 @@ KsAcquireDevice( IN PKSDEVICE Device) { - UNIMPLEMENTED -} + IKsDevice *KsDevice; + PKSIDEVICE_HEADER DeviceHeader = (PKSIDEVICE_HEADER)CONTAINING_RECORD(Device, KSIDEVICE_HEADER, KsDevice); + + /* get device interface*/ + KsDevice = (IKsDevice*)&DeviceHeader->lpVtblIKsDevice; + + /* acquire device mutex */ + KsDevice->lpVtbl->AcquireDevice(KsDevice); +} + +/* + @implemented +*/ +VOID +NTAPI +KsReleaseDevice( + IN PKSDEVICE Device) +{ + IKsDevice *KsDevice; + PKSIDEVICE_HEADER DeviceHeader = (PKSIDEVICE_HEADER)CONTAINING_RECORD(Device, KSIDEVICE_HEADER, KsDevice); + + /* get device interface*/ + KsDevice = (IKsDevice*)&DeviceHeader->lpVtblIKsDevice; + + /* release device mutex */ + KsDevice->lpVtbl->ReleaseDevice(KsDevice); +} + +/* + @implemented +*/ +KSDDKAPI +VOID +NTAPI +KsTerminateDevice( + IN PDEVICE_OBJECT DeviceObject) +{ + IKsDevice *KsDevice; + PKSIDEVICE_HEADER DeviceHeader; + PDEVICE_EXTENSION DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* get device header */ + DeviceHeader = DeviceExtension->DeviceHeader; + + /* get device interface*/ + KsDevice = (IKsDevice*)&DeviceHeader->lpVtblIKsDevice; + + /* now free device header */ + KsFreeDeviceHeader((KSDEVICE_HEADER)DeviceHeader); + + /* release interface when available */ + if (KsDevice) + { + /* delete IKsDevice interface */ + KsDevice->lpVtbl->Release(KsDevice); + } +} + /* Modified: trunk/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Thu Jul 23 17:19:46 2009 @@ -681,34 +681,9 @@ } /* - @implemented + @unimplemented */ KSDDKAPI -VOID -NTAPI -KsTerminateDevice( - IN PDEVICE_OBJECT DeviceObject) -{ - UNIMPLEMENTED -} - -/* - @implemented -*/ -VOID -NTAPI -KsReleaseDevice( - IN PKSDEVICE Device) -{ - UNIMPLEMENTED -} - - - -/* - @implemented -*/ -KSDDKAPI NTSTATUS NTAPI KsReferenceSoftwareBusObject( Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Thu Jul 23 17:19:46 2009 @@ -926,7 +926,7 @@ } /* - @implemented + @unimplemented */ KSDDKAPI VOID @@ -938,7 +938,7 @@ } /* - @implemented + @unimplemented */ KSDDKAPI VOID @@ -950,7 +950,7 @@ } /* - @implemented + @unimplemented */ KSDDKAPI NTSTATUS @@ -965,7 +965,7 @@ } /* - @implemented + @unimplemented */ KSDDKAPI VOID @@ -978,7 +978,7 @@ } /* - @implemented + @unimplemented */ KSDDKAPI NTSTATUS @@ -993,7 +993,7 @@ } /* - @implemented + @unimplemented */ KSDDKAPI NTSTATUS @@ -1008,7 +1008,7 @@ } /* - @implemented + @unimplemented */ KSDDKAPI PKSGATE @@ -1021,7 +1021,7 @@ } /* - @implemented + @unimplemented */ KSDDKAPI ULONG @@ -1035,7 +1035,7 @@ } /* - @implemented + @unimplemented */ KSDDKAPI PKSPIN @@ -1049,7 +1049,7 @@ } /* - @implemented + @unimplemented */ KSDDKAPI VOID @@ -1063,7 +1063,7 @@ } /* - @implemented + @unimplemented */ KSDDKAPI PKSFILTER Modified: trunk/reactos/drivers/ksfilter/ks/ks.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.spe… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.spec [iso-8859-1] Thu Jul 23 17:19:46 2009 @@ -153,7 +153,7 @@ @ stdcall KsPinRegisterIrpCompletionCallback(ptr ptr) @ stdcall KsPinRegisterPowerCallbacks(ptr ptr ptr) @ stdcall KsPinReleaseProcessingMutex(ptr) -;@ stdcall KsPinSetPinClockTime(ptr long) +@ stdcall KsPinSetPinClockTime(ptr double) @ stdcall KsPinSubmitFrame(ptr ptr long ptr ptr) @ stdcall KsPinSubmitFrameMdl(ptr ptr ptr ptr) @ stdcall KsProbeStreamIrp(ptr long long) @@ -184,7 +184,7 @@ @ stdcall KsServiceBusEnumCreateRequest(ptr ptr) @ stdcall KsServiceBusEnumPnpRequest(ptr ptr) @ stdcall KsSetDefaultClockState(ptr long) -;@ stdcall KsSetDefaultClockTime(ptr long) +@ stdcall KsSetDefaultClockTime(ptr double) @ stdcall KsSetDevicePnpAndBaseObject(ptr ptr ptr) @ stdcall KsSetInformationFile(ptr ptr long long) @ stdcall KsSetMajorFunctionHandler(ptr long) @@ -202,7 +202,7 @@ @ stdcall KsStreamPointerGetMdl(ptr) @ stdcall KsStreamPointerGetNextClone(ptr) @ stdcall KsStreamPointerLock(ptr) -;@ stdcall KsStreamPointerScheduleTimeout(ptr ptr longlong) +@ stdcall KsStreamPointerScheduleTimeout(ptr ptr double) @ stdcall KsStreamPointerSetStatusCode(ptr long) @ stdcall KsStreamPointerUnlock(ptr long) @ stdcall KsSynchronousIoControlDevice(ptr long long ptr long ptr long ptr)

1 0

[janderwald] 42155: - Add types to unbreak build - thanks dreimer
by janderwald＠svn.reactos.org 23 Jul '09

23 Jul '09

Author: janderwald Date: Thu Jul 23 16:18:22 2009 New Revision: 42155 URL: http://svn.reactos.org/svn/reactos?rev=42155&view=rev Log: - Add types to unbreak build - thanks dreimer Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4215… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Thu Jul 23 16:18:22 2009 @@ -1928,6 +1928,47 @@ typedef struct _KSMAPPING KSMAPPING, *PKSMAPPING; typedef struct _KSPROCESSPIN KSPROCESSPIN, *PKSPROCESSPIN; +#define IOCTL_KS_HANDSHAKE CTL_CODE(FILE_DEVICE_KS, 0x007, METHOD_NEITHER, FILE_ANY_ACCESS) + +typedef struct { + GUID ProtocolId; + PVOID Argument1; + PVOID Argument2; +} KSHANDSHAKE, *PKSHANDSHAKE; + +typedef +NTSTATUS +(*PFNKSPINHANDSHAKE)( + IN PKSPIN Pin, + IN PKSHANDSHAKE In, + IN PKSHANDSHAKE Out + ); + +typedef +void +(*PFNKSPINPOWER)( + IN PKSPIN Pin, + IN DEVICE_POWER_STATE State + ); + +typedef +void +(*PFNKSPINFRAMERETURN)( + IN PKSPIN Pin, + IN PVOID Data OPTIONAL, + IN ULONG Size OPTIONAL, + IN PMDL Mdl OPTIONAL, + IN PVOID Context OPTIONAL, + IN NTSTATUS Status + ); + +typedef +void +(*PFNKSPINIRPCOMPLETION)( + IN PKSPIN Pin, + IN PIRP Irp + ); + typedef NTSTATUS (*PFNKSPINIRP)( @@ -2502,12 +2543,10 @@ }; #endif - -typedef struct { - GUID ProtocolId; - PVOID Argument1; - PVOID Argument2; -} KSHANDSHAKE, *PKSHANDSHAKE; +typedef enum { + KSSTREAM_POINTER_STATE_UNLOCKED = 0, + KSSTREAM_POINTER_STATE_LOCKED +} KSSTREAM_POINTER_STATE; typedef struct _KSGATE KSGATE, *PKSGATE; typedef struct _KSPROCESSPIN_INDEXENTRY KSPROCESSPIN_INDEXENTRY, *PKSPROCESSPIN_INDEXENTRY; @@ -2666,6 +2705,13 @@ KSOBJECT_BAG Bag; PVOID Context; }; + +typedef +void +(*PFNKSFILTERPOWER)( + IN PKSFILTER Filter, + IN DEVICE_POWER_STATE State + ); typedef NTSTATUS (*PFNKSFILTERIRP)( IN PKSFILTER Filter, @@ -2953,9 +2999,28 @@ #define KSSTREAM_SYNCHRONOUS 0x00001000 #define KSSTREAM_FAILUREEXCEPTION 0x00002000 +typedef +BOOLEAN +(*PFNKSGENERATEEVENTCALLBACK)( + IN PVOID Context, + IN PKSEVENT_ENTRY EventEntry + ); + KSDDKAPI NTSTATUS NTAPI KsGenerateEvent( IN PKSEVENT_ENTRY EntryEvent); + +KSDDKAPI void NTAPI +KsGenerateEvents( + IN PVOID Object, + IN const GUID* EventSet OPTIONAL, + IN ULONG EventId, + IN ULONG DataSize, + IN PVOID Data OPTIONAL, + IN PFNKSGENERATEEVENTCALLBACK CallBack OPTIONAL, + IN PVOID CallBackContext OPTIONAL + ); + KSDDKAPI NTSTATUS NTAPI KsEnableEventWithAllocator( @@ -3509,6 +3574,7 @@ typedef struct _KSFILTERFACTORY KSFILTERFACTORY, *PKSFILTERFACTORY; //FIXME + KSDDKAPI NTSTATUS NTAPI @@ -3694,6 +3760,32 @@ #endif + +typedef interface IKsReferenceClock* PIKSREFERENCECLOCK; + +#undef INTERFACE +#define INTERFACE IKsReferenceClock +DECLARE_INTERFACE_(IKsReferenceClock,IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() // For C + + STDMETHOD_(LONGLONG,GetTime)(THIS + ) PURE; + STDMETHOD_(LONGLONG,GetPhysicalTime)(THIS + ) PURE; + STDMETHOD_(LONGLONG,GetCorrelatedTime)(THIS_ + OUT PLONGLONG SystemTime + ) PURE; + STDMETHOD_(LONGLONG,GetCorrelatedPhysicalTime)(THIS_ + OUT PLONGLONG SystemTime + ) PURE; + STDMETHOD_(NTSTATUS, GetResolution)(THIS_ + OUT PKSRESOLUTION Resolution + ) PURE; + STDMETHOD_(NTSTATUS, GetState)(THIS_ + OUT PKSSTATE State + ) PURE; +}; #undef INTERFACE #define INTERFACE IKsControl

1 0

A test which shouldn't get through
by Aleksey Bragin 23 Jul '09

23 Jul '09

Test message which shouldn't get through.

1 0

[fireball] 42154: - User server: only copy variable length data to the caller if a buffer was provided. Otherwise notify via a debug print that no buffer was provided. Fixes a crash at repainting.
by fireball＠svn.reactos.org 23 Jul '09

23 Jul '09

Author: fireball Date: Thu Jul 23 15:16:59 2009 New Revision: 42154 URL: http://svn.reactos.org/svn/reactos?rev=42154&view=rev Log: - User server: only copy variable length data to the caller if a buffer was provided. Otherwise notify via a debug print that no buffer was provided. Fixes a crash at repainting. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c [iso-8859-1] Thu Jul 23 15:16:59 2009 @@ -130,13 +130,18 @@ if (reqinfo->data_count > 1) ExFreePool(RequestData); /* Copy back the reply data if any */ - if (ReplySize) + if (ReplySize && reqinfo->reply_data) { /* Copy it */ RtlCopyMemory(reqinfo->reply_data, ReplyData, ReplySize); /* Free temp storage */ ExFreePool(ReplyData); + } + else if (ReplySize) + { + DPRINT1("Caller didn't provide any storage for output data, not transferring anything.\n"); + ReplySize = 0; } /* Set reply's error flag and size */

1 0

[janderwald] 42153: - Add tons of stubs - Add (existing) exported functions - Ks mostly has now WinXP' ks exported functions
by janderwald＠svn.reactos.org 23 Jul '09

23 Jul '09

Author: janderwald Date: Thu Jul 23 15:13:45 2009 New Revision: 42153 URL: http://svn.reactos.org/svn/reactos?rev=42153&view=rev Log: - Add tons of stubs - Add (existing) exported functions - Ks mostly has now WinXP' ks exported functions Added: trunk/reactos/drivers/ksfilter/ks/pin.c (with props) Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/bag.c trunk/reactos/drivers/ksfilter/ks/device.c trunk/reactos/drivers/ksfilter/ks/event.c trunk/reactos/drivers/ksfilter/ks/filter.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/ks.rbuild trunk/reactos/drivers/ksfilter/ks/ks.spec trunk/reactos/drivers/ksfilter/ks/misc.c Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Thu Jul 23 15:13:45 2009 @@ -1155,4 +1155,371 @@ return STATUS_UNSUCCESSFUL; } - +/* + @implemented +*/ +NTSTATUS +NTAPI +DllInitialize( + PUNICODE_STRING RegistryPath) +{ + return STATUS_SUCCESS; +} + + +/* + @unimplemented +*/ +COMDDKAPI +NTSTATUS +NTAPI +KoDeviceInitialize( + IN PDEVICE_OBJECT DeviceObject) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + @unimplemented +*/ +COMDDKAPI +NTSTATUS +NTAPI +KoDriverInitialize( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPathName, + IN KoCreateObjectHandler CreateObjectHandler) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + @unimplemented +*/ +COMDDKAPI +VOID +NTAPI +KoRelease( + IN REFCLSID ClassId) +{ + +} + +/* + @unimplemented +*/ +KSDDKAPI +VOID +NTAPI +KsAcquireControl( + IN PVOID Object) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +KSDDKAPI +VOID +NTAPI +KsAcquireDevice( + IN PKSDEVICE Device) +{ + UNIMPLEMENTED +} + + +/* + @unimplemented +*/ +KSDDKAPI +VOID +NTAPI +KsCompletePendingRequest( + IN PIRP Irp) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsCreateBusEnumObject( + IN PWCHAR BusIdentifier, + IN PDEVICE_OBJECT BusDeviceObject, + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PDEVICE_OBJECT PnpDeviceObject OPTIONAL, + IN REFGUID InterfaceGuid OPTIONAL, + IN PWCHAR ServiceRelativePath OPTIONAL) +{ + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + +/* + @unimplemented +*/ +KSDDKAPI +ULONG +NTAPI +KsDeviceSetBusData( + IN PKSDEVICE Device, + IN ULONG DataType, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length) +{ + UNIMPLEMENTED + return 0; +} + + +/* + @unimplemented +*/ +KSDDKAPI +ULONG +NTAPI +KsDeviceGetBusData( + IN PKSDEVICE Device, + IN ULONG DataType, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length) +{ + UNIMPLEMENTED + return 0; +} + +/* + @unimplemented +*/ +KSDDKAPI +void +NTAPI +KsDeviceRegisterAdapterObject( + IN PKSDEVICE Device, + IN PADAPTER_OBJECT AdapterObject, + IN ULONG MaxMappingsByteCount, + IN ULONG MappingTableStride) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +_KsEdit( + IN KSOBJECT_BAG ObjectBag, + IN OUT PVOID* PointerToPointerToItem, + IN ULONG NewSize, + IN ULONG OldSize, + IN ULONG Tag) +{ + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsGetBusEnumIdentifier( + IN PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsGetBusEnumParentFDOFromChildPDO( + IN PDEVICE_OBJECT DeviceObject, + OUT PDEVICE_OBJECT *FunctionalDeviceObject) +{ + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsGetBusEnumPnpDeviceObject( + IN PDEVICE_OBJECT DeviceObject, + IN PDEVICE_OBJECT *PnpDeviceObject) +{ + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + +/* + @unimplemented +*/ +KSDDKAPI +PVOID +NTAPI +KsGetFirstChild( + IN PVOID Object) +{ + UNIMPLEMENTED + return NULL; +} + +/* + @unimplemented +*/ +KSDDKAPI +PVOID +NTAPI +KsGetNextSibling( + IN PVOID Object) +{ + UNIMPLEMENTED + return NULL; +} + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsInstallBusEnumInterface( + PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsIsBusEnumChildDevice( + IN PDEVICE_OBJECT DeviceObject, + OUT PBOOLEAN ChildDevice) +{ + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + +/* + @unimplemented +*/ +NTSTATUS +NTAPI +KsMergeAutomationTables( + OUT PKSAUTOMATION_TABLE *AutomationTableAB, + IN PKSAUTOMATION_TABLE AutomationTableA OPTIONAL, + IN PKSAUTOMATION_TABLE AutomationTableB OPTIONAL, + IN KSOBJECT_BAG Bag OPTIONAL) +{ + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsServiceBusEnumCreateRequest( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsServiceBusEnumPnpRequest( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsRemoveBusEnumInterface( + IN PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + + + +/* + @unimplemented +*/ +KSDDKAPI +PUNKNOWN +NTAPI +KsRegisterAggregatedClientUnknown( + IN PVOID Object, + IN PUNKNOWN ClientUnknown) +{ + UNIMPLEMENTED + return NULL; +} + +/* + @unimplemented +*/ +VOID +NTAPI +KsReleaseControl( + IN PVOID Object) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +NTSTATUS +NTAPI +KsRegisterFilterWithNoKSPins( + IN PDEVICE_OBJECT DeviceObject, + IN const GUID* InterfaceClassGUID, + IN ULONG PinCount, + IN BOOL* PinDirection, + IN KSPIN_MEDIUM* MediumList, + IN GUID* CategoryList OPTIONAL) +{ + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} Modified: trunk/reactos/drivers/ksfilter/ks/bag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/bag.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] Thu Jul 23 15:13:45 2009 @@ -9,47 +9,37 @@ #include "priv.h" - -#if 0 -typedef struct -{ - LIST_ENTRY Entry; - PVOID Item; - PFNKSFREE Free; - LONG ReferenceCount; -}KSOBJECT_BAG_ENTRY; - -typedef struct -{ - LIST_ENTRY ListHead; - KMUTEX Lock; -}KSOBJECT_BAG_IMPL; - /* - @implemented + @unimplemented */ KSDDKAPI NTSTATUS NTAPI -KsAddItemToObjectBag( - IN KSOBJECT_BAG ObjectBag, - IN PVOID Item, - IN PFNKSFREE Free OPTIONAL) +KsAllocateObjectBag( + IN PKSDEVICE Device, + OUT KSOBJECT_BAG* ObjectBag) { - KSOBJECT_BAG_ENTRY * Entry; - KSOBJECT_BAG_IMPL * Bag = (KSOBJECT_BAG_IMPL)ObjectBag; - - Entry = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_BAG_ENTRY)); - if (!Entry) - return STATUS_INSUFFICIENT_RESOURCES; - - Entry->Free = Free; - Entry->Item = Item; - - InsertTailList(&Bag->ListHead, &Entry->Entry); - return STATUS_SUCCESS; + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; } +/* + @unimplemented +*/ +NTSTATUS +NTAPI +KsAddItemToObjectBag( + IN KSOBJECT_BAG ObjectBag, + IN PVOID Item, + IN PFNKSFREE Free OPTIONAL) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +/* + @unimplemented +*/ KSDDKAPI ULONG NTAPI @@ -58,10 +48,32 @@ IN PVOID Item, IN BOOLEAN Free) { - KSOBJECT_BAG_IMPL * Bag = (KSOBJECT_BAG_IMPL)ObjectBag; + UNIMPLEMENTED + return 0; +} - +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsCopyObjectBagItems( + IN KSOBJECT_BAG ObjectBagDestination, + IN KSOBJECT_BAG ObjectBagSource) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +KSDDKAPI +VOID +NTAPI +KsFreeObjectBag( + IN KSOBJECT_BAG ObjectBag) +{ + UNIMPLEMENTED +} -} -#endif + Modified: trunk/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Thu Jul 23 15:13:45 2009 @@ -680,5 +680,40 @@ return Status; } - - +/* + @implemented +*/ +KSDDKAPI +VOID +NTAPI +KsTerminateDevice( + IN PDEVICE_OBJECT DeviceObject) +{ + UNIMPLEMENTED +} + +/* + @implemented +*/ +VOID +NTAPI +KsReleaseDevice( + IN PKSDEVICE Device) +{ + UNIMPLEMENTED +} + + + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsReferenceSoftwareBusObject( + IN KSDEVICE_HEADER Header) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} Modified: trunk/reactos/drivers/ksfilter/ks/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/event.… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/event.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/event.c [iso-8859-1] Thu Jul 23 15:13:45 2009 @@ -121,6 +121,9 @@ return STATUS_UNSUCCESSFUL; } +/* + @unimplemented +*/ KSDDKAPI VOID NTAPI @@ -134,3 +137,47 @@ UNIMPLEMENTED } +/* + @unimplemented +*/ +KSDDKAPI +VOID +NTAPI +KsAddEvent( + IN PVOID Object, + IN PKSEVENT_ENTRY EventEntry) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +NTSTATUS +NTAPI +KsDefaultAddEventHandler( + IN PIRP Irp, + IN PKSEVENTDATA EventData, + IN OUT PKSEVENT_ENTRY EventEntry) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +/* + @unimplemented +*/ +KSDDKAPI +void +NTAPI +KsGenerateEvents( + IN PVOID Object, + IN const GUID* EventSet OPTIONAL, + IN ULONG EventId, + IN ULONG DataSize, + IN PVOID Data OPTIONAL, + IN PFNKSGENERATEEVENTCALLBACK CallBack OPTIONAL, + IN PVOID CallBackContext OPTIONAL) +{ + UNIMPLEMENTED +} Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Thu Jul 23 15:13:45 2009 @@ -924,3 +924,154 @@ /* completed initialization */ return Status; } + +/* + @implemented +*/ +KSDDKAPI +VOID +NTAPI +KsFilterAcquireProcessingMutex( + IN PKSFILTER Filter) +{ + UNIMPLEMENTED +} + +/* + @implemented +*/ +KSDDKAPI +VOID +NTAPI +KsFilterReleaseProcessingMutex( + IN PKSFILTER Filter) +{ + UNIMPLEMENTED +} + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsFilterAddTopologyConnections ( + IN PKSFILTER Filter, + IN ULONG NewConnectionsCount, + IN const KSTOPOLOGY_CONNECTION *const NewTopologyConnections) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +/* + @implemented +*/ +KSDDKAPI +VOID +NTAPI +KsFilterAttemptProcessing( + IN PKSFILTER Filter, + IN BOOLEAN Asynchronous) +{ + UNIMPLEMENTED +} + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsFilterCreateNode ( + IN PKSFILTER Filter, + IN const KSNODE_DESCRIPTOR *const NodeDescriptor, + OUT PULONG NodeID) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsFilterCreatePinFactory ( + IN PKSFILTER Filter, + IN const KSPIN_DESCRIPTOR_EX *const PinDescriptor, + OUT PULONG PinID) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +/* + @implemented +*/ +KSDDKAPI +PKSGATE +NTAPI +KsFilterGetAndGate( + IN PKSFILTER Filter) +{ + UNIMPLEMENTED + return NULL; +} + +/* + @implemented +*/ +KSDDKAPI +ULONG +NTAPI +KsFilterGetChildPinCount( + IN PKSFILTER Filter, + IN ULONG PinId) +{ + UNIMPLEMENTED + return 0; +} + +/* + @implemented +*/ +KSDDKAPI +PKSPIN +NTAPI +KsFilterGetFirstChildPin( + IN PKSFILTER Filter, + IN ULONG PinId) +{ + UNIMPLEMENTED + return NULL; +} + +/* + @implemented +*/ +KSDDKAPI +VOID +NTAPI +KsFilterRegisterPowerCallbacks( + IN PKSFILTER Filter, + IN PFNKSFILTERPOWER Sleep OPTIONAL, + IN PFNKSFILTERPOWER Wake OPTIONAL) +{ + UNIMPLEMENTED +} + +/* + @implemented +*/ +KSDDKAPI +PKSFILTER +NTAPI +KsGetFilterFromIrp( + IN PIRP Irp) +{ + UNIMPLEMENTED + return NULL; +} + Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Thu Jul 23 15:13:45 2009 @@ -30,6 +30,18 @@ NTAPI KsDereferenceBusObject( IN KSDEVICE_HEADER Header) +{ + UNIMPLEMENTED; +} + +/* + @unimplemented +*/ +KSDDKAPI +VOID +NTAPI +KsDereferenceSoftwareBusObject( + IN KSDEVICE_HEADER Header) { UNIMPLEMENTED; } @@ -1633,3 +1645,29 @@ return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); } } + +/* + @unimplemented +*/ +KSDDKAPI +ULONG +NTAPI +KsGetNodeIdFromIrp( + IN PIRP Irp) +{ + UNIMPLEMENTED + return (ULONG)-1; +} + +/* + @unimplemented +*/ +KSDDKAPI +PKSPIN +NTAPI +KsGetPinFromIrp( + IN PIRP Irp) +{ + UNIMPLEMENTED + return NULL; +} Modified: trunk/reactos/drivers/ksfilter/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.rbu… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] Thu Jul 23 15:13:45 2009 @@ -26,6 +26,7 @@ <file>irp.c</file> <file>methods.c</file> <file>misc.c</file> + <file>pin.c</file> <file>property.c</file> <file>topology.c</file> <file>worker.c</file> Modified: trunk/reactos/drivers/ksfilter/ks/ks.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.spe… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.spec [iso-8859-1] Thu Jul 23 15:13:45 2009 @@ -1,111 +1,218 @@ -@ stdcall KsCreateAllocator(ptr ptr ptr) -@ stdcall KsCreateDefaultAllocator(ptr) -@ stdcall KsValidateAllocatorCreateRequest(ptr ptr) -@ stdcall KsCreateDefaultAllocatorEx(ptr ptr ptr ptr ptr ptr) -@ stdcall KsValidateAllocatorFramingEx(ptr long ptr) - -@ stdcall KsCreateClock(ptr ptr ptr) -@ stdcall KsCreateDefaultClock(ptr ptr) +@ stdcall DllInitialize(ptr) +@ stdcall KoCreateInstance(ptr ptr long ptr ptr) +@ stdcall KoDeviceInitialize(ptr) +@ stdcall KoDriverInitialize(ptr ptr ptr) +@ stdcall KoRelease(ptr) +@ stdcall KsAcquireControl(ptr) +@ stdcall KsAcquireDevice(ptr) +@ stdcall KsAcquireDeviceSecurityLock(ptr long) +@ stdcall KsAcquireResetValue(ptr ptr) +@ stdcall KsAddDevice(ptr ptr) +@ stdcall KsAddEvent(ptr ptr) +@ stdcall KsAddIrpToCancelableQueue(ptr ptr ptr long ptr) +@ stdcall KsAddItemToObjectBag(ptr ptr ptr) +@ stdcall KsAddObjectCreateItemToDeviceHeader (ptr ptr ptr ptr ptr) +@ stdcall KsAddObjectCreateItemToObjectHeader(ptr ptr ptr ptr ptr) @ stdcall KsAllocateDefaultClock(ptr) @ stdcall KsAllocateDefaultClockEx(ptr ptr ptr ptr ptr ptr long) +@ stdcall KsAllocateDeviceHeader(ptr long ptr) +@ stdcall KsAllocateExtraData(ptr long ptr) +@ stdcall KsAllocateObjectBag(ptr ptr) +@ stdcall KsAllocateObjectCreateItem(ptr ptr long ptr) +@ stdcall KsAllocateObjectHeader(ptr long ptr ptr ptr) +@ stdcall KsCacheMedium(ptr ptr long) +@ stdcall KsCancelIo(ptr ptr) +@ stdcall KsCancelRoutine(ptr ptr) +@ stdcall KsCompletePendingRequest(ptr) +@ stdcall KsCopyObjectBagItems(ptr ptr) +@ stdcall KsCreateAllocator(ptr ptr ptr) +@ stdcall KsCreateBusEnumObject(ptr ptr ptr ptr ptr ptr) +@ stdcall KsCreateClock(ptr ptr ptr) +@ stdcall KsCreateDefaultAllocator(ptr) +@ stdcall KsCreateDefaultAllocatorEx(ptr ptr ptr ptr ptr ptr) +@ stdcall KsCreateDefaultClock(ptr ptr) +@ stdcall KsCreateDefaultSecurity(ptr ptr) +@ stdcall KsCreateDevice(ptr ptr ptr long ptr) +@ stdcall KsCreateFilterFactory(ptr ptr ptr ptr long ptr ptr ptr) +@ stdcall KsCreatePin(ptr ptr long ptr) +@ stdcall KsCreateTopologyNode(ptr ptr long ptr) +@ stdcall KsDecrementCountedWorker(ptr) +@ stdcall KsDefaultAddEventHandler(ptr ptr ptr) +@ stdcall KsDefaultDeviceIoCompletion(ptr ptr) +@ stdcall KsDefaultDispatchPnp(ptr ptr) +@ stdcall KsDefaultDispatchPower(ptr ptr) +@ stdcall KsDefaultForwardIrp(ptr ptr) +@ stdcall KsDereferenceBusObject(ptr) +@ stdcall KsDereferenceSoftwareBusObject(ptr) +@ stdcall KsDeviceGetBusData(ptr long ptr long long) +@ stdcall KsDeviceRegisterAdapterObject(ptr ptr long long) +@ stdcall KsDeviceSetBusData(ptr long ptr long long) +@ stdcall KsDisableEvent(ptr ptr long long) +@ stdcall KsDiscardEvent(ptr) +@ stdcall KsDispatchFastIoDeviceControlFailure(ptr long ptr long ptr long long ptr ptr) +@ stdcall KsDispatchFastReadFailure(ptr ptr long long long ptr ptr ptr) +@ stdcall KsDispatchInvalidDeviceRequest(ptr ptr) +@ stdcall KsDispatchIrp(ptr ptr) +@ stdcall KsDispatchQuerySecurity(ptr ptr) +@ stdcall KsDispatchSetSecurity(ptr ptr) +@ stdcall KsDispatchSpecificMethod(ptr ptr) +@ stdcall KsDispatchSpecificProperty(ptr ptr) +@ stdcall _KsEdit(ptr ptr long long long) +@ stdcall KsEnableEvent(ptr long ptr ptr long ptr) +@ stdcall KsEnableEventWithAllocator(ptr long ptr ptr long ptr ptr long) +@ stdcall KsFastMethodHandler(ptr ptr long ptr long ptr long ptr) +@ stdcall KsFastPropertyHandler(ptr ptr long ptr long ptr long ptr) +@ stdcall KsFilterAcquireProcessingMutex(ptr) +@ stdcall KsFilterAddTopologyConnections(ptr long ptr) +@ stdcall KsFilterAttemptProcessing(ptr long) +@ stdcall KsFilterCreateNode(ptr ptr ptr) +@ stdcall KsFilterCreatePinFactory(ptr ptr ptr) +@ stdcall KsFilterFactoryAddCreateItem(ptr ptr ptr long) +@ stdcall KsFilterFactoryGetSymbolicLink(ptr) +@ stdcall KsFilterFactorySetDeviceClassesState(ptr long) +@ stdcall KsFilterFactoryUpdateCacheData(ptr ptr) +@ stdcall KsFilterGetAndGate(ptr) +@ stdcall KsFilterGetChildPinCount(ptr long) +@ stdcall KsFilterGetFirstChildPin(ptr long) +@ stdcall KsFilterRegisterPowerCallbacks(ptr ptr ptr) +@ stdcall KsFilterReleaseProcessingMutex(ptr) +@ stdcall KsForwardAndCatchIrp(ptr ptr ptr long) +@ stdcall KsForwardIrp(ptr ptr long) @ stdcall KsFreeDefaultClock(ptr) -@ stdcall KsValidateClockCreateRequest(ptr ptr) +@ stdcall KsFreeDeviceHeader(ptr) +@ stdcall KsFreeEventList(ptr ptr long ptr) +@ stdcall KsFreeObjectBag(ptr) +@ stdcall KsFreeObjectCreateItem(ptr ptr) +@ stdcall KsFreeObjectCreateItemsByContext(ptr ptr) +@ stdcall KsFreeObjectHeader(ptr) +@ stdcall KsGenerateDataEvent(ptr long ptr) +@ stdcall KsGenerateEvent(ptr) +@ stdcall KsGenerateEventList(ptr long ptr long ptr) +@ stdcall KsGenerateEvents(ptr ptr long long ptr ptr ptr) +@ stdcall KsGetBusEnumIdentifier(ptr) +@ stdcall KsGetBusEnumParentFDOFromChildPDO(ptr ptr) +@ stdcall KsGetBusEnumPnpDeviceObject(ptr ptr) @ stdcall KsGetDefaultClockState(ptr) -@ stdcall KsSetDefaultClockState(ptr long) @ stdcall KsGetDefaultClockTime(ptr) -@ stdcall KsSetDefaultClockTime(ptr long long) - +@ stdcall KsGetDevice(ptr) +@ stdcall KsGetDeviceForDeviceObject(ptr) +@ stdcall KsGetFilterFromIrp(ptr) +@ stdcall KsGetFirstChild(ptr) +@ stdcall KsGetImageNameAndResourceId(ptr ptr ptr ptr) +@ stdcall KsGetNextSibling(ptr) +@ stdcall KsGetNodeIdFromIrp(ptr) +@ stdcall KsGetObjectFromFileObject(ptr) +@ stdcall KsGetObjectTypeFromFileObject(ptr) +@ stdcall KsGetObjectTypeFromIrp(ptr) +@ stdcall KsGetOuterUnknown(ptr) +@ stdcall KsGetParent(ptr) +@ stdcall KsGetPinFromIrp(ptr) +@ stdcall KsHandleSizedListQuery(ptr long long ptr) +;@ stdcall KsiDefaultClockAddMarkEvent +@ stdcall KsIncrementCountedWorker(ptr) +@ stdcall KsInitializeDevice(ptr ptr ptr ptr) +@ stdcall KsInitializeDriver(ptr ptr ptr) +@ stdcall KsInstallBusEnumInterface(ptr) +;KsiPropertyDefaultClockGetCorrelatedPhysicalTime +;KsiPropertyDefaultClockGetCorrelatedTime +;KsiPropertyDefaultClockGetFunctionTable +;KsiPropertyDefaultClockGetPhysicalTime +;KsiPropertyDefaultClockGetResolution +;KsiPropertyDefaultClockGetState +;KsiPropertyDefaultClockGetTime +;KsiQueryObjectCreateItemsPresent +@ stdcall KsIsBusEnumChildDevice(ptr ptr) +@ stdcall KsLoadResource(ptr long long long ptr ptr) +@ stdcall KsMapModuleName(ptr ptr ptr ptr ptr) +@ stdcall KsMergeAutomationTables(ptr ptr ptr ptr) @ stdcall KsMethodHandler(ptr long ptr) @ stdcall KsMethodHandlerWithAllocator(ptr long ptr ptr long) -@ stdcall KsFastMethodHandler(ptr ptr long ptr long ptr long ptr) - +@ stdcall KsMoveIrpsOnCancelableQueue(ptr ptr ptr ptr long ptr ptr) +@ stdcall KsNullDriverUnload(ptr) +@ stdcall KsPinAcquireProcessingMutex(ptr) +@ stdcall KsPinAttachAndGate(ptr ptr) +@ stdcall KsPinAttachOrGate(ptr ptr) +@ stdcall KsPinAttemptProcessing(ptr long) +@ stdcall KsPinDataIntersection(ptr ptr ptr long ptr ptr) +@ stdcall KsPinGetAndGate(ptr) +@ stdcall KsPinGetAvailableByteCount(ptr ptr ptr) +@ stdcall KsPinGetConnectedFilterInterface(ptr ptr ptr) +@ stdcall KsPinGetConnectedPinDeviceObject(ptr) +@ stdcall KsPinGetConnectedPinFileObject(ptr) +@ stdcall KsPinGetConnectedPinInterface(ptr ptr ptr) +@ stdcall KsPinGetCopyRelationships(ptr ptr ptr) +@ stdcall KsPinGetFirstCloneStreamPointer(ptr) +@ stdcall KsPinGetLeadingEdgeStreamPointer(ptr long) +@ stdcall KsPinGetNextSiblingPin(ptr) +@ stdcall KsPinGetParentFilter(ptr) +@ stdcall KsPinGetReferenceClockInterface(ptr ptr) +@ stdcall KsPinGetTrailingEdgeStreamPointer(ptr ptr) +@ stdcall KsPinPropertyHandler(ptr ptr ptr long ptr) +@ stdcall KsPinRegisterFrameReturnCallback(ptr ptr) +@ stdcall KsPinRegisterHandshakeCallback(ptr ptr) +@ stdcall KsPinRegisterIrpCompletionCallback(ptr ptr) +@ stdcall KsPinRegisterPowerCallbacks(ptr ptr ptr) +@ stdcall KsPinReleaseProcessingMutex(ptr) +;@ stdcall KsPinSetPinClockTime(ptr long) +@ stdcall KsPinSubmitFrame(ptr ptr long ptr ptr) +@ stdcall KsPinSubmitFrameMdl(ptr ptr ptr ptr) +@ stdcall KsProbeStreamIrp(ptr long long) +@ stdcall KsProcessPinUpdate(ptr) @ stdcall KsPropertyHandler(ptr long ptr) @ stdcall KsPropertyHandlerWithAllocator(ptr long ptr ptr long) -@ stdcall KsUnserializeObjectPropertiesFromRegistry(ptr ptr ptr) -@ stdcall KsFastPropertyHandler(ptr ptr long ptr long ptr long ptr) - -@ stdcall KsGenerateEvent(ptr) -@ stdcall KsEnableEventWithAllocator(ptr long ptr ptr long ptr ptr long) -@ stdcall KsGenerateDataEvent(ptr long ptr) -@ stdcall KsEnableEvent(ptr long ptr ptr long ptr) -@ stdcall KsDiscardEvent(ptr) -@ stdcall KsDisableEvent(ptr ptr long ptr) -@ stdcall KsFreeEventList(ptr ptr long ptr) - -@ stdcall KsValidateTopologyNodeCreateRequest(ptr ptr ptr) -@ stdcall KsCreateTopologyNode(ptr ptr long ptr) -@ stdcall KsTopologyPropertyHandler(ptr ptr ptr ptr) - -@ stdcall KsCreatePin(ptr ptr long ptr) -@ stdcall KsValidateConnectRequest(ptr long ptr ptr) -@ stdcall KsPinPropertyHandler(ptr ptr ptr long ptr) -@ stdcall KsPinDataIntersection(ptr ptr ptr long ptr ptr) - -@ stdcall KsHandleSizedListQuery(ptr long long ptr) - -@ stdcall KsAcquireResetValue(ptr ptr) -@ stdcall KsDefaultForwardIrp(ptr ptr) -@ stdcall KsAddIrpToCancelableQueue(ptr ptr ptr long ptr) -@ stdcall KsAddObjectCreateItemToDeviceHeader(ptr ptr ptr wstr ptr) -@ stdcall KsAddObjectCreateItemToObjectHeader(ptr ptr ptr wstr ptr) -@ stdcall KsAllocateDeviceHeader(ptr long ptr) -@ stdcall KsAllocateExtraData(ptr long ptr) -@ stdcall KsAllocateObjectCreateItem(long ptr long ptr) -@ stdcall KsAllocateObjectHeader(ptr long ptr ptr ptr) -@ stdcall KsCancelIo(ptr ptr) -@ stdcall KsCancelRoutine(ptr ptr) -@ stdcall KsDefaultDeviceIoCompletion(ptr ptr) -@ stdcall KsDispatchFastIoDeviceControlFailure(ptr long ptr long ptr long long ptr ptr) -@ stdcall KsDispatchFastReadFailure(ptr ptr long long long ptr ptr ptr) -; KsDispatchFastWriteFailure@32 -@ stdcall KsDispatchInvalidDeviceRequest(ptr ptr) -@ stdcall KsDispatchIrp(ptr ptr) -@ stdcall KsDispatchSpecificMethod(ptr ptr) -@ stdcall KsDispatchSpecificProperty(ptr ptr) -@ stdcall KsForwardAndCatchIrp(ptr ptr ptr long) -@ stdcall KsForwardIrp(ptr ptr long) -@ stdcall KsFreeDeviceHeader(ptr) -@ stdcall KsFreeObjectHeader(ptr) -@ stdcall KsGetChildCreateParameter(ptr ptr) -@ stdcall KsMoveIrpsOnCancelableQueue(ptr ptr ptr ptr long ptr ptr) -@ stdcall KsProbeStreamIrp(ptr long long) +@ stdcall KsQueryDevicePnpObject(ptr) @ stdcall KsQueryInformationFile(ptr ptr long long) @ stdcall KsQueryObjectAccessMask(ptr) @ stdcall KsQueryObjectCreateItem(ptr) +@ stdcall KsQueueWorkItem(ptr ptr) @ stdcall KsReadFile(ptr ptr ptr ptr ptr long long long) +@ stdcall KsRecalculateStackDepth(ptr long) +@ stdcall KsReferenceBusObject(ptr) +@ stdcall KsReferenceSoftwareBusObject(ptr) +@ stdcall KsRegisterAggregatedClientUnknown(ptr ptr) +@ stdcall KsRegisterCountedWorker(long ptr ptr) +@ stdcall KsRegisterFilterWithNoKSPins(ptr ptr long ptr ptr ptr) +@ stdcall KsRegisterWorker(long ptr) +@ stdcall KsReleaseControl(ptr) +@ stdcall KsReleaseDevice(ptr) +@ stdcall KsReleaseDeviceSecurityLock(ptr) @ stdcall KsReleaseIrpOnCancelableQueue(ptr ptr) +@ stdcall KsRemoveBusEnumInterface(ptr) @ stdcall KsRemoveIrpFromCancelableQueue(ptr ptr long long) +@ stdcall KsRemoveItemFromObjectBag(ptr ptr long) @ stdcall KsRemoveSpecificIrpFromCancelableQueue(ptr) +@ stdcall KsServiceBusEnumCreateRequest(ptr ptr) +@ stdcall KsServiceBusEnumPnpRequest(ptr ptr) +@ stdcall KsSetDefaultClockState(ptr long) +;@ stdcall KsSetDefaultClockTime(ptr long) +@ stdcall KsSetDevicePnpAndBaseObject(ptr ptr ptr) @ stdcall KsSetInformationFile(ptr ptr long long) @ stdcall KsSetMajorFunctionHandler(ptr long) -@ stdcall KsStreamIo(ptr ptr ptr ptr ptr long ptr ptr long long long) -@ stdcall KsWriteFile(ptr ptr ptr ptr ptr long long long) - -@ stdcall KsRegisterWorker(long ptr) -@ stdcall KsUnregisterWorker(ptr) -@ stdcall KsRegisterCountedWorker(long ptr ptr) -@ stdcall KsDecrementCountedWorker(ptr) -@ stdcall KsIncrementCountedWorker(ptr) -@ stdcall KsQueueWorkItem(ptr ptr) - -@ stdcall KsCacheMedium(ptr ptr long) -@ stdcall KsDefaultDispatchPnp(ptr ptr) -@ stdcall KsSetDevicePnpAndBaseObject(ptr ptr ptr) -@ stdcall KsDefaultDispatchPower(ptr ptr) @ stdcall KsSetPowerDispatch(ptr ptr ptr) -@ stdcall KsReferenceBusObject(ptr) -@ stdcall KsDereferenceBusObject(ptr) -@ stdcall KsFreeObjectCreateItem(ptr ptr) -@ stdcall KsFreeObjectCreateItemsByContext(ptr ptr) -@ stdcall KsLoadResource(ptr long ptr long ptr ptr) -@ stdcall KsNullDriverUnload(ptr) -@ stdcall KsPinDataIntersectionEx(ptr ptr ptr long ptr long ptr ptr) -@ stdcall KsQueryDevicePnpObject(ptr) -@ stdcall KsRecalculateStackDepth(ptr long) @ stdcall KsSetTargetDeviceObject(ptr ptr) @ stdcall KsSetTargetState(ptr long) +@ stdcall KsStreamIo(ptr ptr ptr ptr ptr long ptr ptr long long long) +@ stdcall KsStreamPointerAdvance(ptr) +@ stdcall KsStreamPointerAdvanceOffsets(ptr long long long) +@ stdcall KsStreamPointerAdvanceOffsetsAndUnlock(ptr long long long) +@ stdcall KsStreamPointerCancelTimeout(ptr) +@ stdcall KsStreamPointerClone(ptr ptr long ptr) +@ stdcall KsStreamPointerDelete(ptr) +@ stdcall KsStreamPointerGetIrp(ptr ptr ptr) +@ stdcall KsStreamPointerGetMdl(ptr) +@ stdcall KsStreamPointerGetNextClone(ptr) +@ stdcall KsStreamPointerLock(ptr) +;@ stdcall KsStreamPointerScheduleTimeout(ptr ptr longlong) +@ stdcall KsStreamPointerSetStatusCode(ptr long) +@ stdcall KsStreamPointerUnlock(ptr long) @ stdcall KsSynchronousIoControlDevice(ptr long long ptr long ptr long ptr) -@ stdcall KsInitializeDriver(ptr ptr ptr) - -; Kernel COM -@ stdcall KoCreateInstance(ptr ptr long ptr ptr) +@ stdcall KsTerminateDevice(ptr) +@ stdcall KsTopologyPropertyHandler(ptr ptr ptr ptr) +@ stdcall KsUnregisterWorker(ptr) +@ stdcall KsUnserializeObjectPropertiesFromRegistry(ptr ptr ptr) +@ stdcall KsValidateAllocatorCreateRequest(ptr ptr) +@ stdcall KsValidateAllocatorFramingEx(ptr long ptr) +@ stdcall KsValidateClockCreateRequest(ptr ptr) +@ stdcall KsValidateConnectRequest(ptr long ptr ptr) +@ stdcall KsValidateTopologyNodeCreateRequest(ptr ptr ptr) +@ stdcall KsWriteFile(ptr ptr ptr ptr ptr long long long) Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Thu Jul 23 15:13:45 2009 @@ -139,3 +139,68 @@ return STATUS_SUCCESS; } +/* + @unimplemented +*/ +KSDDKAPI +PVOID +NTAPI +KsGetObjectFromFileObject( + IN PFILE_OBJECT FileObject) +{ + UNIMPLEMENTED + return NULL; +} + +/* + @unimplemented +*/ +KSDDKAPI +KSOBJECTTYPE +NTAPI +KsGetObjectTypeFromFileObject( + IN PFILE_OBJECT FileObject) +{ + UNIMPLEMENTED + return (KSOBJECTTYPE)-1; +} + +/* + @unimplemented +*/ +KSOBJECTTYPE +NTAPI +KsGetObjectTypeFromIrp( + IN PIRP Irp) +{ + UNIMPLEMENTED + return (KSOBJECTTYPE)-1; +} + +/* + @unimplemented +*/ +PUNKNOWN +NTAPI +KsGetOuterUnknown( + IN PVOID Object) +{ + UNIMPLEMENTED + return NULL; + +} + +/* + @unimplemented +*/ +KSDDKAPI +PVOID +NTAPI +KsGetParent( + IN PVOID Object) +{ + UNIMPLEMENTED + return NULL; +} + + Added: trunk/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/pin.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/pin.c (added) +++ trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] Thu Jul 23 15:13:45 2009 @@ -1,0 +1,521 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/ksfilter/ks/worker.c + * PURPOSE: KS pin functions + * PROGRAMMER: Johannes Anderwald + */ + + +#include "priv.h" + +/* + @unimplemented +*/ +VOID +NTAPI +KsPinAcquireProcessingMutex( + IN PKSPIN Pin) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +VOID +NTAPI +KsPinAttachAndGate( + IN PKSPIN Pin, + IN PKSGATE AndGate OPTIONAL) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +VOID +NTAPI +KsPinAttachOrGate( + IN PKSPIN Pin, + IN PKSGATE OrGate OPTIONAL) +{ + UNIMPLEMENTED +} +/* + @unimplemented +*/ +VOID +NTAPI +KsPinAttemptProcessing( + IN PKSPIN Pin, + IN BOOLEAN Asynchronous) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +NTSTATUS +NTAPI +KsPinGetAvailableByteCount( + IN PKSPIN Pin, + OUT PLONG InputDataBytes OPTIONAL, + OUT PLONG OutputBufferBytes OPTIONAL) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +/* + @unimplemented +*/ +NTSTATUS +NTAPI +KsPinGetConnectedFilterInterface( + IN PKSPIN Pin, + IN const GUID* InterfaceId, + OUT PVOID* Interface) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +/* + @unimplemented +*/ +PKSGATE +NTAPI +KsPinGetAndGate( + IN PKSPIN Pin) +{ + UNIMPLEMENTED + return NULL; +} + +/* + @unimplemented +*/ +PDEVICE_OBJECT +NTAPI +KsPinGetConnectedPinDeviceObject( + IN PKSPIN Pin) +{ + UNIMPLEMENTED + return NULL; +} + +/* + @unimplemented +*/ +PFILE_OBJECT +NTAPI +KsPinGetConnectedPinFileObject( + IN PKSPIN Pin) +{ + UNIMPLEMENTED + return NULL; +} + +/* + @unimplemented +*/ +NTSTATUS +NTAPI +KsPinGetConnectedPinInterface( + IN PKSPIN Pin, + IN const GUID* InterfaceId, + OUT PVOID* Interface) +{ + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + +/* + @unimplemented +*/ +VOID +NTAPI +KsPinGetCopyRelationships( + IN PKSPIN Pin, + OUT PKSPIN* CopySource, + OUT PKSPIN* DelegateBranch) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +PKSPIN +NTAPI +KsPinGetNextSiblingPin( + IN PKSPIN Pin) +{ + UNIMPLEMENTED + return NULL; +} + +/* + @unimplemented +*/ +PKSFILTER +NTAPI +KsPinGetParentFilter( + IN PKSPIN Pin) +{ + UNIMPLEMENTED + return NULL; +} + +/* + @unimplemented +*/ +NTSTATUS +NTAPI + KsPinGetReferenceClockInterface( + IN PKSPIN Pin, + OUT PIKSREFERENCECLOCK* Interface) +{ + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + +/* + @unimplemented +*/ +VOID +NTAPI +KsPinRegisterFrameReturnCallback( + IN PKSPIN Pin, + IN PFNKSPINFRAMERETURN FrameReturn) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +VOID +NTAPI +KsPinRegisterHandshakeCallback( + IN PKSPIN Pin, + IN PFNKSPINHANDSHAKE Handshake) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +VOID +NTAPI +KsPinRegisterIrpCompletionCallback( + IN PKSPIN Pin, + IN PFNKSPINIRPCOMPLETION IrpCompletion) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +VOID +NTAPI +KsPinRegisterPowerCallbacks( + IN PKSPIN Pin, + IN PFNKSPINPOWER Sleep OPTIONAL, + IN PFNKSPINPOWER Wake OPTIONAL) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +VOID +NTAPI +KsPinReleaseProcessingMutex( + IN PKSPIN Pin) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +VOID +NTAPI +KsPinSetPinClockTime( + IN PKSPIN Pin, + IN LONGLONG Time) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +NTSTATUS +NTAPI +KsPinSubmitFrame( + IN PKSPIN Pin, + IN PVOID Data OPTIONAL, + IN ULONG Size OPTIONAL, + IN PKSSTREAM_HEADER StreamHeader OPTIONAL, + IN PVOID Context OPTIONAL) +{ + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsPinSubmitFrameMdl( + IN PKSPIN Pin, + IN PMDL Mdl OPTIONAL, + IN PKSSTREAM_HEADER StreamHeader OPTIONAL, + IN PVOID Context OPTIONAL) +{ + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + +/* + @unimplemented +*/ +KSDDKAPI +BOOLEAN +NTAPI +KsProcessPinUpdate( + IN PKSPROCESSPIN ProcessPin) +{ + UNIMPLEMENTED + return FALSE; +} + +/* + @unimplemented +*/ +KSDDKAPI +PKSSTREAM_POINTER +NTAPI +KsPinGetLeadingEdgeStreamPointer( + IN PKSPIN Pin, + IN KSSTREAM_POINTER_STATE State) +{ + UNIMPLEMENTED + return NULL; +} + +/* + @unimplemented +*/ +KSDDKAPI +PKSSTREAM_POINTER +NTAPI +KsPinGetTrailingEdgeStreamPointer( + IN PKSPIN Pin, + IN KSSTREAM_POINTER_STATE State) +{ + UNIMPLEMENTED + return NULL; +} + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsStreamPointerSetStatusCode( + IN PKSSTREAM_POINTER StreamPointer, + IN NTSTATUS Status) +{ + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsStreamPointerLock( + IN PKSSTREAM_POINTER StreamPointer) +{ + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + +/* + @unimplemented +*/ +KSDDKAPI +VOID +NTAPI +KsStreamPointerUnlock( + IN PKSSTREAM_POINTER StreamPointer, + IN BOOLEAN Eject) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +KSDDKAPI +VOID +NTAPI +KsStreamPointerAdvanceOffsetsAndUnlock( + IN PKSSTREAM_POINTER StreamPointer, + IN ULONG InUsed, + IN ULONG OutUsed, + IN BOOLEAN Eject) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +KSDDKAPI +VOID +NTAPI +KsStreamPointerDelete( + IN PKSSTREAM_POINTER StreamPointer) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsStreamPointerClone( + IN PKSSTREAM_POINTER StreamPointer, + IN PFNKSSTREAMPOINTER CancelCallback OPTIONAL, + IN ULONG ContextSize, + OUT PKSSTREAM_POINTER* CloneStreamPointer) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsStreamPointerAdvanceOffsets( + IN PKSSTREAM_POINTER StreamPointer, + IN ULONG InUsed, + IN ULONG OutUsed, + IN BOOLEAN Eject) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsStreamPointerAdvance( + IN PKSSTREAM_POINTER StreamPointer) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +/* + @unimplemented +*/ +KSDDKAPI +PMDL +NTAPI +KsStreamPointerGetMdl( + IN PKSSTREAM_POINTER StreamPointer) +{ + UNIMPLEMENTED + return NULL; +} + +/* + @unimplemented +*/ +KSDDKAPI +PIRP +NTAPI +KsStreamPointerGetIrp( + IN PKSSTREAM_POINTER StreamPointer, + OUT PBOOLEAN FirstFrameInIrp OPTIONAL, + OUT PBOOLEAN LastFrameInIrp OPTIONAL) +{ + UNIMPLEMENTED + return NULL; +} + +/* + @unimplemented +*/ +KSDDKAPI +VOID +NTAPI +KsStreamPointerScheduleTimeout( + IN PKSSTREAM_POINTER StreamPointer, + IN PFNKSSTREAMPOINTER Callback, + IN ULONGLONG Interval) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +KSDDKAPI +VOID +NTAPI +KsStreamPointerCancelTimeout( + IN PKSSTREAM_POINTER StreamPointer) +{ + UNIMPLEMENTED +} + +/* + @unimplemented +*/ +KSDDKAPI +PKSSTREAM_POINTER +NTAPI +KsPinGetFirstCloneStreamPointer( + IN PKSPIN Pin) +{ + UNIMPLEMENTED + return NULL; +} + +/* + @unimplemented +*/ +KSDDKAPI +PKSSTREAM_POINTER +NTAPI +KsStreamPointerGetNextClone( + IN PKSSTREAM_POINTER StreamPointer) +{ + UNIMPLEMENTED + return NULL; +} Propchange: trunk/reactos/drivers/ksfilter/ks/pin.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 42152: - Implement link speed and duplex detection - Fix LED programming (we didn't set LEDPE so all our programming was ignored) - Add some other LED programming - Fixes bug 4703
by cgutman＠svn.reactos.org 23 Jul '09

23 Jul '09

Author: cgutman Date: Thu Jul 23 06:21:06 2009 New Revision: 42152 URL: http://svn.reactos.org/svn/reactos?rev=42152&view=rev Log: - Implement link speed and duplex detection - Fix LED programming (we didn't set LEDPE so all our programming was ignored) - Add some other LED programming - Fixes bug 4703 Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c trunk/reactos/drivers/network/dd/pcnet/pcnet.h trunk/reactos/drivers/network/dd/pcnet/pcnethw.h trunk/reactos/drivers/network/dd/pcnet/requests.c Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Thu Jul 23 06:21:06 2009 @@ -607,12 +607,18 @@ { PADAPTER Adapter = (PADAPTER)SynchronizeContext; NDIS_MEDIA_STATE MediaState = MiGetMediaState(Adapter); + UINT MediaSpeed = MiGetMediaSpeed(Adapter); + BOOLEAN FullDuplex = MiGetMediaDuplex(Adapter); DPRINT("Called\n"); DPRINT("MediaState: %d\n", MediaState); - if (MediaState != Adapter->MediaState) + if (MediaState != Adapter->MediaState || + MediaSpeed != Adapter->MediaSpeed || + FullDuplex != Adapter->FullDuplex) { Adapter->MediaState = MediaState; + Adapter->MediaSpeed = MediaSpeed; + Adapter->FullDuplex = FullDuplex; return TRUE; } return FALSE; @@ -721,10 +727,29 @@ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR0); NdisRawWritePortUshort(Adapter->PortOffset + RDP, CSR0_STRT|CSR0_INIT|CSR0_IENA); - /* detect the media state */ + /* Allow LED programming */ + NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR2); + NdisRawWritePortUshort(Adapter->PortOffset + BDP, BCR2_LEDPE); + + /* LED0 is configured for link status (on = up, off = down) */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR4); - NdisRawWritePortUshort(Adapter->PortOffset + BDP, BCR4_LNKSTE|BCR4_FDLSE); + NdisRawWritePortUshort(Adapter->PortOffset + BDP, BCR4_LNKSTE | BCR4_PSE); + + /* LED1 is configured for link duplex (on = full, off = half) */ + NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR5); + NdisRawWritePortUshort(Adapter->PortOffset + BDP, BCR5_FDLSE | BCR5_PSE); + + /* LED2 is configured for link speed (on = 100M, off = 10M) */ + NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR6); + NdisRawWritePortUshort(Adapter->PortOffset + BDP, BCR6_E100 | BCR6_PSE); + + /* LED3 is configured for trasmit/receive activity */ + NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR7); + NdisRawWritePortUshort(Adapter->PortOffset + BDP, BCR7_XMTE | BCR7_RCVE | BCR7_PSE); + Adapter->MediaState = MiGetMediaState(Adapter); + Adapter->FullDuplex = MiGetMediaDuplex(Adapter); + Adapter->MediaSpeed = MiGetMediaSpeed(Adapter); DPRINT("card started\n"); @@ -1240,6 +1265,30 @@ return NDIS_STATUS_SUCCESS; } +BOOLEAN +NTAPI +MiGetMediaDuplex(PADAPTER Adapter) +{ + ULONG Data; + + NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR5); + NdisRawReadPortUshort(Adapter->PortOffset + BDP, &Data); + + return Data & BCR5_LEDOUT; +} + +UINT +NTAPI +MiGetMediaSpeed(PADAPTER Adapter) +{ + ULONG Data; + + NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR4); + NdisRawReadPortUshort(Adapter->PortOffset + BDP, &Data); + + return Data & BCR6_LEDOUT ? 100 : 10; +} + NDIS_MEDIA_STATE NTAPI MiGetMediaState(PADAPTER Adapter) Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] Thu Jul 23 06:21:06 2009 @@ -60,6 +60,8 @@ ULONG_PTR PortOffset; NDIS_MINIPORT_INTERRUPT InterruptObject; NDIS_MEDIA_STATE MediaState; + UINT MediaSpeed; + BOOLEAN FullDuplex; NDIS_MINIPORT_TIMER MediaDetectionTimer; ULONG CurrentReceiveDescriptorIndex; ULONG CurrentPacketFilter; @@ -129,6 +131,14 @@ NTAPI MiGetMediaState(PADAPTER Adapter); +UINT +NTAPI +MiGetMediaSpeed(PADAPTER Adapter); + +BOOLEAN +NTAPI +MiGetMediaDuplex(PADAPTER Adapter); + /* operational constants */ #define NUMBER_OF_BUFFERS 0x20 #define LOG_NUMBER_OF_BUFFERS 5 /* log2(NUMBER_OF_BUFFERS) */ Modified: trunk/reactos/drivers/network/dd/pcnet/pcnethw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnethw.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnethw.h [iso-8859-1] Thu Jul 23 06:21:06 2009 @@ -250,6 +250,7 @@ #define BCR2_DXCVRCTL 0x20 /* dxcvr control */ #define BCR2_INTLEVEL 0x80 /* interrupt level/edge */ #define BCR2_APROMWE 0x100 /* address prom write enable */ +#define BCR2_LEDPE 0x1000 /* LED programming enable */ #define BCR2_TMAULOOP 0x4000 /* t-mau transmit on loopback */ /* BCR4 bits */ @@ -263,6 +264,7 @@ #define BCR4_PSE 0x80 /* pulse stretcher enable */ #define BCR4_FDLSE 0x100 /* full-duplex link status enable */ #define BCR4_MPSE 0x200 /* magic packet status enable */ +#define BCR4_E100 0x1000 /* link speed */ #define BCR4_LEDDIS 0x2000 /* led disable */ #define BCR4_LEDPOL 0x4000 /* led polarity */ #define BCR4_LEDOUT 0x8000 /* led output pin value */ @@ -278,6 +280,7 @@ #define BCR5_PSE 0x80 /* pulse stretcher enable */ #define BCR5_FDLSE 0x100 /* full-duplex link status enable */ #define BCR5_MPSE 0x200 /* magic packet status enable */ +#define BCR5_E100 0x1000 /* link speed */ #define BCR5_LEDDIS 0x2000 /* led disable */ #define BCR5_LEDPOL 0x4000 /* led polarity */ #define BCR5_LEDOUT 0x8000 /* led output pin value */ @@ -293,6 +296,7 @@ #define BCR6_PSE 0x80 /* pulse stretcher enable */ #define BCR6_FDLSE 0x100 /* full-duplex link status enable */ #define BCR6_MPSE 0x200 /* magic packet status enable */ +#define BCR6_E100 0x1000 /* link speed */ #define BCR6_LEDDIS 0x2000 /* led disable */ #define BCR6_LEDPOL 0x4000 /* led polarity */ #define BCR6_LEDOUT 0x8000 /* led output pin value */ @@ -308,6 +312,7 @@ #define BCR7_PSE 0x80 /* pulse stretcher enable */ #define BCR7_FDLSE 0x100 /* full-duplex link status enable */ #define BCR7_MPSE 0x200 /* magic packet status enable */ +#define BCR7_E100 0x1000 /* link speed */ #define BCR7_LEDDIS 0x2000 /* led disable */ #define BCR7_LEDPOL 0x4000 /* led polarity */ #define BCR7_LEDOUT 0x8000 /* led output pin value */ Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/r… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] Thu Jul 23 06:21:06 2009 @@ -173,7 +173,7 @@ case OID_GEN_LINK_SPEED: { - GenericULONG = 100000; /* 10Mbps */ + GenericULONG = Adapter->MediaSpeed * 10000; break; }

1 0

[jimtabor] 42151: - [Win32k] More work on classes. Wine test drop to 35 failures from 52, now with the system class rewrite it is up to 42 failures. There is one User32 loaded so there is one User client Instance for this system. One System class per system not including Public (Global) or Private (Local) classes per process. Sorting continues. - Tested wine (some improvements and losses), Firefox 1.15.xx and AbiWord 2.6.8.
by jimtabor＠svn.reactos.org 23 Jul '09

23 Jul '09

Author: jimtabor Date: Thu Jul 23 03:34:31 2009 New Revision: 42151 URL: http://svn.reactos.org/svn/reactos?rev=42151&view=rev Log: - [Win32k] More work on classes. Wine test drop to 35 failures from 52, now with the system class rewrite it is up to 42 failures. There is one User32 loaded so there is one User client Instance for this system. One System class per system not including Public (Global) or Private (Local) classes per process. Sorting continues. - Tested wine (some improvements and losses), Firefox 1.15.xx and AbiWord 2.6.8. Modified: trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/windows/class.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -70,9 +70,6 @@ #define NtUserSetCaretBlinkTime(uMSeconds) \ (BOOL)NtUserCallOneParam((DWORD)uMSeconds, ONEPARAM_ROUTINE_SETCARETBLINKTIME) -#define NtUserRegisterUserModule(hInstance) \ - (BOOL)NtUserCallOneParam((DWORD)hInstance, ONEPARAM_ROUTINE_REGISTERUSERMODULE) - /* #define NtUserEnumClipboardFormats(format) \ (UINT)NtUserCallOneParam(format, ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS) Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -244,7 +244,6 @@ gHandleEntries = SharedPtrToUser(gHandleTable->handles); //ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); - RegisterClientPFN(); /* Allocate an index for user32 thread local data. */ User32TlsIndex = TlsAlloc(); if (User32TlsIndex != TLS_OUT_OF_INDEXES) @@ -290,7 +289,7 @@ { case DLL_PROCESS_ATTACH: User32Instance = hInstanceDll; - if (!NtUserRegisterUserModule(hInstanceDll) || + if (!RegisterClientPFN() || !RegisterSystemControls()) { return FALSE; @@ -351,8 +350,6 @@ g_ulSharedDelta = UserCon.siClient.ulSharedDelta; g_psi = SharedPtrToUser(UserCon.siClient.psi); gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); - gHandleEntries = SharedPtrToUser(gHandleTable->handles); - - RegisterClientPFN(); + gHandleEntries = SharedPtrToUser(gHandleTable->handles); } Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -136,8 +136,6 @@ WNDCLASSEXA wcex; BOOL retval; - if (!hInstance) hInstance = User32Instance; - retval = GetClassInfoExA(hInstance, lpClassName, &wcex); if (retval) { @@ -145,7 +143,7 @@ lpWndClass->lpfnWndProc = wcex.lpfnWndProc; lpWndClass->cbClsExtra = wcex.cbClsExtra; lpWndClass->cbWndExtra = wcex.cbWndExtra; - lpWndClass->hInstance = (User32Instance == hInstance) ? 0 : wcex.hInstance; + lpWndClass->hInstance = wcex.hInstance; lpWndClass->hIcon = wcex.hIcon; lpWndClass->hCursor = wcex.hCursor; lpWndClass->hbrBackground = wcex.hbrBackground; @@ -169,8 +167,6 @@ WNDCLASSEXW wcex; BOOL retval; - if (!hInstance) hInstance = User32Instance; - retval = GetClassInfoExW(hInstance, lpClassName, &wcex); if (retval) { @@ -178,7 +174,7 @@ lpWndClass->lpfnWndProc = wcex.lpfnWndProc; lpWndClass->cbClsExtra = wcex.cbClsExtra; lpWndClass->cbWndExtra = wcex.cbWndExtra; - lpWndClass->hInstance = (User32Instance == hInstance) ? 0 : wcex.hInstance; + lpWndClass->hInstance = wcex.hInstance; lpWndClass->hIcon = wcex.hIcon; lpWndClass->hCursor = wcex.hCursor; lpWndClass->hbrBackground = wcex.hbrBackground; Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -2988,7 +2988,6 @@ #define ONEPARAM_ROUTINE_GETWINDOWINSTANCE 0xfffe0010 #define ONEPARAM_ROUTINE_CREATECURICONHANDLE 0xfffe0025 // CREATE_EMPTY_CURSOR_OBJECT ? #define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0xfffe0027 -#define ONEPARAM_ROUTINE_REGISTERUSERMODULE 0xfffe0031 #define ONEPARAM_ROUTINE_GETCURSORPOSITION 0xfffe0048 // use ONEPARAM_ or TWOPARAM routine ? #define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0xfffd0048 // user mode #define TWOPARAM_ROUTINE_GETWINDOWRGN 0xfffd0049 // user mode Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -1,7 +1,11 @@ #ifndef __INCLUDE_NAPI_WIN32_H #define __INCLUDE_NAPI_WIN32_H -extern HINSTANCE hModClient; // This should replace (PROCESSINFO)->hModUser +extern BOOL ClientPfnInit; +extern HINSTANCE hModClient; +extern HANDLE hModuleWin; // This Win32k Instance. +extern PCLS SystemClassList; +extern BOOL RegisteredSysClasses; typedef struct _WIN32HEAP WIN32HEAP, *PWIN32HEAP; @@ -99,14 +103,11 @@ typedef struct _PROCESSINFO { W32PROCESS XzyxW32Process; /* Place holder. */ + + PCLS pclsPrivateList; + PCLS pclsPublicList; /* ReactOS */ - HINSTANCE hModUser; - PCLS LocalClassList; - PCLS GlobalClassList; - PCLS SystemClassList; - - UINT RegisteredSysClasses : 1; - + } PROCESSINFO; #endif /* __INCLUDE_NAPI_WIN32_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -1,21 +1,3 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998 - 2006 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -34,6 +16,9 @@ #define TRACE DPRINT #define WARN DPRINT1 #define ERR DPRINT1 + +PCLS SystemClassList = NULL; +BOOL RegisteredSysClasses = FALSE; static struct { @@ -137,43 +122,31 @@ { PCLS Class; PPROCESSINFO pi = (PPROCESSINFO)Process; - + if (pi != NULL) { /* free all local classes */ - Class = pi->LocalClassList; + Class = pi->pclsPrivateList; while (Class != NULL) { - pi->LocalClassList = Class->pclsNext; + pi->pclsPrivateList = Class->pclsNext; ASSERT(Class->pclsBase == Class); IntDestroyClass(Class); - Class = pi->LocalClassList; + Class = pi->pclsPrivateList; } /* free all global classes */ - Class = pi->GlobalClassList; + Class = pi->pclsPublicList; while (Class != NULL) { - pi->GlobalClassList = Class->pclsNext; + pi->pclsPublicList = Class->pclsNext; ASSERT(Class->pclsBase == Class); IntDestroyClass(Class); - Class = pi->GlobalClassList; - } - - /* free all system classes */ - Class = pi->SystemClassList; - while (Class != NULL) - { - pi->SystemClassList = Class->pclsNext; - - ASSERT(Class->pclsBase == Class); - IntDestroyClass(Class); - - Class = pi->SystemClassList; + Class = pi->pclsPublicList; } } } @@ -632,11 +605,11 @@ if (BaseClass->pclsClone != NULL) { if (BaseClass->System) - PrevLink = &pi->SystemClassList; + PrevLink = &SystemClassList; else if (BaseClass->Global) - PrevLink = &pi->GlobalClassList; + PrevLink = &pi->pclsPublicList; else - PrevLink = &pi->LocalClassList; + PrevLink = &pi->pclsPrivateList; CurrentClass = *PrevLink; while (CurrentClass != BaseClass) @@ -810,19 +783,19 @@ /* check all local classes */ IntCheckDesktopClasses(Desktop, - &pi->LocalClassList, + &pi->pclsPrivateList, FreeOnFailure, &Ret); /* check all global classes */ IntCheckDesktopClasses(Desktop, - &pi->GlobalClassList, + &pi->pclsPublicList, FreeOnFailure, &Ret); /* check all system classes */ IntCheckDesktopClasses(Desktop, - &pi->SystemClassList, + &SystemClassList, FreeOnFailure, &Ret); @@ -891,6 +864,8 @@ Class->rpdeskParent = Desktop; Class->pclsBase = Class; Class->atomClassName = Atom; + + Class->CSF_flags = dwFlags; if (dwFlags & CSF_SYSTEMCLASS) { @@ -1117,7 +1092,7 @@ /* Step 1: try to find an exact match of locally registered classes */ Class = IntFindClass(Atom, hInstance, - &pi->LocalClassList, + &pi->pclsPrivateList, Link); if (Class != NULL) { @@ -1128,7 +1103,7 @@ is not relevant for global classes */ Class = IntFindClass(Atom, NULL, - &pi->GlobalClassList, + &pi->pclsPublicList, Link); if (Class != NULL) { @@ -1137,8 +1112,8 @@ /* Step 3: try to find any local class registered by user32 */ Class = IntFindClass(Atom, - pi->hModUser, - &pi->LocalClassList, + hModClient, + &pi->pclsPrivateList, Link); if (Class != NULL) { @@ -1147,8 +1122,8 @@ /* Step 4: try to find any global class registered by user32 */ Class = IntFindClass(Atom, - pi->hModUser, - &pi->GlobalClassList, + hModClient, + &pi->pclsPublicList, Link); if (Class != NULL) { @@ -1158,7 +1133,7 @@ /* Step 5: try to find a system class */ Class = IntFindClass(Atom, NULL, - &pi->SystemClassList, + &SystemClassList, Link); if (Class == NULL) { @@ -1191,7 +1166,7 @@ pti = PsGetCurrentThreadWin32Thread(); ti = GetW32ThreadInfo(); - if (ti == NULL || !ti->ppi->RegisteredSysClasses) + if (ti == NULL || !RegisteredSysClasses) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return (RTL_ATOM)0; @@ -1240,11 +1215,11 @@ /* Register the class */ if (Class->System) - List = &pi->SystemClassList; + List = &SystemClassList; else if (Class->Global) - List = &pi->GlobalClassList; + List = &pi->pclsPublicList; else - List = &pi->LocalClassList; + List = &pi->pclsPrivateList; Class->pclsNext = *List; (void)InterlockedExchangePointer((PVOID*)List, @@ -1763,7 +1738,7 @@ if (!IntSetClassMenuName(Class, Value)) { - DPRINT("Setting the class menu name failed!\n"); + DPRINT1("Setting the class menu name failed!\n"); } /* FIXME - really return NULL? Wine does so... */ @@ -1841,10 +1816,10 @@ else lpwcx->lpszMenuName = Class->MenuName; - if (Class->hModule == pi->hModUser) + if (hInstance == hModClient) lpwcx->hInstance = NULL; else - lpwcx->hInstance = Class->hModule; + lpwcx->hInstance = hInstance; lpwcx->lpszClassName = (LPCWSTR)((ULONG_PTR)Class->atomClassName); /* FIXME - return the string? */ @@ -1865,8 +1840,11 @@ PCLS Class; BOOL Ret = TRUE; - if (pi->RegisteredSysClasses || pi->hModUser == NULL) + if ( hModClient == NULL) return FALSE; + /* Init System Classes once only*/ + if (RegisteredSysClasses) + return TRUE; RtlZeroMemory(&MenuName, sizeof(MenuName)); @@ -1885,7 +1863,7 @@ wc.lpfnWndProc = SystemClasses[i].ProcW; wc.cbClsExtra = 0; wc.cbWndExtra = SystemClasses[i].ExtraBytes; - wc.hInstance = pi->hModUser; + wc.hInstance = hModClient; wc.hIcon = NULL; wc.hCursor = SystemClasses[i].hCursor; wc.hbrBackground = SystemClasses[i].hBrush; @@ -1911,8 +1889,8 @@ } ASSERT(Class->System); - Class->pclsNext = pi->SystemClassList; - (void)InterlockedExchangePointer((PVOID*)&pi->SystemClassList, + Class->pclsNext = SystemClassList; + (void)InterlockedExchangePointer((PVOID*)&SystemClassList, Class); } else @@ -1923,7 +1901,7 @@ } if (Ret) - pi->RegisteredSysClasses = TRUE; + RegisteredSysClasses = TRUE; return Ret; } @@ -2294,8 +2272,8 @@ NULL); if (ClassAtom != (RTL_ATOM)0) { - if (hInstance == NULL) - hInstance = pi->hModUser; + if (hInstance == NULL) + hInstance = hModClient; Ret = UserGetClassInfo(Class, lpWndClassEx, @@ -2313,7 +2291,8 @@ (PVOID)Class->AnsiMenuName : (PVOID)Class->MenuName); } - + // From Wine: + /* We must return the atom of the class here instead of just TRUE. */ /* Undocumented behavior! Return the class atom as a BOOL! */ Ret = (BOOL)ClassAtom; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -1122,7 +1122,7 @@ wc.lpfnWndProc = gpsi->apfnClientW.pfnDesktopWndProc; // Use User32 Desktop Proc. wc.cbClsExtra = 0; wc.cbWndExtra = 0; - wc.hInstance = pi->hModUser; // hModClient; + wc.hInstance = hModClient; wc.hIcon = NULL; wc.hCursor = NULL; wc.hbrBackground = 0; @@ -1140,8 +1140,8 @@ if (Class != NULL) { ASSERT(Class->System); - Class->pclsNext = pi->SystemClassList; - (void)InterlockedExchangePointer((PVOID*)&pi->SystemClassList, + Class->pclsNext = SystemClassList; + (void)InterlockedExchangePointer((PVOID*)&SystemClassList, Class); } else @@ -1159,7 +1159,7 @@ 100, NULL, NULL, - pi->hModUser, // hModClient; + hModClient, NULL, 0, TRUE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -366,6 +366,9 @@ { NTSTATUS Status = STATUS_SUCCESS; DPRINT("Enter NtUserInitializeClientPfnArrays User32 0x%x\n",hmodUser); + + if (ClientPfnInit) return Status; + UserEnterExclusive(); _SEH2_TRY @@ -378,6 +381,7 @@ RtlCopyMemory(&gpsi->apfnClientWorker, pfnClientWorker, sizeof(PFNCLIENTWORKER)); hModClient = hmodUser; + ClientPfnInit = TRUE; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -22,6 +22,7 @@ ATOM AtomMessage; // Window Message atom. BOOL gbInitialized; HINSTANCE hModClient = NULL; +BOOL ClientPfnInit = FALSE; /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -344,25 +344,6 @@ case ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT: RETURN( (DWORD)UserGetKeyboardLayout(Param)); - case ONEPARAM_ROUTINE_REGISTERUSERMODULE: - { - PW32THREADINFO ti; - - ti = GetW32ThreadInfo(); - if (ti == NULL) - { - DPRINT1("Cannot register user32 module instance!\n"); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN(FALSE); - } - - if (InterlockedCompareExchangePointer(&ti->ppi->hModUser, - (HINSTANCE)Param, - NULL) == NULL) - { - RETURN(TRUE); - } - } case ONEPARAM_ROUTINE_RELEASEDC: RETURN (UserReleaseDC(NULL, (HDC) Param, FALSE));

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