Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[arty] 20056: Added chew library.

by arty＠svn.reactos.com

Added chew library. Modified: trunk/reactos/drivers/lib/directory.xml _____ Modified: trunk/reactos/drivers/lib/directory.xml --- trunk/reactos/drivers/lib/directory.xml 2005-12-11 08:26:16 UTC (rev 20055) +++ trunk/reactos/drivers/lib/directory.xml 2005-12-11 08:27:12 UTC (rev 20056) @@ -10,3 +10,6 @@ <directory name="oskittcp"> <xi:include href="oskittcp/oskittcp.xml" /> </directory> +<directory name="chew"> + <xi:include href="chew/chew.xml" /> +</directory> \ No newline at end of file

18 years, 9 months

[arty] 20055: A little library for making it easier to get to PASSIVE_LEVEL. Just contains

by arty＠svn.reactos.com

A little library for making it easier to get to PASSIVE_LEVEL. Just contains boilerplate for using work items. Added: trunk/reactos/drivers/lib/chew/ Added: trunk/reactos/drivers/lib/chew/chew.xml Added: trunk/reactos/drivers/lib/chew/workqueue.c Added: trunk/reactos/include/chew/ Added: trunk/reactos/include/chew/chew.h Property changes on: trunk/reactos/drivers/lib/chew ___________________________________________________________________ Name: eol-style + native Name: eol-style:native + include\chew _____ Added: trunk/reactos/drivers/lib/chew/chew.xml --- trunk/reactos/drivers/lib/chew/chew.xml 2005-12-11 08:11:21 UTC (rev 20054) +++ trunk/reactos/drivers/lib/chew/chew.xml 2005-12-11 08:26:16 UTC (rev 20055) @@ -0,0 +1,7 @@ +<module name="chew" type="staticlibrary"> + <define name="__USE_W32API" /> + <define name="_NTOSKRNL_" /> + <include base="chew">include</include> + <include base="reactos">w32api/include/ddk</include> + <file>workqueue.c</file> +</module> \ No newline at end of file _____ Added: trunk/reactos/drivers/lib/chew/workqueue.c --- trunk/reactos/drivers/lib/chew/workqueue.c 2005-12-11 08:11:21 UTC (rev 20054) +++ trunk/reactos/drivers/lib/chew/workqueue.c 2005-12-11 08:26:16 UTC (rev 20055) @@ -0,0 +1,101 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS TCP/IP protocol driver + * FILE: tcpip/main.c + * PURPOSE: Common Highlevel Executive Worker + * PROGRAMMERS: Art Yerkes + * REVISIONS: + * CSH 10/12-2005 Created + */ +#include <ntddk.h> +#include <chew/chew.h> + +//#define NDEBUG + +#define FOURCC(w,x,y,z) (((w) << 24) | ((x) << 16) | ((y) << 8) | (z)) + +PDEVICE_OBJECT WorkQueueDevice; +LIST_ENTRY WorkQueue; +KSPIN_LOCK WorkQueueLock; + +typedef struct _WORK_ITEM { + LIST_ENTRY Entry; + PIO_WORKITEM WorkItem; + VOID (*Worker)( PVOID Data ); + CHAR UserSpace[1]; +} WORK_ITEM, *PWORK_ITEM; + +VOID ChewInit( PDEVICE_OBJECT DeviceObject ) { + WorkQueueDevice = DeviceObject; + InitializeListHead( &WorkQueue ); + KeInitializeSpinLock( &WorkQueueLock ); +} + +VOID ChewShutdown() { + KIRQL OldIrql; + PLIST_ENTRY Entry; + PWORK_ITEM WorkItem; + + KeAcquireSpinLock( &WorkQueueLock, &OldIrql ); + + while( !IsListEmpty( &WorkQueue ) ) { + Entry = RemoveHeadList( &WorkQueue ); + WorkItem = CONTAINING_RECORD( Entry, WORK_ITEM, Entry ); + IoFreeWorkItem( WorkItem->WorkItem ); + ExFreePool( WorkItem ); + } + + KeReleaseSpinLock( &WorkQueueLock, OldIrql ); +} + +VOID STDCALL ChewWorkItem( PDEVICE_OBJECT DeviceObject, PVOID ChewItem ) { + PWORK_ITEM WorkItem = ChewItem; + + if( WorkItem->Worker ) + WorkItem->Worker( WorkItem->UserSpace ); + + IoFreeWorkItem( WorkItem->WorkItem ); + ExFreePool( WorkItem ); +} + +BOOLEAN ChewCreate +( PVOID *ItemPtr, UINT Bytes, VOID (*Worker)( PVOID ), PVOID UserSpace ) { + PWORK_ITEM Item; + if( KeGetCurrentIrql() == PASSIVE_LEVEL ) { + *ItemPtr = NULL; + Worker(UserSpace); + return TRUE; + } else { + Item = ExAllocatePoolWithTag + ( NonPagedPool, + sizeof( WORK_ITEM ) + Bytes - 1, + FOURCC('C','H','E','W') ); + + if( Item ) { + Item->WorkItem = IoAllocateWorkItem( WorkQueueDevice ); + if( !Item->WorkItem ) { + ExFreePool( Item ); + return FALSE; + } + Item->Worker = Worker; + if( Bytes && UserSpace ) + RtlCopyMemory( Item->UserSpace, UserSpace, Bytes ); + + ExInterlockedInsertTailList + ( &WorkQueue, &Item->Entry, &WorkQueueLock ); + IoQueueWorkItem + ( Item->WorkItem, ChewWorkItem, CriticalWorkQueue, Item ); + + *ItemPtr = Item; + + return TRUE; + } else + return FALSE; + } +} + +VOID ChewRemove( PVOID Item ) { + PWORK_ITEM WorkItem = Item; + IoFreeWorkItem( WorkItem->WorkItem ); + ExFreePool( WorkItem ); +} _____ Added: trunk/reactos/include/chew/chew.h --- trunk/reactos/include/chew/chew.h 2005-12-11 08:11:21 UTC (rev 20054) +++ trunk/reactos/include/chew/chew.h 2005-12-11 08:26:16 UTC (rev 20055) @@ -0,0 +1,10 @@ +#ifndef _REACTOS_CHEW_H +#define _REACTOS_CHEW_H + +VOID ChewInit( PDEVICE_OBJECT DeviceObject ); +VOID ChewShutdown(); +BOOLEAN ChewCreate +( PVOID *Item, UINT Bytes, VOID (*Worker)(PVOID), PVOID UserSpace ); +VOID ChewRemove( PVOID Item ); + +#endif/*_REACTOS_CHEW_H*/

18 years, 9 months

[hpoussin] 20054: Implement SetupDiGetClassImageIndex, SetupDiGetClassImageList, SetupDiGetClassImageListExA/W, SetupDiLoadClassIcon

by hpoussin＠svn.reactos.com

Implement SetupDiGetClassImageIndex, SetupDiGetClassImageList, SetupDiGetClassImageListExA/W, SetupDiLoadClassIcon Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/misc.c Modified: trunk/reactos/lib/setupapi/setupapi_private.h Modified: trunk/reactos/lib/setupapi/stubs.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-11 06:01:32 UTC (rev 20053) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-11 08:11:21 UTC (rev 20054) @@ -656,7 +656,7 @@ TRACE("%s %p %s %p\n", debugstr_guid(ClassGuid), hwndParent, debugstr_w(MachineName), Reserved); - size = sizeof(struct DeviceInfoSet); + size = FIELD_OFFSET(struct DeviceInfoSet, szData); if (MachineName) size += (wcslen(MachineName) + 3) * sizeof(WCHAR); list = HeapAlloc(GetProcessHeap(), 0, size); @@ -1145,7 +1145,7 @@ *pDeviceInfo = NULL; - size = sizeof(struct DeviceInfoElement) + (wcslen(InstancePath) + 1) * sizeof(WCHAR); + size = FIELD_OFFSET(struct DeviceInfoElement, Data) + (wcslen(InstancePath) + 1) * sizeof(WCHAR); deviceInfo = HeapAlloc(GetProcessHeap(), 0, size); if (!deviceInfo) { @@ -1842,6 +1842,303 @@ } /*********************************************************************** + * SetupDiGetClassImageIndex (SETUPAPI.@) + */ + +static BOOL GetIconIndex( + IN HKEY hClassKey, + OUT PINT ImageIndex) +{ + LPWSTR Buffer = NULL; + DWORD dwRegType, dwLength; + LONG rc; + BOOL ret = FALSE; + + /* Read "Icon" registry key */ + rc = RegQueryValueExW(hClassKey, L"Icon", NULL, &dwRegType, NULL, &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } else if (dwRegType != REG_SZ) + { + SetLastError(ERROR_INVALID_INDEX); + goto cleanup; + } + Buffer = MyMalloc(dwLength + sizeof(WCHAR)); + if (!Buffer) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + Buffer[dwLength / sizeof(WCHAR)] = 0; + rc = RegQueryValueExW(hClassKey, L"Icon", NULL, NULL, (LPBYTE)Buffer, &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + + /* Transform "Icon" value to a INT */ + *ImageIndex = atoiW(Buffer); + ret = TRUE; + +cleanup: + MyFree(Buffer); + return ret; +} + +BOOL WINAPI SetupDiGetClassImageIndex( + IN PSP_CLASSIMAGELIST_DATA ClassImageListData, + IN CONST GUID *ClassGuid, + OUT PINT ImageIndex) +{ + struct ClassImageList *list; + BOOL ret = FALSE; + + TRACE("%p %s %p\n", ClassImageListData, debugstr_guid(ClassGuid), ImageIndex); + + if (!ClassImageListData || !ClassGuid || !ImageIndex) + SetLastError(ERROR_INVALID_PARAMETER); + else if (ClassImageListData->cbSize != sizeof(SP_CLASSIMAGELIST_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if ((list = (struct ClassImageList *)ClassImageListData->Reserved) == NULL) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (list->magic != SETUP_CLASS_IMAGE_LIST_MAGIC) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (!ImageIndex) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + HKEY hKey = INVALID_HANDLE_VALUE; + INT iconIndex; + + /* Read Icon registry entry into Buffer */ + hKey = SetupDiOpenClassRegKeyExW(ClassGuid, KEY_QUERY_VALUE, DIOCR_INTERFACE, list->MachineName, NULL); + if (hKey == INVALID_HANDLE_VALUE) + goto cleanup; + if (!GetIconIndex(hKey, &iconIndex)) + goto cleanup; + + if (iconIndex >= 0) + { + SetLastError(ERROR_INVALID_INDEX); + goto cleanup; + } + + *ImageIndex = -iconIndex; + ret = TRUE; + +cleanup: + if (hKey != INVALID_HANDLE_VALUE) + RegCloseKey(hKey); + } + + TRACE("Returning %d\n", ret); + return ret; +} + +/********************************************************************** * + * SetupDiGetClassImageList(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetClassImageList( + OUT PSP_CLASSIMAGELIST_DATA ClassImageListData) +{ + return SetupDiGetClassImageListExW(ClassImageListData, NULL, NULL); +} + +/********************************************************************** * + * SetupDiGetClassImageListExA(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetClassImageListExA( + OUT PSP_CLASSIMAGELIST_DATA ClassImageListData, + IN PCSTR MachineName OPTIONAL, + IN PVOID Reserved) +{ + PWSTR MachineNameW = NULL; + BOOL ret; + + if (MachineName) + { + MachineNameW = MultiByteToUnicode(MachineName, CP_ACP); + if (MachineNameW == NULL) + return FALSE; + } + + ret = SetupDiGetClassImageListExW(ClassImageListData, MachineNameW, Reserved); + + if (MachineNameW) + MyFree(MachineNameW); + + return ret; +} + +/********************************************************************** * + * SetupDiGetClassImageListExW(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetClassImageListExW( + OUT PSP_CLASSIMAGELIST_DATA ClassImageListData, + IN PCWSTR MachineName OPTIONAL, + IN PVOID Reserved) +{ + BOOL ret = FALSE; + + TRACE("%p %p %p\n", ClassImageListData, debugstr_w(MachineName), Reserved); + + if (!ClassImageListData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (ClassImageListData->cbSize != sizeof(SP_CLASSIMAGELIST_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (Reserved) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + struct ClassImageList *list = NULL; + DWORD size; + + size = FIELD_OFFSET(struct ClassImageList, szData); + if (MachineName) + size += (wcslen(MachineName) + 3) * sizeof(WCHAR); + list = HeapAlloc(GetProcessHeap(), 0, size); + if (!list) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + list->magic = SETUP_CLASS_IMAGE_LIST_MAGIC; + if (MachineName) + { + list->szData[0] = list->szData[1] = '\\'; + strcpyW(list->szData + 2, MachineName); + list->MachineName = list->szData; + } + else + { + list->MachineName = NULL; + } + + ClassImageListData->Reserved = (DWORD)list; /* FIXME: 64 bit portability issue */ + ret = TRUE; + +cleanup: + if (!ret) + MyFree(list); + } + + TRACE("Returning %d\n", ret); + return ret; +} + +/********************************************************************** * + * SetupDiLoadClassIcon(SETUPAPI.@) + */ +BOOL WINAPI SetupDiLoadClassIcon( + IN CONST GUID *ClassGuid, + OUT HICON *LargeIcon OPTIONAL, + OUT PINT MiniIconIndex OPTIONAL) +{ + BOOL ret = FALSE; + + if (!ClassGuid) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + LPWSTR Buffer = NULL; + LPCWSTR DllName; + INT iconIndex; + HKEY hKey = INVALID_HANDLE_VALUE; + + hKey = SetupDiOpenClassRegKey(ClassGuid, KEY_QUERY_VALUE); + if (hKey == INVALID_HANDLE_VALUE) + goto cleanup; + + if (!GetIconIndex(hKey, &iconIndex)) + goto cleanup; + + if (iconIndex > 0) + { + /* Look up icon in dll specified by Installer32 or EnumPropPages32 key */ + PWCHAR Comma; + LONG rc; + DWORD dwRegType, dwLength; + rc = RegQueryValueExW(hKey, L"Installer32", NULL, &dwRegType, NULL, &dwLength); + if (rc == ERROR_SUCCESS && dwRegType == REG_SZ) + { + Buffer = MyMalloc(dwLength); + if (Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + rc = RegQueryValueExW(hKey, L"Installer32", NULL, NULL, (LPBYTE)Buffer, &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + } + else if + (ERROR_SUCCESS == (rc = RegQueryValueExW(hKey, L"EnumPropPages32", NULL, &dwRegType, NULL, &dwLength)) + && dwRegType == REG_SZ) + { + Buffer = MyMalloc(dwLength); + if (Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + rc = RegQueryValueExW(hKey, L"EnumPropPages32", NULL, NULL, (LPBYTE)Buffer, &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + } + else + { + /* Unable to find where to load the icon */ + SetLastError(ERROR_FILE_NOT_FOUND); + goto cleanup; + } + Comma = strchrW(Buffer, ','); + if (!Comma) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + *Comma = '\0'; + } + else + { + /* Look up icon in setupapi.dll */ + DllName = L"setupapi.dll"; + iconIndex = -iconIndex; + } + + TRACE("Icon index %d, dll name %s\n", iconIndex, debugstr_w(DllName)); + if (LargeIcon) + { + if (1 != ExtractIconEx(DllName, iconIndex, LargeIcon, NULL, 1)) + { + SetLastError(ERROR_INVALID_INDEX); + goto cleanup; + } + } + if (MiniIconIndex) + *MiniIconIndex = iconIndex; + ret = TRUE; + +cleanup: + if (hKey != INVALID_HANDLE_VALUE) + RegCloseKey(hKey); + MyFree(Buffer); + } + + TRACE("Returning %d\n", ret); + return ret; +} + +/********************************************************************** * * SetupDiEnumDeviceInterfaces (SETUPAPI.@) */ BOOL WINAPI SetupDiEnumDeviceInterfaces( @@ -2766,10 +3063,10 @@ * SetupDiOpenClassRegKeyExA (SETUPAPI.@) */ HKEY WINAPI SetupDiOpenClassRegKeyExA( - const GUID* ClassGuid, + const GUID* ClassGuid OPTIONAL, REGSAM samDesired, DWORD Flags, - PCSTR MachineName, + PCSTR MachineName OPTIONAL, PVOID Reserved) { PWSTR MachineNameW = NULL; @@ -2798,10 +3095,10 @@ * SetupDiOpenClassRegKeyExW (SETUPAPI.@) */ HKEY WINAPI SetupDiOpenClassRegKeyExW( - const GUID* ClassGuid, + const GUID* ClassGuid OPTIONAL, REGSAM samDesired, DWORD Flags, - PCWSTR MachineName, + PCWSTR MachineName OPTIONAL, PVOID Reserved) { LPWSTR lpGuidString; @@ -4205,7 +4502,7 @@ if (CreationFlags & DICD_GENERATE_ID) { /* Generate a new unique ID for this device */ - SetLastError(ERROR_GEN_FAILURE); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); FIXME("not implemented\n"); } else @@ -4948,7 +5245,7 @@ TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); FIXME("not implemented\n"); - SetLastError(ERROR_GEN_FAILURE); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } _____ Modified: trunk/reactos/lib/setupapi/misc.c --- trunk/reactos/lib/setupapi/misc.c 2005-12-11 06:01:32 UTC (rev 20053) +++ trunk/reactos/lib/setupapi/misc.c 2005-12-11 08:11:21 UTC (rev 20054) @@ -278,7 +278,10 @@ lpUnicodeStr = MyMalloc(nLength * sizeof(WCHAR)); if (lpUnicodeStr == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; + } if (!MultiByteToWideChar(uCodePage, 0, lpMultiByteStr, nLength, lpUnicodeStr, nLength)) _____ Modified: trunk/reactos/lib/setupapi/setupapi_private.h --- trunk/reactos/lib/setupapi/setupapi_private.h 2005-12-11 06:01:32 UTC (rev 20053) +++ trunk/reactos/lib/setupapi/setupapi_private.h 2005-12-11 08:11:21 UTC (rev 20054) @@ -41,6 +41,7 @@ #include "resource.h" #define SETUP_DEV_INFO_SET_MAGIC 0xd00ff057 +#define SETUP_CLASS_IMAGE_LIST_MAGIC 0xd00ff058 struct DeviceInterface /* Element of DeviceInfoElement.InterfaceListHead */ { @@ -153,6 +154,17 @@ WCHAR szData[0]; }; +struct ClassImageList +{ + DWORD magic; /* SETUP_CLASS_IMAGE_LIST_MAGIC */ + + /* Contains the name of the remote computer ('\\COMPUTERNAME' for example), + * or NULL if related to local machine. Points into szData field at the + * end of the structure */ + PCWSTR MachineName; + WCHAR szData[0]; +}; + extern HINSTANCE hInstance; #define RC_STRING_MAX_SIZE 256 _____ Modified: trunk/reactos/lib/setupapi/stubs.c --- trunk/reactos/lib/setupapi/stubs.c 2005-12-11 06:01:32 UTC (rev 20053) +++ trunk/reactos/lib/setupapi/stubs.c 2005-12-11 08:11:21 UTC (rev 20054) @@ -169,53 +169,6 @@ /*********************************************************************** - * SetupDiGetClassImageList(SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetClassImageList(PSP_CLASSIMAGELIST_DATA ClassImageListData) -{ - FIXME ("Stub %p\n", ClassImageListData); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/********************************************************************** * - * SetupDiGetClassImageListExA(SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetClassImageListExA(PSP_CLASSIMAGELIST_DATA ClassImageListData, - PCSTR MachineName, PVOID Reserved) -{ - FIXME ("Stub %p %s %p\n", ClassImageListData, debugstr_a(MachineName), Reserved); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/********************************************************************** * - * SetupDiGetClassImageListExW(SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetClassImageListExW(PSP_CLASSIMAGELIST_DATA ClassImageListData, - PCWSTR MachineName, PVOID Reserved) -{ - FIXME ("Stub %p %s %p\n", ClassImageListData, debugstr_w(MachineName), Reserved); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/********************************************************************** * - * SetupDiGetClassImageIndex(SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetClassImageIndex(PSP_CLASSIMAGELIST_DATA ClassImageListData, - CONST GUID *ClassGuid, PINT ImageIndex) -{ - FIXME ("Stub %p %p %p\n", ClassImageListData, ClassGuid, ImageIndex); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/********************************************************************** * * SetupDiDestroyClassImageList(SETUPAPI.@) */ BOOL WINAPI SetupDiDestroyClassImageList(PSP_CLASSIMAGELIST_DATA ClassImageListData) @@ -225,13 +178,3 @@ return TRUE; } - -/********************************************************************** * - * SetupDiLoadClassIcon(SETUPAPI.@) - */ -BOOL WINAPI SetupDiLoadClassIcon(CONST GUID *ClassGuid, HICON *LargeIcon, PINT MiniIconIndex) -{ - FIXME ("Stub %p %p %p\n", ClassGuid, LargeIcon, MiniIconIndex); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -}

18 years, 9 months

[turner] 20053: Make sure buffer isnt NULL. fixes bug 1102.

by turner＠svn.reactos.com

Make sure buffer isnt NULL. fixes bug 1102. Modified: trunk/reactos/lib/kernel32/misc/dllmain.c _____ Modified: trunk/reactos/lib/kernel32/misc/dllmain.c --- trunk/reactos/lib/kernel32/misc/dllmain.c 2005-12-11 05:51:14 UTC (rev 20052) +++ trunk/reactos/lib/kernel32/misc/dllmain.c 2005-12-11 06:01:32 UTC (rev 20053) @@ -348,6 +348,10 @@ SystemDirectory.Buffer = RtlAllocateHeap(hProcessHeap, 0, SystemDirectory.MaximumLength); + if(SystemDirectory.Buffer == NULL) + { + return FALSE; + } wcscpy(SystemDirectory.Buffer, WindowsDirectory.Buffer); wcscat(SystemDirectory.Buffer, L"\\System32");

18 years, 9 months

[turner] 20052: Spell it right. :rolleyes:

by turner＠svn.reactos.com

Spell it right. :rolleyes: Modified: trunk/reactos/lib/kernel32/misc/errormsg.c _____ Modified: trunk/reactos/lib/kernel32/misc/errormsg.c --- trunk/reactos/lib/kernel32/misc/errormsg.c 2005-12-11 05:49:02 UTC (rev 20051) +++ trunk/reactos/lib/kernel32/misc/errormsg.c 2005-12-11 05:51:14 UTC (rev 20052) @@ -177,7 +177,7 @@ if (dwFlags & FORMAT_MESSAGE_FROM_STRING) { from = HeapAlloc( GetProcessHeap(), 0, strlen((LPCSTR)lpSource)+1 ); - if (form == NULL) + if (from == NULL) { return 0; }

18 years, 9 months

[turner] 20051: Check to make sure pointer isnt null after allocation. Fixes bug 1103.

by turner＠svn.reactos.com

Check to make sure pointer isnt null after allocation. Fixes bug 1103. Modified: trunk/reactos/lib/kernel32/misc/errormsg.c _____ Modified: trunk/reactos/lib/kernel32/misc/errormsg.c --- trunk/reactos/lib/kernel32/misc/errormsg.c 2005-12-11 05:34:11 UTC (rev 20050) +++ trunk/reactos/lib/kernel32/misc/errormsg.c 2005-12-11 05:49:02 UTC (rev 20051) @@ -177,6 +177,10 @@ if (dwFlags & FORMAT_MESSAGE_FROM_STRING) { from = HeapAlloc( GetProcessHeap(), 0, strlen((LPCSTR)lpSource)+1 ); + if (form == NULL) + { + return 0; + } strcpy( from, (LPCSTR)lpSource ); } else {

18 years, 9 months

[turner] 20050: Stop the footer from printing twice. fixes 1084.

by turner＠svn.reactos.com

Stop the footer from printing twice. fixes 1084. Modified: trunk/reactos/subsys/system/cmd/dir.c _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-12-11 04:55:19 UTC (rev 20049) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-12-11 05:34:11 UTC (rev 20050) @@ -1138,46 +1138,33 @@ /* Print recursive specific results */ /* Take this code offline to fix /S does not print duoble info */ - if (lpFlags->bRecursive) - { - ConvertULargeInteger(u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); + if (lpFlags->bRecursive) + { + ConvertULargeInteger(u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP5, szMsg, RC_STRING_MAX_SIZE); + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,szMsg,ulFiles, szBuffer); + else + ConOutPrintf(szMsg,ulFiles, szBuffer); + } + else + { - LoadString(CMD_ModuleHandle, STRING_DIR_HELP5, szMsg, RC_STRING_MAX_SIZE); - if(lpFlags->bPause) - ConOutPrintfPaging(FALSE,szMsg,ulFiles, szBuffer); - else - ConOutPrintf(szMsg,ulFiles, szBuffer); - - if (ulFiles > 0) - { - ConvertULargeInteger(u64Bytes, szBuffer, 20, lpFlags->bTSeperator); - LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE); - if(lpFlags->bPause) - ConOutPrintfPaging(FALSE,szMsg,ulFiles, szBuffer); - else - ConOutPrintf(szMsg,ulFiles, szBuffer); + /* Print File Summary */ + /* Condition to print summary is: + If we are not in bare format and if we have results! */ + if (ulFiles > 0) + { + ConvertULargeInteger(u64Bytes, szBuffer, 20, lpFlags->bTSeperator); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE); + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,szMsg,ulFiles, szBuffer); + else + ConOutPrintf(szMsg,ulFiles, szBuffer); - } - - } - else - { - - /* Print File Summary */ - /* Condition to print summary is: - If we are not in bare format and if we have results! */ - if (ulFiles > 0) - { - ConvertULargeInteger(u64Bytes, szBuffer, 20, lpFlags->bTSeperator); - LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE); - if(lpFlags->bPause) - ConOutPrintfPaging(FALSE,szMsg,ulFiles, szBuffer); - else - ConOutPrintf(szMsg,ulFiles, szBuffer); + } - } - -} + } /* Print total directories and freespace */ szRoot[0] = szPath[0]; GetUserDiskFreeSpace(szRoot, &uliFree);

18 years, 9 months

[turner] 20049: "Add" -> "Modify". Fixes bug 847.

by turner＠svn.reactos.com

"Add" -> "Modify". Fixes bug 847. Modified: trunk/reactos/lib/cpl/appwiz/En.rc _____ Modified: trunk/reactos/lib/cpl/appwiz/En.rc --- trunk/reactos/lib/cpl/appwiz/En.rc 2005-12-11 04:37:18 UTC (rev 20048) +++ trunk/reactos/lib/cpl/appwiz/En.rc 2005-12-11 04:55:19 UTC (rev 20049) @@ -13,7 +13,7 @@ ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 LTEXT "The following Software can be automatically removed. To remove a program or to modify its installed components, select it from the list and click Add/Remove.",-1,36,72,PROPSHEETWIDTH-48,32 LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "Add/&Remove", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 + PUSHBUTTON "Modify/&Remove", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 END IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT

18 years, 9 months

[turner] 20048: Write the new environment vars to the registry. Fixes 987.

by turner＠svn.reactos.com

Write the new environment vars to the registry. Fixes 987. Modified: trunk/reactos/lib/cpl/sysdm/environment.c _____ Modified: trunk/reactos/lib/cpl/sysdm/environment.c --- trunk/reactos/lib/cpl/sysdm/environment.c 2005-12-11 00:07:56 UTC (rev 20047) +++ trunk/reactos/lib/cpl/sysdm/environment.c 2005-12-11 04:37:18 UTC (rev 20048) @@ -473,7 +473,71 @@ } } +VOID +SetAllVars(HWND hwndDlg, + INT iDlgItem) +{ + HWND hwndListView; + PVARIABLE_DATA VarData; + LV_ITEM lvi; + INT iItem; + HKEY hk; + DWORD Type = 0; + memset(&lvi, 0x00, sizeof(lvi)); + + /* Get the handle to the list box with all system vars in it */ + hwndListView = GetDlgItem(hwndDlg, iDlgItem); + /* first item is 0 */ + iItem = 0; + /* set up struct to retreive item */ + lvi.mask = LVIF_PARAM; + lvi.iItem = iItem; + + /* Open or create the key */ + if (RegCreateKeyEx((iDlgItem == IDC_SYSTEM_VARIABLE_LIST ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER), + (iDlgItem == IDC_SYSTEM_VARIABLE_LIST ? _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment") : _T("Environment")), + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE | KEY_READ, + NULL, + &hk, + NULL)) + { + return; + } + + /* loop through all system variables */ + while(ListView_GetItem(hwndListView, &lvi)) + { + /* Get the data in each item */ + VarData = (PVARIABLE_DATA)lvi.lParam; + if (VarData != NULL) + { + /* Get the type */ + RegQueryValueEx(hk,VarData->lpName,NULL,&Type,NULL,NULL); + + /* Set the new value */ + if (RegSetValueEx(hk, + VarData->lpName, + 0, + Type, + (LPBYTE) VarData->lpRawValue, + (DWORD) (_tcsclen(VarData->lpRawValue)* sizeof(TCHAR))+1)) + { + RegCloseKey(hk); + return; + } + } + /* Fill struct for next item */ + lvi.mask = LVIF_PARAM; + lvi.iItem = ++iItem; + } + + RegCloseKey(hk); +} + /* Environment dialog procedure */ INT_PTR CALLBACK EnvironmentDlgProc(HWND hwndDlg, @@ -515,7 +579,8 @@ return TRUE; case IDOK: - /* FIXME: Set environment variables in the registry */ + SetAllVars(hwndDlg, IDC_USER_VARIABLE_LIST); + SetAllVars(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); case IDCANCEL: ReleaseListViewItems(hwndDlg, IDC_USER_VARIABLE_LIST);

18 years, 9 months

[sgasiorek] 20047: fix inserting menu by position in InsertMenuA/W

by sgasiorek＠svn.reactos.com

fix inserting menu by position in InsertMenuA/W Modified: trunk/reactos/lib/user32/windows/menu.c _____ Modified: trunk/reactos/lib/user32/windows/menu.c --- trunk/reactos/lib/user32/windows/menu.c 2005-12-10 22:28:26 UTC (rev 20046) +++ trunk/reactos/lib/user32/windows/menu.c 2005-12-11 00:07:56 UTC (rev 20047) @@ -4030,7 +4030,7 @@ mii.fMask |= MIIM_ID; mii.wID = (UINT)uIDNewItem; } - return InsertMenuItemA(hMenu, uPosition, (BOOL)!(MF_BYPOSITION & uFlags), &mii); + return InsertMenuItemA(hMenu, uPosition, (BOOL)((MF_BYPOSITION & uFlags) > 0), &mii); } @@ -4189,7 +4189,7 @@ mii.fMask |= MIIM_ID; mii.wID = (UINT)uIDNewItem; } - return InsertMenuItemW(hMenu, uPosition, (BOOL)!(MF_BYPOSITION & uFlags), &mii); + return InsertMenuItemW(hMenu, uPosition, (BOOL)((MF_BYPOSITION & uFlags) > 0), &mii); }

18 years, 9 months

← Newer
1
...
42
43
44
45
46
47
48
...
71
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 2005