Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[winesync] 31770: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 15:26:48 2008 New Revision: 31770 URL: http://svn.reactos.org/svn/reactos?rev=31770&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/avifil32/acmstream.c trunk/reactos/dll/win32/avifil32/api.c trunk/reactos/dll/win32/avifil32/avifil32.rbuild trunk/reactos/dll/win32/avifil32/avifile.c trunk/reactos/dll/win32/avifil32/factory.c Modified: trunk/reactos/dll/win32/avifil32/acmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/acmstre… ============================================================================== --- trunk/reactos/dll/win32/avifil32/acmstream.c (original) +++ trunk/reactos/dll/win32/avifil32/acmstream.c Mon Jan 14 15:26:48 2008 @@ -729,7 +729,7 @@ This->sInfo.dwQuality = (DWORD)ICQUALITY_DEFAULT; SetRectEmpty(&This->sInfo.rcFrame); - /* convert positions ansd sizes to output format */ + /* convert positions and sizes to output format */ CONVERT_STREAM_to_THIS(&This->sInfo.dwStart); CONVERT_STREAM_to_THIS(&This->sInfo.dwLength); CONVERT_STREAM_to_THIS(&This->sInfo.dwSuggestedBufferSize); Modified: trunk/reactos/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?r… ============================================================================== --- trunk/reactos/dll/win32/avifil32/api.c (original) +++ trunk/reactos/dll/win32/avifil32/api.c Mon Jan 14 15:26:48 2008 @@ -1065,9 +1065,9 @@ HeapFree(GetProcessHeap(), 0, lp); return AVIERR_ERROR; } - for (n = 0;RegEnumKeyW(hKey, n, szFileExt, sizeof(szFileExt)) == S_OK;n++) { + for (n = 0;RegEnumKeyW(hKey, n, szFileExt, sizeof(szFileExt)/sizeof(szFileExt[0])) == S_OK;n++) { /* get CLSID to extension */ - size = sizeof(szValue)/sizeof(szValue[0]); + size = sizeof(szValue); if (RegQueryValueW(hKey, szFileExt, szValue, &size) != S_OK) break; @@ -1116,7 +1116,7 @@ for (n = 0; n <= count; n++) { /* first the description */ if (n != 0) { - size = sizeof(szValue)/sizeof(szValue[0]); + size = sizeof(szValue); if (RegQueryValueW(hKey, lp[n].szClsid, szValue, &size) == S_OK) { size = lstrlenW(szValue); lstrcpynW(szFilter, szValue, cbFilter); @@ -1509,7 +1509,7 @@ HeapFree(GetProcessHeap(), 0, pSavedOptions); } - return (BOOL)ret; + return ret; } /*********************************************************************** Modified: trunk/reactos/dll/win32/avifil32/avifil32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifil3… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifil32.rbuild (original) +++ trunk/reactos/dll/win32/avifil32/avifil32.rbuild Mon Jan 14 15:26:48 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="avifil32" type="win32dll" baseaddress="${BASEADDRESS_AVIFIL32}" installbase="system32" installname="avifil32.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="avifil32.spec.def" /> @@ -32,3 +33,4 @@ <file>rsrc.rc</file> <file>avifil32.spec</file> </module> +</group> Modified: trunk/reactos/dll/win32/avifil32/avifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile.c (original) +++ trunk/reactos/dll/win32/avifil32/avifile.c Mon Jan 14 15:26:48 2008 @@ -1795,7 +1795,7 @@ if (str == NULL) return AVIERR_MEMORY; - if (mmioRead(This->hmmio, (HPSTR)str, ck.cksize) != ck.cksize) + if (mmioRead(This->hmmio, str, ck.cksize) != ck.cksize) { HeapFree(GetProcessHeap(), 0, str); return AVIERR_FILEREAD; @@ -2249,7 +2249,7 @@ WideCharToMultiByte(CP_ACP, 0, pStream->sInfo.szName, -1, str, ck.cksize, NULL, NULL); - if (mmioWrite(This->hmmio, (HPSTR)str, ck.cksize) != ck.cksize) { + if (mmioWrite(This->hmmio, str, ck.cksize) != ck.cksize) { HeapFree(GetProcessHeap(), 0, str); return AVIERR_FILEWRITE; } Modified: trunk/reactos/dll/win32/avifil32/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory… ============================================================================== --- trunk/reactos/dll/win32/avifil32/factory.c (original) +++ trunk/reactos/dll/win32/avifil32/factory.c Mon Jan 14 15:26:48 2008 @@ -209,7 +209,7 @@ switch (fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDll); - AVIFILE_hModule = (HMODULE)hInstDll; + AVIFILE_hModule = hInstDll; break; case DLL_PROCESS_DETACH: break;

1 0

[hpoussin] 31769: Autosyncing with Wine HEAD
by hpoussin＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: hpoussin Date: Mon Jan 14 15:20:56 2008 New Revision: 31769 URL: http://svn.reactos.org/svn/reactos?rev=31769&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/advpack/advpack.rbuild Modified: trunk/reactos/dll/win32/advpack/advpack.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.… ============================================================================== --- trunk/reactos/dll/win32/advpack/advpack.rbuild (original) +++ trunk/reactos/dll/win32/advpack/advpack.rbuild Mon Jan 14 15:20:56 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="advpack" type="win32dll" baseaddress="${BASEADDRESS_ADVPACK}" installbase="system32" installname="advpack.dll" allowwarnings="true"> <importlibrary definition="advpack.spec.def" /> <include base="advpack">.</include> @@ -11,7 +12,6 @@ <library>ole32</library> <library>setupapi</library> <library>version</library> - <library>user32</library> <library>advapi32</library> <library>kernel32</library> <library>ntdll</library> @@ -21,3 +21,4 @@ <file>reg.c</file> <file>advpack.spec</file> </module> +</group>

1 0

[fireball] 31768: - Implement canonicalizing the service binary path properly, handling all possible cases (instead of a memory-overwriting hack Christoph noticed yesterday).
by fireball＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: fireball Date: Mon Jan 14 14:46:14 2008 New Revision: 31768 URL: http://svn.reactos.org/svn/reactos?rev=31768&view=rev Log: - Implement canonicalizing the service binary path properly, handling all possible cases (instead of a memory-overwriting hack Christoph noticed yesterday). Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Mon Jan 14 14:46:14 2008 @@ -993,6 +993,380 @@ DPRINT("ScmrChangeServiceConfigW() done (Error %lu)\n", dwError); return dwError; +} + +/* Create a path suitable for the bootloader out of the full path */ +DWORD +ScmConvertToBootPathName(wchar_t *CanonName, wchar_t **RelativeName) +{ + DWORD ServiceNameLen, BufferSize, ExpandedLen; + WCHAR Dest; + WCHAR *Expanded; + UNICODE_STRING NtPathName, SystemRoot, LinkTarget; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + HANDLE SymbolicLinkHandle; + + DPRINT("ScmConvertToBootPathName %S\n", CanonName); + + ServiceNameLen = wcslen(CanonName); + /* First check, if it's already good */ + if (ServiceNameLen > 12 && + !wcsnicmp(L"\\SystemRoot\\", CanonName, 12)) + { + *RelativeName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) + sizeof(WCHAR)); + + if (*RelativeName == NULL) + { + DPRINT1("Error allocating memory for boot driver name!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Copy it */ + wcscpy(*RelativeName, CanonName); + + DPRINT1("Bootdriver name %S\n", *RelativeName); + return ERROR_SUCCESS; + } + + /* If it has %SystemRoot% prefix, substitute it to \System*/ + if (ServiceNameLen > 13 && + !wcsnicmp(L"%SystemRoot%\\", CanonName, 13)) + { + /* There is no +sizeof(wchar_t) because the name is less by 1 wchar */ + *RelativeName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR)); + + if (*RelativeName == NULL) + { + DPRINT1("Error allocating memory for boot driver name!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Copy it */ + wcscpy(*RelativeName, L"\\SystemRoot\\"); + wcscat(*RelativeName, CanonName + 13); + + DPRINT1("Bootdriver name %S\n", *RelativeName); + return ERROR_SUCCESS; + } + + /* Get buffer size needed for expanding env strings */ + BufferSize = ExpandEnvironmentStringsW(L"%SystemRoot%\\", &Dest, 1); + + if (BufferSize <= 1) + { + DPRINT1("Error during a call to ExpandEnvironmentStringsW()\n"); + return ERROR_INVALID_ENVIRONMENT; + } + + /* Allocate memory, since the size is known now */ + Expanded = LocalAlloc(LMEM_ZEROINIT, BufferSize * sizeof(WCHAR) + sizeof(WCHAR)); + if (!Expanded) + { + DPRINT1("Error allocating memory for boot driver name!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Expand it */ + if (ExpandEnvironmentStringsW(L"%SystemRoot%\\", Expanded, BufferSize) > + BufferSize) + { + DPRINT1("Error during a call to ExpandEnvironmentStringsW()\n"); + LocalFree(Expanded); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Convert to NY-style path */ + if (!RtlDosPathNameToNtPathName_U(Expanded, &NtPathName, NULL, NULL)) + { + DPRINT1("Error during a call to RtlDosPathNameToNtPathName_U()\n"); + return ERROR_INVALID_ENVIRONMENT; + } + + DPRINT("Converted to NT-style %wZ\n", &NtPathName); + + /* No need to keep the dos-path anymore */ + LocalFree(Expanded); + + /* Copy it to the allocated place */ + Expanded = LocalAlloc(LMEM_ZEROINIT, NtPathName.Length + sizeof(WCHAR)); + if (!Expanded) + { + DPRINT1("Error allocating memory for boot driver name!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + ExpandedLen = NtPathName.Length / sizeof(WCHAR); + wcsncpy(Expanded, NtPathName.Buffer, ExpandedLen); + Expanded[ExpandedLen] = 0; + + if (ServiceNameLen > ExpandedLen && + !wcsnicmp(Expanded, CanonName, ExpandedLen)) + { + /* Only \SystemRoot\ is missing */ + *RelativeName = LocalAlloc(LMEM_ZEROINIT, + (ServiceNameLen - ExpandedLen) * sizeof(WCHAR) + 13*sizeof(WCHAR)); + + if (*RelativeName == NULL) + { + DPRINT1("Error allocating memory for boot driver name!\n"); + LocalFree(Expanded); + return ERROR_NOT_ENOUGH_MEMORY; + } + + wcscpy(*RelativeName, L"\\SystemRoot\\"); + wcscat(*RelativeName, CanonName + ExpandedLen); + + RtlFreeUnicodeString(&NtPathName); + return ERROR_SUCCESS; + } + + /* The most complex case starts here */ + RtlInitUnicodeString(&SystemRoot, L"\\SystemRoot"); + InitializeObjectAttributes(&ObjectAttributes, + &SystemRoot, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Open this symlink */ + Status = NtOpenSymbolicLinkObject(&SymbolicLinkHandle, SYMBOLIC_LINK_QUERY, &ObjectAttributes); + + if (NT_SUCCESS(Status)) + { + LinkTarget.Length = 0; + LinkTarget.MaximumLength = 0; + + DPRINT("Opened symbolic link object\n"); + + Status = NtQuerySymbolicLinkObject(SymbolicLinkHandle, &LinkTarget, &BufferSize); + if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_TOO_SMALL) + { + /* Check if required buffer size is sane */ + if (BufferSize > 0xFFFD) + { + DPRINT1("Too large buffer required\n"); + *RelativeName = 0; + + if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); + LocalFree(Expanded); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Alloc the string */ + LinkTarget.Buffer = LocalAlloc(LMEM_ZEROINIT, BufferSize + sizeof(WCHAR)); + if (!LinkTarget.Buffer) + { + DPRINT1("Unable to alloc buffer\n"); + if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); + LocalFree(Expanded); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Do a real query now */ + LinkTarget.Length = BufferSize; + LinkTarget.MaximumLength = LinkTarget.Length + sizeof(WCHAR); + + Status = NtQuerySymbolicLinkObject(SymbolicLinkHandle, &LinkTarget, &BufferSize); + if (NT_SUCCESS(Status)) + { + DPRINT("LinkTarget: %wZ\n", &LinkTarget); + + ExpandedLen = LinkTarget.Length / sizeof(WCHAR); + if ((ServiceNameLen > ExpandedLen) && + !wcsnicmp(LinkTarget.Buffer, CanonName, ExpandedLen)) + { + *RelativeName = LocalAlloc(LMEM_ZEROINIT, + (ServiceNameLen - ExpandedLen) * sizeof(WCHAR) + 13*sizeof(WCHAR)); + + if (*RelativeName == NULL) + { + DPRINT1("Unable to alloc buffer\n"); + if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); + LocalFree(Expanded); + RtlFreeUnicodeString(&NtPathName); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Copy it over, substituting the first part + with SystemRoot */ + wcscpy(*RelativeName, L"\\SystemRoot\\"); + wcscat(*RelativeName, CanonName+ExpandedLen+1); + + /* Cleanup */ + if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); + LocalFree(Expanded); + RtlFreeUnicodeString(&NtPathName); + + /* Return success */ + return ERROR_SUCCESS; + } + else + { + if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); + LocalFree(Expanded); + RtlFreeUnicodeString(&NtPathName); + return ERROR_INVALID_PARAMETER; + } + } + else + { + DPRINT1("Error, Status = %08X\n", Status); + if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); + LocalFree(Expanded); + RtlFreeUnicodeString(&NtPathName); + return ERROR_INVALID_PARAMETER; + } + } + else + { + DPRINT1("Error, Status = %08X\n", Status); + if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); + LocalFree(Expanded); + RtlFreeUnicodeString(&NtPathName); + return ERROR_INVALID_PARAMETER; + } + } + else + { + DPRINT1("Error, Status = %08X\n", Status); + LocalFree(Expanded); + return ERROR_INVALID_PARAMETER; + } + + /* Failure */ + *RelativeName = NULL; + return ERROR_INVALID_PARAMETER; +} + +DWORD +ScmCanonDriverImagePath(DWORD dwStartType, + wchar_t *lpServiceName, + wchar_t **lpCanonName) +{ + DWORD ServiceNameLen, Result; + UNICODE_STRING NtServiceName; + WCHAR *RelativeName; + WCHAR *SourceName = lpServiceName; + + /* Calculate the length of the service's name */ + ServiceNameLen = wcslen(lpServiceName); + + /* 12 is wcslen(L"\\SystemRoot\\") */ + if (ServiceNameLen > 12 && + !wcsnicmp(L"\\SystemRoot\\", lpServiceName, 12)) + { + /* SystemRoot prefix is already included */ + + *lpCanonName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) + sizeof(WCHAR)); + + if (*lpCanonName == NULL) + { + DPRINT1("Error allocating memory for canonized service name!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* If it's a boot-time driver, it must be systemroot relative */ + if (dwStartType == SERVICE_BOOT_START) + SourceName += 12; + + /* Copy it */ + wcscpy(*lpCanonName, SourceName); + + DPRINT("Canonicalized name %S\n", *lpCanonName); + return NO_ERROR; + } + + /* Check if it has %SystemRoot% (len=13) */ + if (ServiceNameLen > 13 && + !wcsnicmp(L"%SystemRoot%\\", lpServiceName, 13)) + { + /* Substitute %SystemRoot% with \\SystemRoot\\ */ + *lpCanonName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) + sizeof(WCHAR)); + + if (*lpCanonName == NULL) + { + DPRINT1("Error allocating memory for canonized service name!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* If it's a boot-time driver, it must be systemroot relative */ + if (dwStartType == SERVICE_BOOT_START) + wcscpy(*lpCanonName, L"\\SystemRoot\\"); + + wcscat(*lpCanonName, lpServiceName); + + DPRINT("Canonicalized name %S\n", *lpCanonName); + return NO_ERROR; + } + + /* Check if it's a relative path name */ + if (lpServiceName[0] != L'\\' && lpServiceName[1] != L':') + { + *lpCanonName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) + sizeof(WCHAR)); + + if (*lpCanonName == NULL) + { + DPRINT1("Error allocating memory for canonized service name!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Just copy it over without changing */ + wcscpy(*lpCanonName, lpServiceName); + + return NO_ERROR; + } + + /* It seems to be a DOS path, convert it */ + if (!RtlDosPathNameToNtPathName_U(lpServiceName, &NtServiceName, NULL, NULL)) + { + DPRINT1("RtlDosPathNameToNtPathName_U() failed!\n"); + return ERROR_INVALID_PARAMETER; + } + + *lpCanonName = LocalAlloc(LMEM_ZEROINIT, NtServiceName.Length + sizeof(WCHAR)); + + if (*lpCanonName == NULL) + { + DPRINT1("Error allocating memory for canonized service name!\n"); + RtlFreeUnicodeString(&NtServiceName); + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Copy the string */ + wcsncpy(*lpCanonName, NtServiceName.Buffer, NtServiceName.Length / sizeof(WCHAR)); + + /* The unicode string is not needed anymore */ + RtlFreeUnicodeString(&NtServiceName); + + if (dwStartType != SERVICE_BOOT_START) + { + DPRINT("Canonicalized name %S\n", *lpCanonName); + return NO_ERROR; + } + + /* The service is boot-started, so must be relative */ + Result = ScmConvertToBootPathName(*lpCanonName, &RelativeName); + if (Result) + { + /* There is a problem, free name and return */ + LocalFree(*lpCanonName); + DPRINT1("Error converting named!\n"); + return Result; + } + + ASSERT(RelativeName); + + /* Copy that string */ + wcscpy(*lpCanonName, RelativeName + 12); + + /* Free the allocated buffer */ + LocalFree(RelativeName); + + DPRINT("Canonicalized name %S\n", *lpCanonName); + + /* Success */ + return NO_ERROR; } @@ -1058,24 +1432,12 @@ if (dwServiceType & SERVICE_DRIVER) { - lpImagePath = (WCHAR*) HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - (wcslen(lpBinaryPathName) + 5) * sizeof(WCHAR)); - if (lpImagePath == NULL) - { - dwError = ERROR_NOT_ENOUGH_MEMORY; + dwError = ScmCanonDriverImagePath(dwStartType, + lpBinaryPathName, + &lpImagePath); + + if (dwError != ERROR_SUCCESS) goto done; - } - - if (lpBinaryPathName[1] == L':') - { - wcscpy(lpImagePath, L"\\??\\"); - wcscat(lpImagePath, lpBinaryPathName); - } - else - { - wcscpy(lpImagePath, lpBinaryPathName); - } } /* Allocate a new service entry */

1 0

[weiden] 31767: Add more definitions
by weiden＠svn.reactos.org 13 Jan '08

13 Jan '08

Author: weiden Date: Mon Jan 14 01:44:07 2008 New Revision: 31767 URL: http://svn.reactos.org/svn/reactos?rev=31767&view=rev Log: Add more definitions Modified: trunk/reactos/include/reactos/wine/rpcfc.h Modified: trunk/reactos/include/reactos/wine/rpcfc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/rpcfc… ============================================================================== --- trunk/reactos/include/reactos/wine/rpcfc.h (original) +++ trunk/reactos/include/reactos/wine/rpcfc.h Mon Jan 14 01:44:07 2008 @@ -204,4 +204,10 @@ #define USER_MARSHAL_POINTER 0xc0 #define USER_MARSHAL_IID 0x20 +/* context handle flags */ +#define NDR_CONTEXT_HANDLE_CANNOT_BE_NULL 0x01 +#define NDR_CONTEXT_HANDLE_SERIALIZE 0x02 +#define NDR_CONTEXT_HANDLE_NO_SERIALIZE 0x04 +#define NDR_STRICT_CONTEXT_HANDLE 0x08 + #endif /* __WINE_RPCFC_H */

1 0

[spetreolle] 31766: french translation for devmgr thanks to amine48rz for dialogs
by spetreolle＠svn.reactos.org 13 Jan '08

13 Jan '08

Author: spetreolle Date: Sun Jan 13 23:41:28 2008 New Revision: 31766 URL: http://svn.reactos.org/svn/reactos?rev=31766&view=rev Log: french translation for devmgr thanks to amine48rz for dialogs Added: trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc (with props) Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgr.rc (original) +++ trunk/reactos/dll/win32/devmgr/devmgr.rc Sun Jan 13 23:41:28 2008 @@ -16,6 +16,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" Added: trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc (added) +++ trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc Sun Jan 13 23:41:28 2008 @@ -1,0 +1,170 @@ +// French language resource file (Sylvain Petreolle) + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_NAME "Nom" + IDS_TYPE "Type" + IDS_MANUFACTURER "Fabricant: %1" + IDS_LOCATION "Emplacement: %1" + IDS_STATUS "Etat: %1" + IDS_UNKNOWN "Inconnu" + IDS_LOCATIONSTR "Emplacement %1!u! (%2)" + IDS_DEVCODE " (Code %1!u!)" + IDS_DEVCODE2 " (Code %2!u!)" + IDS_ENABLEDEVICE "Utiliser ce périphérique (activé)" + IDS_DISABLEDEVICE "Ne pas utiliser ce matériel (désactivé)" + IDS_UNKNOWNDEVICE "Matériel inconnu" + IDS_NODRIVERLOADED "Aucun driver n'est installé pour ce matériel." + IDS_DEVONPARENT "sur %1" + IDS_TROUBLESHOOTDEV "&Dépannage..." + IDS_ENABLEDEV "A&ctiver le matériel" + IDS_REINSTALLDRV "Ré&installer le Driver" + IDS_PROPERTIES "&Propriétés" + IDS_UPDATEDRV "Mettre à jour le Driver..." + IDS_REBOOT "&Redémarrer l'ordinateur..." + IDS_NOTAVAILABLE "Non disponible" + IDS_NOTDIGITALLYSIGNED "Non signé numériquement" + IDS_NODRIVERS "Aucun fichier n'est requis ou n'a été chargé pour ce matériel." +END + +STRINGTABLE +BEGIN + IDS_DEV_NO_PROBLEM "Ce périphérique fonctionne correctement." + IDS_DEV_NOT_CONFIGURED "Ce périphérique n'est pas configuré correctement." + IDS_DEV_DEVLOADER_FAILED "ReactOS n'a pu charger le pilote de ce périphérique car l'ordinateur signale deux types de bus $1." + IDS_DEV_DEVLOADER_FAILED2 "Le(s) chargeur(s) de périphérique $1 pour ce périphérique n'ont pu charger le driver." + IDS_DEV_OUT_OF_MEMORY "Le pilote de ce périphérique peut être mauvais, ou votre système peut être à court de mémoire ou d'autres ressources." + IDS_DEV_ENTRY_IS_WRONG_TYPE "Ce périphérique ne fonctionne pas correctement parce qu'un des pilotes de ce périphérique peut être mauvais, ou votre base de registres peut être mauvaise." + IDS_DEV_LACKED_ARBITRATOR "Le pilote de ce périphérique a demandé une ressource que ReactOS ne sait pas prendre en compte." + IDS_DEV_BOOT_CONFIG_CONFLICT "Un autre périphérique utilise les resources nécéssaire à ce périphérique." + IDS_DEV_FAILED_FILTER "Les pilotes de ce périphérique doivent etre réinstallés." + IDS_DEV_DEVLOADER_NOT_FOUND "Ce périphérique ne fonctionne pas correctement parce que ReactOS ne peut charger le fichier $1 qui charge les pilotes de ce périphérique." + IDS_DEV_DEVLOADER_NOT_FOUND2 "Ce périphérique ne fonctionne pas correctement parce que le fichier $1 qui charge les pilotes de ce périphérique est mauvais." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Erreur du périphérique: Essayez de changer le driver du périphérique. Si cela ne fonctionne pas, voyez la documentation du matériel." + IDS_DEV_INVALID_DATA "Ce périphérique ne fonctionne pas correctement parce que le BIOS de votre ordinateur rapporte incorrectement les ressources de ce périphérique." + IDS_DEV_INVALID_DATA2 "Ce périphérique ne fonctionne pas correctement parce que le BIOS de votre ordinateur rapporte incorrectement les ressources de ce périphérique. " + IDS_DEV_FAILED_START "Ce périphérique est soit non présent, ne fonctionnant pas correctement, ou n'a pas tous les pilotes installés." + IDS_DEV_LIAR "ReactOS a arrêté de fonctionner en essayant de démarrer ce périphérique, et n'essayera donc plus de le démarrer de nouveau." + IDS_DEV_NORMAL_CONFLICT "Ce périphérique nze peut trouver de ressources $1 à utiliser." + IDS_DEV_NOT_VERIFIED "Ce périphérique est soit non présent, ne fonctionnant pas correctement, ou n'a pas tous les pilotes installés." + IDS_DEV_NEED_RESTART "Ce périphérique ne peut fonctionner correctement tant que vous n'aurez pas redémarré votre ordinateur." + IDS_DEV_REENUMERATION "Ce périphérique cause un conflit de ressource." + IDS_DEV_PARTIAL_LOG_CONF "ReactOS n'a pu identifier toutes les ressources utilisées par ce périphérique." + IDS_DEV_UNKNOWN_RESOURCE "Le fichier d'information du pilote $1 indique à ce périphérique enfant d'utiliser une ressource que le périphérique parent n'a ou ne reconnait pas." + IDS_DEV_REINSTALL "Les pilotes de ce périphérique doivent être réinstallés." + IDS_DEV_REGISTRY "Votre base de registres peut être mauvaise." + IDS_DEV_WILL_BE_REMOVED "ReactOS est en train de supprimer ce périphérique." + IDS_DEV_DISABLED "Ce périphérique n'est pas démarré." + IDS_DEV_DISABLED2 "Ce périphérique est désactivé." + IDS_DEV_DEVLOADER_NOT_READY "Les chargeurs de ce périphérique ne peuvent charger les drivers requis." + IDS_DEV_DEVLOADER_NOT_READY2 "Cet écran fonctionne correctement." + IDS_DEV_DEVLOADER_NOT_READY3 "Les chargeurs de ce périphérique ne peuvent charger les drivers requis." + IDS_DEV_DEVICE_NOT_THERE "Ce périphérique est soit non présent, soit ne fonctionne pas correctement, ou n'a pas tous les pilotes installés." + IDS_DEV_MOVED "ReactOS est en train de mettre en place ce périphérique." + IDS_DEV_TOO_EARLY "ReactOS est en train de mettre en place ce périphérique." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." + IDS_DEV_FAILED_INSTALL "Les pilotes de ce périphérique ne sont pas installés." + IDS_DEV_HARDWARE_DISABLED "Ce périphérique est désactivé car le BIOS n'a pas donné de ressources à ce périphérique." + IDS_DEV_CANT_SHARE_IRQ "Ce périphérique utilise une Interruption Matérielle (IRQ) qui est utilisée par un autre périphérique et ne peut être partagé.\nVous devez changer les réglages en conflit ou enlever le driver en mode-réel causant le conflit." + IDS_DEV_FAILED_ADD "Ce périphérique ne fonctionne pas correctement parce que $1 ne fonctionne pas correctement." + IDS_DEV_DISABLED_SERVICE "ReactOS ne peut installer les pioltes pour ce périphérique car il ne peut accéder au lecteur ou à l'emplacement réseau contenant les fichiers d'installation." + IDS_DEV_TRANSLATION_FAILED "Ce périphérique ne répond pas à son pilote." + IDS_DEV_NO_SOFTCONFIG "ReactOS ne peut déterminer les réglages de ce périphérique. Consultez la documentation accompagnant ce périphérique et utilisez la pages des Resources pour modifier la configuration." + IDS_DEV_BIOS_TABLE "Le firmware de votre ordinateur n'inclut pas assez d'information pour configurer et utiliser correctement ce périphérique. \nPour utiliser ce périphérique, contactez le fabricant de votre ordinateur afin d'obtenir une mise a jour du firmware ou du BIOS." + IDS_DEV_IRQ_TRANSLATION_FAILED "Ce périphérique demande une Interruption PCI mais est configuré pour une Interruption ISA (ou vice versa). \nVeuillez utiliser le programme système d'installation de l'ordinateur pour reconfigurer les interruptions de ce périphérique." + IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS ne peut initialiser le pilote de ce matériel." + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS ne peut charger le pilote de ce matériel parce qu'une instance précédente de ce pilote est toujours en mémoire." + IDS_DEV_DRIVER_FAILED_LOAD "ReactOS ne peut charger le pilote de ce matériel. Le pilote peut être corrompu ou manquant." + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS ne peut accéder à ce matériel parce que la clé de registre de son service est manquante ou incorrectement inscrite." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS a chargé avec succès le pilote pour ce matériel mais n'a pu trouver le périphérique matériel." + IDS_DEV_DUPLICATE_DEVICE "ReactOS ne peut charger le pilote pour ce périphérique matériel parce qu'un matériel en double tourne déjà dans le système." + IDS_DEV_FAILED_POST_START "ReactOS a arrêté ce périphérique car il a signalé des problèmes." + IDS_DEV_HALTED "Une application ou un service a arrêté ce périphérique matériel." + IDS_DEV_PHANTOM "Ce périphérique matériel n'est pas connecté à l'ordinateur actuellement." + IDS_DEV_SYSTEM_SHUTDOWN "ReactOS ne peut accéder à ce matériel parce que le système est en train de s'arrêter." + IDS_DEV_HELD_FOR_EJECT "ReactOS ne peut utiliser ce matériel parce qu'il a été préparé pour être enlevé, mais n'a pas encore été enlevé de l'ordinateur." + IDS_DEV_DRIVER_BLOCKED "Le logiciel de ce périphérique a été empéché de démarrer car il est connu pour avoir des problèmes avec ReactOS. Contactez the vendeur pour obtenir un nouveau driver." + IDS_DEV_REGISTRY_TOO_LARGE "ReactOS ne peut démarrer de nouveaux matériels parce que la base de registres es trop grande (dépasse la taille limite de la base)." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS n'a pu changer les réglages de ce périphérique." +END + +IDD_HARDWARE DIALOG DISCARDABLE 0, 0, 300, 400 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Périphériques:",IDC_DEVICES,7,6,196,10 + CONTROL "",IDC_LV_DEVICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,16,196,50 + GROUPBOX "Propriétés des Périphériques",IDC_PROPERTIESGROUP,7,76,196,105 + LTEXT "",IDC_MANUFACTURER,14,88,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_LOCATION,14,100,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_STATUS,14,112,183,30 + PUSHBUTTON "&Dépannage...",IDC_TROUBLESHOOT,85,140,54,14, + BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "P&ropriétés",IDC_PROPERTIES,146,140,50,14 +END + +IDD_DEVICEGENERAL DIALOG DISCARDABLE 0, 0, 252, 218 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Général" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Type de matériel:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVTYPE, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Fabricant:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVMANUFACTURER, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Emplacement:", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVLOCATION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + GROUPBOX "Etat du matériel", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 + EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL + PUSHBUTTON "&Dépannage...", IDC_DEVPROBLEM, 148, 163, 90, 15 + LTEXT "&Utilisation du matériel:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED + COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED +END + +IDD_DEVICEDRIVER DIALOG DISCARDABLE 0, 0, 252, 218 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Pilote" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Fournisseur:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVPROVIDER, 120, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Date du Pilote:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVDATE, 120, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Version du Pilote:", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVVERSION, 120, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Signature numérique:", -1, 37, 81, 80, 8, SS_NOPREFIX + EDITTEXT IDC_DIGITALSIGNER, 120, 81, 126, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "&Détails...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + LTEXT "Voir les détails à propos des fichiers du Pilote.", -1, 91, 110, 154, 17, SS_NOPREFIX +END + +IDD_DRIVERDETAILS DIALOG DISCARDABLE 0, 0, 224, 250 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Fichiers du Pilote" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "&Fichiers:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LTEXT "Fournisseur:", -1, 14, 134, 50, 8 + LTEXT "", IDC_FILEPROVIDER, 66, 134, 155, 8 + LTEXT "Version:", -1, 14, 150, 50, 8 + LTEXT "", IDC_FILEVERSION, 66, 150, 155, 8 + LTEXT "Copyright:", -1, 14, 166, 50, 8 + LTEXT "", IDC_FILECOPYRIGHT, 66, 166, 155, 8 + LTEXT "Signature numérique:", -1, 14, 182, 80, 8 + LTEXT "", IDC_DIGITALSIGNER, 96, 182, 125, 8 + PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 +END + Propchange: trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

[cfinck] 31765: - Change the comment about the build tag for releases in "version.h" - Update Thunderbird 1.5 to 1.5.0.14 in "downloader.xml"
by cfinck＠svn.reactos.org 13 Jan '08

13 Jan '08

Author: cfinck Date: Sun Jan 13 22:45:24 2008 New Revision: 31765 URL: http://svn.reactos.org/svn/reactos?rev=31765&view=rev Log: - Change the comment about the build tag for releases in "version.h" - Update Thunderbird 1.5 to 1.5.0.14 in "downloader.xml" Modified: trunk/reactos/include/reactos/version.h trunk/rosapps/downloader/downloader.xml Modified: trunk/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.h?… ============================================================================== --- trunk/reactos/include/reactos/version.h (original) +++ trunk/reactos/include/reactos/version.h Sun Jan 13 22:45:24 2008 @@ -21,7 +21,7 @@ #define KERNEL_VERSION_MINOR 4 #define KERNEL_VERSION_PATCH_LEVEL 0 -/* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"RELEASE" */ +/* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */ #define KERNEL_VERSION_BUILD_TYPE L"SVN" Modified: trunk/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.xml?… ============================================================================== --- trunk/rosapps/downloader/downloader.xml (original) +++ trunk/rosapps/downloader/downloader.xml Sun Jan 13 22:45:24 2008 @@ -17,9 +17,9 @@ <application name="Thunderbird 1.5"> <regname>Mozilla Thunderbird (1.5)</regname> <licence>MPL/GPL/LGPL</licence> - <version>1.5.0.13</version> + <version>1.5.0.14</version> <description>The most popular and one of the best free Mail Clients out there.</description> - <location>http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/1.5.0.13/win32/…</location> + <location>http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/1.5.0.14/win32/…</location> </application> <application name="Thunderbird 2.0"> <regname>Mozilla Thunderbird (2.0.0.9)</regname>

1 0

[hpoussin] 31764: Better arguments check Do not prepend '-' if build tag is empty Fix check to know if file needs to be rewritten Support a custom buildtag with -t
by hpoussin＠svn.reactos.org 13 Jan '08

13 Jan '08

Author: hpoussin Date: Sun Jan 13 21:54:52 2008 New Revision: 31764 URL: http://svn.reactos.org/svn/reactos?rev=31764&view=rev Log: Better arguments check Do not prepend '-' if build tag is empty Fix check to know if file needs to be rewritten Support a custom buildtag with -t Modified: trunk/reactos/tools/buildno/buildno.cpp Modified: trunk/reactos/tools/buildno/buildno.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/buildno/buildno.cpp?… ============================================================================== --- trunk/reactos/tools/buildno/buildno.cpp (original) +++ trunk/reactos/tools/buildno/buildno.cpp Sun Jan 13 21:54:52 2008 @@ -3,27 +3,25 @@ * * Copyright (c) 1999,2000 Emanuele Aliberti * Copyright (c) 2006 Christoph von Wittich + * Copyright (c) 2008 Hervé Poussineau * * The build number is the day on which the build took * place, as YYYYMMDD * - * The build number is stored in the file - * <reactos/buildno.h> as a set of macros: - * - * KERNEL_VERSION_BUILD base 10 number - * KERNEL_VERSION_BUILD_STR C string - * KERNEL_VERSION_BUILD_RC RC string + * The build number is stored in the output file as a set of macros * * REVISIONS * --------- + * 2008-01-12 (hpoussin) + * Add -t option to change the build tag * 2006-09-09 (cwittich) - * read binary entries files from SVN 1.4.x + * Read binary entries files from SVN 1.4.x * 2000-01-22 (ea) - * Fixed bugs: tm_year is (current_year - 1900), - * tm_month is 0-11 not 1-12 and code ignored TZ. + * Fixed bugs: tm_year is (current_year - 1900), + * tm_month is 0-11 not 1-12 and code ignored TZ. * 2000-12-10 (ea) - * Added -p option to make it simply print the - * version number, but skip buildno.h generation. + * Added -p option to make it simply print the + * version number, but skip buildno.h generation. */ #include <stdio.h> #include <stdlib.h> @@ -36,8 +34,8 @@ #define TRUE 1 static char * argv0 = ""; -static char * filename = ""; -static char * kernel_version_build_type = 0; +static char * filename = NULL; +static char * build_tag = NULL; int count_wide_string( wchar_t *str ) { @@ -169,7 +167,7 @@ { s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); } - s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); + s = s + sprintf (s, "%s\\0\"\n", build_tag); s = s + sprintf (s, "#define KERNEL_RELEASE_STR\t\"%d.%d", KERNEL_VERSION_MAJOR, KERNEL_VERSION_MINOR); @@ -177,7 +175,7 @@ { s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); } - s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); + s = s + sprintf (s, "%s\"\n", build_tag); s = s + sprintf (s, "#define KERNEL_VERSION_RC\t\"%d.%d", KERNEL_VERSION_MAJOR, KERNEL_VERSION_MINOR); @@ -185,7 +183,7 @@ { s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); } - s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); + s = s + sprintf (s, "%s\\0\"\n", build_tag); s = s + sprintf (s, "#define KERNEL_VERSION_STR\t\"%d.%d", KERNEL_VERSION_MAJOR, KERNEL_VERSION_MINOR); @@ -193,7 +191,7 @@ { s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); } - s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); + s = s + sprintf (s, "%s\"\n", build_tag); s = s + sprintf (s, "#define REACTOS_DLL_VERSION_MAJOR\t%d\n", dllversion); s = s + sprintf (s, "#define REACTOS_DLL_RELEASE_RC\t\"%d.%d", dllversion, KERNEL_VERSION_MINOR); @@ -201,7 +199,7 @@ { s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); } - s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); + s = s + sprintf (s, "%s\\0\"\n", build_tag); s = s + sprintf (s, "#define REACTOS_DLL_RELEASE_STR\t\"%d.%d", dllversion, KERNEL_VERSION_MINOR); @@ -209,7 +207,7 @@ { s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); } - s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); + s = s + sprintf (s, "%s\"\n", build_tag); s = s + sprintf (s, "#define REACTOS_DLL_VERSION_RC\t\"%d.%d", dllversion, KERNEL_VERSION_MINOR); @@ -217,7 +215,7 @@ { s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); } - s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); + s = s + sprintf (s, "%s\\0\"\n", build_tag); s = s + sprintf (s, "#define REACTOS_DLL_VERSION_STR\t\"%d.%d", dllversion, KERNEL_VERSION_MINOR); @@ -225,10 +223,10 @@ { s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); } - s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); + s = s + sprintf (s, "%s\"\n", build_tag); s = s + sprintf (s, "#endif\n/* EOF */\n"); - h = fopen (filename, "wb"); + h = fopen (filename, "rb"); if (h != NULL) { fseek(h, 0, SEEK_END); @@ -269,9 +267,10 @@ { fprintf ( stderr, - "Usage: %s [-{p|q}] path-to-header\n\n" + "Usage: %s [-{p|q}] [-t tag] path-to-header\n\n" " -p print version number and exit\n" - " -q run in quiet mode\n", + " -q run in quiet mode\n" + " -t specify a build tag\n", argv0); exit (EXIT_SUCCESS); } @@ -292,40 +291,45 @@ argv0 = argv[0]; - switch (argc) - { - case 1: - break; - case 2: - case 3: - if (argv[1][0] == '-') + /* Check arguments */ + for (i = 1; i < argc; i++) + { + if (*argv[i] == '-') + { + switch (argv[i][1]) { - if (argv[1][1] == 'q') - { + case 'p': + print_only = TRUE; + break; + case 'q': quiet = TRUE; - } - else if (argv[1][1] == 'p') - { - print_only = TRUE; - } - else - { - usage (); - } - filename = argv[2]; + break; + case 't': + if (i + 1 != argc) + { + build_tag = argv[++i]; + break; + } + /* fall through */ + default: + usage(); + return EXIT_SUCCESS; } - else if (argc == 2) - { - filename = argv[1]; - } - else - { - usage (); - } - break; - default: - usage (); - } + } + else if (!filename) + filename = argv[i]; + else + { + usage(); + return EXIT_SUCCESS; + } + } + if (!filename) + { + usage(); + return EXIT_SUCCESS; + } + /* Set TZ information. */ tzset (); /* We are building TODAY! */ @@ -333,15 +337,6 @@ { printf ( "\nReactOS Build Number Generator\n\n"); } - - /* Convert kernel_version_build_type to a host-friendly string */ - length = count_wide_string(KERNEL_VERSION_BUILD_TYPE); - kernel_version_build_type = (char *)malloc(length+1); - for( i = 0; KERNEL_VERSION_BUILD_TYPE[i]; i++ ) - { - kernel_version_build_type[i] = KERNEL_VERSION_BUILD_TYPE[i]; - } - kernel_version_build_type[i] = 0; time (& t1); /* current build time */ t1_tm = gmtime (& t1); @@ -355,10 +350,36 @@ (t1_tm->tm_mon + 1), t1_tm->tm_mday); } - /* - * Compute build number. - */ + + /* Compute build number. */ build = t1_tm->tm_year * 10000 + (t1_tm->tm_mon + 1) * 100 + t1_tm->tm_mday; + + if (!build_tag) + { + /* Create default build tag */ + length = count_wide_string(KERNEL_VERSION_BUILD_TYPE); + build_tag = (char *)malloc(length+2); + if (length > 0) + { + build_tag[0] = '-'; + for (i = 0; KERNEL_VERSION_BUILD_TYPE[i]; i++) + { + build_tag[i + 1] = KERNEL_VERSION_BUILD_TYPE[i]; + } + build_tag[i+1] = 0; + } + else + build_tag[0] = 0; + } + else if (*build_tag) + { + /* Prepend '-' */ + length = strlen(build_tag); + char *new_build_tag = (char *)malloc(length + 2); + strcpy(new_build_tag, "-"); + strcat(new_build_tag, build_tag); + build_tag = new_build_tag; + } sprintf(buildstr, "%d-r%s", build, GetRev()); @@ -372,7 +393,7 @@ { printf(".%d", KERNEL_VERSION_PATCH_LEVEL); } - printf("-%s (Build %s)\n\n", kernel_version_build_type, buildstr); + printf("%s (Build %s)\n\n", build_tag, buildstr); } /* (Over)write the include file, unless the user switched on -p. */ if (! print_only) @@ -384,8 +405,6 @@ printf ("%s: no code generated", argv [0]); } - free(kernel_version_build_type); - return EXIT_SUCCESS; }

1 0

[cwittich] 31763: don't crash on thread detach - now Diablo 2 videotest isn't crashing anymore
by cwittich＠svn.reactos.org 13 Jan '08

13 Jan '08

Author: cwittich Date: Sun Jan 13 18:42:23 2008 New Revision: 31763 URL: http://svn.reactos.org/svn/reactos?rev=31763&view=rev Log: don't crash on thread detach - now Diablo 2 videotest isn't crashing anymore Modified: trunk/reactos/dll/win32/opengl32/opengl32.c trunk/reactos/dll/win32/opengl32/wgl.c Modified: trunk/reactos/dll/win32/opengl32/opengl32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.c (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.c Sun Jan 13 18:42:23 2008 @@ -91,6 +91,7 @@ if (!HeapFree( GetProcessHeap(), 0, lpData )) DBGPRINT( "Warning: HeapFree() on GLTHREADDATA failed (%d)", GetLastError() ); + lpData = NULL; } dispatchTable = NtCurrentTeb()->glTable; Modified: trunk/reactos/dll/win32/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/wgl.c?r… ============================================================================== --- trunk/reactos/dll/win32/opengl32/wgl.c (original) +++ trunk/reactos/dll/win32/opengl32/wgl.c Sun Jan 13 18:42:23 2008 @@ -978,6 +978,9 @@ DBGTRACE( "Called!" ); + if (OPENGL32_threaddata == NULL) + return FALSE; + /* flush current context */ if (OPENGL32_threaddata->glrc != NULL) {

1 0

[fireball] 31762: - Use new APIs MmHeapAlloc / MmHeapFree for small and discardable memory allocations (not everywhere yet). There is currently no difference, since they all point to the same old memory allocator. - Include bget.h to freeldr.h.
by fireball＠svn.reactos.org 13 Jan '08

13 Jan '08

Author: fireball Date: Sun Jan 13 18:17:54 2008 New Revision: 31762 URL: http://svn.reactos.org/svn/reactos?rev=31762&view=rev Log: - Use new APIs MmHeapAlloc / MmHeapFree for small and discardable memory allocations (not everywhere yet). There is currently no difference, since they all point to the same old memory allocator. - Include bget.h to freeldr.h. Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/fs/iso.c trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c trunk/reactos/boot/freeldr/freeldr/inifile/parse.c trunk/reactos/boot/freeldr/freeldr/mm/mm.c trunk/reactos/boot/freeldr/freeldr/oslist.c trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c trunk/reactos/boot/freeldr/freeldr/reactos/registry.c trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c trunk/reactos/boot/freeldr/freeldr/ui/tui.c trunk/reactos/boot/freeldr/freeldr/ui/ui.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c Sun Jan 13 18:17:54 2008 @@ -131,7 +131,7 @@ // // Allocate the memory to hold the boot sector // - FatVolumeBootSector = (PFAT_BOOTSECTOR) MmAllocateMemory(512); + FatVolumeBootSector = (PFAT_BOOTSECTOR) MmHeapAlloc(512); Fat32VolumeBootSector = (PFAT32_BOOTSECTOR) FatVolumeBootSector; FatXVolumeBootSector = (PFATX_BOOTSECTOR) FatVolumeBootSector; @@ -148,7 +148,7 @@ // If this fails then abort if (!MachDiskReadLogicalSectors(DriveNumber, VolumeStartSector, 1, (PVOID)DISKREADBUFFER)) { - MmFreeMemory(FatVolumeBootSector); + MmHeapFree(FatVolumeBootSector); return FALSE; } RtlCopyMemory(FatVolumeBootSector, (PVOID)DISKREADBUFFER, 512); @@ -247,7 +247,7 @@ sprintf(ErrMsg, "Invalid boot sector magic on drive 0x%x (expected 0xaa55 found 0x%x)", DriveNumber, FatVolumeBootSector->BootSectorMagic); FileSystemError(ErrMsg); - MmFreeMemory(FatVolumeBootSector); + MmHeapFree(FatVolumeBootSector); return FALSE; } @@ -259,7 +259,7 @@ (! ISFATX(FatType) && 64 * 1024 < FatVolumeBootSector->SectorsPerCluster * FatVolumeBootSector->BytesPerSector)) { FileSystemError("This file system has cluster sizes bigger than 64k.\nFreeLoader does not support this."); - MmFreeMemory(FatVolumeBootSector); + MmHeapFree(FatVolumeBootSector); return FALSE; } @@ -332,7 +332,7 @@ return FALSE; } } - MmFreeMemory(FatVolumeBootSector); + MmHeapFree(FatVolumeBootSector); // // Initialize the disk cache for this drive @@ -445,7 +445,7 @@ // Attempt to allocate memory for directory buffer // DbgPrint((DPRINT_FILESYSTEM, "Trying to allocate (DirectorySize) %d bytes.\n", *DirectorySize)); - DirectoryBuffer = MmAllocateMemory(*DirectorySize); + DirectoryBuffer = MmHeapAlloc(*DirectorySize); if (DirectoryBuffer == NULL) { @@ -459,7 +459,7 @@ { if (!FatReadVolumeSectors(FatDriveNumber, RootDirSectorStart, RootDirSectors, DirectoryBuffer)) { - MmFreeMemory(DirectoryBuffer); + MmHeapFree(DirectoryBuffer); return NULL; } } @@ -467,7 +467,7 @@ { if (!FatReadClusterChain(DirectoryStartCluster, 0xFFFFFFFF, DirectoryBuffer)) { - MmFreeMemory(DirectoryBuffer); + MmHeapFree(DirectoryBuffer); return NULL; } } @@ -817,7 +817,7 @@ { if (!FatXSearchDirectoryBufferForFile(DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) { - MmFreeMemory(DirectoryBuffer); + MmHeapFree(DirectoryBuffer); return FALSE; } } @@ -825,12 +825,12 @@ { if (!FatSearchDirectoryBufferForFile(DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) { - MmFreeMemory(DirectoryBuffer); + MmHeapFree(DirectoryBuffer); return FALSE; } } - MmFreeMemory(DirectoryBuffer); + MmHeapFree(DirectoryBuffer); // // If we have another sub-directory to go then @@ -839,7 +839,7 @@ if ((i+1) < NumberOfPathParts) { DirectoryStartCluster = FatFileInfo.FileFatChain[0]; - MmFreeMemory(FatFileInfo.FileFatChain); + MmHeapFree(FatFileInfo.FileFatChain); } } @@ -1007,7 +1007,7 @@ return NULL; } - FileHandle = MmAllocateMemory(sizeof(FAT_FILE_INFO)); + FileHandle = MmHeapAlloc(sizeof(FAT_FILE_INFO)); if (FileHandle == NULL) { @@ -1071,7 +1071,7 @@ // // Allocate array memory // - ArrayPointer = MmAllocateMemory(ArraySize); + ArrayPointer = MmHeapAlloc(ArraySize); if (ArrayPointer == NULL) { @@ -1104,7 +1104,7 @@ // if (!FatGetFatEntry(StartCluster, &StartCluster)) { - MmFreeMemory(ArrayPointer); + MmHeapFree(ArrayPointer); return NULL; } } Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/is… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/iso.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/iso.c Sun Jan 13 18:17:54 2008 @@ -139,7 +139,7 @@ // Attempt to allocate memory for directory buffer // DbgPrint((DPRINT_FILESYSTEM, "Trying to allocate (DirectoryLength) %d bytes.\n", DirectoryLength)); - DirectoryBuffer = MmAllocateMemory(DirectoryLength); + DirectoryBuffer = MmHeapAlloc(DirectoryLength); if (DirectoryBuffer == NULL) { @@ -153,7 +153,7 @@ { if (!MachDiskReadLogicalSectors(IsoDriveNumber, DirectoryStartSector + i, 1, (PVOID)DISKREADBUFFER)) { - MmFreeMemory(DirectoryBuffer); + MmHeapFree(DirectoryBuffer); return NULL; } RtlCopyMemory(Ptr, (PVOID)DISKREADBUFFER, SECTORSIZE); @@ -224,11 +224,11 @@ // if (!IsoSearchDirectoryBufferForFile(DirectoryBuffer, DirectoryLength, PathPart, &IsoFileInfo)) { - MmFreeMemory(DirectoryBuffer); + MmHeapFree(DirectoryBuffer); return FALSE; } - MmFreeMemory(DirectoryBuffer); + MmHeapFree(DirectoryBuffer); // // If we have another sub-directory to go then Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Sun Jan 13 18:17:54 2008 @@ -78,6 +78,7 @@ #include <keycodes.h> #include <ver.h> #include <cmdline.h> +#include <bget.h> /* Needed by boot manager */ #include <bootmgr.h> #include <oslist.h> Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inffi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c (original) +++ trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c Sun Jan 13 18:17:54 2008 @@ -159,7 +159,7 @@ Next = Line->Next; if (Line->Key != NULL) { - MmFreeMemory (Line->Key); + MmHeapFree (Line->Key); Line->Key = NULL; } @@ -167,12 +167,12 @@ while (Line->FirstField != NULL) { Field = Line->FirstField->Next; - MmFreeMemory (Line->FirstField); + MmHeapFree (Line->FirstField); Line->FirstField = Field; } Line->LastField = NULL; - MmFreeMemory (Line); + MmHeapFree (Line); return Next; } @@ -196,7 +196,7 @@ } Section->LastLine = NULL; - MmFreeMemory (Section); + MmHeapFree (Section); return Next; } @@ -245,7 +245,7 @@ /* Allocate and initialize the new section */ Size = sizeof(INFCACHESECTION) + strlen (Name); - Section = (PINFCACHESECTION)MmAllocateMemory (Size); + Section = (PINFCACHESECTION)MmHeapAlloc (Size); if (Section == NULL) { // DPRINT("RtlAllocateHeap() failed\n"); @@ -284,7 +284,7 @@ return NULL; } - Line = (PINFCACHELINE)MmAllocateMemory (sizeof(INFCACHELINE)); + Line = (PINFCACHELINE)MmHeapAlloc (sizeof(INFCACHELINE)); if (Line == NULL) { // DPRINT("RtlAllocateHeap() failed\n"); @@ -320,7 +320,7 @@ if (Line->Key != NULL) return NULL; - Line->Key = (PCHAR)MmAllocateMemory (strlen (Key) + 1); + Line->Key = (PCHAR)MmHeapAlloc (strlen (Key) + 1); if (Line->Key == NULL) return NULL; @@ -338,7 +338,7 @@ ULONG Size; Size = sizeof(INFCACHEFIELD) + strlen(Data); - Field = (PINFCACHEFIELD)MmAllocateMemory (Size); + Field = (PINFCACHEFIELD)MmHeapAlloc (Size); if (Field == NULL) { return NULL; @@ -906,7 +906,7 @@ // DPRINT("File size: %lu\n", FileLength); /* Allocate file buffer */ - FileBuffer = MmAllocateMemory (FileSize + 1); + FileBuffer = MmHeapAlloc (FileSize + 1); if (FileBuffer == NULL) { // DPRINT1("RtlAllocateHeap() failed\n"); @@ -921,7 +921,7 @@ if (!Success) { // DPRINT("FsReadFile() failed\n"); - MmFreeMemory (FileBuffer); + MmHeapFree (FileBuffer); return FALSE; } @@ -929,11 +929,11 @@ FileBuffer[FileSize] = 0; /* Allocate infcache header */ - Cache = (PINFCACHE)MmAllocateMemory (sizeof(INFCACHE)); + Cache = (PINFCACHE)MmHeapAlloc (sizeof(INFCACHE)); if (Cache == NULL) { // DPRINT("RtlAllocateHeap() failed\n"); - MmFreeMemory (FileBuffer); + MmHeapFree (FileBuffer); return FALSE; } @@ -948,12 +948,12 @@ ErrorLine); if (!Success) { - MmFreeMemory (Cache); + MmHeapFree (Cache); Cache = NULL; } /* Free file buffer */ - MmFreeMemory (FileBuffer); + MmHeapFree (FileBuffer); *InfHandle = (HINF)Cache; @@ -979,7 +979,7 @@ } Cache->LastSection = NULL; - MmFreeMemory(Cache); + MmHeapFree(Cache); } Modified: trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c Sun Jan 13 18:17:54 2008 @@ -37,7 +37,7 @@ // Get the file size & allocate enough memory for it FreeLoaderIniFileSize = FsGetFileSize(Freeldr_Ini); - FreeLoaderIniFileData = MmAllocateMemory(FreeLoaderIniFileSize); + FreeLoaderIniFileData = MmHeapAlloc(FreeLoaderIniFileSize); // If we are out of memory then return FALSE if (FreeLoaderIniFileData == NULL) @@ -51,7 +51,7 @@ if (!FsReadFile(Freeldr_Ini, FreeLoaderIniFileSize, NULL, FreeLoaderIniFileData)) { FsCloseFile(Freeldr_Ini); - MmFreeMemory(FreeLoaderIniFileData); + MmHeapFree(FreeLoaderIniFileData); return FALSE; } @@ -60,7 +60,7 @@ // Parse the .ini file data Success = IniParseFile(FreeLoaderIniFileData, FreeLoaderIniFileSize); - MmFreeMemory(FreeLoaderIniFileData); + MmHeapFree(FreeLoaderIniFileData); return Success; } Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c Sun Jan 13 18:17:54 2008 @@ -178,7 +178,7 @@ PINI_SECTION Section; // Allocate a new section structure - Section = MmAllocateMemory(sizeof(INI_SECTION)); + Section = MmHeapAlloc(sizeof(INI_SECTION)); if (!Section) { return FALSE; @@ -187,10 +187,10 @@ RtlZeroMemory(Section, sizeof(INI_SECTION)); // Allocate the section name buffer - Section->SectionName = MmAllocateMemory(strlen(SectionName)); + Section->SectionName = MmHeapAlloc(strlen(SectionName)); if (!Section->SectionName) { - MmFreeMemory(Section); + MmHeapFree(Section); return FALSE; } @@ -212,7 +212,7 @@ PINI_SECTION_ITEM SectionItem; // Allocate a new item structure - SectionItem = MmAllocateMemory(sizeof(INI_SECTION_ITEM)); + SectionItem = MmHeapAlloc(sizeof(INI_SECTION_ITEM)); if (!SectionItem) { return FALSE; @@ -221,19 +221,19 @@ RtlZeroMemory(SectionItem, sizeof(INI_SECTION_ITEM)); // Allocate the setting name buffer - SectionItem->ItemName = MmAllocateMemory(strlen(SettingName) + 1); + SectionItem->ItemName = MmHeapAlloc(strlen(SettingName) + 1); if (!SectionItem->ItemName) { - MmFreeMemory(SectionItem); + MmHeapFree(SectionItem); return FALSE; } // Allocate the setting value buffer - SectionItem->ItemValue = MmAllocateMemory(strlen(SettingValue) + 1); + SectionItem->ItemValue = MmHeapAlloc(strlen(SettingValue) + 1); if (!SectionItem->ItemValue) { - MmFreeMemory(SectionItem->ItemName); - MmFreeMemory(SectionItem); + MmHeapFree(SectionItem->ItemName); + MmHeapFree(SectionItem); return FALSE; } Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/parse.c (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/parse.c Sun Jan 13 18:17:54 2008 @@ -46,7 +46,7 @@ // Start with an 80-byte buffer IniFileLineSize = 80; - IniFileLine = MmAllocateMemory(IniFileLineSize); + IniFileLine = MmHeapAlloc(IniFileLineSize); if (!IniFileLine) { return FALSE; @@ -61,8 +61,8 @@ if (IniFileLineSize < IniGetNextLineSize(IniFileData, IniFileSize, CurrentOffset)) { IniFileLineSize = IniGetNextLineSize(IniFileData, IniFileSize, CurrentOffset); - MmFreeMemory(IniFileLine); - IniFileLine = MmAllocateMemory(IniFileLineSize); + MmHeapFree(IniFileLine); + IniFileLine = MmHeapAlloc(IniFileLineSize); if (!IniFileLine) { return FALSE; @@ -84,21 +84,21 @@ if (IniIsSectionName(IniFileLine, LineLength)) { // Allocate a new section structure - CurrentSection = MmAllocateMemory(sizeof(INI_SECTION)); + CurrentSection = MmHeapAlloc(sizeof(INI_SECTION)); if (!CurrentSection) { - MmFreeMemory(IniFileLine); + MmHeapFree(IniFileLine); return FALSE; } RtlZeroMemory(CurrentSection, sizeof(INI_SECTION)); // Allocate the section name buffer - CurrentSection->SectionName = MmAllocateMemory(IniGetSectionNameSize(IniFileLine, LineLength)); + CurrentSection->SectionName = MmHeapAlloc(IniGetSectionNameSize(IniFileLine, LineLength)); if (!CurrentSection->SectionName) { - MmFreeMemory(CurrentSection); - MmFreeMemory(IniFileLine); + MmHeapFree(CurrentSection); + MmHeapFree(IniFileLine); return FALSE; } @@ -128,31 +128,31 @@ } // Allocate a new item structure - CurrentItem = MmAllocateMemory(sizeof(INI_SECTION_ITEM)); + CurrentItem = MmHeapAlloc(sizeof(INI_SECTION_ITEM)); if (!CurrentItem) { - MmFreeMemory(IniFileLine); + MmHeapFree(IniFileLine); return FALSE; } RtlZeroMemory(CurrentItem, sizeof(INI_SECTION_ITEM)); // Allocate the setting name buffer - CurrentItem->ItemName = MmAllocateMemory(IniGetSettingNameSize(IniFileLine, LineLength)); + CurrentItem->ItemName = MmHeapAlloc(IniGetSettingNameSize(IniFileLine, LineLength)); if (!CurrentItem->ItemName) { - MmFreeMemory(CurrentItem); - MmFreeMemory(IniFileLine); + MmHeapFree(CurrentItem); + MmHeapFree(IniFileLine); return FALSE; } // Allocate the setting value buffer - CurrentItem->ItemValue = MmAllocateMemory(IniGetSettingValueSize(IniFileLine, LineLength)); + CurrentItem->ItemValue = MmHeapAlloc(IniGetSettingValueSize(IniFileLine, LineLength)); if (!CurrentItem->ItemValue) { - MmFreeMemory(CurrentItem->ItemName); - MmFreeMemory(CurrentItem); - MmFreeMemory(IniFileLine); + MmHeapFree(CurrentItem->ItemName); + MmHeapFree(CurrentItem); + MmHeapFree(IniFileLine); return FALSE; } Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c Sun Jan 13 18:17:54 2008 @@ -310,8 +310,8 @@ PVOID MmHeapAlloc(ULONG MemorySize) { - // Stub for WinLdr - return NULL; + // Temporary forwarder... + return MmAllocateMemoryWithType(MemorySize, LoaderOsloaderHeap); } VOID MmHeapFree(PVOID MemoryPointer) Modified: trunk/reactos/boot/freeldr/freeldr/oslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/oslis… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/oslist.c (original) +++ trunk/reactos/boot/freeldr/freeldr/oslist.c Sun Jan 13 18:17:54 2008 @@ -119,8 +119,8 @@ // // Allocate memory to hold operating system list arrays // - OperatingSystemSectionNames = MmAllocateMemory( sizeof(PCHAR) * OperatingSystemCount); - OperatingSystemDisplayNames = MmAllocateMemory( sizeof(PCHAR) * OperatingSystemCount); + OperatingSystemSectionNames = MmHeapAlloc( sizeof(PCHAR) * OperatingSystemCount); + OperatingSystemDisplayNames = MmHeapAlloc( sizeof(PCHAR) * OperatingSystemCount); // // If either allocation failed then return FALSE @@ -129,12 +129,12 @@ { if (OperatingSystemSectionNames != NULL) { - MmFreeMemory(OperatingSystemSectionNames); + MmHeapFree(OperatingSystemSectionNames); } if (OperatingSystemDisplayNames != NULL) { - MmFreeMemory(OperatingSystemDisplayNames); + MmHeapFree(OperatingSystemDisplayNames); } return FALSE; @@ -151,8 +151,8 @@ // for (Idx=0; Idx<OperatingSystemCount; Idx++) { - OperatingSystemSectionNames[Idx] = MmAllocateMemory(80); - OperatingSystemDisplayNames[Idx] = MmAllocateMemory(80); + OperatingSystemSectionNames[Idx] = MmHeapAlloc(80); + OperatingSystemDisplayNames[Idx] = MmHeapAlloc(80); // // If it failed then jump to the cleanup code @@ -177,20 +177,20 @@ { if (OperatingSystemSectionNames[Idx] != NULL) { - MmFreeMemory(OperatingSystemSectionNames[Idx]); + MmHeapFree(OperatingSystemSectionNames[Idx]); } if (OperatingSystemDisplayNames[Idx] != NULL) { - MmFreeMemory(OperatingSystemDisplayNames[Idx]); + MmHeapFree(OperatingSystemDisplayNames[Idx]); } } // // Free operating system list arrays // - MmFreeMemory(OperatingSystemSectionNames); - MmFreeMemory(OperatingSystemDisplayNames); + MmHeapFree(OperatingSystemSectionNames); + MmHeapFree(OperatingSystemDisplayNames); return FALSE; } Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Sun Jan 13 18:17:54 2008 @@ -32,7 +32,7 @@ NTAPI CmpAllocate (SIZE_T Size, BOOLEAN Paged, ULONG Tag) { - return MmAllocateMemory(Size); + return MmHeapAlloc(Size); } @@ -40,7 +40,7 @@ NTAPI CmpFree (PVOID Ptr, IN ULONG Quota) { - return MmFreeMemory(Ptr); + return MmHeapFree(Ptr); } static BOOLEAN @@ -62,7 +62,7 @@ if (ValueCell->Flags & VALUE_COMP_NAME) { - wName = MmAllocateMemory ((ValueCell->NameLength + 1)*sizeof(WCHAR)); + wName = MmHeapAlloc ((ValueCell->NameLength + 1)*sizeof(WCHAR)); for (i = 0; i < ValueCell->NameLength; i++) { wName[i] = ((PCHAR)ValueCell->Name)[i]; @@ -71,7 +71,7 @@ } else { - wName = MmAllocateMemory (ValueCell->NameLength + sizeof(WCHAR)); + wName = MmHeapAlloc (ValueCell->NameLength + sizeof(WCHAR)); memcpy (wName, ValueCell->Name, ValueCell->NameLength); @@ -93,7 +93,7 @@ if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_REGISTRY, "RegSetValue() failed!\n")); - MmFreeMemory (wName); + MmHeapFree (wName); return FALSE; } } @@ -111,12 +111,12 @@ if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_REGISTRY, "RegSetValue() failed!\n")); - MmFreeMemory (wName); + MmHeapFree (wName); return FALSE; } } - MmFreeMemory (wName); + MmHeapFree (wName); return TRUE; } @@ -147,7 +147,7 @@ if (KeyCell->Flags & KEY_COMP_NAME) { - wName = MmAllocateMemory ((KeyCell->NameLength + 1) * sizeof(WCHAR)); + wName = MmHeapAlloc ((KeyCell->NameLength + 1) * sizeof(WCHAR)); for (i = 0; i < KeyCell->NameLength; i++) { wName[i] = ((PCHAR)KeyCell->Name)[i]; @@ -156,7 +156,7 @@ } else { - wName = MmAllocateMemory (KeyCell->NameLength + sizeof(WCHAR)); + wName = MmHeapAlloc (KeyCell->NameLength + sizeof(WCHAR)); memcpy (wName, KeyCell->Name, KeyCell->NameLength); @@ -169,7 +169,7 @@ Error = RegCreateKey (ParentKey, wName, &SubKey); - MmFreeMemory (wName); + MmHeapFree (wName); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_REGISTRY, "RegCreateKey() failed!\n")); Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c Sun Jan 13 18:17:54 2008 @@ -28,7 +28,7 @@ RegInitializeRegistry (VOID) { /* Create root key */ - RootKey = (FRLDRHKEY) MmAllocateMemory (sizeof(KEY)); + RootKey = (FRLDRHKEY) MmHeapAlloc (sizeof(KEY)); InitializeListHead (&RootKey->SubKeyList); InitializeListHead (&RootKey->ValueList); @@ -38,7 +38,7 @@ RootKey->ValueCount = 0; RootKey->NameSize = 4; - RootKey->Name = MmAllocateMemory (4); + RootKey->Name = MmHeapAlloc (4); wcscpy (RootKey->Name, L"\\"); RootKey->DataType = 0; @@ -244,7 +244,7 @@ if (CmpResult != 0) { /* no key found -> create new subkey */ - NewKey = (FRLDRHKEY)MmAllocateMemory(sizeof(KEY)); + NewKey = (FRLDRHKEY)MmHeapAlloc(sizeof(KEY)); if (NewKey == NULL) return(ERROR_OUTOFMEMORY); @@ -262,7 +262,7 @@ CurrentKey->SubKeyCount++; NewKey->NameSize = NameSize; - NewKey->Name = (PWCHAR)MmAllocateMemory(NewKey->NameSize); + NewKey->Name = (PWCHAR)MmHeapAlloc(NewKey->NameSize); if (NewKey->Name == NULL) return(ERROR_OUTOFMEMORY); memcpy(NewKey->Name, name, NewKey->NameSize - sizeof(WCHAR)); @@ -468,7 +468,7 @@ /* set default value */ if ((Key->Data != NULL) && (Key->DataSize > sizeof(PUCHAR))) { - MmFreeMemory(Key->Data); + MmHeapFree(Key->Data); } if (DataSize <= sizeof(PUCHAR)) @@ -479,7 +479,7 @@ } else { - Key->Data = MmAllocateMemory(DataSize); + Key->Data = MmHeapAlloc(DataSize); Key->DataSize = DataSize; Key->DataType = Type; memcpy(Key->Data, Data, DataSize); @@ -508,7 +508,7 @@ /* add new value */ DbgPrint((DPRINT_REGISTRY, "No value found - adding new value\n")); - Value = (PVALUE)MmAllocateMemory(sizeof(VALUE)); + Value = (PVALUE)MmHeapAlloc(sizeof(VALUE)); if (Value == NULL) return(ERROR_OUTOFMEMORY); @@ -516,7 +516,7 @@ Key->ValueCount++; Value->NameSize = (wcslen(ValueName)+1)*sizeof(WCHAR); - Value->Name = (PWCHAR)MmAllocateMemory(Value->NameSize); + Value->Name = (PWCHAR)MmHeapAlloc(Value->NameSize); if (Value->Name == NULL) return(ERROR_OUTOFMEMORY); wcscpy(Value->Name, ValueName); @@ -528,7 +528,7 @@ /* set new value */ if ((Value->Data != NULL) && (Value->DataSize > sizeof(PUCHAR))) { - MmFreeMemory(Value->Data); + MmHeapFree(Value->Data); } if (DataSize <= sizeof(PUCHAR)) @@ -539,7 +539,7 @@ } else { - Value->Data = MmAllocateMemory(DataSize); + Value->Data = MmHeapAlloc(DataSize); if (Value->Data == NULL) return(ERROR_OUTOFMEMORY); Value->DataType = Type; Modified: trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/rtl/l… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c (original) +++ trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c Sun Jan 13 18:17:54 2008 @@ -33,7 +33,7 @@ RtlpAllocateMemory(ULONG Bytes, ULONG Tag) { - return MmAllocateMemory(Bytes); + return MmHeapAlloc(Bytes); } @@ -42,5 +42,5 @@ RtlpFreeMemory(PVOID Mem, ULONG Tag) { - return MmFreeMemory(Mem); + return MmHeapFree(Mem); } Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c Sun Jan 13 18:17:54 2008 @@ -559,7 +559,7 @@ PVOID ScreenBuffer; // Save the screen contents - ScreenBuffer = MmAllocateMemory(UiScreenWidth * UiScreenHeight * 2); + ScreenBuffer = MmHeapAlloc(UiScreenWidth * UiScreenHeight * 2); TuiSaveScreen(ScreenBuffer); // Display the message box @@ -567,7 +567,7 @@ // Restore the screen contents TuiRestoreScreen(ScreenBuffer); - MmFreeMemory(ScreenBuffer); + MmHeapFree(ScreenBuffer); } VOID TuiMessageBoxCritical(PCSTR MessageText) @@ -774,7 +774,7 @@ if (UiUseSpecialEffects && ! MachVideoIsPaletteFixed()) { - TuiFadePalette = (PPALETTE_ENTRY)MmAllocateMemory(sizeof(PALETTE_ENTRY) * 64); + TuiFadePalette = (PPALETTE_ENTRY)MmHeapAlloc(sizeof(PALETTE_ENTRY) * 64); if (TuiFadePalette != NULL) { @@ -789,7 +789,7 @@ if (UiUseSpecialEffects && ! MachVideoIsPaletteFixed() && TuiFadePalette != NULL) { VideoFadeIn(TuiFadePalette, 64); - MmFreeMemory(TuiFadePalette); + MmHeapFree(TuiFadePalette); } } @@ -799,7 +799,7 @@ if (UiUseSpecialEffects && ! MachVideoIsPaletteFixed()) { - TuiFadePalette = (PPALETTE_ENTRY)MmAllocateMemory(sizeof(PALETTE_ENTRY) * 64); + TuiFadePalette = (PPALETTE_ENTRY)MmHeapAlloc(sizeof(PALETTE_ENTRY) * 64); if (TuiFadePalette != NULL) { @@ -817,7 +817,7 @@ if (UiUseSpecialEffects && ! MachVideoIsPaletteFixed() && TuiFadePalette != NULL) { VideoRestorePaletteState(TuiFadePalette, 64); - MmFreeMemory(TuiFadePalette); + MmHeapFree(TuiFadePalette); } } @@ -841,7 +841,7 @@ PVOID ScreenBuffer; // Save the screen contents - ScreenBuffer = MmAllocateMemory(UiScreenWidth * UiScreenHeight * 2); + ScreenBuffer = MmHeapAlloc(UiScreenWidth * UiScreenHeight * 2); TuiSaveScreen(ScreenBuffer); // Find the height @@ -982,7 +982,7 @@ // Restore the screen contents TuiRestoreScreen(ScreenBuffer); - MmFreeMemory(ScreenBuffer); + MmHeapFree(ScreenBuffer); return ReturnCode; } Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/ui.c (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c Sun Jan 13 18:17:54 2008 @@ -465,7 +465,7 @@ //if (MessageBoxTextSize > 0) { // Allocate enough memory to hold the text - MessageBoxText = MmAllocateMemory(MessageBoxTextSize); + MessageBoxText = MmHeapAlloc(MessageBoxTextSize); if (MessageBoxText) { @@ -479,7 +479,7 @@ UiMessageBox(MessageBoxText); // Free the memory - MmFreeMemory(MessageBoxText); + MmHeapFree(MessageBoxText); } } }

1 0

[cwittich] 31761: only allocate a buffer in StartServiceA when dwNumServiceArgs > 0 adjust the image path in services/rpcserver
by cwittich＠svn.reactos.org 13 Jan '08

13 Jan '08

Author: cwittich Date: Sun Jan 13 17:22:55 2008 New Revision: 31761 URL: http://svn.reactos.org/svn/reactos?rev=31761&view=rev Log: only allocate a buffer in StartServiceA when dwNumServiceArgs > 0 adjust the image path in services/rpcserver Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Sun Jan 13 17:22:55 2008 @@ -1058,17 +1058,24 @@ if (dwServiceType & SERVICE_DRIVER) { - /* FIXME: Adjust the image path */ - lpImagePath = (WCHAR*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - (wcslen(lpBinaryPathName) + 1) * sizeof(WCHAR)); + (wcslen(lpBinaryPathName) + 5) * sizeof(WCHAR)); if (lpImagePath == NULL) { dwError = ERROR_NOT_ENOUGH_MEMORY; goto done; } - wcscpy(lpImagePath, lpBinaryPathName); + + if (lpBinaryPathName[1] == L':') + { + wcscpy(lpImagePath, L"\\??\\"); + wcscat(lpImagePath, lpBinaryPathName); + } + else + { + wcscpy(lpImagePath, lpBinaryPathName); + } } /* Allocate a new service entry */ Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c Sun Jan 13 17:22:55 2008 @@ -1998,34 +1998,36 @@ DWORD dwNumServiceArgs, LPCSTR *lpServiceArgVectors) { - LPSTR lpBuffer; + LPSTR lpBuffer = NULL; LPSTR lpStr; DWORD dwError; - DWORD dwBufSize; + DWORD dwBufSize = 0; DWORD i; - dwBufSize = 0; - for (i = 0; i < dwNumServiceArgs; i++) - { - dwBufSize += (strlen(lpServiceArgVectors[i]) + 1); - } - dwBufSize++; - DPRINT1("dwBufSize: %lu\n", dwBufSize); - - lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwBufSize); - if (lpBuffer == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - lpStr = lpBuffer; - for (i = 0; i < dwNumServiceArgs; i++) - { - strcpy(lpStr, lpServiceArgVectors[i]); - lpStr += (strlen(lpServiceArgVectors[i]) + 1); - } - *lpStr = 0; + if (dwNumServiceArgs > 0) + { + for (i = 0; i < dwNumServiceArgs; i++) + { + dwBufSize += (strlen(lpServiceArgVectors[i]) + 1); + } + dwBufSize++; + DPRINT1("dwBufSize: %lu\n", dwBufSize); + + lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwBufSize); + if (lpBuffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + lpStr = lpBuffer; + for (i = 0; i < dwNumServiceArgs; i++) + { + strcpy(lpStr, lpServiceArgVectors[i]); + lpStr += (strlen(lpServiceArgVectors[i]) + 1); + } + *lpStr = 0; + } dwError = ScmrStartServiceA(BindingHandle, (unsigned int)hService, @@ -2033,7 +2035,8 @@ (unsigned char *)lpBuffer, dwBufSize); - HeapFree(GetProcessHeap(), 0, lpBuffer); + if (lpBuffer != NULL) + HeapFree(GetProcessHeap(), 0, lpBuffer); if (dwError != ERROR_SUCCESS) {

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2008