Ros-diffs September 2009

ros-diffs@reactos.org

16 participants
270 discussions

[sginsberg] 43236: - Goodbye __USE_W32API

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Sep 30 15:32:05 2009 New Revision: 43236 URL: http://svn.reactos.org/svn/reactos?rev=43236&view=rev Log: - Goodbye __USE_W32API Modified: trunk/rosapps/demos/maze/Makefile Modified: trunk/rosapps/demos/maze/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/maze/Makefile?rev=43… ============================================================================== --- trunk/rosapps/demos/maze/Makefile [iso-8859-1] (original) +++ trunk/rosapps/demos/maze/Makefile [iso-8859-1] Wed Sep 30 15:32:05 2009 @@ -12,7 +12,7 @@ TARGET_OBJECTS = maze.o -TARGET_CFLAGS = -D__USE_W32API -Wall -Werror +TARGET_CFLAGS = -Wall -Werror include $(PATH_TO_TOP)/rules.mak

14 years, 11 months

[sginsberg] 43235: - Good bye __USE_W32API, _DISABLE_TIDENTS

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Sep 30 15:31:50 2009 New Revision: 43235 URL: http://svn.reactos.org/svn/reactos?rev=43235&view=rev Log: - Good bye __USE_W32API, _DISABLE_TIDENTS Modified: trunk/rostests/drivers/kmtest/kmtestassist.rbuild trunk/rostests/tests/regqueryvalue/regqueryvalue.c Modified: trunk/rostests/drivers/kmtest/kmtestassist.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/kmtestassi… ============================================================================== --- trunk/rostests/drivers/kmtest/kmtestassist.rbuild [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/kmtestassist.rbuild [iso-8859-1] Wed Sep 30 15:31:50 2009 @@ -1,6 +1,5 @@ <module name="kmtestassist" type="kernelmodedriver" installbase="system32/drivers" installname="kmtestassist.sys"> <bootstrap base="$(CDOUTPUT)" /> - <define name="__USE_W32API" /> <include base="ReactOS">include/reactos/drivers</include> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/rostests/tests/regqueryvalue/regqueryvalue.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/regqueryvalue/regqu… ============================================================================== --- trunk/rostests/tests/regqueryvalue/regqueryvalue.c [iso-8859-1] (original) +++ trunk/rostests/tests/regqueryvalue/regqueryvalue.c [iso-8859-1] Wed Sep 30 15:31:50 2009 @@ -1,4 +1,3 @@ -#define _DISABLE_TIDENTS #include <stdio.h> #include <string.h> #include <stdlib.h>

14 years, 11 months

[sginsberg] 43234: - Remove the remaining __USE_W32API, deprecated for ages. - Remove _SEH_NO_NATIVE_NLG from msvcrt.rbuild, deprecated long ago. - Get rid of __NO_CTYPE_INLINES for everything but host tools, deprecated since revision 38052. - Deprecate and remove _DISABLE_TIDENTS.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Sep 30 15:28:51 2009 New Revision: 43234 URL: http://svn.reactos.org/svn/reactos?rev=43234&view=rev Log: - Remove the remaining __USE_W32API, deprecated for ages. - Remove _SEH_NO_NATIVE_NLG from msvcrt.rbuild, deprecated long ago. - Get rid of __NO_CTYPE_INLINES for everything but host tools, deprecated since revision 38052. - Deprecate and remove _DISABLE_TIDENTS. Modified: trunk/reactos/base/setup/usetup/usetup.rbuild trunk/reactos/base/shell/explorer/Make-rosshell.mak trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild trunk/reactos/dll/win32/ws2_32/misc/ns.c trunk/reactos/drivers/filesystems/npfs/npfs.rbuild trunk/reactos/hal/halamd64/generic/generic.rbuild trunk/reactos/hal/halamd64/hal_generic.rbuild trunk/reactos/hal/halamd64/up/halup.rbuild trunk/reactos/hal/halx86/hal_generic_amd64.rbuild trunk/reactos/include/psdk/winfax.h trunk/reactos/lib/3rdparty/freetype/freetype.rbuild trunk/reactos/lib/3rdparty/fullfat/fullfat.rbuild trunk/reactos/lib/cmlib/cmlib.rbuild trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild trunk/reactos/lib/fslib/vfatlib/check/file.c trunk/reactos/lib/ppcmmu/ppcmmu.rbuild trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/libcntpr.rbuild trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/base/setup/usetup/usetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.r… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -6,7 +6,6 @@ <include base="zlib">.</include> <include base="inflib">.</include> <include base="ReactOS">include/reactos/drivers</include> - <define name="__NO_CTYPE_INLINES" /> <library>zlib</library> <library>inflib</library> <library>ext2lib</library> Modified: trunk/reactos/base/shell/explorer/Make-rosshell.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/Make-r… ============================================================================== --- trunk/reactos/base/shell/explorer/Make-rosshell.mak [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/Make-rosshell.mak [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -15,7 +15,7 @@ TARGET_INSTALLDIR := . TARGET_CFLAGS := \ - -D__USE_W32API -DWIN32 -D_ROS_ \ + -DWIN32 -D_ROS_ \ -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 \ -DUNICODE -fexceptions -Wall -g Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -12,7 +12,6 @@ <include base="ReactOS">include/reactos/subsys</include> <define name="__NTDLL__" /> <define name="_NTOSKRNL_" /> - <define name="__NO_CTYPE_INLINES" /> <library>rtl</library> <library>ntdllsys</library> <library>libcntpr</library> Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -12,7 +12,6 @@ <library>ntdll</library> <define name="_KERNEL32_" /> <redefine name="_WIN32_WINNT">0x0600</redefine> - <define name="__NO_CTYPE_INLINES" /> <dependency>errcodes</dependency> <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38269 <pch>k32.h</pch> Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -6,7 +6,6 @@ <define name="_MSVCRT_" /> <define name="_MSVCRT_LIB_" /> <define name="_MT" /> - <define name="__NO_CTYPE_INLINES" /> <define name="_CTYPE_DISABLE_MACROS" /> <define name="_NO_INLINING" /> <linkerflag linkerset="ld">-enable-stdcall-fixup</linkerflag> Modified: trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/snmpapi.… ============================================================================== --- trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -3,7 +3,6 @@ <include base="snmpapi">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> - <define name="_DISABLE_TIDENTS" /> <library>ntdll</library> <library>kernel32</library> <library>wine</library> Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -7,7 +7,6 @@ * REVISIONS: * CSH 01/09-2000 Created */ -#define __NO_CTYPE_INLINES #include <ctype.h> #include <ws2_32.h> #include <winbase.h> Modified: trunk/reactos/drivers/filesystems/npfs/npfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/npfs.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="npfs" type="kernelmodedriver" installbase="system32/drivers" installname="npfs.sys"> <include base="npfs">.</include> - <define name="__NO_CTYPE_INLINES" /> <library>ntoskrnl</library> <library>hal</library> <file>create.c</file> Modified: trunk/reactos/hal/halamd64/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halamd64/generic/gener… ============================================================================== --- trunk/reactos/hal/halamd64/generic/generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halamd64/generic/generic.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -4,7 +4,6 @@ <module name="hal_generic" type="objectlibrary"> <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> <file>halinit.c</file> <file>irq.S</file> Modified: trunk/reactos/hal/halamd64/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halamd64/hal_generic.r… ============================================================================== --- trunk/reactos/hal/halamd64/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halamd64/hal_generic.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -4,7 +4,6 @@ <module name="hal_generic" type="objectlibrary"> <include>include</include> <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> <file>hal_generic.c</file> </module> Modified: trunk/reactos/hal/halamd64/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halamd64/up/halup.rbui… ============================================================================== --- trunk/reactos/hal/halamd64/up/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halamd64/up/halup.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -5,7 +5,6 @@ <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> <include base="halup">../include</include> <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> <library>hal_generic_amd64</library> <library>hal_generic</library> Modified: trunk/reactos/hal/halx86/hal_generic_amd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_amd… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -4,7 +4,6 @@ <module name="hal_generic_amd64" type="objectlibrary"> <include>include</include> <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> <directory name="generic"> <file>beep.c</file> Modified: trunk/reactos/include/psdk/winfax.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winfax.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winfax.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winfax.h [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -492,8 +492,6 @@ typedef BOOL (CALLBACK *PFAX_RECIPIENT_CALLBACKA)(HANDLE FaxHandle, DWORD RecipientNumber, LPVOID Context, PFAX_JOB_PARAMA JobParams, PFAX_COVERAGE_INFOA CoverpageInfo); typedef BOOL (CALLBACK *PFAX_RECIPIENT_CALLBACKW)(HANDLE FaxHandle, DWORD RecipientNumber, LPVOID Context, PFAX_JOB_PARAMW JobParams, PFAX_COVERAGE_INFOW CoverpageInfo); - -#ifndef _DISABLE_TIDENTS #ifdef UNICODE typedef FAX_JOB_PARAMW FAX_JOB_PARAM; @@ -589,8 +587,6 @@ #define FaxStartPrintJob FaxStartPrintJobA #endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - typedef BOOL (CALLBACK *PFAX_ROUTING_INSTALLATION_CALLBACKW)(HANDLE FaxHandle, LPVOID Context, LPWSTR MethodName, LPWSTR FriendlyName, LPWSTR FunctionName, LPWSTR Guid); #define PFAX_ROUTING_INSTALLATION_CALLBACK PFAX_ROUTING_INSTALLATION_CALLBACKW #define FaxRegisterRoutingExtension FaxRegisterRoutingExtensionW Modified: trunk/reactos/lib/3rdparty/freetype/freetype.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/free… ============================================================================== --- trunk/reactos/lib/3rdparty/freetype/freetype.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/freetype/freetype.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -2,9 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="freetype" type="staticlibrary" allowwarnings="true"> <include base="freetype">include</include> - <define name="_DISABLE_TIDENTS" /> <define name="__NTDRIVER__" /> - <define name="__NO_CTYPE_INLINES" /> <define name="FT2_BUILD_LIBRARY" /> <if property="NSWPAT" value="0"> <define name="TT_CONFIG_OPTION_UNPATENTED_HINTING" /> Modified: trunk/reactos/lib/3rdparty/fullfat/fullfat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/fullf… ============================================================================== --- trunk/reactos/lib/3rdparty/fullfat/fullfat.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/fullfat/fullfat.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -3,7 +3,6 @@ <module name="fullfat" type="staticlibrary"> <include base="ReactOS">include/reactos/libs/fullfat</include> <define name="__NTDRIVER__" /> - <define name="__NO_CTYPE_INLINES" /> <file>ff_blk.c</file> <file>ff_crc.c</file> Modified: trunk/reactos/lib/cmlib/cmlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.rbuild?rev… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -3,7 +3,6 @@ <group> <module name="cmlib" type="staticlibrary"> <include base="cmlib">.</include> - <define name="__NO_CTYPE_INLINES" /> <define name="_NTOSKRNL_" /> <define name="_NTSYSTEM_" /> <define name="NASSERT" /> Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -3,7 +3,6 @@ <module name="oskittcp" type="staticlibrary"> <define name="__NTDRIVER__"/> <define name="KERNEL"/> - <define name="__NO_CTYPE_INLINES" /> <include base="oskittcp">include/freebsd</include> <include base="oskittcp">include/freebsd/sys/include</include> <include base="oskittcp">include/freebsd/src/sys</include> Modified: trunk/reactos/lib/fslib/vfatlib/check/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/fi… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/file.c [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -4,10 +4,6 @@ /* FAT32, VFAT, Atari format support, and various fixes additions May 1998 * by Roman Hodek <Roman.Hodek(a)informatik.uni-erlangen.de> */ - -/* Need to define this so that islower isn't inlined - (ntdll doesn't export isctype) */ -#define __NO_CTYPE_INLINES #include "vfatlib.h" Modified: trunk/reactos/lib/ppcmmu/ppcmmu.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/ppcmmu.rbuild?r… ============================================================================== --- trunk/reactos/lib/ppcmmu/ppcmmu.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/ppcmmu/ppcmmu.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="ppcmmu" type="staticlibrary"> <include base="ppcmmu">.</include> - <define name="__NO_CTYPE_INLINES" /> <if property="ARCH" value="powerpc"> <file>mmuutil.c</file> </if> Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=432… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="rtl" type="staticlibrary"> <define name="_NTOSKRNL_" /> - <define name="__NO_CTYPE_INLINES" /> <define name="NO_RTL_INLINES" /> <define name="_NTSYSTEM_" /> <define name="_NTDLLBUILD_" /> Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -24,7 +24,6 @@ <define name="_MSVCRT_LIB_" /> <define name="_MSVCRT_" /> <define name="_MT" /> - <define name="__NO_CTYPE_INLINES" /> <directory name="conio"> <file>cgets.c</file> <file>cprintf.c</file> Modified: trunk/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.rbuil… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -3,11 +3,9 @@ <module name="libcntpr" type="staticlibrary"> <include base="crt">.</include> <include base="crt">include</include> - <define name="__NO_CTYPE_INLINES" /> <define name="NO_RTL_INLINES" /> <define name="_NTSYSTEM_" /> <define name="_NTDLLBUILD_" /> - <define name="_SEH_NO_NATIVE_NLG" /> <define name="_LIBCNT_" /> <if property="ARCH" value="i386"> <define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define> Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Wed Sep 30 15:28:51 2009 @@ -6,7 +6,6 @@ <define name="__NTOSKRNL__" /> <define name="_NTOSKRNL_" /> <define name="_NTSYSTEM_" /> - <define name="__NO_CTYPE_INLINES" /> <define name="_IN_KERNEL_" /> <if property="_WINKD_" value="1"> <define name="_WINKD_" />

14 years, 11 months

[khornicek] 43233: - simplify the code a bit

by khornicek＠svn.reactos.org

Author: khornicek Date: Wed Sep 30 14:59:06 2009 New Revision: 43233 URL: http://svn.reactos.org/svn/reactos?rev=43233&view=rev Log: - simplify the code a bit Modified: trunk/reactos/dll/win32/opengl32/font.c Modified: trunk/reactos/dll/win32/opengl32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/font.c?… ============================================================================== --- trunk/reactos/dll/win32/opengl32/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/font.c [iso-8859-1] Wed Sep 30 14:59:06 2009 @@ -36,39 +36,6 @@ static DWORD VertBufIndex; static GLenum TessErrorOccurred; - -/***************************************************************************** -* InitLineBuf -* -* Initializes the global LineBuf and its associated size and current-element -* counters. -*****************************************************************************/ - -INT InitLineBuf(VOID) -{ - if (!(LineBuf = (FLOAT*) - HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (LineBufSize = LINE_BUF_QUANT) * sizeof(FLOAT)))) - return 0; - LineBufIndex = 0; - return 1; -} - -/***************************************************************************** -* InitVertBuf -* -* Initializes the global VertBuf and its associated size and current-element -* counters. -*****************************************************************************/ - -INT InitVertBuf(VOID) -{ - if (!(VertBuf = (FLOAT*) - HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (VertBufSize = VERT_BUF_QUANT) * sizeof(FLOAT)))) - return 0; - VertBufIndex = 0; - return 1; -} - /***************************************************************************** * AppendToLineBuf * @@ -81,8 +48,9 @@ if (LineBufIndex >= LineBufSize) { FLOAT* f; - - f = (FLOAT*) HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, LineBuf, (LineBufSize += LINE_BUF_QUANT) * sizeof(FLOAT)); + LineBufSize += LINE_BUF_QUANT; + + f = (FLOAT*) HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, LineBuf, (LineBufSize) * sizeof(FLOAT)); if (!f) return 0; LineBuf = f; @@ -107,36 +75,6 @@ return 0; VertBuf[VertBufIndex++] = value; return 1; -} - -/***************************************************************************** -* FreeLineBuf -* -* Cleans up vertex buffer structure. -*****************************************************************************/ - -VOID FreeLineBuf(VOID) -{ - if (LineBuf) - { - HeapFree(GetProcessHeap(), 0, LineBuf); - LineBuf = NULL; - } -} - -/***************************************************************************** -* FreeVertBuf -* -* Cleans up vertex buffer structure. -*****************************************************************************/ - -VOID FreeVertBuf(VOID) -{ - if (VertBuf) - { - HeapFree(GetProcessHeap(), 0, VertBuf); - VertBuf = NULL; - } } /***************************************************************************** @@ -634,8 +572,13 @@ /* * Initialize the global buffer into which we place the outlines: */ - if (!InitLineBuf()) + LineBuf = (FLOAT*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (LINE_BUF_QUANT) * sizeof(FLOAT)); + + if(!LineBuf) goto exit; + + LineBufSize = LINE_BUF_QUANT; + LineBufIndex = 0; /* * Convert the glyph outlines to a set of polyline loops. @@ -681,8 +624,14 @@ * auxiliary routines for drawing. */ - if (!InitVertBuf()) + VertBuf = (FLOAT*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (VERT_BUF_QUANT) * sizeof(FLOAT)); + + if (!VertBuf) goto exit; + + VertBufSize = VERT_BUF_QUANT; + VertBufIndex = 0; + if (!(tess = gluNewTess())) goto exit; @@ -799,11 +748,16 @@ exit: - FreeLineBuf(); + + if(LineBuf) + HeapFree(GetProcessHeap(), 0, LineBuf); + + if(VertBuf) + HeapFree(GetProcessHeap(), 0, VertBuf); + if (tess) gluDeleteTess(tess); - FreeVertBuf(); return status; }

14 years, 11 months

[khornicek] 43232: - add wglUseFontOutlines, wglUseFontBitmaps - code ported (rearranged, simplified, fixed memory leaks, removed unneeded variables) from Mesa3D glDirect driver (c) SciTech Software, Inc - more work needed but 3D text screen saver finally renders at least something

by khornicek＠svn.reactos.org

Author: khornicek Date: Wed Sep 30 14:12:56 2009 New Revision: 43232 URL: http://svn.reactos.org/svn/reactos?rev=43232&view=rev Log: - add wglUseFontOutlines, wglUseFontBitmaps - code ported (rearranged, simplified, fixed memory leaks, removed unneeded variables) from Mesa3D glDirect driver (c) SciTech Software, Inc - more work needed but 3D text screen saver finally renders at least something Added: trunk/reactos/dll/win32/opengl32/font.c (with props) Modified: trunk/reactos/dll/win32/opengl32/opengl32.h trunk/reactos/dll/win32/opengl32/opengl32.rbuild trunk/reactos/dll/win32/opengl32/wgl.c Added: trunk/reactos/dll/win32/opengl32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/font.c?… ============================================================================== --- trunk/reactos/dll/win32/opengl32/font.c (added) +++ trunk/reactos/dll/win32/opengl32/font.c [iso-8859-1] Wed Sep 30 14:12:56 2009 @@ -1,0 +1,1201 @@ +/**************************************************************************** +* Copyright (C) 1991-2004 SciTech Software, Inc. All rights reserved. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included +* in all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* SCITECH SOFTWARE INC BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +* SOFTWARE. +****************************************************************************/ + +#include "opengl32.h" +#include <math.h> + +#define LINE_BUF_QUANT 4000 +#define VERT_BUF_QUANT 4000 + +static HFONT hNewFont, hOldFont; +static FLOAT ScaleFactor; +static FLOAT* LineBuf; +static DWORD LineBufSize; +static DWORD LineBufIndex; +static FLOAT* VertBuf; +static DWORD VertBufSize; +static DWORD VertBufIndex; +static GLenum TessErrorOccurred; + + +/***************************************************************************** +* InitLineBuf +* +* Initializes the global LineBuf and its associated size and current-element +* counters. +*****************************************************************************/ + +INT InitLineBuf(VOID) +{ + if (!(LineBuf = (FLOAT*) + HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (LineBufSize = LINE_BUF_QUANT) * sizeof(FLOAT)))) + return 0; + LineBufIndex = 0; + return 1; +} + +/***************************************************************************** +* InitVertBuf +* +* Initializes the global VertBuf and its associated size and current-element +* counters. +*****************************************************************************/ + +INT InitVertBuf(VOID) +{ + if (!(VertBuf = (FLOAT*) + HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (VertBufSize = VERT_BUF_QUANT) * sizeof(FLOAT)))) + return 0; + VertBufIndex = 0; + return 1; +} + +/***************************************************************************** +* AppendToLineBuf +* +* Appends one floating-point value to the global LineBuf array. Return value +* is non-zero for success, zero for failure. +*****************************************************************************/ + +INT AppendToLineBuf(FLOAT value) +{ + if (LineBufIndex >= LineBufSize) + { + FLOAT* f; + + f = (FLOAT*) HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, LineBuf, (LineBufSize += LINE_BUF_QUANT) * sizeof(FLOAT)); + if (!f) + return 0; + LineBuf = f; + } + LineBuf[LineBufIndex++] = value; + return 1; +} + +/***************************************************************************** +* AppendToVertBuf +* +* Appends one floating-point value to the global VertBuf array. Return value +* is non-zero for success, zero for failure. +* +* Note that we can't realloc this one, because the tessellator is using +* pointers into it. +*****************************************************************************/ + +INT AppendToVertBuf(FLOAT value) +{ + if (VertBufIndex >= VertBufSize) + return 0; + VertBuf[VertBufIndex++] = value; + return 1; +} + +/***************************************************************************** +* FreeLineBuf +* +* Cleans up vertex buffer structure. +*****************************************************************************/ + +VOID FreeLineBuf(VOID) +{ + if (LineBuf) + { + HeapFree(GetProcessHeap(), 0, LineBuf); + LineBuf = NULL; + } +} + +/***************************************************************************** +* FreeVertBuf +* +* Cleans up vertex buffer structure. +*****************************************************************************/ + +VOID FreeVertBuf(VOID) +{ + if (VertBuf) + { + HeapFree(GetProcessHeap(), 0, VertBuf); + VertBuf = NULL; + } +} + +/***************************************************************************** +* GetWord +* +* Fetch the next 16-bit word from a little-endian byte stream, and increment +* the stream pointer to the next unscanned byte. +*****************************************************************************/ + +LONG GetWord(UCHAR** p) +{ + LONG value; + + value = ((*p)[1] << 8) + (*p)[0]; + *p += 2; + return value; +} + +/***************************************************************************** +* GetDWord +* +* Fetch the next 32-bit word from a little-endian byte stream, and increment +* the stream pointer to the next unscanned byte. +*****************************************************************************/ + +LONG GetDWord(UCHAR** p) +{ + LONG value; + + value = ((*p)[3] << 24) + ((*p)[2] << 16) + ((*p)[1] << 8) + (*p)[0]; + *p += 4; + return value; +} + +/***************************************************************************** +* GetFixed +* +* Fetch the next 32-bit fixed-point value from a little-endian byte stream, +* convert it to floating-point, and increment the stream pointer to the next +* unscanned byte. +*****************************************************************************/ +double GetFixed(UCHAR** p) +{ + LONG hiBits, loBits; + double value; + + loBits = GetWord(p); + hiBits = GetWord(p); + value = (double) ((hiBits << 16) | loBits) / 65536.0; + + return value * ScaleFactor; +} + + +/***************************************************************************** +** +** InvertGlyphBitmap. +** +** Invert the bitmap so that it suits OpenGL's representation. +** Each row starts on a double word boundary. +** +*****************************************************************************/ + +VOID InvertGlyphBitmap(INT w, INT h, DWORD *fptr, DWORD *tptr) +{ + INT dWordsInRow = (w+31)/32; + INT i, j; + + if (w <= 0 || h <= 0) { + return; + } + + tptr += ((h-1)*dWordsInRow); + for (i = 0; i < h; i++) { + for (j = 0; j < dWordsInRow; j++) { + *(tptr + j) = *(fptr + j); + } + tptr -= dWordsInRow; + fptr += dWordsInRow; + } +} + +/***************************************************************************** +* CreateHighResolutionFont +* +* Gets metrics for the current font and creates an equivalent font +* scaled to the design units of the font. +* +*****************************************************************************/ + +HFONT CreateHighResolutionFont(HDC hDC) +{ + UINT otmSize; + OUTLINETEXTMETRIC *otm; + LONG fontHeight, fontWidth, fontUnits; + LOGFONTW logFont, logFontFaceName; + + otmSize = GetOutlineTextMetricsW(hDC, 0, NULL); + if (!otmSize) + return NULL; + + otm = (OUTLINETEXTMETRIC *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, otmSize); + if (!otm) + return NULL; + + otm->otmSize = otmSize; + if (!GetOutlineTextMetricsW(hDC, otmSize, otm)) + return NULL; + + GetObjectW(GetCurrentObject(hDC, OBJ_FONT), sizeof(logFontFaceName), &logFontFaceName); + + fontHeight = otm->otmTextMetrics.tmHeight - + otm->otmTextMetrics.tmInternalLeading; + fontWidth = otm->otmTextMetrics.tmAveCharWidth; + fontUnits = (LONG) otm->otmEMSquare; + + ScaleFactor = 1.0F / (FLOAT) fontUnits; + + logFont.lfHeight = - ((LONG) fontUnits); + logFont.lfWidth = (LONG)((FLOAT) (fontWidth * fontUnits) / (FLOAT) fontHeight); + logFont.lfEscapement = 0; + logFont.lfOrientation = 0; + logFont.lfWeight = otm->otmTextMetrics.tmWeight; + logFont.lfItalic = otm->otmTextMetrics.tmItalic; + logFont.lfUnderline = otm->otmTextMetrics.tmUnderlined; + logFont.lfStrikeOut = otm->otmTextMetrics.tmStruckOut; + logFont.lfCharSet = otm->otmTextMetrics.tmCharSet; + logFont.lfOutPrecision = OUT_OUTLINE_PRECIS; + logFont.lfClipPrecision = CLIP_DEFAULT_PRECIS; + logFont.lfQuality = DEFAULT_QUALITY; + logFont.lfPitchAndFamily = + otm->otmTextMetrics.tmPitchAndFamily & 0xf0; + wcscpy(logFont.lfFaceName, logFontFaceName.lfFaceName); + + hNewFont = CreateFontIndirectW(&logFont); + + HeapFree(GetProcessHeap(), 0, otm); + + return hNewFont; +} + +/***************************************************************************** +* MakeLinesFromArc +* +* Subdivides one arc of a quadratic spline until the chordal deviation +* tolerance requirement is met, then places the resulting set of line +* segments in the global LineBuf. +*****************************************************************************/ +INT MakeLinesFromArc(FLOAT x0, FLOAT y0, FLOAT x1, FLOAT y1, FLOAT x2, FLOAT y2, + DWORD vertexCountIndex, FLOAT chordalDeviationSquared) +{ + FLOAT x01; + FLOAT y01; + FLOAT x12; + FLOAT y12; + FLOAT midPointX; + FLOAT midPointY; + FLOAT deltaX; + FLOAT deltaY; + + /* + * Calculate midpoint of the curve by de Casteljau: + */ + x01 = 0.5F * (x0 + x1); + y01 = 0.5F * (y0 + y1); + x12 = 0.5F * (x1 + x2); + y12 = 0.5F * (y1 + y2); + midPointX = 0.5F * (x01 + x12); + midPointY = 0.5F * (y01 + y12); + + + /* + * Estimate chordal deviation by the distance from the midpoint + * of the curve to its non-pointpolated control point. If this + * distance is greater than the specified chordal deviation + * constraint, then subdivide. Otherwise, generate polylines + * from the three control points. + */ + deltaX = midPointX - x1; + deltaY = midPointY - y1; + + if (deltaX * deltaX + deltaY * deltaY > chordalDeviationSquared) + { + MakeLinesFromArc( x0, y0, + x01, y01, + midPointX, midPointY, + vertexCountIndex, + chordalDeviationSquared); + + MakeLinesFromArc( midPointX, midPointY, + x12, y12, + x2, y2, + vertexCountIndex, + chordalDeviationSquared); + } + else + { + /* + * The "pen" is already at (x0, y0), so we don't need to + * add that point to the LineBuf. + */ + if (!AppendToLineBuf(x1) + || !AppendToLineBuf(y1) + || !AppendToLineBuf(x2) + || !AppendToLineBuf(y2)) + return 0; + LineBuf[vertexCountIndex] += 2.0F; + } + + return 1; +} + +/***************************************************************************** +* MakeLinesFromTTQSpline +* +* Converts points from the poly quadratic spline in a TT_PRIM_QSPLINE +* structure to polyline points in the global LineBuf. +*****************************************************************************/ + +INT MakeLinesFromTTQSpline( UCHAR** pp, DWORD vertexCountIndex, WORD pointCount, FLOAT chordalDeviation) +{ + FLOAT x0, y0, x1, y1, x2, y2; + WORD point; + + /* + * Process each of the non-pointpolated points in the outline. + * To do this, we need to generate two pointpolated points (the + * start and end of the arc) for each non-pointpolated point. + * The first pointpolated point is always the one most recently + * stored in LineBuf, so we just extract it from there. The + * second pointpolated point is either the average of the next + * two points in the QSpline, or the last point in the QSpline + * if only one remains. + */ + for (point = 0; point < pointCount - 1; ++point) + { + x0 = LineBuf[LineBufIndex - 2]; + y0 = LineBuf[LineBufIndex - 1]; + + x1 = (FLOAT) GetFixed(pp); + y1 = (FLOAT) GetFixed(pp); + + if (point == pointCount - 2) + { + /* + * This is the last arc in the QSpline. The final + * point is the end of the arc. + */ + x2 = (FLOAT) GetFixed(pp); + y2 = (FLOAT) GetFixed(pp); + } + else + { + /* + * Peek at the next point in the input to compute + * the end of the arc: + */ + x2 = 0.5F * (x1 + (FLOAT) GetFixed(pp)); + y2 = 0.5F * (y1 + (FLOAT) GetFixed(pp)); + /* + * Push the point back onto the input so it will + * be reused as the next off-curve point: + */ + *pp -= 8; + } + + if (!MakeLinesFromArc( x0, y0, + x1, y1, + x2, y2, + vertexCountIndex, + chordalDeviation * chordalDeviation)) + return 0; + } + + return 1; +} + +/***************************************************************************** +* MakeLinesFromTTLine +* +* Converts points from the polyline in a TT_PRIM_LINE structure to +* equivalent points in the global LineBuf. +*****************************************************************************/ +INT MakeLinesFromTTLine(UCHAR** pp, DWORD vertexCountIndex, WORD pointCount) +{ + /* + * Just copy the line segments into the line buffer (converting + * type as we go): + */ + LineBuf[vertexCountIndex] += pointCount; + while (pointCount--) + { + if (!AppendToLineBuf((FLOAT) GetFixed(pp)) /* X coord */ + || !AppendToLineBuf((FLOAT) GetFixed(pp))) /* Y coord */ + return 0; + } + + return 1; +} + +/***************************************************************************** +* MakeLinesFromTTPolyCurve +* +* Converts the lines and splines in a single TTPOLYCURVE structure to points +* in the global LineBuf. +*****************************************************************************/ + +INT MakeLinesFromTTPolycurve(UCHAR** pp, DWORD vertexCountIndex, FLOAT chordalDeviation) +{ + WORD type; + WORD pointCount; + + /* + * Pick up the relevant fields of the TTPOLYCURVE structure: + */ + type = (WORD) GetWord(pp); + pointCount = (WORD) GetWord(pp); + + /* + * Convert the "curve" to line segments: + */ + if (type == TT_PRIM_LINE) + return MakeLinesFromTTLine( pp, + vertexCountIndex, + pointCount); + else if (type == TT_PRIM_QSPLINE) + return MakeLinesFromTTQSpline( pp, + vertexCountIndex, + pointCount, + chordalDeviation); + else + return 0; +} + +/***************************************************************************** +* MakeLinesFromTTPolygon +* +* Converts a TTPOLYGONHEADER and its associated curve structures into a +* single polyline loop in the global LineBuf. +*****************************************************************************/ + +INT MakeLinesFromTTPolygon(UCHAR** pp, FLOAT chordalDeviation) +{ + DWORD polySize; + UCHAR* polyStart; + DWORD vertexCountIndex; + + /* + * Record where the polygon data begins, and where the loop's + * vertex count resides: + */ + polyStart = *pp; + vertexCountIndex = LineBufIndex; + if (!AppendToLineBuf(0.0F)) + return 0; + + /* + * Extract relevant data from the TTPOLYGONHEADER: + */ + polySize = GetDWord(pp); + if (GetDWord(pp) != TT_POLYGON_TYPE) /* polygon type */ + return 0; + if (!AppendToLineBuf((FLOAT) GetFixed(pp))) /* first X coord */ + return 0; + if (!AppendToLineBuf((FLOAT) GetFixed(pp))) /* first Y coord */ + return 0; + LineBuf[vertexCountIndex] += 1.0F; + + /* + * Process each of the TTPOLYCURVE structures in the polygon: + */ + while (*pp < polyStart + polySize) + if (!MakeLinesFromTTPolycurve( pp, + vertexCountIndex, + chordalDeviation)) + return 0; + + return 1; +} + +/***************************************************************************** +* TessVertexOut +* +* Used by tessellator to handle output vertexes. +*****************************************************************************/ + +VOID CALLBACK TessVertexOutData(FLOAT p[3], GLfloat z) +{ + GLfloat v[3]; + v[0] = (GLfloat) p[0]; + v[1] = (GLfloat) p[1]; + v[2] = z; + glVertex3fv(v); +} + +/***************************************************************************** +* TessCombine +* +* Used by tessellator to handle self-pointsecting contours and degenerate +* geometry. +*****************************************************************************/ +VOID CALLBACK TessCombine(double coords[3], VOID* vertex_data[4], FLOAT weight[4], VOID** outData) +{ + if (!AppendToVertBuf((FLOAT) coords[0]) + || !AppendToVertBuf((FLOAT) coords[1]) + || !AppendToVertBuf((FLOAT) coords[2])) + TessErrorOccurred = GL_OUT_OF_MEMORY; + + *outData = VertBuf + (VertBufIndex - 3); +} + +/***************************************************************************** +* TessError +* +* Saves the last tessellator error code in the global TessErrorOccurred. +*****************************************************************************/ + +VOID CALLBACK TessError(GLenum error) +{ + TessErrorOccurred = error; +} + +/***************************************************************************** +* MakeLinesFromGlyph +* +* Converts the outline of a glyph from the TTPOLYGON format to a simple +* array of floating-point values containing one or more loops. +* +* The first element of the output array is a count of the number of loops. +* The loop data follows this count. Each loop consists of a count of the +* number of vertices it contains, followed by the vertices. Each vertex +* is an X and Y coordinate. For example, a single triangle might be +* described by this array: +* +* 1., 3., 0., 0., 1., 0., 0., 1. +* ^ ^ ^ ^ ^ ^ ^ ^ +* #loops #verts x1 y1 x2 y2 x3 y3 +* +* A two-loop glyph would look like this: +* +* 2., 3., 0.,0., 1.,0., 0.,1., 3., .2,.2, .4,.2, .2,.4 +* +* Line segments from the TTPOLYGON are transferred to the output array in +* the obvious way. Quadratic splines in the TTPOLYGON are converted to +* collections of line segments +*****************************************************************************/ + +INT MakeLinesFromGlyph(UCHAR* glyphBuf, DWORD glyphSize, FLOAT chordalDeviation) +{ + UCHAR* p; + INT status = 0; + + /* + * Pick up all the polygons (aka loops) that make up the glyph: + */ + if (!AppendToLineBuf(0.0F)) /* loop count at LineBuf[0] */ + goto exit; + + p = glyphBuf; + while (p < glyphBuf + glyphSize) + { + if (!MakeLinesFromTTPolygon(&p, chordalDeviation)) + goto exit; + LineBuf[0] += 1.0F; /* increment loop count */ + } + + status = 1; + +exit: + return status; +} + +/***************************************************************************** +* DrawGlyph +* +* Converts the outline of a glyph to OpenGL drawing primitives, tessellating +* as needed, and then draws the glyph. Tessellation of the quadratic splines +* in the outline is controlled by "chordalDeviation", and the drawing +* primitives (lines or polygons) are selected by "format". +* +* Return value is nonzero for success, zero for failure. +* +* Does not check for OpenGL errors, so if the caller needs to know about them, +* it should call glGetError(). +*****************************************************************************/ + +INT DrawGlyph(UCHAR* glyphBuf, DWORD glyphSize, FLOAT chordalDeviation, FLOAT extrusion, INT format) +{ + INT status = 0; + FLOAT* p; + DWORD loop; + DWORD point; + GLUtesselator* tess = NULL; + + /* + * Initialize the global buffer into which we place the outlines: + */ + if (!InitLineBuf()) + goto exit; + + /* + * Convert the glyph outlines to a set of polyline loops. + * (See MakeLinesFromGlyph() for the format of the loop data + * structure.) + */ + if (!MakeLinesFromGlyph(glyphBuf, glyphSize, chordalDeviation)) + goto exit; + p = LineBuf; + + + /* + * Now draw the loops in the appropriate format: + */ + if (format == WGL_FONT_LINES) + { + /* + * This is the easy case. Just draw the outlines. + */ + for (loop = (DWORD) *p++; loop; --loop) + { + glBegin(GL_LINE_LOOP); + for (point = (DWORD) *p++; point; --point) + { + glVertex2fv(p); + p += 2; + } + glEnd(); + } + status = 1; + } + + else if (format == WGL_FONT_POLYGONS) + { + double v[3]; + FLOAT *save_p = p; + GLfloat z_value; + + /* + * This is the hard case. We have to set up a tessellator + * to convert the outlines into a set of polygonal + * primitives, which the tessellator passes to some + * auxiliary routines for drawing. + */ + + if (!InitVertBuf()) + goto exit; + if (!(tess = gluNewTess())) + goto exit; + + gluTessCallback(tess, GLU_BEGIN, (VOID(CALLBACK *)()) glBegin); + gluTessCallback(tess, GLU_TESS_VERTEX_DATA, (VOID(CALLBACK *)()) TessVertexOutData); + gluTessCallback(tess, GLU_END, (VOID(CALLBACK *)()) glEnd); + gluTessCallback(tess, GLU_ERROR, (VOID(CALLBACK *)()) TessError); + gluTessCallback(tess, GLU_TESS_COMBINE, (VOID(CALLBACK *)()) TessCombine); + gluTessNormal(tess, 0.0F, 0.0F, 1.0F); + + TessErrorOccurred = 0; + glNormal3f(0.0f, 0.0f, 1.0f); + v[2] = 0.0; + z_value = 0.0f; + + gluTessBeginPolygon(tess, (VOID *)*(INT *)&z_value); + + for (loop = (DWORD) *p++; loop; --loop) + { + gluTessBeginContour(tess); + + for (point = (DWORD) *p++; point; --point) + { + v[0] = p[0]; + v[1] = p[1]; + gluTessVertex(tess, v, p); + p += 2; + } + + gluTessEndContour(tess); + } + gluTessEndPolygon(tess); + + status = !TessErrorOccurred; + + /* Extrusion code */ + if (extrusion) + { + DWORD loops; + GLfloat thickness = (GLfloat) - extrusion; + FLOAT *vert, *vert2; + DWORD count; + + p = save_p; + loops = (DWORD) *p++; + + for (loop = 0; loop < loops; loop++) + { + GLfloat dx, dy, len; + DWORD last; + + count = (DWORD) *p++; + glBegin(GL_QUAD_STRIP); + + /* Check if the first and last vertex are identical + * so we don't draw the same quad twice. + */ + vert = p + (count-1)*2; + last = (p[0] == vert[0] && p[1] == vert[1]) ? count-1 : count; + + for (point = 0; point <= last; point++) + { + vert = p + 2 * (point % last); + vert2 = p + 2 * ((point+1) % last); + + dx = vert[0] - vert2[0]; + dy = vert[1] - vert2[1]; + len = (GLfloat)sqrt(dx * dx + dy * dy); + + glNormal3f(dy / len, -dx / len, 0.0f); + glVertex3f((GLfloat) vert[0], + (GLfloat) vert[1], thickness); + glVertex3f((GLfloat) vert[0], + (GLfloat) vert[1], 0.0f); + } + + glEnd(); + p += count*2; + } + + /* Draw the back face */ + p = save_p; + v[2] = thickness; + glNormal3f(0.0f, 0.0f, -1.0f); + gluTessNormal(tess, 0.0F, 0.0F, -1.0F); + + gluTessBeginPolygon(tess, (VOID *)*(INT *)&thickness); + + for (loop = (DWORD) *p++; loop; --loop) + { + count = (DWORD) *p++; + + gluTessBeginContour(tess); + + for (point = 0; point < count; point++) + { + vert = p + ((count-point-1)<<1); + v[0] = vert[0]; + v[1] = vert[1]; + gluTessVertex(tess, v, vert); + } + p += count*2; + + gluTessEndContour(tess); + } + gluTessEndPolygon(tess); + } + +#if !defined(NDEBUG) + if (TessErrorOccurred) + DBGPRINT("Tessellation error %s\n", gluErrorString(TessErrorOccurred)); +#endif + } + + +exit: + FreeLineBuf(); + if (tess) + gluDeleteTess(tess); + + FreeVertBuf(); + return status; +} + + +/***************************************************************************** +* MakeDisplayListFromGlyph +* +* Converts the outline of a glyph to an OpenGL display list. +* +* Return value is nonzero for success, zero for failure. +* +* Does not check for OpenGL errors, so if the caller needs to know about them, +* it should call glGetError(). +*****************************************************************************/ + +INT MakeDisplayListFromGlyph(DWORD listName, UCHAR* glyphBuf, DWORD glyphSize, LPGLYPHMETRICSFLOAT glyphMetricsFloat, + FLOAT chordalDeviation, FLOAT extrusion, INT format) +{ + INT status; + + glNewList(listName, GL_COMPILE); + status = DrawGlyph(glyphBuf, glyphSize, chordalDeviation, extrusion, format); + glTranslatef(glyphMetricsFloat->gmfCellIncX, glyphMetricsFloat->gmfCellIncY, 0.0F); + glEndList(); + + return status; +} + +// *********************************************************************** + +/***************************************************************************** +* IntUseFontBitmaps +* +* Converts a subrange of the glyphs in a GDI font to OpenGL display +* lists. +* +* Extended to support any GDI font, not just TrueType fonts. (DaveM) +* +*****************************************************************************/ + +BOOL APIENTRY IntUseFontBitmapsW(HDC hDC, DWORD first, DWORD count, DWORD listBase) +{ + INT i, ox, oy, ix, iy; + INT w = 0, h = 0; + INT iBufSize, iCurBufSize = 0; + DWORD *bitmapBuffer = NULL; + DWORD *invertedBitmapBuffer = NULL; + BOOL bSuccessOrFail = TRUE; + BOOL bTrueType = FALSE; + TEXTMETRIC tm; + GLYPHMETRICS gm; + RASTERIZER_STATUS rs; + MAT2 mat; + SIZE size; + RECT rect; + HDC hDCMem; + HBITMAP hBitmap; + BITMAPINFO bmi; + HFONT hFont; + + // Set up a unity matrix. + ZeroMemory(&mat, sizeof(mat)); + mat.eM11.value = 1; + mat.eM22.value = 1; + + // Test to see if selected font is TrueType or not + ZeroMemory(&tm, sizeof(tm)); + if (!GetTextMetrics(hDC, &tm)) + { + DBGPRINT("Font metrics error\n"); + return FALSE; + } + bTrueType = (tm.tmPitchAndFamily & TMPF_TRUETYPE) ? TRUE : FALSE; + + // Test to see if TRUE-TYPE capabilities are installed + // (only necessary if TrueType font selected) + ZeroMemory(&rs, sizeof(rs)); + + if (bTrueType) + { + if (!GetRasterizerCaps (&rs, sizeof (RASTERIZER_STATUS)) || !(rs.wFlags & TT_ENABLED)) + { + DBGPRINT("No TrueType caps\n"); + bTrueType = FALSE; + } + } + + // Trick to get the current font handle + hFont = SelectObject(hDC, GetStockObject(SYSTEM_FONT)); + SelectObject(hDC, hFont); + + // Have memory device context available for holding bitmaps of font glyphs + hDCMem = CreateCompatibleDC(hDC); + SelectObject(hDCMem, hFont); + SetTextColor(hDCMem, RGB(0xFF, 0xFF, 0xFF)); + SetBkColor(hDCMem, 0); + + for (i = first; (DWORD) i < (first + count); i++) + { + // Find out how much space is needed for the bitmap so we can + // Set the buffer size correctly. + if (bTrueType) + { + // Use TrueType support to get bitmap size of glyph + iBufSize = GetGlyphOutline(hDC, i, GGO_BITMAP, &gm, 0, NULL, &mat); + if (iBufSize == GDI_ERROR) + { + bSuccessOrFail = FALSE; + break; + } + } + else + { + // Use generic GDI support to compute bitmap size of glyph + w = tm.tmMaxCharWidth; + h = tm.tmHeight; + if (GetTextExtentPoint32(hDC, (LPCTSTR)&i, 1, &size)) + { + w = size.cx; + h = size.cy; + } + iBufSize = w * h; + // Use DWORD multiple for compatibility + iBufSize += 3; + iBufSize /= 4; + iBufSize *= 4; + } + + // If we need to allocate Larger Buffers, then do so - but allocate + // An extra 50 % so that we don't do too many mallocs ! + if (iBufSize > iCurBufSize) + { + if (bitmapBuffer) + { + HeapFree(GetProcessHeap(), 0, bitmapBuffer); + } + if (invertedBitmapBuffer) + { + HeapFree(GetProcessHeap(), 0, invertedBitmapBuffer); + } + + iCurBufSize = iBufSize * 2; + bitmapBuffer = (DWORD *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, iCurBufSize); + invertedBitmapBuffer = (DWORD *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, iCurBufSize); + + if (bitmapBuffer == NULL || invertedBitmapBuffer == NULL) + { + bSuccessOrFail = FALSE; + break; + } + } + + // If we fail to get the Glyph data, delete the display lists + // Created so far and return FALSE. + if (bTrueType) + { + // Use TrueType support to get bitmap of glyph + if (GetGlyphOutline(hDC, i, GGO_BITMAP, &gm, iBufSize, bitmapBuffer, &mat) == GDI_ERROR) + { + bSuccessOrFail = FALSE; + break; + } + + // Setup glBitmap parameters for current font glyph + w = gm.gmBlackBoxX; + h = gm.gmBlackBoxY; + ox = gm.gmptGlyphOrigin.x; + oy = gm.gmptGlyphOrigin.y; + ix = gm.gmCellIncX; + iy = gm.gmCellIncY; + } + else + { + // Use generic GDI support to create bitmap of glyph + ZeroMemory(bitmapBuffer, iBufSize); + + if (i >= tm.tmFirstChar && i <= tm.tmLastChar) + { + // Only create bitmaps for actual font glyphs + hBitmap = CreateBitmap(w, h, 1, 1, NULL); + SelectObject(hDCMem, hBitmap); + // Make bitmap of current font glyph + SetRect(&rect, 0, 0, w, h); + DrawText(hDCMem, (LPCTSTR)&i, 1, &rect, + DT_LEFT | DT_BOTTOM | DT_SINGLELINE | DT_NOCLIP); + // Make copy of bitmap in our local buffer + ZeroMemory(&bmi, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi.bmiHeader.biWidth = w; + bmi.bmiHeader.biHeight = -h; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 1; + bmi.bmiHeader.biCompression = BI_RGB; + GetDIBits(hDCMem, hBitmap, 0, h, bitmapBuffer, &bmi, 0); + DeleteObject(hBitmap); + } + else + { + // Otherwise use empty display list for non-existing glyph + iBufSize = 0; + } + + // Setup glBitmap parameters for current font glyph + ox = 0; + oy = tm.tmDescent; + ix = w; + iy = 0; + } + + // Create an OpenGL display list. + glNewList((listBase + i), GL_COMPILE); + + // Some fonts have no data for the space character, yet advertise + // a non-zero size. + if (0 == iBufSize) + { + glBitmap(0, 0, 0.0f, 0.0f, (GLfloat) ix, (GLfloat) iy, NULL); + } + else + { + // Invert the Glyph data. + InvertGlyphBitmap(w, h, bitmapBuffer, invertedBitmapBuffer); + + // Render an OpenGL bitmap and invert the origin. + glBitmap(w, h, + (GLfloat) ox, (GLfloat) (h-oy), + (GLfloat) ix, (GLfloat) iy, + (GLubyte *) invertedBitmapBuffer); + } + + // Close this display list. + glEndList(); + } + + if (bSuccessOrFail == FALSE) + { + DBGPRINT("DGL_UseFontBitmaps: Get glyph failed\n"); + glDeleteLists((i+listBase), (i-first)); + } + + // Release resources used + DeleteObject(hFont); + DeleteDC(hDCMem); + + if (bitmapBuffer) + HeapFree(GetProcessHeap(), 0, bitmapBuffer); + + if (invertedBitmapBuffer) + HeapFree(GetProcessHeap(), 0, invertedBitmapBuffer); + + return(bSuccessOrFail); +} + +BOOL APIENTRY IntUseFontBitmapsA(HDC hDC, DWORD first, DWORD count, DWORD listBase) +{ + /* Just call IntUseFontBitmapsW for now */ + return IntUseFontBitmapsW(hDC, first, count, listBase); +} + + + +/***************************************************************************** +* IntUseFontOutlines +* +* Converts a subrange of the glyphs in a TrueType font to OpenGL display +* lists. +*****************************************************************************/ + +BOOL APIENTRY IntUseFontOutlinesW(HDC hDC, DWORD first, DWORD count, DWORD listBase, FLOAT chordalDeviation, + FLOAT extrusion, INT format, GLYPHMETRICSFLOAT *glyphMetricsFloatArray) +{ + DWORD glyphIndex; + UCHAR* glyphBuf; + DWORD glyphBufSize; + + /* + * Flush any previous OpenGL errors. This allows us to check for + * new errors so they can be reported via the function return value. + */ + while (glGetError() != GL_NO_ERROR); + + /* + * Make sure that the current font can be sampled accurately. + */ + hNewFont = CreateHighResolutionFont(hDC); + + if (!hNewFont) + return FALSE; + + hOldFont = SelectObject(hDC, hNewFont); + if (!hOldFont) + return FALSE; + + /* + * Preallocate a buffer for the outline data, and track its size: + */ + glyphBuf = (UCHAR*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, glyphBufSize = 10240); + + if (!glyphBuf) + return FALSE; /*WGL_STATUS_NOT_ENOUGH_MEMORY*/ + + /* + * Process each glyph in the given range: + */ + for (glyphIndex = first; glyphIndex - first < count; ++glyphIndex) + { + GLYPHMETRICS glyphMetrics; + DWORD glyphSize; + static MAT2 matrix = + { + {0, 1}, {0, 0}, + {0, 0}, {0, 1} + }; + LPGLYPHMETRICSFLOAT glyphMetricsFloat = &glyphMetricsFloatArray[glyphIndex - first]; + + /* + * Determine how much space is needed to store the glyph's + * outlines. If our glyph buffer isn't large enough, + * resize it. + */ + + glyphSize = GetGlyphOutline(hDC, glyphIndex, GGO_NATIVE, &glyphMetrics, 0, NULL, &matrix); + + if (glyphSize < 0) + return FALSE; /*WGL_STATUS_FAILURE*/ + + if (glyphSize > glyphBufSize) + { + HeapFree(GetProcessHeap(), 0, glyphBuf); + glyphBuf = (UCHAR*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, glyphBufSize = glyphSize); + if (!glyphBuf) + return FALSE; /*WGL_STATUS_NOT_ENOUGH_MEMORY*/ + } + + + /* + * Get the glyph's outlines. + */ + if (GetGlyphOutline(hDC, glyphIndex, GGO_NATIVE, &glyphMetrics, glyphBufSize, glyphBuf, &matrix) < 0) + { + HeapFree(GetProcessHeap(), 0, glyphBuf); + return FALSE; /*WGL_STATUS_FAILURE*/ + } + + glyphMetricsFloat->gmfBlackBoxX = + (FLOAT) glyphMetrics.gmBlackBoxX * ScaleFactor; + glyphMetricsFloat->gmfBlackBoxY = + (FLOAT) glyphMetrics.gmBlackBoxY * ScaleFactor; + glyphMetricsFloat->gmfptGlyphOrigin.x = + (FLOAT) glyphMetrics.gmptGlyphOrigin.x * ScaleFactor; + glyphMetricsFloat->gmfptGlyphOrigin.y = + (FLOAT) glyphMetrics.gmptGlyphOrigin.y * ScaleFactor; + glyphMetricsFloat->gmfCellIncX = + (FLOAT) glyphMetrics.gmCellIncX * ScaleFactor; + glyphMetricsFloat->gmfCellIncY = + (FLOAT) glyphMetrics.gmCellIncY * ScaleFactor; + + /* + * Turn the glyph into a display list: + */ + if (!MakeDisplayListFromGlyph((glyphIndex - first) + listBase, glyphBuf, glyphSize, glyphMetricsFloat, + chordalDeviation + ScaleFactor, extrusion, format)) + { + HeapFree(GetProcessHeap(), 0, glyphBuf); + return FALSE; /*WGL_STATUS_FAILURE*/ + } + } + + /* + * Clean up temporary storage and return. If an error occurred, + * clear all OpenGL error flags and return FAILURE status; + * otherwise just return SUCCESS. + */ + HeapFree(GetProcessHeap(), 0, glyphBuf); + + DeleteObject(SelectObject(hDC, hOldFont)); + + if (glGetError() == GL_NO_ERROR) + { + return TRUE; /*WGL_STATUS_SUCCESS*/ + } + else + { + while (glGetError() != GL_NO_ERROR); + + return FALSE; /*WGL_STATUS_FAILURE*/ + } +} + +BOOL APIENTRY IntUseFontOutlinesA(HDC hDC, DWORD first, DWORD count, DWORD listBase, FLOAT chordalDeviation, + FLOAT extrusion, INT format, GLYPHMETRICSFLOAT *glyphMetricsFloatArray) +{ + /* Just call IntUseFontOutlinesW for now */ + return IntUseFontOutlinesW(hDC, first, count, listBase, chordalDeviation, extrusion, format, glyphMetricsFloatArray); +} Propchange: trunk/reactos/dll/win32/opengl32/font.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/opengl32/opengl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.h [iso-8859-1] Wed Sep 30 14:12:56 2009 @@ -40,6 +40,7 @@ #include <ndk/ntndk.h> #include <GL/gl.h> +#include <GL/glu.h> /* gl function list */ #include "glfuncs.h" @@ -190,6 +191,14 @@ GLDRIVERDATA *OPENGL32_LoadICD( LPCWSTR driver ); BOOL OPENGL32_UnloadICD( GLDRIVERDATA *icd ); BOOL APIENTRY rosglMakeCurrent( HDC hdc, HGLRC hglrc ); +BOOL APIENTRY IntUseFontBitmapsA( HDC hDC, DWORD first, DWORD count, DWORD listBase ); +BOOL APIENTRY IntUseFontBitmapsW( HDC hDC, DWORD first, DWORD count, DWORD listBase ); +BOOL APIENTRY IntUseFontOutlinesA( HDC hDC, DWORD first, DWORD count, DWORD listBase, + FLOAT chordalDeviation, FLOAT extrusion, INT format, + GLYPHMETRICSFLOAT *glyphMetricsFloatArray ); +BOOL APIENTRY IntUseFontOutlinesW( HDC hDC, DWORD first, DWORD count, DWORD listBase, + FLOAT chordalDeviation, FLOAT extrusion, INT format, + GLYPHMETRICSFLOAT *glyphMetricsFloatArray ); /* empty gl functions from gl.c */ int WINAPI glEmptyFunc0( void ); Modified: trunk/reactos/dll/win32/opengl32/opengl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.rbuild [iso-8859-1] Wed Sep 30 14:12:56 2009 @@ -5,7 +5,9 @@ <library>gdi32</library> <library>user32</library> <library>advapi32</library> + <library>glu32</library> <pch>opengl32.h</pch> + <file>font.c</file> <file>gl.c</file> <file>opengl32.c</file> <file>wgl.c</file> Modified: trunk/reactos/dll/win32/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/wgl.c?r… ============================================================================== --- trunk/reactos/dll/win32/opengl32/wgl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/wgl.c [iso-8859-1] Wed Sep 30 14:12:56 2009 @@ -1209,23 +1209,18 @@ BOOL APIENTRY -rosglUseFontBitmapsA( HDC hdc, DWORD first, DWORD count, DWORD listBase ) -{ - UNIMPLEMENTED; - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; -} - - -BOOL -APIENTRY -rosglUseFontBitmapsW( HDC hdc, DWORD first, DWORD count, DWORD listBase ) -{ - UNIMPLEMENTED; - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; -} - +rosglUseFontBitmapsA( HDC hdc, DWORD first, DWORD count, DWORD listBase ) +{ + return IntUseFontBitmapsA(hdc, first, count, listBase); +} + + +BOOL +APIENTRY +rosglUseFontBitmapsW( HDC hdc, DWORD first, DWORD count, DWORD listBase ) +{ + return IntUseFontBitmapsW(hdc, first, count, listBase); +} BOOL APIENTRY @@ -1233,9 +1228,7 @@ FLOAT deviation, FLOAT extrusion, int format, GLYPHMETRICSFLOAT *pgmf ) { - UNIMPLEMENTED; - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + return IntUseFontOutlinesA(hdc, first, count, listBase, deviation, extrusion, format, pgmf); } @@ -1245,9 +1238,7 @@ FLOAT deviation, FLOAT extrusion, int format, GLYPHMETRICSFLOAT *pgmf ) { - UNIMPLEMENTED; - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + return IntUseFontOutlinesW(hdc, first, count, listBase, deviation, extrusion, format, pgmf); } #ifdef __cplusplus

14 years, 11 months

[janderwald] 43231: - Store destination line in LineList - Implement WdmAudGetLineInfo for MIXER_GETLINEINFOF_LINEID - Add a hack for WdmAudGetLineControls for MIXER_GETLINECONTROLSF_ONEBYTYPE

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Sep 30 12:32:15 2009 New Revision: 43231 URL: http://svn.reactos.org/svn/reactos?rev=43231&view=rev Log: - Store destination line in LineList - Implement WdmAudGetLineInfo for MIXER_GETLINEINFOF_LINEID - Add a hack for WdmAudGetLineControls for MIXER_GETLINECONTROLSF_ONEBYTYPE Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] Wed Sep 30 12:32:15 2009 @@ -22,21 +22,22 @@ const GUID KSNODETYPE_REVERB = {0xEF0328E0L, 0xC558, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; const GUID KSNODETYPE_SUPERMIX = {0xE573ADC0L, 0xC555, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; - -LPMIXERLINE_SOURCE +#define DESTINATION_LINE 0xFFFF0000 + +LPMIXERLINE_EXT GetSourceMixerLine( LPMIXER_INFO MixerInfo, DWORD dwSource) { PLIST_ENTRY Entry; - LPMIXERLINE_SOURCE MixerLineSrc; + LPMIXERLINE_EXT MixerLineSrc; /* get first entry */ - Entry = MixerInfo->SourceLineList.Flink; - - while(Entry != &MixerInfo->SourceLineList) - { - MixerLineSrc = (LPMIXERLINE_SOURCE)CONTAINING_RECORD(Entry, MIXERLINE_SOURCE, Entry); + Entry = MixerInfo->LineList.Flink; + + while(Entry != &MixerInfo->LineList) + { + MixerLineSrc = (LPMIXERLINE_EXT)CONTAINING_RECORD(Entry, MIXERLINE_EXT, Entry); DPRINT("dwSource %x dwSource %x\n", MixerLineSrc->Line.dwSource, dwSource); if (MixerLineSrc->Line.dwSource == dwSource) return MixerLineSrc; @@ -47,20 +48,20 @@ return NULL; } -LPMIXERLINE_SOURCE +LPMIXERLINE_EXT GetSourceMixerLineByLineId( LPMIXER_INFO MixerInfo, DWORD dwLineID) { PLIST_ENTRY Entry; - LPMIXERLINE_SOURCE MixerLineSrc; + LPMIXERLINE_EXT MixerLineSrc; /* get first entry */ - Entry = MixerInfo->SourceLineList.Flink; - - while(Entry != &MixerInfo->SourceLineList) - { - MixerLineSrc = (LPMIXERLINE_SOURCE)CONTAINING_RECORD(Entry, MIXERLINE_SOURCE, Entry); + Entry = MixerInfo->LineList.Flink; + + while(Entry != &MixerInfo->LineList) + { + MixerLineSrc = (LPMIXERLINE_EXT)CONTAINING_RECORD(Entry, MIXERLINE_EXT, Entry); DPRINT("dwLineID %x dwLineID %x\n", MixerLineSrc->Line.dwLineID, dwLineID); if (MixerLineSrc->Line.dwLineID == dwLineID) return MixerLineSrc; @@ -686,7 +687,7 @@ IN PFILE_OBJECT FileObject, IN ULONG PinId) { - LPMIXERLINE_SOURCE SrcLine; + LPMIXERLINE_EXT SrcLine, DstLine; NTSTATUS Status; KSP_PIN Pin; LPWSTR PinName; @@ -694,26 +695,29 @@ ULONG BytesReturned; /* allocate src mixer line */ - SrcLine = (LPMIXERLINE_SOURCE)ExAllocatePool(NonPagedPool, sizeof(MIXERLINE_SOURCE)); + SrcLine = (LPMIXERLINE_EXT)ExAllocatePool(NonPagedPool, sizeof(MIXERLINE_EXT)); if (!SrcLine) return STATUS_INSUFFICIENT_RESOURCES; /* zero struct */ - RtlZeroMemory(SrcLine, sizeof(MIXERLINE_SOURCE)); + RtlZeroMemory(SrcLine, sizeof(MIXERLINE_EXT)); /* initialize mixer src line */ SrcLine->FileObject = FileObject; SrcLine->PinId = PinId; SrcLine->Line.cbStruct = sizeof(MIXERLINEW); + /* get destination line */ + DstLine = GetSourceMixerLineByLineId(MixerInfo, DESTINATION_LINE); + /* initialize mixer destination line */ SrcLine->Line.cbStruct = sizeof(MIXERLINEW); SrcLine->Line.dwDestination = 0; - SrcLine->Line.dwSource = MixerInfo->DestinationLine.cConnections; - SrcLine->Line.dwLineID = (MixerInfo->DestinationLine.cConnections * 0x10000); + SrcLine->Line.dwSource = DstLine->Line.cConnections; + SrcLine->Line.dwLineID = (DstLine->Line.cConnections * 0x10000); SrcLine->Line.fdwLine = MIXERLINE_LINEF_ACTIVE | MIXERLINE_LINEF_SOURCE; SrcLine->Line.dwUser = 0; - SrcLine->Line.cChannels = MixerInfo->DestinationLine.cChannels; + SrcLine->Line.cChannels = DstLine->Line.cChannels; SrcLine->Line.cConnections = 0; SrcLine->Line.cControls = 1; //FIXME @@ -789,7 +793,7 @@ } SrcLine->Line.Target.dwType = 1; - SrcLine->Line.Target.dwDeviceID = MixerInfo->DestinationLine.Target.dwDeviceID; + SrcLine->Line.Target.dwDeviceID = DstLine->Line.Target.dwDeviceID; SrcLine->Line.Target.wMid = MixerInfo->MixCaps.wMid; SrcLine->Line.Target.wPid = MixerInfo->MixCaps.wPid; SrcLine->Line.Target.vDriverVersion = MixerInfo->MixCaps.vDriverVersion; @@ -797,8 +801,8 @@ /* insert src line */ - InsertTailList(&MixerInfo->SourceLineList, &SrcLine->Entry); - MixerInfo->DestinationLine.cConnections++; + InsertTailList(&MixerInfo->LineList, &SrcLine->Entry); + DstLine->Line.cConnections++; return STATUS_SUCCESS; } @@ -991,6 +995,11 @@ PULONG Pins; ULONG Index; PKSPIN_PHYSICALCONNECTION OutConnection; + LPMIXERLINE_EXT DestinationLine; + + DestinationLine = ExAllocatePool(NonPagedPool, sizeof(MIXERLINE_EXT)); + if (!DestinationLine) + return STATUS_INSUFFICIENT_RESOURCES; /* initialize mixer info */ MixerInfo->hMixer = hDevice; @@ -1022,26 +1031,29 @@ } /* initialize mixer destination line */ - MixerInfo->DestinationLine.cbStruct = sizeof(MIXERLINEW); - MixerInfo->DestinationLine.dwSource = MAXULONG; - MixerInfo->DestinationLine.dwLineID = 0xFFFF0000; - MixerInfo->DestinationLine.fdwLine = MIXERLINE_LINEF_ACTIVE; - MixerInfo->DestinationLine.dwUser = 0; - MixerInfo->DestinationLine.dwComponentType = (bInput == 0 ? MIXERLINE_COMPONENTTYPE_DST_SPEAKERS : MIXERLINE_COMPONENTTYPE_DST_WAVEIN); - MixerInfo->DestinationLine.cChannels = 2; //FIXME - MixerInfo->DestinationLine.cControls = 0; //FIXME - wcscpy(MixerInfo->DestinationLine.szShortName, L"Summe"); //FIXME - wcscpy(MixerInfo->DestinationLine.szName, L"Summe"); //FIXME - MixerInfo->DestinationLine.Target.dwType = (bInput == 0 ? MIXERLINE_TARGETTYPE_WAVEOUT : MIXERLINE_TARGETTYPE_WAVEIN); - MixerInfo->DestinationLine.Target.dwDeviceID = !bInput; - MixerInfo->DestinationLine.Target.wMid = MixerInfo->MixCaps.wMid; - MixerInfo->DestinationLine.Target.wPid = MixerInfo->MixCaps.wPid; - MixerInfo->DestinationLine.Target.vDriverVersion = MixerInfo->MixCaps.vDriverVersion; - wcscpy(MixerInfo->DestinationLine.Target.szPname, MixerInfo->MixCaps.szPname); - + RtlZeroMemory(DestinationLine, sizeof(MIXERLINEW)); + DestinationLine->Line.cbStruct = sizeof(MIXERLINEW); + DestinationLine->Line.dwSource = MAXULONG; + DestinationLine->Line.dwLineID = DESTINATION_LINE; + DestinationLine->Line.fdwLine = MIXERLINE_LINEF_ACTIVE; + DestinationLine->Line.dwUser = 0; + DestinationLine->Line.dwComponentType = (bInput == 0 ? MIXERLINE_COMPONENTTYPE_DST_SPEAKERS : MIXERLINE_COMPONENTTYPE_DST_WAVEIN); + DestinationLine->Line.cChannels = 2; //FIXME + DestinationLine->Line.cControls = 0; //FIXME + wcscpy(DestinationLine->Line.szShortName, L"Summe"); //FIXME + wcscpy(DestinationLine->Line.szName, L"Summe"); //FIXME + DestinationLine->Line.Target.dwType = (bInput == 0 ? MIXERLINE_TARGETTYPE_WAVEOUT : MIXERLINE_TARGETTYPE_WAVEIN); + DestinationLine->Line.Target.dwDeviceID = !bInput; + DestinationLine->Line.Target.wMid = MixerInfo->MixCaps.wMid; + DestinationLine->Line.Target.wPid = MixerInfo->MixCaps.wPid; + DestinationLine->Line.Target.vDriverVersion = MixerInfo->MixCaps.vDriverVersion; + wcscpy(DestinationLine->Line.Target.szPname, MixerInfo->MixCaps.szPname); /* initialize source line list */ - InitializeListHead(&MixerInfo->SourceLineList); + InitializeListHead(&MixerInfo->LineList); + + /* insert destination line */ + InsertHeadList(&MixerInfo->LineList, &DestinationLine->Entry); Pins = AllocatePinArray(PinCount); if (!Pins) @@ -1274,7 +1286,7 @@ IN PWDMAUD_CLIENT ClientInfo) { PWDMAUD_DEVICE_EXTENSION DeviceExtension; - LPMIXERLINE_SOURCE MixerLineSrc; + LPMIXERLINE_EXT MixerLineSrc; /* get device extension */ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -1292,9 +1304,11 @@ /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } + MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DESTINATION_LINE); + ASSERT(MixerLineSrc); /* copy cached data */ - RtlCopyMemory(&DeviceInfo->u.MixLine, &DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice].DestinationLine, sizeof(MIXERLINEW)); + RtlCopyMemory(&DeviceInfo->u.MixLine, &MixerLineSrc->Line, sizeof(MIXERLINEW)); return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); } else if (DeviceInfo->Flags == MIXER_GETLINEINFOF_SOURCE) @@ -1305,9 +1319,12 @@ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - if (DeviceInfo->u.MixLine.dwSource >= DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice].DestinationLine.cConnections) - { - DPRINT1("dwSource %u Destinations %u\n", DeviceInfo->u.MixLine.dwSource, DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice].DestinationLine.cConnections); + MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DESTINATION_LINE); + ASSERT(MixerLineSrc); + + if (DeviceInfo->u.MixLine.dwSource >= MixerLineSrc->Line.cConnections) + { + DPRINT1("dwSource %u Destinations %u\n", DeviceInfo->u.MixLine.dwSource, MixerLineSrc->Line.cConnections); /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } @@ -1320,6 +1337,22 @@ } return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); } + else if (DeviceInfo->Flags == MIXER_GETLINEINFOF_LINEID) + { + if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + { + /* invalid parameter */ + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwLineID); + ASSERT(MixerLineSrc); + + /* copy cached data */ + RtlCopyMemory(&DeviceInfo->u.MixLine, &MixerLineSrc->Line, sizeof(MIXERLINEW)); + return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); + } + DPRINT1("Flags %x\n", DeviceInfo->Flags); UNIMPLEMENTED; @@ -1337,7 +1370,7 @@ IN PWDMAUD_DEVICE_INFO DeviceInfo, IN PWDMAUD_CLIENT ClientInfo) { - LPMIXERLINE_SOURCE MixerLineSrc; + LPMIXERLINE_EXT MixerLineSrc; PWDMAUD_DEVICE_EXTENSION DeviceExtension; /* get device extension */ @@ -1358,9 +1391,25 @@ RtlMoveMemory(DeviceInfo->u.MixControls.pamxctrl, MixerLineSrc->LineControls, min(MixerLineSrc->Line.cControls, DeviceInfo->u.MixControls.cControls) * sizeof(MIXERLINECONTROLSW)); } return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); - - - + } + else if (DeviceInfo->Flags == MIXER_GETLINECONTROLSF_ONEBYTYPE) + { + DPRINT1("dwLineID %u\n",DeviceInfo->u.MixControls.dwLineID); + UNIMPLEMENTED + //HACK + if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + { + /* invalid parameter */ + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwLineID); + ASSERT(MixerLineSrc); + if (MixerLineSrc) + { + RtlMoveMemory(DeviceInfo->u.MixControls.pamxctrl, MixerLineSrc->LineControls, min(MixerLineSrc->Line.cControls, DeviceInfo->u.MixControls.cControls) * sizeof(MIXERLINECONTROLSW)); + } + return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); } UNIMPLEMENTED; Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Wed Sep 30 12:32:15 2009 @@ -40,7 +40,7 @@ PFILE_OBJECT FileObject; MIXERLINEW Line; LPMIXERCONTROLW LineControls; -}MIXERLINE_SOURCE, *LPMIXERLINE_SOURCE; +}MIXERLINE_EXT, *LPMIXERLINE_EXT; typedef struct @@ -49,9 +49,8 @@ PFILE_OBJECT MixerFileObject; MIXERCAPSW MixCaps; - MIXERLINEW DestinationLine; - LIST_ENTRY SourceLineList; + LIST_ENTRY LineList; }MIXER_INFO, *LPMIXER_INFO;

14 years, 11 months

[cgutman] 43230: - Uncomment some SYN handling code - Enable a ROS-specific hack because oskittcp doesn't know about all interfaces in the system - Small cleanup of code

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Sep 30 05:44:44 2009 New Revision: 43230 URL: http://svn.reactos.org/svn/reactos?rev=43230&view=rev Log: - Uncomment some SYN handling code - Enable a ROS-specific hack because oskittcp doesn't know about all interfaces in the system - Small cleanup of code Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_output.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] Wed Sep 30 05:44:44 2009 @@ -301,7 +301,7 @@ } #endif -#ifdef notdef +#ifdef __REACTOS__ /* * If source address not specified yet, use address * of outgoing interface. Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_output.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_output.c [iso-8859-1] Wed Sep 30 05:44:44 2009 @@ -86,9 +86,6 @@ int idle, sendalot; struct rmxp_tao *taop; struct rmxp_tao tao_noncached; -#ifdef __REACTOS__ - struct mbuf *n; -#endif OS_DbgPrint(OSK_MID_TRACE,("Called\n")); @@ -411,7 +408,6 @@ * CC or CC.new. */ case TH_SYN: -#if 0 opt[optlen++] = TCPOPT_NOP; opt[optlen++] = TCPOPT_NOP; opt[optlen++] = tp->t_flags & TF_SENDCCNEW ? @@ -419,7 +415,6 @@ opt[optlen++] = TCPOLEN_CC; *(u_int32_t *)&opt[optlen] = htonl(tp->cc_send); optlen += 4; -#endif break; /* @@ -742,8 +737,7 @@ data block */ while (NULL != m) { m->m_flags &= ~M_EXT; - MFREE(m, n); - m = n; + m = m_free(m); } #endif }

14 years, 11 months

[cgutman] 43229: - Fix a nasty bug that caused us to exit the loop before sending all the data

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Sep 30 03:30:45 2009 New Revision: 43229 URL: http://svn.reactos.org/svn/reactos?rev=43229&view=rev Log: - Fix a nasty bug that caused us to exit the loop before sending all the data Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] Wed Sep 30 03:30:45 2009 @@ -522,7 +522,6 @@ error = OtcpEvent.PacketSend( OtcpEvent.ClientData, (OSK_PCHAR)new_m->m_data, new_m->m_len ); m_free( new_m ); - goto done; } OS_DbgPrint(OSK_MID_TRACE,("Error from upper layer: %d\n", error));

14 years, 11 months

[cgutman] 43228: - Sync the ACK hack with the last oskit release

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Sep 30 01:14:21 2009 New Revision: 43228 URL: http://svn.reactos.org/svn/reactos?rev=43228&view=rev Log: - Sync the ACK hack with the last oskit release Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c [iso-8859-1] Wed Sep 30 01:14:21 2009 @@ -84,7 +84,6 @@ * Set DELACK for segments received in order, but ack immediately * when segments are out of order (so fast retransmit can work). */ -#ifdef TCP_ACK_HACK #define TCP_REASS(tp, ti, m, so, flags) { \ if ((ti)->ti_seq == (tp)->rcv_nxt && \ (tp)->seg_next == (struct tcpiphdr *)(tp) && \ @@ -104,24 +103,6 @@ tp->t_flags |= TF_ACKNOW; \ } \ } -#else -#define TCP_REASS(tp, ti, m, so, flags) { \ - if ((ti)->ti_seq == (tp)->rcv_nxt && \ - (tp)->seg_next == (struct tcpiphdr *)(tp) && \ - (tp)->t_state == TCPS_ESTABLISHED) { \ - tp->t_flags |= TF_DELACK; \ - (tp)->rcv_nxt += (ti)->ti_len; \ - flags = (ti)->ti_flags & TH_FIN; \ - tcpstat.tcps_rcvpack++;\ - tcpstat.tcps_rcvbyte += (ti)->ti_len;\ - sbappend(&(so)->so_rcv, (m)); \ - sorwakeup(so); \ - } else { \ - (flags) = tcp_reass((tp), (ti), (m)); \ - tp->t_flags |= TF_ACKNOW; \ - } \ -} -#endif #ifndef TUBA_INCLUDE int @@ -592,7 +573,6 @@ */ sbappend(&so->so_rcv, m); sorwakeup(so); -#ifdef TCP_ACK_HACK /* * If this is a short packet, then ACK now - with Nagel * congestion avoidance sender won't send more until @@ -604,9 +584,6 @@ } else { tp->t_flags |= TF_DELACK; } -#else - tp->t_flags |= TF_DELACK; -#endif return; } }

14 years, 11 months

[hpoussin] 43227: Reapply r43141: Remove now unneeded ARC cdrom hack in NTLDR boot-style. We're now able to boot from a LiveCD, even if ReactOS directory is not "reactos" Keep the existing hack for FreeLdr boot-style, which should be removed one day

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Sep 29 22:01:20 2009 New Revision: 43227 URL: http://svn.reactos.org/svn/reactos?rev=43227&view=rev Log: Reapply r43141: Remove now unneeded ARC cdrom hack in NTLDR boot-style. We're now able to boot from a LiveCD, even if ReactOS directory is not "reactos" Keep the existing hack for FreeLdr boot-style, which should be removed one day Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] Tue Sep 29 22:01:20 2009 @@ -17,6 +17,7 @@ UNICODE_STRING IoArcHalDeviceName, IoArcBootDeviceName; PCHAR IoLoaderArcBootDeviceName; +extern PROS_LOADER_PARAMETER_BLOCK KeRosLoaderBlock; /* FUNCTIONS *****************************************************************/ @@ -278,7 +279,8 @@ BOOLEAN INIT_FUNCTION NTAPI -IopAssignArcNamesToCdrom(IN PULONG Buffer, +IopAssignArcNamesToCdrom(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PULONG Buffer, IN ULONG DiskNumber) { CHAR ArcBuffer[128]; @@ -292,6 +294,10 @@ ULONG i, CheckSum = 0; PDEVICE_OBJECT DeviceObject; PFILE_OBJECT FileObject; + PARC_DISK_INFORMATION ArcDiskInfo = LoaderBlock->ArcDiskInformation; + PLIST_ENTRY NextEntry; + PARC_DISK_SIGNATURE ArcDiskEntry; + BOOLEAN IsBootCdRom = FALSE; /* Build the device name */ sprintf(ArcBuffer, "\\Device\\CdRom%lu", DiskNumber); @@ -348,6 +354,28 @@ /* Now calculate the checksum */ for (i = 0; i < 2048 / sizeof(ULONG); i++) CheckSum += Buffer[i]; + if (KeRosLoaderBlock) goto freeldrhack; + + /* Search if this device is the actual boot CD */ + for (NextEntry = ArcDiskInfo->DiskSignatureListHead.Flink; + NextEntry != &ArcDiskInfo->DiskSignatureListHead; + NextEntry = NextEntry->Flink) + { + /* Get the current ARC disk signature entry */ + ArcDiskEntry = CONTAINING_RECORD(NextEntry, + ARC_DISK_SIGNATURE, + ListEntry); + /* And check if checksums and arc names match */ + if (CheckSum == ArcDiskEntry->CheckSum && + strcmp(KeLoaderBlock->ArcBootDeviceName, ArcDiskEntry->ArcName) == 0) + { + IsBootCdRom = TRUE; + break; + } + } + goto checkbootcd; + +freeldrhack: /* * FIXME: In normal conditions, NTLDR/FreeLdr sends the *proper* CDROM * ARC Path name, and what happens here is a comparision of both checksums @@ -363,7 +391,10 @@ * The signature code stays however, because eventually FreeLDR will work * like NTLDR, and, conversly, we do want to be able to be booted by NTLDR. */ - if (IopApplyRosCdromArcHack(DiskNumber)) + IsBootCdRom = IopApplyRosCdromArcHack(DiskNumber); + +checkbootcd: + if (IsBootCdRom) { /* This is the boot CD-ROM, build the ARC name */ sprintf(ArcBuffer, "\\ArcName\\%s", KeLoaderBlock->ArcBootDeviceName); @@ -583,7 +614,7 @@ for (i = 0; i < ConfigInfo->CdRomCount; i++) { /* Give it an ARC name */ - if (IopAssignArcNamesToCdrom(PartitionBuffer, i)) break; + if (IopAssignArcNamesToCdrom(LoaderBlock, PartitionBuffer, i)) break; } /* Free the buffer */

14 years, 11 months

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 September 2009