Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 38180: - From SDK, LD_ flags.
by jimtabor＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: jimtabor Date: Thu Dec 18 14:59:12 2008 New Revision: 38180 URL: http://svn.reactos.org/svn/reactos?rev=38180&view=rev Log: - From SDK, LD_ flags. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Thu Dec 18 14:59:12 2008 @@ -1072,6 +1072,7 @@ #define LR_LOADTRANSPARENT 32 #define LR_DEFAULTSIZE 64 #define LR_LOADREALSIZE 128 +#define LR_VGACOLOR 128 #define LR_LOADMAP3DCOLORS 4096 #define LR_CREATEDIBSECTION 8192 #define LR_COPYFROMRESOURCE 0x4000

1 0

[jmorlan] 38179: VfatSetAllocationSizeInformation: The fast code for extending the size of a non-empty file did have a bug in that it didn't always set Fcb->LastCluster/Fcb->LastOffset but the OffsetToCluster call was made assuming that it did. However, the code that replaced it had a bug as well, in that it did not set Cluster to the original final cluster like the error handling code expected, so it would crash when out of disk space. Bringing back the fast code, but with its bug fixed.
by jmorlan＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: jmorlan Date: Thu Dec 18 14:47:20 2008 New Revision: 38179 URL: http://svn.reactos.org/svn/reactos?rev=38179&view=rev Log: VfatSetAllocationSizeInformation: The fast code for extending the size of a non-empty file did have a bug in that it didn't always set Fcb->LastCluster/Fcb->LastOffset but the OffsetToCluster call was made assuming that it did. However, the code that replaced it had a bug as well, in that it did not set Cluster to the original final cluster like the error handling code expected, so it would crash when out of disk space. Bringing back the fast code, but with its bug fixed. Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Thu Dec 18 14:47:20 2008 @@ -639,7 +639,6 @@ } else { -#if 0 /* FIXME */ if (Fcb->LastCluster > 0) { if (Fcb->RFCB.AllocationSize.u.LowPart - ClusterSize == Fcb->LastOffset) @@ -665,23 +664,14 @@ return Status; } - if (Fcb->LastCluster == 0) - { - Fcb->LastCluster = Cluster; - Fcb->LastOffset = Fcb->RFCB.AllocationSize.u.LowPart - ClusterSize; - } + Fcb->LastCluster = Cluster; + Fcb->LastOffset = Fcb->RFCB.AllocationSize.u.LowPart - ClusterSize; /* FIXME: Check status */ /* Cluster points now to the last cluster within the chain */ Status = OffsetToCluster(DeviceExt, Cluster, ROUND_DOWN(NewSize - 1, ClusterSize) - Fcb->LastOffset, &NCluster, TRUE); -#else - Status = OffsetToCluster(DeviceExt, FirstCluster, - ROUND_DOWN(NewSize - 1, ClusterSize), - &Cluster, TRUE); - NCluster = Cluster; -#endif if (NCluster == 0xffffffff || !NT_SUCCESS(Status)) { /* disk is full */

1 0

[gschneider] 38178: - Update _mbsbtype and _mbsninc functions - Fixes 17 msvcrt string tests, 16 to go
by gschneider＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: gschneider Date: Thu Dec 18 14:26:57 2008 New Revision: 38178 URL: http://svn.reactos.org/svn/reactos?rev=38178&view=rev Log: - Update _mbsbtype and _mbsninc functions - Fixes 17 msvcrt string tests, 16 to go Modified: trunk/reactos/lib/sdk/crt/mbstring/mbbtype.c trunk/reactos/lib/sdk/crt/mbstring/mbsninc.c Modified: trunk/reactos/lib/sdk/crt/mbstring/mbbtype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbbty… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/mbbtype.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/mbbtype.c [iso-8859-1] Thu Dec 18 14:26:57 2008 @@ -1,11 +1,13 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/msvcrt/mbstring/mbbtype.c + * FILE: lib/sdk/crt/mbstring/mbbtype.c * PURPOSE: Determines the type of a multibyte character - * PROGRAMER: Ariadne - * UPDATE HISTORY: - * 12/04/99: Created + * PROGRAMERS: + * Copyright 1999 Ariadne + * Copyright 1999 Alexandre Julliard + * Copyright 2000 Jon Griffths + * */ #include <precomp.h> @@ -48,7 +50,28 @@ */ int _mbsbtype( const unsigned char *str, size_t n ) { - if ( str == NULL ) - return -1; - return _mbbtype(*(str+n),1); + int lead = 0; + const unsigned char *end = str + n; + + /* Lead bytes can also be trail bytes so we need to analyse the string. + * Also we must return _MBC_ILLEGAL for chars past the end of the string + */ + while (str < end) /* Note: we skip the last byte - will check after the loop */ + { + if (!*str) + return _MBC_ILLEGAL; + lead = !lead && _ismbblead(*str); + str++; + } + + if (lead) + if (_ismbbtrail(*str)) + return _MBC_TRAIL; + else + return _MBC_ILLEGAL; + else + if (_ismbblead(*str)) + return _MBC_LEAD; + else + return _MBC_SINGLE; } Modified: trunk/reactos/lib/sdk/crt/mbstring/mbsninc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbsni… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/mbsninc.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/mbsninc.c [iso-8859-1] Thu Dec 18 14:26:57 2008 @@ -1,3 +1,16 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/sdk/crt/mbstring/mbsninc.c + * PURPOSE: + * PROGRAMERS: + * Copyright 1999 Alexandre Julliard + * Copyright 2000 Jon Griffths + * + */ + +#include <precomp.h> + #include <mbstring.h> /* @@ -5,12 +18,20 @@ */ unsigned char * _mbsninc(const unsigned char *str, size_t n) { - unsigned char *s = (unsigned char *)str; - while(*s != 0 && n > 0) { - if (!_ismbblead(*s) ) - n--; - s++; - } + if(!str) + return NULL; - return s; + while (n > 0 && *str) + { + if (_ismbblead(*str)) + { + if (!*(str+1)) + break; + str++; + } + str++; + n--; + } + + return (unsigned char*)str; }

1 0

[gbrunmar] 38177: Implemented IDirect3DDevice9::GetRasterStatus()
by gbrunmar＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: gbrunmar Date: Thu Dec 18 13:48:17 2008 New Revision: 38177 URL: http://svn.reactos.org/svn/reactos?rev=38177&view=rev Log: Implemented IDirect3DDevice9::GetRasterStatus() 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] Thu Dec 18 13:48:17 2008 @@ -486,31 +486,12 @@ return D3D_OK; } -HRESULT WINAPI IDirect3DDevice9Base_GetRasterStatus(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DRASTER_STATUS* pRasterStatus) -{ - UNIMPLEMENTED - - return D3D_OK; -} - -HRESULT WINAPI IDirect3DDevice9Base_SetDialogBoxMode(LPDIRECT3DDEVICE9 iface, BOOL bEnableDialogs) -{ - UNIMPLEMENTED - - return D3D_OK; -} - -VOID WINAPI IDirect3DDevice9Base_SetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, DWORD Flags, CONST D3DGAMMARAMP* pRamp) -{ - UNIMPLEMENTED -} - -/*++ -* @name IDirect3DDevice9::GetGammaRamp -* @implemented -* -* The function IDirect3DDevice9Base_GetGammaRamp retrieves the gamma correction ramp values -* for the specified swap chain. +/*++ +* @name IDirect3DDevice9::GetRasterStatus +* @implemented +* +* The function IDirect3DDevice9Base_GetRasterStatus retrieves raster information +* of the monitor for the specified swap chain. * * @param LPDIRECT3D iface * Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice(). @@ -519,6 +500,64 @@ * Swap chain index to get object for. * The maximum value for this is the value returned by IDirect3DDevice9::GetNumberOfSwapChains() - 1. * +* @param D3DRASTER_STATUS* pRasterStatus +* Pointer to a D3DRASTER_STATUS to receive the raster information +* +*/ +HRESULT WINAPI IDirect3DDevice9Base_GetRasterStatus(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DRASTER_STATUS* pRasterStatus) +{ + HRESULT hResult; + IDirect3DSwapChain9* pSwapChain = NULL; + LPDIRECT3DDEVICE9_INT This = IDirect3DDevice9ToImpl(iface); + LOCK_D3DDEVICE9(); + + IDirect3DDevice9Base_GetSwapChain(iface, iSwapChain, &pSwapChain); + if (NULL == pSwapChain) + { + DPRINT1("Invalid iSwapChain parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + if (NULL == pRasterStatus) + { + DPRINT1("Invalid pRasterStatus parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + hResult = IDirect3DSwapChain9_GetRasterStatus(pSwapChain, pRasterStatus); + + UNLOCK_D3DDEVICE9(); + return hResult; +} + +HRESULT WINAPI IDirect3DDevice9Base_SetDialogBoxMode(LPDIRECT3DDEVICE9 iface, BOOL bEnableDialogs) +{ + UNIMPLEMENTED + + return D3D_OK; +} + +VOID WINAPI IDirect3DDevice9Base_SetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, DWORD Flags, CONST D3DGAMMARAMP* pRamp) +{ + UNIMPLEMENTED +} + +/*++ +* @name IDirect3DDevice9::GetGammaRamp +* @implemented +* +* The function IDirect3DDevice9Base_GetGammaRamp retrieves the gamma correction ramp values +* for the specified swap chain. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice(). +* +* @param UINT iSwapChain +* Swap chain index to get object for. +* The maximum value for this is the value returned by IDirect3DDevice9::GetNumberOfSwapChains() - 1. +* * @param D3DGAMMARAMP* pRamp * Pointer to a D3DGAMMARAMP to receive the gamma correction ramp values. *

1 0

[gschneider] 38176: - Close registry key handle of both RegQueryValueEx calls fail. I don't see anything else leaking.
by gschneider＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: gschneider Date: Thu Dec 18 13:38:01 2008 New Revision: 38176 URL: http://svn.reactos.org/svn/reactos?rev=38176&view=rev Log: - Close registry key handle of both RegQueryValueEx calls fail. I don't see anything else leaking. Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Thu Dec 18 13:38:01 2008 @@ -265,6 +265,8 @@ RegCloseKey(hKey); return TRUE; } + + RegCloseKey(hKey); } return FALSE;

1 0

[gbrunmar] 38175: Implemented IDirect3DDevice9::GetGammaRamp()
by gbrunmar＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: gbrunmar Date: Thu Dec 18 13:29:49 2008 New Revision: 38175 URL: http://svn.reactos.org/svn/reactos?rev=38175&view=rev Log: Implemented IDirect3DDevice9::GetGammaRamp() Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h 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] Thu Dec 18 13:29:49 2008 @@ -505,9 +505,50 @@ UNIMPLEMENTED } +/*++ +* @name IDirect3DDevice9::GetGammaRamp +* @implemented +* +* The function IDirect3DDevice9Base_GetGammaRamp retrieves the gamma correction ramp values +* for the specified swap chain. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice(). +* +* @param UINT iSwapChain +* Swap chain index to get object for. +* The maximum value for this is the value returned by IDirect3DDevice9::GetNumberOfSwapChains() - 1. +* +* @param D3DGAMMARAMP* pRamp +* Pointer to a D3DGAMMARAMP to receive the gamma correction ramp values. +* +*/ VOID WINAPI IDirect3DDevice9Base_GetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DGAMMARAMP* pRamp) { - UNIMPLEMENTED + IDirect3DSwapChain9* pSwapChain = NULL; + Direct3DSwapChain9_INT* pSwapChain_INT; + LPDIRECT3DDEVICE9_INT This = IDirect3DDevice9ToImpl(iface); + LOCK_D3DDEVICE9(); + + IDirect3DDevice9Base_GetSwapChain(iface, iSwapChain, &pSwapChain); + if (NULL == pSwapChain) + { + DPRINT1("Invalid iSwapChain parameter specified"); + UNLOCK_D3DDEVICE9(); + return; + } + + if (NULL == pRamp) + { + DPRINT1("Invalid pRamp parameter specified"); + UNLOCK_D3DDEVICE9(); + return; + } + + pSwapChain_INT = IDirect3DSwapChain9ToImpl(pSwapChain); + Direct3DSwapChain9_GetGammaRamp(pSwapChain_INT, pRamp); + + UNLOCK_D3DDEVICE9(); } /*++ Modified: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] Thu Dec 18 13:29:49 2008 @@ -18,7 +18,7 @@ #define UNLOCK_D3DDEVICE9() D3D9BaseObject_UnlockDevice(&This->BaseObject) /* Convert a IDirect3DSwapChain9 pointer safely to the internal implementation struct */ -static LPDIRECT3DSWAPCHAIN9_INT IDirect3DSwapChain9ToImpl(LPDIRECT3DSWAPCHAIN9 iface) +LPDIRECT3DSWAPCHAIN9_INT IDirect3DSwapChain9ToImpl(LPDIRECT3DSWAPCHAIN9 iface) { if (NULL == iface) return NULL; @@ -244,3 +244,8 @@ // TODO: Do all the dirty work... return D3D_OK; } + +VOID Direct3DSwapChain9_GetGammaRamp(Direct3DSwapChain9_INT* pThisSwapChain, D3DGAMMARAMP* pRamp) +{ + memcpy(pRamp, &pThisSwapChain->GammaRamp, sizeof(D3DGAMMARAMP)); +} Modified: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h [iso-8859-1] Thu Dec 18 13:29:49 2008 @@ -68,14 +68,15 @@ /* 0x01f4 */ D3DSWAPEFFECT SwapEffect; /* 0x01f8 */ DWORD dwUnknown01f8; /* 0x01fc */ DWORD dwUnknown01fc; -/* 0x0200 */ DDGAMMARAMP GammaRamp; +/* 0x0200 */ D3DGAMMARAMP GammaRamp; } Direct3DSwapChain9_INT, FAR* LPDIRECT3DSWAPCHAIN9_INT; - +LPDIRECT3DSWAPCHAIN9_INT IDirect3DSwapChain9ToImpl(LPDIRECT3DSWAPCHAIN9 iface); Direct3DSwapChain9_INT* CreateDirect3DSwapChain9(enum REF_TYPE RefType, struct _Direct3DDevice9_INT* pBaseDevice, DWORD ChainIndex); VOID Direct3DSwapChain9_SetDisplayMode(Direct3DSwapChain9_INT* pThisSwapChain, D3DPRESENT_PARAMETERS* pPresentationParameters); HRESULT Direct3DSwapChain9_Init(Direct3DSwapChain9_INT* pThisSwapChain, D3DPRESENT_PARAMETERS* pPresentationParameters); HRESULT Direct3DSwapChain9_Reset(Direct3DSwapChain9_INT* pThisSwapChain, D3DPRESENT_PARAMETERS* pPresentationParameters); +VOID Direct3DSwapChain9_GetGammaRamp(Direct3DSwapChain9_INT* pThisSwapChain, D3DGAMMARAMP* pRamp); #endif // _D3D9_SWAPCHAIN_H_

1 0

[gbrunmar] 38174: Implemented IDirect3DDevice9::CreateAdditionalSwapChain()
by gbrunmar＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: gbrunmar Date: Thu Dec 18 13:08:17 2008 New Revision: 38174 URL: http://svn.reactos.org/svn/reactos?rev=38174&view=rev Log: Implemented IDirect3DDevice9::CreateAdditionalSwapChain() 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] Thu Dec 18 13:08:17 2008 @@ -316,10 +316,64 @@ return TRUE; } +/*++ +* @name IDirect3DDevice9::CreateAdditionalSwapChain +* @implemented +* +* The function IDirect3DDevice9Base_CreateAdditionalSwapChain creates a swap chain object, +* useful when rendering multiple views. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice() +* +* @param D3DPRESENT_PARAMETERS* pPresentationParameters +* Pointer to a D3DPRESENT_PARAMETERS structure describing the parameters for the swap chain +* to be created. +* +* @param IDirect3DSwapChain9** ppSwapChain +* Pointer to a IDirect3DSwapChain9* to receive the swap chain object pointer. +* +* @return HRESULT +* If the method successfully fills the ppSwapChain structure, the return value is D3D_OK. +* If iSwapChain is out of range or ppSwapChain is a bad pointer, the return value +* will be D3DERR_INVALIDCALL. Also D3DERR_OUTOFVIDEOMEMORY can be returned if allocation +* of the new swap chain object failed. +* +*/ HRESULT WINAPI IDirect3DDevice9Base_CreateAdditionalSwapChain(LPDIRECT3DDEVICE9 iface, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DSwapChain9** ppSwapChain) { - UNIMPLEMENTED - + UINT iSwapChain; + IDirect3DSwapChain9* pSwapChain; + Direct3DSwapChain9_INT* pSwapChain_INT; + LPDIRECT3DDEVICE9_INT This = IDirect3DDevice9ToImpl(iface); + LOCK_D3DDEVICE9(); + + if (NULL == ppSwapChain) + { + DPRINT1("Invalid ppSwapChain parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + *ppSwapChain = NULL; + iSwapChain = IDirect3DDevice9_GetNumberOfSwapChains(iface) + 1; + + pSwapChain_INT = CreateDirect3DSwapChain9(RT_EXTERNAL, This, iSwapChain); + if (NULL == pSwapChain_INT) + { + DPRINT1("Out of memory"); + UNLOCK_D3DDEVICE9(); + return D3DERR_OUTOFVIDEOMEMORY; + } + + Direct3DSwapChain9_Init(pSwapChain_INT, pPresentationParameters); + + This->pSwapChains[iSwapChain] = pSwapChain_INT; + pSwapChain = (IDirect3DSwapChain9*)&pSwapChain_INT->lpVtbl; + IDirect3DSwapChain9_AddRef(pSwapChain); + *ppSwapChain = pSwapChain; + + UNLOCK_D3DDEVICE9(); return D3D_OK; }

1 0

[gschneider] 38173: - Remove duplicate harcoded _mbctype, rename MSVCRT_mbctype to fit the new role - Update related functions _ismbblead, _ismbslead, _ismbbtrail, _ismbstrail to use Wine _mbctype indexing - Fixes 28 msvcrt string tests, 33 left - Minor header updates
by gschneider＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: gschneider Date: Thu Dec 18 12:58:43 2008 New Revision: 38173 URL: http://svn.reactos.org/svn/reactos?rev=38173&view=rev Log: - Remove duplicate harcoded _mbctype, rename MSVCRT_mbctype to fit the new role - Update related functions _ismbblead, _ismbslead, _ismbbtrail, _ismbstrail to use Wine _mbctype indexing - Fixes 28 msvcrt string tests, 33 left - Minor header updates Modified: trunk/reactos/lib/sdk/crt/locale/locale.c trunk/reactos/lib/sdk/crt/mbstring/ismbc.c trunk/reactos/lib/sdk/crt/mbstring/ismblead.c trunk/reactos/lib/sdk/crt/mbstring/ismbtrl.c Modified: trunk/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/locale/locale.… ============================================================================== --- trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] Thu Dec 18 12:58:43 2008 @@ -27,7 +27,7 @@ */ #define MAX_ELEM_LEN 64 /* Max length of country/language/CP string */ -unsigned char MSVCRT_mbctype[257] = { 0 }; +unsigned char _mbctype[257] = { 0 }; static int g_mbcp_is_multibyte = 0; /* It seems that the data about valid trail bytes is not available from kernel32 @@ -671,13 +671,13 @@ } /* setup the _mbctype */ - memset(MSVCRT_mbctype, 0, sizeof(MSVCRT_mbctype)); + memset(_mbctype, 0, sizeof(_mbctype)); bytes = cpi.LeadByte; while (bytes[0] || bytes[1]) { for (i = bytes[0]; i <= bytes[1]; i++) - MSVCRT_mbctype[i + 1] |= _M1; + _mbctype[i + 1] |= _M1; bytes += 2; } @@ -698,7 +698,7 @@ while (bytes[0] || bytes[1]) { for (i = bytes[0]; i <= bytes[1]; i++) - MSVCRT_mbctype[i + 1] |= _M2; + _mbctype[i + 1] |= _M2; bytes += 2; } break; @@ -713,7 +713,7 @@ */ charcount = 0; for (i = 0; i < 256; i++) - if (!(MSVCRT_mbctype[i + 1] & _M1)) + if (!(_mbctype[i + 1] & _M1)) bufA[charcount++] = i; ret = MultiByteToWideChar(newcp, 0, bufA, charcount, bufW, charcount); @@ -724,12 +724,12 @@ curr_type = chartypes; for (i = 0; i < 256; i++) - if (!(MSVCRT_mbctype[i + 1] & _M1)) + if (!(_mbctype[i + 1] & _M1)) { if ((*curr_type) & C1_UPPER) - MSVCRT_mbctype[i + 1] |= _SBUP; + _mbctype[i + 1] |= _SBUP; if ((*curr_type) & C1_LOWER) - MSVCRT_mbctype[i + 1] |= _SBLOW; + _mbctype[i + 1] |= _SBLOW; curr_type++; } @@ -741,9 +741,9 @@ * also faster execution. */ for (i = 161; i <= 165; i++) - MSVCRT_mbctype[i + 1] |= _MP; + _mbctype[i + 1] |= _MP; for (i = 166; i <= 223; i++) - MSVCRT_mbctype[i + 1] |= _MS; + _mbctype[i + 1] |= _MS; } MSVCRT___lc_collate_cp = MSVCRT___lc_codepage = newcp; Modified: trunk/reactos/lib/sdk/crt/mbstring/ismbc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/ismbc… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/ismbc.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/ismbc.c [iso-8859-1] Thu Dec 18 12:58:43 2008 @@ -13,26 +13,6 @@ #include <precomp.h> #include <mbstring.h> #include <mbctype.h> - -unsigned char _mbctype[257] = { - 0, /* EOF */ - 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , /* 0 */ - 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , /* 1 */ - B ,P ,P ,P ,P ,P ,P ,P ,P ,P ,P ,P ,P ,P ,P ,P , /* 2 */ - D ,D ,D ,P ,D ,D ,D ,D ,D ,D ,P ,P ,P ,P ,P ,P , /* 3 */ - PT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT, /* 4 */ - AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,PT,PT,PT,PT,PT, /* 5 */ - PT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT, /* 6 */ - AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,PT,PT,PT,PT,0 , /* 7 */ - T ,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT, /* 8 */ - LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT, /* 9 */ - T ,GT,GT,GT,GT,GT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT, /* A */ - KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT, /* B */ - KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT, /* C */ - KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,GT,GT, /* D */ - LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT, /* E */ - LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,0 ,0 ,0 , /* F */ -}; /* * @implemented Modified: trunk/reactos/lib/sdk/crt/mbstring/ismblead.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/ismbl… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/ismblead.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/ismblead.c [iso-8859-1] Thu Dec 18 12:58:43 2008 @@ -1,16 +1,18 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/sdk/crt/mbstring/iskana.c - * PURPOSE: - * PROGRAMER: - * UPDATE HISTORY: - * 12/04/99: Ariadne, Taiji Yamada Created - * 05/30/08: Samuel Serapion adapted from PROJECT C Library + * FILE: lib/sdk/crt/mbstring/ismblead.c + * PURPOSE: Checks for a leading byte + * PROGRAMERS: + * Copyright 1999 Ariadne, Taiji Yamada + * Copyright 1999 Alexandre Julliard + * Copyright 2000 Jon Griffths + * Copyright 2008 Samuel Serapion adapted from PROJECT C Library * */ #include <precomp.h> +#include <mbctype.h> size_t _mbclen2(const unsigned int s); @@ -19,21 +21,27 @@ */ int _ismbblead(unsigned int c) { - return (_mbctype[c & 0xff] & _MLEAD); + return (_mbctype[(c&0xff) + 1] & _M1) != 0; } /* * @implemented */ -int _ismbslead( const unsigned char *str, const unsigned char *t) +int _ismbslead( const unsigned char *start, const unsigned char *str) { - unsigned char *s = (unsigned char *)str; - while(*s != 0 && s != t) - { + int lead = 0; - s+= _mbclen2(*s); - } - return _ismbblead( *s); + /* Lead bytes can also be trail bytes so we need to analyse the string + */ + while (start <= str) + { + if (!*start) + return 0; + lead = !lead && _ismbblead(*start); + start++; + } + + return lead ? -1 : 0; } /* @@ -41,7 +49,7 @@ */ const unsigned char *__p__mbctype(void) { - return _mbctype; + return _mbctype; } Modified: trunk/reactos/lib/sdk/crt/mbstring/ismbtrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/ismbt… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/ismbtrl.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/ismbtrl.c [iso-8859-1] Thu Dec 18 12:58:43 2008 @@ -1,14 +1,17 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/msvcrt/mbstring/ismbtrl.c + * FILE: lib/sdk/crt/mbstring/ismbtrl.c * PURPOSE: Checks for a trailing byte - * PROGRAMER: Ariadne - * UPDATE HISTORY: - * 12/04/99: Created + * PROGRAMERS: + * Copyright 1999 Ariadne + * Copyright 1999 Alexandre Julliard + * Copyright 2000 Jon Griffths + * */ #include <precomp.h> +#include <mbctype.h> size_t _mbclen2(const unsigned int s); @@ -19,21 +22,18 @@ */ int _ismbbtrail(unsigned int c) { - return (_mbctype[c & 0xff] & _MTRAIL); + return (_mbctype[(c&0xff) + 1] & _M2) != 0; } /* * @implemented */ -int _ismbstrail( const unsigned char *str, const unsigned char *t) +int _ismbstrail( const unsigned char *start, const unsigned char *str) { - unsigned char *s = (unsigned char *)str; - while(*s != 0 && s != t) - { - - s+= _mbclen2(*s); - } - - return _ismbbtrail(*s); + /* Note: this function doesn't check _ismbbtrail */ + if ((str > start) && _ismbslead(start, str-1)) + return -1; + else + return 0; }

1 0

[dchapyshev] 38172: - Revert r37085. It fix work kbswitch, but I think, that somewhere (in kbswitch) there is a memory leak. Help somebody to find it
by dchapyshev＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: dchapyshev Date: Thu Dec 18 06:32:46 2008 New Revision: 38172 URL: http://svn.reactos.org/svn/reactos?rev=38172&view=rev Log: - Revert r37085. It fix work kbswitch, but I think, that somewhere (in kbswitch) there is a memory leak. Help somebody to find it Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Thu Dec 18 06:32:46 2008 @@ -24,8 +24,6 @@ HANDLE hProcessHeap; HMODULE hDllLib; ULONG ulCurrentLayoutNum = 1; -UINT cxSmIcon, cySmIcon; - static HICON CreateTrayIcon(LPTSTR szLCID) @@ -51,18 +49,18 @@ hdcsrc = GetDC(NULL); hdc = CreateCompatibleDC(hdcsrc); - hBitmap = CreateCompatibleBitmap(hdcsrc, cxSmIcon, cySmIcon); + hBitmap = CreateCompatibleBitmap(hdcsrc, 16, 16); ReleaseDC(NULL, hdcsrc); if (hdc && hBitmap) { - hBmpNew = CreateBitmap(cxSmIcon, cySmIcon, 1, 1, NULL); + hBmpNew = CreateBitmap(16, 16, 1, 1, NULL); if (hBmpNew) { hBmpOld = SelectObject(hdc, hBitmap); - rect.right = cxSmIcon; + rect.right = 16; rect.left = 0; - rect.bottom = cySmIcon; + rect.bottom = 16; rect.top = 0; bkColor = SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT)); @@ -70,14 +68,14 @@ ExtTextOut(hdc, rect.left, rect.top, ETO_OPAQUE, &rect, _T(""), 0, NULL); - hFont = (HFONT) GetStockObject(DEFAULT_GUI_FONT); - if (!hFont) - goto End; + hFont = CreateFont(-11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, FF_DONTCARE, _T("Tahoma")); hFontOld = SelectObject(hdc, hFont); DrawText(hdc, _tcsupr(szBuf), 2, &rect, DT_SINGLELINE|DT_CENTER|DT_VCENTER); SelectObject(hdc, hBmpNew); - PatBlt(hdc, 0, 0, cxSmIcon, cySmIcon, BLACKNESS); + PatBlt(hdc, 0, 0, 16, 16, BLACKNESS); SelectObject(hdc, hBmpOld); SelectObject(hdc, hFontOld); @@ -86,15 +84,15 @@ IconInfo.fIcon = TRUE; hIcon = CreateIconIndirect(&IconInfo); -End: - if (hBmpNew) DeleteObject(hBmpNew); - if (hBmpOld) DeleteObject(hBmpOld); - if (hFont) DeleteObject(hFont); - } - } - - if (hdc) DeleteDC(hdc); - if (hBitmap) DeleteObject(hBitmap); + + DeleteObject(hBmpNew); + DeleteObject(hBmpOld); + DeleteObject(hFont); + } + } + + DeleteDC(hdc); + DeleteObject(hBitmap); return hIcon; } @@ -386,23 +384,6 @@ return -1; } -static VOID -SettingsChanging(HWND hwnd) -{ - UINT cxSmIconCur = 0, cySmIconCur = 0; - - cxSmIconCur = GetSystemMetrics(SM_CXSMICON); - cySmIconCur = GetSystemMetrics(SM_CYSMICON); - - if ((cxSmIcon != cxSmIconCur) || (cySmIcon != cySmIconCur)) - { - cxSmIcon = cxSmIconCur; - cySmIcon = cySmIconCur; - } - - ActivateLayout(hwnd, ulCurrentLayoutNum); -} - LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { @@ -413,9 +394,6 @@ { case WM_CREATE: { - cxSmIcon = GetSystemMetrics(SM_CXSMICON); - cySmIcon = GetSystemMetrics(SM_CYSMICON); - SetHooks(); AddTrayIcon(hwnd); hRightPopupMenu = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(IDR_POPUP)), 0); @@ -511,8 +489,6 @@ case WM_SETTINGCHANGE: { - SettingsChanging(hwnd); - if (wParam == SPI_SETDEFAULTINPUTLANG) { //FIXME: Should detect default language changes by CPL applet or by other tools and update UI

1 0

[cwittich] 38171: GENERIC_WRITE is required to flush the input buffer
by cwittich＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: cwittich Date: Thu Dec 18 06:32:32 2008 New Revision: 38171 URL: http://svn.reactos.org/svn/reactos?rev=38171&view=rev Log: GENERIC_WRITE is required to flush the input buffer Modified: trunk/reactos/base/applications/cmdutils/more/more.c Modified: trunk/reactos/base/applications/cmdutils/more/more.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/more.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/more.c [iso-8859-1] Thu Dec 18 06:32:32 2008 @@ -124,7 +124,7 @@ return 0; } - hKeyboard = CreateFile (_T("CONIN$"), GENERIC_READ, + hKeyboard = CreateFile (_T("CONIN$"), GENERIC_READ|GENERIC_WRITE, 0,NULL,OPEN_ALWAYS,0,0); GetScreenSize(&maxx,&maxy);

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