Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jmorlan] 41889: Don't use non-portable %zd format. Instead, use %d and cast the variable to an int to ensure printf can read the argument properly
by jmorlan＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: jmorlan Date: Sat Jul 11 20:16:39 2009 New Revision: 41889 URL: http://svn.reactos.org/svn/reactos?rev=41889&view=rev Log: Don't use non-portable %zd format. Instead, use %d and cast the variable to an int to ensure printf can read the argument properly Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sat Jul 11 20:16:39 2009 @@ -499,8 +499,8 @@ if ( ModuleHandlerInformations[i].cflags && ModuleHandlerInformations[i].cflags[0] ) { fprintf ( fMakefile, - "MODULETYPE%zd_%sFLAGS:=%s\n", - i, + "MODULETYPE%d_%sFLAGS:=%s\n", + (int)i, "C", ModuleHandlerInformations[i].cflags ); } @@ -508,8 +508,8 @@ if ( ModuleHandlerInformations[i].cflags && ModuleHandlerInformations[i].cflags[0] ) { fprintf ( fMakefile, - "MODULETYPE%zd_%sFLAGS:=%s\n", - i, + "MODULETYPE%d_%sFLAGS:=%s\n", + (int)i, "CXX", ModuleHandlerInformations[i].cflags ); } @@ -517,8 +517,8 @@ if ( ModuleHandlerInformations[i].nasmflags && ModuleHandlerInformations[i].nasmflags[0] ) { fprintf ( fMakefile, - "MODULETYPE%zd_%sFLAGS:=%s\n", - i, + "MODULETYPE%d_%sFLAGS:=%s\n", + (int)i, "NASM", ModuleHandlerInformations[i].nasmflags ); }

1 0

[mkupfer] 41888: make status window parts more flexible in size
by mkupfer＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: mkupfer Date: Sat Jul 11 19:59:46 2009 New Revision: 41888 URL: http://svn.reactos.org/svn/reactos?rev=41888&view=rev Log: make status window parts more flexible in size Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c trunk/reactos/base/applications/taskmgr/taskmgr.h Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Sat Jul 11 19:59:46 2009 @@ -459,9 +459,9 @@ return FALSE; /* Create the status bar panes */ - nParts[0] = 100; - nParts[1] = 210; - nParts[2] = 400; + nParts[0] = STATUS_SIZE1; + nParts[1] = STATUS_SIZE2; + nParts[2] = STATUS_SIZE3; SendMessageW(hStatusWnd, SB_SETPARTS, 3, (LPARAM) (LPINT) nParts); /* Create tab pages */ @@ -638,8 +638,8 @@ SendMessageW(hStatusWnd, WM_SIZE, nType, MAKELPARAM(cx,rc.bottom - rc.top)); /* Update the status bar pane sizes */ - nParts[0] = bInMenuLoop ? -1 : 100; - nParts[1] = 210; + nParts[0] = bInMenuLoop ? -1 : STATUS_SIZE1; + nParts[1] = STATUS_SIZE2; nParts[2] = cx; SendMessageW(hStatusWnd, SB_SETPARTS, bInMenuLoop ? 1 : 3, (LPARAM) (LPINT) nParts); @@ -792,8 +792,8 @@ bInMenuLoop = FALSE; /* Update the status bar pane sizes */ GetClientRect(hWnd, &rc); - nParts[0] = 100; - nParts[1] = 210; + nParts[0] = STATUS_SIZE1; + nParts[1] = STATUS_SIZE2; nParts[2] = rc.right; SendMessageW(hStatusWnd, SB_SETPARTS, 3, (LPARAM) (LPINT) nParts); SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)L""); Modified: trunk/reactos/base/applications/taskmgr/taskmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.h [iso-8859-1] Sat Jul 11 19:59:46 2009 @@ -47,6 +47,9 @@ #define RUN_PERF_PAGE #define STATUS_WINDOW 2001 +#define STATUS_SIZE1 80 +#define STATUS_SIZE2 210 +#define STATUS_SIZE3 400 typedef struct {

1 0

[dchapyshev] 41887: - Fix 3 "kernel32_winetest environ" tests. All environ tests passed now
by dchapyshev＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: dchapyshev Date: Sat Jul 11 18:18:06 2009 New Revision: 41887 URL: http://svn.reactos.org/svn/reactos?rev=41887&view=rev Log: - Fix 3 "kernel32_winetest environ" tests. All environ tests passed now Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/computername.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/computername.c [iso-8859-1] Sat Jul 11 18:18:06 2009 @@ -92,10 +92,18 @@ return FALSE; } - if (*nSize > (KeyInfo->DataLength / sizeof(WCHAR))) + if (lpBuffer && *nSize > (KeyInfo->DataLength / sizeof(WCHAR))) { *nSize = KeyInfo->DataLength / sizeof(WCHAR) - 1; lpBuffer[*nSize] = 0; + } + else + { + RtlFreeHeap(RtlGetProcessHeap(), 0, KeyInfo); + ZwClose(KeyHandle); + *nSize = ReturnSize; + SetLastErrorByStatus(STATUS_BUFFER_OVERFLOW); + return FALSE; } RtlCopyMemory(lpBuffer, KeyInfo->Data, *nSize * sizeof(WCHAR)); @@ -254,7 +262,8 @@ if (!TempBuffer) { - return ERROR_OUTOFMEMORY; + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; } AnsiString.MaximumLength = (USHORT)*nSize;

1 0

[janderwald] 41886: [KMIXER] - Set KSCREATE_ITEM_WILDCARD flag to receive all requests in one handler -- Kmixer is now back accessible
by janderwald＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: janderwald Date: Sat Jul 11 17:52:36 2009 New Revision: 41886 URL: http://svn.reactos.org/svn/reactos?rev=41886&view=rev Log: [KMIXER] - Set KSCREATE_ITEM_WILDCARD flag to receive all requests in one handler -- Kmixer is now back accessible Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c [iso-8859-1] Sat Jul 11 17:52:36 2009 @@ -201,7 +201,7 @@ if (Buffer) { /* is the request for a new pin */ - if (!wcsstr(KS_NAME_PIN, Buffer)) + if (wcsstr(Buffer, KS_NAME_PIN)) { Status = CreatePin(Irp); @@ -254,6 +254,7 @@ /* initialize create item struct */ RtlZeroMemory(CreateItem, sizeof(KSOBJECT_CREATE_ITEM)); CreateItem->Create = DispatchCreateKMix; + CreateItem->Flags = KSCREATE_ITEM_WILDCARD; RtlInitUnicodeString(&CreateItem->ObjectClass, L"KMixer"); Status = KsAllocateDeviceHeader(&DeviceExtension->KsDeviceHeader,

1 0

[mjmartin] 41885: - NtMapViewOfSection: When referencing the section object by handle, don't assume access mask of SECTION_MAP_READ. Access mask must be determined from page protection attributes passed in Protect parameter. Fixes 5 winetests for kernel32 virtual.
by mjmartin＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: mjmartin Date: Sat Jul 11 17:40:56 2009 New Revision: 41885 URL: http://svn.reactos.org/svn/reactos?rev=41885&view=rev Log: - NtMapViewOfSection: When referencing the section object by handle, don't assume access mask of SECTION_MAP_READ. Access mask must be determined from page protection attributes passed in Protect parameter. Fixes 5 winetests for kernel32 virtual. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Jul 11 17:40:56 2009 @@ -3729,6 +3729,7 @@ PMMSUPPORT AddressSpace; NTSTATUS Status = STATUS_SUCCESS; ULONG tmpProtect; + ACCESS_MASK DesiredAccess; /* * Check the protection @@ -3807,8 +3808,27 @@ AddressSpace = &Process->Vm; + /* Convert NT Protection Attr to Access Mask */ + if (Protect == PAGE_READONLY) + { + DesiredAccess = SECTION_MAP_READ; + } + else if (Protect == PAGE_READWRITE) + { + DesiredAccess = SECTION_MAP_WRITE; + } + else if (Protect == PAGE_WRITECOPY) + { + DesiredAccess = SECTION_QUERY; + } + /* FIXME: Handle other Protection Attributes. For now keep previous behavior */ + else + { + DesiredAccess = SECTION_MAP_READ; + } + Status = ObReferenceObjectByHandle(SectionHandle, - SECTION_MAP_READ, + DesiredAccess, MmSectionObjectType, PreviousMode, (PVOID*)(PVOID)&Section,

1 0

[dchapyshev] 41884: - Fix one "kernel32_winetest time" test. All time tests passed now
by dchapyshev＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: dchapyshev Date: Sat Jul 11 17:35:38 2009 New Revision: 41884 URL: http://svn.reactos.org/svn/reactos?rev=41884&view=rev Log: - Fix one "kernel32_winetest time" test. All time tests passed now Modified: trunk/reactos/dll/win32/kernel32/misc/time.c Modified: trunk/reactos/dll/win32/kernel32/misc/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ti… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/time.c [iso-8859-1] Sat Jul 11 17:35:38 2009 @@ -204,6 +204,27 @@ } /*********************************************************************** + * TIME_TimeZoneID + * + * Calculates whether daylight savings is on now. + * + * PARAMS + * pTzi [in] Timezone info. + * + * RETURNS + * TIME_ZONE_ID_INVALID An error occurred + * TIME_ZONE_ID_UNKNOWN There are no transition time known + * TIME_ZONE_ID_STANDARD Current time is standard time + * TIME_ZONE_ID_DAYLIGHT Current time is daylight savings time + */ +static DWORD TIME_ZoneID( const TIME_ZONE_INFORMATION *pTzi ) +{ + FILETIME ftTime; + GetSystemTimeAsFileTime( &ftTime); + return TIME_CompTimeZoneID( pTzi, &ftTime, FALSE); +} + +/*********************************************************************** * TIME_GetTimezoneBias * * Calculates the local time bias for a given time zone. @@ -534,7 +555,7 @@ return TIME_ZONE_ID_INVALID; } - return(SharedUserData->TimeZoneId); + return TIME_ZoneID(lpTimeZoneInformation); }

1 0

[mkupfer] 41883: use application icon for about dialog
by mkupfer＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: mkupfer Date: Sat Jul 11 17:34:18 2009 New Revision: 41883 URL: http://svn.reactos.org/svn/reactos?rev=41883&view=rev Log: use application icon for about dialog Modified: trunk/reactos/base/applications/mplay32/mplay32.c trunk/reactos/base/applications/mplay32/mplay32.rbuild Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Sat Jul 11 17:34:18 2009 @@ -641,9 +641,12 @@ break; case IDM_ABOUT: - ShellAbout(hwnd, szAppTitle, 0, 0); - break; - + { + HICON mplayIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN)); + ShellAbout(hwnd, szAppTitle, 0, mplayIcon); + DeleteObject(mplayIcon); + break; + } case IDM_EXIT: PostMessage(hwnd, WM_CLOSE, 0, 0); return 0; Modified: trunk/reactos/base/applications/mplay32/mplay32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.rbuild [iso-8859-1] Sat Jul 11 17:34:18 2009 @@ -5,6 +5,7 @@ <library>comdlg32</library> <library>kernel32</library> <library>user32</library> + <library>gdi32</library> <library>winmm</library> <library>shell32</library> <file>mplay32.c</file>

1 0

[ros-arm-bringup] 41882: Fix the signature of tcsrchr. The last prameter is a TCHAR, not a XINT.
by ros-arm-bringup＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: ros-arm-bringup Date: Sat Jul 11 17:12:09 2009 New Revision: 41882 URL: http://svn.reactos.org/svn/reactos?rev=41882&view=rev Log: Fix the signature of tcsrchr. The last prameter is a TCHAR, not a XINT. Modified: trunk/reactos/lib/sdk/crt/string/tcsrchr.h Modified: trunk/reactos/lib/sdk/crt/string/tcsrchr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/tcsrchr… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/tcsrchr.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/tcsrchr.h [iso-8859-1] Sat Jul 11 17:12:09 2009 @@ -3,7 +3,7 @@ #include <tchar.h> -_TCHAR * _tcsrchr(const _TCHAR * s, _XINT c) +_TCHAR * _tcsrchr(const _TCHAR * s, _TCHAR c) { _TCHAR cc = c; const _TCHAR * sp = (_TCHAR *)0;

1 0

[ros-arm-bringup] 41881: Don't build stack-based WINE exception handling on ARM -- we have .pdata
by ros-arm-bringup＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: ros-arm-bringup Date: Sat Jul 11 17:11:44 2009 New Revision: 41881 URL: http://svn.reactos.org/svn/reactos?rev=41881&view=rev Log: Don't build stack-based WINE exception handling on ARM -- we have .pdata Modified: trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h Modified: trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] Sat Jul 11 17:11:44 2009 @@ -52,6 +52,7 @@ #define EH_STACK_INVALID 0x08 #define EH_NESTED_CALL 0x10 +#ifndef _M_ARM static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) { frame->Next = (struct _EXCEPTION_REGISTRATION_RECORD *)__readfsdword(0); @@ -64,6 +65,7 @@ __writefsdword(0, (unsigned long)frame->Next); return frame->Next; } +#endif #define __TRY _SEH2_TRY #define __EXCEPT(func) _SEH2_EXCEPT(func(_SEH2_GetExceptionInformation()))

1 0

[ros-arm-bringup] 41880: *** WE WILL NOW BE FOCUSING AND BUILDING FOR ARM CORTEX-A8 (ARMv7) *** *** SUPPORT FOR ARMv6 WILL ALSO BE ENFORCED, BUT NOTHING LOWER *** *** THE TARGET PLATFORM IS TI OMAP3-35xx and OMAP3-34xx ***
by ros-arm-bringup＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: ros-arm-bringup Date: Sat Jul 11 17:04:46 2009 New Revision: 41880 URL: http://svn.reactos.org/svn/reactos?rev=41880&view=rev Log: *** WE WILL NOW BE FOCUSING AND BUILDING FOR ARM CORTEX-A8 (ARMv7) *** *** SUPPORT FOR ARMv6 WILL ALSO BE ENFORCED, BUT NOTHING LOWER *** *** THE TARGET PLATFORM IS TI OMAP3-35xx and OMAP3-34xx *** Modified: trunk/reactos/config-arm.template.rbuild Modified: trunk/reactos/config-arm.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-arm.template.rbuild… ============================================================================== --- trunk/reactos/config-arm.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config-arm.template.rbuild [iso-8859-1] Sat Jul 11 17:04:46 2009 @@ -15,19 +15,19 @@  -<property name="SARCH" value="versatile" /> +<property name="SARCH" value="omap3" />  -<property name="OARCH" value="armv5te" /> +<property name="OARCH" value="armv7-a" /> <!--

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