Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[sginsberg] 37362: - Optimize DebugService -- patch from Alex
by sginsberg＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sginsberg Date: Fri Nov 14 13:14:00 2008 New Revision: 37362 URL: http://svn.reactos.org/svn/reactos?rev=37362&view=rev Log: - Optimize DebugService -- patch from Alex Modified: trunk/reactos/lib/rtl/i386/debug_asm.S Modified: trunk/reactos/lib/rtl/i386/debug_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/debug_asm.S?r… ============================================================================== --- trunk/reactos/lib/rtl/i386/debug_asm.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/debug_asm.S [iso-8859-1] Fri Nov 14 13:14:00 2008 @@ -67,13 +67,11 @@ /* Setup the stack */ push ebp mov ebp, esp - + /* Save the registers */ - push ecx push ebx push edi - push edx - + /* Call the Interrupt */ mov eax, [ebp+8] mov ecx, [ebp+12] @@ -82,14 +80,12 @@ mov edi, [ebp+24] int 0x2D int 3 - + /* Restore registers */ - pop edx pop edi pop ebx - pop ecx - + /* Return */ - leave + pop ebp ret 20 .endfunc

1 0

[janderwald] 37361: - Pass the parent to PropertySheetW See issue #3597 for more details.
by janderwald＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: janderwald Date: Fri Nov 14 13:08:29 2008 New Revision: 37361 URL: http://svn.reactos.org/svn/reactos?rev=37361&view=rev Log: - Pass the parent to PropertySheetW See issue #3597 for more details. Modified: trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/misc.c 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] Fri Nov 14 13:08:29 2008 @@ -391,7 +391,7 @@ if (NewLcid == (LCID)CB_ERR) break; - SetupApplet(NewLcid); + SetupApplet(GetParent(hwndDlg), NewLcid); } break; } Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=37… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] Fri Nov 14 13:08:29 2008 @@ -75,7 +75,7 @@ LONG APIENTRY -SetupApplet(LCID lcid); +SetupApplet(HWND hwndDlg, LCID lcid); #endif /* __CPL_INTL_H */ Modified: trunk/reactos/dll/cpl/intl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/misc.c?rev=37… ============================================================================== --- trunk/reactos/dll/cpl/intl/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/misc.c [iso-8859-1] Fri Nov 14 13:08:29 2008 @@ -190,7 +190,7 @@ /* Create applets */ LONG APIENTRY -SetupApplet(LCID lcid) +SetupApplet(HWND hwndDlg, LCID lcid) { PROPSHEETPAGE PsPage[NUM_SHEETS + 1]; PROPSHEETHEADER psh; @@ -207,7 +207,7 @@ ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USECALLBACK | PSH_PROPTITLE; - psh.hwndParent = NULL; + psh.hwndParent = hwndDlg; psh.hInstance = hApplet; psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); psh.pszCaption = Caption;

1 0

[janderwald] 37360: - Implement IShellExecuteHookW - Free NETCON_PROPERTIES on cleanup - Show status dialog when clicking on startmenu->settings->network connections item - Fixes bug 3782 See issue #3782 for more details.
by janderwald＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: janderwald Date: Fri Nov 14 12:47:00 2008 New Revision: 37360 URL: http://svn.reactos.org/svn/reactos?rev=37360&view=rev Log: - Implement IShellExecuteHookW - Free NETCON_PROPERTIES on cleanup - Show status dialog when clicking on startmenu->settings->network connections item - Fixes bug 3782 See issue #3782 for more details. Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.c Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_… ============================================================================== --- trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] Fri Nov 14 12:47:00 2008 @@ -33,6 +33,7 @@ LONG ref; const IPersistFolder2Vtbl *lpVtblPersistFolder2; + const IShellExecuteHookWVtbl *lpVtblShellExecuteHookW; //const IPersistIDListVtbl *lpVtblPersistIDList; /* both paths are parsible from the desktop */ @@ -71,6 +72,8 @@ #define COLUMN_PHONE 4 #define COLUMN_OWNER 5 +HRESULT ShowNetConnectionStatus(IOleCommandTarget * lpOleCmd, INetConnection * pNetConnect, HWND hwnd); + static const IContextMenu3Vtbl vt_ContextMenu3; static const IObjectWithSiteVtbl vt_ObjectWithSite; static const IQueryInfoVtbl vt_QueryInfo; @@ -92,6 +95,11 @@ return (LPIGenericSFImpl)((char *)iface - FIELD_OFFSET(IGenericSFImpl, lpVtblPersistFolder2)); } +static LPIGenericSFImpl __inline impl_from_IShellExecuteHookW(IShellExecuteHookW *iface) +{ + return (LPIGenericSFImpl)((char *)iface - FIELD_OFFSET(IGenericSFImpl, lpVtblShellExecuteHookW)); +} + static LPIContextMenuImpl __inline impl_from_IQueryInfo(IQueryInfo *iface) { return (LPIContextMenuImpl)((char *)iface - FIELD_OFFSET(IContextMenuImpl, lpVtblQueryInfo)); @@ -120,6 +128,10 @@ IsEqualIID (riid, &IID_IPersistFolder2)) { *ppvObj = (LPVOID *)&This->lpVtblPersistFolder2; + } + else if (IsEqualIID(riid, &IID_IShellExecuteHookW)) + { + *ppvObj = (LPVOID *)&This->lpVtblShellExecuteHookW; } #if 0 else if (IsEqualIID(riid, &IID_IPersistIDList)) @@ -382,12 +394,14 @@ pMenu->lpOleCmd = lpOleCmd; pMenu->ref = 1; - if (IsEqualIID(riid, &IID_IContextMenu) || IsEqualIID(riid, &IID_IContextMenu2))// || IsEqualIID(riid, &IID_IContextMenu3)) + if (IsEqualIID(riid, &IID_IContextMenu) || IsEqualIID(riid, &IID_IContextMenu2)|| IsEqualIID(riid, &IID_IContextMenu3)) pObj = (IUnknown*)(&pMenu->lpVtblContextMenu); else if(IsEqualIID(riid, &IID_IQueryInfo)) pObj = (IUnknown*)(&pMenu->lpVtblQueryInfo); else if(IsEqualIID(riid, &IID_IExtractIconW)) pObj = (IUnknown*)(&pMenu->lpVtblExtractIconW); + else + return E_NOINTERFACE; IUnknown_AddRef(pObj); @@ -462,7 +476,7 @@ wcscpy(pszName, pProperties->pszwName); hr = S_OK; } - //NcFreeNetconProperties(pProperties); + NcFreeNetconProperties(pProperties); } } @@ -842,7 +856,7 @@ _InsertMenuItemW(hMenu, indexMenu++, TRUE, -1, MFT_SEPARATOR, NULL, MFS_ENABLED); _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_PROPERTIES, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_ENABLED); - + NcFreeNetconProperties(pProperties); return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 9); } @@ -862,23 +876,23 @@ HRESULT ShowNetConnectionStatus( - IContextMenuImpl * This, + IOleCommandTarget * lpOleCmd, INetConnection * pNetConnect, HWND hwnd) { NETCON_PROPERTIES * pProperties; HRESULT hr; - if (!This->lpOleCmd) + if (!lpOleCmd) return E_FAIL; if (INetConnection_GetProperties(pNetConnect, &pProperties) != NOERROR) return E_FAIL; - hr = IOleCommandTarget_Exec(This->lpOleCmd, &pProperties->guidId, 2, OLECMDEXECOPT_DODEFAULT, NULL, NULL); + hr = IOleCommandTarget_Exec(lpOleCmd, &pProperties->guidId, 2, OLECMDEXECOPT_DODEFAULT, NULL, NULL); NcFreeNetconProperties(pProperties); - return E_FAIL; + return hr; } HRESULT @@ -951,7 +965,7 @@ if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_STATUS) || lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_STATUS-1)) //HACK for Windows XP { - return ShowNetConnectionStatus(This, val->pItem, lpcmi->hwnd); + return ShowNetConnectionStatus(This->lpOleCmd, val->pItem, lpcmi->hwnd); } else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_PROPERTIES) || lpcmi->lpVerb == MAKEINTRESOURCEA(10099)) //HACK for Windows XP @@ -1310,6 +1324,75 @@ ISF_NetConnect_PersistFolder2_GetCurFolder }; +/************************************************************************ + * ISF_NetConnect_ShellExecuteHookW_QueryInterface + */ +static HRESULT WINAPI ISF_NetConnect_ShellExecuteHookW_QueryInterface (IShellExecuteHookW * iface, + REFIID iid, LPVOID * ppvObj) +{ + IGenericSFImpl * This = impl_from_IShellExecuteHookW(iface); + + return IShellFolder2_QueryInterface ((IShellFolder2*)This, iid, ppvObj); +} + +/************************************************************************ + * ISF_NetConnect_ShellExecuteHookW_AddRef + */ +static ULONG WINAPI ISF_NetConnect_ShellExecuteHookW_AddRef (IShellExecuteHookW * iface) +{ + IGenericSFImpl * This = impl_from_IShellExecuteHookW(iface); + + return IShellFolder2_AddRef((IShellFolder2*)This); +} + +/************************************************************************ + * ISF_NetConnect_PersistFolder2_Release + */ +static ULONG WINAPI ISF_NetConnect_ShellExecuteHookW_Release (IShellExecuteHookW * iface) +{ + IGenericSFImpl * This = impl_from_IShellExecuteHookW(iface); + + return IShellFolder2_Release((IShellFolder2*)This); +} + + +/************************************************************************ + * ISF_NetConnect_ShellExecuteHookW_Execute + */ +static HRESULT WINAPI ISF_NetConnect_ShellExecuteHookW_Execute (IShellExecuteHookW * iface, + LPSHELLEXECUTEINFOW pei) +{ + VALUEStruct * val; + NETCON_PROPERTIES * pProperties; + IGenericSFImpl * This = impl_from_IShellExecuteHookW(iface); + + val = _ILGetValueStruct(ILFindLastID(pei->lpIDList)); + if (!val) + return E_FAIL; + + if (INetConnection_GetProperties((INetConnection*)val->pItem, &pProperties) != NOERROR) + return E_FAIL; + + if (pProperties->Status == NCS_CONNECTED) + { + NcFreeNetconProperties(pProperties); + return ShowNetConnectionStatus(This->lpOleCmd, val->pItem, pei->hwnd); + } + + NcFreeNetconProperties(pProperties); + + return S_OK; +} + + +static const IShellExecuteHookWVtbl vt_ShellExecuteHookW = +{ + ISF_NetConnect_ShellExecuteHookW_QueryInterface, + ISF_NetConnect_ShellExecuteHookW_AddRef, + ISF_NetConnect_ShellExecuteHookW_Release, + ISF_NetConnect_ShellExecuteHookW_Execute +}; + #if 0 static const IPersistIDListVtbl vt_PersistIDList = { @@ -1413,6 +1496,7 @@ sf->ref = 1; sf->lpVtbl = &vt_ShellFolder2; sf->lpVtblPersistFolder2 = &vt_PersistFolder2; + sf->lpVtblShellExecuteHookW = &vt_ShellExecuteHookW; hr = CoCreateInstance(&CLSID_LanConnectStatusUI, NULL, CLSCTX_INPROC_SERVER, &IID_IOleCommandTarget, (LPVOID*)&sf->lpOleCmd); if (FAILED(hr))

1 0

[sginsberg] 37359: - PAGE_SIZE fix 2.0
by sginsberg＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sginsberg Date: Fri Nov 14 09:24:08 2008 New Revision: 37359 URL: http://svn.reactos.org/svn/reactos?rev=37359&view=rev Log: - PAGE_SIZE fix 2.0 Modified: trunk/reactos/lib/cmlib/cmlib.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=3735… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Fri Nov 14 09:24:08 2008 @@ -107,14 +107,10 @@ // PAGE_SIZE definition // #ifndef PAGE_SIZE -#if defined(_M_IX86) -#define PAGE_SIZE 0x1000 -#elif defined(_M_AMD64) -#define PAGE_SIZE 0x1000 -#elif defined(_M_ARM) +#if defined(TARGET_i386) || defined(TARGET_amd64) || defined(TARGET_arm) #define PAGE_SIZE 0x1000 #else -#error Local PAGE_SIZE definition required +#error Local PAGE_SIZE definition required when built as host #endif #endif

1 0

[sginsberg] 37358: - Don't define PAGE_SIZE in typedefs.h as -- "this value is target specific, host tools MUST not use it and this line has to be removed". Instead, define it locally for cmlib. - Also correct TRUE definition in this header
by sginsberg＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sginsberg Date: Fri Nov 14 08:49:11 2008 New Revision: 37358 URL: http://svn.reactos.org/svn/reactos?rev=37358&view=rev Log: - Don't define PAGE_SIZE in typedefs.h as -- "this value is target specific, host tools MUST not use it and this line has to be removed". Instead, define it locally for cmlib. - Also correct TRUE definition in this header Modified: trunk/reactos/include/host/typedefs.h trunk/reactos/lib/cmlib/cmlib.h Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h [iso-8859-1] (original) +++ trunk/reactos/include/host/typedefs.h [iso-8859-1] Fri Nov 14 08:49:11 2008 @@ -40,11 +40,7 @@ #define OPTIONAL #define FALSE 0 -#define TRUE (!(FALSE)) - -/* FIXME: this value is target specific, host tools MUST not use it - * and this line has to be removed */ -#define PAGE_SIZE 4096 +#define TRUE 1 #define ANYSIZE_ARRAY 1 Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=3735… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Fri Nov 14 08:49:11 2008 @@ -101,6 +101,21 @@ #ifndef ROUND_UP #define ROUND_UP(a,b) ((((a)+(b)-1)/(b))*(b)) #define ROUND_DOWN(a,b) (((a)/(b))*(b)) +#endif + +// +// PAGE_SIZE definition +// +#ifndef PAGE_SIZE +#if defined(_M_IX86) +#define PAGE_SIZE 0x1000 +#elif defined(_M_AMD64) +#define PAGE_SIZE 0x1000 +#elif defined(_M_ARM) +#define PAGE_SIZE 0x1000 +#else +#error Local PAGE_SIZE definition required +#endif #endif #define TAG_CM 0x68742020

1 0

[fireball] 37357: 2008-10-18 Reece Dunn include: Fixed the tom constant values.
by fireball＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: fireball Date: Fri Nov 14 04:13:08 2008 New Revision: 37357 URL: http://svn.reactos.org/svn/reactos?rev=37357&view=rev Log: 2008-10-18 Reece Dunn include: Fixed the tom constant values. Modified: trunk/reactos/include/psdk/tom.idl Modified: trunk/reactos/include/psdk/tom.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/tom.idl?rev=3… ============================================================================== --- trunk/reactos/include/psdk/tom.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/tom.idl [iso-8859-1] Fri Nov 14 04:13:08 2008 @@ -32,8 +32,8 @@ tomApplyLater = 1, tomTrackParms = 2, tomCacheParms = 3, - tomBackward = 0xc00000001, - tomForward = 0x3ffffffff, + tomBackward = 0xc0000001, + tomForward = 0x3fffffff, tomMove = 0, tomExtend = 1, tomNoSelection = 0, @@ -161,21 +161,21 @@ tomText = 0x2, tomHTML = 0x3, tomWordDocument = 0x4, - tomBold = 0x800000001, - tomItalic = 0x800000002, - tomUnderline = 0x800000004, - tomStrikeout = 0x800000008, - tomProtected = 0x800000010, - tomLink = 0x800000020, - tomSmallCaps = 0x800000040, - tomAllCaps = 0x800000080, - tomHidden = 0x800000100, - tomOutline = 0x800000200, - tomShadow = 0x800000400, - tomEmboss = 0x800000800, - tomImprint = 0x800001000, - tomDisabled = 0x800002000, - tomRevised = 0x800004000, + tomBold = 0x80000001, + tomItalic = 0x80000002, + tomUnderline = 0x80000004, + tomStrikeout = 0x80000008, + tomProtected = 0x80000010, + tomLink = 0x80000020, + tomSmallCaps = 0x80000040, + tomAllCaps = 0x80000080, + tomHidden = 0x80000100, + tomOutline = 0x80000200, + tomShadow = 0x80000400, + tomEmboss = 0x80000800, + tomImprint = 0x80001000, + tomDisabled = 0x80002000, + tomRevised = 0x80004000, tomNormalCaret = 0, tomKoreanBlockCaret = 0x1, tomIncludeInset = 0x1,

1 0

[fireball] 37356: - Time to say goodbye to dosfsck port, it's been fully integrated into vfatlib, and the need in a standalone version disappeared.
by fireball＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: fireball Date: Fri Nov 14 03:35:59 2008 New Revision: 37356 URL: http://svn.reactos.org/svn/reactos?rev=37356&view=rev Log: - Time to say goodbye to dosfsck port, it's been fully integrated into vfatlib, and the need in a standalone version disappeared. Removed: trunk/rosapps/applications/sysutils/dosfsck/ Modified: trunk/rosapps/applications/sysutils/sysutils.rbuild Modified: trunk/rosapps/applications/sysutils/sysutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/sysu… ============================================================================== --- trunk/rosapps/applications/sysutils/sysutils.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/sysutils.rbuild [iso-8859-1] Fri Nov 14 03:35:59 2008 @@ -10,10 +10,6 @@ <directory name="chklib"> <xi:include href="chklib/chklib.rbuild" /> - </directory> - - <directory name="dosfsck"> - <xi:include href="dosfsck/dosfsck.rbuild" /> </directory> <directory name="gettype">

1 0

[sserapion] 37354: Kill auto-import insurgent.
by sserapion＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sserapion Date: Thu Nov 13 23:53:40 2008 New Revision: 37354 URL: http://svn.reactos.org/svn/reactos?rev=37354&view=rev Log: Kill auto-import insurgent. Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/stabs.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/stabs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/stabs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/stabs.c [iso-8859-1] Thu Nov 13 23:53:40 2008 @@ -62,8 +62,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); - -UINT64 _strtoui64( const char *nptr, char **endptr, int base ); #ifndef N_UNDF #define N_UNDF 0x00

1 0

[sserapion] 37353: Kill auto-import insurgent.
by sserapion＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sserapion Date: Thu Nov 13 23:53:00 2008 New Revision: 37353 URL: http://svn.reactos.org/svn/reactos?rev=37353&view=rev Log: Kill auto-import insurgent. Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ftp/prototypes.h Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ftp/prototypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/ftp/prototypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/ftp/prototypes.h [iso-8859-1] Thu Nov 13 23:53:00 2008 @@ -44,7 +44,6 @@ int sleep(int time); char *tail(); -int errno; char *mktemp(); void setbell(), setdebug(); void setglob(), sethash(), setport();

1 0

[sserapion] 37352: Correct definitions for WIN32 and WIN64.
by sserapion＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sserapion Date: Thu Nov 13 23:51:46 2008 New Revision: 37352 URL: http://svn.reactos.org/svn/reactos?rev=37352&view=rev Log: Correct definitions for WIN32 and WIN64. Modified: branches/ros-amd64-bringup/reactos/include/crt/mingw32/stddef.h Modified: branches/ros-amd64-bringup/reactos/include/crt/mingw32/stddef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/mingw32/stddef.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/mingw32/stddef.h [iso-8859-1] Thu Nov 13 23:51:46 2008 @@ -140,7 +140,11 @@ #define ___int_ptrdiff_t_h #define _GCC_PTRDIFF_T #ifndef __PTRDIFF_TYPE__ -#define __PTRDIFF_TYPE__ long long int +# ifdef _WIN64 + #define __PTRDIFF_TYPE__ long long int +# else +# #define __PTRDIFF_TYPE__ long int +# endif #endif #ifndef _PTRDIFF_T_DEFINED #define _PTRDIFF_T_DEFINED @@ -204,7 +208,11 @@ #define __size_t #endif #ifndef __SIZE_TYPE__ -#define __SIZE_TYPE__ long long unsigned int +# ifdef _WIN64 +# define __SIZE_TYPE__ long long unsigned int +# else +# define __SIZE_TYPE__ long unsigned int +# endif #endif #if !(defined (__GNUG__) && defined (size_t)) typedef __SIZE_TYPE__ size_t; @@ -379,12 +387,12 @@ #endif /* NULL not defined and <stddef.h> or need NULL. */ #undef __need_NULL -#ifdef _STDDEF_H +#ifndef offsetof /* Offset of member MEMBER in a struct of type TYPE. */ #define offsetof(TYPE, MEMBER) __builtin_offsetof (TYPE, MEMBER) -#endif /* _STDDEF_H was defined this time */ +#endif /* !offsetof */ #endif /* !_STDDEF_H && !_STDDEF_H_ && !_ANSI_STDDEF_H && !__STDDEF_H__ || __need_XXX was not defined before */

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008