Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 18698: use GetSystemDirectory
by gedmurphy＠svn.reactos.com 23 Oct '05

23 Oct '05

use GetSystemDirectory Modified: trunk/reactos/services/tcpsvcs/qotd.c _____ Modified: trunk/reactos/services/tcpsvcs/qotd.c --- trunk/reactos/services/tcpsvcs/qotd.c 2005-10-23 10:58:21 UTC (rev 18697) +++ trunk/reactos/services/tcpsvcs/qotd.c 2005-10-23 11:01:11 UTC (rev 18698) @@ -21,20 +21,26 @@ #define QBUFSIZ 160 #define NUMQUOTES 60 -LPCTSTR FilePath = "C:\\ReactOS\\system32\\drivers\\etc\\quotes"; +LPCTSTR FilePath = _T("\\drivers\\etc\\quotes"); DWORD WINAPI QotdHandler(VOID* Sock_) { FILE *fp; SOCKET Sock; + TCHAR Sys[MAX_PATH]; + TCHAR Quote[NUMQUOTES][BUFSIZ]; // need to set this dynamically INT QuoteToPrint; - TCHAR Quote[NUMQUOTES][BUFSIZ]; // need to set this dynamically INT i = 0; Sock = (SOCKET)Sock_; + if(! GetSystemDirectory(Sys, MAX_PATH)) + _tprintf(_T("Getting system path failed. Error: %lu\n"), GetLastError()); + + _tcscat(Sys, FilePath); + _tprintf(_T("Opening quotes file\n")); - if ((fp = _tfopen(FilePath, "r")) == NULL) + if ((fp = _tfopen(Sys, "r")) == NULL) { _tprintf(_T("Error opening file: %lu\n"), GetLastError()); _tprintf(_T("Terminating qotd thread\n"));

1 0

[greatlrd] 18697: Move struct DDARGB to right include file, Adding GUID define GUID_MiscellaneousCallbacks, GUID_Miscellaneous2Callbacks, GUID_VideoPortCallbacks, GUID_ColorControlCallbacks, GUID_MotionCompCallbacks, GUID_VideoPortCaps, GUID_D3DCaps, GUID_D3DExtendedCaps, GUID_D3DCallbacks, GUID_D3DCallbacks2, GUID_D3DCallbacks3, GUID_NonLocalVidMemCaps, GUID_KernelCallbacks, GUID_KernelCaps, GUID_ZPixelFormats, GUID_DDMoreCaps, GUID_D3DParseUnknownCommandCallback, GUID_NTCallbacks, GUID_DDMoreS
by greatlrd＠svn.reactos.com 23 Oct '05

23 Oct '05

Move struct DDARGB to right include file, Adding GUID define GUID_MiscellaneousCallbacks, GUID_Miscellaneous2Callbacks, GUID_VideoPortCallbacks, GUID_ColorControlCallbacks, GUID_MotionCompCallbacks, GUID_VideoPortCaps, GUID_D3DCaps, GUID_D3DExtendedCaps, GUID_D3DCallbacks, GUID_D3DCallbacks2, GUID_D3DCallbacks3, GUID_NonLocalVidMemCaps, GUID_KernelCallbacks, GUID_KernelCaps, GUID_ZPixelFormats, GUID_DDMoreCaps, GUID_D3DParseUnknownCommandCallback, GUID_NTCallbacks, GUID_DDMoreSurfaceCaps, GUID_GetHeapAlignment, GUID_UpdateNonLocalHeap, GUID_NTPrivateDriverCaps, GUID_DDStereoMode, GUID_VPE2Callbacks Modified: trunk/reactos/w32api/include/ddk/ddrawint.h Modified: trunk/reactos/w32api/include/ddraw.h _____ Modified: trunk/reactos/w32api/include/ddk/ddrawint.h --- trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-23 10:40:25 UTC (rev 18696) +++ trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-23 10:58:21 UTC (rev 18697) @@ -25,17 +25,42 @@ #endif +DEFINE_GUID( GUID_MiscellaneousCallbacks, 0xEFD60CC0, 0x49e7, 0x11d0, 0x88, 0x9d, 0x0, 0xaa, 0x0, 0xbb, 0xb7, 0x6a); +DEFINE_GUID( GUID_Miscellaneous2Callbacks, 0x406B2F00, 0x3E5A, 0x11D1, 0xB6, 0x40, 0x00, 0xAA, 0x00, 0xA1, 0xF9, 0x6A); +DEFINE_GUID( GUID_VideoPortCallbacks, 0xefd60cc1, 0x49e7, 0x11d0, 0x88, 0x9d, 0x0, 0xaa, 0x0, 0xbb, 0xb7, 0x6a); +DEFINE_GUID( GUID_ColorControlCallbacks, 0xefd60cc2, 0x49e7, 0x11d0, 0x88, 0x9d, 0x0, 0xaa, 0x0, 0xbb, 0xb7, 0x6a); +DEFINE_GUID( GUID_MotionCompCallbacks, 0xb1122b40, 0x5dA5, 0x11d1, 0x8f, 0xcF, 0x00, 0xc0, 0x4f, 0xc2, 0x9b, 0x4e); +DEFINE_GUID( GUID_VideoPortCaps, 0xefd60cc3, 0x49e7, 0x11d0, 0x88, 0x9d, 0x0, 0xaa, 0x0, 0xbb, 0xb7, 0x6a); +DEFINE_GUID( GUID_D3DCaps, 0x7bf06991, 0x8794, 0x11d0, 0x91, 0x39, 0x08, 0x00, 0x36, 0xd2, 0xef, 0x02); +DEFINE_GUID( GUID_D3DExtendedCaps, 0x7de41f80, 0x9d93, 0x11d0, 0x89, 0xab, 0x00, 0xa0, 0xc9, 0x05, 0x41, 0x29); +DEFINE_GUID( GUID_D3DCallbacks, 0x7bf06990, 0x8794, 0x11d0, 0x91, 0x39, 0x08, 0x00, 0x36, 0xd2, 0xef, 0x02); +DEFINE_GUID( GUID_D3DCallbacks2, 0xba584e1, 0x70b6, 0x11d0, 0x88, 0x9d, 0x0, 0xaa, 0x0, 0xbb, 0xb7, 0x6a); +DEFINE_GUID( GUID_D3DCallbacks3, 0xddf41230, 0xec0a, 0x11d0, 0xa9, 0xb6, 0x00, 0xaa, 0x00, 0xc0, 0x99, 0x3e); +DEFINE_GUID( GUID_NonLocalVidMemCaps, 0x86c4fa80, 0x8d84, 0x11d0, 0x94, 0xe8, 0x00, 0xc0, 0x4f, 0xc3, 0x41, 0x37); +DEFINE_GUID( GUID_KernelCallbacks, 0x80863800, 0x6B06, 0x11D0, 0x9B, 0x06, 0x0, 0xA0, 0xC9, 0x03, 0xA3, 0xB8); +DEFINE_GUID( GUID_KernelCaps, 0xFFAA7540, 0x7AA8, 0x11D0, 0x9B, 0x06, 0x00, 0xA0, 0xC9, 0x03, 0xA3, 0xB8); +DEFINE_GUID( GUID_ZPixelFormats, 0x93869880, 0x36cf, 0x11d1, 0x9b, 0x1b, 0x0, 0xaa, 0x0, 0xbb, 0xb8, 0xae); +DEFINE_GUID( GUID_DDMoreCaps, 0x880baf30, 0xb030, 0x11d0, 0x8e, 0xa7, 0x00, 0x60, 0x97, 0x97, 0xea, 0x5b); +DEFINE_GUID( GUID_D3DParseUnknownCommandCallback, 0x2e04ffa0, 0x98e4, 0x11d1, 0x8c, 0xe1, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0xa8); +DEFINE_GUID( GUID_NTCallbacks, 0x6fe9ecde, 0xdf89, 0x11d1, 0x9d, 0xb0, 0x00, 0x60, 0x08, 0x27, 0x71, 0xba); +DEFINE_GUID( GUID_DDMoreSurfaceCaps, 0x3b8a0466, 0xf269, 0x11d1, 0x88, 0x0b, 0x0, 0xc0, 0x4f, 0xd9, 0x30, 0xc5); +DEFINE_GUID( GUID_GetHeapAlignment, 0x42e02f16, 0x7b41, 0x11d2, 0x8b, 0xff, 0x0, 0xa0, 0xc9, 0x83, 0xea, 0xf6); +DEFINE_GUID( GUID_UpdateNonLocalHeap, 0x42e02f17, 0x7b41, 0x11d2, 0x8b, 0xff, 0x0, 0xa0, 0xc9, 0x83, 0xea, 0xf6); +DEFINE_GUID( GUID_NTPrivateDriverCaps, 0xfad16a23, 0x7b66, 0x11d2, 0x83, 0xd7, 0x0, 0xc0, 0x4f, 0x7c, 0xe5, 0x8c); +DEFINE_GUID( GUID_DDStereoMode, 0xf828169c, 0xa8e8, 0x11d2, 0xa1, 0xf2, 0x0, 0xa0, 0xc9, 0x83, 0xea, 0xf6); +DEFINE_GUID( GUID_VPE2Callbacks, 0x52882147, 0x2d47, 0x469a, 0xa0, 0xd1, 0x3, 0x45, 0x58, 0x90, 0xf6, 0xc8); -typedef struct _DD_VIDEOPORT_LOCAL *PDD_VIDEOPORT_LOCAL; /* should be defined here once we have dvp.h */ +typedef struct _DD_VIDEOPORT_LOCAL *PDD_VIDEOPORT_LOCAL; + /*********************************************************************** */ /* Video memory info structures */ /*********************************************************************** */ -typedef struct +typedef struct _VIDEOMEMORY { DWORD dwFlags; FLATPTR fpStart; @@ -53,7 +78,7 @@ }; } VIDEOMEMORY, *PVIDEOMEMORY; -typedef struct +typedef struct _VIDEOMEMORYINFO { FLATPTR fpPrimary; DWORD dwFlags; @@ -74,7 +99,7 @@ /* DDI representation of the DirectDraw object */ /*********************************************************************** */ -typedef struct +typedef struct _DD_DIRECTDRAW_GLOBAL { PVOID dhpdev; ULONG_PTR dwReserved1; @@ -82,7 +107,7 @@ LPDDVIDEOPORTCAPS lpDDVideoPortCaps; } DD_DIRECTDRAW_GLOBAL, *PDD_DIRECTDRAW_GLOBAL; -typedef struct +typedef struct _DD_DIRECTDRAW_LOCAL { PDD_DIRECTDRAW_GLOBAL lpGbl; } DD_DIRECTDRAW_LOCAL, *PDD_DIRECTDRAW_LOCAL; @@ -91,7 +116,7 @@ /* DDI representation of the DirectDrawSurface object */ /*********************************************************************** */ -typedef struct +typedef struct _DD_SURFACE_GLOBAL { union { @@ -122,7 +147,7 @@ HANDLE hCreatorProcess; } DD_SURFACE_GLOBAL, *PDD_SURFACE_GLOBAL; -typedef struct +typedef struct _DD_SURFACE_MORE { DWORD dwMipMapCount; PDD_VIDEOPORT_LOCAL lpVideoPort; @@ -133,7 +158,7 @@ typedef struct _DD_ATTACHLIST *PDD_ATTACHLIST; -typedef struct +typedef struct _DD_SURFACE_LOCAL { PDD_SURFACE_GLOBAL lpGbl; DWORD dwFlags; @@ -161,7 +186,7 @@ PDD_SURFACE_LOCAL lpAttached; } DD_ATTACHLIST; -typedef struct +typedef struct _DD_SURFACE_INT { PDD_SURFACE_LOCAL lpLcl; } DD_SURFACE_INT, *PDD_SURFACE_INT; @@ -170,7 +195,7 @@ /* DDI representation of the DirectDrawPalette object */ /*********************************************************************** */ -typedef struct +typedef struct _DD_PALETTE_GLOBAL { ULONG_PTR Reserved1; } DD_PALETTE_GLOBAL, *PDD_PALETTE_GLOBAL; @@ -213,7 +238,7 @@ /* IDirectDrawSurface callbacks */ /*********************************************************************** */ -typedef struct +typedef struct _DD_LOCKDATA { PDD_DIRECTDRAW_GLOBAL lpDD; PDD_SURFACE_LOCAL lpDDSurface; @@ -227,7 +252,8 @@ } DD_LOCKDATA, *PDD_LOCKDATA; typedef DWORD (STDCALL *PDD_SURFCB_LOCK)(PDD_LOCKDATA); -typedef struct + +typedef struct _DD_UNLOCKDATA { PDD_DIRECTDRAW_GLOBAL lpDD; PDD_SURFACE_LOCAL lpDDSurface; @@ -239,12 +265,9 @@ #define DDABLT_SRCOVERDEST 0x00000001 #define DDBLT_AFLAGS 0x80000000 -typedef struct -{ - BYTE blue, green, red, alpha; -} DDARGB, *PDDARGB; -typedef struct + +typedef struct _DD_BLTDATA { PDD_DIRECTDRAW_GLOBAL lpDD; PDD_SURFACE_LOCAL lpDDDestSurface; @@ -266,7 +289,7 @@ } DD_BLTDATA, *PDD_BLTDATA; typedef DWORD (STDCALL *PDD_SURFCB_BLT)(PDD_BLTDATA); -typedef struct +typedef struct _DD_UPDATEOVERLAYDATA { PDD_DIRECTDRAW_GLOBAL lpDD; PDD_SURFACE_LOCAL lpDDDestSurface; _____ Modified: trunk/reactos/w32api/include/ddraw.h --- trunk/reactos/w32api/include/ddraw.h 2005-10-23 10:40:25 UTC (rev 18696) +++ trunk/reactos/w32api/include/ddraw.h 2005-10-23 10:58:21 UTC (rev 18697) @@ -59,7 +59,7 @@ * Predeclare the interfaces */ #ifndef _NO_COM -#ifndef __DDRAW_GUID_DEFINED__ +#if defined( _WIN32 ) && !defined( _NO_COM ) DEFINE_GUID( CLSID_DirectDraw, 0xD7B70EE0,0x4340,0x11CF,0xB0,0x63,0x00,0x20,0xAF,0xC2,0xCD,0x35 ); DEFINE_GUID( CLSID_DirectDraw7, 0x3C305196,0x50DB,0x11D3,0x9C,0xFE,0x00,0xC0,0x4F,0xD9,0x30,0xC5 ); DEFINE_GUID( CLSID_DirectDrawClipper, 0x593817A0,0x7DB3,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xb9,0x33,0x56 ); @@ -386,6 +386,11 @@ /* indicates surface is part of a stereo flipping chain */ #define DDSCAPS2_STEREOSURFACELEFT 0x00080000 +typedef struct +{ + BYTE blue, green, red, alpha; +} DDARGB, *PDDARGB; + typedef struct _DDSCAPS2 { DWORD dwCaps; /* capabilities of surface wanted */ DWORD dwCaps2; /* additional capabilities */

1 0

[hpoussin] 18696: Manufacturer section names can also be decorated by architecture-specific extension
by hpoussin＠svn.reactos.com 23 Oct '05

23 Oct '05

Manufacturer section names can also be decorated by architecture-specific extension Fix possible buffer overflow (spotted by w3seek) Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-23 10:02:46 UTC (rev 18695) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-23 10:40:25 UTC (rev 18696) @@ -3698,7 +3698,8 @@ driverInfo->Details.Reserved = (ULONG_PTR)driverInfo; /* Copy InfFileName field */ - wcsncpy(driverInfo->Details.InfFileName, InfFile, MAX_PATH); + wcsncpy(driverInfo->Details.InfFileName, InfFile, MAX_PATH - 1); + driverInfo->Details.InfFileName[MAX_PATH - 1] = '\0'; /* Fill InfDate field */ /* FIXME: hFile = CreateFile(driverInfo->Details.InfFileName, @@ -3942,7 +3943,7 @@ HINF hInf = INVALID_HANDLE_VALUE; LPWSTR ProviderName = NULL; LPWSTR ManufacturerName = NULL; - LPWSTR ManufacturerSection = NULL; + WCHAR ManufacturerSection[LINE_LEN + 1]; LPWSTR HardwareIDs = NULL; LPWSTR CompatibleIDs = NULL; FILETIME DriverDate; @@ -4114,29 +4115,24 @@ ManufacturerName, RequiredSize, &RequiredSize); } + /* Get manufacturer section name */ Result = SetupGetStringFieldW( &ContextManufacturer, 1, /* Field index */ - NULL, 0, + ManufacturerSection, LINE_LEN, &RequiredSize); if (Result) { - /* We got the needed size for the buffer */ - ManufacturerSection = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); - if (!ManufacturerSection) + ManufacturerSection[RequiredSize] = 0; /* Final NULL char */ + /* Add (possible) extension to manufacturer section name */ + Result = SetupDiGetActualSectionToInstallW( + hInf, ManufacturerSection, ManufacturerSection, LINE_LEN, NULL, NULL); + if (Result) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto done; + TRACE("Enumerating devices in manufacturer %S\n", ManufacturerSection); + Result = SetupFindFirstLineW(hInf, ManufacturerSection, NULL, &ContextDevice); } - Result = SetupGetStringFieldW( - &ContextManufacturer, - 1, /* Field index */ - ManufacturerSection, RequiredSize, - &RequiredSize); } - - TRACE("Enumerating devices in manufacturer %S\n", ManufacturerSection); - Result = SetupFindFirstLineW(hInf, ManufacturerSection, NULL, &ContextDevice); while (Result) { if (DriverType == SPDIT_CLASSDRIVER) @@ -4239,8 +4235,7 @@ } HeapFree(GetProcessHeap(), 0, ManufacturerName); - HeapFree(GetProcessHeap(), 0, ManufacturerSection); - ManufacturerName = ManufacturerSection = NULL; + ManufacturerName = NULL; Result = SetupFindNextLine(&ContextManufacturer, &ContextManufacturer); } @@ -4274,7 +4269,6 @@ HeapFree(GetProcessHeap(), 0, ProviderName); HeapFree(GetProcessHeap(), 0, ManufacturerName); - HeapFree(GetProcessHeap(), 0, ManufacturerSection); HeapFree(GetProcessHeap(), 0, HardwareIDs); HeapFree(GetProcessHeap(), 0, CompatibleIDs); if (hInf != INVALID_HANDLE_VALUE)

1 0

[greatlrd] 18695: adding DD_VIDEOPORT_LOCAL struct
by greatlrd＠svn.reactos.com 23 Oct '05

23 Oct '05

adding DD_VIDEOPORT_LOCAL struct Modified: trunk/reactos/w32api/include/ddk/ddrawint.h _____ Modified: trunk/reactos/w32api/include/ddk/ddrawint.h --- trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-23 09:54:12 UTC (rev 18694) +++ trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-23 10:02:46 UTC (rev 18695) @@ -24,13 +24,13 @@ extern "C" { #endif -// FIXME: These should have been defined in other header files! -typedef struct _DD_VIDEOPORT_LOCAL *PDD_VIDEOPORT_LOCAL; /* should be defined here once we have dvp.h */ +typedef struct _DD_VIDEOPORT_LOCAL *PDD_VIDEOPORT_LOCAL; /* should be defined here once we have dvp.h */ + /*********************************************************************** */ /* Video memory info structures */ /*********************************************************************** */ @@ -194,6 +194,21 @@ LPVOID lpDriverReserved3; } DD_MOTIONCOMP_LOCAL, *PDD_MOTIONCOMP_LOCAL; + +typedef struct _DD_VIDEOPORT_LOCAL +{ + PDD_DIRECTDRAW_LOCAL lpDD; + DDVIDEOPORTDESC ddvpDesc; + DDVIDEOPORTINFO ddvpInfo; + PDD_SURFACE_INT lpSurface; + PDD_SURFACE_INT lpVBISurface; + DWORD dwNumAutoflip; + DWORD dwNumVBIAutoflip; + ULONG_PTR dwReserved1; + ULONG_PTR dwReserved2; + ULONG_PTR dwReserved3; +} DD_VIDEOPORT_LOCAL ; + /*********************************************************************** */ /* IDirectDrawSurface callbacks */ /*********************************************************************** */

1 0

[navaraf] 18694: Call CLIPPING_UpdateGCRegion every time we update clip region.
by navaraf＠svn.reactos.com 23 Oct '05

23 Oct '05

Call CLIPPING_UpdateGCRegion every time we update clip region. Modified: trunk/reactos/subsys/win32k/ntuser/windc.c Modified: trunk/reactos/subsys/win32k/objects/cliprgn.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/windc.c --- trunk/reactos/subsys/win32k/ntuser/windc.c 2005-10-23 06:19:15 UTC (rev 18693) +++ trunk/reactos/subsys/win32k/ntuser/windc.c 2005-10-23 09:54:12 UTC (rev 18694) @@ -782,7 +782,9 @@ } if (NULL != dc->w.hClipRgn) { + int FASTCALL CLIPPING_UpdateGCRegion(DC* Dc); NtGdiOffsetRgn(dc->w.hClipRgn, DeltaX, DeltaY); + CLIPPING_UpdateGCRegion(dc); } if (NULL != pDCE->hClipRgn) { _____ Modified: trunk/reactos/subsys/win32k/objects/cliprgn.c --- trunk/reactos/subsys/win32k/objects/cliprgn.c 2005-10-23 06:19:15 UTC (rev 18693) +++ trunk/reactos/subsys/win32k/objects/cliprgn.c 2005-10-23 09:54:12 UTC (rev 18694) @@ -348,6 +348,7 @@ Result = NtGdiOffsetRgn(dc->w.hClipRgn, XOffset, YOffset); + CLIPPING_UpdateGCRegion(dc); } else {

1 0

[ekohl] 18693: Improvements to ScmrCreateServiceW:
by ekohl＠svn.reactos.com 23 Oct '05

23 Oct '05

Improvements to ScmrCreateServiceW: - Allocate a service record for the new service. - Fix registry value types and sizes. - Fail if the new service already exists. Modified: trunk/reactos/subsys/system/services/database.c Modified: trunk/reactos/subsys/system/services/rpcserver.c Modified: trunk/reactos/subsys/system/services/services.h _____ Modified: trunk/reactos/subsys/system/services/database.c --- trunk/reactos/subsys/system/services/database.c 2005-10-23 01:06:59 UTC (rev 18692) +++ trunk/reactos/subsys/system/services/database.c 2005-10-23 06:19:15 UTC (rev 18693) @@ -186,11 +186,10 @@ CreateServiceListEntry(LPWSTR lpServiceName) { RTL_QUERY_REGISTRY_TABLE QueryTable[6]; - UNICODE_STRING ServiceName; PSERVICE Service = NULL; NTSTATUS Status; - DPRINT("Service: '%wZ'\n", ServiceName); + DPRINT("Service: '%S'\n", lpServiceName); /* Allocate service entry */ @@ -265,6 +264,42 @@ } +DWORD +ScmCreateNewServiceRecord(LPWSTR lpServiceName, + PSERVICE *lpServiceRecord) +{ + PSERVICE lpService = NULL; + + DPRINT("Service: '%S'\n", lpServiceName); + + /* Allocate service entry */ + lpService = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SERVICE) + ((wcslen(lpServiceName) + 1) * sizeof(WCHAR))); + if (lpService == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + *lpServiceRecord = lpService; + + /* Copy service name */ + wcscpy(lpService->szServiceName, lpServiceName); + lpService->lpServiceName = lpService->szServiceName; + + /* Append service entry */ + InsertTailList(&ServiceListHead, + &lpService->ServiceListEntry); + + lpService->Status.dwCurrentState = SERVICE_STOPPED; + lpService->Status.dwControlsAccepted = 0; + lpService->Status.dwWin32ExitCode = ERROR_SERVICE_NEVER_STARTED; + lpService->Status.dwServiceSpecificExitCode = 0; + lpService->Status.dwCheckPoint = 0; + lpService->Status.dwWaitHint = 2000; /* 2 seconds */ + + return ERROR_SUCCESS; +} + + NTSTATUS ScmCreateServiceDataBase(VOID) { _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-10-23 01:06:59 UTC (rev 18692) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-10-23 06:19:15 UTC (rev 18693) @@ -493,9 +493,9 @@ #endif -#if 0 static DWORD -CreateServiceKey(LPWSTR lpServiceName, PHKEY phKey) +CreateServiceKey(LPWSTR lpServiceName, + PHKEY phKey) { HKEY hServicesKey = NULL; DWORD dwDisposition; @@ -520,6 +520,7 @@ NULL, phKey, &dwDisposition); +#if 0 if ((dwError == ERROR_SUCCESS) && (dwDisposition == REG_OPENED_EXISTING_KEY)) { @@ -527,12 +528,12 @@ *phKey = NULL; dwError = ERROR_SERVICE_EXISTS; } +#endif RegCloseKey(hServicesKey); return dwError; } -#endif /* Function 12 */ @@ -557,10 +558,10 @@ { PMANAGER_HANDLE hManager; DWORD dwError = ERROR_SUCCESS; -#if 0 + PSERVICE lpService = NULL; + SC_HANDLE hServiceHandle = NULL; + LPWSTR lpImagePath = NULL; HKEY hServiceKey = NULL; - LPWSTR lpImagePath = NULL; -#endif DPRINT1("ScmrCreateServiceW() called\n"); DPRINT1("lpServiceName = %S\n", lpServiceName); @@ -588,15 +589,16 @@ return ERROR_ACCESS_DENIED; } - /* FIXME: Fail if the service already exists! */ + /* Fail if the service already exists! */ + if (ScmGetServiceEntryByName(lpServiceName) != NULL) + return ERROR_SERVICE_EXISTS; -#if 0 if (dwServiceType & SERVICE_DRIVER) { /* FIXME: Adjust the image path */ lpImagePath = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - wcslen(lpBinaryPathName) + sizeof(WCHAR)); + (wcslen(lpBinaryPathName) + 1) * sizeof(WCHAR)); if (lpImagePath == NULL) { dwError = ERROR_NOT_ENOUGH_MEMORY; @@ -605,14 +607,18 @@ wcscpy(lpImagePath, lpBinaryPathName); } - /* FIXME: Allocate and fill a service entry */ -// dwError = CreateNewServiceListEntry(lpServiceName, -// &lpServiceEntry) + /* Allocate a new service entry */ + dwError = ScmCreateNewServiceRecord(lpServiceName, + &lpService); + if (dwError != ERROR_SUCCESS) + goto done; -// if (lpdwTagId != NULL) -// *lpdwTagId = 0; + /* Fill the new service entry */ + lpService->Status.dwServiceType = dwServiceType; + lpService->dwStartType = dwStartType; + lpService->dwErrorControl = dwErrorControl; -// *hService = 0; + /* FIXME: set lpLoadOrderGroup, lpDependencies etc. */ /* Write service data to the registry */ @@ -621,6 +627,7 @@ if (dwError != ERROR_SUCCESS) goto done; + /* Set the display name */ if (lpDisplayName != NULL && *lpDisplayName != 0) { RegSetValueExW(hServiceKey, @@ -667,7 +674,7 @@ dwError = RegSetValueExW(hServiceKey, L"ImagePath", 0, - REG_SZ, + REG_EXPAND_SZ, (LPBYTE)lpBinaryPathName, (wcslen(lpBinaryPathName) + 1) * sizeof(WCHAR)); if (dwError != ERROR_SUCCESS) @@ -675,13 +682,12 @@ } else if (dwServiceType & SERVICE_DRIVER) { - /* FIXME: Adjust the path name */ dwError = RegSetValueExW(hServiceKey, L"ImagePath", 0, - REG_SZ, + REG_EXPAND_SZ, (LPBYTE)lpImagePath, - (wcslen(lpImagePath) + 1) *sizeof(WCHAR)); + (wcslen(lpImagePath) + 1) *sizeof(WCHAR)); if (dwError != ERROR_SUCCESS) goto done; } @@ -699,6 +705,11 @@ goto done; } + if (lpdwTagId != NULL) + { + /* FIXME: Write tag */ + } + if (lpDependencies != NULL && *lpDependencies != 0) { /* FIXME: Write dependencies */ @@ -709,13 +720,44 @@ /* FIXME: Write password */ } + dwError = ScmCreateServiceHandle(lpService, + &hServiceHandle); + if (dwError != ERROR_SUCCESS) + goto done; + + dwError = ScmCheckAccess(hServiceHandle, + dwDesiredAccess); + if (dwError != ERROR_SUCCESS) + goto done; + done:; if (hServiceKey != NULL) RegCloseKey(hServiceKey); + if (dwError == ERROR_SUCCESS) + { + DPRINT1("hService %lx\n", hServiceHandle); + *hService = (unsigned int)hServiceHandle; + + if (lpdwTagId != NULL) + *lpdwTagId = 0; /* FIXME */ + } + else + { + if (hServiceHandle != NULL) + { + /* Remove the service handle */ + HeapFree(GetProcessHeap(), 0, hServiceHandle); + } + + if (lpService != NULL) + { + /* FIXME: remove the service entry */ + } + } + if (lpImagePath != NULL) HeapFree(GetProcessHeap(), 0, lpImagePath); -#endif DPRINT1("ScmrCreateServiceW() done (Error %lu)\n", dwError); _____ Modified: trunk/reactos/subsys/system/services/services.h --- trunk/reactos/subsys/system/services/services.h 2005-10-23 01:06:59 UTC (rev 18692) +++ trunk/reactos/subsys/system/services/services.h 2005-10-23 06:19:15 UTC (rev 18693) @@ -44,6 +44,8 @@ VOID ScmAutoStartServices(VOID); PSERVICE ScmGetServiceEntryByName(LPWSTR lpServiceName); +DWORD ScmCreateNewServiceRecord(LPWSTR lpServiceName, + PSERVICE *lpServiceRecord); DWORD ScmMarkServiceForDelete(PSERVICE pService);

1 0

[cwittich] 18692: fixed some bugs in machine.inf
by cwittich＠svn.reactos.com 23 Oct '05

23 Oct '05

fixed some bugs in machine.inf added keyboard.inf added LPT Port to ports.inf Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/media/inf/inf.xml Added: trunk/reactos/media/inf/keyboard.inf Modified: trunk/reactos/media/inf/machine.inf Modified: trunk/reactos/media/inf/ports.inf _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-10-22 22:58:24 UTC (rev 18691) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-10-23 01:06:59 UTC (rev 18692) @@ -298,6 +298,7 @@ media\inf\layout.inf 6 media\inf\machine.inf 6 media\inf\mouse.inf 6 +media\inf\keyboard.inf 6 media\inf\NET_NIC.inf 6 media\inf\netamd.inf 6 media\inf\netisa.inf 6 _____ Modified: trunk/reactos/media/inf/inf.xml --- trunk/reactos/media/inf/inf.xml 2005-10-22 22:58:24 UTC (rev 18691) +++ trunk/reactos/media/inf/inf.xml 2005-10-23 01:06:59 UTC (rev 18692) @@ -6,6 +6,7 @@ <installfile base="inf">layout.inf</installfile> <installfile base="inf">machine.inf</installfile> <installfile base="inf">mouse.inf</installfile> +<installfile base="inf">keyboard.inf</installfile> <installfile base="inf">NET_NIC.inf</installfile> <installfile base="inf">netamd.inf</installfile> <installfile base="inf">netisa.inf</installfile> _____ Added: trunk/reactos/media/inf/keyboard.inf --- trunk/reactos/media/inf/keyboard.inf 2005-10-22 22:58:24 UTC (rev 18691) +++ trunk/reactos/media/inf/keyboard.inf 2005-10-23 01:06:59 UTC (rev 18692) @@ -0,0 +1,67 @@ +; KEYBOARD.INF + +; Installation file for keyboard devices + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = Keyboard +ClassGUID = {4D36E96B-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 10/08/2005,1.01.0.0 + +[ClassInstall32.NT] +AddReg = KeyboardClass.NT.AddReg + +[KeyboardClass.NT.AddReg] +HKR, , , 0, %KeyboardClassName% +HKR, , Icon, 0, "-2" +;HKR, , Installer32, 0, "syssetup.dll,KeyboardClassInstaller" +HKR, , NoInstallClass, 0, 1 + +[Manufacturer] +%StdMfg% = StdMfg + +[StdMfg] +%*PNP0303.DeviceDesc% = PS2_Inst,*PNP0303 + +;------------------------------ PS/2 DRIVER ----------------------------- + +[PS2_Inst.NT] +CopyFiles = PS2_CopyFiles.NT, kbdclass_CopyFiles.NT +AddReg = PS2_AddReg + +[PS2_CopyFiles.NT] +i8042prt.sys + +[PS2_Inst.NT.Services] +AddService = i8042prt, 0x00000002, i8042prt_Service_Inst +AddService = kbdclass, , kbdclass_Service_Inst + +[i8042prt_Service_Inst] +ServiceType = 1 +StartType = 1 +ErrorControl = 1 +ServiceBinary = %12%\i8042prt.sys +LoadOrderGroup = Keyboard Port + +;---------------------------- KBDCLASS DRIVER --------------------------- + +[kbdclass_CopyFiles.NT] +mouclass.sys + +[kbdclass_Service_Inst] +ServiceType = 1 +StartType = 3 +ErrorControl = 1 +ServiceBinary = %12%\kbdclass.sys +LoadOrderGroup = Keyboard Class + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" +KeyboardClassName = "Keyboards" +StdMfg = "(Standard keyboards)" +*PNP0303.DeviceDesc = "IBM PC/AT keyboard" \ No newline at end of file _____ Modified: trunk/reactos/media/inf/machine.inf --- trunk/reactos/media/inf/machine.inf 2005-10-22 22:58:24 UTC (rev 18691) +++ trunk/reactos/media/inf/machine.inf 2005-10-23 01:06:59 UTC (rev 18692) @@ -35,14 +35,15 @@ %PCI\VEN_8086&DEV_7192.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7192 [GenericMfg] -%*PNP0001.DeviceDesc% = NO_DRV_Inst, *PNP0001 -%*PNP0100.DeviceDesc% = NO_DRV_Inst, *PNP0100 -%*PNP0200.DeviceDesc% = NO_DRV_Inst, *PNP0200 -%*PNP0800.DeviceDesc% = NO_DRV_Inst, *PNP0800 -%*PNP0A03.DeviceDesc% = PCI_Inst,*PNP0A03 -%*PNP0A05.DeviceDesc% = NO_DRV_Inst, *PNP0A05 -%*PNP0B00.DeviceDesc% = NO_DRV_Inst, *PNP0B00 -%*PNP0C02.DeviceDesc% = NO_DRV_Inst, *PNP0C02 +%*PNP0001.DeviceDesc% = NO_DRV, *PNP0001 +%*PNP0100.DeviceDesc% = NO_DRV, *PNP0100 +%*PNP0200.DeviceDesc% = NO_DRV, *PNP0200 +%*PNP0800.DeviceDesc% = NO_DRV, *PNP0800 +%*PNP0A03.DeviceDesc% = PCI_Inst, *PNP0A03 +%*PNP0A05.DeviceDesc% = NO_DRV, *PNP0A05 +%*PNP0B00.DeviceDesc% = NO_DRV, *PNP0B00 +%*PNP0C02.DeviceDesc% = NO_DRV, *PNP0C02 +%*PNP0C0F.DeviceDesc% = NO_DRV, *PNP0C0F %ACPI\FixedButton.DeviceDesc% = NO_DRV, ACPI\FixedButton %PCI\CC_0604.DeviceDesc% = PCI_Inst,PCI\CC_0604 @@ -104,6 +105,7 @@ *PNP0200.DeviceDesc = "DMA controller" *PNP0800.DeviceDesc = "System speaker" *PNP0C02.DeviceDesc = "Motherboard resources" +*PNP0C0F.DeviceDesc = "PCI interrupt link device" ACPI\FixedButton.DeviceDesc ="ACPI Fixed Feature Button" PCI\CC_0604.DeviceDesc = "Standard PCI to PCI bridge" _____ Modified: trunk/reactos/media/inf/ports.inf --- trunk/reactos/media/inf/ports.inf 2005-10-22 22:58:24 UTC (rev 18691) +++ trunk/reactos/media/inf/ports.inf 2005-10-23 01:06:59 UTC (rev 18692) @@ -28,7 +28,16 @@ [StdMfg] %*PNP0500.DeviceDesc% = ComPort_Inst,*PNP0500,*PNP0501 %*PNP0501.DeviceDesc% = ComPort_Inst,*PNP0501 +%*PNP0400.DeviceDesc% = LptPort_Inst, *PNP0400,*PNP0401 +%*PNP0401.DeviceDesc% = LptPort_Inst, *PNP0401 +;---------------------------- LPT PORT DRIVER --------------------------- + +[LptPort_Inst.NT] +CopyFiles = LptPort_CopyFiles.NT + +[LptPort_CopyFiles.NT] + ;---------------------------- COM PORT DRIVER --------------------------- [ComPort_Inst.NT] @@ -71,3 +80,5 @@ StdMfg = "(Standard ports)" *PNP0500.DeviceDesc = "Serial communication port" *PNP0501.DeviceDesc = "Serial communication port" +*PNP0400.DeviceDesc = "Standard LPT printer port" +*PNP0401.DeviceDesc = "ECP printer port" \ No newline at end of file

1 0

[ros-diffs] [hpoussin] 18691: Small fixes in descriptions, fix typos, sort by alphabetical order
by hpoussin＠svn.reactos.com 22 Oct '05

22 Oct '05

Small fixes in descriptions, fix typos, sort by alphabetical order Modified: trunk/reactos/media/inf/machine.inf _____ Modified: trunk/reactos/media/inf/machine.inf --- trunk/reactos/media/inf/machine.inf 2005-10-22 20:42:20 UTC (rev 18690) +++ trunk/reactos/media/inf/machine.inf 2005-10-22 22:58:24 UTC (rev 18691) @@ -26,24 +26,24 @@ %IntelMfg% = IntelMfg [IntelMfg] -%PCI\VEN_8086&DEV_7190.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7190 ;Intel 440LX -%PCI\VEN_8086&DEV_7192.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7192 ;Intel 440BX -%PCI\VEN_8086&DEV_7113.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7113 - ; DO NOT INSTALL ISAPNP -> FREEZES SYSTEM ;%PCI\VEN_8086&DEV_7110.DeviceDesc% = Intel_PCI_ISA_Inst, PCI\VEN_8086&DEV_7110 -%PCI\VEN_8086&DEV_7110.DeviceDesc% = INO_DRV, PCI\VEN_8086&DEV_7110 +%PCI\VEN_8086&DEV_7110.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7110 +%PCI\VEN_8086&DEV_7113.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7113 +%PCI\VEN_8086&DEV_7180.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7180 +%PCI\VEN_8086&DEV_7190.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7190 +%PCI\VEN_8086&DEV_7192.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7192 [GenericMfg] -%*PNP0A03.DeviceDesc% = PCI_Inst,*PNP0A03 +%*PNP0001.DeviceDesc% = NO_DRV_Inst, *PNP0001 %*PNP0100.DeviceDesc% = NO_DRV_Inst, *PNP0100 %*PNP0200.DeviceDesc% = NO_DRV_Inst, *PNP0200 %*PNP0800.DeviceDesc% = NO_DRV_Inst, *PNP0800 +%*PNP0A03.DeviceDesc% = PCI_Inst,*PNP0A03 %*PNP0A05.DeviceDesc% = NO_DRV_Inst, *PNP0A05 %*PNP0B00.DeviceDesc% = NO_DRV_Inst, *PNP0B00 %*PNP0C02.DeviceDesc% = NO_DRV_Inst, *PNP0C02 -%*PNP0001.DeviceDesc% = NO_DRV_Inst, *PNP0001 -%ACPI\FixedButton.DeviceDesc% = NO_DRV_Inst, ACPI\FixedButton +%ACPI\FixedButton.DeviceDesc% = NO_DRV, ACPI\FixedButton %PCI\CC_0604.DeviceDesc% = PCI_Inst,PCI\CC_0604 ;---------------------------- NO DRIVER REQ ----------------------------- @@ -53,16 +53,6 @@ [NO_DRV.Services] AddService = , 0x00000002 -[NO_DRV_Inst] -AddReg = NO_DRV_Inst_REG - -[NO_DRV_Inst.Services] -AddService = , 0x00000002 - -[NO_DRV_Inst_REG] -HKR,,ResourcePickerExceptions,0,"IO@0-0xFF:*;IO:HAL,MBRES;IRQ:HAL,*" -HKR,,ResourcePickerTags,0,"MBRES" - ;----------------------------- INTEL DRIVER ----------------------------- [Intel_PCI_ISA_Inst] @@ -106,21 +96,20 @@ SystemClassName = "System devices" GenericMfg = "(Generic system devices)" -IntelMfg = "Intel" - +*PNP0001.DeviceDesc = "EISA programmable interrupt controller" *PNP0A03.DeviceDesc = "PCI bus" +*PNP0A05.DeviceDesc = "Generic ACPI bus" +*PNP0B00.DeviceDesc = "AT real-time clock" *PNP0100.DeviceDesc = "System timer" *PNP0200.DeviceDesc = "DMA controller" *PNP0800.DeviceDesc = "System speaker" -*PNP0A05.DeviceDesc = "Generic ACPI bus" -*PNP0b00.DeviceDesc = "AT real-time clock" *PNP0C02.DeviceDesc = "Motherboard resources" -*PNP0001.DeviceDesc = "EISA programmable interrupt controller" - -ACPI\FixedButton.DeviceDesc=" ACPI Fixed Feature Button" +ACPI\FixedButton.DeviceDesc ="ACPI Fixed Feature Button" PCI\CC_0604.DeviceDesc = "Standard PCI to PCI bridge" -PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX Pentium(R) II CPU to PCI-Bridge" -PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX Pentium(R) II CPU to PCI-Bridge" +IntelMfg = "Intel" +PCI\VEN_8086&DEV_7180.DeviceDesc = "Intel 82443LX/EX Pentium(R) II CPU to PCI-Bridge" +PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI-Bridge" +PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI-Bridge" PCI\VEN_8086&DEV_7113.DeviceDesc = "Intel 82371AB/EB Power Management Controller" PCI\VEN_8086&DEV_7110.DeviceDesc = "Intel 82371AB/EB PCI to ISA Bridge" \ No newline at end of file

1 0

[cwittich] 18690: fix warnings in winetests
by cwittich＠svn.reactos.com 22 Oct '05

22 Oct '05

fix warnings in winetests Modified: trunk/reactos/regtests/winetests/kernel32/console.c Modified: trunk/reactos/regtests/winetests/kernel32/path.c Modified: trunk/reactos/regtests/winetests/ntdll/large_int.c Modified: trunk/reactos/regtests/winetests/ntdll/rtlstr.c _____ Modified: trunk/reactos/regtests/winetests/kernel32/console.c --- trunk/reactos/regtests/winetests/kernel32/console.c 2005-10-22 20:12:42 UTC (rev 18689) +++ trunk/reactos/regtests/winetests/kernel32/console.c 2005-10-22 20:42:20 UTC (rev 18690) @@ -74,8 +74,8 @@ c.X = c.Y = 0; ok(SetConsoleCursorPosition(0, c) == 0, "No handle\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError: expecting %u got %lu\n", - ERROR_INVALID_HANDLE, GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError: expecting %lu got %lu\n", + (DWORD) ERROR_INVALID_HANDLE, (DWORD) GetLastError()); c.X = c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left\n"); @@ -89,26 +89,26 @@ c.X = sbSize.X; c.Y = sbSize.Y - 1; ok(SetConsoleCursorPosition(hCon, c) == 0, "Cursor is outside\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %lu\n", - ERROR_INVALID_PARAMETER, GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError: expecting %lu got %lu\n", + (DWORD) ERROR_INVALID_PARAMETER, (DWORD) GetLastError()); c.X = sbSize.X - 1; c.Y = sbSize.Y; ok(SetConsoleCursorPosition(hCon, c) == 0, "Cursor is outside\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %lu\n", - ERROR_INVALID_PARAMETER, GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError: expecting %lu got %lu\n", + (DWORD) ERROR_INVALID_PARAMETER, (DWORD) GetLastError()); c.X = -1; c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) == 0, "Cursor is outside\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %lu\n", - ERROR_INVALID_PARAMETER, GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError: expecting %lu got %lu\n", + (DWORD) ERROR_INVALID_PARAMETER, (DWORD) GetLastError()); c.X = 0; c.Y = -1; ok(SetConsoleCursorPosition(hCon, c) == 0, "Cursor is outside\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %lu\n", - ERROR_INVALID_PARAMETER, GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError: expecting %lu got %lu\n", + (DWORD) ERROR_INVALID_PARAMETER, (DWORD) GetLastError()); } static void testWriteSimple(HANDLE hCon, COORD sbSize) _____ Modified: trunk/reactos/regtests/winetests/kernel32/path.c --- trunk/reactos/regtests/winetests/kernel32/path.c 2005-10-22 20:12:42 UTC (rev 18689) +++ trunk/reactos/regtests/winetests/kernel32/path.c 2005-10-22 20:42:20 UTC (rev 18690) @@ -251,13 +251,13 @@ ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); if(valid) { ok(passfail.longerror==ERROR_FILE_NOT_FOUND, - "%s: GetLongPathA returned %ld and not %d\n", - errstr,passfail.longerror,ERROR_FILE_NOT_FOUND); + "%s: GetLongPathA returned %ld and not %ld\n", + errstr,passfail.longerror,(DWORD) ERROR_FILE_NOT_FOUND); } else { ok(passfail.longerror==ERROR_INVALID_NAME || passfail.longerror==ERROR_FILE_NOT_FOUND, - "%s: GetLongPathA returned %ld and not %d or %d'\n", - errstr, passfail.longerror,ERROR_INVALID_NAME,ERROR_FILE_NOT_FOUND); + "%s: GetLongPathA returned %ld and not %ld or %ld'\n", + errstr, passfail.longerror,(DWORD) ERROR_INVALID_NAME,(DWORD)ERROR_FILE_NOT_FOUND); } } } _____ Modified: trunk/reactos/regtests/winetests/ntdll/large_int.c --- trunk/reactos/regtests/winetests/ntdll/large_int.c 2005-10-22 20:12:42 UTC (rev 18689) +++ trunk/reactos/regtests/winetests/ntdll/large_int.c 2005-10-22 20:42:20 UTC (rev 18690) @@ -390,23 +390,23 @@ value = largeint2str[0].value; result = pRtlLargeIntegerToChar(&value, 20, largeint2str[0].MaximumLength, NULL); ok(result == STATUS_INVALID_PARAMETER, - "(test a): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %x\n", - largeint2str[0].value, 20, largeint2str[0].MaximumLength, result, STATUS_INVALID_PARAMETER); + "(test a): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %lx\n", + largeint2str[0].value, 20, largeint2str[0].MaximumLength, result, (DWORD) STATUS_INVALID_PARAMETER); result = pRtlLargeIntegerToChar(&value, 20, 0, NULL); ok(result == STATUS_INVALID_PARAMETER, - "(test b): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %x\n", - largeint2str[0].value, 20, largeint2str[0].MaximumLength, result, STATUS_INVALID_PARAMETER); + "(test b): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %lx\n", + largeint2str[0].value, 20, largeint2str[0].MaximumLength, result, (DWORD) STATUS_INVALID_PARAMETER); result = pRtlLargeIntegerToChar(&value, largeint2str[0].base, 0, NULL); ok(result == STATUS_BUFFER_OVERFLOW, - "(test c): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %x\n", - largeint2str[0].value, largeint2str[0].base, 0, result, STATUS_BUFFER_OVERFLOW); + "(test c): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %lx\n", + largeint2str[0].value, largeint2str[0].base, 0, result, (DWORD) STATUS_BUFFER_OVERFLOW); result = pRtlLargeIntegerToChar(&value, largeint2str[0].base, largeint2str[0].MaximumLength, NULL); ok(result == STATUS_ACCESS_VIOLATION, - "(test d): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %x\n", - largeint2str[0].value, largeint2str[0].base, largeint2str[0].MaximumLength, result, STATUS_ACCESS_VIOLATION); + "(test d): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %lx\n", + largeint2str[0].value, largeint2str[0].base, largeint2str[0].MaximumLength, result, (DWORD) STATUS_ACCESS_VIOLATION); } _____ Modified: trunk/reactos/regtests/winetests/ntdll/rtlstr.c --- trunk/reactos/regtests/winetests/ntdll/rtlstr.c 2005-10-22 20:12:42 UTC (rev 18689) +++ trunk/reactos/regtests/winetests/ntdll/rtlstr.c 2005-10-22 20:42:20 UTC (rev 18690) @@ -199,8 +199,8 @@ uni.Buffer = (void *) 0xdeadbeef; result = pRtlInitUnicodeStringEx(&uni, teststring); ok(result == STATUS_SUCCESS, - "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %x\n", - result, STATUS_SUCCESS); + "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %lx\n", + result, (DWORD) STATUS_SUCCESS); ok(uni.Length == 32, "pRtlInitUnicodeStringEx(&uni, 0) sets Length to %u, expected %u\n", uni.Length, 32); @@ -230,8 +230,8 @@ uni.Buffer = (void *) 0xdeadbeef; result = pRtlInitUnicodeStringEx(&uni, teststring2); ok(result == STATUS_NAME_TOO_LONG, - "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %x\n", - result, STATUS_NAME_TOO_LONG); + "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %lx\n", + result, (DWORD) STATUS_NAME_TOO_LONG); ok(uni.Length == 12345, "pRtlInitUnicodeStringEx(&uni, 0) sets Length to %u, expected %u\n", uni.Length, 12345); @@ -263,8 +263,8 @@ uni.Buffer = (void *) 0xdeadbeef; result = pRtlInitUnicodeStringEx(&uni, 0); ok(result == STATUS_SUCCESS, - "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %x\n", - result, STATUS_SUCCESS); + "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %lx\n", + result, (DWORD) STATUS_SUCCESS); ok(uni.Length == 0, "pRtlInitUnicodeStringEx(&uni, 0) sets Length to %u, expected %u\n", uni.Length, 0); @@ -1650,23 +1650,23 @@ result = pRtlIntegerToChar(int2str[0].value, 20, int2str[0].MaximumLength, NULL); ok(result == STATUS_INVALID_PARAMETER, - "(test a): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %x\n", - int2str[0].value, 20, int2str[0].MaximumLength, result, STATUS_INVALID_PARAMETER); + "(test a): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %lx\n", + int2str[0].value, 20, int2str[0].MaximumLength, result, (DWORD) STATUS_INVALID_PARAMETER); result = pRtlIntegerToChar(int2str[0].value, 20, 0, NULL); ok(result == STATUS_INVALID_PARAMETER, - "(test b): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %x\n", - int2str[0].value, 20, 0, result, STATUS_INVALID_PARAMETER); + "(test b): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %lx\n", + int2str[0].value, 20, 0, result, (DWORD) STATUS_INVALID_PARAMETER); result = pRtlIntegerToChar(int2str[0].value, int2str[0].base, 0, NULL); ok(result == STATUS_BUFFER_OVERFLOW, - "(test c): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %x\n", - int2str[0].value, int2str[0].base, 0, result, STATUS_BUFFER_OVERFLOW); + "(test c): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %lx\n", + int2str[0].value, int2str[0].base, 0, result, (DWORD) STATUS_BUFFER_OVERFLOW); result = pRtlIntegerToChar(int2str[0].value, int2str[0].base, int2str[0].MaximumLength, NULL); ok(result == STATUS_ACCESS_VIOLATION, - "(test d): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %x\n", - int2str[0].value, int2str[0].base, int2str[0].MaximumLength, result, STATUS_ACCESS_VIOLATION); + "(test d): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %lx\n", + int2str[0].value, int2str[0].base, int2str[0].MaximumLength, result, (DWORD) STATUS_ACCESS_VIOLATION); } static const WCHAR szGuid[] = { '{','0','1','0','2','0','3','0','4','-',

1 0

[weiden] 18689: implemented SetupDiGetDriverInfoDetailA()
by weiden＠svn.reactos.com 22 Oct '05

22 Oct '05

implemented SetupDiGetDriverInfoDetailA() Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-22 20:03:50 UTC (rev 18688) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-22 20:12:42 UTC (rev 18689) @@ -4812,11 +4812,193 @@ IN DWORD DriverInfoDetailDataSize, OUT PDWORD RequiredSize OPTIONAL) { - FIXME("%p %p %p %p 0x%lx %p\n", DeviceInfoSet, DeviceInfoData, - DriverInfoData, DriverInfoDetailData, DriverInfoDetailDataSize, - RequiredSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + SP_DRVINFO_DATA_V2_W DriverInfoDataW; + PSP_DRVINFO_DETAIL_DATA_W DriverInfoDetailDataW = NULL; + DWORD BufSize = 0; + DWORD HardwareIDLen = 0; + BOOL ret = FALSE; + + /* do some sanity checks, the unicode version might do more thorough checks */ + if (DriverInfoData == NULL || + (DriverInfoDetailData == NULL && DriverInfoDetailDataSize != 0) || + (DriverInfoDetailData != NULL && + (DriverInfoDetailDataSize < FIELD_OFFSET(SP_DRVINFO_DETAIL_DATA_A, HardwareID) + sizeof(CHAR) || + DriverInfoDetailData->cbSize != sizeof(SP_DRVINFO_DETAIL_DATA_A)))) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto Cleanup; + } + + /* make sure we support both versions of the SP_DRVINFO_DATA structure */ + if (DriverInfoData->cbSize == sizeof(SP_DRVINFO_DATA_V1_A)) + { + DriverInfoDataW.cbSize = sizeof(SP_DRVINFO_DATA_V1_W); + } + else if (DriverInfoData->cbSize == sizeof(SP_DRVINFO_DATA_V2_A)) + { + DriverInfoDataW.cbSize = sizeof(SP_DRVINFO_DATA_V2_W); + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + goto Cleanup; + } + DriverInfoDataW.DriverType = DriverInfoData->DriverType; + DriverInfoDataW.Reserved = DriverInfoData->Reserved; + + /* convert the strings to unicode */ + if (MultiByteToWideChar(CP_ACP, + 0, + DriverInfoData->Description, + LINE_LEN, + DriverInfoDataW.Description, + LINE_LEN) && + MultiByteToWideChar(CP_ACP, + 0, + DriverInfoData->MfgName, + LINE_LEN, + DriverInfoDataW.MfgName, + LINE_LEN) && + MultiByteToWideChar(CP_ACP, + 0, + DriverInfoData->ProviderName, + LINE_LEN, + DriverInfoDataW.ProviderName, + LINE_LEN)) + { + if (DriverInfoDataW.cbSize == sizeof(SP_DRVINFO_DATA_V2_W)) + { + DriverInfoDataW.DriverDate = ((PSP_DRVINFO_DATA_V2_A)DriverInfoData)->DriverDate; + DriverInfoDataW.DriverVersion = ((PSP_DRVINFO_DATA_V2_A)DriverInfoData)->DriverVersion; + } + + if (DriverInfoDetailData != NULL) + { + /* calculate the unicode buffer size from the ansi buffer size */ + HardwareIDLen = DriverInfoDetailDataSize - FIELD_OFFSET(SP_DRVINFO_DETAIL_DATA_A, HardwareID); + BufSize = FIELD_OFFSET(SP_DRVINFO_DETAIL_DATA_W, HardwareID) + + (HardwareIDLen * sizeof(WCHAR)); + + DriverInfoDetailDataW = MyMalloc(BufSize); + if (DriverInfoDetailDataW == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto Cleanup; + } + + /* initialize the buffer */ + ZeroMemory(DriverInfoDetailDataW, + BufSize); + DriverInfoDetailDataW->cbSize = sizeof(SP_DRVINFO_DETAIL_DATA_W); + } + + /* call the unicode version */ + ret = SetupDiGetDriverInfoDetailW(DeviceInfoSet, + DeviceInfoData, + &DriverInfoDataW, + DriverInfoDetailDataW, + BufSize, + RequiredSize); + + if (ret) + { + if (DriverInfoDetailDataW != NULL) + { + /* convert the SP_DRVINFO_DETAIL_DATA_W structure to ansi */ + DriverInfoDetailData->cbSize = sizeof(SP_DRVINFO_DETAIL_DATA_A); + DriverInfoDetailData->InfDate = DriverInfoDetailDataW->InfDate; + DriverInfoDetailData->Reserved = DriverInfoDetailDataW->Reserved; + if (WideCharToMultiByte(CP_ACP, + 0, + DriverInfoDetailDataW->SectionName, + LINE_LEN, + DriverInfoDetailData->SectionName, + LINE_LEN, + NULL, + NULL) && + WideCharToMultiByte(CP_ACP, + 0, + DriverInfoDetailDataW->InfFileName, + MAX_PATH, + DriverInfoDetailData->InfFileName, + MAX_PATH, + NULL, + NULL) && + WideCharToMultiByte(CP_ACP, + 0, + DriverInfoDetailDataW->DrvDescription, + LINE_LEN, + DriverInfoDetailData->DrvDescription, + LINE_LEN, + NULL, + NULL) && + WideCharToMultiByte(CP_ACP, + 0, + DriverInfoDetailDataW->HardwareID, + HardwareIDLen, + DriverInfoDetailData->HardwareID, + HardwareIDLen, + NULL, + NULL)) + { + DWORD len, cnt = 0; + DWORD hwidlen = HardwareIDLen; + CHAR *s = DriverInfoDetailData->HardwareID; + + /* count the strings in the list */ + while (*s != '\0') + { + len = lstrlenA(s) + 1; + if (hwidlen > len) + { + cnt++; + s += len; + hwidlen -= len; + } + else + { + /* looks like the string list wasn't terminated... */ + SetLastError(ERROR_INVALID_USER_BUFFER); + ret = FALSE; + break; + } + } + + /* make sure CompatIDsOffset points to the second string in the + list, if present */ + if (cnt > 1) + { + DriverInfoDetailData->CompatIDsOffset = lstrlenA(DriverInfoDetailData->HardwareID) + 1; + DriverInfoDetailData->CompatIDsLength = (DWORD)(s - DriverInfoDetailData->HardwareID) - + DriverInfoDetailData->CompatIDsOffset + 1; + } + else + { + DriverInfoDetailData->CompatIDsOffset = 0; + DriverInfoDetailData->CompatIDsLength = 0; + } + } + else + { + ret = FALSE; + } + } + + if (RequiredSize != NULL) + { + *RequiredSize = FIELD_OFFSET(SP_DRVINFO_DETAIL_DATA_A, HardwareID) + + (((*RequiredSize) - FIELD_OFFSET(SP_DRVINFO_DETAIL_DATA_W, HardwareID)) / sizeof(WCHAR)); + } + } + } + +Cleanup: + if (DriverInfoDetailDataW != NULL) + { + MyFree(DriverInfoDetailDataW); + } + + return ret; } /***********************************************************************

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