Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 33341: (Nt)UserGetWindowDC returns a HDC, not a DWORD
by tkreuzer＠svn.reactos.org 07 May '08

07 May '08

Author: tkreuzer Date: Wed May 7 09:11:01 2008 New Revision: 33341 URL: http://svn.reactos.org/svn/reactos?rev=33341&view=rev Log: (Nt)UserGetWindowDC returns a HDC, not a DWORD Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/userfuncs.h trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/color.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/print.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed May 7 09:11:01 2008 @@ -1485,7 +1485,7 @@ HRGN hRgn, BOOL bErase); -DWORD +HDC NTAPI NtUserGetWindowDC( HWND hWnd); Modified: trunk/reactos/subsystems/win32/win32k/include/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/userfuncs.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/userfuncs.h [iso-8859-1] Wed May 7 09:11:01 2008 @@ -67,7 +67,7 @@ HDC FASTCALL UserGetDCEx(PWINDOW_OBJECT Window OPTIONAL, HANDLE ClipRegion, ULONG Flags); -DWORD FASTCALL +HDC FASTCALL UserGetWindowDC(PWINDOW_OBJECT Wnd); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Wed May 7 09:11:01 2008 @@ -837,10 +837,10 @@ return nRet; } -DWORD FASTCALL +HDC FASTCALL UserGetWindowDC(PWINDOW_OBJECT Wnd) { - return (DWORD)UserGetDCEx(Wnd, 0, DCX_USESTYLE | DCX_WINDOW); + return UserGetDCEx(Wnd, 0, DCX_USESTYLE | DCX_WINDOW); } HDC STDCALL @@ -877,10 +877,10 @@ * Status * @implemented */ -DWORD STDCALL +HDC STDCALL NtUserGetWindowDC(HWND hWnd) { - return (DWORD)NtUserGetDCEx(hWnd, 0, DCX_USESTYLE | DCX_WINDOW); + return NtUserGetDCEx(hWnd, 0, DCX_USESTYLE | DCX_WINDOW); } HDC STDCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] Wed May 7 09:11:01 2008 @@ -118,7 +118,7 @@ /* Immediately apply the new palette if current window uses it */ Wnd = UserGetDesktopWindow(); - hDC = (HDC)UserGetWindowDC(Wnd); + hDC = UserGetWindowDC(Wnd); dc = DC_LockDc(hDC); if (NULL != dc) { Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Wed May 7 09:11:01 2008 @@ -2796,7 +2796,7 @@ PDC pDC; DesktopObject = UserGetDesktopWindow(); - DesktopHDC = (HDC)UserGetWindowDC(DesktopObject); + DesktopHDC = UserGetWindowDC(DesktopObject); pDC = DC_LockDc(DesktopHDC); *DisplayNumber = ((GDIDEVICE *)pDC->pPDev)->DisplayNumber; @@ -3320,7 +3320,7 @@ return FALSE; } - hDC = (HDC)UserGetWindowDC(Wnd); + hDC = UserGetWindowDC(Wnd); DC = DC_LockDc(hDC); if (NULL == DC) Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] Wed May 7 09:11:01 2008 @@ -164,7 +164,7 @@ if (hDC == 0) { - hDC = (HDC)UserGetWindowDC(NULL); + hDC = UserGetWindowDC(NULL); } pDC = DC_LockDc(hDC);

1 0

[fireball] 33340: - Fix uninitialized Callback var usage, spotted by Stefan Ginsberg. Probably fixes bug 3214. See issue #3214 for more details.
by fireball＠svn.reactos.org 07 May '08

07 May '08

Author: fireball Date: Wed May 7 05:06:07 2008 New Revision: 33340 URL: http://svn.reactos.org/svn/reactos?rev=33340&view=rev Log: - Fix uninitialized Callback var usage, spotted by Stefan Ginsberg. Probably fixes bug 3214. See issue #3214 for more details. Modified: trunk/reactos/ntoskrnl/lpc/send.c Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=33… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] Wed May 7 05:06:07 2008 @@ -180,7 +180,7 @@ NTSTATUS Status = STATUS_SUCCESS; PLPCP_MESSAGE Message; PETHREAD Thread = PsGetCurrentThread(); - BOOLEAN Callback; + BOOLEAN Callback = FALSE; PKSEMAPHORE Semaphore; ULONG MessageType; PAGED_CODE();

1 0

[fireball] 33339: - Assign statements in ASSERTs is a bad idea. Fix that.
by fireball＠svn.reactos.org 07 May '08

07 May '08

Author: fireball Date: Wed May 7 04:46:37 2008 New Revision: 33339 URL: http://svn.reactos.org/svn/reactos?rev=33339&view=rev Log: - Assign statements in ASSERTs is a bad idea. Fix that. Modified: trunk/reactos/ntoskrnl/ex/resource.c Modified: trunk/reactos/ntoskrnl/ex/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/resource.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] Wed May 7 04:46:37 2008 @@ -1896,7 +1896,7 @@ Resource->NumberOfSharedWaiters = 0; /* Release lock and let someone else have it */ - ASSERT(Resource->ActiveCount = 1); + ASSERT(Resource->ActiveCount == 1); ExReleaseResourceLock(Resource, &LockHandle); KeReleaseSemaphore(Resource->SharedWaiters, 0, Count, FALSE); return; @@ -1910,7 +1910,7 @@ Resource->NumberOfExclusiveWaiters--; /* Release the lock and give it away */ - ASSERT(Resource->ActiveCount = 1); + ASSERT(Resource->ActiveCount == 1); ExReleaseResourceLock(Resource, &LockHandle); KeSetEventBoostPriority(Resource->ExclusiveWaiters, (PKTHREAD*)&Resource->OwnerEntry.OwnerThread); @@ -2003,7 +2003,7 @@ Resource->NumberOfExclusiveWaiters--; /* Release the lock and give it away */ - ASSERT(Resource->ActiveCount = 1); + ASSERT(Resource->ActiveCount == 1); ExReleaseResourceLock(Resource, &LockHandle); KeSetEventBoostPriority(Resource->ExclusiveWaiters, (PKTHREAD*)&Resource->OwnerEntry.OwnerThread);

1 0

[gbrunmar] 33326: Implemented IDirect3DDevice9::GetDisplayMode()
by gbrunmar＠svn.reactos.org 07 May '08

07 May '08

Author: gbrunmar Date: Tue May 6 11:15:33 2008 New Revision: 33326 URL: http://svn.reactos.org/svn/reactos?rev=33326&view=rev Log: Implemented IDirect3DDevice9::GetDisplayMode() Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Tue May 6 11:15:33 2008 @@ -192,10 +192,53 @@ return D3D_OK; } +/*++ +* @name IDirect3DDevice9::GetDisplayMode +* @implemented +* +* The function IDirect3DDevice9Impl_GetDisplayMode fills the pMode argument with the +* display mode for the specified swap chain. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D9 object returned from Direct3DCreate9() +* +* @param UINT iSwapChain +* Swap chain index to get object for. +* The maximum value for this is the value returned by IDirect3DDevice9::GetNumberOfSwapChains() - 1. +* +* @param D3DDISPLAYMODE* pMode +* Pointer to a D3DDISPLAYMODE structure to be filled with the current swap chain's display mode information. +* +* @return HRESULT +* If the method successfully fills the pMode structure, the return value is D3D_OK. +* If iSwapChain is out of range or pMode is a bad pointer, the return value will be D3DERR_INVALIDCALL. +* +*/ static HRESULT WINAPI IDirect3DDevice9Impl_GetDisplayMode(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DDISPLAYMODE* pMode) { - UNIMPLEMENTED - + LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface); + LOCK_D3DDEVICE9(); + + if (iSwapChain >= IDirect3DDevice9_GetNumberOfSwapChains(iface)) + { + DPRINT1("Invalid iSwapChain parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + if (IsBadWritePtr(pMode, sizeof(D3DDISPLAYMODE*))) + { + DPRINT1("Invalid pMode parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + pMode->Width = This->DeviceData[iSwapChain].DriverCaps.dwDisplayWidth; + pMode->Height = This->DeviceData[iSwapChain].DriverCaps.dwDisplayHeight; + pMode->Format = This->DeviceData[iSwapChain].DriverCaps.RawDisplayFormat; + pMode->RefreshRate = This->DeviceData[iSwapChain].DriverCaps.dwRefreshRate; + + UNLOCK_D3DDEVICE9(); return D3D_OK; }

2 1

[tkreuzer] 33338: ntifs.h: fix prototypes of PsChargePoolQuota, PsChargeProcessPoolQuota, PsReturnPoolQuota, ZwAllocateVirtualMemory and ZwFreeVirtualMemory
by tkreuzer＠svn.reactos.org 07 May '08

07 May '08

Author: tkreuzer Date: Tue May 6 19:57:10 2008 New Revision: 33338 URL: http://svn.reactos.org/svn/reactos?rev=33338&view=rev Log: ntifs.h: fix prototypes of PsChargePoolQuota, PsChargeProcessPoolQuota, PsReturnPoolQuota, ZwAllocateVirtualMemory and ZwFreeVirtualMemory Modified: trunk/reactos/include/ddk/ntifs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=33… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Tue May 6 19:57:10 2008 @@ -3738,7 +3738,7 @@ PsChargePoolQuota ( IN PEPROCESS Process, IN POOL_TYPE PoolType, - IN ULONG Amount + IN SIZE_T Amount ); NTKERNELAPI @@ -3747,7 +3747,7 @@ PsChargeProcessPoolQuota ( IN PEPROCESS Process, IN POOL_TYPE PoolType, - IN ULONG_PTR Amount + IN SIZE_T Amount ); #define PsDereferenceImpersonationToken(T) \ @@ -3856,7 +3856,7 @@ PsReturnPoolQuota ( IN PEPROCESS Process, IN POOL_TYPE PoolType, - IN ULONG Amount + IN SIZE_T Amount ); NTKERNELAPI @@ -4664,7 +4664,7 @@ IN HANDLE ProcessHandle, IN OUT PVOID *BaseAddress, IN ULONG ZeroBits, - IN OUT PULONG RegionSize, + IN OUT PSIZE_T RegionSize, IN ULONG AllocationType, IN ULONG Protect ); @@ -4912,7 +4912,7 @@ ZwFreeVirtualMemory ( IN HANDLE ProcessHandle, IN OUT PVOID *BaseAddress, - IN OUT PULONG RegionSize, + IN OUT PSIZE_T RegionSize, IN ULONG FreeType );

1 0

[tkreuzer] 33337: change Amount param in all PsXxxPoolQuota functions to SIZE_T
by tkreuzer＠svn.reactos.org 06 May '08

06 May '08

Author: tkreuzer Date: Tue May 6 18:19:22 2008 New Revision: 33337 URL: http://svn.reactos.org/svn/reactos?rev=33337&view=rev Log: change Amount param in all PsXxxPoolQuota functions to SIZE_T Modified: trunk/reactos/include/ndk/psfuncs.h trunk/reactos/ntoskrnl/ps/quota.c Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Tue May 6 18:19:22 2008 @@ -101,7 +101,7 @@ NTAPI PsReturnProcessNonPagedPoolQuota( IN PEPROCESS Process, - IN ULONG_PTR Amount + IN SIZE_T Amount ); // @@ -141,7 +141,7 @@ PsChargePoolQuota( IN PEPROCESS Process, IN POOL_TYPE PoolType, - IN ULONG Amount + IN SIZE_T Amount ); NTKERNELAPI @@ -149,7 +149,7 @@ NTAPI PsChargeProcessNonPagedPoolQuota( IN PEPROCESS Process, - IN ULONG_PTR Amount + IN SIZE_T Amount ); NTKERNELAPI @@ -157,7 +157,7 @@ NTAPI PsChargeProcessPagedPoolQuota( IN PEPROCESS Process, - IN ULONG_PTR Amount + IN SIZE_T Amount ); NTKERNELAPI @@ -166,7 +166,7 @@ PsChargeProcessPoolQuota( IN PEPROCESS Process, IN POOL_TYPE PoolType, - IN ULONG Amount + IN SIZE_T Amount ); NTKERNELAPI @@ -175,7 +175,7 @@ PsReturnPoolQuota( IN PEPROCESS Process, IN POOL_TYPE PoolType, - IN ULONG_PTR Amount + IN SIZE_T Amount ); NTKERNELAPI @@ -183,7 +183,7 @@ NTAPI PsReturnProcessNonPagedPoolQuota( IN PEPROCESS Process, - IN ULONG_PTR Amount + IN SIZE_T Amount ); NTKERNELAPI @@ -191,7 +191,7 @@ NTAPI PsReturnProcessPagedPoolQuota( IN PEPROCESS Process, - IN ULONG_PTR Amount + IN SIZE_T Amount ); #endif Modified: trunk/reactos/ntoskrnl/ps/quota.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/quota.c?rev=33… ============================================================================== --- trunk/reactos/ntoskrnl/ps/quota.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/quota.c [iso-8859-1] Tue May 6 18:19:22 2008 @@ -38,7 +38,7 @@ NTAPI PspChargeProcessQuotaSpecifiedPool(IN PEPROCESS Process, IN UCHAR PoolIndex, - IN ULONG Amount) + IN SIZE_T Amount) { ASSERT(Process); ASSERT(Process != PsInitialSystemProcess); @@ -74,7 +74,7 @@ NTAPI PspReturnProcessQuotaSpecifiedPool(IN PEPROCESS Process, IN UCHAR PoolIndex, - IN ULONG Amount) + IN SIZE_T Amount) { ASSERT(Process); ASSERT(Process != PsInitialSystemProcess); @@ -114,11 +114,11 @@ if (ParentProcess != NULL) { PEPROCESS_QUOTA_BLOCK QuotaBlock = ParentProcess->QuotaBlock; - + ASSERT(QuotaBlock != NULL); (void)InterlockedIncrementUL(&QuotaBlock->ReferenceCount); - + Process->QuotaBlock = QuotaBlock; } else @@ -162,7 +162,7 @@ STDCALL PsChargePoolQuota(IN PEPROCESS Process, IN POOL_TYPE PoolType, - IN ULONG Amount) + IN SIZE_T Amount) { NTSTATUS Status; @@ -186,7 +186,7 @@ NTSTATUS STDCALL PsChargeProcessNonPagedPoolQuota(IN PEPROCESS Process, - IN ULONG_PTR Amount) + IN SIZE_T Amount) { /* Call the general function */ return PsChargeProcessPoolQuota(Process, NonPagedPool, Amount); @@ -198,7 +198,7 @@ NTSTATUS STDCALL PsChargeProcessPagedPoolQuota(IN PEPROCESS Process, - IN ULONG_PTR Amount) + IN SIZE_T Amount) { /* Call the general function */ return PsChargeProcessPoolQuota(Process, PagedPool, Amount); @@ -211,7 +211,7 @@ STDCALL PsChargeProcessPoolQuota(IN PEPROCESS Process, IN POOL_TYPE PoolType, - IN ULONG Amount) + IN SIZE_T Amount) { /* Don't do anything for the system process */ if (Process == PsInitialSystemProcess) return STATUS_SUCCESS; @@ -233,7 +233,7 @@ STDCALL PsReturnPoolQuota(IN PEPROCESS Process, IN POOL_TYPE PoolType, - IN ULONG_PTR Amount) + IN SIZE_T Amount) { #ifdef PS_QUOTA_ENABLE_QUOTA_CODE /* MS-documented IRQL requirement. Not yet enabled as it */ @@ -259,7 +259,7 @@ VOID STDCALL PsReturnProcessNonPagedPoolQuota(IN PEPROCESS Process, - IN ULONG_PTR Amount) + IN SIZE_T Amount) { /* Don't do anything for the system process */ if (Process == PsInitialSystemProcess) return; @@ -277,7 +277,7 @@ VOID STDCALL PsReturnProcessPagedPoolQuota(IN PEPROCESS Process, - IN ULONG_PTR Amount) + IN SIZE_T Amount) { /* Don't do anything for the system process */ if (Process == PsInitialSystemProcess) return; @@ -296,7 +296,7 @@ { /* Don't do anything for the system process */ if (Process == PsInitialSystemProcess) return STATUS_SUCCESS; - + #ifdef PS_QUOTA_ENABLE_QUOTA_CODE PspReturnProcessQuotaSpecifiedPool(Process, 2, Amount); #else

1 0

[tkreuzer] 33336: fix MmMapViewOfSection prototype
by tkreuzer＠svn.reactos.org 06 May '08

06 May '08

Author: tkreuzer Date: Tue May 6 16:37:10 2008 New Revision: 33336 URL: http://svn.reactos.org/svn/reactos?rev=33336&view=rev Log: fix MmMapViewOfSection prototype Modified: trunk/reactos/include/ndk/mmfuncs.h Modified: trunk/reactos/include/ndk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmfuncs.h [iso-8859-1] Tue May 6 16:37:10 2008 @@ -51,7 +51,7 @@ IN ULONG ZeroBits, IN ULONG CommitSize, IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, - IN OUT PULONG ViewSize, + IN OUT PSIZE_T ViewSize, IN SECTION_INHERIT InheritDisposition, IN ULONG AllocationType, IN ULONG Protect

1 0

[janderwald] 33335: - fix changing time format garbles the clock output - patch by Carlo Bramix and Alwyn Tar - fix potential buffer overflows by me - bug 2437
by janderwald＠svn.reactos.org 06 May '08

06 May '08

Author: janderwald Date: Tue May 6 15:51:07 2008 New Revision: 33335 URL: http://svn.reactos.org/svn/reactos?rev=33335&view=rev Log: - fix changing time format garbles the clock output - patch by Carlo Bramix and Alwyn Tar - fix potential buffer overflows by me - bug 2437 Modified: trunk/reactos/dll/cpl/intl/date.c trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/misc.c trunk/reactos/dll/cpl/intl/sort.c trunk/reactos/dll/cpl/intl/time.c Modified: trunk/reactos/dll/cpl/intl/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/date.c?rev=33… ============================================================================== --- trunk/reactos/dll/cpl/intl/date.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/date.c [iso-8859-1] Tue May 6 15:51:07 2008 @@ -59,8 +59,8 @@ FindDateSep(const TCHAR *szSourceStr) { LPTSTR pszFoundSep; - INT nDateCompCount=0; - INT nDateSepCount=0; + UINT nDateCompCount=0; + UINT nDateSepCount=0; pszFoundSep = (LPTSTR)malloc(MAX_SAMPLES_STR_SIZE * sizeof(TCHAR)); @@ -418,7 +418,7 @@ SetCalendarInfo(lcid, CAL_GREGORIAN, 48 , /* CAL_ITWODIGITYEARMAX */ - (LPCTSTR)&szMaxDateVal); + (LPCTSTR)szMaxDateVal); } /* Get max date value from registry set */ Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] Tue May 6 15:51:07 2008 @@ -67,7 +67,7 @@ } else { - GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)); + GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)/sizeof(TCHAR)); } if (bNoShow == FALSE) @@ -135,7 +135,7 @@ /* Select current locale */ /* or should it be System and not user? */ - GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SLANGUAGE, langSel, sizeof(langSel)); + GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SLANGUAGE, langSel, sizeof(langSel)/sizeof(TCHAR)); SendMessage(hList, CB_SELECTSTRING, @@ -160,14 +160,14 @@ TCHAR ACPPage[9]; TCHAR OEMPage[9]; - ret = GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTCODEPAGE, (WORD*)OEMPage, sizeof(OEMPage)); + ret = GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTCODEPAGE, OEMPage, sizeof(OEMPage)/sizeof(TCHAR)); if (ret == 0) { MessageBox(NULL, _T("Problem reading OEM code page"), _T("Big Problem"), MB_OK); return; } - GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTANSICODEPAGE, (WORD*)ACPPage, sizeof(ACPPage)); + ret = GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTANSICODEPAGE, ACPPage, sizeof(ACPPage)/sizeof(TCHAR)); if (ret == 0) { MessageBox(NULL, _T("Problem reading ANSI code page"), _T("Big Problem"), MB_OK); @@ -305,7 +305,7 @@ continue; } - if (lResult == (LCID)UnattendLCID) + if (lResult == (LRESULT)UnattendLCID) { SendMessage(hList, CB_SETCURSEL, (WPARAM)lIndex, (LPARAM)0); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); Modified: trunk/reactos/dll/cpl/intl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/misc.c?rev=33… ============================================================================== --- trunk/reactos/dll/cpl/intl/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/misc.c [iso-8859-1] Tue May 6 15:51:07 2008 @@ -47,7 +47,7 @@ LPTSTR pszDestStr; LPTSTR pszTempStr; TCHAR szFmtVal[255]; - INT nFmtCount = 0; + UINT nFmtCount = 0; INT nValCount = 0; INT nLastVal = 0; INT nSpaceOffset = 0; @@ -124,10 +124,10 @@ LPCTSTR szTempl) { LPTSTR szDestStr; - INT nCharCnt; - INT nSubStrCnt; - INT nDestStrCnt; - INT nFirstCharCnt; + UINT nCharCnt; + UINT nSubStrCnt; + UINT nDestStrCnt; + UINT nFirstCharCnt; szDestStr = (LPTSTR)malloc(MAX_SAMPLES_STR_SIZE * sizeof(TCHAR)); Modified: trunk/reactos/dll/cpl/intl/sort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/sort.c?rev=33… ============================================================================== --- trunk/reactos/dll/cpl/intl/sort.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/sort.c [iso-8859-1] Tue May 6 15:51:07 2008 @@ -64,7 +64,7 @@ if ((LANGIDFROMLCID(lcid) == LANGIDFROMLCID(userLcid)) && (SORTIDFROMLCID(lcid) != SORTIDFROMLCID(userLcid))) { - GetLocaleInfo(lcid, LOCALE_SSORTNAME, lang, sizeof(lang)); + GetLocaleInfo(lcid, LOCALE_SSORTNAME, lang, sizeof(lang)/sizeof(TCHAR)); index = SendMessage(hWndSortList, CB_ADDSTRING, @@ -94,7 +94,7 @@ { /* Add traditional sorting */ GetLocaleInfo(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), - LOCALE_SSORTNAME, lang, sizeof(lang)); + LOCALE_SSORTNAME, lang, sizeof(lang)/sizeof(TCHAR)); index = SendMessage(hwnd, CB_ADDSTRING, @@ -108,7 +108,7 @@ /* Add modern sorting */ GetLocaleInfo(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), - LOCALE_SSORTNAME, lang, sizeof(lang)); + LOCALE_SSORTNAME, lang, sizeof(lang)/sizeof(TCHAR)); index = SendMessage(hwnd, CB_ADDSTRING, @@ -124,7 +124,7 @@ { userLcid = lcid; - GetLocaleInfo(lcid & 0xFFFF, LOCALE_SSORTNAME, lang, sizeof(lang)); + GetLocaleInfo(lcid & 0xFFFF, LOCALE_SSORTNAME, lang, sizeof(lang)/sizeof(TCHAR)); index = SendMessage(hWndSortList, CB_ADDSTRING, Modified: trunk/reactos/dll/cpl/intl/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/time.c?rev=33… ============================================================================== --- trunk/reactos/dll/cpl/intl/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/time.c [iso-8859-1] Tue May 6 15:51:07 2008 @@ -27,6 +27,7 @@ #include <commctrl.h> #include <cpl.h> #include <tchar.h> +#include <malloc.h> #include "intl.h" #include "resource.h" @@ -53,6 +54,36 @@ SendMessage(hWnd, WM_SETTEXT, 0, (LPARAM)szBuffer); } + +static VOID +GetSelectedComboEntry(HWND hwndDlg, DWORD dwIdc, TCHAR *Buffer, UINT uSize) +{ + int nIndex; + HWND hChildWnd; + + /* get handle to time format control */ + hChildWnd = GetDlgItem(hwndDlg, dwIdc); + /* Get index to selected time format */ + nIndex = SendMessage(hChildWnd, CB_GETCURSEL, 0, 0); + if (nIndex == CB_ERR) + /* no selection? get content of the edit control */ + SendMessage(hChildWnd, WM_GETTEXT, uSize, (LPARAM)Buffer); + else { + LPTSTR tmp; + UINT uReqSize; + + /* get requested size, including the null terminator; + * it shouldn't be required because the previous CB_LIMITTEXT, + * but it would be better to check it anyways */ + uReqSize = SendMessage(hChildWnd, CB_GETLBTEXTLEN, (WPARAM)nIndex, 0) + 1; + /* allocate enought space, to be more safe */ + tmp = (LPTSTR)_alloca(uReqSize*sizeof(TCHAR)); + /* get selected time format text */ + SendMessage(hChildWnd, CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)tmp); + /* finally, copy the result into the output */ + _tcsncpy(Buffer, tmp, uSize); + } +} /* Property page dialog callback */ INT_PTR CALLBACK @@ -86,7 +117,7 @@ hwndEnum = GetDlgItem(hwndDlg, IDC_TIMEFORMAT); EnumTimeFormats(TimeFormatEnumProc, pGlobalData->lcid, 0); - GetLocaleInfo(pGlobalData->lcid, LOCALE_STIMEFORMAT, Buffer, 80); + GetLocaleInfo(pGlobalData->lcid, LOCALE_STIMEFORMAT, Buffer, sizeof(Buffer)/sizeof(TCHAR)); SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), CB_SELECTSTRING, -1, @@ -95,7 +126,7 @@ /* Get the time separator (max. 4 characters) */ SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), CB_LIMITTEXT, 4, 0); - GetLocaleInfo(pGlobalData->lcid, LOCALE_STIME, Buffer, 80); + GetLocaleInfo(pGlobalData->lcid, LOCALE_STIME, Buffer, sizeof(Buffer)/sizeof(TCHAR)); SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), CB_ADDSTRING, 0, @@ -170,49 +201,30 @@ if (lpnm->code == (UINT)PSN_APPLY) { TCHAR Buffer[80]; - int nIndex; + + /* get selected/typed time format text */ + GetSelectedComboEntry(hwndDlg, IDC_TIMEFORMAT, Buffer, sizeof(Buffer)/sizeof(TCHAR)); /* Set time format */ - nIndex = SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), - CB_GETCURSEL, 0, 0); - SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), - CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); SetLocaleInfo(pGlobalData->lcid, LOCALE_STIMEFORMAT, Buffer); + /* get selected/typed time separator text */ + GetSelectedComboEntry(hwndDlg, IDC_TIMESEPARATOR, Buffer, sizeof(Buffer)/sizeof(TCHAR)); + /* Set time separator */ - nIndex = SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), - CB_GETCURSEL, 0, 0); - SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), - CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); SetLocaleInfo(pGlobalData->lcid, LOCALE_STIME, Buffer); + /* get selected/typed AM symbol text */ + GetSelectedComboEntry(hwndDlg, IDC_TIMEAMSYMBOL, Buffer, sizeof(Buffer)/sizeof(TCHAR)); + /* Set the AM symbol */ - nIndex = SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), - CB_GETCURSEL, 0, 0); - if (nIndex != CB_ERR) - { - SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), - CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); - SetLocaleInfo(pGlobalData->lcid, LOCALE_S1159, Buffer); - } - else - { - SetLocaleInfo(pGlobalData->lcid, LOCALE_S1159, _T("")); - } + SetLocaleInfo(pGlobalData->lcid, LOCALE_S1159, Buffer); + + /* get selected/typed PM symbol text */ + GetSelectedComboEntry(hwndDlg, IDC_TIMEPMSYMBOL, Buffer, sizeof(Buffer)/sizeof(TCHAR)); /* Set the PM symbol */ - nIndex = SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), - CB_GETCURSEL, 0, 0); - if (nIndex != CB_ERR) - { - SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), - CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); - SetLocaleInfo(pGlobalData->lcid, LOCALE_S2359, Buffer); - } - else - { - SetLocaleInfo(pGlobalData->lcid, LOCALE_S2359, _T("")); - } + SetLocaleInfo(pGlobalData->lcid, LOCALE_S2359, Buffer); /* Update the time format sample */ UpdateTimeSample(GetDlgItem(hwndDlg, IDC_TIMESAMPLE), pGlobalData->lcid);

1 0

[tkreuzer] 33334: remove PalIndexed from dc struct
by tkreuzer＠svn.reactos.org 06 May '08

06 May '08

Author: tkreuzer Date: Tue May 6 15:50:53 2008 New Revision: 33334 URL: http://svn.reactos.org/svn/reactos?rev=33334&view=rev Log: remove PalIndexed from dc struct Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Tue May 6 15:50:53 2008 @@ -132,8 +132,6 @@ INT saveLevel; // DCLEVEL lSaveDepth HDC hSelf; // DCLEVEL hdcSave Used only for MemoryDC & SaveDC. - HPALETTE PalIndexed; - UNICODE_STRING DriverName; } DC, *PDC;

1 0

[fireball] 33333: - Fix regedit's import function. Now it works equally good in ReactOS and in a real Windows (previously was broken in both OSes). See issue #997 for more details.
by fireball＠svn.reactos.org 06 May '08

06 May '08

Author: fireball Date: Tue May 6 15:44:35 2008 New Revision: 33333 URL: http://svn.reactos.org/svn/reactos?rev=33333&view=rev Log: - Fix regedit's import function. Now it works equally good in ReactOS and in a real Windows (previously was broken in both OSes). See issue #997 for more details. Modified: trunk/reactos/base/applications/regedit/regproc.c Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regproc.c [iso-8859-1] Tue May 6 15:44:35 2008 @@ -441,6 +441,7 @@ keyNameBeg = strchr(lpLineCopy, '\\'); /* The key name start by '\' */ if (keyNameBeg) { + keyNameBeg++; if (lpLine[0] == '[') /* need to find matching ']' */ { LPSTR keyNameEnd;

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