Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[sginsberg] 37643: - Remove blue's implicit dependency on windef.h

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Nov 25 11:11:42 2008 New Revision: 37643 URL: http://svn.reactos.org/svn/reactos?rev=37643&view=rev Log: - Remove blue's implicit dependency on windef.h Modified: trunk/reactos/drivers/setup/blue/blue.c trunk/reactos/drivers/setup/blue/blue.h trunk/reactos/drivers/setup/blue/font.c Modified: trunk/reactos/drivers/setup/blue/blue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.c?… ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.c [iso-8859-1] (original) +++ trunk/reactos/drivers/setup/blue/blue.c [iso-8859-1] Tue Nov 25 11:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: services/dd/blue/blue.c @@ -103,7 +102,7 @@ static VOID FASTCALL ScrSetRegisters(const VGA_REGISTERS *Registers) { - UINT i; + UINT32 i; /* Update misc output register */ WRITE_PORT_UCHAR(MISC, Registers->Misc); @@ -692,7 +691,7 @@ { PCONSOLE_DRAW ConsoleDraw; PUCHAR Src, Dest; - UINT SrcDelta, DestDelta, i, Offset; + UINT32 SrcDelta, DestDelta, i, Offset; ConsoleDraw = (PCONSOLE_DRAW) MmGetSystemAddressForMdl(Irp->MdlAddress); Src = (PUCHAR) (ConsoleDraw + 1); @@ -725,7 +724,7 @@ case IOCTL_CONSOLE_LOADFONT: { - UINT CodePage = (UINT)*(PULONG)Irp->AssociatedIrp.SystemBuffer; + UINT32 CodePage = (UINT32)*(PULONG)Irp->AssociatedIrp.SystemBuffer; // Upload a font for the codepage if needed ScrLoadFontTable(CodePage); Modified: trunk/reactos/drivers/setup/blue/blue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.h?… ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.h [iso-8859-1] (original) +++ trunk/reactos/drivers/setup/blue/blue.h [iso-8859-1] Tue Nov 25 11:11:42 2008 @@ -97,5 +97,5 @@ #define PELINDEX (PUCHAR)0x3c8 #define PELDATA (PUCHAR)0x3c9 -void ScrLoadFontTable(UINT CodePage); -NTSTATUS ExtractFont(UINT CodePage, PUCHAR FontBitField); +void ScrLoadFontTable(UINT32 CodePage); +NTSTATUS ExtractFont(UINT32 CodePage, PUCHAR FontBitField); Modified: trunk/reactos/drivers/setup/blue/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/font.c?… ============================================================================== --- trunk/reactos/drivers/setup/blue/font.c [iso-8859-1] (original) +++ trunk/reactos/drivers/setup/blue/font.c [iso-8859-1] Tue Nov 25 11:11:42 2008 @@ -18,15 +18,15 @@ VOID OpenBitPlane(); VOID CloseBitPlane(); -VOID LoadFont(PBYTE Bitplane, PUCHAR FontBitfield); +VOID LoadFont(PUCHAR Bitplane, PUCHAR FontBitfield); /* FUNCTIONS ****************************************************************/ VOID -ScrLoadFontTable(UINT CodePage) +ScrLoadFontTable(UINT32 CodePage) { PHYSICAL_ADDRESS BaseAddress; - PBYTE Bitplane; + PUCHAR Bitplane; PUCHAR FontBitfield = NULL; NTSTATUS Status = STATUS_SUCCESS; @@ -38,7 +38,7 @@ /* get pointer to video memory */ BaseAddress.QuadPart = BITPLANE_BASE; - Bitplane = (PBYTE)MmMapIoSpace (BaseAddress, 0xFFFF, MmNonCached); + Bitplane = (PUCHAR)MmMapIoSpace (BaseAddress, 0xFFFF, MmNonCached); Status = ExtractFont(CodePage, FontBitfield); if (NT_SUCCESS(Status)) @@ -54,7 +54,7 @@ /* PRIVATE FUNCTIONS *********************************************************/ -NTSTATUS ExtractFont(UINT CodePage, PUCHAR FontBitField) +NTSTATUS ExtractFont(UINT32 CodePage, PUCHAR FontBitField) { BOOLEAN bFoundFile = FALSE; HANDLE Handle; @@ -231,9 +231,9 @@ } VOID -LoadFont(PBYTE Bitplane, PUCHAR FontBitfield) -{ - UINT i,j; +LoadFont(PUCHAR Bitplane, PUCHAR FontBitfield) +{ + UINT32 i,j; for (i=0; i<256; i++) {

16 years, 1 month

[sginsberg] 37642: - FIX is declared in winddi.h, don't redeclare

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Nov 25 11:08:48 2008 New Revision: 37642 URL: http://svn.reactos.org/svn/reactos?rev=37642&view=rev Log: - FIX is declared in winddi.h, don't redeclare Modified: trunk/rostests/apitests/gdi32api/gdi.h Modified: trunk/rostests/apitests/gdi32api/gdi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/gdi.h?r… ============================================================================== --- trunk/rostests/apitests/gdi32api/gdi.h [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/gdi.h [iso-8859-1] Tue Nov 25 11:08:48 2008 @@ -38,15 +38,6 @@ /** Not really an object type. Forces GDI_FreeObj to be silent. */ #define GDI_OBJECT_TYPE_SILENT 0x80000000 - - -/* Number Representation */ - -typedef LONG FIX; - - - - HDC WINAPI GdiConvertBitmap(HDC hdc); HBRUSH WINAPI GdiConvertBrush(HBRUSH hbr); HDC WINAPI GdiConvertDC(HDC hdc);

16 years, 1 month

[sginsberg] 37641: - Remove Freeldr's dependency on windef.h - Explicitly include winerror.h

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Nov 25 10:55:43 2008 New Revision: 37641 URL: http://svn.reactos.org/svn/reactos?rev=37641&view=rev Log: - Remove Freeldr's dependency on windef.h - Explicitly include winerror.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/fs/iso.c trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/include/winldr.h trunk/reactos/boot/freeldr/freeldr/mm/meminit.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -25,6 +25,12 @@ #define NDEBUG #include <debug.h> +/* non-standard specifier from windef.h -- please deprecate */ +#undef PACKED +#ifdef __GNUC__ +#define PACKED __attribute__((packed)) +#endif + typedef struct { UCHAR Signature[4]; // (ret) signature ("VESA") Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -21,6 +21,12 @@ #define NDEBUG #include <debug.h> + +/* non-standard specifier from windef.h -- please deprecate */ +#undef PACKED +#ifdef __GNUC__ +#define PACKED __attribute__((packed)) +#endif typedef struct { Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -21,6 +21,12 @@ #define NDEBUG #include <debug.h> + +/* non-standard specifier from windef.h -- please deprecate */ +#undef PACKED +#ifdef __GNUC__ +#define PACKED __attribute__((packed)) +#endif #define VIDEOPORT_PALETTE_READ 0x03C7 #define VIDEOPORT_PALETTE_WRITE 0x03C8 Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -182,7 +182,7 @@ */ BOOLEAN Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer) { - UINT i; + UINT32 i; ULONG NumberOfPathParts; CHAR PathPart[261]; PVOID DirectoryBuffer; Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -784,7 +784,7 @@ */ BOOLEAN FatLookupFile(PCSTR FileName, PFAT_FILE_INFO FatFileInfoPointer) { - UINT i; + UINT32 i; ULONG NumberOfPathParts; CHAR PathPart[261]; PVOID DirectoryBuffer; @@ -922,9 +922,9 @@ BOOLEAN FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer) { ULONG fat = 0; - UINT FatOffset; - UINT ThisFatSecNum; - UINT ThisFatEntOffset; + UINT32 FatOffset; + UINT32 ThisFatSecNum; + UINT32 ThisFatEntOffset; DbgPrint((DPRINT_FILESYSTEM, "FatGetFatEntry() Retrieving FAT entry for cluster %d.\n", Cluster)); Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/is… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/iso.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/iso.c [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -172,7 +172,7 @@ */ static BOOLEAN IsoLookupFile(PCSTR FileName, PISO_FILE_INFO IsoFileInfoPointer) { - UINT i; + UINT32 i; ULONG NumberOfPathParts; CHAR PathPart[261]; PVOID DirectoryBuffer; Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -84,6 +84,7 @@ #include <ver.h> #include <cmdline.h> #include <bget.h> +#include <winerror.h> /* Needed by boot manager */ #include <bootmgr.h> #include <oslist.h> Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -27,7 +27,7 @@ // ReactOS Loading Functions // /////////////////////////////////////////////////////////////////////////////////////// -VOID LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion); +VOID LoadAndBootWindows(PCSTR OperatingSystemName, USHORT OperatingSystemVersion); /* Entry-point to kernel */ typedef VOID (NTAPI *KERNEL_ENTRY_POINT) (PLOADER_PARAMETER_BLOCK LoaderBlock); Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -476,8 +476,8 @@ VOID MmFixupSystemMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG* MapCount) { - UINT Index; - UINT Index2; + UINT32 Index; + UINT32 Index2; // Loop through each entry in the array for (Index=0; Index<*MapCount; Index++) Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -77,7 +77,7 @@ PCHAR Options, PCHAR SystemPath, PCHAR BootPath, - WORD VersionToBoot) + USHORT VersionToBoot) { /* Examples of correct options and paths */ //CHAR Options[] = "/DEBUGPORT=COM1 /BAUDRATE=115200"; @@ -417,7 +417,7 @@ VOID -LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion) +LoadAndBootWindows(PCSTR OperatingSystemName, USHORT OperatingSystemVersion) { CHAR MsgBuffer[256]; CHAR SystemPath[512], SearchPath[512];

16 years, 1 month

[gschneider] 37640: - Enhance test with icon drawing - Tests some configurations of DrawIcon and DrawIconEx, highlighting another problem in 32bpp - Reference TransparentBlt and AlphaBlend directly

by gschneider＠svn.reactos.org

Author: gschneider Date: Tue Nov 25 10:50:25 2008 New Revision: 37640 URL: http://svn.reactos.org/svn/reactos?rev=37640&view=rev Log: - Enhance test with icon drawing - Tests some configurations of DrawIcon and DrawIconEx, highlighting another problem in 32bpp - Reference TransparentBlt and AlphaBlend directly Added: trunk/rostests/dibtests/vbltest/test_inv32.ico (with props) Modified: trunk/rostests/dibtests/vbltest/vbltest.c trunk/rostests/dibtests/vbltest/vbltest.rbuild trunk/rostests/dibtests/vbltest/vbltest.rc Added: trunk/rostests/dibtests/vbltest/test_inv32.ico URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/vbltest/test_inv… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/dibtests/vbltest/test_inv32.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/rostests/dibtests/vbltest/vbltest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/vbltest/vbltest.… ============================================================================== --- trunk/rostests/dibtests/vbltest/vbltest.c [iso-8859-1] (original) +++ trunk/rostests/dibtests/vbltest/vbltest.c [iso-8859-1] Tue Nov 25 10:50:25 2008 @@ -8,7 +8,18 @@ #include <windows.h> #include <tchar.h> +BOOL WINAPI GdiAlphaBlend( + HDC hdcDst, int xDst, int yDst, int wDst, int hDst, + HDC hdcSrc, int xSrc, int ySrc, int wSrc, int hSrc, + BLENDFUNCTION blendFunction); + +BOOL WINAPI GdiTransparentBlt( + HDC hdcDst, int xDst, int yDst, int wDst, int hDst, + HDC hdcSrc, int xSrc, int ySrc, int wSrc, int hSrc, + UINT crTransparent); + #define CURRENT_BMPS 4 +#define CURRENT_ICONS 1 #define SCALE 1.5 #define OFFSET 5 @@ -19,6 +30,7 @@ WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { static HBITMAP hbmList[CURRENT_BMPS]; + static HICON hicList[CURRENT_ICONS]; switch (message) { @@ -28,6 +40,7 @@ hbmList[1] = (HBITMAP)LoadImage(hInst, MAKEINTRESOURCE(400), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); hbmList[2] = (HBITMAP)LoadImage(hInst, MAKEINTRESOURCE(800), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); hbmList[3] = (HBITMAP)LoadImage(hInst, MAKEINTRESOURCE(2400), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + hicList[0] = (HICON)LoadIcon(hInst, MAKEINTRESOURCE(3200)); break; } @@ -38,7 +51,6 @@ BITMAP bitmap; BLENDFUNCTION bfunc; int x = 0, y = 0, i; - hdc = BeginPaint(hWnd, &ps); hdcMem = CreateCompatibleDC(hdc); @@ -47,6 +59,7 @@ bfunc.BlendOp = AC_SRC_OVER; bfunc.SourceConstantAlpha = 128; + /* bitmaps */ for(i = 0; i < CURRENT_BMPS; i++) { y = 0; @@ -66,19 +79,47 @@ y += bitmap.bmHeight*SCALE + OFFSET; /* transparent blt, transparency: grey */ - TransparentBlt(hdc, x, y, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, 128*256*256+128*256+128); + GdiTransparentBlt(hdc, x, y, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, 128*256*256+128*256+128); y += bitmap.bmHeight + OFFSET; /* transparent blt, transparency: grey, scaled */ - TransparentBlt(hdc, x, y, bitmap.bmWidth*SCALE, bitmap.bmHeight*SCALE, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, 128*256*256+128*256+128); + GdiTransparentBlt(hdc, x, y, bitmap.bmWidth*SCALE, bitmap.bmHeight*SCALE, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, 128*256*256+128*256+128); y += bitmap.bmHeight*SCALE + OFFSET; - + /* alpha blend, org size */ - AlphaBlend(hdc, x, y, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, bfunc); + GdiAlphaBlend(hdc, x, y, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, bfunc); y += bitmap.bmHeight + OFFSET; /* alpha blend, scaled */ - AlphaBlend(hdc, x, y, bitmap.bmWidth*SCALE, bitmap.bmHeight*SCALE, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, bfunc); + GdiAlphaBlend(hdc, x, y, bitmap.bmWidth*SCALE, bitmap.bmHeight*SCALE, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, bfunc); + y += bitmap.bmHeight*SCALE + OFFSET; + + x += bitmap.bmWidth*SCALE + OFFSET; + } + + /* icons */ + for(i = 0; i < CURRENT_ICONS; i++) + { + y = 0; + /* pure icon */ + DrawIcon(hdc, x, y, hicList[i]); + y += bitmap.bmHeight + OFFSET; + + /* normal icon using Ex */ + DrawIconEx(hdc, x, y, hicList[i], 0, 0, 0, NULL, DI_NORMAL); + y += bitmap.bmHeight + OFFSET; + + /* normal icon using Ex with bigger size */ + DrawIconEx(hdc, x, y, hicList[i], bitmap.bmWidth, bitmap.bmHeight, 0, NULL, DI_NORMAL); + y += bitmap.bmHeight + OFFSET; + + /* only icon using Ex */ + DrawIconEx(hdc, x, y, hicList[i], 0, 0, 0, NULL, DI_IMAGE); + y += bitmap.bmHeight + OFFSET; + + /* mask using Ex */ + DrawIconEx(hdc, x, y, hicList[i], 0, 0, 0, NULL, DI_MASK); + y += bitmap.bmHeight + OFFSET; x += bitmap.bmWidth*SCALE + OFFSET; } Modified: trunk/rostests/dibtests/vbltest/vbltest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/vbltest/vbltest.… ============================================================================== --- trunk/rostests/dibtests/vbltest/vbltest.rbuild [iso-8859-1] (original) +++ trunk/rostests/dibtests/vbltest/vbltest.rbuild [iso-8859-1] Tue Nov 25 10:50:25 2008 @@ -2,9 +2,8 @@ <define name="__USE_W32API" /> <include base="vbltest">.</include> <library>kernel32</library> + <library>user32</library> <library>gdi32</library> - <library>user32</library> - <library>msimg32</library> <file>vbltest.c</file> <file>vbltest.rc</file> </module> Modified: trunk/rostests/dibtests/vbltest/vbltest.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/vbltest/vbltest.… ============================================================================== --- trunk/rostests/dibtests/vbltest/vbltest.rc [iso-8859-1] (original) +++ trunk/rostests/dibtests/vbltest/vbltest.rc [iso-8859-1] Tue Nov 25 10:50:25 2008 @@ -2,3 +2,5 @@ 400 BITMAP "test_inv04.bmp" 800 BITMAP "test_inv08.bmp" 2400 BITMAP "test_inv24.bmp" +3200 ICON "test_inv32.ico" +

16 years, 1 month

[dreimer] 37639: God. I hate Batch Hacks soo much.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Nov 25 10:43:42 2008 New Revision: 37639 URL: http://svn.reactos.org/svn/reactos?rev=37639&view=rev Log: God. I hate Batch Hacks soo much. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Tue Nov 25 10:43:42 2008 @@ -85,15 +85,17 @@ # # First check for a new Updater. # -$_ROSBE_UPDDATE = get-content update.ps1 +rename-item update.ps1 update2.ps1 &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/update.ps1 2>&1> $null -$_ROSBE_UPDDATE = get-content update.ps1 -if ($_ROSBE_UPDDATE -ne $_ROSBE_UPDDATE2) { +if ((gi .\update.ps1).LastWriteTime -gt (gi .\update2.ps1).LastWriteTime) { clear-host "Updater got updated and needs to be restarted." + remove-item update2.ps1 -force EOC +} else { + remove-item update.ps1 -force + rename-item update2.ps1 update.ps1 } - # # Get to the Updates Subfolder. #

16 years, 1 month

[fireball] 37638: - Fix weird code in RtlGetVersion (inspired by Coverity ID 1355 and Daniel's patch in bug 3906). See issue #3906 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Nov 25 10:31:07 2008 New Revision: 37638 URL: http://svn.reactos.org/svn/reactos?rev=37638&view=rev Log: - Fix weird code in RtlGetVersion (inspired by Coverity ID 1355 and Daniel's patch in bug 3906). See issue #3906 for more details. Modified: trunk/reactos/dll/ntdll/rtl/version.c trunk/reactos/ntoskrnl/rtl/misc.c Modified: trunk/reactos/dll/ntdll/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/version.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] Tue Nov 25 10:31:07 2008 @@ -104,6 +104,8 @@ NTSTATUS NTAPI RtlGetVersion(RTL_OSVERSIONINFOW *Info) { + ULONG i, MaxLength; + if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) || Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) { @@ -113,17 +115,19 @@ Info->dwMinorVersion = Peb->OSMinorVersion; Info->dwBuildNumber = Peb->OSBuildNumber; Info->dwPlatformId = Peb->OSPlatformId; + RtlZeroMemory(Info->szCSDVersion, sizeof(Info->szCSDVersion)); if(((Peb->OSCSDVersion >> 8) & 0xFF) != 0) { - int i = _snwprintf(Info->szCSDVersion, - (sizeof(Info->szCSDVersion) / sizeof(Info->szCSDVersion[0])) - 1, - L"Service Pack %d", - ((Peb->OSCSDVersion >> 8) & 0xFF)); - Info->szCSDVersion[i] = L'\0'; - } - else - { - RtlZeroMemory(Info->szCSDVersion, sizeof(Info->szCSDVersion)); + MaxLength = (sizeof(Info->szCSDVersion) / sizeof(Info->szCSDVersion[0])) - 1; + i = _snwprintf(Info->szCSDVersion, + MaxLength, + L"Service Pack %d", + ((Peb->OSCSDVersion >> 8) & 0xFF)); + if (i < 0) + { + /* null-terminate if it was overflowed */ + Info->szCSDVersion[MaxLength] = L'\0'; + } } if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) { Modified: trunk/reactos/ntoskrnl/rtl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/misc.c?rev=37… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] Tue Nov 25 10:31:07 2008 @@ -39,6 +39,7 @@ NTSTATUS STDCALL RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation) { + ULONG i, MaxLength; if (lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) || lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) { @@ -46,17 +47,19 @@ lpVersionInformation->dwMinorVersion = NtMinorVersion; lpVersionInformation->dwBuildNumber = NtBuildNumber; lpVersionInformation->dwPlatformId = VER_PLATFORM_WIN32_NT; + RtlZeroMemory(lpVersionInformation->szCSDVersion, sizeof(lpVersionInformation->szCSDVersion)); if(((CmNtCSDVersion >> 8) & 0xFF) != 0) { - int i = _snwprintf(lpVersionInformation->szCSDVersion, - (sizeof(lpVersionInformation->szCSDVersion) / sizeof(lpVersionInformation->szCSDVersion[0])) - 1, - L"Service Pack %d", - ((CmNtCSDVersion >> 8) & 0xFF)); - lpVersionInformation->szCSDVersion[i] = L'\0'; - } - else - { - RtlZeroMemory(lpVersionInformation->szCSDVersion, sizeof(lpVersionInformation->szCSDVersion)); + MaxLength = (sizeof(lpVersionInformation->szCSDVersion) / sizeof(lpVersionInformation->szCSDVersion[0])) - 1; + i = _snwprintf(lpVersionInformation->szCSDVersion, + MaxLength, + L"Service Pack %d", + ((CmNtCSDVersion >> 8) & 0xFF)); + if (i < 0) + { + /* null-terminate if it was overflowed */ + lpVersionInformation->szCSDVersion[MaxLength] = L'\0'; + } } if (lpVersionInformation->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW)) {

16 years, 1 month

[dreimer] 37637: oops

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Nov 25 09:57:55 2008 New Revision: 37637 URL: http://svn.reactos.org/svn/reactos?rev=37637&view=rev Log: oops Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Tue Nov 25 09:57:55 2008 @@ -89,9 +89,9 @@ &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/update.ps1 2>&1> $null $_ROSBE_UPDDATE = get-content update.ps1 if ($_ROSBE_UPDDATE -ne $_ROSBE_UPDDATE2) { - # clear-host + clear-host "Updater got updated and needs to be restarted." - # EOC + EOC } #

16 years, 1 month

[fireball] 37636: Daniel Zimmerman - First check for NULL before reference a member in it. See issue #3907 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Nov 25 09:57:03 2008 New Revision: 37636 URL: http://svn.reactos.org/svn/reactos?rev=37636&view=rev Log: Daniel Zimmerman - First check for NULL before reference a member in it. See issue #3907 for more details. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c [iso-8859-1] Tue Nov 25 09:57:03 2008 @@ -1428,9 +1428,10 @@ if (old_irql < DISPATCH_LEVEL) KeRaiseIrql(DISPATCH_LEVEL, &old_irql); - pdev = purb->pdev; if (purb == NULL) goto LBL_LOWER_IRQL; + + pdev = purb->pdev; if (pdev == NULL) goto LBL_LOWER_IRQL;

16 years, 1 month

[dreimer] 37635: OK, now the PS Port "should" work.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Nov 25 09:51:16 2008 New Revision: 37635 URL: http://svn.reactos.org/svn/reactos?rev=37635&view=rev Log: OK, now the PS Port "should" work. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Tue Nov 25 09:51:16 2008 @@ -21,11 +21,13 @@ } function UPDCHECK { + set-location "$ENV:APPDATA\RosBE\Updates" + if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { - break + return } if (!(Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { - IEX "'$_ROSBE_BASEDIR\Tools\wget.exe' -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" + &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt 2>&1> $null } if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { get-Content "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" @@ -34,67 +36,32 @@ $YESNO = Read-Host "(yes), (no)" if ($YESNO -eq "yes") { if (!(Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z")) { - IEX "&'$_ROSBE_BASEDIR\Tools\wget.exe' -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z" + &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z 2>&1> $null } if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z") { - remove-item "$_ROSBE_VERSION-$_ROSBE_STATCOUNT\*.*" -force + remove-item "$_ROSBE_VERSION-$_ROSBE_STATCOUNT\*.*" -force -EA SilentlyContinue IEX "&'$_ROSBE_BASEDIR\Tools\7z.exe' x '$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z'" set-location "$_ROSBE_VERSION-$_ROSBE_STATCOUNT" - "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.ps1" - break + IEX "& .\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.ps1" + return } else { "ERROR: This Update does not seem to exist or the Internet connection is not working correctly." - break + return } } elseif ($YESNO -eq "no") { "Do you want to be asked again to install this update?" $YESNO = Read-Host "(yes), (no)" if ($YESNO -eq "yes") { - remove-item "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" -force + remove-item "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" -force -EA SilentlyContinue } - break + return } } else { if ($_ROSBE_MULTIUPD -ne "1") { "ERROR: This Update does not seem to exist or the Internet connection is not working correctly." - break + return } } -} - -function STATUS { - set-location tmp - if (!(Test-path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { - IEX "&'$_ROSBE_BASEDIR\Tools\wget.exe' -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" - if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { - $_ROSBE_UPDATES = "$_ROSBE_UPDATES $_ROSBE_STATCOUNT" - } - } - set-loaction .. -} - -function UPDINFO { - set-location tmp - if (!(Test-path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { - IEX "&'$_ROSBE_BASEDIR\Tools\wget.exe' -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" - if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { - get-content "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" - } else { - "ERROR: This Update does not seem to exist or the Internet connection is not working correctly." - } - } - set-location .. - remove-item "tmp\*.*" -force -} - -function UPDFIN { - remove-item "tmp\*.*" -force - if ($_ROSBE_UPDATES -ne $null) { - "Following Updates available: $_ROSBE_UPDATES" - } else { - "RosBE is up to Date." - } - EOC } # @@ -107,24 +74,24 @@ # $_ROSBE_OPATH = "$pwd" -if (Test-Path "$_ROSBE_BASEDIR\Tools\7z.exe") { +if (!(Test-Path "$_ROSBE_BASEDIR\Tools\7z.exe")) { set-location "$_ROSBE_BASEDIR\Tools" - IEX "& wget.exe -N --ignore-length --no-verbose $_ROSBE_URL/7z.exe" + &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/7z.exe 2>&1> $null set-location $_ROSBE_OPATH } set-location $_ROSBE_BASEDIR # -# First check for a new Updater +# First check for a new Updater. # $_ROSBE_UPDDATE = get-content update.ps1 -IEX "$'Tools\wget.exe' -N --ignore-length --no-verbose $_ROSBE_URL/update.ps1" +&"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/update.ps1 2>&1> $null $_ROSBE_UPDDATE = get-content update.ps1 if ($_ROSBE_UPDDATE -ne $_ROSBE_UPDDATE2) { # clear-host "Updater got updated and needs to be restarted." - EOC + # EOC } # @@ -139,62 +106,63 @@ if ("$args" -eq "") { $_ROSBE_MULTIUPD = 1 $_ROSBE_STATCOUNT = 1 - UPDCHECK - $_ROSBE_STATCOUNT += 1 - UPDCHECK - $_ROSBE_STATCOUNT += 1 - UPDCHECK - $_ROSBE_STATCOUNT += 1 - UPDCHECK - $_ROSBE_STATCOUNT += 1 - UPDCHECK - $_ROSBE_STATCOUNT += 1 - UPDCHECK - $_ROSBE_STATCOUNT += 1 - UPDCHECK - $_ROSBE_STATCOUNT += 1 - UPDCHECK - $_ROSBE_STATCOUNT += 1 + while ($_ROSBE_STATCOUNT -lt 10) { + UPDCHECK + $_ROSBE_STATCOUNT += 1 + } + EOC +} +if ("$args" -eq "reset") { + remove-item "$ENV:APPDATA\RosBE\Updates\*.*" -force -recurse -EA SilentlyContinue + remove-item "$ENV:APPDATA\RosBE\Updates\tmp\*.*" -force -recurse -EA SilentlyContinue + EOC +} +$arg1 = $args[0] +$arg2 = $args[1] +if ("$arg1" -eq "nr") { + $_ROSBE_STATCOUNT = $arg2 UPDCHECK EOC } -if ("$args" -eq "reset") { - remove-item "$ENV:APPDATA\RosBE\Updates\*.*" -force - remove-item "$ENV:APPDATA\RosBE\Updates\tmp\*.*" -force +if ("$arg1" -eq "info") { + $_ROSBE_STATCOUNT = $arg2 + set-location tmp + if (!(Test-path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { + &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt 2>&1> $null + if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { + get-content "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" + } else { + "ERROR: This Update does not seem to exist or the Internet connection is not working correctly." + } + } + set-location .. + remove-item "tmp\*.*" -force -EA SilentlyContinue EOC } -if ("$args[0]" -eq "nr") { - $_ROSBE_STATCOUNT = $args[1] - UPDCHECK +$arg1 = $null +$arg2 = $null +if ("$args" -eq "status") { + $_ROSBE_STATCOUNT = 1 + if (!(test-path "tmp")) {New-Item -name "tmp" -type directory} + copy-item *.txt .\tmp\. + set-location tmp + while($_ROSBE_STATCOUNT -lt 10) { + if (!(Test-path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { + &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt 2>&1> $null + if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { + $_ROSBE_UPDATES += "$_ROSBE_STATCOUNT " + } + } + $_ROSBE_STATCOUNT += 1 + } + set-location .. + remove-item "tmp\*.*" -force -EA SilentlyContinue + if ($_ROSBE_UPDATES -ne $null) { + "Following Updates available: $_ROSBE_UPDATES" + } else { + "RosBE is up to Date." + } EOC -} -if ("$args[0]" -eq "info") { - $_ROSBE_STATCOUNT = $args[1] - UPDINFO - EOC -} -if ("$args" -eq "status") { - if (!(test-path "tmp")) {New-Item -name "Updates" -type directory} - copy-item *.txt .\tmp\. - $_ROSBE_STATCOUNT = 1 - STATUS - $_ROSBE_STATCOUNT += 1 - STATUS - $_ROSBE_STATCOUNT += 1 - STATUS - $_ROSBE_STATCOUNT += 1 - STATUS - $_ROSBE_STATCOUNT += 1 - STATUS - $_ROSBE_STATCOUNT += 1 - STATUS - $_ROSBE_STATCOUNT += 1 - STATUS - $_ROSBE_STATCOUNT += 1 - STATUS - $_ROSBE_STATCOUNT += 1 - STATUS - UPDFIN } if ("$args" -ne "") { "Unknown parameter specified. Try 'help update'." @@ -207,4 +175,4 @@ $_ROSBE_UPDATES = $null $_ROSBE_UPDDATE2 = $null $_ROSBE_MULTIUPD = $null -$_ROSBE_STATCOUNT = $null +$_ROSBE_STATCOUNT = $null Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Tue Nov 25 09:51:16 2008 @@ -131,7 +131,7 @@ if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( - set _ROSBE_UPDATES=%_ROSBE_UPDATES% %_ROSBE_STATCOUNT% + set _ROSBE_UPDATES=%_ROSBE_UPDATES% %_ROSBE_STATCOUNT% ) ) cd.. @@ -164,6 +164,8 @@ goto :EOC :UPDCHECK + +cd /d "%APPDATA%\RosBE\Updates" if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( goto :EOF @@ -221,4 +223,4 @@ set _ROSBE_UPDATES= set _ROSBE_UPDDATE2= set _ROSBE_MULTIUPD= -set _ROSBE_STATCOUNT= +set _ROSBE_STATCOUNT=

16 years, 1 month

[fireball] 37634: Daniel Zimmerman - Check pdev and purb for NULL before accessing them. Resolves CID 764 and 763. See issue #3908 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Nov 25 09:51:09 2008 New Revision: 37634 URL: http://svn.reactos.org/svn/reactos?rev=37634&view=rev Log: Daniel Zimmerman - Check pdev and purb for NULL before accessing them. Resolves CID 764 and 763. See issue #3908 for more details. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Tue Nov 25 09:51:09 2008 @@ -698,6 +698,8 @@ pdev = uhci_create_device(drvr_obj, dev_mgr); + if (pdev == NULL) + return pdev; pdev_ext = pdev->DeviceExtension; pdev_ext->pci_addr = bus_addr; @@ -706,9 +708,6 @@ slot_num.u.AsULONG = 0; slot_num.u.bits.DeviceNumber = ((bus_addr & 0xff) >> 3); slot_num.u.bits.FunctionNumber = (bus_addr & 0x07); - - if (pdev == NULL) - return pdev; //now create adapter object RtlZeroMemory(&dev_desc, sizeof(dev_desc)); @@ -3122,9 +3121,10 @@ if (old_irql < DISPATCH_LEVEL) KeRaiseIrql(DISPATCH_LEVEL, &old_irql); - pdev = purb->pdev; if (purb == NULL) return; + + pdev = purb->pdev; if (pdev == NULL) return;

16 years, 1 month

← Newer
1
...
12
13
14
15
16
17
18
...
66
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008