Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[tkreuzer] 36585: Improve memcpy. It was working correctly, but it wasted a cycle. ; -)
by tkreuzer＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: tkreuzer Date: Sun Sep 28 16:50:05 2008 New Revision: 36585 URL: http://svn.reactos.org/svn/reactos?rev=36585&view=rev Log: Improve memcpy. It was working correctly, but it wasted a cycle. ;-) Modified: trunk/reactos/lib/sdk/crt/mem/i386/memcpy_asm.s Modified: trunk/reactos/lib/sdk/crt/mem/i386/memcpy_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/i386/memcp… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/i386/memcpy_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/i386/memcpy_asm.s [iso-8859-1] Sun Sep 28 16:50:05 2008 @@ -23,13 +23,12 @@ /* * Make the destination dword aligned */ - mov %edi,%ecx - and $3,%ecx - sub $5,%ecx - not %ecx - sub %ecx,%edx - rep movsb - mov %edx,%ecx + mov %edi,%ecx + neg %ecx + and $3,%ecx + sub %ecx,%edx + rep movsb + mov %edx,%ecx .L2: shr $2,%ecx rep movsl

1 0

[tkreuzer] 36584: Extend ObjTypeInfo array to 32 entries. Fixes Coverity CID 538
by tkreuzer＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: tkreuzer Date: Sun Sep 28 16:25:24 2008 New Revision: 36584 URL: http://svn.reactos.org/svn/reactos?rev=36584&view=rev Log: Extend ObjTypeInfo array to 32 entries. Fixes Coverity CID 538 Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Sun Sep 28 16:25:24 2008 @@ -20,6 +20,8 @@ /* apparently the first 10 entries are never used in windows as they are empty */ #define RESERVE_ENTRIES_COUNT 10 +#define BASE_OBJTYPE_COUNT 32 + #define DelayExecution() \ DPRINT("%s:%i: Delay\n", __FILE__, __LINE__); \ KeDelayExecutionThread(KernelMode, FALSE, &ShortDelay) @@ -37,7 +39,7 @@ } OBJ_TYPE_INFO, *POBJ_TYPE_INFO; static const -OBJ_TYPE_INFO ObjTypeInfo[] = +OBJ_TYPE_INFO ObjTypeInfo[BASE_OBJTYPE_COUNT] = { {0, 0, 0, NULL}, /* 00 reserved entry */ {1, sizeof(DC), TAG_DC, DC_Cleanup}, /* 01 DC */ @@ -70,9 +72,8 @@ {0, 0, TAG_DRVOBJ, NULL}, /* 1c DRVOBJ, unused */ {0, 0, TAG_DCIOBJ, NULL}, /* 1d DCIOBJ, unused */ {0, 0, TAG_SPOOL, NULL}, /* 1e SPOOL, unused */ + {0, 0, 0, NULL}, /* 1f reserved entry */ }; - -#define BASE_OBJTYPE_COUNT (sizeof(ObjTypeInfo) / sizeof(ObjTypeInfo[0])) static LARGE_INTEGER ShortDelay;

1 0

[sginsberg] 36583: - Fix comments (no code change)
by sginsberg＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: sginsberg Date: Sun Sep 28 15:53:51 2008 New Revision: 36583 URL: http://svn.reactos.org/svn/reactos?rev=36583&view=rev Log: - Fix comments (no code change) Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=3658… ============================================================================== --- trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] Sun Sep 28 15:53:51 2008 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ke/apc.c - * PURPOSE: Implements the Asyncronous Procedure Call mechanism + * PURPOSE: Implements the Asynchronous Procedure Call mechanism * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ @@ -27,8 +27,8 @@ * @return None. * * @remarks This routine allows KeLeave/EnterCritical/GuardedRegion to be used - * as macro from inside WIN32K or other Drivers, which will then only - * have do an Import API call in the case where APCs are enabled again. + * as macros from inside WIN32K or other Drivers, which will then only + * have to do an Import API call in the case where APCs are enabled again. * *--*/ VOID @@ -49,7 +49,7 @@ { /* * If we're not at passive level it means someone raised IRQL - * to APC level before the a critical or guarded section was entered + * to APC level before the critical or guarded section was entered * (e.g) by a fast mutex). This implies that the APCs shouldn't * be delivered now, but after the IRQL is lowered to passive * level again. @@ -66,7 +66,7 @@ * scheduler environment exists. * * @param Apc - * Pointer to an initialized control object of type DPC for which the + * Pointer to an initialized control object of type APC for which the * caller provides the storage. * * @param PriorityBoost @@ -159,7 +159,7 @@ /* Now check if the Apc State Indexes match */ if (Thread->ApcStateIndex == Apc->ApcStateIndex) { - /* Check that if the thread matches */ + /* Check that the thread matches */ if (Thread == KeGetCurrentThread()) { /* Sanity check */ @@ -325,7 +325,7 @@ ApcListEntry = Thread->ApcState.ApcListHead[KernelMode].Flink; Apc = CONTAINING_RECORD(ApcListEntry, KAPC, ApcListEntry); - /* Save Parameters so that it's safe to free the Object in Kernel Routine*/ + /* Save Parameters so that it's safe to free the Object in the Kernel Routine*/ NormalRoutine = Apc->NormalRoutine; KernelRoutine = Apc->KernelRoutine; NormalContext = Apc->NormalContext; @@ -339,7 +339,7 @@ RemoveEntryList(ApcListEntry); Apc->Inserted = FALSE; - /* Rrelease the APC lock */ + /* Release the APC lock */ KiReleaseApcLock(&ApcLock); /* Call the Special APC */ @@ -396,14 +396,14 @@ (ULONG_PTR)NormalRoutine); } - /* Check if There still is a Normal Routine */ + /* Check if there still is a Normal Routine */ if (NormalRoutine) { /* At Passive Level, an APC can be prempted by a Special APC */ Thread->ApcState.KernelApcInProgress = TRUE; KeLowerIrql(PASSIVE_LEVEL); - /* Call and Raise IRQ back to APC_LEVEL */ + /* Call and Raise IRQL back to APC_LEVEL */ NormalRoutine(NormalContext, SystemArgument1, SystemArgument2); KeRaiseIrql(APC_LEVEL, &ApcLock.OldIrql); } @@ -436,7 +436,7 @@ ApcListEntry = Thread->ApcState.ApcListHead[UserMode].Flink; Apc = CONTAINING_RECORD(ApcListEntry, KAPC, ApcListEntry); - /* Save Parameters so that it's safe to free the Object in Kernel Routine*/ + /* Save Parameters so that it's safe to free the Object in the Kernel Routine*/ NormalRoutine = Apc->NormalRoutine; KernelRoutine = Apc->KernelRoutine; NormalContext = Apc->NormalContext; @@ -584,7 +584,7 @@ * KeInitializeApc * @implemented NT4 * - * The The KeInitializeApc routine initializes an APC object, and registers + * The KeInitializeApc routine initializes an APC object, and registers * the Kernel, Rundown and Normal routines for that object. * * @param Apc @@ -604,7 +604,7 @@ * * @param RundownRoutine * Points to the RundownRoutine to associate with the APC. - * This routine is executed when the Thread exists during APC execution. + * This routine is executed when the Thread exits during APC execution. * * @param NormalRoutine * Points to the NormalRoutine to associate with the APC. @@ -678,7 +678,7 @@ Apc->NormalContext = NULL; } - /* The APC is not inserted*/ + /* The APC is not inserted */ Apc->Inserted = FALSE; } @@ -690,7 +690,7 @@ * scheduler environment exists. * * @param Apc - * Pointer to an initialized control object of type DPC for which the + * Pointer to an initialized control object of type APC for which the * caller provides the storage. * * @param SystemArgument[1,2] @@ -757,7 +757,7 @@ * @param Thread * Pointer to the thread whose APC queue will be flushed. * - * @paramt PreviousMode + * @param PreviousMode * Specifies which APC Queue to flush. * * @return A pointer to the first entry in the flushed APC queue. @@ -846,7 +846,7 @@ * The KeRemoveQueueApc routine removes a given APC object from the system * APC queue. * - * @params Apc + * @param Apc * Pointer to an initialized APC object that was queued by calling * KeInsertQueueApc. * @@ -920,7 +920,7 @@ * region or a guarded region, and FALSE otherwise. * * @remarks A thread running at IRQL = PASSIVE_LEVEL can use KeAreApcsDisabled - * determine if normal kernel APCs are disabled. + * to determine if normal kernel APCs are disabled. * * A thread that is inside critical region has both user APCs and * normal kernel APCs disabled, but not special kernel APCs. @@ -944,7 +944,7 @@ * @implemented NT5.1 * * The KeAreAllApcsDisabled routine returns whether the calling thread is - * inside a guarded region or running at IRQL = APC_LEVEL, which disables + * inside a guarded region or running at IRQL >= APC_LEVEL, which disables * all APC delivery. * * @param None. @@ -953,7 +953,7 @@ * guarded region or running at IRQL >= APC_LEVEL, and FALSE otherwise. * * @remarks A thread running at IRQL = PASSIVE_LEVEL can use this routine to - * determine if all APCs delivery is disabled. + * determine if all APC delivery is disabled. * * Callers of this routine must be running at IRQL <= DISPATCH_LEVEL. * @@ -966,7 +966,3 @@ return ((KeGetCurrentThread()->SpecialApcDisable) || (KeGetCurrentIrql() >= APC_LEVEL)) ? TRUE : FALSE; } - - - -

1 0

[cgutman] 36582: - Merge aicom-network-fixes up to r36581
by cgutman＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: cgutman Date: Sun Sep 28 15:19:27 2008 New Revision: 36582 URL: http://svn.reactos.org/svn/reactos?rev=36582&view=rev Log: - Merge aicom-network-fixes up to r36581 Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Sep 28 15:19:27 2008 @@ -182,8 +182,6 @@ AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); NDIS_DbgPrint(DEBUG_MINIPORT, ("AdapterBinding = %x\n", AdapterBinding)); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - #ifdef DBG if(!AdapterBinding) { @@ -225,8 +223,6 @@ LookaheadBuffer, LookaheadBufferSize, PacketSize); - - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); CurrentEntry = CurrentEntry->Flink; } Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Sun Sep 28 15:19:27 2008 @@ -67,6 +67,7 @@ { UINT BufferedLength; UINT PacketLength; + KIRQL OldIrql; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -75,6 +76,8 @@ #endif NdisQueryPacket(Packet, NULL, NULL, NULL, &PacketLength); + + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); @@ -102,6 +105,8 @@ Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()] = NULL; } KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + + KeLowerIrql(OldIrql); return STATUS_SUCCESS; }

1 0

[cgutman] 36581: - Call the ProtocolReceive handler at DISPATCH_LEVEL
by cgutman＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: cgutman Date: Sun Sep 28 15:05:38 2008 New Revision: 36581 URL: http://svn.reactos.org/svn/reactos?rev=36581&view=rev Log: - Call the ProtocolReceive handler at DISPATCH_LEVEL Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Sep 28 15:05:38 2008 @@ -182,8 +182,6 @@ AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); NDIS_DbgPrint(DEBUG_MINIPORT, ("AdapterBinding = %x\n", AdapterBinding)); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - #ifdef DBG if(!AdapterBinding) { @@ -225,8 +223,6 @@ LookaheadBuffer, LookaheadBufferSize, PacketSize); - - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); CurrentEntry = CurrentEntry->Flink; }

1 0

[cgutman] 36580: - Raise IRQL to DISPATCH_LEVEL before using KeAcquireSpinLockAtDpcLevel/KeReleaseSpinLockFromDpcLevel
by cgutman＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: cgutman Date: Sun Sep 28 14:58:09 2008 New Revision: 36580 URL: http://svn.reactos.org/svn/reactos?rev=36580&view=rev Log: - Raise IRQL to DISPATCH_LEVEL before using KeAcquireSpinLockAtDpcLevel/KeReleaseSpinLockFromDpcLevel Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Sun Sep 28 14:58:09 2008 @@ -67,6 +67,7 @@ { UINT BufferedLength; UINT PacketLength; + KIRQL OldIrql; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -75,6 +76,8 @@ #endif NdisQueryPacket(Packet, NULL, NULL, NULL, &PacketLength); + + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); @@ -102,6 +105,8 @@ Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()] = NULL; } KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + + KeLowerIrql(OldIrql); return STATUS_SUCCESS; }

1 0

[gschneider] 36579: Check for NULL before using the DC. Fixes Coverity CID 680.
by gschneider＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: gschneider Date: Sun Sep 28 14:44:58 2008 New Revision: 36579 URL: http://svn.reactos.org/svn/reactos?rev=36579&view=rev Log: Check for NULL before using the DC. Fixes Coverity CID 680. Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Sun Sep 28 14:44:58 2008 @@ -599,14 +599,17 @@ BOOL STDCALL NtGdiSetBrushOrg(HDC hDC, INT XOrg, INT YOrg, LPPOINT Point) { - PDC dc = DC_LockDc(hDC); - PDC_ATTR Dc_Attr = dc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + PDC dc; + PDC_ATTR Dc_Attr; + + dc = DC_LockDc(hDC); if (dc == NULL) { SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; if (Point != NULL) {

1 0

[gschneider] 36578: Handle PALETTE_LockPalette returning NULL. Fixes Coverity CIDs 486 and 487.
by gschneider＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: gschneider Date: Sun Sep 28 14:42:03 2008 New Revision: 36578 URL: http://svn.reactos.org/svn/reactos?rev=36578&view=rev Log: Handle PALETTE_LockPalette returning NULL. Fixes Coverity CIDs 486 and 487. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sun Sep 28 14:42:03 2008 @@ -62,6 +62,13 @@ Entries = (1 << BitmapObj->dib->dsBmih.biBitCount) - StartIndex; PalGDI = PALETTE_LockPalette(BitmapObj->hDIBPalette); + if (PalGDI == NULL) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + DC_UnlockDc(dc); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } for (Index = StartIndex; Index < StartIndex + Entries && Index < PalGDI->NumColors; @@ -120,6 +127,13 @@ Entries = (1 << BitmapObj->dib->dsBmih.biBitCount) - StartIndex; PalGDI = PALETTE_LockPalette(BitmapObj->hDIBPalette); + if (PalGDI == NULL) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + DC_UnlockDc(dc); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } for (Index = StartIndex; Index < StartIndex + Entries && Index < PalGDI->NumColors;

1 0

[gschneider] 36577: A msvcrt test shouldn't test ntdll functions for correctness. Now people don't need to fix nonexistant "hidden" msvcrt bugs anymore.
by gschneider＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: gschneider Date: Sun Sep 28 13:40:38 2008 New Revision: 36577 URL: http://svn.reactos.org/svn/reactos?rev=36577&view=rev Log: A msvcrt test shouldn't test ntdll functions for correctness. Now people don't need to fix nonexistant "hidden" msvcrt bugs anymore. Modified: trunk/rostests/winetests/msvcrt/msvcrt.rbuild Modified: trunk/rostests/winetests/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/msvcrt.r… ============================================================================== --- trunk/rostests/winetests/msvcrt/msvcrt.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/msvcrt.rbuild [iso-8859-1] Sun Sep 28 13:40:38 2008 @@ -6,7 +6,7 @@ <include base="msvcrt">include/reactos/wine/msvcrt</include> <define name="__USE_W32API" /> <library>kernel32</library> - <library>ntdll</library> + <library>msvcrt</library> <file>cpp.c</file> <file>data.c</file> <file>dir.c</file>

1 0

[hpoussin] 36576: Remove a hack, and link with C++ libraries only when required Patch by Cecill Etheredge ( ijsf at gmx dot net )
by hpoussin＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: hpoussin Date: Sun Sep 28 09:17:45 2008 New Revision: 36576 URL: http://svn.reactos.org/svn/reactos?rev=36576&view=rev Log: Remove a hack, and link with C++ libraries only when required Patch by Cecill Etheredge ( ijsf at gmx dot net ) Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Sep 28 09:17:45 2008 @@ -1481,19 +1481,22 @@ fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); string targetName ( module.output->name ); - /* HACK: if we have C++ in kernel, link it with some user mode dlls (kernel32 + msvcrt) ... */ - static const string libsCppKernel = " '$(shell ${TARGET_CC} -print-file-name=libkernel32.a)' '$(shell ${TARGET_CC} -print-file-name=libmsvcrt.a)'"; + /* check if we need to add default C++ libraries, ie if we have + * a C++ user-mode module without the -nostdlib linker flag + */ + bool link_defaultlibs = module.cplusplus && + linkerParameters.find ("-nostdlib") == string::npos && + !(module.type == KernelModeDLL || module.type == KernelModeDriver); if ( !module.HasImportLibrary() ) { fprintf ( fMakefile, - "\t%s %s%s %s %s%s %s %s -o %s\n", + "\t%s %s%s %s %s %s %s -o %s\n", linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), objectsMacro.c_str (), - module.cplusplus ? "$(PROJECT_LPPFLAGS) " : "", - module.cplusplus && (module.type == KernelModeDLL || module.type == KernelModeDriver) ? libsCppKernel.c_str () : "", + link_defaultlibs ? "$(PROJECT_LPPFLAGS) " : "", libsMacro.c_str (), GetLinkerMacro ().c_str (), target_macro.c_str () ); @@ -1514,14 +1517,14 @@ module.underscoreSymbols ? " --add-underscore" : "" ); fprintf ( fMakefile, - "\t%s %s%s %s %s %s%s %s %s -o %s\n", + "\t%s %s%s %s %s %s %s %s -o %s\n", + linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), backend->GetFullName ( temp_exp ).c_str (), objectsMacro.c_str (), - module.cplusplus ? "$(PROJECT_LPPFLAGS) " : "", - module.cplusplus && (module.type == KernelModeDLL || module.type == KernelModeDriver) ? libsCppKernel.c_str () : "", + link_defaultlibs ? "$(PROJECT_LPPFLAGS) " : "", libsMacro.c_str (), GetLinkerMacro ().c_str (), target_macro.c_str () );

1 0

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