Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 28912: - Remove FF2.0 from Downloader (it doesn't work in 0.3.3).
by fireball＠svn.reactos.org 07 Sep '07

07 Sep '07

Author: fireball Date: Fri Sep 7 12:35:15 2007 New Revision: 28912 URL: http://svn.reactos.org/svn/reactos?rev=28912&view=rev Log: - Remove FF2.0 from Downloader (it doesn't work in 0.3.3). Modified: branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml Modified: branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/rosapps/do… ============================================================================== --- branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml (original) +++ branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml Fri Sep 7 12:35:15 2007 @@ -6,13 +6,6 @@ <version>1.5.0.9</version> <description>The most popular and one of the best free Web Browsers out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/1.5.0.9/wi…</location> - </application> - <application name="Firefox 2.0"> - <regname>Mozilla Firefox (2.0.0.6)</regname> - <licence>MPL/GPL/LGPL</licence> - <version>2.0.0.6</version> - <description>The most popular and one of the best free Web Browsers out there.</description> - <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/latest/win…</location> </application> <application name="Thunderbird 1.5"> <regname>Mozilla Thunderbird (1.5)</regname>

1 0

[tkreuzer] 28911: - add NTMW_INTERNAL structure - better structure implementation for ENUMFONTDATAW - change NewEnumFontFamiliesEx to use the new structure - some fixes and comments
by tkreuzer＠svn.reactos.org 07 Sep '07

07 Sep '07

Author: tkreuzer Date: Fri Sep 7 07:33:00 2007 New Revision: 28911 URL: http://svn.reactos.org/svn/reactos?rev=28911&view=rev Log: - add NTMW_INTERNAL structure - better structure implementation for ENUMFONTDATAW - change NewEnumFontFamiliesEx to use the new structure - some fixes and comments Modified: trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Fri Sep 7 07:33:00 2007 @@ -1321,59 +1321,67 @@ LPARAM lParam, DWORD dwFlags) { - ULONG_PTR idEnum, ulCount, ulSize; + ULONG_PTR idEnum, cbDataSize, cbRetSize; PENUMFONTDATAW pEfdw; PBYTE pBuffer; PBYTE pMax; INT ret = 1; + /* Open enumeration handle and find out how much memory we need */ idEnum = NtGdiEnumFontOpen(hDC, EfdFontFamilies, 0, LF_FACESIZE, - lpLogfont->lfFaceName, - lpLogfont->lfCharSet, - &ulCount); + (lpLogfont && lpLogfont->lfFaceName[0])? lpLogfont->lfFaceName : NULL, + lpLogfont? lpLogfont->lfCharSet : DEFAULT_CHARSET, + &cbDataSize); if (idEnum == 0) { return 0; } - if (ulCount == 0) + if (cbDataSize == 0) { NtGdiEnumFontClose(idEnum); return 0; } - pBuffer = HeapAlloc(GetProcessHeap(), 0, ulCount); + /* Allocate memory */ + pBuffer = HeapAlloc(GetProcessHeap(), 0, cbDataSize); if (pBuffer == NULL) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); NtGdiEnumFontClose(idEnum); return 0; } - pMax = pBuffer + ulCount; - - if (!NtGdiEnumFontChunk(hDC, idEnum, ulCount, &ulSize, (PVOID)pBuffer)) + + /* Do the enumeration */ + if (!NtGdiEnumFontChunk(hDC, idEnum, cbDataSize, &cbRetSize, (PVOID)pBuffer)) { HeapFree(GetProcessHeap(), 0, pBuffer); NtGdiEnumFontClose(idEnum); return 0; } - /* Iterate through the structures */ - for (pEfdw = (PENUMFONTDATAW)pBuffer; - (PBYTE)pEfdw < pMax && pEfdw->cbSize != 0 && ret != 0; - pEfdw = (PENUMFONTDATAW)((PBYTE)pEfdw + pEfdw->cbSize)) - { - ENUMLOGFONTEXW *pElfew = &pEfdw->efdi.elfex; - NEWTEXTMETRICEXW *pNtmew = (NEWTEXTMETRICEXW*)((PBYTE)&pEfdw->efdi + pEfdw->efdi.cbSize + sizeof(DWORD)); // FIXME - DWORD dwFontType = pEfdw->efdi.dwFontType; - ret = lpEnumFontFamExProcW(pElfew, pNtmew, dwFontType, lParam); + /* Get start and end address */ + pEfdw = (PENUMFONTDATAW)pBuffer; + pMax = pBuffer + cbDataSize; + + /* Iterate through the structures */ + while ((PBYTE)pEfdw < pMax && ret) + { + PNTMW_INTERNAL pNtmwi = (PNTMW_INTERNAL)((ULONG_PTR)pEfdw + pEfdw->ulNtmwiOffset); + + ret = lpEnumFontFamExProcW(&pEfdw->elfexdv.elfEnumLogfontEx, + &pNtmwi->ntmw, + pEfdw->dwFontType, + lParam); + + pEfdw = (PENUMFONTDATAW)((ULONG_PTR)pEfdw + pEfdw->cbSize); } + /* Release the memory and close handle */ HeapFree(GetProcessHeap(), 0, pBuffer); NtGdiEnumFontClose(idEnum); return ret; } - - Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Fri Sep 7 07:33:00 2007 @@ -120,32 +120,20 @@ TMDIFF Diff; } TMW_INTERNAL, *PTMW_INTERNAL; -typedef struct +typedef struct _NTMW_INTERNAL { - ULONG cbSize; - DWORD dwFontType; - ENUMLOGFONTEXW elfex; -/* - * Yuan 14.5: - * DESIGNVECTOR is a variable-size data structure that specifies the number of - * axes and a value for each axis. - * So it maybe smaller than MM_MAX_NUMAXES. - */ - DESIGNVECTOR dv; -} ENUMFONTDATAINTW, *PENUMFONTDATAINTW; + TMDIFF tmd; + NEWTEXTMETRICEXW ntmw; +} NTMW_INTERNAL, *PNTMW_INTERNAL; -/* Warning: this structure is of variable size! - * It is only to access the cbSize and efdi member. - * The rest of the structure has to be parsed. */ typedef struct _ENUMFONTDATAW { ULONG cbSize; - ENUMFONTDATAINTW efdi; -/* The following 2 members do not have a constant offset! */ -/* DWORD dwFlags; - ENUMTEXTMETRICW etm; */ + ULONG ulNtmwiOffset; + DWORD dwFontType; + ENUMLOGFONTEXDVW elfexdv; /* variable size! */ + /* NTMW_INTERNAL ntmwi; use ulNtwmOffset */ } ENUMFONTDATAW, *PENUMFONTDATAW; - /* Number Representation */ typedef struct _EFLOAT_S

1 0

[janderwald] 28910: - format hdd images with raw format - improve error checking
by janderwald＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: janderwald Date: Fri Sep 7 02:49:05 2007 New Revision: 28910 URL: http://svn.reactos.org/svn/reactos?rev=28910&view=rev Log: - format hdd images with raw format - improve error checking Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Fri Sep 7 02:49:05 2007 @@ -187,25 +187,28 @@ cerr << "Error: ROS_EMU_PATH must contain the path to qemu and qemu-img " << qemuimgdir << endl; return false; } - - TCHAR * options[] = { NULL, - _T("create"), - NULL, - _T("100M"), - NULL + _tremove(image.c_str ()); + + TCHAR * options[] = {NULL, + _T("create"), + _T("-f"), + _T("raw"), + NULL, + _T("100M"), + NULL }; options[0] = (TCHAR*)qemuimgdir.c_str(); - options[2] = (TCHAR*)image.c_str(); + options[4] = (TCHAR*)image.c_str(); cerr << "Creating HDD Image ..." << image << endl; - if (OsSupport::createProcess ((TCHAR*)qemuimgdir.c_str(), 4, options, true)) + OsSupport::createProcess ((TCHAR*)qemuimgdir.c_str(), 6, options, true); + if (isFileExisting(image)) { m_HDDImage = image; return true; } - return false; } //----------------------------------------------------------------------------------------

1 0

[gedmurphy] 28909: silence debug output
by gedmurphy＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: gedmurphy Date: Fri Sep 7 01:37:58 2007 New Revision: 28909 URL: http://svn.reactos.org/svn/reactos?rev=28909&view=rev Log: silence debug output Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c Fri Sep 7 01:37:58 2007 @@ -579,7 +579,7 @@ if (ret && ClipboardOwnerWindow) { - DPRINT1("Clipboard: WM_DESTROYCLIPBOARD to %p", ClipboardOwnerWindow->hSelf); + DPRINT("Clipboard: WM_DESTROYCLIPBOARD to %p", ClipboardOwnerWindow->hSelf); co_IntSendMessage( ClipboardOwnerWindow->hSelf, WM_DESTROYCLIPBOARD, 0, 0); }

1 0

[janderwald] 28908: - fix bug in GetCPFileNameFromRegistry spotted by Daniel Zimmermann ; )
by janderwald＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: janderwald Date: Fri Sep 7 00:18:15 2007 New Revision: 28908 URL: http://svn.reactos.org/svn/reactos?rev=28908&view=rev Log: - fix bug in GetCPFileNameFromRegistry spotted by Daniel Zimmermann ;) Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c Fri Sep 7 00:18:15 2007 @@ -854,6 +854,7 @@ if (NT_SUCCESS(Status) && Kvpi->Type == REG_SZ && Kvpi->DataLength > sizeof(WCHAR)) { + bRetValue = TRUE; if (FileName != NULL) { lstrcpynW(FileName, (WCHAR*)Kvpi->Data,

1 0

[janderwald] 28907: - terminate comment by Marc Puilachs See issue #2611 for more details.
by janderwald＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: janderwald Date: Fri Sep 7 00:00:19 2007 New Revision: 28907 URL: http://svn.reactos.org/svn/reactos?rev=28907&view=rev Log: - terminate comment by Marc Puilachs See issue #2611 for more details. Modified: trunk/reactos/include/psdk/multimon.h Modified: trunk/reactos/include/psdk/multimon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/multimon.h?re… ============================================================================== --- trunk/reactos/include/psdk/multimon.h (original) +++ trunk/reactos/include/psdk/multimon.h Fri Sep 7 00:00:19 2007 @@ -13,4 +13,4 @@ } #endif -#endif /* __MULTIMON_H &/ +#endif /* __MULTIMON_H */

1 0

[janderwald] 28906: - fix memory leak in GetCPFileNameFromRegistry - bug report + patch by Daniel Zimmermann / netzimme@aol.com See issue #2637 for more details.
by janderwald＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: janderwald Date: Thu Sep 6 23:57:19 2007 New Revision: 28906 URL: http://svn.reactos.org/svn/reactos?rev=28906&view=rev Log: - fix memory leak in GetCPFileNameFromRegistry - bug report + patch by Daniel Zimmermann / netzimme(a)aol.com See issue #2637 for more details. Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c Thu Sep 6 23:57:19 2007 @@ -813,12 +813,15 @@ HANDLE KeyHandle; PKEY_VALUE_PARTIAL_INFORMATION Kvpi; DWORD KvpiSize; + BOOL bRetValue; + + bRetValue = FALSE; /* Convert the codepage number to string. */ ValueName.Buffer = ValueNameBuffer; ValueName.MaximumLength = sizeof(ValueNameBuffer); if (!NT_SUCCESS(RtlIntegerToUnicodeString(CodePage, 10, &ValueName))) - return FALSE; + return bRetValue; /* Open the registry key containing file name mappings. */ RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\System\\" @@ -828,17 +831,17 @@ Status = NtOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); if (!NT_SUCCESS(Status)) { - return FALSE; + return bRetValue; } /* Allocate buffer that will be used to query the value data. */ KvpiSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + (MAX_PATH * sizeof(WCHAR)); - Kvpi = HeapAlloc(GetProcessHeap(), 0, KvpiSize); + Kvpi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, KvpiSize); if (Kvpi == NULL) { NtClose(KeyHandle); - return FALSE; + return bRetValue; } /* Query the file name for our code page. */ @@ -856,10 +859,11 @@ lstrcpynW(FileName, (WCHAR*)Kvpi->Data, min(Kvpi->DataLength / sizeof(WCHAR), FileNameSize)); } - return TRUE; - } - - return FALSE; + } + + /* free temporary buffer */ + HeapFree(GetProcessHeap(),0,Kvpi); + return bRetValue; } /**

1 0

[janderwald] 28905: - there can be only one instance of the device manager
by janderwald＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: janderwald Date: Thu Sep 6 23:45:26 2007 New Revision: 28905 URL: http://svn.reactos.org/svn/reactos?rev=28905&view=rev Log: - there can be only one instance of the device manager Modified: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c Modified: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c Thu Sep 6 23:45:26 2007 @@ -11,6 +11,7 @@ HINSTANCE hInstance; HANDLE ProcessHeap; +HANDLE hMutex; int WINAPI _tWinMain(HINSTANCE hThisInstance, @@ -23,6 +24,18 @@ MSG Msg; int Ret = 1; INITCOMMONCONTROLSEX icex; + + hMutex = CreateMutex(NULL, TRUE, _T("devmgmt_mutex")); + if (hMutex == NULL || GetLastError() == ERROR_ALREADY_EXISTS) + { + if (hMutex) + { + CloseHandle(hMutex); + } + return 0; + } + + hInstance = hThisInstance; ProcessHeap = GetProcessHeap(); @@ -59,7 +72,7 @@ } LocalFree((HLOCAL)lpAppName); - + CloseHandle(hMutex); return Ret; }

1 0

[dreimer] 28904: Get ready for 0.3.8. (once more)
by dreimer＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: dreimer Date: Thu Sep 6 22:11:35 2007 New Revision: 28904 URL: http://svn.reactos.org/svn/reactos?rev=28904&view=rev Log: Get ready for 0.3.8. (once more) Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/README.txt trunk/tools/RosBE-Windows/Root/readme.pdf Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Thu Sep 6 22:11:35 2007 @@ -7,7 +7,7 @@ - Other small Bugfixes (Daniel Reimer) - Updated to NSIS 2.30. (Daniel Reimer) - Updated Binutils 2.17.50 to Build 20070806 (Daniel Reimer) -- Updated: GCC 4.1.3 Build 20070826 (Daniel Reimer) +- Updated: GCC 4.1.3 Build 20070829 (Daniel Reimer) *** Aug XXst, 2007 - RosBE 0.3.7.2 Released (Unsupported) Modified: trunk/tools/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.tx… ============================================================================== --- trunk/tools/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE-Windows/Root/README.txt Thu Sep 6 22:11:35 2007 @@ -16,7 +16,7 @@ w32api-3.10 mingw32-make-3.81-2 nasm-0.99.02-win32 -mingw-4.1.3-20070826-prerelease +mingw-4.1.3-20070829-prerelease - Patched to fix a GCC bug concerning decorating virtual methods with stdcall in C++, see GCC issue: Modified: trunk/tools/RosBE-Windows/Root/readme.pdf URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/readme.pd… ============================================================================== Binary files - no diff available.

1 0

[fireball] 28903: - Fix LoaderPagesSpanned calculation.
by fireball＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: fireball Date: Thu Sep 6 21:18:42 2007 New Revision: 28903 URL: http://svn.reactos.org/svn/reactos?rev=28903&view=rev Log: - Fix LoaderPagesSpanned calculation. Modified: trunk/reactos/ntoskrnl/ke/freeldr.c Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Thu Sep 6 21:18:42 2007 @@ -1111,11 +1111,13 @@ LoaderBlock->Extension->MajorVersion = 5; LoaderBlock->Extension->MinorVersion = 2; - /* Save the number of pages the kernel images take */ - LoaderBlock->Extension->LoaderPagesSpanned = - PAGE_ROUND_UP(KeRosLoaderBlock-> - ModsAddr[KeRosLoaderBlock->ModsCount - 1].ModEnd) - - KeRosLoaderBlock->ModsAddr[0].ModStart; + /* FreeLDR hackllocates 1536 static pages for the initial boot images */ + LoaderBlock->Extension->LoaderPagesSpanned = 1536 * PAGE_SIZE; + + /* ReactOS always boots the kernel at 0x80800000 (just like NT 5.2) */ + LoaderBlock->Extension->LoaderPagesSpanned += 0x80800000 - KSEG0_BASE; + + /* Now convert to pages */ LoaderBlock->Extension->LoaderPagesSpanned /= PAGE_SIZE; /* Now setup the setup block if we have one */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs