Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[hbirr] 19252: Put the bitmap into the executable.

by hbirr＠svn.reactos.com

Put the bitmap into the executable. Modified: trunk/rosapps/tests/bitblt/bitblt.c Added: trunk/rosapps/tests/bitblt/bitblt.rc Modified: trunk/rosapps/tests/bitblt/bitblt.xml _____ Modified: trunk/rosapps/tests/bitblt/bitblt.c --- trunk/rosapps/tests/bitblt/bitblt.c 2005-11-15 17:52:27 UTC (rev 19251) +++ trunk/rosapps/tests/bitblt/bitblt.c 2005-11-15 17:54:00 UTC (rev 19252) @@ -84,8 +84,8 @@ /* load a bitmap from file */ HBITMAP HBmp = /* static_cast<HBITMAP> */( - LoadImage(HInst, filename, IMAGE_BITMAP, - 0, 0, LR_LOADFROMFILE) + LoadImage(HInst, MAKEINTRESOURCE(1000), IMAGE_BITMAP, + 0, 0, 0) ); if (HBmp) { _____ Added: trunk/rosapps/tests/bitblt/bitblt.rc --- trunk/rosapps/tests/bitblt/bitblt.rc 2005-11-15 17:52:27 UTC (rev 19251) +++ trunk/rosapps/tests/bitblt/bitblt.rc 2005-11-15 17:54:00 UTC (rev 19252) @@ -0,0 +1,2 @@ +1000 BITMAP MOVEABLE PURE "lena.bmp" + _____ Modified: trunk/rosapps/tests/bitblt/bitblt.xml --- trunk/rosapps/tests/bitblt/bitblt.xml 2005-11-15 17:52:27 UTC (rev 19251) +++ trunk/rosapps/tests/bitblt/bitblt.xml 2005-11-15 17:54:00 UTC (rev 19252) @@ -2,7 +2,9 @@ <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> + <include base="bitblt">.</include> <library>kernel32</library> <library>gdi32</library> <file>bitblt.c</file> + <file>bitblt.rc</file> </module>

18 years, 10 months

[hbirr] 19251: Put the bitmaps into the executable.

by hbirr＠svn.reactos.com

Put the bitmaps into the executable. Modified: trunk/rosapps/tests/alphablend/alphablend.c Added: trunk/rosapps/tests/alphablend/alphablend.rc Modified: trunk/rosapps/tests/alphablend/alphablend.xml _____ Modified: trunk/rosapps/tests/alphablend/alphablend.c --- trunk/rosapps/tests/alphablend/alphablend.c 2005-11-15 16:53:06 UTC (rev 19250) +++ trunk/rosapps/tests/alphablend/alphablend.c 2005-11-15 17:52:27 UTC (rev 19251) @@ -85,8 +85,8 @@ BitBlt(hDC, 0, 0, bmp->bmWidth, bmp->bmHeight, HMemDC, 0, 0, SRCCOPY); /* load and apply alpha channel */ - bmpalpha = LoadImage(HInst, TEXT("lenaalpha.bmp"), IMAGE_BITMAP, - 0, 0, LR_LOADFROMFILE); + bmpalpha = LoadImage(HInst, MAKEINTRESOURCE(2000), IMAGE_BITMAP, + 0, 0, 0); if(bmpalpha) { COLORREF *col = pBmpBits; @@ -131,8 +131,8 @@ /* load a bitmap from file */ HBITMAP HBmp = /* static_cast<HBITMAP> */( - LoadImage(HInst, filename, IMAGE_BITMAP, - 0, 0, LR_LOADFROMFILE) + LoadImage(HInst, MAKEINTRESOURCE(1000), IMAGE_BITMAP, + 0, 0, 0) ); if (HBmp) { _____ Added: trunk/rosapps/tests/alphablend/alphablend.rc --- trunk/rosapps/tests/alphablend/alphablend.rc 2005-11-15 16:53:06 UTC (rev 19250) +++ trunk/rosapps/tests/alphablend/alphablend.rc 2005-11-15 17:52:27 UTC (rev 19251) @@ -0,0 +1,3 @@ + +1000 BITMAP MOVEABLE PURE "lena.bmp" +2000 BITMAP MOVEABLE PURE "lenaalpha.bmp" _____ Modified: trunk/rosapps/tests/alphablend/alphablend.xml --- trunk/rosapps/tests/alphablend/alphablend.xml 2005-11-15 16:53:06 UTC (rev 19250) +++ trunk/rosapps/tests/alphablend/alphablend.xml 2005-11-15 17:52:27 UTC (rev 19251) @@ -2,7 +2,9 @@ <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> + <include base="alphablend">.</include> <library>kernel32</library> <library>gdi32</library> <file>alphablend.c</file> + <file>alphablend.rc</file> </module>

18 years, 10 months

[cwittich] 19250: better stub for EnumFonts (fixed license agreement in ClamWin installer)

by cwittich＠svn.reactos.com

better stub for EnumFonts (fixed license agreement in ClamWin installer) Modified: trunk/reactos/lib/gdi32/misc/stubsa.c Modified: trunk/reactos/lib/gdi32/misc/stubsw.c Modified: trunk/reactos/lib/gdi32/objects/font.c _____ Modified: trunk/reactos/lib/gdi32/misc/stubsa.c --- trunk/reactos/lib/gdi32/misc/stubsa.c 2005-11-15 16:48:24 UTC (rev 19249) +++ trunk/reactos/lib/gdi32/misc/stubsa.c 2005-11-15 16:53:06 UTC (rev 19250) @@ -32,44 +32,9 @@ return 0; } - /* * @unimplemented */ -int -STDCALL -EnumFontsA ( - HDC hDC, - LPCSTR lpFaceName, - FONTENUMPROCA FontFunc, - LPARAM lParam - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -#if 0 - NTSTATUS Status; - LPWSTR lpFaceNameW; - int rc = 0; - - Status = HEAP_strdupA2W ( &lpFaceNameW, lpFaceName ); - if (!NT_SUCCESS (Status)) - SetLastError (RtlNtStatusToDosError(Status)); - else - { - rc = NtGdiEnumFonts ( hDC, lpFaceNameW, FontFunc, lParam ); - - HEAP_free ( lpFaceNameW ); - } - return rc; -#endif -} - - -/* - * @unimplemented - */ UINT APIENTRY GetOutlineTextMetricsA( _____ Modified: trunk/reactos/lib/gdi32/misc/stubsw.c --- trunk/reactos/lib/gdi32/misc/stubsw.c 2005-11-15 16:48:24 UTC (rev 19249) +++ trunk/reactos/lib/gdi32/misc/stubsw.c 2005-11-15 16:53:06 UTC (rev 19250) @@ -40,32 +40,9 @@ #endif } - /* * @unimplemented */ -int -STDCALL -EnumFontsW( - HDC hDC, - LPCWSTR lpFaceName, - FONTENUMPROCW FontFunc, - LPARAM lParam - ) -{ -#if 0 - return NtGdiEnumFonts ( hDC, lpFaceName, FontFunc, lParam ); -#else - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -#endif -} - - -/* - * @unimplemented - */ UINT APIENTRY GetOutlineTextMetricsW( _____ Modified: trunk/reactos/lib/gdi32/objects/font.c --- trunk/reactos/lib/gdi32/objects/font.c 2005-11-15 16:48:24 UTC (rev 19249) +++ trunk/reactos/lib/gdi32/objects/font.c 2005-11-15 16:53:06 UTC (rev 19250) @@ -834,3 +834,58 @@ return (sz.cx / 26 + 1) / 2; } + +/* + * @unimplemented + */ +int +STDCALL +EnumFontsW( + HDC hDC, + LPCWSTR lpFaceName, + FONTENUMPROCW FontFunc, + LPARAM lParam + ) +{ +#if 0 + return NtGdiEnumFonts ( hDC, lpFaceName, FontFunc, lParam ); +#else + return EnumFontFamiliesW( hDC, lpFaceName, FontFunc, lParam ); +#endif +} + +/* + * @unimplemented + */ +int +STDCALL +EnumFontsA ( + HDC hDC, + LPCSTR lpFaceName, + FONTENUMPROCA FontFunc, + LPARAM lParam + ) +{ +#if 0 + NTSTATUS Status; + LPWSTR lpFaceNameW; + int rc = 0; + + Status = HEAP_strdupA2W ( &lpFaceNameW, lpFaceName ); + if (!NT_SUCCESS (Status)) + SetLastError (RtlNtStatusToDosError(Status)); + else + { + rc = NtGdiEnumFonts ( hDC, lpFaceNameW, FontFunc, lParam ); + + HEAP_free ( lpFaceNameW ); + } + return rc; +#else + return EnumFontFamiliesA( hDC, lpFaceName, FontFunc, lParam ); +#endif +} + + + +

18 years, 10 months

[hpoussin] 19249: Forgot to commit this with r19248... ("Add back ACPI device, to allow auto power off of the computer")

by hpoussin＠svn.reactos.com

Forgot to commit this with r19248... ("Add back ACPI device, to allow auto power off of the computer") Modified: trunk/reactos/drivers/bus/acpi/ospm/acpisys.c _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/acpisys.c --- trunk/reactos/drivers/bus/acpi/ospm/acpisys.c 2005-11-15 16:41:49 UTC (rev 19248) +++ trunk/reactos/drivers/bus/acpi/ospm/acpisys.c 2005-11-15 16:48:24 UTC (rev 19249) @@ -125,6 +125,9 @@ DPRINT("Called\n"); + if (PhysicalDeviceObject == NULL) + return STATUS_SUCCESS; + Status = IoCreateDevice(DriverObject, sizeof(FDO_DEVICE_EXTENSION), NULL, @@ -143,8 +146,8 @@ DeviceExtension->Pdo = PhysicalDeviceObject; DeviceExtension->Common.IsFDO = TRUE; - //DeviceExtension->Common.Ldo = - // IoAttachDeviceToDeviceStack(Fdo, PhysicalDeviceObject); + DeviceExtension->Common.Ldo = + IoAttachDeviceToDeviceStack(Fdo, PhysicalDeviceObject); DeviceExtension->State = dsStopped;

18 years, 10 months

[hpoussin] 19248: Add back ACPI device, to allow auto power off of the computer

by hpoussin＠svn.reactos.com

Add back ACPI device, to allow auto power off of the computer Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-11-15 16:30:14 UTC (rev 19247) +++ trunk/reactos/bootdata/hivesys.inf 2005-11-15 16:41:49 UTC (rev 19248) @@ -631,8 +631,11 @@ 01,00,00,00,01,00,01,00,01,00,00,00, \ 00,06,00,00,00,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +; ACPI bus +HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0C08\0000","HardwareID",0x 00010000,"*PNP0C08" +HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0C08\0000","DeviceDesc",0x 00000000,"ACPI bus" +HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0C08\0000","Service",0x000 00000,"acpi" - ; Named Pipe filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ErrorControl",0x00010001, 0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Group",0x00000000,"File System"

18 years, 10 months

[hpoussin] 19247: Fix indentation

by hpoussin＠svn.reactos.com

Fix indentation Modified: trunk/reactos/lib/gdi32/gdi32.xml _____ Modified: trunk/reactos/lib/gdi32/gdi32.xml --- trunk/reactos/lib/gdi32/gdi32.xml 2005-11-15 14:29:46 UTC (rev 19246) +++ trunk/reactos/lib/gdi32/gdi32.xml 2005-11-15 16:30:14 UTC (rev 19247) @@ -17,7 +17,7 @@ </directory> <directory name="misc"> <file>heap.c</file> - <file>gdientry.c</file> + <file>gdientry.c</file> <file>misc.c</file> <file>stubs.c</file> <file>stubsa.c</file>

18 years, 10 months

[hpoussin] 19246: Try to transform the ClassGUID string to a GUID only when the string exists in registry. Otherwise, set it to GUID_NULL

by hpoussin＠svn.reactos.com

Try to transform the ClassGUID string to a GUID only when the string exists in registry. Otherwise, set it to GUID_NULL Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi_private.h _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-11-15 14:26:06 UTC (rev 19245) +++ trunk/reactos/lib/setupapi/devinst.c 2005-11-15 14:29:46 UTC (rev 19246) @@ -1185,6 +1185,8 @@ if (pClassGuid) /* Skip this bad entry as we can't verify it */ continue; + /* Set a default GUID for this device */ + memcpy(&KeyGuid, &GUID_NULL, sizeof(GUID)); } else if (rc != ERROR_SUCCESS) { @@ -1196,13 +1198,14 @@ RegCloseKey(hDeviceIdKey); return ERROR_GEN_FAILURE; } - - KeyBuffer[37] = '\0'; /* Replace the } by a NULL character */ - if (UuidFromStringW(&KeyBuffer[1], &KeyGuid) != RPC_S_OK) + else { - RegCloseKey(hDeviceIdKey); - return GetLastError(); + KeyBuffer[37] = '\0'; /* Replace the } by a NULL character */ + if (UuidFromStringW(&KeyBuffer[1], &KeyGuid) != RPC_S_OK) + /* Bad GUID, skip the entry */ + continue; } + if (pClassGuid && !IsEqualIID(&KeyGuid, pClassGuid)) { /* Skip this entry as it is not the right device class */ @@ -1259,7 +1262,7 @@ return rc; /* If enumerator is provided, call directly SETUP_CreateDevListFromEnumerator. - * Else, enumerate all enumerators all call SETUP_CreateDevListFromEnumerator + * Else, enumerate all enumerators and call SETUP_CreateDevListFromEnumerator * for each one. */ if (Enumerator) _____ Modified: trunk/reactos/lib/setupapi/setupapi_private.h --- trunk/reactos/lib/setupapi/setupapi_private.h 2005-11-15 14:26:06 UTC (rev 19245) +++ trunk/reactos/lib/setupapi/setupapi_private.h 2005-11-15 14:29:46 UTC (rev 19246) @@ -103,7 +103,8 @@ * String which identifies the device. Can be NULL. If not NULL, * points into the Data field at the end of the structure * - ClassGuid - * Identifies the class of this device. FIXME: can it be GUID_NULL? + * Identifies the class of this device. It is GUID_NULL if the + * device has not been installed * - CreationFlags * Is a combination of: * - DICD_GENERATE_ID

18 years, 10 months

[cwittich] 19245: fix some MSVC compile problems

by cwittich＠svn.reactos.com

fix some MSVC compile problems Modified: trunk/reactos/lib/crt/include/internal/debug.h Modified: trunk/reactos/lib/crt/precomp.h Modified: trunk/reactos/lib/crt/process/_cwait.c Modified: trunk/reactos/lib/crt/process/dll.c _____ Modified: trunk/reactos/lib/crt/include/internal/debug.h --- trunk/reactos/lib/crt/include/internal/debug.h 2005-11-15 09:47:31 UTC (rev 19244) +++ trunk/reactos/lib/crt/include/internal/debug.h 2005-11-15 14:26:06 UTC (rev 19245) @@ -30,9 +30,10 @@ unsigned long DbgPrint(char *Format,...); -#define TRACE(...) +#ifdef __GNUC__ + #define TRACE(...) +#endif - #ifdef DBG #ifdef __GNUC__ #define DPRINT1(args...) do { DbgPrint("(MSVCRT:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0); @@ -50,7 +51,9 @@ #endif #if !defined(NDEBUG) && defined(DBG) - #define DPRINT(args...) do { DbgPrint("(MSVCRT:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0); + #ifdef __GNUC__ + #define DPRINT(args...) do { DbgPrint("(MSVCRT:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0); + #endif #define CHECKPOINT do { DbgPrint("MSVCRT:%s:%d\n",__FILE__,__LINE__); } while(0); #else #ifdef __GNUC__ _____ Modified: trunk/reactos/lib/crt/precomp.h --- trunk/reactos/lib/crt/precomp.h 2005-11-15 09:47:31 UTC (rev 19244) +++ trunk/reactos/lib/crt/precomp.h 2005-11-15 14:26:06 UTC (rev 19245) @@ -1,3 +1,7 @@ #define CRT_SECURE_NO_DEPRECATE #include <windows.h> + +#if !defined(_MSC_VER) + #include <stdint.h> +#endif _____ Modified: trunk/reactos/lib/crt/process/_cwait.c --- trunk/reactos/lib/crt/process/_cwait.c 2005-11-15 09:47:31 UTC (rev 19244) +++ trunk/reactos/lib/crt/process/_cwait.c 2005-11-15 14:26:06 UTC (rev 19245) @@ -22,15 +22,15 @@ DWORD ExitCode; nAction = 0; - if (WaitForSingleObject((void*)hProc, INFINITE) != WAIT_OBJECT_0) { + if (WaitForSingleObject((void*)ULongToPtr(hProc), INFINITE) != WAIT_OBJECT_0) { __set_errno(ECHILD); return -1; } - if (!GetExitCodeProcess((void*)hProc, &ExitCode)) + if (!GetExitCodeProcess((void*)ULongToPtr(hProc), &ExitCode)) return -1; if (pnStatus != NULL) *pnStatus = (int)ExitCode; - CloseHandle((HANDLE)hProc); + CloseHandle((HANDLE)ULongToPtr(hProc)); return hProc; } _____ Modified: trunk/reactos/lib/crt/process/dll.c --- trunk/reactos/lib/crt/process/dll.c 2005-11-15 09:47:31 UTC (rev 19244) +++ trunk/reactos/lib/crt/process/dll.c 2005-11-15 14:26:06 UTC (rev 19245) @@ -11,31 +11,30 @@ #include "precomp.h" #include <process.h> - /* * @implemented */ -void* _loaddll(char* name) +intptr_t _loaddll(char* name) { - return LoadLibraryA(name); + return (intptr_t) LoadLibraryA(name); } /* * @implemented */ -int _unloaddll(void* handle) +int _unloaddll(intptr_t handle) { - return FreeLibrary(handle); + return FreeLibrary((HMODULE) handle); } /* * @implemented */ -FARPROC _getdllprocaddr(void* hModule, char* lpProcName, int iOrdinal) +FARPROC _getdllprocaddr(intptr_t hModule, char* lpProcName, intptr_t iOrdinal) { if (lpProcName != NULL) - return GetProcAddress(hModule, lpProcName); + return GetProcAddress((HMODULE) hModule, lpProcName); else - return GetProcAddress(hModule, (LPSTR)iOrdinal); + return GetProcAddress((HMODULE) hModule, (LPSTR)iOrdinal); return (NULL); }

18 years, 10 months

[sedwards] 19244: revert this one

by sedwards＠svn.reactos.com

revert this one Modified: trunk/reactos/lib/crt/stdio/putwchar.c _____ Modified: trunk/reactos/lib/crt/stdio/putwchar.c --- trunk/reactos/lib/crt/stdio/putwchar.c 2005-11-15 08:55:31 UTC (rev 19243) +++ trunk/reactos/lib/crt/stdio/putwchar.c 2005-11-15 09:47:31 UTC (rev 19244) @@ -1,5 +1,3 @@ -#include "precomp.h" - #define UNICODE #define _UNICODE

18 years, 10 months

[hpoussin] 19243: Support optional Class parameter in SetupOpenInfFileW

by hpoussin＠svn.reactos.com

Support optional Class parameter in SetupOpenInfFileW Modified: trunk/reactos/lib/setupapi/parser.c _____ Modified: trunk/reactos/lib/setupapi/parser.c --- trunk/reactos/lib/setupapi/parser.c 2005-11-15 08:27:38 UTC (rev 19242) +++ trunk/reactos/lib/setupapi/parser.c 2005-11-15 08:55:31 UTC (rev 19243) @@ -899,7 +899,7 @@ * * parse an INF file. */ -static struct inf_file *parse_file( HANDLE handle, const WCHAR *class, UINT *error_line ) +static struct inf_file *parse_file( HANDLE handle, UINT *error_line ) { void *buffer; DWORD err = 0; @@ -912,8 +912,6 @@ NtClose( mapping ); if (!buffer) return NULL; - if (class) FIXME( "class %s not supported yet\n", debugstr_w(class) ); - if (!(file = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*file) ))) { err = ERROR_NOT_ENOUGH_MEMORY; @@ -1042,6 +1040,72 @@ } +static BOOL +GetInfClassW( + IN HINF hInf, + OUT LPGUID ClassGuid, + OUT PWSTR ClassName, + IN DWORD ClassNameSize, + OUT PDWORD RequiredSize OPTIONAL) +{ + DWORD requiredSize; + WCHAR guidW[MAX_GUID_STRING_LEN + 1]; + BOOL ret = FALSE; + + /* Read class Guid */ + if (!SetupGetLineTextW(NULL, hInf, L"Version", L"ClassGUID", guidW, sizeof(guidW), NULL)) + goto cleanup; + guidW[37] = '\0'; /* Replace the } by a NULL character */ + if (UuidFromStringW(&guidW[1], ClassGuid) != RPC_S_OK) + goto cleanup; + + /* Read class name */ + ret = SetupGetLineTextW(NULL, hInf, L"Version", L"Class", ClassName, ClassNameSize, &requiredSize); + if (ret && ClassName == NULL && ClassNameSize == 0) + { + if (RequiredSize) + *RequiredSize = requiredSize; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + goto cleanup; + } + if (!ret) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + if (RequiredSize) + *RequiredSize = requiredSize; + goto cleanup; + } + else if (!SetupDiClassNameFromGuidW(ClassGuid, ClassName, ClassNameSize, &requiredSize)) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + if (RequiredSize) + *RequiredSize = requiredSize; + goto cleanup; + } + /* Return a NULL class name */ + if (RequiredSize) + *RequiredSize = 1; + if (ClassNameSize < 1) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + goto cleanup; + } + memcpy(ClassGuid, &GUID_NULL, sizeof(GUID)); + *ClassName = UNICODE_NULL; + } + } + + ret = TRUE; + +cleanup: + TRACE("Returning %d\n", ret); + return ret; +} + + /*********************************************************************** * SetupOpenInfFileW (SETUPAPI.@) */ @@ -1091,7 +1155,7 @@ if (handle != INVALID_HANDLE_VALUE) { - file = parse_file( handle, class, error ); + file = parse_file( handle, error ); CloseHandle( handle ); } if (!file) @@ -1102,6 +1166,37 @@ TRACE( "%s -> %p\n", debugstr_w(path), file ); file->src_root = path; if ((p = strrchrW( path, '\\' ))) p[1] = 0; /* remove file name */ + + if (class) + { + GUID ClassGuid; + LPWSTR ClassName = HeapAlloc(GetProcessHeap(), 0, (strlenW(class) + 1) * sizeof(WCHAR)); + if (!ClassName) + { + /* Not enough memory */ + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + SetupCloseInfFile((HINF)file); + return NULL; + } + else if (!GetInfClassW((HINF)file, &ClassGuid, ClassName, strlenW(class) + 1, NULL)) + { + /* Unable to get class name in .inf file */ + HeapFree(GetProcessHeap(), 0, ClassName); + SetLastError(ERROR_CLASS_MISMATCH); + SetupCloseInfFile((HINF)file); + return NULL; + } + else if (strcmpW(class, ClassName) != 0) + { + /* Provided name name is not the expected one */ + HeapFree(GetProcessHeap(), 0, ClassName); + SetLastError(ERROR_CLASS_MISMATCH); + SetupCloseInfFile((HINF)file); + return NULL; + } + HeapFree(GetProcessHeap(), 0, ClassName); + } + SetLastError( 0 ); return (HINF)file; } @@ -2111,8 +2206,6 @@ OUT PDWORD RequiredSize OPTIONAL) { HINF hInf = INVALID_HANDLE_VALUE; - DWORD requiredSize; - WCHAR guidW[MAX_GUID_STRING_LEN + 1]; BOOL ret = FALSE; TRACE("%S %p %p %ld %p\n", InfName, ClassGuid, @@ -2123,54 +2216,8 @@ if (hInf == INVALID_HANDLE_VALUE) goto cleanup; - /* Read class Guid */ - if (!SetupGetLineTextW(NULL, hInf, L"Version", L"ClassGUID", guidW, sizeof(guidW), NULL)) - goto cleanup; - guidW[37] = '\0'; /* Replace the } by a NULL character */ - if (UuidFromStringW(&guidW[1], ClassGuid) != RPC_S_OK) - goto cleanup; + ret = GetInfClassW(hInf, ClassGuid, ClassName, ClassNameSize, RequiredSize); - /* Read class name */ - ret = SetupGetLineTextW(NULL, hInf, L"Version", L"Class", ClassName, ClassNameSize, &requiredSize); - if (ret && ClassName == NULL && ClassNameSize == 0) - { - if (RequiredSize) - *RequiredSize = requiredSize; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - ret = FALSE; - goto cleanup; - } - if (!ret) - { - if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - if (RequiredSize) - *RequiredSize = requiredSize; - goto cleanup; - } - else if (!SetupDiClassNameFromGuidW(ClassGuid, ClassName, ClassNameSize, &requiredSize)) - { - if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - if (RequiredSize) - *RequiredSize = requiredSize; - goto cleanup; - } - /* Return a NULL class name */ - if (RequiredSize) - *RequiredSize = 1; - if (ClassNameSize < 1) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - goto cleanup; - } - memcpy(ClassGuid, &GUID_NULL, sizeof(GUID)); - *ClassName = UNICODE_NULL; - } - } - - ret = TRUE; - cleanup: if (hInf != INVALID_HANDLE_VALUE) SetupCloseInfFile(hInf);

18 years, 10 months

← Newer
1
...
52
53
54
55
56
57
58
...
88
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 November 2005