Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sserapion] 38260: Fix EDITSTREAM structure
by sserapion＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: sserapion Date: Sun Dec 21 21:22:05 2008 New Revision: 38260 URL: http://svn.reactos.org/svn/reactos?rev=38260&view=rev Log: Fix EDITSTREAM structure Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/editor.c branches/ros-amd64-bringup/reactos/include/psdk/richedit.h Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/riched20/editor.c [iso-8859-1] Sun Dec 21 21:22:05 2008 @@ -1616,7 +1616,7 @@ data.string = string; data.length = strlen(string); data.pos = 0; - es.dwCookie = (DWORD)&data; + es.dwCookie = (DWORD_PTR)&data; es.pfnCallback = ME_ReadFromRTFString; ME_StreamIn(editor, SF_RTF | (selection ? SFF_SELECTION : 0), &es, FALSE); } @@ -1998,7 +1998,7 @@ return FALSE; gds.hData = GetClipboardData(cf); gds.nLength = 0; - es.dwCookie = (DWORD)&gds; + es.dwCookie = (DWORD_PTR)&gds; es.pfnCallback = dwFormat == SF_RTF ? ME_ReadFromHGLOBALRTF : ME_ReadFromHGLOBALUnicode; ME_StreamIn(editor, dwFormat|SFF_SELECTION, &es, FALSE); Modified: branches/ros-amd64-bringup/reactos/include/psdk/richedit.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/richedit.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/richedit.h [iso-8859-1] Sun Dec 21 21:22:05 2008 @@ -517,7 +517,7 @@ typedef struct _editstream { DWORD dwCookie; - DWORD dwError; + DWORD_PTR dwError; EDITSTREAMCALLBACK pfnCallback; } EDITSTREAM;

1 0

[sserapion] 38259: Support IMAGE_REL_BASED_DIR64.
by sserapion＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: sserapion Date: Sun Dec 21 21:09:04 2008 New Revision: 38259 URL: http://svn.reactos.org/svn/reactos?rev=38259&view=rev Log: Support IMAGE_REL_BASED_DIR64. Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Sun Dec 21 21:09:04 2008 @@ -3265,6 +3265,12 @@ LongPtr = (PULONG)((ULONG_PTR)Address + Offset); *LongPtr += Delta; break; +#ifdef _WIN64 + case IMAGE_REL_BASED_DIR64: + LongPtr = (PULONG)((ULONG_PTR)Address + Offset); + *LongPtr += Delta; + break; +#endif case IMAGE_REL_BASED_HIGHADJ: case IMAGE_REL_BASED_MIPS_JMPADDR:

1 0

[jimtabor] 38258: - Start populating server information structure. This fixes the icon issues with other languages.
by jimtabor＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: jimtabor Date: Sun Dec 21 20:52:47 2008 New Revision: 38258 URL: http://svn.reactos.org/svn/reactos?rev=38258&view=rev Log: - Start populating server information structure. This fixes the icon issues with other languages. Modified: trunk/reactos/dll/win32/user32/windows/icon.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] Sun Dec 21 20:52:47 2008 @@ -670,13 +670,13 @@ { ColorBits = 1; } - else if (g_psi->SystemMetrics[SM_SAMEDISPLAYFORMAT] || (cFlag & LR_VGACOLOR) ) + else if (cFlag & LR_VGACOLOR) { ColorBits = 4; } else { - ColorBits = 0; + ColorBits = g_psi->BitsPixel; } if(bIcon) 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] Sun Dec 21 20:52:47 2008 @@ -277,6 +277,19 @@ COLORREF SysColors[COLOR_MENUBAR+1]; // GetSysColor HBRUSH SysColorBrushes[COLOR_MENUBAR+1]; // GetSysColorBrush HPEN SysColorPens[COLOR_MENUBAR+1]; // ReactOS exclusive + // + RECTL rcScreen; + WORD BitCount; + WORD dmLogPixels; + BYTE BitsPixel; + BYTE Planes; + WORD reserved; + DWORD PUSIFlags; + ULONG uCaretWidth; + LANGID UILangID; + UINT LastRITWasKeyboard : 1; + UINT bKeyboardPref : 1; + DWORD TimeTick; DWORD SrvEventActivity; } SERVERINFO, *PSERVERINFO; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Sun Dec 21 20:52:47 2008 @@ -314,6 +314,11 @@ NtGdiSelectFont( hSystemBM, NtGdiGetStockObject(SYSTEM_FONT)); IntGdiSetDCOwnerEx( hSystemBM, GDI_OBJ_HMGR_PUBLIC, FALSE); + + // FIXME! Move these to a update routine. + gpsi->Planes = NtGdiGetDeviceCaps(ScreenDeviceContext, PLANES); + gpsi->BitsPixel = NtGdiGetDeviceCaps(ScreenDeviceContext, BITSPIXEL); + gpsi->BitCount = gpsi->Planes * gpsi->BitsPixel; return TRUE; }

1 0

[cgutman] 38257: - Fix compilation of tcpip with MEMTRACK defined
by cgutman＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: cgutman Date: Sun Dec 21 20:52:45 2008 New Revision: 38257 URL: http://svn.reactos.org/svn/reactos?rev=38257&view=rev Log: - Fix compilation of tcpip with MEMTRACK defined Modified: branches/aicom-network-fixes/drivers/network/tcpip/include/memtrack.h Modified: branches/aicom-network-fixes/drivers/network/tcpip/include/memtrack.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/include/memtrack.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/include/memtrack.h [iso-8859-1] Sun Dec 21 20:52:45 2008 @@ -19,9 +19,6 @@ #define exAllocatePool(x,y) ExAllocatePoolX(x,y,__FILE__,__LINE__) #define exAllocatePoolWithTag(x,y,z) ExAllocatePoolX(x,y,__FILE__,__LINE__) #define exFreePool(x) ExFreePoolX(x,__FILE__,__LINE__) - -extern LIST_ENTRY AllocatedObjectsHead; -extern KSPIN_LOCK AllocatedObjectsLock; typedef struct _ALLOCATION_TRACKER { LIST_ENTRY Entry;

1 0

[sginsberg] 38256: - More hack
by sginsberg＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: sginsberg Date: Sun Dec 21 17:42:08 2008 New Revision: 38256 URL: http://svn.reactos.org/svn/reactos?rev=38256&view=rev Log: - More hack Modified: trunk/rostests/winetests/shell32/roshack.diff trunk/rostests/winetests/shell32/systray.c Modified: trunk/rostests/winetests/shell32/roshack.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/roshack… ============================================================================== --- trunk/rostests/winetests/shell32/roshack.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/roshack.diff [iso-8859-1] Sun Dec 21 17:42:08 2008 @@ -11,3 +11,17 @@ myARGC = winetest_get_mainargs(&myARGV); if (myARGC >= 3) +Index: systray.c +=================================================================== +--- systray.c (revision 38229) ++++ systray.c (working copy) +@@ -138,6 +138,9 @@ + RECT rc; + HMODULE huser32, hshell32; + ++ skip("Skipping systray tests\n"); ++ return; ++ + hshell32 = GetModuleHandleA("shell32.dll"); + pShell_NotifyIconW = (void*)GetProcAddress(hshell32, "Shell_NotifyIconW"); + Modified: trunk/rostests/winetests/shell32/systray.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/systray… ============================================================================== --- trunk/rostests/winetests/shell32/systray.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/systray.c [iso-8859-1] Sun Dec 21 17:42:08 2008 @@ -138,6 +138,9 @@ RECT rc; HMODULE huser32, hshell32; + skip("Skipping systray tests\n"); + return; + hshell32 = GetModuleHandleA("shell32.dll"); pShell_NotifyIconW = (void*)GetProcAddress(hshell32, "Shell_NotifyIconW");

1 0

[tkreuzer] 38255: Include crtdefs.h instead of _mingw.h in the crt headers (like ms does), so only one header left (crtdefs.h) that includes a non-standard header
by tkreuzer＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: tkreuzer Date: Sun Dec 21 17:33:19 2008 New Revision: 38255 URL: http://svn.reactos.org/svn/reactos?rev=38255&view=rev Log: Include crtdefs.h instead of _mingw.h in the crt headers (like ms does), so only one header left (crtdefs.h) that includes a non-standard header Modified: trunk/reactos/include/crt/assert.h trunk/reactos/include/crt/complex.h trunk/reactos/include/crt/conio.h trunk/reactos/include/crt/crtdbg.h trunk/reactos/include/crt/ctype.h trunk/reactos/include/crt/direct.h trunk/reactos/include/crt/dirent.h trunk/reactos/include/crt/dos.h trunk/reactos/include/crt/dvec.h trunk/reactos/include/crt/eh.h trunk/reactos/include/crt/errno.h trunk/reactos/include/crt/fcntl.h trunk/reactos/include/crt/float.h trunk/reactos/include/crt/fpieee.h trunk/reactos/include/crt/fvec.h trunk/reactos/include/crt/inttypes.h trunk/reactos/include/crt/io.h trunk/reactos/include/crt/libgen.h trunk/reactos/include/crt/limits.h trunk/reactos/include/crt/locale.h trunk/reactos/include/crt/malloc.h trunk/reactos/include/crt/math.h trunk/reactos/include/crt/mbctype.h trunk/reactos/include/crt/mbstring.h trunk/reactos/include/crt/memory.h trunk/reactos/include/crt/new.h trunk/reactos/include/crt/process.h trunk/reactos/include/crt/rtcapi.h trunk/reactos/include/crt/search.h trunk/reactos/include/crt/setjmp.h trunk/reactos/include/crt/signal.h trunk/reactos/include/crt/stddef.h trunk/reactos/include/crt/stdexcpt.h trunk/reactos/include/crt/stdint.h trunk/reactos/include/crt/stdio.h trunk/reactos/include/crt/stdlib.h trunk/reactos/include/crt/string.h trunk/reactos/include/crt/sys/locking.h trunk/reactos/include/crt/sys/stat.h trunk/reactos/include/crt/sys/timeb.h trunk/reactos/include/crt/sys/types.h trunk/reactos/include/crt/sys/utime.h trunk/reactos/include/crt/tchar.h trunk/reactos/include/crt/time.h trunk/reactos/include/crt/typeinfo.h trunk/reactos/include/crt/vadefs.h trunk/reactos/include/crt/wchar.h trunk/reactos/include/crt/wctype.h trunk/reactos/include/crt/yvals.h Modified: trunk/reactos/include/crt/assert.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/assert.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/assert.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/assert.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef __ASSERT_H_ #define __ASSERT_H_ -#include <_mingw.h> +#include <crtdefs.h> #ifdef __cplusplus #include <stdlib.h> #endif Modified: trunk/reactos/include/crt/complex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/complex.h?rev=… ============================================================================== --- trunk/reactos/include/crt/complex.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/complex.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -26,8 +26,7 @@ #ifndef _COMPLEX_H_ #define _COMPLEX_H_ -/* All the headers include this file. */ -#include <_mingw.h> +#include <crtdefs.h> #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \ || !defined __STRICT_ANSI__ Modified: trunk/reactos/include/crt/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/conio.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/conio.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/conio.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_CONIO #define _INC_CONIO -#include <_mingw.h> +#include <crtdefs.h> #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/crt/crtdbg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdbg.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/crtdbg.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/crtdbg.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <_mingw.h> +#include <crtdefs.h> #ifndef _INC_CRTDBG #define _INC_CRTDBG Modified: trunk/reactos/include/crt/ctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/ctype.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/ctype.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/ctype.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_CTYPE #define _INC_CTYPE -#include <_mingw.h> +#include <crtdefs.h> #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/crt/direct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/direct.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/direct.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/direct.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_DIRECT #define _INC_DIRECT -#include <_mingw.h> +#include <crtdefs.h> #include <io.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/dirent.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/dirent.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/dirent.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/dirent.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -3,8 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -/* All the headers include this file. */ -#include <_mingw.h> +#include <crtdefs.h> #ifndef __STRICT_ANSI__ Modified: trunk/reactos/include/crt/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/dos.h?rev=3825… ============================================================================== --- trunk/reactos/include/crt/dos.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/dos.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_DOS #define _INC_DOS -#include <_mingw.h> +#include <crtdefs.h> #include <io.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/dvec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/dvec.h?rev=382… ============================================================================== --- trunk/reactos/include/crt/dvec.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/dvec.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -14,7 +14,7 @@ #include <emmintrin.h> #include <assert.h> #include <fvec.h> -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/eh.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/eh.h?rev=38255… ============================================================================== --- trunk/reactos/include/crt/eh.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/eh.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <_mingw.h> +#include <crtdefs.h> #ifndef _EH_H_ #define _EH_H_ Modified: trunk/reactos/include/crt/errno.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/errno.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/errno.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/errno.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_ERRNO #define _INC_ERRNO -#include <_mingw.h> +#include <crtdefs.h> #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/crt/fcntl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/fcntl.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/fcntl.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/fcntl.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <_mingw.h> +#include <crtdefs.h> #include <io.h> Modified: trunk/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/float.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/float.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/float.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -21,8 +21,7 @@ #ifndef _MINGW_FLOAT_H_ #define _MINGW_FLOAT_H_ -/* All the headers include this file. */ -#include <_mingw.h> +#include <crtdefs.h> /* * Functions and definitions for controlling the FPU. Modified: trunk/reactos/include/crt/fpieee.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/fpieee.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/fpieee.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/fpieee.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_FPIEEE #define _INC_FPIEEE -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/fvec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/fvec.h?rev=382… ============================================================================== --- trunk/reactos/include/crt/fvec.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/fvec.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -14,7 +14,7 @@ #include <xmmintrin.h> #include <assert.h> #include <ivec.h> -#include <_mingw.h> +#include <crtdefs.h> #if defined(_ENABLE_VEC_DEBUG) #include <iostream> Modified: trunk/reactos/include/crt/inttypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/inttypes.h?rev… ============================================================================== --- trunk/reactos/include/crt/inttypes.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/inttypes.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -8,7 +8,7 @@ #ifndef _INTTYPES_H_ #define _INTTYPES_H_ -#include <_mingw.h> +#include <crtdefs.h> #include <stdint.h> #define __need_wchar_t #include <stddef.h> Modified: trunk/reactos/include/crt/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/io.h?rev=38255… ============================================================================== --- trunk/reactos/include/crt/io.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/io.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _IO_H_ #define _IO_H_ -#include <_mingw.h> +#include <crtdefs.h> #include <string.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/libgen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/libgen.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/libgen.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/libgen.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -14,7 +14,7 @@ #define _LIBGEN_H_ /* All the headers include this file. */ -#include <_mingw.h> +#include <crtdefs.h> #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/crt/limits.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/limits.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/limits.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/limits.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <_mingw.h> +#include <crtdefs.h> #ifndef _INC_LIMITS #define _INC_LIMITS Modified: trunk/reactos/include/crt/locale.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/locale.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/locale.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/locale.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_LOCALE #define _INC_LOCALE -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/malloc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/malloc.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/malloc.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/malloc.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _MALLOC_H_ #define _MALLOC_H_ -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=382… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -10,7 +10,7 @@ #pragma GCC system_header #endif -#include <_mingw.h> +#include <crtdefs.h> struct exception; Modified: trunk/reactos/include/crt/mbctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mbctype.h?rev=… ============================================================================== --- trunk/reactos/include/crt/mbctype.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mbctype.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_MBCTYPE #define _INC_MBCTYPE -#include <_mingw.h> +#include <crtdefs.h> #include <ctype.h> #ifdef __cplusplus Modified: trunk/reactos/include/crt/mbstring.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mbstring.h?rev… ============================================================================== --- trunk/reactos/include/crt/mbstring.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mbstring.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_MBSTRING #define _INC_MBSTRING -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/memory.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/memory.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/memory.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_MEMORY #define _INC_MEMORY -#include <_mingw.h> +#include <crtdefs.h> #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/crt/new.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/new.h?rev=3825… ============================================================================== --- trunk/reactos/include/crt/new.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/new.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -10,7 +10,7 @@ #include <new> -#include <_mingw.h> +#include <crtdefs.h> #pragma push_macro("new") #undef new Modified: trunk/reactos/include/crt/process.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/process.h?rev=… ============================================================================== --- trunk/reactos/include/crt/process.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/process.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_PROCESS #define _INC_PROCESS -#include <_mingw.h> +#include <crtdefs.h> /* Includes a definition of _pid_t and pid_t */ #include <sys/types.h> Modified: trunk/reactos/include/crt/rtcapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/rtcapi.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/rtcapi.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/rtcapi.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_RTCAPI #define _INC_RTCAPI -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/search.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/search.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/search.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/search.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_SEARCH #define _INC_SEARCH -#include <_mingw.h> +#include <crtdefs.h> #include <stddef.h> #ifdef __cplusplus Modified: trunk/reactos/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/setjmp.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/setjmp.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/setjmp.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_SETJMP #define _INC_SETJMP -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/signal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/signal.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/signal.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/signal.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_SIGNAL #define _INC_SIGNAL -#include <_mingw.h> +#include <crtdefs.h> #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/crt/stddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stddef.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/stddef.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stddef.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -4,7 +4,7 @@ * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <_mingw.h> +#include <crtdefs.h> #ifndef _INC_STDDEF #define _INC_STDDEF Modified: trunk/reactos/include/crt/stdexcpt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdexcpt.h?rev… ============================================================================== --- trunk/reactos/include/crt/stdexcpt.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdexcpt.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <_mingw.h> +#include <crtdefs.h> #ifndef _INC_STDEXCPT #define _INC_STDEXCPT Modified: trunk/reactos/include/crt/stdint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdint.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/stdint.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdint.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -25,7 +25,7 @@ #ifndef _STDINT_H #define _STDINT_H -#include <_mingw.h> +#include <crtdefs.h> #define __need_wint_t #define __need_wchar_t Modified: trunk/reactos/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdio.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/stdio.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdio.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_STDIO #define _INC_STDIO -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdlib.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_STDLIB #define _INC_STDLIB -#include <_mingw.h> +#include <crtdefs.h> #include <limits.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/string.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/string.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_STRING #define _INC_STRING -#include <_mingw.h> +#include <crtdefs.h> #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/crt/sys/locking.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/locking.h?… ============================================================================== --- trunk/reactos/include/crt/sys/locking.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/locking.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -10,8 +10,7 @@ #error Only Win32 target is supported! #endif -/* All the headers include this file. */ -#include <_mingw.h> +#include <crtdefs.h> #define _LK_UNLCK 0 #define _LK_LOCK 1 Modified: trunk/reactos/include/crt/sys/stat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/stat.h?rev… ============================================================================== --- trunk/reactos/include/crt/sys/stat.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/stat.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -10,7 +10,7 @@ #error Only Win32 target is supported! #endif -#include <_mingw.h> +#include <crtdefs.h> #include <io.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/sys/timeb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/timeb.h?re… ============================================================================== --- trunk/reactos/include/crt/sys/timeb.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/timeb.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _TIMEB_H_ #define _TIMEB_H_ -#include <_mingw.h> +#include <crtdefs.h> #ifndef _WIN32 #error Only Win32 target is supported! Modified: trunk/reactos/include/crt/sys/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/types.h?re… ============================================================================== --- trunk/reactos/include/crt/sys/types.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/types.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -10,7 +10,7 @@ #error Only Win32 target is supported! #endif -#include <_mingw.h> +#include <crtdefs.h> #ifdef _USE_32BIT_TIME_T #ifdef _WIN64 Modified: trunk/reactos/include/crt/sys/utime.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/utime.h?re… ============================================================================== --- trunk/reactos/include/crt/sys/utime.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/utime.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -10,7 +10,7 @@ #error Only Win32 target is supported! #endif -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/tchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/tchar.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/tchar.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/tchar.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <_mingw.h> +#include <crtdefs.h> #ifndef _INC_TCHAR #define _INC_TCHAR Modified: trunk/reactos/include/crt/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/time.h?rev=382… ============================================================================== --- trunk/reactos/include/crt/time.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/time.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _TIME_H_ #define _TIME_H_ -#include <_mingw.h> +#include <crtdefs.h> #ifndef _WIN32 #error Only Win32 target is supported! Modified: trunk/reactos/include/crt/typeinfo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/typeinfo.h?rev… ============================================================================== --- trunk/reactos/include/crt/typeinfo.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/typeinfo.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <_mingw.h> +#include <crtdefs.h> #ifndef _INC_TYPEINFO #define _INC_TYPEINFO Modified: trunk/reactos/include/crt/vadefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/vadefs.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/vadefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/vadefs.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -10,7 +10,7 @@ #error Only Win32 target is supported! #endif -#include <_mingw.h> +#include <crtdefs.h> #undef _CRT_PACKING #define _CRT_PACKING 8 Modified: trunk/reactos/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wchar.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/wchar.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/wchar.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_WCHAR #define _INC_WCHAR -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/wctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wctype.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/wctype.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/wctype.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -10,7 +10,7 @@ #error Only Win32 target is supported! #endif -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/yvals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/yvals.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/yvals.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/yvals.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _YVALS #define _YVALS -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING)

1 0

[sginsberg] 38254: - Disable shell32 execute tests - Add missing ole32 diff
by sginsberg＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: sginsberg Date: Sun Dec 21 17:16:59 2008 New Revision: 38254 URL: http://svn.reactos.org/svn/reactos?rev=38254&view=rev Log: - Disable shell32 execute tests - Add missing ole32 diff Added: trunk/rostests/winetests/ole32/roshack.diff trunk/rostests/winetests/shell32/roshack.diff Modified: trunk/rostests/winetests/ole32/compobj.c trunk/rostests/winetests/shell32/shlexec.c Modified: trunk/rostests/winetests/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/compobj.c… ============================================================================== --- trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] Sun Dec 21 17:16:59 2008 @@ -1024,7 +1024,7 @@ START_TEST(compobj) { - skip("Skipping compobj tests\n"); + skip("ROS-HACK: Skipping compobj tests\n"); return; HMODULE hOle32 = GetModuleHandle("ole32"); Added: trunk/rostests/winetests/ole32/roshack.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/roshack.d… ============================================================================== --- trunk/rostests/winetests/ole32/roshack.diff (added) +++ trunk/rostests/winetests/ole32/roshack.diff [iso-8859-1] Sun Dec 21 17:16:59 2008 @@ -1,0 +1,14 @@ +Index: compobj.c +=================================================================== +--- compobj.c (revision 38229) ++++ compobj.c (working copy) +@@ -1024,6 +1024,9 @@ + + START_TEST(compobj) + { ++ skip("ROS-HACK: Skipping compobj tests\n"); ++ return; ++ + HMODULE hOle32 = GetModuleHandle("ole32"); + pCoGetObjectContext = (void*)GetProcAddress(hOle32, "CoGetObjectContext"); + if (!(pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"))) Added: trunk/rostests/winetests/shell32/roshack.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/roshack… ============================================================================== --- trunk/rostests/winetests/shell32/roshack.diff (added) +++ trunk/rostests/winetests/shell32/roshack.diff [iso-8859-1] Sun Dec 21 17:16:59 2008 @@ -1,0 +1,13 @@ +Index: shlexec.c +=================================================================== +--- shlexec.c (revision 38229) ++++ shlexec.c (working copy) +@@ -1577,6 +1577,8 @@ + + START_TEST(shlexec) + { ++ skip("ROS-HACK: Skipping shell execute tests\n"); ++ return; + + myARGC = winetest_get_mainargs(&myARGV); + if (myARGC >= 3) Modified: trunk/rostests/winetests/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlexec… ============================================================================== --- trunk/rostests/winetests/shell32/shlexec.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlexec.c [iso-8859-1] Sun Dec 21 17:16:59 2008 @@ -1577,6 +1577,8 @@ START_TEST(shlexec) { + skip("ROS-HACK: Skipping shell execute tests\n"); + return; myARGC = winetest_get_mainargs(&myARGV); if (myARGC >= 3)

1 0

[sginsberg] 38253: - Skip a buck load of ole32 tests too
by sginsberg＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: sginsberg Date: Sun Dec 21 16:58:10 2008 New Revision: 38253 URL: http://svn.reactos.org/svn/reactos?rev=38253&view=rev Log: - Skip a buck load of ole32 tests too Modified: trunk/rostests/winetests/ole32/compobj.c Modified: trunk/rostests/winetests/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/compobj.c… ============================================================================== --- trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] Sun Dec 21 16:58:10 2008 @@ -1024,6 +1024,9 @@ START_TEST(compobj) { + skip("Skipping compobj tests\n"); + return; + HMODULE hOle32 = GetModuleHandle("ole32"); pCoGetObjectContext = (void*)GetProcAddress(hOle32, "CoGetObjectContext"); if (!(pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx")))

1 0

[tkreuzer] 38252: Update excpt.h, fcntl.h, float.h, math.c, mbctype.h, setjmp.h, share.h, stddef.h, stdio.h, stdlib.h, string.h, wchar.h from ming64 - fix __p__mbctype() - add some stuff to wine/exception.h that was formerly in except.h, but doesn't belong there - inlcude intrin.h from _mingw.h
by tkreuzer＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: tkreuzer Date: Sun Dec 21 16:43:46 2008 New Revision: 38252 URL: http://svn.reactos.org/svn/reactos?rev=38252&view=rev Log: Update excpt.h, fcntl.h, float.h, math.c, mbctype.h, setjmp.h, share.h, stddef.h, stdio.h, stdlib.h, string.h, wchar.h from ming64 - fix __p__mbctype() - add some stuff to wine/exception.h that was formerly in except.h, but doesn't belong there - inlcude intrin.h from _mingw.h Modified: trunk/reactos/include/crt/_mingw.h trunk/reactos/include/crt/excpt.h trunk/reactos/include/crt/fcntl.h trunk/reactos/include/crt/float.h trunk/reactos/include/crt/math.h trunk/reactos/include/crt/mbctype.h trunk/reactos/include/crt/setjmp.h trunk/reactos/include/crt/share.h trunk/reactos/include/crt/stddef.h trunk/reactos/include/crt/stdio.h trunk/reactos/include/crt/stdlib.h trunk/reactos/include/crt/string.h trunk/reactos/include/crt/wchar.h trunk/reactos/include/reactos/wine/exception.h trunk/reactos/lib/sdk/crt/mbstring/ismblead.c Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/_mingw.h [iso-8859-1] Sun Dec 21 16:43:46 2008 @@ -569,5 +569,27 @@ #endif #pragma pack(pop) -#endif - + +/* There are here for intrin.h */ +#ifndef _SIZE_T_DEFINED +#define _SIZE_T_DEFINED +#ifdef _WIN64 + typedef unsigned __int64 size_t; +#else + typedef unsigned int size_t; +#endif +#endif + +#ifndef _UINTPTR_T_DEFINED +#define _UINTPTR_T_DEFINED +#ifdef _WIN64 + typedef unsigned __int64 uintptr_t; +#else + typedef unsigned int uintptr_t; +#endif +#endif + +#include <mingw32/intrin.h> + +#endif + Modified: trunk/reactos/include/crt/excpt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/excpt.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/excpt.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/excpt.h [iso-8859-1] Sun Dec 21 16:43:46 2008 @@ -1,103 +1,129 @@ -/* - * excpt.h +/** * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Support for operating system level structured exception handling. - * - * NOTE: This is very preliminary stuff. I am also pretty sure it is - * completely Intel specific. - * + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. */ +#ifndef _INC_EXCPT +#define _INC_EXCPT -#ifndef _EXCPT_H_ -#define _EXCPT_H_ +#include <crtdefs.h> -/* All the headers include this file. */ -#include <_mingw.h> +#pragma pack(push,_CRT_PACKING) -/* - * NOTE: The constants structs and typedefs below should be defined in the - * Win32 API headers. - */ -#define EXCEPTION_EXECUTE_HANDLER 1 -#define EXCEPTION_CONTINUE_SEARCH 0 -#define EXCEPTION_CONTINUE_EXECUTION -1 - -#define EH_NONCONTINUABLE 0x01 -#define EH_UNWINDING 0x02 -#define EH_EXIT_UNWIND 0x04 -#define EH_STACK_INVALID 0x08 -#define EH_NESTED_CALL 0x10 - -#ifndef RC_INVOKED - -typedef enum { - ExceptionContinueExecution, - ExceptionContinueSearch, - ExceptionNestedException, - ExceptionCollidedUnwind -} EXCEPTION_DISPOSITION; - - -/* - * End of stuff that should be in the Win32 API files. - */ - - -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif -/* - * The type of function that is expected as an exception handler to be - * installed with __try1. - */ -struct _CONTEXT; -struct _EXCEPTION_RECORD; -typedef EXCEPTION_DISPOSITION (*PEXCEPTION_HANDLER) - (struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*); +typedef enum _EXCEPTION_DISPOSITION +{ + ExceptionContinueExecution, + ExceptionContinueSearch, + ExceptionNestedException, + ExceptionCollidedUnwind, +} EXCEPTION_DISPOSITION; -/* - * This is not entirely necessary, but it is the structure installed by - * the __try1 primitive below. - */ -typedef struct _EXCEPTION_REGISTRATION -{ - struct _EXCEPTION_REGISTRATION* prev; - PEXCEPTION_HANDLER handler; -} EXCEPTION_REGISTRATION, *PEXCEPTION_REGISTRATION; +#if (defined(_X86_) && !defined(__x86_64)) + struct _EXCEPTION_RECORD; + struct _CONTEXT; -/* - * A macro which installs the supplied exception handler. - * Push the pointer to the new handler onto the stack, - * then push the pointer to the old registration structure (at fs:0) - * onto the stack, then put a pointer to the new registration - * structure (i.e. the current stack pointer) at fs:0. - */ + EXCEPTION_DISPOSITION __cdecl _except_handler(struct _EXCEPTION_RECORD *_ExceptionRecord,void *_EstablisherFrame,struct _CONTEXT *_ContextRecord,void *_DispatcherContext); +#elif defined(__ia64__) + + typedef struct _EXCEPTION_POINTERS *Exception_info_ptr; + struct _EXCEPTION_RECORD; + struct _CONTEXT; + struct _DISPATCHER_CONTEXT; + + _CRTIMP EXCEPTION_DISPOSITION __cdecl __C_specific_handler (struct _EXCEPTION_RECORD *_ExceptionRecord,unsigned __int64 _MemoryStackFp,unsigned __int64 _BackingStoreFp,struct _CONTEXT *_ContextRecord,struct _DISPATCHER_CONTEXT *_DispatcherContext,unsigned __int64 _GlobalPointer); +#elif defined(__x86_64) + + struct _EXCEPTION_RECORD; + struct _CONTEXT; + struct _DISPATCHER_CONTEXT; + + _CRTIMP EXCEPTION_DISPOSITION __cdecl __C_specific_handler (struct _EXCEPTION_RECORD *_ExceptionRecord,void *_EstablisherFrame,struct _CONTEXT *_ContextRecord,struct _DISPATCHER_CONTEXT *_DispatcherContext); +#endif + +#ifdef _MSC_VER // HACK!!! +#define GetExceptionCode _exception_code +#define exception_code _exception_code +#define GetExceptionInformation (struct _EXCEPTION_POINTERS *)_exception_info +#define exception_info (struct _EXCEPTION_POINTERS *)_exception_info +#define AbnormalTermination _abnormal_termination +#define abnormal_termination _abnormal_termination +#endif + + unsigned long __cdecl _exception_code(void); + void *__cdecl _exception_info(void); + int __cdecl _abnormal_termination(void); + +#define EXCEPTION_EXECUTE_HANDLER 1 +#define EXCEPTION_CONTINUE_SEARCH 0 +#define EXCEPTION_CONTINUE_EXECUTION -1 + +#if 0 + /* CRT stuff */ + typedef void (__cdecl * _PHNDLR)(int); + + struct _XCPT_ACTION { + unsigned long XcptNum; + int SigNum; + _PHNDLR XcptAction; + }; + + extern struct _XCPT_ACTION _XcptActTab[]; + extern int _XcptActTabCount; + extern int _XcptActTabSize; + extern int _First_FPE_Indx; + extern int _Num_FPE; + + int __cdecl __CppXcptFilter(unsigned long _ExceptionNum,struct _EXCEPTION_POINTERS * _ExceptionPtr); + int __cdecl _XcptFilter(unsigned long _ExceptionNum,struct _EXCEPTION_POINTERS * _ExceptionPtr); + + /* + * The type of function that is expected as an exception handler to be + * installed with _try1. + */ + typedef EXCEPTION_DISPOSITION (*PEXCEPTION_HANDLER)(struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*); + +#ifndef HAVE_NO_SEH + /* + * This is not entirely necessary, but it is the structure installed by + * the _try1 primitive below. + */ + typedef struct _EXCEPTION_REGISTRATION { + struct _EXCEPTION_REGISTRATION *prev; + EXCEPTION_DISPOSITION (*handler)(struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*); + } EXCEPTION_REGISTRATION, *PEXCEPTION_REGISTRATION; + + typedef EXCEPTION_REGISTRATION EXCEPTION_REGISTRATION_RECORD; + typedef PEXCEPTION_REGISTRATION PEXCEPTION_REGISTRATION_RECORD; +#endif + +#if (defined(_X86_) && !defined(__x86_64)) #define __try1(pHandler) \ - __asm__ ("pushl %0;pushl %%fs:0;movl %%esp,%%fs:0;" : : "g" (pHandler)); + __asm__ ("pushl %0;pushl %%fs:0;movl %%esp,%%fs:0;" : : "g" (pHandler)); -/* - * A macro which (despite its name) *removes* an installed - * exception handler. Should be used only in conjunction with the above - * install routine __try1. - * Move the pointer to the old reg. struct (at the current stack - * position) to fs:0, replacing the pointer we installed above, - * then add 8 to the stack pointer to get rid of the space we - * used when we pushed on our new reg. struct above. Notice that - * the stack must be in the exact state at this point that it was - * after we did __try1 or this will smash things. - */ #define __except1 \ - __asm__ ("movl (%%esp),%%eax;movl %%eax,%%fs:0;addl $8,%%esp;" \ - : : : "%eax"); + __asm__ ("movl (%%esp),%%eax;movl %%eax,%%fs:0;addl $8,%%esp;" \ + : : : "%eax"); +#elif defined(__x86_64) +#define __try1(pHandler) \ + __asm__ ("pushq %0;pushq %%gs:0;movq %%rsp,%%gs:0;" : : "g" (pHandler)); -#ifdef __cplusplus +#define __except1 \ + __asm__ ("movq (%%rsp),%%rax;movq %%rax,%%gs:0;addq $16,%%rsp;" \ + : : : "%rax"); +#else +#define __try1(pHandler) +#define __except1 +#endif + +#endif // 0 + +#ifdef __cplusplus } #endif -#endif /* Not RC_INVOKED */ - -#endif /* _EXCPT_H_ not defined */ +#pragma pack(pop) +#endif Modified: trunk/reactos/include/crt/fcntl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/fcntl.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/fcntl.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/fcntl.h [iso-8859-1] Sun Dec 21 16:43:46 2008 @@ -36,7 +36,6 @@ #define O_RDONLY _O_RDONLY #define O_WRONLY _O_WRONLY #define O_RDWR _O_RDWR -#define O_ACCMODE _O_ACCMODE #define O_APPEND _O_APPEND #define O_CREAT _O_CREAT #define O_TRUNC _O_TRUNC @@ -48,5 +47,6 @@ #define O_NOINHERIT _O_NOINHERIT #define O_SEQUENTIAL _O_SEQUENTIAL #define O_RANDOM _O_RANDOM +#define O_ACCMODE _O_ACCMODE #endif #endif Modified: trunk/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/float.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/float.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/float.h [iso-8859-1] Sun Dec 21 16:43:46 2008 @@ -99,12 +99,12 @@ /* Set the FPU control word as cw = (cw & ~unMask) | (unNew & unMask), * i.e. change the bits in unMask to have the values they have in unNew, * leaving other bits unchanged. */ -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _controlfp (unsigned int unNew, unsigned int unMask); -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _control87 (unsigned int unNew, unsigned int unMask); +_CRTIMP unsigned int __cdecl __attribute__ ((__nothrow__)) _controlfp (unsigned int unNew, unsigned int unMask); +_CRTIMP unsigned int __cdecl __attribute__ ((__nothrow__)) _control87 (unsigned int unNew, unsigned int unMask); -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _clearfp (void); /* Clear the FPU status word */ -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _statusfp (void); /* Report the FPU status word */ +_CRTIMP unsigned int __cdecl __attribute__ ((__nothrow__)) _clearfp (void); /* Clear the FPU status word */ +_CRTIMP unsigned int __cdecl __attribute__ ((__nothrow__)) _statusfp (void); /* Report the FPU status word */ #define _clear87 _clearfp #define _status87 _statusfp @@ -118,11 +118,11 @@ per fninit. To use the MSVCRT.dll _fpreset, include CRT_fp8.o when building your application. */ -void __cdecl __MINGW_NOTHROW _fpreset (void); -void __cdecl __MINGW_NOTHROW fpreset (void); +void __cdecl __attribute__ ((__nothrow__)) _fpreset (void); +void __cdecl __attribute__ ((__nothrow__)) fpreset (void); /* Global 'variable' for the current floating point error code. */ -_CRTIMP int * __cdecl __MINGW_NOTHROW __fpecode(void); +_CRTIMP int * __cdecl __attribute__ ((__nothrow__)) __fpecode(void); #define _fpecode (*(__fpecode())) /* @@ -130,15 +130,15 @@ * but they really belong in math.h. */ -_CRTIMP double __cdecl __MINGW_NOTHROW _chgsign (double); -_CRTIMP double __cdecl __MINGW_NOTHROW _copysign (double, double); -_CRTIMP double __cdecl __MINGW_NOTHROW _logb (double); -_CRTIMP double __cdecl __MINGW_NOTHROW _nextafter (double, double); -_CRTIMP double __cdecl __MINGW_NOTHROW _scalb (double, long); +_CRTIMP double __cdecl __attribute__ ((__nothrow__)) _chgsign (double); +_CRTIMP double __cdecl __attribute__ ((__nothrow__)) _copysign (double, double); +_CRTIMP double __cdecl __attribute__ ((__nothrow__)) _logb (double); +_CRTIMP double __cdecl __attribute__ ((__nothrow__)) _nextafter (double, double); +_CRTIMP double __cdecl __attribute__ ((__nothrow__)) _scalb (double, long); -_CRTIMP int __cdecl __MINGW_NOTHROW _finite (double); -_CRTIMP int __cdecl __MINGW_NOTHROW _fpclass (double); -_CRTIMP int __cdecl __MINGW_NOTHROW _isnan (double); +_CRTIMP int __cdecl __attribute__ ((__nothrow__)) _finite (double); +_CRTIMP int __cdecl __attribute__ ((__nothrow__)) _fpclass (double); +_CRTIMP int __cdecl __attribute__ ((__nothrow__)) _isnan (double); #ifdef __cplusplus } Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=382… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Sun Dec 21 16:43:46 2008 @@ -76,6 +76,7 @@ double __cdecl cos(double _X); double __cdecl cosh(double _X); double __cdecl exp(double _X); + double expm1(double _X); double __cdecl fabs(double _X); double __cdecl fmod(double _X,double _Y); double __cdecl log(double _X); @@ -130,6 +131,7 @@ float __cdecl sinhf(float _X); float __cdecl tanhf(float _X); float __cdecl expf(float _X); + float expm1f(float _X); float __cdecl logf(float _X); float __cdecl log10f(float _X); float __cdecl modff(float _X,float *_Y); @@ -421,6 +423,7 @@ extern long double __cdecl powl (long double, long double); extern long double __cdecl expl(long double); + extern long double expm1l(long double); extern long double __cdecl coshl(long double); extern long double __cdecl fabsl (long double); extern long double __cdecl acosl(long double); Modified: trunk/reactos/include/crt/mbctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mbctype.h?rev=… ============================================================================== --- trunk/reactos/include/crt/mbctype.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mbctype.h [iso-8859-1] Sun Dec 21 16:43:46 2008 @@ -14,16 +14,29 @@ #endif /* CRT stuff */ -#if defined(_M_CEE_PURE) +#if 1 +#if defined (_DLL) && defined (_M_IX86) /* Retained for compatibility with VC++ 5.0 and earlier versions */ _CRTIMP unsigned char * __cdecl __p__mbctype(void); _CRTIMP unsigned char * __cdecl __p__mbcasemap(void); - #define _mbctype (__p__mbctype()) - #define _mbcasemap (__p__mbcasemap()) +#endif /* defined (_DLL) && defined (_M_IX86) */ +#endif +#ifndef _mbctype +#ifdef _MSVCRT_ + extern unsigned char _mbctype[257]; #else - _CRTIMP extern unsigned char _mbctype[]; - _CRTIMP extern unsigned char _mbcasemap[]; -#endif // defined(_M_CEE_PURE) +#define _mbctype (*_imp___mbctype) + extern unsigned char **_imp___mbctype; +#endif +#endif +#ifndef _mbcasemap +#ifdef _MSVCRT_ + extern unsigned char *_mbcasemap; +#else +#define _mbcasemap (*_imp___mbcasemap) + extern unsigned char **_imp___mbcasemap; +#endif +#endif /* CRT stuff */ #if 1 Modified: trunk/reactos/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/setjmp.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/setjmp.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/setjmp.h [iso-8859-1] Sun Dec 21 16:43:46 2008 @@ -130,28 +130,7 @@ #define _JMP_BUF_DEFINED #endif -__CRT_INLINE void * __cdecl __attribute__ ((__nothrow__)) mingw_getsp(void) -{ -#ifdef __GNUC__ -#ifdef __x86_64 - __int64 *ret; - __asm__ __volatile__("leaq 16(%%rsp),%0\n" - :"=r"(ret) - : - ); - return ret; -#elif __i386__ - __int32 *ret; - __asm__ __volatile__("lea 8(%esp),%0\n" - :"=r"(ret) - : - ); - return ret; -#endif -#else -#error Unsupported Compiler -#endif -} + void * __cdecl __attribute__ ((__nothrow__)) mingw_getsp(void); #ifdef USE_MINGW_SETJMP_TWO_ARGS #ifndef _INC_SETJMPEX Modified: trunk/reactos/include/crt/share.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/share.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/share.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/share.h [iso-8859-1] Sun Dec 21 16:43:46 2008 @@ -10,7 +10,7 @@ #error Only Win32 target is supported! #endif -#define _SH_COMPAT 0x00 /* Compatibility */ +#define _SH_COMPAT 0x00 #define _SH_DENYRW 0x10 #define _SH_DENYWR 0x20 #define _SH_DENYRD 0x30 Modified: trunk/reactos/include/crt/stddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stddef.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/stddef.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stddef.h [iso-8859-1] Sun Dec 21 16:43:46 2008 @@ -140,11 +140,11 @@ #define ___int_ptrdiff_t_h #define _GCC_PTRDIFF_T #ifndef __PTRDIFF_TYPE__ -# ifdef _WIN64 - #define __PTRDIFF_TYPE__ long long int -# else -# #define __PTRDIFF_TYPE__ long int -# endif +#ifdef _WIN64 +#define __PTRDIFF_TYPE__ long long int +#else +#define __PTRDIFF_TYPE__ long int +#endif #endif #ifndef _PTRDIFF_T_DEFINED #define _PTRDIFF_T_DEFINED @@ -208,11 +208,11 @@ #define __size_t #endif #ifndef __SIZE_TYPE__ -# ifdef _WIN64 -# define __SIZE_TYPE__ long long unsigned int -# else -# define __SIZE_TYPE__ long unsigned int -# endif +#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; Modified: trunk/reactos/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdio.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/stdio.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdio.h [iso-8859-1] Sun Dec 21 16:43:46 2008 @@ -294,7 +294,7 @@ _CRTIMP int __cdecl _vscprintf(const char *_Format,va_list _ArgList); _CRTIMP int __cdecl _set_printf_count_output(int _Value); - _CRTIMP int __cdecl _get_printf_count_output(); + _CRTIMP int __cdecl _get_printf_count_output(void); #ifndef _WSTDIO_DEFINED @@ -332,14 +332,7 @@ _CRTIMP int __cdecl _snwprintf(wchar_t *_Dest,size_t _Count,const wchar_t *_Format,...); _CRTIMP int __cdecl _vsnwprintf(wchar_t *_Dest,size_t _Count,const wchar_t *_Format,va_list _Args); #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ - __CRT_INLINE int __cdecl snwprintf (wchar_t* s, size_t n, const wchar_t* format, ...) { - int r; - va_list a; - __mingw_va_start(a, format); - r = _vsnwprintf (s, n, format, a); - __mingw_va_end(a); - return r; - } + _CRTIMP int __cdecl snwprintf (wchar_t* s, size_t n, const wchar_t* format, ...); __CRT_INLINE int __cdecl vsnwprintf (wchar_t* s, size_t n, const wchar_t* format, va_list arg) { return _vsnwprintf(s,n,format,arg); } int __cdecl vwscanf (const wchar_t *, va_list); int __cdecl vfwscanf (FILE *,const wchar_t *,va_list); Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdlib.h [iso-8859-1] Sun Dec 21 16:43:46 2008 @@ -131,7 +131,7 @@ typedef void (__cdecl *_purecall_handler)(void); _CRTIMP _purecall_handler __cdecl _set_purecall_handler(_purecall_handler _Handler); - _CRTIMP _purecall_handler __cdecl _get_purecall_handler(); + _CRTIMP _purecall_handler __cdecl _get_purecall_handler(void); typedef void (__cdecl *_invalid_parameter_handler)(const wchar_t *,const wchar_t *,const wchar_t *,unsigned int,uintptr_t); _invalid_parameter_handler __cdecl _set_invalid_parameter_handler(_invalid_parameter_handler _Handler); @@ -149,15 +149,10 @@ errno_t __cdecl _set_doserrno(unsigned long _Value); errno_t __cdecl _get_doserrno(unsigned long *_Value); -#ifdef _MSVCRT_ - extern int* _imp___sys_nerr; - extern char*** _imp__sys_errlist; -#else - __MINGW_IMPORT int _sys_nerr; - __MINGW_IMPORT char* _sys_errlist[]; -#endif - -//#if (defined(_X86_) && !defined(__x86_64)) + _CRTIMP extern char *_sys_errlist[]; + _CRTIMP extern int _sys_nerr; + +#if (defined(_X86_) && !defined(__x86_64)) _CRTIMP int *__cdecl __p___argc(void); _CRTIMP char ***__cdecl __p___argv(void); _CRTIMP wchar_t ***__cdecl __p___wargv(void); @@ -165,7 +160,7 @@ _CRTIMP wchar_t ***__cdecl __p__wenviron(void); _CRTIMP char **__cdecl __p__pgmptr(void); _CRTIMP wchar_t **__cdecl __p__wpgmptr(void); -//#endif +#endif #ifndef __argc #ifdef _MSVCRT_ extern int __argc; @@ -349,15 +344,15 @@ void *__cdecl bsearch(const void *_Key,const void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); void __cdecl qsort(void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); #endif - /*unsigned short __cdecl _byteswap_ushort(unsigned short _Short); */ + unsigned short __cdecl _byteswap_ushort(unsigned short _Short); /*unsigned long __cdecl _byteswap_ulong (unsigned long _Long); */ #if _INTEGRAL_MAX_BITS >= 64 - /*unsigned __int64 __cdecl _byteswap_uint64(unsigned __int64 _Int64);*/ + unsigned __int64 __cdecl _byteswap_uint64(unsigned __int64 _Int64); #endif div_t __cdecl div(int _Numerator,int _Denominator); char *__cdecl getenv(const char *_VarName); _CRTIMP char *__cdecl _itoa(int _Value,char *_Dest,int _Radix); -/* #if _INTEGRAL_MAX_BITS >= 64 */ +#if _INTEGRAL_MAX_BITS >= 64 _CRTIMP char *__cdecl _i64toa(__int64 _Val,char *_DstBuf,int _Radix); _CRTIMP char *__cdecl _ui64toa(unsigned __int64 _Val,char *_DstBuf,int _Radix); _CRTIMP __int64 __cdecl _atoi64(const char *_String); @@ -366,7 +361,7 @@ _CRTIMP __int64 __cdecl _strtoi64_l(const char *_String,char **_EndPtr,int _Radix,_locale_t _Locale); _CRTIMP unsigned __int64 __cdecl _strtoui64(const char *_String,char **_EndPtr,int _Radix); _CRTIMP unsigned __int64 __cdecl _strtoui64_l(const char *_String,char **_EndPtr,int _Radix,_locale_t _Locale); -/* #endif */ +#endif ldiv_t __cdecl ldiv(long _Numerator,long _Denominator); _CRTIMP char *__cdecl _ltoa(long _Value,char *_Dest,int _Radix); int __cdecl mblen(const char *_Ch,size_t _MaxCount); @@ -448,7 +443,7 @@ _CRTIMP long __cdecl _wtol(const wchar_t *_Str); _CRTIMP long __cdecl _wtol_l(const wchar_t *_Str,_locale_t _Locale); -/* #if _INTEGRAL_MAX_BITS >= 64 */ +#if _INTEGRAL_MAX_BITS >= 64 _CRTIMP wchar_t *__cdecl _i64tow(__int64 _Val,wchar_t *_DstBuf,int _Radix); _CRTIMP wchar_t *__cdecl _ui64tow(unsigned __int64 _Val,wchar_t *_DstBuf,int _Radix); _CRTIMP __int64 __cdecl _wtoi64(const wchar_t *_Str); @@ -457,7 +452,7 @@ _CRTIMP __int64 __cdecl _wcstoi64_l(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix,_locale_t _Locale); _CRTIMP unsigned __int64 __cdecl _wcstoui64(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix); _CRTIMP unsigned __int64 __cdecl _wcstoui64_l(const wchar_t *_Str ,wchar_t **_EndPtr,int _Radix,_locale_t _Locale); -/* #endif */ +#endif #endif #ifndef _POSIX_ @@ -472,8 +467,8 @@ _CRTIMP int __cdecl _atodbl_l(_CRT_DOUBLE *_Result,char *_Str,_locale_t _Locale); _CRTIMP int __cdecl _atoldbl_l(_LDOUBLE *_Result,char *_Str,_locale_t _Locale); _CRTIMP int __cdecl _atoflt_l(_CRT_FLOAT *_Result,char *_Str,_locale_t _Locale); - _CRTIMP unsigned long __cdecl __MINGW_NOTHROW _lrotl(unsigned long, int) __MINGW_ATTRIB_CONST; - _CRTIMP unsigned long __cdecl __MINGW_NOTHROW _lrotr(unsigned long, int) __MINGW_ATTRIB_CONST; + unsigned long __cdecl _lrotl(unsigned long _Val,int _Shift); + unsigned long __cdecl _lrotr(unsigned long _Val,int _Shift); _CRTIMP void __cdecl _makepath(char *_Path,const char *_Drive,const char *_Dir,const char *_Filename,const char *_Ext); _onexit_t __cdecl _onexit(_onexit_t _Func); @@ -482,13 +477,13 @@ void __cdecl perror(const char *_ErrMsg); #endif _CRTIMP int __cdecl _putenv(const char *_EnvString); - //_CRTIMP unsigned int __cdecl _rotl(unsigned int, int) __MINGW_ATTRIB_CONST; + unsigned int __cdecl _rotl(unsigned int _Val,int _Shift); #if _INTEGRAL_MAX_BITS >= 64 - //_CRTIMP unsigned __int64 __cdecl _rotl64(unsigned __int64, int) __MINGW_ATTRIB_CONST; -#endif - //_CRTIMP unsigned int __cdecl _rotr(unsigned int, int) __MINGW_ATTRIB_CONST; + unsigned __int64 __cdecl _rotl64(unsigned __int64 _Val,int _Shift); +#endif + unsigned int __cdecl _rotr(unsigned int _Val,int _Shift); #if _INTEGRAL_MAX_BITS >= 64 - //_CRTIMP unsigned __int64 __cdecl _rotr64(unsigned __int64, int) __MINGW_ATTRIB_CONST; + unsigned __int64 __cdecl _rotr64(unsigned __int64 _Val,int _Shift); #endif _CRTIMP void __cdecl _searchenv(const char *_Filename,const char *_EnvVar,char *_ResultPath); _CRTIMP void __cdecl _splitpath(const char *_FullPath,char *_Drive,char *_Dir,char *_Filename,char *_Ext); @@ -528,8 +523,8 @@ #endif #endif -#define sys_errlist (*_imp___sys_errlist) -#define sys_nerr (*_imp___sys_nerr) +#define sys_errlist _sys_errlist +#define sys_nerr _sys_nerr #define environ _environ char *__cdecl ecvt(double _Val,int _NumOfDigits,int *_PtDec,int *_PtSign); char *__cdecl fcvt(double _Val,int _NumOfDec,int *_PtDec,int *_PtSign); @@ -563,7 +558,7 @@ char *__cdecl ulltoa (unsigned long long , char *, int); wchar_t *__cdecl lltow (long long, wchar_t *, int); wchar_t *__cdecl ulltow (unsigned long long, wchar_t *, int); -#if _INTEGRAL_MAX_BITS >= 64 + /* __CRT_INLINE using non-ansi functions */ __CRT_INLINE long long __cdecl atoll (const char * _c) { return _atoi64 (_c); } __CRT_INLINE char *__cdecl lltoa (long long _n, char * _c, int _i) { return _i64toa (_n, _c, _i); } @@ -572,7 +567,7 @@ __CRT_INLINE wchar_t *__cdecl lltow (long long _n, wchar_t * _w, int _i) { return _i64tow (_n, _w, _i); } __CRT_INLINE wchar_t *__cdecl ulltow (unsigned long long _n, wchar_t * _w, int _i) { return _ui64tow (_n, _w, _i); } #endif /* (__STRICT_ANSI__) */ -#endif + #endif /* !__NO_ISOCEXT */ #ifdef __cplusplus Modified: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/string.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/string.h [iso-8859-1] Sun Dec 21 16:43:46 2008 @@ -143,11 +143,6 @@ _CRTIMP int __cdecl _wcsnicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); #ifndef NO_OLDNAMES - /* NOTE: There is no _wcscmpi, but this is for compatibility. */ - int __cdecl wcscmpi (const wchar_t * __ws1, const wchar_t * __ws2); - __CRT_INLINE int __cdecl wcscmpi (const wchar_t * __ws1, const wchar_t * __ws2) { return _wcsicmp (__ws1, __ws2); } - #define _wcscmpi _wcsicmp - wchar_t *__cdecl wcsdup(const wchar_t *_Str); #define wcswcs wcsstr int __cdecl wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2); Modified: trunk/reactos/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wchar.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/wchar.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/wchar.h [iso-8859-1] Sun Dec 21 16:43:46 2008 @@ -457,7 +457,7 @@ }; #endif -/* #if _INTEGRAL_MAX_BITS >= 64 */ +#if _INTEGRAL_MAX_BITS >= 64 struct _stat32i64 { _dev_t st_dev; @@ -500,7 +500,7 @@ __time64_t st_mtime; __time64_t st_ctime; }; -/* #endif */ +#endif #define __stat64 _stat64 @@ -778,11 +778,6 @@ _CRTIMP int __cdecl _wcsnicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); #ifndef NO_OLDNAMES - /* NOTE: There is no _wcscmpi, but this is for compatibility. */ - int __cdecl wcscmpi (const wchar_t * __ws1, const wchar_t * __ws2); - __CRT_INLINE int __cdecl wcscmpi (const wchar_t * __ws1, const wchar_t * __ws2) { return _wcsicmp (__ws1, __ws2); } - #define _wcscmpi _wcsicmp - wchar_t *__cdecl wcsdup(const wchar_t *_Str); #define wcswcs wcsstr int __cdecl wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2); Modified: trunk/reactos/include/reactos/wine/exception.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/excep… ============================================================================== --- trunk/reactos/include/reactos/wine/exception.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/exception.h [iso-8859-1] Sun Dec 21 16:43:46 2008 @@ -8,6 +8,9 @@ #ifdef __cplusplus extern "C" { #endif + +typedef EXCEPTION_DISPOSITION (*PEXCEPTION_HANDLER) + (struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*); struct _EXCEPTION_REGISTRATION_RECORD; typedef struct _EXCEPTION_REGISTRATION_RECORD EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD; @@ -37,6 +40,13 @@ #define AbnormalTermination() _SEH2_AbnormalTermination() #endif +/* Win32 seems to use the same flags as ExceptionFlags in an EXCEPTION_RECORD */ +#define EH_NONCONTINUABLE 0x01 +#define EH_UNWINDING 0x02 +#define EH_EXIT_UNWIND 0x04 +#define EH_STACK_INVALID 0x08 +#define EH_NESTED_CALL 0x10 + #define EXCEPTION_WINE_STUB 0x80000100 #define EXCEPTION_WINE_ASSERTION 0x80000101 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] Sun Dec 21 16:43:46 2008 @@ -45,7 +45,7 @@ /* * @implemented */ -const unsigned char *__p__mbctype(void) +unsigned char *__p__mbctype(void) { return _mbctype; }

1 0

[sginsberg] 38251: - Skip port tests due to missing kernel support
by sginsberg＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: sginsberg Date: Sun Dec 21 16:34:32 2008 New Revision: 38251 URL: http://svn.reactos.org/svn/reactos?rev=38251&view=rev Log: - Skip port tests due to missing kernel support Added: trunk/rostests/winetests/ntdll/roshack.diff Modified: trunk/rostests/winetests/ntdll/port.c Modified: trunk/rostests/winetests/ntdll/port.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/port.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/port.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/port.c [iso-8859-1] Sun Dec 21 16:34:32 2008 @@ -310,6 +310,9 @@ { HANDLE thread; DWORD id; + + skip("ROS-HACK: Skipping port tests -- missing NtReplyPort and NtRequestPort\n"); + return; if (!init_function_ptrs()) return; Added: trunk/rostests/winetests/ntdll/roshack.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/roshack.d… ============================================================================== --- trunk/rostests/winetests/ntdll/roshack.diff (added) +++ trunk/rostests/winetests/ntdll/roshack.diff [iso-8859-1] Sun Dec 21 16:34:32 2008 @@ -1,0 +1,14 @@ +Index: port.c +=================================================================== +--- port.c (revision 38229) ++++ port.c (working copy) +@@ -310,6 +310,9 @@ + { + HANDLE thread; + DWORD id; ++ ++ skip("ROS-HACK: Skipping port tests -- missing NtReplyPort and NtRequestPort\n"); ++ return; + + if (!init_function_ptrs()) + return;

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