Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[navaraf] 13895: Fix failure case in IoConnectInterrupt. (Now really)
by navaraf＠svn.reactos.com 08 Mar '05

08 Mar '05

Fix failure case in IoConnectInterrupt. (Now really) Modified: trunk/reactos/ntoskrnl/io/irq.c _____ Modified: trunk/reactos/ntoskrnl/io/irq.c --- trunk/reactos/ntoskrnl/io/irq.c 2005-03-08 23:10:38 UTC (rev 13894) +++ trunk/reactos/ntoskrnl/io/irq.c 2005-03-08 23:15:34 UTC (rev 13895) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -121,7 +121,10 @@ { for (i = 0; i < count; i++) { - KeDisconnectInterrupt(&Interrupt[i]); + if (ProcessorEnableMask & (1 << i)) + { + KeDisconnectInterrupt(&Interrupt[i]); + } } ExFreePool(Interrupt); return STATUS_INVALID_PARAMETER;

1 0

[navaraf] 13894: Fix failure case in IoConnectInterrupt.
by navaraf＠svn.reactos.com 08 Mar '05

08 Mar '05

Fix failure case in IoConnectInterrupt. Modified: trunk/reactos/ntoskrnl/io/driver.c _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-03-08 23:07:10 UTC (rev 13893) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-03-08 23:10:38 UTC (rev 13894) @@ -1252,11 +1252,12 @@ */ for (i = 1; i < KeLoaderBlock.ModsCount; i++) { - MiFreeBootDriverMemory((PVOID)KeLoaderModules[i].ModStart, KeLoaderModules[i].ModEnd - KeLoaderModules[i].ModStart); } + KeLoaderBlock.ModsCount = 0; + if (BootDriverCount == 0) { DbgPrint("No boot drivers available.\n");

2 1

[arty] 13893: Last fix due to w3seek. I will stop working on this stuff until I have
by arty＠svn.reactos.com 08 Mar '05

08 Mar '05

Last fix due to w3seek. I will stop working on this stuff until I have time to be thorough. Modified: trunk/reactos/lib/rosrtl/misc/intrlck.c _____ Modified: trunk/reactos/lib/rosrtl/misc/intrlck.c --- trunk/reactos/lib/rosrtl/misc/intrlck.c 2005-03-08 23:01:54 UTC (rev 13892) +++ trunk/reactos/lib/rosrtl/misc/intrlck.c 2005-03-08 23:07:10 UTC (rev 13893) @@ -136,8 +136,9 @@ "lock\n\txchgl %0,(%1)" :"=r" (ret):"r" (target), "0" (value):"memory" ); #elif defined(_M_PPC) - ret = *(volatile LONG *)target; - while( InterlockedCompareExchange( target, value, ret ) != ret ); + do { + ret = *(volatile LONG *)target; + } while( InterlockedCompareExchange( target, value, ret ) != ret ); #endif return ret; }

1 0

[arty] 13892: Fixes by w3seek regarding interlocked functions. These were due to my
by arty＠svn.reactos.com 08 Mar '05

08 Mar '05

Fixes by w3seek regarding interlocked functions. These were due to my missing a mismatch between the glib functions and windows variants. Modified: trunk/reactos/lib/rosrtl/misc/intrlck.c _____ Modified: trunk/reactos/lib/rosrtl/misc/intrlck.c --- trunk/reactos/lib/rosrtl/misc/intrlck.c 2005-03-08 22:41:27 UTC (rev 13891) +++ trunk/reactos/lib/rosrtl/misc/intrlck.c 2005-03-08 23:01:54 UTC (rev 13892) @@ -136,8 +136,8 @@ "lock\n\txchgl %0,(%1)" :"=r" (ret):"r" (target), "0" (value):"memory" ); #elif defined(_M_PPC) - ret = *target; - while( InterlockedCompareExchange( target, value, ret ) != value ); + ret = *(volatile LONG *)target; + while( InterlockedCompareExchange( target, value, ret ) != ret ); #endif return ret; } @@ -202,9 +202,11 @@ :"r" (Addend), "0" (Increment) :"memory" ); #elif defined(_M_PPC) - do - ret = *Addend; - while (!InterlockedCompareExchange(Addend, ret, ret + Increment)); + LONG newval; + do { + ret = *(volatile LONG *)Addend; + newval = ret + Increment; + } while (InterlockedCompareExchange(Addend, ret, newval) != ret); #endif return ret; }

1 0

[ea] 13891: Refresh RC script for PSX bare sh.
by ea＠svn.reactos.com 08 Mar '05

08 Mar '05

Refresh RC script for PSX bare sh. Modified: trunk/posix/apps/baresh/baresh.rc _____ Modified: trunk/posix/apps/baresh/baresh.rc --- trunk/posix/apps/baresh/baresh.rc 2005-03-08 22:39:53 UTC (rev 13890) +++ trunk/posix/apps/baresh/baresh.rc 2005-03-08 22:41:27 UTC (rev 13891) @@ -1,38 +1,4 @@ -#include <defines.h> -#include <reactos/resource.h> - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -VS_VERSION_INFO VERSIONINFO - FILEVERSION RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUI LD - PRODUCTVERSION RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUI LD - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", RES_STR_COMPANY_NAME - VALUE "FileDescription", "Bare sh for POSIX+\0" - VALUE "FileVersion", RES_STR_FILE_VERSION - VALUE "InternalName", "sh\0" - VALUE "LegalCopyright", RES_STR_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "sh\0" - VALUE "ProductName", RES_STR_PRODUCT_NAME - VALUE "ProductVersion", RES_STR_PRODUCT_VERSION - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - +#define REACTOS_STR_FILE_DESCRIPTION "Bare sh for ReactOS POSIX Subsystem\0" +#define REACTOS_STR_INTERNAL_NAME "sh\0" +#define REACTOS_STR_ORIGINAL_FILENAME "sh\0" +#include <reactos/version.rc>

1 0

[arty] 13890: Added PowerPC interlocked functions from glib.
by arty＠svn.reactos.com 08 Mar '05

08 Mar '05

Added PowerPC interlocked functions from glib. Modified: trunk/reactos/lib/rosrtl/misc/intrlck.c _____ Modified: trunk/reactos/lib/rosrtl/misc/intrlck.c --- trunk/reactos/lib/rosrtl/misc/intrlck.c 2005-03-08 21:02:50 UTC (rev 13889) +++ trunk/reactos/lib/rosrtl/misc/intrlck.c 2005-03-08 22:39:53 UTC (rev 13890) @@ -15,6 +15,29 @@ * Copied from kernel32 */ +/* PowerPC Functions from gatomic.c in glib + * + * GLIB - Library of useful routines for C programming + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * + * g_atomic_*: atomic operations. + * Copyright (C) 2003 Sebastian Wilhelmi + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ /*********************************************************************** * * InterlockedIncrement * @@ -36,6 +59,7 @@ InterlockedIncrement(PLONG Addend) { long ret = 0; +#ifdef _M_IX86 __asm__ ( "\tlock\n" /* for SMP systems */ @@ -48,6 +72,10 @@ "2:\n" :"=r" (ret):"r" (Addend), "0" (0): "memory" ); +#elif defined(_M_PPC) + ret = *Addend; + ret = InterlockedExchangeAdd( Addend, ret + 1 ); +#endif return ret; } @@ -67,6 +95,7 @@ InterlockedDecrement(LPLONG lpAddend) { long ret; +#ifdef _M_IX86 __asm__ ( "\tlock\n" /* for SMP systems */ @@ -79,6 +108,10 @@ "2:\n" :"=r" (ret):"r" (lpAddend), "0" (0): "memory" ); +#elif defined(_M_PPC) + ret = *lpAddend; + ret = InterlockedExchangeAdd( lpAddend, ret - 1 ); +#endif return ret; @@ -97,14 +130,16 @@ STDCALL InterlockedExchange(LPLONG target, LONG value ) { - long ret; +#ifdef _M_IX86 __asm__ ( /* lock for SMP systems */ "lock\n\txchgl %0,(%1)" :"=r" (ret):"r" (target), "0" (value):"memory" ); +#elif defined(_M_PPC) + ret = *target; + while( InterlockedCompareExchange( target, value, ret ) != value ); +#endif return ret; - - } /*********************************************************************** * @@ -124,8 +159,21 @@ LONG Comperand ) { LONG ret; +#ifdef _M_IX86 __asm__ __volatile__( "lock; cmpxchgl %2,(%1)" : "=a" (ret) : "r" (Destination), "r" (Exchange), "0" (Comperand) : "memory" ); +#elif defined(_M_PPC) + __asm__ __volatile__ ("sync\n" + "1: lwarx %0,0,%1\n" + " subf. %0,%2,%0\n" + " bne 2f\n" + " stwcx. %3,0,%1\n" + " bne- 1b\n" + "2: isync" + : "=&r" (ret) + : "b" (Destination), "r" (Comperand), "r" (Exchange) + : "cr0", "memory"); +#endif return ret; } @@ -145,14 +193,18 @@ LONG Increment ) { - LONG ret; +#ifdef _M_IX86 __asm__ ( /* lock for SMP systems */ "lock\n\t" "xaddl %0,(%1)" :"=r" (ret) :"r" (Addend), "0" (Increment) :"memory" ); +#elif defined(_M_PPC) + do + ret = *Addend; + while (!InterlockedCompareExchange(Addend, ret, ret + Increment)); +#endif return ret; - }

1 0

[royce] 13889: adjust newlines around rsym command
by royce＠svn.reactos.com 08 Mar '05

08 Mar '05

adjust newlines around rsym command Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-08 20:50:42 UTC (rev 13888) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-08 21:02:50 UTC (rev 13889) @@ -332,17 +332,17 @@ string path = "tools" SSEP "rbuild" SSEP "backend" SSEP "mingw" SSEP "pch_detection.h"; system ( ssprintf("gcc -c %s", path.c_str()).c_str() ); path += ".gch"; + + FILE* f = fopen ( path.c_str(), "rb" ); + if ( f ) { - FILE* f = fopen ( path.c_str(), "rb" ); - if ( f ) - { - use_pch = true; - fclose(f); - unlink ( path.c_str() ); - } - else - use_pch = false; + use_pch = true; + fclose(f); + unlink ( path.c_str() ); } + else + use_pch = false; + // TODO FIXME - eventually check for ROS_USE_PCH env var and // allow that to override use_pch if true } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-08 20:50:42 UTC (rev 13888) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-08 21:02:50 UTC (rev 13889) @@ -857,7 +857,7 @@ else { fprintf ( fMakefile, - "\t%s %s -o %s %s %s %s\n\n", + "\t%s %s -o %s %s %s %s\n", linker.c_str (), linkerParameters.c_str (), target.c_str (), @@ -867,7 +867,7 @@ } fprintf ( fMakefile, - "\t${rsym} %s %s\n", + "\t${rsym} %s %s\n\n", target.c_str (), target.c_str () ); } @@ -1405,10 +1405,10 @@ objectsMacro.c_str (), importLibraryDependencies.c_str () ); fprintf ( fMakefile, - "\t${rm} %s\n\n", + "\t${rm} %s\n", temp_exp.c_str () ); fprintf ( fMakefile, - "\t${rsym} %s %s\n", + "\t${rsym} %s %s\n\n", target.c_str (), target.c_str () ); }

1 0

[royce] 13888: add newline at EOF to suppress warning
by royce＠svn.reactos.com 08 Mar '05

08 Mar '05

add newline at EOF to suppress warning Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/pch_detection .h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/pch_detection .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/pch_detection .h 2005-03-08 20:40:35 UTC (rev 13887) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/pch_detection .h 2005-03-08 20:50:42 UTC (rev 13888) @@ -1 +1 @@ -// this file is intentionally left empty \ No newline at end of file +// this file is intentionally left empty

1 0

[sedwards] 13887: another fix
by sedwards＠svn.reactos.com 08 Mar '05

08 Mar '05

another fix Deleted: branches/xmlbuildsystem/reactos/tools/unicode/Makefile Added: branches/xmlbuildsystem/reactos/tools/unicode/makefile _____ Deleted: branches/xmlbuildsystem/reactos/tools/unicode/Makefile --- branches/xmlbuildsystem/reactos/tools/unicode/Makefile 2005-03-08 20:23:40 UTC (rev 13886) +++ branches/xmlbuildsystem/reactos/tools/unicode/Makefile 2005-03-08 20:40:35 UTC (rev 13887) @@ -1,95 +0,0 @@ -UNICODE_BASE = tools$(SEP)unicode - -UNICODE_TARGET = \ - $(ROS_INTERMEDIATE)$(UNICODE_BASE)$(SEP)libunicode.a - -UNICODE_CODEPAGES = \ - 037 \ - 424 \ - 437 \ - 500 \ - 737 \ - 775 \ - 850 \ - 852 \ - 855 \ - 856 \ - 857 \ - 860 \ - 861 \ - 862 \ - 863 \ - 864 \ - 865 \ - 866 \ - 869 \ - 874 \ - 875 \ - 878 \ - 932 \ - 936 \ - 949 \ - 950 \ - 1006 \ - 1026 \ - 1250 \ - 1251 \ - 1252 \ - 1253 \ - 1254 \ - 1255 \ - 1256 \ - 1257 \ - 1258 \ - 10000 \ - 10006 \ - 10007 \ - 10029 \ - 10079 \ - 10081 \ - 20866 \ - 20932 \ - 21866 \ - 28591 \ - 28592 \ - 28593 \ - 28594 \ - 28595 \ - 28596 \ - 28597 \ - 28598 \ - 28599 \ - 28600 \ - 28603 \ - 28604 \ - 28605 \ - 28606 - -UNICODE_SOURCES = \ - $(UNICODE_BASE)$(SEP)casemap.c \ - $(UNICODE_BASE)$(SEP)compose.c \ - $(UNICODE_BASE)$(SEP)cptable.c \ - $(UNICODE_BASE)$(SEP)mbtowc.c \ - $(UNICODE_BASE)$(SEP)string.c \ - $(UNICODE_BASE)$(SEP)wctomb.c \ - $(UNICODE_BASE)$(SEP)wctype.c \ - $(addprefix $(UNICODE_BASE)$(SEP), $(UNICODE_CODEPAGES:%=c_%.o)) - -UNICODE_OBJECTS = \ - $(UNICODE_SOURCES:.c=.o) - -UNICODE_HOST_CFLAGS = \ - -D__USE_W32API -DWINVER=0x501 -DWINE_UNICODE_API= \ - -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ - -I$(UNICODE_BASE) -Iinclude/wine - -$(UNICODE_TARGET): $(UNICODE_OBJECTS) - ${host_ar} -rc $(UNICODE_TARGET) $(UNICODE_OBJECTS) - -$(UNICODE_OBJECTS): %.o : %.c - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -.PHONY: unicode_clean -unicode_clean: - -@$(rm) $(UNICODE_TARGET) $(UNICODE_OBJECTS) 2>$(NUL) -clean: unicode_clean _____ Copied: branches/xmlbuildsystem/reactos/tools/unicode/makefile (from rev 13883, branches/xmlbuildsystem/reactos/tools/unicode/Makefile) --- branches/xmlbuildsystem/reactos/tools/unicode/Makefile 2005-03-08 19:19:45 UTC (rev 13883) +++ branches/xmlbuildsystem/reactos/tools/unicode/makefile 2005-03-08 20:40:35 UTC (rev 13887) @@ -0,0 +1,95 @@ +UNICODE_BASE = tools$(SEP)unicode + +UNICODE_TARGET = \ + $(ROS_INTERMEDIATE)$(UNICODE_BASE)$(SEP)libunicode.a + +UNICODE_CODEPAGES = \ + 037 \ + 424 \ + 437 \ + 500 \ + 737 \ + 775 \ + 850 \ + 852 \ + 855 \ + 856 \ + 857 \ + 860 \ + 861 \ + 862 \ + 863 \ + 864 \ + 865 \ + 866 \ + 869 \ + 874 \ + 875 \ + 878 \ + 932 \ + 936 \ + 949 \ + 950 \ + 1006 \ + 1026 \ + 1250 \ + 1251 \ + 1252 \ + 1253 \ + 1254 \ + 1255 \ + 1256 \ + 1257 \ + 1258 \ + 10000 \ + 10006 \ + 10007 \ + 10029 \ + 10079 \ + 10081 \ + 20866 \ + 20932 \ + 21866 \ + 28591 \ + 28592 \ + 28593 \ + 28594 \ + 28595 \ + 28596 \ + 28597 \ + 28598 \ + 28599 \ + 28600 \ + 28603 \ + 28604 \ + 28605 \ + 28606 + +UNICODE_SOURCES = \ + $(UNICODE_BASE)$(SEP)casemap.c \ + $(UNICODE_BASE)$(SEP)compose.c \ + $(UNICODE_BASE)$(SEP)cptable.c \ + $(UNICODE_BASE)$(SEP)mbtowc.c \ + $(UNICODE_BASE)$(SEP)string.c \ + $(UNICODE_BASE)$(SEP)wctomb.c \ + $(UNICODE_BASE)$(SEP)wctype.c \ + $(addprefix $(UNICODE_BASE)$(SEP), $(UNICODE_CODEPAGES:%=c_%.o)) + +UNICODE_OBJECTS = \ + $(UNICODE_SOURCES:.c=.o) + +UNICODE_HOST_CFLAGS = \ + -D__USE_W32API -DWINVER=0x501 -DWINE_UNICODE_API= \ + -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ + -I$(UNICODE_BASE) -Iinclude/wine -Iw32api/include + +$(UNICODE_TARGET): $(UNICODE_OBJECTS) + ${host_ar} -rc $(UNICODE_TARGET) $(UNICODE_OBJECTS) + +$(UNICODE_OBJECTS): %.o : %.c + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ + +.PHONY: unicode_clean +unicode_clean: + -@$(rm) $(UNICODE_TARGET) $(UNICODE_OBJECTS) 2>$(NUL) +clean: unicode_clean

1 0

[gvg] 13886: Use GDIINFO values instead of DEVMODE values
by gvg＠svn.reactos.com 08 Mar '05

08 Mar '05

Use GDIINFO values instead of DEVMODE values Modified: trunk/reactos/include/win32k/dc.h Modified: trunk/reactos/subsys/win32k/ntuser/metric.c Modified: trunk/reactos/subsys/win32k/objects/dc.c _____ Modified: trunk/reactos/include/win32k/dc.h --- trunk/reactos/include/win32k/dc.h 2005-03-08 20:19:07 UTC (rev 13885) +++ trunk/reactos/include/win32k/dc.h 2005-03-08 20:23:40 UTC (rev 13886) @@ -79,7 +79,6 @@ HDC hSelf; HDC hNext; DHPDEV PDev; - DEVMODEW DMW; HSURF FillPatternSurfaces[HS_DDI_MAX]; PGDIINFO GDIInfo; PDEVINFO DevInfo; _____ Modified: trunk/reactos/subsys/win32k/ntuser/metric.c --- trunk/reactos/subsys/win32k/ntuser/metric.c 2005-03-08 20:19:07 UTC (rev 13885) +++ trunk/reactos/subsys/win32k/ntuser/metric.c 2005-03-08 20:23:40 UTC (rev 13886) @@ -167,8 +167,8 @@ ScreenDC = DC_LockDc(ScreenDCHandle); if (NULL != ScreenDC) { - Width = ScreenDC->DMW.dmPelsWidth; - Height = ScreenDC->DMW.dmPelsHeight; + Width = ScreenDC->GDIInfo->ulHorzRes; + Height = ScreenDC->GDIInfo->ulVertRes; DC_UnlockDc(ScreenDCHandle); } NtGdiDeleteDC(ScreenDCHandle); _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2005-03-08 20:19:07 UTC (rev 13885) +++ trunk/reactos/subsys/win32k/objects/dc.c 2005-03-08 20:23:40 UTC (rev 13886) @@ -172,7 +172,6 @@ NewDC->IsIC = FALSE; NewDC->PDev = OrigDC->PDev; - NewDC->DMW = OrigDC->DMW; memcpy(NewDC->FillPatternSurfaces, OrigDC->FillPatternSurfaces, sizeof OrigDC->FillPatternSurfaces); @@ -779,7 +778,6 @@ } NewDC->IsIC = CreateAsIC; - NewDC->DMW = PrimarySurface.DMW; NewDC->DevInfo = &PrimarySurface.DevInfo; NewDC->GDIInfo = &PrimarySurface.GDIInfo; memcpy(NewDC->FillPatternSurfaces, PrimarySurface.FillPatterns, @@ -789,11 +787,7 @@ NewDC->DriverFunctions = PrimarySurface.DriverFunctions; NewDC->w.hBitmap = PrimarySurface.Handle; - NewDC->DMW.dmSize = sizeof(NewDC->DMW); - NewDC->DMW.dmFields = 0x000fc000; - - NewDC->DMW.dmLogPixels = 96; - NewDC->w.bitsPerPixel = NewDC->DMW.dmBitsPerPel; // FIXME: set this here?? + NewDC->w.bitsPerPixel = NewDC->GDIInfo->cBitsPixel * NewDC->GDIInfo->cPlanes; DPRINT("Bits per pel: %u\n", NewDC->w.bitsPerPixel); if (! CreateAsIC) @@ -805,9 +799,9 @@ DC_FreeDC ( hNewDC) ; return NULL; } - ASSERT(NewDC->DMW.dmBitsPerPel == BitsPerFormat(SurfObj->iBitmapFormat)); - ASSERT(NewDC->DMW.dmPelsWidth == SurfObj->sizlBitmap.cx); - ASSERT(NewDC->DMW.dmPelsHeight == SurfObj->sizlBitmap.cy); + ASSERT(NewDC->GDIInfo->cBitsPixel * NewDC->GDIInfo->cPlanes == BitsPerFormat(SurfObj->iBitmapFormat)); + ASSERT(NewDC->GDIInfo->ulHorzRes == SurfObj->sizlBitmap.cx); + ASSERT(NewDC->GDIInfo->ulVertRes == SurfObj->sizlBitmap.cy); NewDC->w.hPalette = NewDC->DevInfo->hpalDefault; NewDC->w.ROPmode = R2_COPYPEN;

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2005