Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 16688: Forgot to commit this file.
by ekohl＠svn.reactos.com 22 Jul '05

22 Jul '05

Forgot to commit this file. Modified: trunk/reactos/include/wine/cfgmgr32.h _____ Modified: trunk/reactos/include/wine/cfgmgr32.h --- trunk/reactos/include/wine/cfgmgr32.h 2005-07-22 12:25:02 UTC (rev 16687) +++ trunk/reactos/include/wine/cfgmgr32.h 2005-07-22 14:53:24 UTC (rev 16688) @@ -71,7 +71,20 @@ #define CM_OPEN_CLASS_KEY_INTERFACE 0x00000001 #define CM_OPEN_CLASS_KEY_BITS 0x00000001 +/* ulFlags for CM_Locate_DevNode[_Ex] */ +#define CM_LOCATE_DEVNODE_NORMAL 0x00000000 +#define CM_LOCATE_DEVNODE_PHANTOM 0x00000001 +#define CM_LOCATE_DEVNODE_CANCELREMOVE 0x00000002 +#define CM_LOCATE_DEVNODE_NOVALIDATION 0x00000004 +#define CM_LOCATE_DEVNODE_BITS 0x00000007 +#define CM_LOCATE_DEVINST_NORMAL CM_LOCATE_DEVNODE_NORMAL +#define CM_LOCATE_DEVINST_PHANTOM CM_LOCATE_DEVNODE_PHANTOM +#define CM_LOCATE_DEVINST_CANCELREMOVE CM_LOCATE_DEVNODE_CANCELREMOVE +#define CM_LOCATE_DEVINST_NOVALIDATION CM_LOCATE_DEVNODE_NOVALIDATION +#define CM_LOCATE_DEVINST_BITS CM_LOCATE_DEVNODE_BITS + + CONFIGRET WINAPI CM_Connect_MachineA( PCSTR, PHMACHINE ); CONFIGRET WINAPI CM_Connect_MachineW( PCWSTR, PHMACHINE ); #define CM_Connect_Machine WINELIB_NAME_AW(CM_Connect_Machine)

1 0

[jimtabor] 16687: Update and implement UnrealizeObject.
by jimtabor＠svn.reactos.com 22 Jul '05

22 Jul '05

Update and implement UnrealizeObject. Modified: trunk/reactos/lib/gdi32/misc/stubs.c Modified: trunk/reactos/subsys/win32k/objects/color.c _____ Modified: trunk/reactos/lib/gdi32/misc/stubs.c --- trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-21 20:30:55 UTC (rev 16686) +++ trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-22 12:25:02 UTC (rev 16687) @@ -1107,7 +1107,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -1115,7 +1115,6 @@ HGDIOBJ a0 ) { - UNIMPLEMENTED; return NtGdiUnrealizeObject(a0); } _____ Modified: trunk/reactos/subsys/win32k/objects/color.c --- trunk/reactos/subsys/win32k/objects/color.c 2005-07-21 20:30:55 UTC (rev 16686) +++ trunk/reactos/subsys/win32k/objects/color.c 2005-07-22 12:25:02 UTC (rev 16687) @@ -588,6 +588,13 @@ return old; } +/* + Win 2k Graphics API, Black Book. by coriolis.com + Page 62, Note that Steps 3, 5, and 6 are not required for Windows NT(tm) + and Windows 2000(tm). + + Step 5. UnrealizeObject(hTrackBrush); + */ BOOL STDCALL NtGdiUnrealizeObject(HGDIOBJ hgdiobj) { @@ -595,7 +602,6 @@ GDIOBJHDR * ptr; DWORD objectType; BOOL Ret = FALSE; - UNIMPLEMENTED; ptr = GDIOBJ_LockObj(hgdiobj, GDI_OBJECT_TYPE_DONTCARE); if (ptr == 0) @@ -606,12 +612,6 @@ objectType = GDIOBJ_GetObjectType(hgdiobj); switch(objectType) { - case GDI_OBJECT_TYPE_PALETTE: - { - /* Make sure this is a Palette object!*/ - DPRINT1("GDI_OBJECT_TYPE_PALETTE\n"); - break; - } /* msdn.microsoft.com, "Windows 2000/XP: If hgdiobj is a brush, UnrealizeObject does nothing, @@ -620,7 +620,7 @@ */ case GDI_OBJECT_TYPE_BRUSH: { - DPRINT1("GDI_OBJECT_TYPE_BRUSH\n"); + DPRINT("GDI_OBJECT_TYPE_BRUSH\n"); Ret = TRUE; break; }

1 0

[ekohl] 16686: Make IoGetDeviceObjectFromDeviceInstance work without using the Registry. (experimental)
by ekohl＠svn.reactos.com 21 Jul '05

21 Jul '05

Make IoGetDeviceObjectFromDeviceInstance work without using the Registry. (experimental) Modified: trunk/reactos/ntoskrnl/io/plugplay.c _____ Modified: trunk/reactos/ntoskrnl/io/plugplay.c --- trunk/reactos/ntoskrnl/io/plugplay.c 2005-07-21 20:10:47 UTC (rev 16685) +++ trunk/reactos/ntoskrnl/io/plugplay.c 2005-07-21 20:30:55 UTC (rev 16686) @@ -224,8 +224,35 @@ static PDEVICE_OBJECT +IopTraverseDeviceNode(PDEVICE_NODE Node, PUNICODE_STRING DeviceInstance) +{ + PDEVICE_OBJECT DeviceObject; + PDEVICE_NODE ChildNode; + + if (RtlEqualUnicodeString(&Node->InstancePath, + DeviceInstance, TRUE)) + return Node->PhysicalDeviceObject; + + /* Traversal of all children nodes */ + for (ChildNode = Node->Child; + ChildNode != NULL; + ChildNode = ChildNode->NextSibling) + { + DeviceObject = IopTraverseDeviceNode(ChildNode, DeviceInstance); + if (DeviceObject != NULL) + { + return DeviceObject; + } + } + + return NULL; +} + + +static PDEVICE_OBJECT IopGetDeviceObjectFromDeviceInstance(PUNICODE_STRING DeviceInstance) { +#if 0 OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName, ValueName; LPWSTR KeyNameBuffer; @@ -308,7 +335,7 @@ ZwClose(ControlKeyHandle); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open the 'Control' key (Status %lx)\n", Status); + DPRINT1("Failed to query the 'DeviceReference' value (Status %lx)\n", Status); return NULL; } @@ -336,9 +363,30 @@ DPRINT("IopGetDeviceObjectFromDeviceInstance() done\n"); return DeviceObject; +#endif + + if (IopRootDeviceNode == NULL) + return NULL; + + if (DeviceInstance == NULL || + DeviceInstance->Length == 0 + ) + { + if (IopRootDeviceNode->PhysicalDeviceObject) + { + ObReferenceObject(IopRootDeviceNode->PhysicalDeviceObject); + return IopRootDeviceNode->PhysicalDeviceObject; + } + else + return NULL; + } + + return IopTraverseDeviceNode(IopRootDeviceNode, DeviceInstance); + } + static NTSTATUS IopGetDeviceProperty(PPLUGPLAY_CONTROL_PROPERTY_DATA PropertyData) {

1 0

[ekohl] 16685: Add parameter checks.
by ekohl＠svn.reactos.com 21 Jul '05

21 Jul '05

Add parameter checks. Modified: trunk/reactos/lib/setupapi/cfgmgr.c _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-07-21 18:32:28 UTC (rev 16684) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-07-21 20:10:47 UTC (rev 16685) @@ -341,6 +341,15 @@ TRACE("%p %lx %lx %lx\n", pulDepth, dnDevInst, ulFlags, hMachine); + if (pulDepth == NULL) + return CR_INVALID_POINTER; + + if (dnDevInst == 0) + return CR_INVALID_DEVINST; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + if (hMachine != NULL) { BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; @@ -418,6 +427,15 @@ TRACE("%lx %p %ld %ld %lx\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); + if (dnDevInst == 0) + return CR_INVALID_DEVINST; + + if (Buffer == NULL) + return CR_INVALID_POINTER; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + if (hMachine != NULL) { StringTable = ((PMACHINE_INFO)hMachine)->StringTable; @@ -560,6 +578,15 @@ TRACE("%p %lx %lx %lx\n", pulLen, dnDevInst, ulFlags, hMachine); + if (pulLen == NULL) + return CR_INVALID_POINTER; + + if (dnDevInst == 0) + return CR_INVALID_DEVINST; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + if (hMachine != NULL) { StringTable = ((PMACHINE_INFO)hMachine)->StringTable; @@ -614,6 +641,15 @@ TRACE("%p %p %lx %lx %lx\n", pulStatus, pulProblemNumber, dnDevInst, ulFlags, hMachine); + if (pulStatus == NULL || pulProblemNumber == NULL) + return CR_INVALID_POINTER; + + if (dnDevInst == 0) + return CR_INVALID_DEVINST; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + if (hMachine != NULL) { BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; @@ -949,6 +985,12 @@ TRACE("%p %s %lu %lx\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags, hMachine); + if (pdnDevInst == NULL) + return CR_INVALID_POINTER; + + if (ulFlags & ~CM_LOCATE_DEVNODE_BITS) + return CR_INVALID_FLAG; + if (hMachine != NULL) { BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle;

1 0

[hbirr] 16684: Initialized all stack related values.
by hbirr＠svn.reactos.com 21 Jul '05

21 Jul '05

Initialized all stack related values. Modified: trunk/reactos/lib/rtl/thread.c _____ Modified: trunk/reactos/lib/rtl/thread.c --- trunk/reactos/lib/rtl/thread.c 2005-07-21 18:22:45 UTC (rev 16683) +++ trunk/reactos/lib/rtl/thread.c 2005-07-21 18:32:28 UTC (rev 16684) @@ -88,6 +88,8 @@ } /* Now set up some basic Initial TEB Parameters */ + InitialTeb->PreviousStackBase = NULL; + InitialTeb->PreviousStackLimit = NULL; InitialTeb->AllocatedStackBase = (PVOID)Stack; InitialTeb->StackBase = (PVOID)(Stack + StackReserve);

1 0

[mbosma] 16683: Created the d3d8thk makefile and a internal header file.
by mbosma＠svn.reactos.com 21 Jul '05

21 Jul '05

Created the d3d8thk makefile and a internal header file. Added: trunk/reactos/lib/d3d8thk/d3d8thk.h Added: trunk/reactos/lib/d3d8thk/d3d8thk.xml Modified: trunk/reactos/lib/directory.xml _____ Added: trunk/reactos/lib/d3d8thk/d3d8thk.h --- trunk/reactos/lib/d3d8thk/d3d8thk.h 2005-07-21 17:24:15 UTC (rev 16682) +++ trunk/reactos/lib/d3d8thk/d3d8thk.h 2005-07-21 18:22:45 UTC (rev 16683) @@ -0,0 +1,324 @@ + +#ifndef __D3D8THK_H +#define __D3D8THK_H + +#include <ddk\ddrawint.h> + +#ifdef __cplusplus +extern "C" { +#endif + +BOOL STDCALL OsThunkD3dContextCreate( + HANDLE hDirectDrawLocal, + HANDLE hSurfColor, + HANDLE hSurfZ, + PD3DNTHAL_CONTEXTCREATEDATA pdcci +); + +DWORD STDCALL OsThunkD3dContextDestroy( + PD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData +); + +DWORD STDCALL OsThunkD3dContextDestroyAll(VOID); + +DWORD STDCALL OsThunkD3dDrawPrimitives2( + HANDLE hCmdBuf, + HANDLE hVBuf, + PD3DNTHAL_DRAWPRIMITIVES2DATA pded, + FLATPTR *pfpVidMemCmd, + DWORD *pdwSizeCmd, + FLATPTR *pfpVidMemVtx, + DWORD *pdwSizeVtx +); + +DWORD STDCALL OsThunkD3dValidateTextureStageState( + PD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData +); + +DWORD STDCALL OsThunkDdAddAttachedSurface( + HANDLE hSurface, + HANDLE hSurfaceAttached, + PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData +); + +DWORD STDCALL OsThunkDdAlphaBlt(VOID); + +BOOL STDCALL OsThunkDdAttachSurface( + HANDLE hSurfaceFrom, + HANDLE hSurfaceTo +); + +DWORD STDCALL OsThunkDdBeginMoCompFrame( + HANDLE hMoComp, + PDD_BEGINMOCOMPFRAMEDATA puBeginFrameData +); + +DWORD STDCALL OsThunkDdBlt( + HANDLE hSurfaceDest, + HANDLE hSurfaceSrc, + PDD_BLTDATA puBltData +); + +DWORD STDCALL OsThunkDdCanCreateD3DBuffer( + HANDLE hDirectDraw, + PDD_CANCREATESURFACEDATA puCanCreateSurfaceData +); + +DWORD STDCALL OsThunkDdCanCreateSurface( + HANDLE hDirectDraw, + PDD_CANCREATESURFACEDATA puCanCreateSurfaceData +); + +DWORD STDCALL OsThunkDdColorControl( + HANDLE hSurface, + PDD_COLORCONTROLDATA puColorControlData +); + +DWORD STDCALL OsThunkDdCreateD3DBuffer( + HANDLE hDirectDraw, + HANDLE *hSurface, + DDSURFACEDESC *puSurfaceDescription, + DD_SURFACE_GLOBAL *puSurfaceGlobalData, + DD_SURFACE_LOCAL *puSurfaceLocalData, + DD_SURFACE_MORE *puSurfaceMoreData, + PDD_CREATESURFACEDATA puCreateSurfaceData, + HANDLE *puhSurface +); + +HANDLE STDCALL OsThunkDdCreateDirectDrawObject( + HDC hdc +); + +HANDLE STDCALL OsThunkDdCreateMoComp( + HANDLE hDirectDraw, + PDD_CREATEMOCOMPDATA puCreateMoCompData +); + +DWORD STDCALL OsThunkDdCreateSurface( + HANDLE hDirectDraw, + HANDLE *hSurface, + DDSURFACEDESC *puSurfaceDescription, + DD_SURFACE_GLOBAL *puSurfaceGlobalData, + DD_SURFACE_LOCAL *puSurfaceLocalData, + DD_SURFACE_MORE *puSurfaceMoreData, + PDD_CREATESURFACEDATA puCreateSurfaceData, + HANDLE *puhSurface +); + +DWORD STDCALL OsThunkDdCreateSurfaceEx( + HANDLE hDirectDraw, + HANDLE hSurface, + DWORD dwSurfaceHandle +); + +HANDLE STDCALL OsThunkDdCreateSurfaceObject( + HANDLE hDirectDrawLocal, + HANDLE hSurface, + PDD_SURFACE_LOCAL puSurfaceLocal, + PDD_SURFACE_MORE puSurfaceMore, + PDD_SURFACE_GLOBAL puSurfaceGlobal, + BOOL bComplete +); + +BOOL STDCALL OsThunkDdDeleteDirectDrawObject( + HANDLE hDirectDrawLocal +); + +BOOL STDCALL OsThunkDdDeleteSurfaceObject( + HANDLE hSurface +); + +DWORD STDCALL OsThunkDdDestroyD3DBuffer( + HANDLE hSurface +); + +DWORD STDCALL OsThunkDdDestroyMoComp( + HANDLE hMoComp, + PDD_DESTROYMOCOMPDATA puBeginFrameData +); + +DWORD STDCALL OsThunkDdDestroySurface( + HANDLE hSurface, + BOOL bRealDestroy +); + +DWORD STDCALL OsThunkDdEndMoCompFrame( + HANDLE hMoComp, + PDD_ENDMOCOMPFRAMEDATA puEndFrameData +); + +DWORD STDCALL OsThunkDdFlip( + HANDLE hSurfaceCurrent, + HANDLE hSurfaceTarget, + HANDLE hSurfaceCurrentLeft, + HANDLE hSurfaceTargetLeft, + PDD_FLIPDATA puFlipData +); + +DWORD STDCALL OsThunkDdFlipToGDISurface( + HANDLE hDirectDraw, + PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData +); + +DWORD STDCALL OsThunkDdGetAvailDriverMemory( + HANDLE hDirectDraw, + PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData +); + +DWORD STDCALL OsThunkDdGetBltStatus( + HANDLE hSurface, + PDD_GETBLTSTATUSDATA puGetBltStatusData +); + +HDC STDCALL OsThunkDdGetDC( + HANDLE hSurface, + PALETTEENTRY *puColorTable +); + +DWORD STDCALL OsThunkDdGetDriverInfo( + HANDLE hDirectDraw, + PDD_GETDRIVERINFODATA puGetDriverInfoData +); + +DWORD STDCALL OsThunkDdGetDriverState( + PDD_GETDRIVERSTATEDATA pdata +); + +DWORD STDCALL OsThunkDdGetDxHandle( + HANDLE hDirectDraw, + HANDLE hSurface, + BOOL bRelease +); + +DWORD STDCALL OsThunkDdGetFlipStatus( + HANDLE hSurface, + PDD_GETFLIPSTATUSDATA puGetFlipStatusData +); + +DWORD STDCALL OsThunkDdGetInternalMoCompInfo( + HANDLE hDirectDraw, + PDD_GETINTERNALMOCOMPDATA puGetInternalData +); + +DWORD STDCALL OsThunkDdGetMoCompBuffInfo( + HANDLE hDirectDraw, + PDD_GETMOCOMPCOMPBUFFDATA puGetBuffData +); + +DWORD STDCALL OsThunkDdGetMoCompFormats( + HANDLE hDirectDraw, + PDD_GETMOCOMPFORMATSDATA puGetMoCompFormatsData +); + +DWORD STDCALL OsThunkDdGetMoCompGuids( + HANDLE hDirectDraw, + PDD_GETMOCOMPGUIDSDATA puGetMoCompGuidsData +); + +DWORD STDCALL OsThunkDdGetScanLine( + HANDLE hDirectDraw, + PDD_GETSCANLINEDATA puGetScanLineData +); + +DWORD STDCALL OsThunkDdLock( + HANDLE hSurface, + PDD_LOCKDATA puLockData, + HDC hdcClip +); + +DWORD STDCALL OsThunkDdLockD3D( + HANDLE hSurface, + PDD_LOCKDATA puLockData +); + +BOOL STDCALL OsThunkDdQueryDirectDrawObject( + HANDLE hDirectDrawLocal, + DD_HALINFO *pHalInfo, + DWORD *pCallBackFlags, + PD3DNTHAL_CALLBACKS puD3dCallbacks, + PD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, + PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, + LPDDSURFACEDESC puD3dTextureFormats, + DWORD *puNumHeaps, + VIDEOMEMORY *puvmList, + DWORD *puNumFourCC, + DWORD *puFourCC +); + +DWORD STDCALL OsThunkDdQueryMoCompStatus( + HANDLE hMoComp, + PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData +); + +BOOL STDCALL OsThunkDdReenableDirectDrawObject( + HANDLE hDirectDrawLocal, + BOOL *pubNewMode +); + +BOOL STDCALL OsThunkDdReleaseDC( + HANDLE hSurface +); + +DWORD STDCALL OsThunkDdRenderMoComp( + HANDLE hMoComp, + PDD_RENDERMOCOMPDATA puRenderMoCompData +); + +BOOL STDCALL OsThunkDdResetVisrgn( + HANDLE hSurface, + HWND hwnd +); + +DWORD STDCALL OsThunkDdSetColorKey( + HANDLE hSurface, + PDD_SETCOLORKEYDATA puSetColorKeyData +); + +DWORD STDCALL OsThunkDdSetExclusiveMode( + HANDLE hDirectDraw, + PDD_SETEXCLUSIVEMODEDATA puSetExclusiveModeData +); + +BOOL STDCALL OsThunkDdSetGammaRamp( + HANDLE hDirectDraw, + HDC hdc, + LPVOID lpGammaRamp +); + +DWORD STDCALL OsThunkDdSetOverlayPosition( + HANDLE hSurfaceSource, + HANDLE hSurfaceDestination, + PDD_SETOVERLAYPOSITIONDATA puSetOverlayPositionData +); + +VOID STDCALL OsThunkDdUnattachSurface( + HANDLE hSurface, + HANDLE hSurfaceAttached +); + +DWORD STDCALL OsThunkDdUnlock( + HANDLE hSurface, + PDD_UNLOCKDATA puUnlockData +); + +DWORD STDCALL OsThunkDdUnlockD3D( + HANDLE hSurface, + PDD_UNLOCKDATA puUnlockData +); + +DWORD STDCALL OsThunkDdUpdateOverlay( + HANDLE hSurfaceDestination, + HANDLE hSurfaceSource, + PDD_UPDATEOVERLAYDATA puUpdateOverlayData +); + +DWORD STDCALL OsThunkDdWaitForVerticalBlank( + HANDLE hDirectDraw, + PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData +); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif // __D3D8THK_H Property changes on: trunk/reactos/lib/d3d8thk/d3d8thk.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/d3d8thk/d3d8thk.xml --- trunk/reactos/lib/d3d8thk/d3d8thk.xml 2005-07-21 17:24:15 UTC (rev 16682) +++ trunk/reactos/lib/d3d8thk/d3d8thk.xml 2005-07-21 18:22:45 UTC (rev 16683) @@ -0,0 +1,5 @@ +<module name="d3d8thk" type="win32dll" installbase="system32" installname="d3d8thk.dll"> + <importlibrary definition="d3d8thk.def" /> + <file>d3d8thk.rc</file> + <file>win32k.S</file> +</module> _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-07-21 17:24:15 UTC (rev 16682) +++ trunk/reactos/lib/directory.xml 2005-07-21 18:22:45 UTC (rev 16683) @@ -37,6 +37,9 @@ <directory name="crtdll"> <xi:include href="crtdll/crtdll.xml" /> </directory> +<directory name="d3d8thk"> + <xi:include href="d3d8thk/d3d8thk.xml" /> +</directory> <directory name="dbghelp"> <xi:include href="dbghelp/dbghelp.xml" /> </directory>

1 0

[greatlrd] 16682: fix bug in date if the input arg are not right dateformat, it should prom after new date
by greatlrd＠svn.reactos.com 21 Jul '05

21 Jul '05

fix bug in date if the input arg are not right dateformat, it should prom after new date Modified: trunk/reactos/subsys/system/cmd/date.c _____ Modified: trunk/reactos/subsys/system/cmd/date.c --- trunk/reactos/subsys/system/cmd/date.c 2005-07-21 16:28:20 UTC (rev 16681) +++ trunk/reactos/subsys/system/cmd/date.c 2005-07-21 17:24:15 UTC (rev 16682) @@ -243,13 +243,25 @@ } else { - if (ParseDate (arg[nDateString])) - { - freep (arg); - return 0; - } - - ConErrResPuts(STRING_DATE_ERROR); + if (!ParseDate (arg[nDateString])) + { + while (TRUE) /* forever loop */ + { + TCHAR s[40]; + ConErrResPuts(STRING_DATE_ERROR); + + PrintDateString (); + ConInString (s, 40); + + while (*s && s[_tcslen (s) - 1] < _T(' ')) + s[_tcslen (s) - 1] = _T('\0'); + if (ParseDate (s)) + { + freep (arg); + return 0; + } + } + } } freep (arg);

1 0

[greatlrd] 16681: fix a small bug, write out time like HH:MM:SS, ms as ms cmd does.
by greatlrd＠svn.reactos.com 21 Jul '05

21 Jul '05

fix a small bug, write out time like HH:MM:SS,ms as ms cmd does. Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/locale.c Modified: trunk/reactos/subsys/system/cmd/prompt.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-07-21 15:46:07 UTC (rev 16680) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-21 16:28:20 UTC (rev 16681) @@ -1035,8 +1035,11 @@ /* %TIME% */ else if (_tcsicmp(ip,_T("time")) ==0) { - TCHAR szTime[40]; - GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL, szTime, sizeof(szTime)); + TCHAR szTime[40]; + SYSTEMTIME t; + GetSystemTime(&t); + + _sntprintf(szTime ,40,_T("%02d%c%02d%c%02d%c%02d"), t.wHour, cTimeSeparator,t.wMinute , cTimeSeparator,t.wSecond , cDecimalSeparator, t.wMilliseconds ); cp = _stpcpy (cp, szTime); } _____ Modified: trunk/reactos/subsys/system/cmd/locale.c --- trunk/reactos/subsys/system/cmd/locale.c 2005-07-21 15:46:07 UTC (rev 16680) +++ trunk/reactos/subsys/system/cmd/locale.c 2005-07-21 16:28:20 UTC (rev 16681) @@ -70,12 +70,12 @@ VOID PrintTime (VOID) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - TCHAR szTime[32]; - - GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL, - szTime, sizeof(szTime)); - + TCHAR szMsg[RC_STRING_MAX_SIZE]; + SYSTEMTIME t; + GetSystemTime(&t); + LoadString(CMD_ModuleHandle, STRING_LOCALE_HELP1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(_T("%s: %s\n"), szMsg, szTime); + ConOutPrintf(_T("%s: %02d%c%02d%c%02d%c%02d\n"), szMsg, t.wHour, cTimeSeparator, + t.wMinute , cTimeSeparator, + t.wSecond , cDecimalSeparator, t.wMilliseconds ); } _____ Modified: trunk/reactos/subsys/system/cmd/prompt.c --- trunk/reactos/subsys/system/cmd/prompt.c 2005-07-21 15:46:07 UTC (rev 16680) +++ trunk/reactos/subsys/system/cmd/prompt.c 2005-07-21 16:28:20 UTC (rev 16681) @@ -138,10 +138,11 @@ break; case _T('T'): - { - TCHAR szTime[32]; - GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL,szTime, sizeof(szTime)); - ConOutPrintf("%s",szTime); + { + SYSTEMTIME t; + GetSystemTime(&t); + ConOutPrintf(_T("%02d%c%02d%c%02d%c%02d\n"),t.wHour, cTimeSeparator,t.wMinute , cTimeSeparator, + t.wSecond , cDecimalSeparator, t.wMilliseconds ); } break;

1 0

[hbirr] 16680: Set MmUserProbeAddress and MmHighestUserAddress according to the system range start.
by hbirr＠svn.reactos.com 21 Jul '05

21 Jul '05

Set MmUserProbeAddress and MmHighestUserAddress according to the system range start. Modified: trunk/reactos/ntoskrnl/mm/mminit.c _____ Modified: trunk/reactos/ntoskrnl/mm/mminit.c --- trunk/reactos/ntoskrnl/mm/mminit.c 2005-07-21 14:15:42 UTC (rev 16679) +++ trunk/reactos/ntoskrnl/mm/mminit.c 2005-07-21 15:46:07 UTC (rev 16680) @@ -321,8 +321,8 @@ } /* Set memory limits */ - MmUserProbeAddress = 0x7fff0000; - MmHighestUserAddress = (PVOID)0x7ffeffff; + MmUserProbeAddress = (ULONG_PTR)MmSystemRangeStart - 0x10000; + MmHighestUserAddress = (PVOID)(MmUserProbeAddress - 1); /* * Initialize memory managment statistics

1 0

[greatlrd] 16679: Fix copy /B filename + , , bug (touch) and fix whitespace for copy /B file + file + file2
by greatlrd＠svn.reactos.com 21 Jul '05

21 Jul '05

Fix copy /B filename + , , bug (touch) and fix whitespace for copy /B file + file + file2 by Brandon Turner Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-21 13:55:36 UTC (rev 16678) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-21 14:15:42 UTC (rev 16679) @@ -518,9 +518,21 @@ { /*if it isnt a switch then it is the source or destination*/ if(nSrc == -1) + { nSrc = i; + } + else if(*arg[i] == _T('+') || *arg[i] == _T(',')) + { + /* Add these onto the source string + this way we can do all checks + directly on source string later on */ + _tcscat(arg[nSrc],arg[i]); + nFiles--; + } else if(nDes == -1) + { nDes = i; + } } } @@ -842,8 +854,10 @@ LoadString(CMD_ModuleHandle, STRING_COPY_FILE, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(szMsg, nFiles); - CloseHandle(hFile); - freep (arg); + CloseHandle(hFile); + if (arg!=NULL) + free(arg); + return 0; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs