Ros-diffs December 2006

ros-diffs@reactos.org

16 participants
168 discussions

[janderwald] 25078: - fix a few warnings - make it compilable with msvc and gcc4.1.1

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Dec 7 11:54:16 2006 New Revision: 25078 URL: http://svn.reactos.org/svn/reactos?rev=25078&view=rev Log: - fix a few warnings - make it compilable with msvc and gcc4.1.1 Modified: trunk/reactos/base/services/dhcp/dhclient.c trunk/reactos/base/services/dhcp/dhcp.rbuild trunk/reactos/base/services/dhcp/include/rosdhcp.h trunk/reactos/base/services/dhcp/options.c trunk/reactos/base/services/dhcp/util.c Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c (original) +++ trunk/reactos/base/services/dhcp/dhclient.c Thu Dec 7 11:54:16 2006 @@ -2044,7 +2044,7 @@ for (; dp < data + len; dp++) { if (!isascii(*dp) || !isprint(*dp)) { if (dp + 1 != data + len || *dp != 0) { - snprintf(op, opleft, "\\%03o", *dp); + _snprintf(op, opleft, "\\%03o", *dp); op += 4; opleft -= 4; } Modified: trunk/reactos/base/services/dhcp/dhcp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhcp.rb… ============================================================================== --- trunk/reactos/base/services/dhcp/dhcp.rbuild (original) +++ trunk/reactos/base/services/dhcp/dhcp.rbuild Thu Dec 7 11:54:16 2006 @@ -1,4 +1,4 @@ -<module name="dhcp" type="win32gui" installbase="system32" installname="dhcp.exe" allowwarnings="true"> +<module name="dhcp" type="win32cui" installbase="system32" installname="dhcp.exe" allowwarnings="true"> <include base="dhcp">.</include> <include base="dhcp">include</include> <define name="__USE_W32API" /> Modified: trunk/reactos/base/services/dhcp/include/rosdhcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/include… ============================================================================== --- trunk/reactos/base/services/dhcp/include/rosdhcp.h (original) +++ trunk/reactos/base/services/dhcp/include/rosdhcp.h Thu Dec 7 11:54:16 2006 @@ -9,6 +9,7 @@ #include <iphlpapi.h> #include <dhcpcsdk.h> #include <stdio.h> +#include <io.h> #include <setjmp.h> #include "stdint.h" #include "predec.h" Modified: trunk/reactos/base/services/dhcp/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/options… ============================================================================== --- trunk/reactos/base/services/dhcp/options.c (original) +++ trunk/reactos/base/services/dhcp/options.c Thu Dec 7 11:54:16 2006 @@ -566,7 +566,7 @@ !isprint(*dp)) { if (dp + 1 != data + len || *dp != 0) { - snprintf(op, opleft, + _snprintf(op, opleft, "\\%03o", *dp); op += 4; opleft -= 4; @@ -602,7 +602,7 @@ dp += 4; break; case 'l': - opcount = snprintf(op, opleft, "%ld", + opcount = _snprintf(op, opleft, "%ld", (long)getLong(dp)); if (opcount >= opleft || opcount == -1) goto toobig; @@ -610,7 +610,7 @@ dp += 4; break; case 'L': - opcount = snprintf(op, opleft, "%ld", + opcount = _snprintf(op, opleft, "%ld", (unsigned long)getULong(dp)); if (opcount >= opleft || opcount == -1) goto toobig; @@ -618,7 +618,7 @@ dp += 4; break; case 's': - opcount = snprintf(op, opleft, "%d", + opcount = _snprintf(op, opleft, "%d", getShort(dp)); if (opcount >= opleft || opcount == -1) goto toobig; @@ -626,7 +626,7 @@ dp += 2; break; case 'S': - opcount = snprintf(op, opleft, "%d", + opcount = _snprintf(op, opleft, "%d", getUShort(dp)); if (opcount >= opleft || opcount == -1) goto toobig; @@ -634,20 +634,20 @@ dp += 2; break; case 'b': - opcount = snprintf(op, opleft, "%d", + opcount = _snprintf(op, opleft, "%d", *(char *)dp++); if (opcount >= opleft || opcount == -1) goto toobig; opleft -= opcount; break; case 'B': - opcount = snprintf(op, opleft, "%d", *dp++); + opcount = _snprintf(op, opleft, "%d", *dp++); if (opcount >= opleft || opcount == -1) goto toobig; opleft -= opcount; break; case 'x': - opcount = snprintf(op, opleft, "%x", *dp++); + opcount = _snprintf(op, opleft, "%x", *dp++); if (opcount >= opleft || opcount == -1) goto toobig; opleft -= opcount; Modified: trunk/reactos/base/services/dhcp/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/util.c?… ============================================================================== --- trunk/reactos/base/services/dhcp/util.c (original) +++ trunk/reactos/base/services/dhcp/util.c Thu Dec 7 11:54:16 2006 @@ -100,6 +100,7 @@ /* What a strage dance */ struct client_config *config; char ComputerName [MAX_COMPUTERNAME_LENGTH + 1]; + LPSTR lpCompName; DWORD ComputerNameSize = sizeof ComputerName / sizeof ComputerName[0]; if ((ifi!= NULL) && (ifi->client->config != NULL)) @@ -113,12 +114,12 @@ GetComputerName(ComputerName, & ComputerNameSize); /* This never gets freed since it's only called once */ - LPSTR lpCompName = + lpCompName = HeapAlloc(GetProcessHeap(), 0, strlen(ComputerName) + 1); if (lpCompName !=NULL) { GetComputerName(lpCompName, & ComputerNameSize); /* Send our hostname, some dhcpds use this to update DNS */ - config->send_options[DHO_HOST_NAME].data = strlwr(lpCompName); + config->send_options[DHO_HOST_NAME].data = (u_int8_t*)strlwr(lpCompName); config->send_options[DHO_HOST_NAME].len = strlen(ComputerName); debug("Hostname: %s, length: %d", config->send_options[DHO_HOST_NAME].data,

18 years

[fireball] 25077: Add KdChangeOption() stub

by fireball＠svn.reactos.org

Author: fireball Date: Wed Dec 6 23:55:42 2006 New Revision: 25077 URL: http://svn.reactos.org/svn/reactos?rev=25077&view=rev Log: Add KdChangeOption() stub Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Wed Dec 6 23:55:42 2006 @@ -2558,6 +2558,10 @@ DEBUG_DEVICE_ADDRESS BaseAddress[6]; DEBUG_MEMORY_REQUIREMENTS Memory; } DEBUG_DEVICE_DESCRIPTOR, *PDEBUG_DEVICE_DESCRIPTOR; + +typedef enum _KD_OPTION { + KD_OPTION_SET_BLOCK_ENABLE, +} KD_OPTION; /* Function Type Defintions for Dispatch Functions */ Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c Wed Dec 6 23:55:42 2006 @@ -240,6 +240,22 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } + +/* + * @unimplemented + */ +VOID +STDCALL +KdChangeOption(IN KD_OPTION Option, + IN ULONG InBufferLength OPTIONAL, + IN PVOID InBuffer, + IN ULONG OutBufferLength OPTIONAL, + OUT PVOID OutBuffer, + OUT PULONG OutBufferRequiredLength OPTIONAL) +{ + UNIMPLEMENTED; +} + NTSTATUS STDCALL Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Wed Dec 6 23:55:42 2006 @@ -504,6 +504,7 @@ @IofCallDriver@8 @IofCompleteRequest@8 IoIsWdmVersionAvailable@8 +KdChangeOption@24 KdComPortInUse DATA KdDebuggerEnabled=_KdDebuggerEnabled KdDebuggerNotPresent=_KdDebuggerNotPresent

18 years

[greatlrd] 25076: did forget to exlucde the ddraw.rbuild. sorry I did break the build

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Dec 6 22:54:53 2006 New Revision: 25076 URL: http://svn.reactos.org/svn/reactos?rev=25076&view=rev Log: did forget to exlucde the ddraw.rbuild. sorry I did break the build Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Wed Dec 6 22:54:53 2006 @@ -36,8 +36,5 @@ <file>surface_main.c</file> </directory> - <directory name="thunks"> - <file>ddraw_thunk.c</file> - <file>surface_thunk.c</file> - </directory> + </module>

18 years

[greatlrd] 25075: fixed a pointer I forget setup. the This->lcl->lpDDCB was not set. and that mean we did not use any interface. we are using This->lcl->lpDDCB in the iface calls

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Dec 6 22:53:43 2006 New Revision: 25075 URL: http://svn.reactos.org/svn/reactos?rev=25075&view=rev Log: fixed a pointer I forget setup. the This->lcl->lpDDCB was not set. and that mean we did not use any interface. we are using This->lcl->lpDDCB in the iface calls Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Wed Dec 6 22:53:43 2006 @@ -15,7 +15,6 @@ <library>ole32</library> <library>user32</library> <library>advapi32</library> - <library>msvcrt</library> <file>ddraw.rc</file> <file>main.c</file> @@ -36,4 +35,9 @@ <file>ddraw_main.c</file> <file>surface_main.c</file> </directory> + + <directory name="thunks"> + <file>ddraw_thunk.c</file> + <file>surface_thunk.c</file> + </directory> </module> Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Wed Dec 6 22:53:43 2006 @@ -229,6 +229,8 @@ This->lpLcl->hDD = This->lpLcl->lpGbl->hDD; /* Mix the DDCALLBACKS */ + This->lpLcl->lpDDCB = This->lpLcl->lpGbl->lpDDCBtmp; + This->lpLcl->lpDDCB->cbDDCallbacks.dwSize = sizeof(This->lpLcl->lpDDCB->cbDDCallbacks); if ((This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) && (devicetypes !=3)) @@ -862,21 +864,21 @@ StartDirectDrawHel(LPDIRECTDRAW* iface, BOOL reenable) { LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; - - This->lpLcl->lpDDCB->HELDD.CanCreateSurface = HelDdCanCreateSurface; - This->lpLcl->lpDDCB->HELDD.CreateSurface = HelDdCreateSurface; - This->lpLcl->lpDDCB->HELDD.CreatePalette = HelDdCreatePalette; - This->lpLcl->lpDDCB->HELDD.DestroyDriver = HelDdDestroyDriver; - This->lpLcl->lpDDCB->HELDD.FlipToGDISurface = HelDdFlipToGDISurface; - This->lpLcl->lpDDCB->HELDD.GetScanLine = HelDdGetScanLine; - This->lpLcl->lpDDCB->HELDD.SetColorKey = HelDdSetColorKey; - This->lpLcl->lpDDCB->HELDD.SetExclusiveMode = HelDdSetExclusiveMode; - This->lpLcl->lpDDCB->HELDD.SetMode = HelDdSetMode; - This->lpLcl->lpDDCB->HELDD.WaitForVerticalBlank = HelDdWaitForVerticalBlank; - - - - This->lpLcl->lpDDCB->HELDD.dwFlags = DDHAL_CB32_CANCREATESURFACE | + + This->lpLcl->lpGbl->lpDDCBtmp->HELDD.CanCreateSurface = HelDdCanCreateSurface; + This->lpLcl->lpGbl->lpDDCBtmp->HELDD.CreateSurface = HelDdCreateSurface; + This->lpLcl->lpGbl->lpDDCBtmp->HELDD.CreatePalette = HelDdCreatePalette; + This->lpLcl->lpGbl->lpDDCBtmp->HELDD.DestroyDriver = HelDdDestroyDriver; + This->lpLcl->lpGbl->lpDDCBtmp->HELDD.FlipToGDISurface = HelDdFlipToGDISurface; + This->lpLcl->lpGbl->lpDDCBtmp->HELDD.GetScanLine = HelDdGetScanLine; + This->lpLcl->lpGbl->lpDDCBtmp->HELDD.SetColorKey = HelDdSetColorKey; + This->lpLcl->lpGbl->lpDDCBtmp->HELDD.SetExclusiveMode = HelDdSetExclusiveMode; + This->lpLcl->lpGbl->lpDDCBtmp->HELDD.SetMode = HelDdSetMode; + This->lpLcl->lpGbl->lpDDCBtmp->HELDD.WaitForVerticalBlank = HelDdWaitForVerticalBlank; + + + + This->lpLcl->lpGbl->lpDDCBtmp->HELDD.dwFlags = DDHAL_CB32_CANCREATESURFACE | DDHAL_CB32_CREATESURFACE | DDHAL_CB32_CREATEPALETTE | DDHAL_CB32_DESTROYDRIVER | @@ -887,24 +889,24 @@ DDHAL_CB32_SETMODE | DDHAL_CB32_WAITFORVERTICALBLANK ; - This->lpLcl->lpDDCB->HELDD.dwSize = sizeof(This->lpLcl->lpDDCB->HELDD); - - This->lpLcl->lpDDCB->HELDDSurface.AddAttachedSurface = HelDdSurfAddAttachedSurface; - This->lpLcl->lpDDCB->HELDDSurface.Blt = HelDdSurfBlt; - This->lpLcl->lpDDCB->HELDDSurface.DestroySurface = HelDdSurfDestroySurface; - This->lpLcl->lpDDCB->HELDDSurface.Flip = HelDdSurfFlip; - This->lpLcl->lpDDCB->HELDDSurface.GetBltStatus = HelDdSurfGetBltStatus; - This->lpLcl->lpDDCB->HELDDSurface.GetFlipStatus = HelDdSurfGetFlipStatus; - This->lpLcl->lpDDCB->HELDDSurface.Lock = HelDdSurfLock; - This->lpLcl->lpDDCB->HELDDSurface.reserved4 = HelDdSurfreserved4; - This->lpLcl->lpDDCB->HELDDSurface.SetClipList = HelDdSurfSetClipList; - This->lpLcl->lpDDCB->HELDDSurface.SetColorKey = HelDdSurfSetColorKey; - This->lpLcl->lpDDCB->HELDDSurface.SetOverlayPosition = HelDdSurfSetOverlayPosition; - This->lpLcl->lpDDCB->HELDDSurface.SetPalette = HelDdSurfSetPalette; - This->lpLcl->lpDDCB->HELDDSurface.Unlock = HelDdSurfUnlock; - This->lpLcl->lpDDCB->HELDDSurface.UpdateOverlay = HelDdSurfUpdateOverlay; + This->lpLcl->lpGbl->lpDDCBtmp->HELDD.dwSize = sizeof(This->lpLcl->lpDDCB->HELDD); + + This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.AddAttachedSurface = HelDdSurfAddAttachedSurface; + This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.Blt = HelDdSurfBlt; + This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.DestroySurface = HelDdSurfDestroySurface; + This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.Flip = HelDdSurfFlip; + This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.GetBltStatus = HelDdSurfGetBltStatus; + This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.GetFlipStatus = HelDdSurfGetFlipStatus; + This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.Lock = HelDdSurfLock; + This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.reserved4 = HelDdSurfreserved4; + This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.SetClipList = HelDdSurfSetClipList; + This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.SetColorKey = HelDdSurfSetColorKey; + This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.SetOverlayPosition = HelDdSurfSetOverlayPosition; + This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.SetPalette = HelDdSurfSetPalette; + This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.Unlock = HelDdSurfUnlock; + This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.UpdateOverlay = HelDdSurfUpdateOverlay; - This->lpLcl->lpDDCB->HELDDSurface.dwFlags = DDHAL_SURFCB32_ADDATTACHEDSURFACE | + This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.dwFlags = DDHAL_SURFCB32_ADDATTACHEDSURFACE | DDHAL_SURFCB32_BLT | DDHAL_SURFCB32_DESTROYSURFACE | DDHAL_SURFCB32_FLIP | @@ -919,7 +921,7 @@ DDHAL_SURFCB32_UNLOCK | DDHAL_SURFCB32_UPDATEOVERLAY; - This->lpLcl->lpDDCB->HELDDSurface.dwSize = sizeof(This->lpLcl->lpDDCB->HELDDSurface); + This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.dwSize = sizeof(This->lpLcl->lpDDCB->HELDDSurface); /* This->lpLcl->lpDDCB->HELDDPalette.DestroyPalette = HelDdPalDestroyPalette;

18 years

[cwittich] 25074: set minimum req. gcc version to 3.4.2

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Dec 6 19:22:32 2006 New Revision: 25074 URL: http://svn.reactos.org/svn/reactos?rev=25074&view=rev Log: set minimum req. gcc version to 3.4.2 Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Wed Dec 6 19:22:32 2006 @@ -760,7 +760,7 @@ bool MingwBackend::IsSupportedCompilerVersion ( const string& compilerVersion ) { - if ( strcmp ( compilerVersion.c_str (), "3.4.5") < 0 ) + if ( strcmp ( compilerVersion.c_str (), "3.4.2") < 0 ) return false; else return true;

18 years

[fireball] 25073: - vfat now checks what CcCopyRead() returned, and return that value to the caller in case of failure - Added a check for successful call to ReadCacheSegmentChain() in CC See issue #1855 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Dec 6 16:29:21 2006 New Revision: 25073 URL: http://svn.reactos.org/svn/reactos?rev=25073&view=rev Log: - vfat now checks what CcCopyRead() returned, and return that value to the caller in case of failure - Added a check for successful call to ReadCacheSegmentChain() in CC See issue #1855 for more details. Modified: trunk/reactos/drivers/filesystems/vfat/rw.c trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/drivers/filesystems/vfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/r… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/rw.c (original) +++ trunk/reactos/drivers/filesystems/vfat/rw.c Wed Dec 6 16:29:21 2006 @@ -689,7 +689,7 @@ (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT), Buffer, &IrpContext->Irp->IoStatus)) { - Status = STATUS_PENDING; + Status = IrpContext->Irp->IoStatus.Status;//STATUS_PENDING; goto ByeBye; } CHECKPOINT; Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=250… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c (original) +++ trunk/reactos/ntoskrnl/cc/copy.c Wed Dec 6 16:29:21 2006 @@ -382,6 +382,15 @@ { TempLength = min(max(Bcb->CacheSegmentSize, MAX_RW_LENGTH), Length); ReadCacheSegmentChain(Bcb, ReadOffset, TempLength, Buffer); + Status = ReadCacheSegmentChain(Bcb, ReadOffset, TempLength, Buffer); + if (!NT_SUCCESS(Status)) + { + IoStatus->Information = 0; + IoStatus->Status = Status; + DPRINT1("ReadCacheSegmentChain failed, Status %x\n", Status); + return FALSE; + } + ReadLength += TempLength; Length -= TempLength; ReadOffset += TempLength;

18 years

[fireball] 25072: Get rid of a hack commited in 25070 (and reverted in 25071). Alex really watches commits, beware!

by fireball＠svn.reactos.org

Author: fireball Date: Wed Dec 6 00:06:40 2006 New Revision: 25072 URL: http://svn.reactos.org/svn/reactos?rev=25072&view=rev Log: Get rid of a hack commited in 25070 (and reverted in 25071). Alex really watches commits, beware! Modified: branches/winldr/windows/peloader.c Modified: branches/winldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/peloader.c?rev=2… ============================================================================== --- branches/winldr/windows/peloader.c (original) +++ branches/winldr/windows/peloader.c Wed Dec 6 00:06:40 2006 @@ -418,10 +418,10 @@ DbgPrint((DPRINT_WINDOWS, "Relocating %p -> %p\n", NtHeaders->OptionalHeader.ImageBase, VirtualBase)); Status = (BOOLEAN)LdrRelocateImageWithBias(PhysicalBase, - 0, - "FLx86", + (ULONG_PTR)VirtualBase - (ULONG_PTR)PhysicalBase, + "FreeLdr", TRUE, - 3, + TRUE, /* in case of conflict still return success */ FALSE); }

18 years

[ion] 25071: - Revert 25070: NO. - Please look what I did inside FreeLdr. I called this function perfectly without needing to modify how it works. It's what the AdditionalBias parameter is there for...

by ion＠svn.reactos.org

Author: ion Date: Tue Dec 5 21:33:03 2006 New Revision: 25071 URL: http://svn.reactos.org/svn/reactos?rev=25071&view=rev Log: - Revert 25070: NO. - Please look what I did inside FreeLdr. I called this function perfectly without needing to modify how it works. It's what the AdditionalBias parameter is there for... Modified: trunk/reactos/lib/rtl/image.c Modified: trunk/reactos/lib/rtl/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/image.c?rev=25071&… ============================================================================== --- trunk/reactos/lib/rtl/image.c (original) +++ trunk/reactos/lib/rtl/image.c Tue Dec 5 21:33:03 2006 @@ -226,10 +226,6 @@ return (PIMAGE_BASE_RELOCATION)TypeOffset; } -/* NOTE: When this function is called with LoaderName == "FLx86" - it's going to behave differently: it will perform all - relocations as needed, but will access only valid physical - addresses (not virtual addresses) */ ULONG NTAPI LdrRelocateImageWithBias( @@ -254,10 +250,10 @@ if (NtHeaders == NULL) return Invalid; - /*if (NtHeaders->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) + if (NtHeaders->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) { return Conflict; - }*/ + } RelocationDDir = &NtHeaders->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; @@ -266,19 +262,7 @@ return Success; } - /* ROS/FreeLoader/arch-specific stuff, for relocating while being in PA mode */ - if ((LoaderName != NULL) && (!strncmp(LoaderName, "FLx86", 5))) - { - /* Calculate it, converting BaseAddress to a virtual address */ - Delta = ((ULONG_PTR)BaseAddress | 0x80000000) - - NtHeaders->OptionalHeader.ImageBase + AdditionalBias; - } - else - { - /* Calculate it as usual */ - Delta = (ULONG_PTR)BaseAddress - NtHeaders->OptionalHeader.ImageBase + AdditionalBias; - } - + Delta = (ULONG_PTR)BaseAddress - NtHeaders->OptionalHeader.ImageBase + AdditionalBias; RelocationDir = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)BaseAddress + RelocationDDir->VirtualAddress); RelocationEnd = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)RelocationDir + RelocationDDir->Size);

18 years

[fireball] 25070: A necessary hack for PE relocation within physical address space (in FreeLdr). Using it removes code duplication from FreeLdr / winldr. To get rid of this hack, either freeldr should be fully switched to virtual paged mode (which is not good) or code must be duplicated inside freeldr.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Dec 5 21:28:08 2006 New Revision: 25070 URL: http://svn.reactos.org/svn/reactos?rev=25070&view=rev Log: A necessary hack for PE relocation within physical address space (in FreeLdr). Using it removes code duplication from FreeLdr / winldr. To get rid of this hack, either freeldr should be fully switched to virtual paged mode (which is not good) or code must be duplicated inside freeldr. Modified: trunk/reactos/lib/rtl/image.c Modified: trunk/reactos/lib/rtl/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/image.c?rev=25070&… ============================================================================== --- trunk/reactos/lib/rtl/image.c (original) +++ trunk/reactos/lib/rtl/image.c Tue Dec 5 21:28:08 2006 @@ -226,6 +226,10 @@ return (PIMAGE_BASE_RELOCATION)TypeOffset; } +/* NOTE: When this function is called with LoaderName == "FLx86" + it's going to behave differently: it will perform all + relocations as needed, but will access only valid physical + addresses (not virtual addresses) */ ULONG NTAPI LdrRelocateImageWithBias( @@ -250,10 +254,10 @@ if (NtHeaders == NULL) return Invalid; - if (NtHeaders->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) + /*if (NtHeaders->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) { return Conflict; - } + }*/ RelocationDDir = &NtHeaders->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; @@ -262,7 +266,19 @@ return Success; } - Delta = (ULONG_PTR)BaseAddress - NtHeaders->OptionalHeader.ImageBase + AdditionalBias; + /* ROS/FreeLoader/arch-specific stuff, for relocating while being in PA mode */ + if ((LoaderName != NULL) && (!strncmp(LoaderName, "FLx86", 5))) + { + /* Calculate it, converting BaseAddress to a virtual address */ + Delta = ((ULONG_PTR)BaseAddress | 0x80000000) - + NtHeaders->OptionalHeader.ImageBase + AdditionalBias; + } + else + { + /* Calculate it as usual */ + Delta = (ULONG_PTR)BaseAddress - NtHeaders->OptionalHeader.ImageBase + AdditionalBias; + } + RelocationDir = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)BaseAddress + RelocationDDir->VirtualAddress); RelocationEnd = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)RelocationDir + RelocationDDir->Size);

18 years

[janderwald] 25069: - fix build with gcc 4.1.0

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Dec 5 14:27:45 2006 New Revision: 25069 URL: http://svn.reactos.org/svn/reactos?rev=25069&view=rev Log: - fix build with gcc 4.1.0 Modified: trunk/reactos/base/applications/network/network.rbuild trunk/reactos/base/applications/network/roshttpd/include/iterator.h Modified: trunk/reactos/base/applications/network/network.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/network.rbuild (original) +++ trunk/reactos/base/applications/network/network.rbuild Tue Dec 5 14:27:45 2006 @@ -25,6 +25,9 @@ <directory name="route"> <xi:include href="route/route.rbuild" /> </directory> +<directory name="roshttpd"> + <xi:include href="roshttpd/roshttpd.rbuild" /> +</directory> <directory name="telnet"> <xi:include href="telnet/telnet.rbuild" /> </directory> Modified: trunk/reactos/base/applications/network/roshttpd/include/iterator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/roshttpd/include/iterator.h (original) +++ trunk/reactos/base/applications/network/roshttpd/include/iterator.h Tue Dec 5 14:27:45 2006 @@ -11,6 +11,8 @@ template <class Item> class CIterator { public: + virtual ~CIterator() + {} virtual VOID First() = 0; virtual VOID Next() = 0; virtual BOOL IsDone() const = 0;

18 years

← Newer
1
...
8
9
10
11
12
13
14
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2006