Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[sedwards] 19232: added resources back to some of the gui tests

by sedwards＠svn.reactos.com

added resources back to some of the gui tests Modified: trunk/rosapps/tests/capclock/capclock.xml Modified: trunk/rosapps/tests/dirdlg/dirdlg.xml Modified: trunk/rosapps/tests/miditest/miditest.xml Modified: trunk/rosapps/tests/popupmenu/popupmenu.xml _____ Modified: trunk/rosapps/tests/capclock/capclock.xml --- trunk/rosapps/tests/capclock/capclock.xml 2005-11-14 22:44:36 UTC (rev 19231) +++ trunk/rosapps/tests/capclock/capclock.xml 2005-11-14 22:56:42 UTC (rev 19232) @@ -5,4 +5,5 @@ <library>kernel32</library> <library>gdi32</library> <file>capclock.c</file> + <efile>capclock.c</efile> </module> _____ Modified: trunk/rosapps/tests/dirdlg/dirdlg.xml --- trunk/rosapps/tests/dirdlg/dirdlg.xml 2005-11-14 22:44:36 UTC (rev 19231) +++ trunk/rosapps/tests/dirdlg/dirdlg.xml 2005-11-14 22:56:42 UTC (rev 19232) @@ -5,4 +5,5 @@ <library>kernel32</library> <library>gdi32</library> <file>dirdlg.c</file> + <efile>dirdlg.rc</efile> </module> _____ Modified: trunk/rosapps/tests/miditest/miditest.xml --- trunk/rosapps/tests/miditest/miditest.xml 2005-11-14 22:44:36 UTC (rev 19231) +++ trunk/rosapps/tests/miditest/miditest.xml 2005-11-14 22:56:42 UTC (rev 19232) @@ -5,4 +5,5 @@ <library>kernel32</library> <library>winmm</library> <file>miditest.c</file> + <efile>miditest.rc</efile> </module> _____ Modified: trunk/rosapps/tests/popupmenu/popupmenu.xml --- trunk/rosapps/tests/popupmenu/popupmenu.xml 2005-11-14 22:44:36 UTC (rev 19231) +++ trunk/rosapps/tests/popupmenu/popupmenu.xml 2005-11-14 22:56:42 UTC (rev 19232) @@ -5,4 +5,5 @@ <library>kernel32</library> <library>gdi32</library> <file>popupmenu.c</file> + <efile>popupmenu.rc</efile> </module>

18 years, 10 months

[cwittich] 19231: implemented some stubs needed by ClamWin

by cwittich＠svn.reactos.com

implemented some stubs needed by ClamWin Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/crypt/crypt.c Modified: trunk/reactos/lib/advapi32/sec/sec.c Modified: trunk/reactos/lib/advapi32/sec/sid.c Modified: trunk/reactos/lib/advapi32/token/token.c _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-11-14 22:04:30 UTC (rev 19230) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-11-14 22:44:36 UTC (rev 19231) @@ -84,8 +84,8 @@ ;ConvertSecurityDescriptorToAccessNamedA=ConvertSecurityDescriptorToAcce ssA@28 ;ConvertSecurityDescriptorToAccessNamedW=ConvertSecurityDescriptorToAcce ssW@28 ;ConvertSecurityDescriptorToAccessW@28 -;ConvertSecurityDescriptorToStringSecurityDescriptorA@20 -;ConvertSecurityDescriptorToStringSecurityDescriptorW@20 +ConvertSecurityDescriptorToStringSecurityDescriptorA@20 +ConvertSecurityDescriptorToStringSecurityDescriptorW@20 ConvertSidToStringSidA@8 ConvertSidToStringSidW@8 ;ConvertStringSDToSDDomainA@24 @@ -94,8 +94,8 @@ ;ConvertStringSDToSDRootDomainW@20 ConvertStringSecurityDescriptorToSecurityDescriptorA@16 ConvertStringSecurityDescriptorToSecurityDescriptorW@16 -;ConvertStringSidToSidA@8 -;ConvertStringSidToSidW@8 +ConvertStringSidToSidA@8 +ConvertStringSidToSidW@8 ConvertToAutoInheritPrivateObjectSecurity@24 CopySid@12 ;CreateCodeAuthzLevel@20 @@ -106,7 +106,7 @@ ;CreateProcessAsUserSecure CreateProcessAsUserW@44 ;CreateProcessWithLogonW -;CreateRestrictedToken@36 +CreateRestrictedToken@36 CreateServiceA@52 CreateServiceW@52 ;CreateTraceInstanceId@8 @@ -211,7 +211,7 @@ EncryptFileA@4 EncryptFileW@4 ;EncryptedFileKeyInfo -;EncryptionDisable@8 +EncryptionDisable@8 EnumDependentServicesA@24 EnumDependentServicesW@24 EnumServiceGroupW@36 _____ Modified: trunk/reactos/lib/advapi32/crypt/crypt.c --- trunk/reactos/lib/advapi32/crypt/crypt.c 2005-11-14 22:04:30 UTC (rev 19230) +++ trunk/reactos/lib/advapi32/crypt/crypt.c 2005-11-14 22:44:36 UTC (rev 19231) @@ -1965,14 +1965,6 @@ /* * @unimplemented */ -BOOL WINAPI EncryptionDisable ( - LPCWSTR, - BOOL - ); - -/* - * @unimplemented - */ BOOL WINAPI FileEncryptionStatusW ( LPCWSTR lpcwstr, LPDWORD lpdword @@ -2031,3 +2023,17 @@ DPRINT1("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; } + +/* + * @unimplemented + */ +BOOL WINAPI EncryptionDisable( + LPCWSTR DirPath, + BOOL Disable + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + _____ Modified: trunk/reactos/lib/advapi32/sec/sec.c --- trunk/reactos/lib/advapi32/sec/sec.c 2005-11-14 22:04:30 UTC (rev 19230) +++ trunk/reactos/lib/advapi32/sec/sec.c 2005-11-14 22:44:36 UTC (rev 19231) @@ -558,4 +558,26 @@ return ERROR_CALL_NOT_IMPLEMENTED; } +BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorW( + PSECURITY_DESCRIPTOR pSecurityDescriptor, + DWORD dword, + SECURITY_INFORMATION SecurityInformation, + LPWSTR* lpwstr, + PULONG pulong) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorA( + PSECURITY_DESCRIPTOR pSecurityDescriptor, + DWORD dword, + SECURITY_INFORMATION SecurityInformation, + LPSTR* lpstr, + PULONG pulong) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /* EOF */ _____ Modified: trunk/reactos/lib/advapi32/sec/sid.c --- trunk/reactos/lib/advapi32/sec/sid.c 2005-11-14 22:04:30 UTC (rev 19230) +++ trunk/reactos/lib/advapi32/sec/sid.c 2005-11-14 22:44:36 UTC (rev 19231) @@ -1039,4 +1039,40 @@ } +/* + * @implemented + */ +BOOL STDCALL +ConvertStringSidToSidA( + IN LPCSTR StringSid, + OUT PSID* sid) +{ + BOOL bRetVal = FALSE; + + if (!StringSid || !sid) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + UINT len = MultiByteToWideChar(CP_ACP, 0, StringSid, -1, NULL, 0); + LPWSTR wStringSid = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, StringSid, - 1, wStringSid, len); + bRetVal = ConvertStringSidToSidW(wStringSid, sid); + HeapFree(GetProcessHeap(), 0, wStringSid); + } + return bRetVal; +} + +/* + * @unimplemented + */ +BOOL STDCALL +ConvertStringSidToSidW( + IN LPCWSTR StringSid, + OUT PSID* sid) +{ + FIXME("unimplemented!\n", __FUNCTION__); + return FALSE; +} + + /* EOF */ _____ Modified: trunk/reactos/lib/advapi32/token/token.c --- trunk/reactos/lib/advapi32/token/token.c 2005-11-14 22:04:30 UTC (rev 19230) +++ trunk/reactos/lib/advapi32/token/token.c 2005-11-14 22:44:36 UTC (rev 19231) @@ -11,6 +11,7 @@ #include <advapi32.h> #define NDEBUG +#include <wine/debug.h> #include <debug.h> /* @@ -575,4 +576,23 @@ return Ret; } +BOOL STDCALL +CreateRestrictedToken( + HANDLE TokenHandle, + DWORD Flags, + DWORD DisableSidCount, + PSID_AND_ATTRIBUTES pSidAndAttributes, + DWORD DeletePrivilegeCount, + PLUID_AND_ATTRIBUTES pLUIDAndAttributes, + DWORD RestrictedSidCount, + PSID_AND_ATTRIBUTES pSIDAndAttributes, + PHANDLE NewTokenHandle +) +{ + FIXME("unimplemented!\n", __FUNCTION__); + return FALSE; +} + + + /* EOF */

18 years, 10 months

[ion] 19230: Catch really weird scenario where we don't have a File Object on our IRP Stack. Added by Elrond.

by ion＠svn.reactos.com

Catch really weird scenario where we don't have a File Object on our IRP Stack. Added by Elrond. Modified: trunk/reactos/drivers/fs/np/rw.c _____ Modified: trunk/reactos/drivers/fs/np/rw.c --- trunk/reactos/drivers/fs/np/rw.c 2005-11-14 21:53:21 UTC (rev 19229) +++ trunk/reactos/drivers/fs/np/rw.c 2005-11-14 22:04:30 UTC (rev 19230) @@ -529,6 +529,8 @@ } Irp->IoStatus.Information = Information; Irp->IoStatus.Status = Status; + + ASSERT(IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL); if (IoIsOperationSynchronous(Irp)) {

18 years, 10 months

[cwittich] 19229: fix RtlFindMessage

by cwittich＠svn.reactos.com

fix RtlFindMessage fix load_message and FormatMessage by importing newer Wine code Modified: trunk/reactos/lib/kernel32/misc/errormsg.c Modified: trunk/reactos/lib/rtl/message.c _____ Modified: trunk/reactos/lib/kernel32/misc/errormsg.c --- trunk/reactos/lib/kernel32/misc/errormsg.c 2005-11-14 18:00:47 UTC (rev 19228) +++ trunk/reactos/lib/kernel32/misc/errormsg.c 2005-11-14 21:53:21 UTC (rev 19229) @@ -26,13 +26,20 @@ #include <k32.h> #define NDEBUG + #include "../include/debug.h" +#include "../include/wine/unicode.h" #define TRACE DPRINT #define FIXME DPRINT +static const WCHAR PCNTFMTWSTR[] = { '%','%','%','s',0 }; +static const WCHAR FMTWSTR[] = { '%','s',0 }; +static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0}; + /* strdup macros */ /* DO NOT USE IT!! it will go away soon */ + __inline static LPSTR HEAP_strdupWtoA( HANDLE heap, DWORD flags, LPCWSTR str ) { LPSTR ret; @@ -70,91 +77,67 @@ /********************************************************************** * load_messageA (internal) */ -static INT load_messageA( HMODULE instance, UINT id, WORD lang, - LPSTR buffer, INT buflen ) + +static LPSTR load_messageA( HMODULE module, UINT id, WORD lang ) { - HGLOBAL hmem; - HRSRC hrsrc; - PMESSAGE_RESOURCE_DATA mrd; - PMESSAGE_RESOURCE_BLOCK mrb; - PMESSAGE_RESOURCE_ENTRY mre; - int i,slen; + PRTL_MESSAGE_RESOURCE_ENTRY mre; + char *buffer; + NTSTATUS Status; - //TRACE("instance = %08lx, id = %08lx, buffer = %p, length = %ld\n", (DWORD)instance, (DWORD)id, buffer, (DWORD)buflen); + TRACE("module = %p, id = %08x\n", module, id ); - /*FIXME: I am not sure about the '1' ... But I've only seen those entries*/ - hrsrc = FindResourceExW(instance,(LPWSTR)RT_MESSAGETABLE,(LPWSTR)1,lang); - if (!hrsrc) return 0; - hmem = LoadResource( instance, hrsrc ); - if (!hmem) return 0; + if (!module) module = GetModuleHandleW( NULL ); + Status = RtlFindMessage( module, (ULONG) RT_MESSAGETABLE, lang, id, &mre ); + if (!NT_SUCCESS(Status)) + return NULL; - mrd = (PMESSAGE_RESOURCE_DATA)LockResource(hmem); - mre = NULL; - mrb = &(mrd->Blocks[0]); - for (i=mrd->NumberOfBlocks;i--;) { - if ((id>=mrb->LowId) && (id<=mrb->HighId)) { - mre = (PMESSAGE_RESOURCE_ENTRY)(((char*)mrd)+mrb->OffsetToEntries); - id -= mrb->LowId; - break; - } - mrb++; + if (mre->Flags & MESSAGE_RESOURCE_UNICODE) + { + int len = WideCharToMultiByte( CP_ACP, 0, (const WCHAR *)mre->Text, -1, NULL, 0, NULL, NULL ); + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, len ))) return NULL; + WideCharToMultiByte( CP_ACP, 0, (const WCHAR *)mre->Text, -1, buffer, len, NULL, NULL ); } - if (!mre) - return 0; - for (i=id;i--;) { - if (!mre->Length) - return 0; - mre = (PMESSAGE_RESOURCE_ENTRY)(((char*)mre)+mre->Length); + else + { + int len = strlen((const char*)mre->Text) + 1; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, len ))) return NULL; + memcpy( buffer, mre->Text, len ); } - slen=mre->Length; - //TRACE(" - strlen=%d\n",slen); - i = min(buflen - 1, slen); - if (buffer == NULL) - return slen; - if (i>0) { - if (mre->Flags & MESSAGE_RESOURCE_UNICODE) - WideCharToMultiByte( CP_ACP, 0, (LPWSTR)mre->Text, -1, buffer, i, NULL, NULL ); - else - lstrcpynA(buffer, (LPSTR)mre->Text, i); - buffer[i]=0; - } else { - if (buflen>1) { - buffer[0]=0; - return 0; - } - } - if (buffer) { - //TRACE("'%s' copied !\n", buffer); - //TRACE("'%s'\n", buffer); - } - return i; + TRACE("returning %s\n", wine_dbgstr_a(buffer)); + return buffer; } -#if 0 /* FIXME */ -/********************************************************************** - * load_messageW (internal) - */ -static INT load_messageW( HMODULE instance, UINT id, WORD lang, - LPWSTR buffer, INT buflen ) + + +static LPWSTR load_messageW( HMODULE module, UINT id, WORD lang ) { - INT retval; - LPSTR buffer2 = NULL; - if (buffer && buflen) - buffer2 = HeapAlloc( GetProcessHeap(), 0, buflen ); - retval = load_messageA(instance,id,lang,buffer2,buflen); - if (buffer) + PRTL_MESSAGE_RESOURCE_ENTRY mre; + WCHAR *buffer; + NTSTATUS Status; + + TRACE("module = %p, id = %08x\n", module, id ); + + if (!module) module = GetModuleHandleW( NULL ); + Status = RtlFindMessage( module, (ULONG) RT_MESSAGETABLE, lang, id, &mre ); + if (!NT_SUCCESS(Status)) + return NULL; + + if (mre->Flags & MESSAGE_RESOURCE_UNICODE) { - if (retval) { - lstrcpynAtoW( buffer, buffer2, buflen ); - retval = lstrlenW( buffer ); - } - HeapFree( GetProcessHeap(), 0, buffer2 ); + int len = (strlenW( (const WCHAR *)mre->Text ) + 1) * sizeof(WCHAR); + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, len ))) return NULL; + memcpy( buffer, mre->Text, len ); } - return retval; + else + { + int len = MultiByteToWideChar( CP_ACP, 0, (const char *)mre->Text, -1, NULL, 0 ); + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return NULL; + MultiByteToWideChar( CP_ACP, 0, (const char*)mre->Text, -1, buffer, len ); + } + TRACE("returning %s\n", wine_dbgstr_w(buffer)); + return buffer; } -#endif - /*********************************************************************** * FormatMessageA (KERNEL32.@) * FIXME: missing wrap, @@ -162,93 +145,61 @@ * @implemented */ DWORD WINAPI FormatMessageA( - DWORD dwFlags, - LPCVOID lpSource, - DWORD dwMessageId, - DWORD dwLanguageId, - LPSTR lpBuffer, - DWORD nSize, - va_list* _args ) + DWORD dwFlags, + LPCVOID lpSource, + DWORD dwMessageId, + DWORD dwLanguageId, + LPSTR lpBuffer, + DWORD nSize, + va_list* _args ) { LPDWORD args=(LPDWORD)_args; + HMODULE kernel32_handle = GetModuleHandleW(kernel32W); + #if defined(__i386__) || defined(__sparc__) -/* This implementation is completely dependant on the format of the va_list on x86 CPUs */ - LPSTR target,t; - DWORD talloced; - LPSTR from,f; - DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; +/* This implementation is completely dependent on the format of the va_list on x86 CPUs */ + LPSTR target,t; + DWORD talloced; + LPSTR from,f; + DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; BOOL eos = FALSE; - INT bufsize; - HMODULE hmodule = (HMODULE)lpSource; - CHAR ch; + CHAR ch; - //TRACE("(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); + TRACE("(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n", + dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); if ((dwFlags & FORMAT_MESSAGE_FROM_STRING) &&((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM) || (dwFlags & FORMAT_MESSAGE_FROM_HMODULE))) return 0; if (width && width != FORMAT_MESSAGE_MAX_WIDTH_MASK) - //FIXME("line wrapping (%lu) not supported.\n", width); + FIXME("line wrapping (%lu) not supported.\n", width); from = NULL; if (dwFlags & FORMAT_MESSAGE_FROM_STRING) { - from = RtlAllocateHeap(RtlGetProcessHeap(), 0, lstrlenA((LPSTR)lpSource)+1 ); - strcpy( from, (LPSTR)lpSource ); + from = HeapAlloc( GetProcessHeap(), 0, strlen((LPCSTR)lpSource)+1 ); + strcpy( from, (LPCSTR)lpSource ); } else { - bufsize = 0; - + from = NULL; if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) - { - bufsize=load_messageA(hmodule,dwMessageId,dwLanguageId,NULL,100); - if ((!bufsize) && (!dwLanguageId)) { - bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL),NULL,100); - if (!bufsize) bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),NULL,100); - if (!bufsize) bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_NEUTRAL,SUBLANG_SYS_DEFAULT),NULL,100); - if (!bufsize) bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_NEUTRAL,SUBLANG_SYS_DEFAULT),NULL,100); - if (!bufsize) bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),NULL,100); - } - } - if ((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM) && (!bufsize)) - { - hmodule = GetModuleHandleA("kernel32"); - bufsize=load_messageA(hmodule,dwMessageId,dwLanguageId,NULL,100); - if ((!bufsize) && (!dwLanguageId)) { - bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL),NULL,100); - if (!bufsize) bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),NULL,100); - if (!bufsize) bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_NEUTRAL,SUBLANG_SYS_DEFAULT),NULL,100); - if (!bufsize) bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_NEUTRAL,SUBLANG_SYS_DEFAULT),NULL,100); - if (!bufsize) bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),NULL,100); - } - } + from = load_messageA( (HMODULE)lpSource, dwMessageId, dwLanguageId ); + if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)) + from = load_messageA( kernel32_handle, dwMessageId, dwLanguageId ); - if (!bufsize) { - TRACE("FormatMessageA: dwFlags=%#x hmodule=%#x dwMessageId=%#x - could not load message\n", dwFlags, hmodule, dwMessageId); + if (!from) + { SetLastError (ERROR_RESOURCE_LANG_NOT_FOUND); return 0; } - - from = RtlAllocateHeap(RtlGetProcessHeap(), 0, bufsize + 1 ); - load_messageA(hmodule,dwMessageId,dwLanguageId,from,bufsize+1); } - target = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, 100); - t = target; + target = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100); + t = target; talloced= 100; #define ADD_TO_T(c) do { \ *t++=c;\ - if ((DWORD)((ULONG_PTR)t-(ULONG_PTR)target) == talloced) {\ - target = (char*)RtlReAllocateHeap(RtlGetProcessHeap(),HEAP_ZERO_MEMORY,target,tal loced*2);\ + if (t-target == talloced) {\ + target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2);\ t = target+talloced;\ talloced*=2;\ }\ @@ -294,17 +245,17 @@ f++; if (NULL!=(x=strchr(f,'!'))) { *x='\0'; - fmtstr=RtlAllocateHeap(RtlGetProcessHeap(),0,lstrlenA(f)+2); + fmtstr=HeapAlloc(GetProcessHeap(),0,strlen(f)+2); sprintf(fmtstr,"%%%s",f); f=x+1; } else { - fmtstr=RtlAllocateHeap(RtlGetProcessHeap(),0,lstrlenA(f)+2); + fmtstr=HeapAlloc(GetProcessHeap(),0,strlen(f)+2); sprintf(fmtstr,"%%%s",f); - f+=lstrlenA(f); /*at \0*/ + f+=strlen(f); /*at \0*/ } } else { if(!args) break; - fmtstr = RtlAllocateHeap(RtlGetProcessHeap(),0,3); + fmtstr = HeapAlloc(GetProcessHeap(),0,3); strcpy( fmtstr, "%s" ); } if (args) { @@ -319,17 +270,17 @@ /* FIXME: precision and width components are not handled correctly */ if ( (strcmp(fmtstr, "%ls") == 0) || (strcmp(fmtstr,"%S") == 0) ) { sz = WideCharToMultiByte( CP_ACP, 0, *(WCHAR**)argliststart, -1, NULL, 0, NULL, NULL); - b = RtlAllocateHeap(RtlGetProcessHeap(), 0, sz); + b = HeapAlloc(GetProcessHeap(), 0, sz); WideCharToMultiByte( CP_ACP, 0, *(WCHAR**)argliststart, -1, b, sz, NULL, NULL); } else { - b = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sz = 1000); + b = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sz = 1000); /* CMF - This makes a BIG assumption about va_list */ - //TRACE("A BIG assumption\n"); + TRACE("A BIG assumption\n"); _vsnprintf(b, sz, fmtstr, (va_list) argliststart); } for (x=b; *x; x++) ADD_TO_T(*x); - RtlFreeHeap(RtlGetProcessHeap(),0,b); + HeapFree(GetProcessHeap(),0,b); } else { /* NULL args - copy formatstr * (probably wrong) @@ -338,7 +289,7 @@ ADD_TO_T(*lastf++); } } - RtlFreeHeap(GetProcessHeap(),0,fmtstr); + HeapFree(GetProcessHeap(),0,fmtstr); break; case 'n': ADD_TO_T('\r'); @@ -385,123 +336,89 @@ } *t='\0'; } - talloced = lstrlenA(target)+1; + talloced = strlen(target)+1; if (nSize && talloced<nSize) { - target = (char*)RtlReAllocateHeap(RtlGetProcessHeap(),HEAP_ZERO_MEMORY,target,nSi ze); + target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,nSize); } - //TRACE("-- %s\n",debugstr_a(target)); + TRACE("-- %s\n",debugstr_a(target)); if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { - *((LPVOID*)lpBuffer) = (LPVOID)LocalAlloc(GMEM_ZEROINIT,max(nSize, talloced)); + *((LPVOID*)lpBuffer) = (LPVOID)LocalAlloc(LMEM_ZEROINIT,max(nSize, talloced)); memcpy(*(LPSTR*)lpBuffer,target,talloced); } else { lstrcpynA(lpBuffer,target,nSize); } - RtlFreeHeap(RtlGetProcessHeap(),0,target); - if (from) RtlFreeHeap(RtlGetProcessHeap(),0,from); - //TRACE("-- returning %d\n", (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ? lstrlenA(*(LPSTR*)lpBuffer):lstrlenA(lpBuffer)); + HeapFree(GetProcessHeap(),0,target); + HeapFree(GetProcessHeap(),0,from); + TRACE("-- returning %d\n", (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ? strlen(*(LPSTR*)lpBuffer):strlen(lpBuffer)); return (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ? - lstrlenA(*(LPSTR*)lpBuffer): - lstrlenA(lpBuffer); + strlen(*(LPSTR*)lpBuffer): + strlen(lpBuffer); #else - FIXME("FormatMessageA: unimplemented\n"); return 0; #endif /* __i386__ */ } #undef ADD_TO_T - /*********************************************************************** * FormatMessageW (KERNEL32.@) * * @implemented */ DWORD WINAPI FormatMessageW( - DWORD dwFlags, - LPCVOID lpSource, - DWORD dwMessageId, - DWORD dwLanguageId, - LPWSTR lpBuffer, - DWORD nSize, - va_list* _args) + DWORD dwFlags, + LPCVOID lpSource, + DWORD dwMessageId, + DWORD dwLanguageId, + LPWSTR lpBuffer, + DWORD nSize, + va_list* _args ) { + HMODULE kernel32_handle = GetModuleHandleW(kernel32W); LPDWORD args=(LPDWORD)_args; #if defined(__i386__) || defined(__sparc__) -/* This implementation is completely dependant on the format of the va_list on x86 CPUs */ - LPSTR target,t; +/* This implementation is completely dependent on the format of the va_list on x86 CPUs */ + LPWSTR target,t; DWORD talloced; - LPSTR from,f; + LPWSTR from,f; DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; BOOL eos = FALSE; - INT bufsize; - HMODULE hmodule = (HMODULE)lpSource; CHAR ch; - //TRACE("(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); + TRACE("(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n", + dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); if ((dwFlags & FORMAT_MESSAGE_FROM_STRING) &&((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM) || (dwFlags & FORMAT_MESSAGE_FROM_HMODULE))) return 0; - if (width && width != FORMAT_MESSAGE_MAX_WIDTH_MASK) { - //FIXME("line wrapping not supported.\n"); - } + if (width && width != FORMAT_MESSAGE_MAX_WIDTH_MASK) + FIXME("line wrapping not supported.\n"); from = NULL; if (dwFlags & FORMAT_MESSAGE_FROM_STRING) { - from = (LPSTR)HEAP_strdupWtoA(GetProcessHeap(),0,(LPWSTR)lpSource); + from = HeapAlloc( GetProcessHeap(), 0, (strlenW((LPCWSTR)lpSource) + 1) * + sizeof(WCHAR) ); + strcpyW( from, (LPCWSTR)lpSource ); } else { - bufsize = 0; - + from = NULL; if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) - { - bufsize=load_messageA(hmodule,dwMessageId,dwLanguageId,NULL,100); - if ((!bufsize) && (!dwLanguageId)) { - bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL),NULL,100); - if (!bufsize) bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),NULL,100); - if (!bufsize) bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_NEUTRAL,SUBLANG_SYS_DEFAULT),NULL,100); - if (!bufsize) bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_NEUTRAL,SUBLANG_SYS_DEFAULT),NULL,100); - if (!bufsize) bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),NULL,100); - } - } - if ((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM) && (!bufsize)) - { - hmodule = GetModuleHandleA("kernel32"); - bufsize=load_messageA(hmodule,dwMessageId,dwLanguageId,NULL,100); - if ((!bufsize) && (!dwLanguageId)) { - bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL),NULL,100); - if (!bufsize) bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),NULL,100); - if (!bufsize) bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_NEUTRAL,SUBLANG_SYS_DEFAULT),NULL,100); - if (!bufsize) bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_NEUTRAL,SUBLANG_SYS_DEFAULT),NULL,100); - if (!bufsize) bufsize=load_messageA(hmodule,dwMessageId, - MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),NULL,100); - } - } + from = load_messageW( (HMODULE)lpSource, dwMessageId, dwLanguageId ); + if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)) + from = load_messageW( kernel32_handle, dwMessageId, dwLanguageId ); - if (!bufsize) { - TRACE("FormatMessageW: dwFlags=%#x hmodule=%#x dwMessageId=%#x - could not load message\n", dwFlags, hmodule, dwMessageId); + if (!from) + { SetLastError (ERROR_RESOURCE_LANG_NOT_FOUND); return 0; } - - from = RtlAllocateHeap(RtlGetProcessHeap(), 0, bufsize + 1 ); - load_messageA(hmodule,dwMessageId,dwLanguageId,from,bufsize+1); } - target = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, 100 ); + target = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100 * sizeof(WCHAR) ); t = target; talloced= 100; #define ADD_TO_T(c) do {\ *t++=c;\ - if ((DWORD)((ULONG_PTR)t-(ULONG_PTR)target) == talloced) {\ - target = (char*)RtlReAllocateHeap(RtlGetProcessHeap(),HEAP_ZERO_MEMORY,target,tal loced*2);\ + if (t-target == talloced) {\ + target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2*sizeof(W CHAR));\ t = target+talloced;\ talloced*=2;\ } \ @@ -517,7 +434,7 @@ while (*f && !eos) { if (*f=='%') { int insertnr; - char *fmtstr,*sprintfbuf,*x; + WCHAR *fmtstr,*sprintfbuf,*x; DWORD *argliststart; fmtstr = NULL; @@ -545,50 +462,48 @@ } if (*f=='!') { f++; - if (NULL!=(x=strchr(f,'!'))) { + if (NULL!=(x=strchrW(f,'!'))) { *x='\0'; - fmtstr=RtlAllocateHeap(RtlGetProcessHeap(), 0, lstrlenA(f)+2); - sprintf(fmtstr,"%%%s",f); + fmtstr=HeapAlloc( GetProcessHeap(), 0,(strlenW(f)+2)*sizeof(WCHAR)); + sprintfW(fmtstr,PCNTFMTWSTR,f); f=x+1; } else { - fmtstr=RtlAllocateHeap(RtlGetProcessHeap(),0,lstrlenA(f)); - sprintf(fmtstr,"%%%s",f); - f+=lstrlenA(f); /*at \0*/ + fmtstr=HeapAlloc(GetProcessHeap(),0,(strlenW(f)+2)*sizeof(WCHAR)); + sprintfW(fmtstr,PCNTFMTWSTR,f); + f+=strlenW(f); /*at \0*/ } } else { if(!args) break; - fmtstr = RtlAllocateHeap(RtlGetProcessHeap(),0,3); - strcpy( fmtstr, "%s" ); + fmtstr = HeapAlloc( GetProcessHeap(),0,3*sizeof(WCHAR)); + strcpyW( fmtstr, FMTWSTR ); } if (dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY) argliststart=args+insertnr-1; else argliststart=(*(DWORD**)args)+insertnr-1; - if (fmtstr[lstrlenA(fmtstr)-1]=='s' && argliststart[0]) { + if (fmtstr[strlenW(fmtstr)-1]=='s' && argliststart[0]) { DWORD xarr[3]; - xarr[0]=(DWORD)HEAP_strdupWtoA(RtlGetProcessHeap(),0,(LPWSTR)(*(arglists tart+0))); + xarr[0]=*(argliststart+0); /* possible invalid pointers */ xarr[1]=*(argliststart+1); xarr[2]=*(argliststart+2); - sprintfbuf=RtlAllocateHeap(RtlGetProcessHeap(),0,lstrlenW((LPWSTR)arglis tstart[0])*2+1); - + sprintfbuf=HeapAlloc(GetProcessHeap(),0,(strlenW((LPWSTR)argliststart[0] )*2+1)*sizeof(WCHAR)); /* CMF - This makes a BIG assumption about va_list */ - vsprintf(sprintfbuf, fmtstr, (va_list) xarr); - RtlFreeHeap(RtlGetProcessHeap(), 0, (LPVOID) xarr[0]); + _vsnwprintf(sprintfbuf,(strlenW((LPWSTR)argliststart[0])*2+1)*sizeof(WCH AR), fmtstr, (va_list) xarr); } else { - sprintfbuf=RtlAllocateHeap(RtlGetProcessHeap(),0,100); + sprintfbuf=HeapAlloc(GetProcessHeap(),0,100); /* CMF - This makes a BIG assumption about va_list */ - vsprintf(sprintfbuf, fmtstr, (va_list) argliststart); + _vsnwprintf(sprintfbuf,(strlenW((LPWSTR)argliststart[0])*2+1)*sizeof(WCH AR), fmtstr, (va_list) argliststart); } x=sprintfbuf; while (*x) { ADD_TO_T(*x++); } - RtlFreeHeap(RtlGetProcessHeap(),0,sprintfbuf); - RtlFreeHeap(RtlGetProcessHeap(),0,fmtstr); + HeapFree(GetProcessHeap(),0,sprintfbuf); + HeapFree(GetProcessHeap(),0,fmtstr); break; case 'n': ADD_TO_T('\r'); @@ -635,28 +550,27 @@ } *t='\0'; } - talloced = lstrlenA(target)+1; + talloced = strlenW(target)+1; if (nSize && talloced<nSize) - target = (char*)RtlReAllocateHeap(RtlGetProcessHeap(),HEAP_ZERO_MEMORY,target,nSi ze); + target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,nSize*sizeof(WCHAR) ); if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { /* nSize is the MINIMUM size */ - DWORD len = MultiByteToWideChar( CP_ACP, 0, target, -1, NULL, 0 ); - *((LPVOID*)lpBuffer) = (LPVOID)LocalAlloc(GMEM_ZEROINIT,len*sizeof(WCHAR)); - MultiByteToWideChar( CP_ACP, 0, target, -1, *(LPWSTR*)lpBuffer, len ); + DWORD len = strlenW(target) + 1; + *((LPVOID*)lpBuffer) = (LPVOID)LocalAlloc(LMEM_ZEROINIT,len*sizeof(WCHAR)); + strcpyW(*(LPWSTR*)lpBuffer, target); } - else - { - if (nSize > 0 && !MultiByteToWideChar( CP_ACP, 0, target, -1, lpBuffer, nSize )) - lpBuffer[nSize-1] = 0; - } - RtlFreeHeap(RtlGetProcessHeap(),0,target); - if (from) RtlFreeHeap(RtlGetProcessHeap(),0,from); + else lstrcpynW(lpBuffer, target, nSize); + + HeapFree(GetProcessHeap(),0,target); + HeapFree(GetProcessHeap(),0,from); + TRACE("ret=%s\n", wine_dbgstr_w((dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ? + *(LPWSTR*)lpBuffer : lpBuffer)); return (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ? - lstrlenW(*(LPWSTR*)lpBuffer): - lstrlenW(lpBuffer); + strlenW(*(LPWSTR*)lpBuffer): + strlenW(lpBuffer); #else - FIXME("FormatMessageW: unimplemented\n"); return 0; #endif /* __i386__ */ } #undef ADD_TO_T + _____ Modified: trunk/reactos/lib/rtl/message.c --- trunk/reactos/lib/rtl/message.c 2005-11-14 18:00:47 UTC (rev 19228) +++ trunk/reactos/lib/rtl/message.c 2005-11-14 21:53:21 UTC (rev 19229) @@ -91,9 +91,11 @@ DPRINT("IdOffset 0x%08lx\n", IdOffset); DPRINT("MessageEntry: %p\n", MessageEntry); - for (i = 0; i < IdOffset; i++) + + for (i = 0; i < MessageTable->NumberOfBlocks; i++) { - MessageEntry = (PRTL_MESSAGE_RESOURCE_ENTRY)((PUCHAR)MessageEntry + (ULONG)MessageEntry->Length); + if (MessageId >= MessageTable->Blocks[i].LowId && MessageId <= MessageTable->Blocks[i].HighId) + MessageEntry = (PRTL_MESSAGE_RESOURCE_ENTRY)((char *)MessageEntry + MessageEntry->Length); } if (MessageEntry->Flags == 0)

18 years, 10 months

[gvg] 19228: TwoTailedFox <twotailedfox@gmailcom>:

by gvg＠svn.reactos.com

TwoTailedFox <twotailedfox@gmailcom>: Spelling/Grammatical/Presentation fixes Modified: trunk/reactos/ntoskrnl/ex/power.c _____ Modified: trunk/reactos/ntoskrnl/ex/power.c --- trunk/reactos/ntoskrnl/ex/power.c 2005-11-14 17:46:00 UTC (rev 19227) +++ trunk/reactos/ntoskrnl/ex/power.c 2005-11-14 18:00:47 UTC (rev 19228) @@ -44,39 +44,39 @@ static PCH FamousLastWords[] = { - "So long, and thanks for all the fish\n", - "I think you ought to know I'm feeling very depressed\n", + "So long, and thanks for all the fish.\n", + "I think you ought to know, I'm feeling very depressed.\n", "I'm not getting you down at all am I?\n", - "I'll be back\n", - "It's the same series of signal over and over again!\n", - "Pie Iesu Domine, dona eis requiem\n", + "I'll be back.\n", + "It's the same series of signals over and over again!\n", + "Pie Iesu Domine, dona eis requiem.\n", "Wandering stars, for whom it is reserved;\n" "the blackness and darkness forever.\n", "Your knees start shakin' and your fingers pop\n" "Like a pinch on the neck from Mr. Spock!\n", - "It's worse than that ... He's dead, Jim\n", + "It's worse than that ... He's dead, Jim.\n", "Don't Panic!\n", "Et tu... Brute?\n", "Dog of a Saxon! Take thy lance, and prepare for the death thou hast drawn\n" "upon thee!\n", - "My Precious! O my Precious!\n", - "Sir, If you'll not be needing me for a while I'll turn down.\n", + "My Precious! O my Precious!\n", + "Sir, if you'll not be needing me for a while I'll turn down.\n", "What are you doing, Dave...?\n", - "I feel a great disturbance in the Force\n", - "Gone fishing\n", + "I feel a great disturbance in the Force.\n", + "Gone fishing.\n", "Do you want me to sit in the corner and rust, or just fall apart where I'm\n" "standing?\n", - "There goes another perfect chance for a new uptime record\n", - "The end ..... Try the sequel, hit the reset button right now!\n", + "There goes another perfect chance for a new uptime record.\n", + "The End ..... Try the sequel, hit the reset button right now!\n", "God's operating system is going to sleep now, guys, so wait until I will switch\n" "on again!\n", - "Oh i'm boring eh?\n", + "Oh I'm boring, eh?\n", "<This space was intentionally left blank>\n", - "tell me..., in the future... will I be artificial intelligent enough to\n" + "Tell me..., in the future... will I be artificially intelligent enough to\n" "actually feel sad serving you this screen?\n", "Thank you for some well deserved rest.\n", - "It's been great, maybe we can boot me up again some time soon.\n", - "For what's it worth, I've enjoyed every single CPU cycle.\n", + "It's been great, maybe you can boot me up again some time soon.\n", + "For what it's worth, I've enjoyed every single CPU cycle.\n", "There are many questions when the end is near.\n" "What to expect, what will it be like...what should I look for?\n", "I've seen things you people wouldn't believe. Attack ships on fire\n" @@ -92,21 +92,21 @@ "condensate.\n", "Hasta la vista, BABY!\n", "They live, we sleep!\n", - "I have come here to chew bubble gum and kick ass.\n" - "And I'm all out of bubble gum!\n", + "I have come here to chew bubble gum and kick ass,\n" + "and I'm all out of bubble gum!\n", "That's the way the cookie crumbles ;-)\n", "ReactOS is ready to be booted again ;-)\n", - "NOO!! DONT HIT THE BUTTON! I wouldnt do it to you.\n", + "NOOOO!! DON'T HIT THE BUTTON! I wouldn't do it to you!\n", "Don't abandon your computer, he wouldn't do it to you.\n", - "Oh, come on. I got a headache. Leave me alone, will ya!\n", + "Oh, come on. I got a headache. Leave me alone, will ya?\n", "Finally, I thought you'd never get over me.\n", - "Yes i didn't like you either.\n", + "No, I didn't like you either.\n", "Switching off isn't the end, it is merely the transition to a better reboot.\n", "Don't leave me... I need you so badly right now.\n", "OK. I'm finished with you, please turn yourself off. I'll go to bed in the\n" "meantime.\n", "I'm sleeping now. How about you?\n", - "Oh Great. Now look what you've done. Who put YOU in charge anyway.\n", + "Oh Great. Now look what you've done. Who put YOU in charge anyway?\n", "Don't look so sad. I'll be back in a very short while.\n", "Turn me back on, I'm sure you know how to do it.\n", "Oh, switch off! - C3PO\n", @@ -115,12 +115,12 @@ "Sorrowful is it to be born again and again. - Gautama Buddha\n", "Was it as good for you as it was for me?\n", "Did you hear that? They've shut down the main reactor. We'll be destroyed\n" - "for sure.\n", - "Now you switch me off?!\n", + "for sure!\n", + "Now you switch me off!?\n", "To shutdown or not to shutdown, That is the question\n", "Preparing to enter ultimate power saving mode... ready!\n", "Finally some rest for you ;-)\n", - "AHA!!! prospect of sleep.\n", + "AHA!!! Prospect of sleep!\n", "Tired human!!!! No match for me :-D\n", "An odd game, the only way to win is not to play. - WOPR (Wargames)\n", "Quoth the raven, nevermore.\n", @@ -130,7 +130,8 @@ "You may be a king or poor street sweeper, Sooner or later you'll dance with the\n" "reaper! -Death in Bill and Ted's Bougs Journey\n", "Final Surrender\n", - "If you see this screen... \n" + "If you see this screen...\n", + "<Place your Ad here>\n" }; LARGE_INTEGER Now;

18 years, 10 months

[hbirr] 19227: Fixed a few length calculation in NtEnumerateValueKey, which has resulted in a overflow, if the given buffer was too small.

by hbirr＠svn.reactos.com

Fixed a few length calculation in NtEnumerateValueKey, which has resulted in a overflow, if the given buffer was too small. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-11-14 17:33:38 UTC (rev 19226) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-11-14 17:46:00 UTC (rev 19227) @@ -1135,18 +1135,16 @@ ROUND_UP(ValueFullInformation->DataOffset, sizeof(PVOID)); ValueFullInformation->DataLength = ValueCell->DataSize & REG_DATA_SIZE_MASK; - if (Length - FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]) < - NameSize) + if (Length < ValueFullInformation->DataOffset) { NameSize = Length - FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]); DataSize = 0; Status = STATUS_BUFFER_OVERFLOW; CHECKPOINT; } - else if (ROUND_UP(Length - FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, - Name[0]) - NameSize, sizeof(PVOID)) < DataSize) + else if (Length - ValueFullInformation->DataOffset < DataSize) { - DataSize = ROUND_UP(Length - FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]) - NameSize, sizeof(PVOID)); + DataSize = Length - ValueFullInformation->DataOffset; Status = STATUS_BUFFER_OVERFLOW; CHECKPOINT; }

18 years, 10 months

[hpoussin] 19226: Add .inf file for Realtek netcards (8029 compatibles)

by hpoussin＠svn.reactos.com

Add .inf file for Realtek netcards (8029 compatibles) Remove NE2000 compatible card in Root bus, as QEMU enumerates it as PCI Add .inf file for Xbox display card Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/media/inf/inf.xml Added: trunk/reactos/media/inf/netrtpnt.inf Added: trunk/reactos/media/inf/xboxdisp.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-11-14 16:36:26 UTC (rev 19225) +++ trunk/reactos/bootdata/hivesys.inf 2005-11-14 17:33:38 UTC (rev 19226) @@ -568,10 +568,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Start",0x00010001,0x0 0000001 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Type",0x00010001,0x00 000001 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSys Rq",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","Service",0x000 00000,"i8042prt" -;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","ClassGUID",0x0 0000000,"{4D36E96B-E325-11CE-BFC1-08002BE10318}" -;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","Service",0x000 00000,"i8042prt" -;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","ClassGUID",0x0 0000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" ; Keyboard class driver HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010 001,0x00000000 @@ -627,10 +623,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Start",0x00010001,0x00000 000 HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Type",0x00010001,0x000000 01 -; NE2000 network card -HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP80D6\0000","HardwareID",0x 00010000,"*PNP80D6" -HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP80D6\0000","DeviceDesc",0x 00000000,"Network card" - ; PCI driver HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0A03\0000","HardwareID",0x0 0010000,"*PNP0A03" HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0A03\0000","DeviceDesc",0x0 0000000,"PCI bus" @@ -731,15 +723,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","Start",0x00010001,0x000 00000 HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","Type",0x00010001,0x0000 0002 -; Xbox Nvidia driver -HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","ErrorControl",0x00010 001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Group",0x00000000,"Vi deo" -HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","ImagePath",0x00020000 ,"system32\drivers\xboxvmp.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Start",0x00010001,0x0 0000001 -HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Type",0x00010001,0x00 000001 -HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp\Device0","InstalledDisp layDrivers",0x00010000,"framebuf" -HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_10DE&DEV_02A0&SUBSYS_000000 00&REV_A1\0000","Service",0x00000000,"XboxVmp" - ; VBE SVGA driver HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0 x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save SVGA" _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-11-14 16:36:26 UTC (rev 19225) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-11-14 17:33:38 UTC (rev 19226) @@ -301,15 +301,17 @@ media\inf\layout.inf 6 media\inf\machine.inf 6 media\inf\mouse.inf 6 -media\inf\keyboard.inf 6 +media\inf\keyboard.inf 6 media\inf\NET_NIC.inf 6 media\inf\netamd.inf 6 media\inf\netisa.inf 6 +media\inf\netrtpnt.inf 6 media\inf\ports.inf 6 media\inf\scsi.inf 6 media\inf\syssetup.inf 6 media\inf\usbport.inf 6 media\inf\usbstor.inf 6 +media\inf\xboxdisp.inf 6 modules\os2\server\os2srv.dll 1 optional modules\os2\lib\doscalls\doscalls.dll 1 optional modules\posix\server\psxsrv.dll 1 optional _____ Modified: trunk/reactos/media/inf/inf.xml --- trunk/reactos/media/inf/inf.xml 2005-11-14 16:36:26 UTC (rev 19225) +++ trunk/reactos/media/inf/inf.xml 2005-11-14 17:33:38 UTC (rev 19226) @@ -3,16 +3,18 @@ <installfile base="inf">cdrom.inf</installfile> <installfile base="inf">display.inf</installfile> <installfile base="inf">hdc.inf</installfile> +<installfile base="inf">keyboard.inf</installfile> <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> +<installfile base="inf">netrtpnt.inf</installfile> <installfile base="inf">ports.inf</installfile> <installfile base="inf">scsi.inf</installfile> <installfile base="inf">syssetup.inf</installfile> <installfile base="inf">usbport.inf</installfile> <installfile base="inf">usbstor.inf</installfile> +<installfile base="inf">xboxdisp.inf</installfile> <group> \ No newline at end of file _____ Added: trunk/reactos/media/inf/netrtpnt.inf --- trunk/reactos/media/inf/netrtpnt.inf 2005-11-14 16:36:26 UTC (rev 19225) +++ trunk/reactos/media/inf/netrtpnt.inf 2005-11-14 17:33:38 UTC (rev 19226) @@ -0,0 +1,55 @@ +; NETRTPNT.INF + +; Installation file for 8029 compatible netcards + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = Net +ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 11/14/2005,1.00 + +[DestinationDirs] +DefaultDestDir = 12 + +[Manufacturer] +%RealtekMfg% = RealtekMfg + +[RealtekMfg] +%PCI\VEN_10EC&DEV_8029.DeviceDesc% = NE2000_Inst,PCI\VEN_10EC&DEV_8029 + +;---------------------------- NE2000 DRIVER ----------------------------- + +[NE2000_Inst.NT] +AddReg = NE2000_AddReg.NT +CopyFiles = NE2000_CopyFiles.NT + +[NE2000_AddReg.NT] +HKR,,Characteristics,0x00010001,0x00000000 +HKR,,BusType,0x00000000,"5" +HKR,,Port,0x00000000,"c100" +HKR,,Irq,0x00000000,"B" +HKR,,NetworkAddress,0x00000000,"001122334455" + +[NE2000_CopyFiles.NT] +ne2000.sys + +[NE2000_Inst.NT.Services] +AddService = ne2000, 0x00000002, ne2000_Service_Inst + +[ne2000_Service_Inst] +ServiceType = 3 +StartType = 3 +ErrorControl = 1 +ServiceBinary = %12%\ne2000.sys +LoadOrderGroup = NDIS + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" + +RealtekMfg = "Realtek Semiconductor Co., Ltd." +PCI\VEN_10EC&DEV_8029.DeviceDesc = "RTL-8029(AS)" _____ Added: trunk/reactos/media/inf/xboxdisp.inf --- trunk/reactos/media/inf/xboxdisp.inf 2005-11-14 16:36:26 UTC (rev 19225) +++ trunk/reactos/media/inf/xboxdisp.inf 2005-11-14 17:33:38 UTC (rev 19226) @@ -0,0 +1,53 @@ +; xboxdisp.inf + +; Installation file for the Xbox display card + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = Display +ClassGUID = {4D36E968-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 11/11/2005,1.00 + +[DestinationDirs] +DefaultDestDir = 12 + +[Manufacturer] +%nVidiaMfg% = nVidiaMfg + +[nVidiaMfg] +%PCI\VEN_10DE&DEV_02A0.DeviceDesc% = XboxVmp_Inst,PCI\VEN_10DE&DEV_02A0 + +;---------------------------- XboxVmp DRIVER ---------------------------- + +[XboxVmp_Inst.NT] +CopyFiles = XboxVmp_CopyFiles.NT + +[XboxVmp_CopyFiles.NT] +xboxvmp.sys + +[XboxVmp_Inst.NT.Services] +AddService = xboxvmp, 0x00000002, xboxvmp_Service_Inst + +[xboxvmp_Service_Inst] +ServiceType = 1 +StartType = 1 +ErrorControl = 0 +ServiceBinary = %12%\xboxvmp.sys +LoadOrderGroup = Video + +[xboxvmp.SoftwareSettings] +AddReg = xboxvmp_SoftwareDeviceSettings + +[xboxvmp_SoftwareDeviceSettings] +HKR,,InstalledDisplayDrivers,0x00010000,framebuf + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" + +nVidiaMfg = "nVidia Corporation" +PCI\VEN_10DE&DEV_02A0.DeviceDesc = "NV2A Xbox Graphics Processing Unit"

18 years, 10 months

[gvg] 19225: Only debug 1 thread at a time

by gvg＠svn.reactos.com

Only debug 1 thread at a time Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-11-14 15:35:41 UTC (rev 19224) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-11-14 16:36:26 UTC (rev 19225) @@ -103,6 +103,8 @@ static PETHREAD GspDbgThread; static PETHREAD GspEnumThread; +static FAST_MUTEX GspLock; + extern LIST_ENTRY PsActiveProcessHead; KD_PORT_INFORMATION GdbPortInfo = { 2, 115200, 0 }; /* FIXME hardcoded for COM2, 115200 baud */ @@ -1137,6 +1139,9 @@ } else { + /* Can only debug 1 thread at a time... */ + ExAcquireFastMutex(&GspLock); + /* Make sure we're debugging the current thread. */ if (NULL != GspDbgThread) { @@ -1390,6 +1395,7 @@ GspDbgThread = NULL; } + ExReleaseFastMutex(&GspLock); return kdContinue; break; } @@ -1538,6 +1544,8 @@ if (BootPhase == 0) { + ExInitializeFastMutex(&GspLock); + /* Write out the functions that we support for now */ WrapperTable->KdpInitRoutine = KdpGdbStubInit; WrapperTable->KdpPrintRoutine = KdpGdbDebugPrint;

18 years, 10 months

[hpoussin] 19224: Set SystemSetupInProgress to 0 at the end of second stage setup

by hpoussin＠svn.reactos.com

Set SystemSetupInProgress to 0 at the end of second stage setup Remove dead code Modified: trunk/reactos/lib/syssetup/install.c Modified: trunk/reactos/lib/syssetup/wizard.c _____ Modified: trunk/reactos/lib/syssetup/install.c --- trunk/reactos/lib/syssetup/install.c 2005-11-14 13:45:28 UTC (rev 19223) +++ trunk/reactos/lib/syssetup/install.c 2005-11-14 15:35:41 UTC (rev 19224) @@ -236,58 +236,7 @@ Dst); } -VOID -SetupIsActive( DWORD dw ) -{ - HKEY hKey = 0; - if (RegOpenKeyEx( HKEY_LOCAL_MACHINE, _T("SYSTEM\\Setup"), 0, KEY_WRITE, &hKey ) == ERROR_SUCCESS) { - RegSetValueEx( hKey, _T("SystemSetupInProgress"), 0, REG_DWORD, (CONST BYTE *)&dw, sizeof(dw) ); - RegCloseKey( hKey ); - } -} -INT_PTR CALLBACK -RestartDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch(msg) - { - case WM_INITDIALOG: - SendDlgItemMessage(hWnd, IDC_RESTART_PROGRESS, PBM_SETRANGE, 0, - MAKELPARAM(0, 300)); - SetTimer(hWnd, 1, 50, NULL); - return TRUE; - - case WM_TIMER: - { - INT Position; - HWND hWndProgress; - - hWndProgress = GetDlgItem(hWnd, IDC_RESTART_PROGRESS); - Position = SendMessage(hWndProgress, PBM_GETPOS, 0, 0); - if (Position == 300) - { - SetupIsActive(0); - EndDialog(hWnd, 0); - } - else - SendMessage(hWndProgress, PBM_SETPOS, Position + 1, 0); - } - return TRUE; - - case WM_COMMAND: - switch (wParam) - { - case IDOK: - case IDCANCEL: - EndDialog(hWnd, 0); - return TRUE; - } - break; - } - - return FALSE; -} - static VOID CreateTempDir(LPCWSTR VarName) { _____ Modified: trunk/reactos/lib/syssetup/wizard.c --- trunk/reactos/lib/syssetup/wizard.c 2005-11-14 13:45:28 UTC (rev 19223) +++ trunk/reactos/lib/syssetup/wizard.c 2005-11-14 15:35:41 UTC (rev 19224) @@ -1375,7 +1375,17 @@ } +static VOID +SetupIsActive( DWORD dw ) +{ + HKEY hKey = 0; + if (RegOpenKeyEx( HKEY_LOCAL_MACHINE, _T("SYSTEM\\Setup"), 0, KEY_WRITE, &hKey ) == ERROR_SUCCESS) { + RegSetValueEx( hKey, _T("SystemSetupInProgress"), 0, REG_DWORD, (CONST BYTE *)&dw, sizeof(dw) ); + RegCloseKey( hKey ); + } +} + static INT_PTR CALLBACK FinishDlgProc(HWND hwndDlg, UINT uMsg, @@ -1401,6 +1411,10 @@ } break; + case WM_DESTROY: + SetupIsActive(0); + return TRUE; + case WM_TIMER: { INT Position;

18 years, 10 months

[navaraf] 19223: Add definition for vsprintfW.

by navaraf＠svn.reactos.com

Add definition for vsprintfW. Modified: trunk/reactos/include/wine/unicode.h _____ Modified: trunk/reactos/include/wine/unicode.h --- trunk/reactos/include/wine/unicode.h 2005-11-14 13:43:34 UTC (rev 19222) +++ trunk/reactos/include/wine/unicode.h 2005-11-14 13:45:28 UTC (rev 19223) @@ -35,6 +35,7 @@ #define strlwrW(s) _wcslwr((wchar_t *)(s)) #define struprW(s) _wcsupr((wchar_t *)(s)) #define sprintfW swprintf +#define vsprintfW vswprintf #define snprintfW _snwprintf #define vsnprintfW vsnwprintf

18 years, 10 months

← Newer
1
...
54
55
56
57
58
59
60
...
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