Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[ros-diffs] [hpoussin] 18408: Fix SetupDiGetDeviceRegistryPropertyA, which should return the required size and the registry data type if the buffer is too small

by hpoussin＠svn.reactos.com

Fix SetupDiGetDeviceRegistryPropertyA, which should return the required size and the registry data type if the buffer is too small (typical case when you call it 2 times: 1st time to get the required size, 2nd time to get real data) Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-11 13:35:07 UTC (rev 18407) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-12 08:14:56 UTC (rev 18408) @@ -2157,7 +2157,7 @@ DWORD PropertyBufferSizeW; PBYTE PropertyBufferW; - TRACE("%04lx %p %ld %p %p %ld %p\n", (DWORD)devinfo, DeviceInfoData, + TRACE("%p %p %ld %p %p %ld %p\n", devinfo, DeviceInfoData, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize); @@ -2173,19 +2173,26 @@ PropertyBufferSizeW, &RequiredSizeW); + if (bResult || GetLastError() == ERROR_MORE_DATA) + { + bIsStringProperty = (RegType == REG_SZ || RegType == REG_MULTI_SZ || RegType == REG_EXPAND_SZ); + + if (bIsStringProperty) + RequiredSizeA = RequiredSizeW / sizeof(WCHAR); + else + RequiredSizeA = RequiredSizeW; + if (RequiredSize) + *RequiredSize = RequiredSizeA; + if (PropertyRegDataType) + *PropertyRegDataType = RegType; + } + if (!bResult) { HeapFree(GetProcessHeap(), 0, PropertyBufferW); return bResult; } - bIsStringProperty = (RegType == REG_SZ || RegType == REG_MULTI_SZ || RegType == REG_EXPAND_SZ); - - if (bIsStringProperty) - RequiredSizeA = RequiredSizeW / sizeof(WCHAR); - else - RequiredSizeA = RequiredSizeW; - if (RequiredSizeA <= PropertyBufferSize) { if (bIsStringProperty && PropertyBufferSize > 0) @@ -2206,10 +2213,6 @@ } HeapFree(GetProcessHeap(), 0, PropertyBufferW); - if (PropertyRegDataType) - *PropertyRegDataType = RegType; - if (RequiredSize) - *RequiredSize = RequiredSizeA; return bResult; } @@ -2877,13 +2880,13 @@ LPWSTR lpGuidString; if (UuidToStringW((UUID*)&DeviceInfoData->ClassGuid, &lpGuidString) == RPC_S_OK) { - rc = RegQueryValueExW(hKey, L"Installer32", NULL, &dwRegType, NULL, &dwLength); + rc = RegQueryValueExW(hKey, lpGuidString, NULL, &dwRegType, NULL, &dwLength); if (rc == ERROR_SUCCESS && dwRegType == REG_SZ) { LPWSTR KeyBuffer = HeapAlloc(GetProcessHeap(), 0, dwLength); if (KeyBuffer != NULL) { - rc = RegQueryValueExW(hKey, L"Installer32", NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); + rc = RegQueryValueExW(hKey, lpGuidString, NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); if (rc == ERROR_SUCCESS) { LPCWSTR ptr;

19 years

[hpoussin] 18407: Send the right LocaleId to device stack when querying the device description.

by hpoussin＠svn.reactos.com

Send the right LocaleId to device stack when querying the device description. Don't erase device description stored by setupapi during next reboot Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-10-11 03:23:01 UTC (rev 18406) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-10-11 13:35:07 UTC (rev 18407) @@ -1475,6 +1475,8 @@ PWSTR Ptr; USHORT Length; USHORT TotalLength; + ULONG RequiredLength; + LCID LocaleId; HANDLE InstanceKey = NULL; UNICODE_STRING ValueName; UNICODE_STRING ParentIdPrefix = { 0 }; @@ -1508,6 +1510,14 @@ return STATUS_UNSUCCESSFUL; } + /* Get Locale ID */ + Status = ZwQueryDefaultLocale(FALSE, &LocaleId); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwQueryDefaultLocale() failed with status 0x%lx\n", Status); + return Status; + } + /* * FIXME: For critical errors, cleanup and disable device, but always * return STATUS_SUCCESS. @@ -1735,7 +1745,7 @@ DPRINT("Sending IRP_MN_QUERY_DEVICE_TEXT.DeviceTextDescription to device stack\n"); Stack.Parameters.QueryDeviceText.DeviceTextType = DeviceTextDescription; - Stack.Parameters.QueryDeviceText.LocaleId = 0; /* FIXME */ + Stack.Parameters.QueryDeviceText.LocaleId = LocaleId; Status = IopInitiatePnpIrp( DeviceNode->PhysicalDeviceObject, &IoStatusBlock, @@ -1743,18 +1753,22 @@ &Stack); if (NT_SUCCESS(Status)) { - RtlInitUnicodeString(&ValueName, - L"DeviceDesc"); - Status = ZwSetValueKey(InstanceKey, - &ValueName, - 0, - REG_SZ, - (PVOID)IoStatusBlock.Information, - (wcslen((PWSTR)IoStatusBlock.Information) + 1) * sizeof(WCHAR)); + RtlInitUnicodeString(&ValueName, L"DeviceDesc"); + if (ZwQueryValueKey(InstanceKey, &ValueName, KeyValueBasicInformation, NULL, 0, &RequiredLength) == STATUS_OBJECT_NAME_NOT_FOUND) + { + /* This key is overriden when a driver is installed. Don't write the + * new description if another one already exists */ + Status = ZwSetValueKey(InstanceKey, + &ValueName, + 0, + REG_SZ, + (PVOID)IoStatusBlock.Information, + (wcslen((PWSTR)IoStatusBlock.Information) + 1) * sizeof(WCHAR)); + } if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status); - } + { + DPRINT1("ZwSetValueKey() failed (Status 0x%lx)\n", Status); + } } else { @@ -1764,7 +1778,7 @@ DPRINT("Sending IRP_MN_QUERY_DEVICE_TEXT.DeviceTextLocation to device stack\n"); Stack.Parameters.QueryDeviceText.DeviceTextType = DeviceTextLocationInformation; - Stack.Parameters.QueryDeviceText.LocaleId = 0; // FIXME + Stack.Parameters.QueryDeviceText.LocaleId = LocaleId; Status = IopInitiatePnpIrp( DeviceNode->PhysicalDeviceObject, &IoStatusBlock,

19 years

[gdalsnes] 18406: nullterm correct string in strndup

by gdalsnes＠svn.reactos.com

nullterm correct string in strndup nullterm argv list reformat Modified: trunk/reactos/lib/crt/misc/getargs.c _____ Modified: trunk/reactos/lib/crt/misc/getargs.c --- trunk/reactos/lib/crt/misc/getargs.c 2005-10-11 00:58:45 UTC (rev 18405) +++ trunk/reactos/lib/crt/misc/getargs.c 2005-10-11 03:23:01 UTC (rev 18406) @@ -16,128 +16,153 @@ wchar_t**__wargv = NULL; int __argc = 0; +extern wchar_t **__winitenv; + extern HANDLE hHeap; char* strndup(char* name, int len) { - char *s = malloc(len + 1); - if (s != NULL) { - strncpy(s, name, len); - name[len] = 0; - } - return s; + char *s = malloc(len + 1); + if (s != NULL) + { + memcpy(s, name, len); + s[len] = 0; + } + return s; } #define SIZE (4096 / sizeof(char*)) -int add(char* name) +int add + (char* name) { - char** _new; - if ((__argc % SIZE) == 0) { - if (__argv == NULL) - _new = malloc(sizeof(char*) * SIZE); - else - _new = realloc(__argv, sizeof(char*) * (__argc + SIZE)); - if (_new == NULL) - return -1; - __argv = _new; - } - __argv[__argc++] = name; - return 0; + char** _new; + if ((__argc % SIZE) == 0) + { + if (__argv == NULL) + _new = malloc(sizeof(char*) * (1 + SIZE)); + else + _new = realloc(__argv, sizeof(char*) * (__argc + 1 + SIZE)); + if (_new == NULL) + return -1; + __argv = _new; + } + __argv[__argc++] = name; + __argv[__argc] = NULL; + return 0; } -int expand(char* name, int flag) +int expand(char* name, int expand_wildcards) { - char* s; - WIN32_FIND_DATAA fd; - HANDLE hFile; - BOOLEAN first = TRUE; - char buffer[256]; - int pos; + char* s; + WIN32_FIND_DATAA fd; + HANDLE hFile; + BOOLEAN first = TRUE; + char buffer[256]; + int pos; - s = strpbrk(name, "*?"); - if (s && flag) { - hFile = FindFirstFileA(name, &fd); - if (hFile != INVALID_HANDLE_VALUE) { - while(s != name && *s != '/' && *s != '\\') - s--; - pos = s - name; - if (*s == '/' || *s == '\\') - pos++; - strncpy(buffer, name, pos); - do { - if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { - strcpy(&buffer[pos], fd.cFileName); - if (add(_strdup(buffer)) < 0) { - FindClose(hFile); - return -1; - } - first = FALSE; - } + if (expand_wildcards && (s = strpbrk(name, "*?"))) + { + hFile = FindFirstFileA(name, &fd); + if (hFile != INVALID_HANDLE_VALUE) + { + while(s != name && *s != '/' && *s != '\\') + s--; + pos = s - name; + if (*s == '/' || *s == '\\') + pos++; + strncpy(buffer, name, pos); + do + { + if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + strcpy(&buffer[pos], fd.cFileName); + if (add + (_strdup(buffer)) < 0) + { + FindClose(hFile); + return -1; + } + first = FALSE; } - while(FindNextFileA(hFile, &fd)); - FindClose(hFile); - } - } - if (first) { - if (add(name) < 0) - return -1; - } - else - free(name); - return 0; + } + while(FindNextFileA(hFile, &fd)); + FindClose(hFile); + } + } + if (first) + { + if (add + (name) < 0) + return -1; + } + else + free(name); + return 0; } /* * @unimplemented */ -int __getmainargs(int* argc, char*** argv, char*** env, int flag) +void __getmainargs(int* argc, char*** argv, char*** env, int expand_wildcards, int* new_mode) { - int i, afterlastspace, ignorespace, len, doexpand; + int i, afterlastspace, ignorespace, len, doexpand; - /* missing threading init */ + /* missing threading init */ - i = 0; - afterlastspace = 0; - ignorespace = 0; - doexpand = flag; + i = 0; + afterlastspace = 0; + ignorespace = 0; + doexpand = expand_wildcards; - len = strlen(_acmdln); + len = strlen(_acmdln); - while (_acmdln[i]) { - if (_acmdln[i] == '"') { - if(ignorespace) { - ignorespace = 0; - } else { - ignorespace = 1; - doexpand = 0; - } - memmove(_acmdln + i, _acmdln + i + 1, len - i); - len--; - continue; - } + while (_acmdln[i]) + { + if (_acmdln[i] == '"') + { + if(ignorespace) + { + ignorespace = 0; + } + else + { + ignorespace = 1; + doexpand = 0; + } + memmove(_acmdln + i, _acmdln + i + 1, len - i); + len--; + continue; + } - if (_acmdln[i] == ' ' && !ignorespace) { - expand(strndup(_acmdln + afterlastspace, i - afterlastspace), doexpand); + if (_acmdln[i] == ' ' && !ignorespace) + { + expand(strndup(_acmdln + afterlastspace, i - afterlastspace), doexpand); + i++; + while (_acmdln[i]==' ') i++; - while (_acmdln[i]==' ') - i++; - afterlastspace=i; - doexpand = flag; - } else { - i++; - } - } + afterlastspace=i; + doexpand = expand_wildcards; + } + else + { + i++; + } + } - if (_acmdln[afterlastspace] != 0) { - expand(strndup(_acmdln+afterlastspace, i - afterlastspace), doexpand); - } - HeapValidate(hHeap, 0, NULL); - *argc = __argc; - *argv = __argv; - *env = _environ; - _pgmptr = _strdup((char*)argv[0]); - return 0; + if (_acmdln[afterlastspace] != 0) + { + expand(strndup(_acmdln+afterlastspace, i - afterlastspace), doexpand); + } + + HeapValidate(hHeap, 0, NULL); + + *argc = __argc; + *argv = __argv; + *env = _environ; + _pgmptr = _strdup((char*)argv[0]); + + // if (new_mode) _set_new_mode(*new_mode); } /* @@ -146,10 +171,11 @@ void __wgetmainargs(int* argc, wchar_t*** wargv, wchar_t*** wenv, int expand_wildcards, int* new_mode) { - extern wchar_t **__winitenv; - *argc = 0; - *wargv = NULL; - *wenv = __winitenv; + *argc = __argc; + *wargv = __wargv; + *wenv = __winitenv; + + // if (new_mode) _set_new_mode(*new_mode); } /* @@ -157,7 +183,7 @@ */ int* __p___argc(void) { - return &__argc; + return &__argc; } /* @@ -165,7 +191,7 @@ */ char*** __p___argv(void) { - return &__argv; + return &__argv; } /* @@ -173,13 +199,13 @@ */ wchar_t*** __p___wargv(void) { - return &__wargv; + return &__wargv; } #if 0 int _chkstk(void) { - return 0; + return 0; } #endif

19 years

[blight] 18405: vdmdbg.dll (stubs only) by Christoph v.W. - thanks!

by blight＠svn.reactos.com

vdmdbg.dll (stubs only) by Christoph v.W. - thanks! Modified: trunk/reactos/baseaddress.xml Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/vdmdbg/ Added: trunk/reactos/lib/vdmdbg/vdmdbg.c Added: trunk/reactos/lib/vdmdbg/vdmdbg.def Added: trunk/reactos/lib/vdmdbg/vdmdbg.h Added: trunk/reactos/lib/vdmdbg/vdmdbg.xml _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-10-10 22:42:13 UTC (rev 18404) +++ trunk/reactos/baseaddress.xml 2005-10-11 00:58:45 UTC (rev 18405) @@ -3,6 +3,7 @@ <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> <property name="BASEADDRESS_DEVENUM" value="0x35680000" /> <property name="BASEADDRESS_UXTHEME" value="0x5AD70000" /> +<property name="BASEADDRESS_VDMDBG" value="0x5B0D0000" /> <property name="BASEADDRESS_OBJSEL" value="0x5B400000" /> <property name="BASEADDRESS_DINPUT" value="0x5F580000" /> <property name="BASEADDRESS_HDWWIZ" value="0x64D40000" /> _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-10-10 22:42:13 UTC (rev 18404) +++ trunk/reactos/lib/directory.xml 2005-10-11 00:58:45 UTC (rev 18405) @@ -189,7 +189,7 @@ <xi:include href="oleaut32/oleaut32.xml" /> </directory> <directory name="oledlg"> - <xi:include href="oledlg/oledlg.xml" /> + <xi:include href="oledlg/oledlg.xml" /> </directory> <directory name="olepro32"> <xi:include href="olepro32/olepro32.xml" /> @@ -281,6 +281,9 @@ <directory name="uxtheme"> <xi:include href="uxtheme/uxtheme.xml" /> </directory> +<directory name="vdmdbg"> + <xi:include href="vdmdbg/vdmdbg.xml" /> +</directory> <directory name="version"> <xi:include href="version/version.xml" /> </directory> _____ Added: trunk/reactos/lib/vdmdbg/vdmdbg.c --- trunk/reactos/lib/vdmdbg/vdmdbg.c 2005-10-10 22:42:13 UTC (rev 18404) +++ trunk/reactos/lib/vdmdbg/vdmdbg.c 2005-10-11 00:58:45 UTC (rev 18405) @@ -0,0 +1,64 @@ +#include <vdmdbg.h> + +#define NDEBUG +#include <debug.h> + +HINSTANCE hDllInstance; + +BOOL WINAPI VDMBreakThread( HANDLE hProcess, + HANDLE hThread ) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI VDMDetectWOW( void ) +{ + UNIMPLEMENTED; + return FALSE; +} + +INT WINAPI VDMEnumProcessWOW( PROCESSENUMPROC fp, + LPARAM lparam ) +{ + UNIMPLEMENTED; + return FALSE; +} + + +INT WINAPI VDMEnumTaskWOWEx( DWORD dwProcessId, + TASKENUMPROCEX fp, + LPARAM lparam ) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +BOOL WINAPI VDMTerminateTaskWOW( DWORD dwProcessId, + WORD htask ) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL STDCALL +DllMain(IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + hDllInstance = hinstDLL; + DisableThreadLibraryCalls(hDllInstance); + /* Don't break, initialize first thread */ + case DLL_THREAD_ATTACH: + break; + case DLL_THREAD_DETACH: + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + _____ Added: trunk/reactos/lib/vdmdbg/vdmdbg.def --- trunk/reactos/lib/vdmdbg/vdmdbg.def 2005-10-10 22:42:13 UTC (rev 18404) +++ trunk/reactos/lib/vdmdbg/vdmdbg.def 2005-10-11 00:58:45 UTC (rev 18405) @@ -0,0 +1,56 @@ +; +; vdmdbg.def +; +; Exports for VDMDBG DLL +; +; Copyright (C) 1998 Free Software Foundation, Inc. +; Created by J.J. van der Heijden <J.J.vanderHeijden(a)student.utwente.nl> +; +; This file is part of the Windows32 API Library. +; Based on the November 1997 Platform SDK +; +; This library is free software; you can redistribute it and/or +; modify it under the terms of the GNU Library General Public +; License as published by the Free Software Foundation; either +; version 2 of the License, or (at your option) any later version. +; +; This library is distributed in the hope that it will be useful, +; but WITHOUT ANY WARRANTY; without even the implied warranty of +; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +; Library General Public License for more details. +; +; You should have received a copy of the GNU Library General Public +; License along with this library; see the file COPYING.LIB. +; If not, write to the Free Software Foundation, +; 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +; +LIBRARY VDMDBG +EXPORTS +VDMBreakThread@8 +VDMDetectWOW@0 +VDMEnumProcessWOW@8 +;VDMEnumTaskWOW@12 +VDMEnumTaskWOWEx@12 +;VDMGetAddrExpression@20 +;VDMGetContext@12 +;VDMGetDbgFlags@4 +;VDMGetModuleSelector@20 +;VDMGetPointer@20 +;VDMGetSegmentInfo@16 +;VDMGetSegtablePointer@0 +;VDMGetSelectorModule@32 +;VDMGetSymbol@28 +;VDMGetThreadContext@8 +;VDMGetThreadSelectorEntry@16 +;VDMGlobalFirst@24 +;VDMGlobalNext@24 +;VDMIsModuleLoaded@4 +;VDMKillWOW@0 +;VDMModuleFirst@20 +;VDMModuleNext@20 +;VDMProcessException@4 +;VDMSetContext@12 +;VDMSetDbgFlags@8 +;VDMSetThreadContext@8 +;VDMStartTaskInWOW@12 +VDMTerminateTaskWOW@8 _____ Added: trunk/reactos/lib/vdmdbg/vdmdbg.h --- trunk/reactos/lib/vdmdbg/vdmdbg.h 2005-10-10 22:42:13 UTC (rev 18404) +++ trunk/reactos/lib/vdmdbg/vdmdbg.h 2005-10-11 00:58:45 UTC (rev 18405) @@ -0,0 +1,24 @@ +#include <windows.h> + +ULONG DbgPrint(PCH Format,...); + +typedef BOOL ( WINAPI *PROCESSENUMPROC ) +( + DWORD dwProcessId, + DWORD dwAttributes, + LPARAM lpUserDefined +); + +typedef BOOL ( WINAPI *TASKENUMPROCEX ) +( + DWORD dwThreadId, + WORD hMod16, + WORD hTask16, + PSZ pszModName, + PSZ pszFileName, + LPARAM lpUserDefined +); + +extern HINSTANCE hDllInstance; + +/* EOF */ _____ Added: trunk/reactos/lib/vdmdbg/vdmdbg.xml --- trunk/reactos/lib/vdmdbg/vdmdbg.xml 2005-10-10 22:42:13 UTC (rev 18404) +++ trunk/reactos/lib/vdmdbg/vdmdbg.xml 2005-10-11 00:58:45 UTC (rev 18405) @@ -0,0 +1,12 @@ +<module name="vdmdbg" type="win32dll" baseaddress="${BASEADDRESS_VDMDBG}" installbase="system32" installname="vdmdbg.dll"> + <importlibrary definition="vdmdbg.def" /> + <include base="vdmdbg">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <library>ntdll</library> + <library>kernel32</library> + <file>vdmdbg.c</file> + <pch>vdmdbg.h</pch> +</module>

19 years

[gdalsnes] 18404: alloc at minimum 16 bytes (spotted by WaxDragon)

by gdalsnes＠svn.reactos.com

alloc at minimum 16 bytes (spotted by WaxDragon) realloc should free passed mem if new size is 0 Modified: trunk/reactos/lib/crt/stdlib/malloc.c _____ Modified: trunk/reactos/lib/crt/stdlib/malloc.c --- trunk/reactos/lib/crt/stdlib/malloc.c 2005-10-10 20:18:07 UTC (rev 18403) +++ trunk/reactos/lib/crt/stdlib/malloc.c 2005-10-10 22:42:13 UTC (rev 18404) @@ -29,6 +29,9 @@ /* fixme: should have this in common header */ #define ROUND_UP(a,b) ((a + (b-1)) & ~(b-1)) +/* round to 16 bytes + alloc at minimum 16 bytes */ +#define ROUND_SIZE(size) (max(16, ROUND_UP(size, 16))) + extern HANDLE hHeap; /* @@ -36,7 +39,7 @@ */ void* malloc(size_t _size) { - return HeapAlloc(hHeap, 0, ROUND_UP(_size, 16)); + return HeapAlloc(hHeap, 0, ROUND_SIZE(_size)); } /* @@ -52,7 +55,7 @@ */ void* calloc(size_t _nmemb, size_t _size) { - return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, ROUND_UP(_nmemb*_size, 16) ); + return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, ROUND_SIZE(_nmemb*_size) ); } /* @@ -60,9 +63,10 @@ */ void* realloc(void* _ptr, size_t _size) { - if (!_ptr) - return HeapAlloc(hHeap, 0, ROUND_UP(_size, 16)); - return HeapReAlloc(hHeap, 0, _ptr, ROUND_UP(_size, 16)); + if (!_ptr) return malloc(_size); + if (_size) return HeapReAlloc(hHeap, 0, _ptr, ROUND_SIZE(_size)); + free(_ptr); + return NULL; } /* @@ -70,7 +74,7 @@ */ void* _expand(void* _ptr, size_t _size) { - return HeapReAlloc(hHeap, HEAP_REALLOC_IN_PLACE_ONLY, _ptr, ROUND_UP(_size, 16)); + return HeapReAlloc(hHeap, HEAP_REALLOC_IN_PLACE_ONLY, _ptr, ROUND_SIZE(_size)); } /*

19 years

[gdalsnes] 18403: alloc multiple of 16 bytes

by gdalsnes＠svn.reactos.com

alloc multiple of 16 bytes Modified: trunk/reactos/lib/crt/stdlib/malloc.c _____ Modified: trunk/reactos/lib/crt/stdlib/malloc.c --- trunk/reactos/lib/crt/stdlib/malloc.c 2005-10-10 19:08:57 UTC (rev 18402) +++ trunk/reactos/lib/crt/stdlib/malloc.c 2005-10-10 20:18:07 UTC (rev 18403) @@ -25,6 +25,10 @@ #include <stdlib.h> #include <malloc.h> + +/* fixme: should have this in common header */ +#define ROUND_UP(a,b) ((a + (b-1)) & ~(b-1)) + extern HANDLE hHeap; /* @@ -32,7 +36,7 @@ */ void* malloc(size_t _size) { - return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, _size); + return HeapAlloc(hHeap, 0, ROUND_UP(_size, 16)); } /* @@ -48,7 +52,7 @@ */ void* calloc(size_t _nmemb, size_t _size) { - return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, _nmemb*_size); + return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, ROUND_UP(_nmemb*_size, 16) ); } /* @@ -57,8 +61,8 @@ void* realloc(void* _ptr, size_t _size) { if (!_ptr) - return HeapAlloc(hHeap, 0, _size); - return HeapReAlloc(hHeap, 0, _ptr, _size); + return HeapAlloc(hHeap, 0, ROUND_UP(_size, 16)); + return HeapReAlloc(hHeap, 0, _ptr, ROUND_UP(_size, 16)); } /* @@ -66,7 +70,7 @@ */ void* _expand(void* _ptr, size_t _size) { - return HeapReAlloc(hHeap, HEAP_REALLOC_IN_PLACE_ONLY, _ptr, _size); + return HeapReAlloc(hHeap, HEAP_REALLOC_IN_PLACE_ONLY, _ptr, ROUND_UP(_size, 16)); } /*

19 years

[turner] 18402: set to eol-style native ;)

by turner＠svn.reactos.com

set to eol-style native ;) Modified: trunk/reactos/subsys/system/cmd/readme2.txt _____ Modified: trunk/reactos/subsys/system/cmd/readme2.txt --- trunk/reactos/subsys/system/cmd/readme2.txt 2005-10-10 18:57:56 UTC (rev 18401) +++ trunk/reactos/subsys/system/cmd/readme2.txt 2005-10-10 19:08:57 UTC (rev 18402) @@ -1,19 +1,19 @@ -General Overview of How THings Work -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -First it comes into _main in cmd.c(1811). The command line params are taking in and if it is unicode it uses CommandLineToArgvW. This can cause a problem on older machines and that is why we have our own custom _CommandLineToArgvW to help this along. We pull in the launch directory as the inital dir and set that in _tchdir. We make a handle to the default console out using CreateFile. - -Then we call Initialize(). Here we need to load ntdll.dll if it isnt loaded(windows 9x machines). We also setup some gloabl vars like default io handles and nErrorLevel and set %prompt% to $P$G. This is where all command lines switches given to cmd on startup are done. - -From here main calls ProcessInput(). This is where cmd loops for getting input and doing the commands. First it checks to see if there is a batch file(note: there is agolbal struct "bc" which is NULL when not processing a batch file) and if there is it will pull a new line from that file. If not, thne it will wait for input. Currently there is some stuff for set /a in there, which might stay there or see if we can find a better spot. - -Once there is input taken in from the command line it is sent into ParseCommandLine(). In here we fist check for aliases and convert if need be. THen we look for redirections using GetRedirection() which will remove any redirection symbols. and pass back info about where to redirect. from this info it will do some switching around with the handles for where things go and send them as need be. personally i dont like this code and i tried to chnage it before but failed. it is confusing to me and i dont understand why a lot of it is there but apparently it is needed. - -It sends the new string without any redirection info into DoCommand(). In this function we just look to see what should be done. There is one of 2 things that could happen. 1) we fnd the matching command and send it off to that commands little section. 2) we dont find it so we send it to Execute() and see if it is a file that we can do something. - -Execute will try to launch the file using createprocess and falls back on shellexecute. It calls a function called SearchForExecuteable() to find the full path name and looks in all the correct locations like PATH, curreent folder, windows folder. If it cant find it, just fails and prints out a message. - -Some useful functions that are used a lot: -split() - splits a string into an array of string on spaces that arent inside quotes. which you need to call freep() on later t clean up. -IsValidPathName(), IsExistingFile(), IsExistingDirectory() - all do what you would expect. -PagePrompt() - ask them to hit a key to continue -FilePromptYN[A]() - ask them a yes or no question +General Overview of How THings Work +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +First it comes into _main in cmd.c(1811). The command line params are taking in and if it is unicode it uses CommandLineToArgvW. This can cause a problem on older machines and that is why we have our own custom _CommandLineToArgvW to help this along. We pull in the launch directory as the inital dir and set that in _tchdir. We make a handle to the default console out using CreateFile. + +Then we call Initialize(). Here we need to load ntdll.dll if it isnt loaded(windows 9x machines). We also setup some gloabl vars like default io handles and nErrorLevel and set %prompt% to $P$G. This is where all command lines switches given to cmd on startup are done. + +From here main calls ProcessInput(). This is where cmd loops for getting input and doing the commands. First it checks to see if there is a batch file(note: there is agolbal struct "bc" which is NULL when not processing a batch file) and if there is it will pull a new line from that file. If not, thne it will wait for input. Currently there is some stuff for set /a in there, which might stay there or see if we can find a better spot. + +Once there is input taken in from the command line it is sent into ParseCommandLine(). In here we fist check for aliases and convert if need be. THen we look for redirections using GetRedirection() which will remove any redirection symbols. and pass back info about where to redirect. from this info it will do some switching around with the handles for where things go and send them as need be. personally i dont like this code and i tried to chnage it before but failed. it is confusing to me and i dont understand why a lot of it is there but apparently it is needed. + +It sends the new string without any redirection info into DoCommand(). In this function we just look to see what should be done. There is one of 2 things that could happen. 1) we fnd the matching command and send it off to that commands little section. 2) we dont find it so we send it to Execute() and see if it is a file that we can do something. + +Execute will try to launch the file using createprocess and falls back on shellexecute. It calls a function called SearchForExecuteable() to find the full path name and looks in all the correct locations like PATH, curreent folder, windows folder. If it cant find it, just fails and prints out a message. + +Some useful functions that are used a lot: +split() - splits a string into an array of string on spaces that arent inside quotes. which you need to call freep() on later t clean up. +IsValidPathName(), IsExistingFile(), IsExistingDirectory() - all do what you would expect. +PagePrompt() - ask them to hit a key to continue +FilePromptYN[A]() - ask them a yes or no question Property changes on: trunk/reactos/subsys/system/cmd/readme2.txt ___________________________________________________________________ Name: svn:eol-style + native

19 years

[turner] 18401: Added a more technical readme for people that want to understand cmd.

by turner＠svn.reactos.com

Added a more technical readme for people that want to understand cmd. Modified: trunk/reactos/subsys/system/cmd/readme2.txt Modified: trunk/reactos/subsys/system/cmd/todo.txt _____ Modified: trunk/reactos/subsys/system/cmd/readme2.txt --- trunk/reactos/subsys/system/cmd/readme2.txt 2005-10-10 18:35:33 UTC (rev 18400) +++ trunk/reactos/subsys/system/cmd/readme2.txt 2005-10-10 18:57:56 UTC (rev 18401) @@ -1 +1,19 @@ -Nothing yet... \ No newline at end of file +General Overview of How THings Work +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +First it comes into _main in cmd.c(1811). The command line params are taking in and if it is unicode it uses CommandLineToArgvW. This can cause a problem on older machines and that is why we have our own custom _CommandLineToArgvW to help this along. We pull in the launch directory as the inital dir and set that in _tchdir. We make a handle to the default console out using CreateFile. + +Then we call Initialize(). Here we need to load ntdll.dll if it isnt loaded(windows 9x machines). We also setup some gloabl vars like default io handles and nErrorLevel and set %prompt% to $P$G. This is where all command lines switches given to cmd on startup are done. + +From here main calls ProcessInput(). This is where cmd loops for getting input and doing the commands. First it checks to see if there is a batch file(note: there is agolbal struct "bc" which is NULL when not processing a batch file) and if there is it will pull a new line from that file. If not, thne it will wait for input. Currently there is some stuff for set /a in there, which might stay there or see if we can find a better spot. + +Once there is input taken in from the command line it is sent into ParseCommandLine(). In here we fist check for aliases and convert if need be. THen we look for redirections using GetRedirection() which will remove any redirection symbols. and pass back info about where to redirect. from this info it will do some switching around with the handles for where things go and send them as need be. personally i dont like this code and i tried to chnage it before but failed. it is confusing to me and i dont understand why a lot of it is there but apparently it is needed. + +It sends the new string without any redirection info into DoCommand(). In this function we just look to see what should be done. There is one of 2 things that could happen. 1) we fnd the matching command and send it off to that commands little section. 2) we dont find it so we send it to Execute() and see if it is a file that we can do something. + +Execute will try to launch the file using createprocess and falls back on shellexecute. It calls a function called SearchForExecuteable() to find the full path name and looks in all the correct locations like PATH, curreent folder, windows folder. If it cant find it, just fails and prints out a message. + +Some useful functions that are used a lot: +split() - splits a string into an array of string on spaces that arent inside quotes. which you need to call freep() on later t clean up. +IsValidPathName(), IsExistingFile(), IsExistingDirectory() - all do what you would expect. +PagePrompt() - ask them to hit a key to continue +FilePromptYN[A]() - ask them a yes or no question _____ Modified: trunk/reactos/subsys/system/cmd/todo.txt --- trunk/reactos/subsys/system/cmd/todo.txt 2005-10-10 18:35:33 UTC (rev 18400) +++ trunk/reactos/subsys/system/cmd/todo.txt 2005-10-10 18:57:56 UTC (rev 18401) @@ -33,4 +33,7 @@ We need more batch files like the one Royce made for "set /a". What out for if bugs when doing this... could lead to in the wrong direction when looking for a regression. *Remove dependance on __REACTOS__ -__REACTOS__ = 0 doesnt compile and is useless. __REACTOS__ = 1 has been the default and works just fine on windows. \ No newline at end of file +__REACTOS__ = 0 doesnt compile and is useless. __REACTOS__ = 1 has been the default and works just fine on windows. + +*Add Breaker +THere is partly code in place for this already. However it is broken and not finished. PocketCMD which is open source and based off ros cmd does do this correctly though. So there is something to look at and see how it can be done. though it is hard to find where they are doing it even though they are based on eachother they look pretty different now a days. \ No newline at end of file

19 years

[gedmurphy] 18400: remove a header no longer needed too

by gedmurphy＠svn.reactos.com

remove a header no longer needed too Modified: trunk/reactos/apps/utils/net/netstat/netstat.rc _____ Modified: trunk/reactos/apps/utils/net/netstat/netstat.rc --- trunk/reactos/apps/utils/net/netstat/netstat.rc 2005-10-10 18:33:45 UTC (rev 18399) +++ trunk/reactos/apps/utils/net/netstat/netstat.rc 2005-10-10 18:35:33 UTC (rev 18400) @@ -1,9 +1,7 @@ -#include <windows.h> -#include "resource.h" - #define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 netstat\0" #define REACTOS_STR_INTERNAL_NAME "netstat\0" #define REACTOS_STR_ORIGINAL_FILENAME "netstat.exe\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Ged Murphy (gedmurphy(a)gmail.com)\0" #include <reactos/version.rc>

19 years

[gedmurphy] 18399: remove uneeded text out of the .rc file.

by gedmurphy＠svn.reactos.com

remove uneeded text out of the .rc file. Modified: trunk/reactos/apps/utils/net/netstat/netstat.rc _____ Modified: trunk/reactos/apps/utils/net/netstat/netstat.rc --- trunk/reactos/apps/utils/net/netstat/netstat.rc 2005-10-10 17:51:30 UTC (rev 18398) +++ trunk/reactos/apps/utils/net/netstat/netstat.rc 2005-10-10 18:33:45 UTC (rev 18399) @@ -1,40 +1,9 @@ -/* $Id$ */ - #include <windows.h> #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 netstat\0" -#define REACTOS_STR_INTERNAL_NAME "netstat\0" -#define REACTOS_STR_ORIGINAL_FILENAME "netstat.exe\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 netstat\0" +#define REACTOS_STR_INTERNAL_NAME "netstat\0" +#define REACTOS_STR_ORIGINAL_FILENAME "netstat.exe\0" #include <reactos/version.rc> -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -/////////////////////////////////////////////////////////////////////// ////// -// -// String Table -// - -#ifdef __GNUC__ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APP_TITLE "ReactOS netstat" - IDS_APP_USAGE "\n"\ - "Displays current TCP/IP protocol statistics and network connections.\n\n"\ - "NETSTAT [-a] [-e] [-n] [-s] [-p proto] [-r] [interval]\n\n"\ - " -a Displays all connections and listening ports.\n"\ - " -e Displays Ethernet statistics. May be combined with -s\n"\ - " -n Displays address and port numbers in numeric form.\n"\ - " -p proto Shows connections for protocol 'proto' TCP or UDP.\n"\ - " If used with the -s option to display\n"\ - " per-protocol statistics, 'proto' may be TCP, UDP, or IP.\n"\ - " -r Displays the current routing table.\n"\ - " -s Displays per-protocol statistics. Statistics are shown for\n"\ - " TCP, UDP and IP by default; use -p option to display\n"\ - " information about a subset of the protocols only.\n"\ - " interval Redisplays selected statistics every 'interval' seconds.\n"\ - " Press CTRL+C to stop redisplaying. By default netstat will\n"\ - " print the current information only once.\n" -END -#endif -

19 years

← Newer
1
...
49
50
51
52
53
54
55
...
74
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 October 2005