Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[tkreuzer] 38274: Build MP kernel/hal by default
by tkreuzer＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: tkreuzer Date: Mon Dec 22 13:22:23 2008 New Revision: 38274 URL: http://svn.reactos.org/svn/reactos?rev=38274&view=rev Log: Build MP kernel/hal by default Modified: trunk/reactos/config.template.rbuild Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config.template.rbuild [iso-8859-1] Mon Dec 22 13:22:23 2008 @@ -88,6 +88,6 @@  -<property name="BUILD_MP" value="0" /> +<property name="BUILD_MP" value="1" /> </group>

1 0

[sginsberg] 38273: - Re-enable some Winetests now that Cm sucks less - Add missing ROS-HACK tag
by sginsberg＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: sginsberg Date: Mon Dec 22 12:48:06 2008 New Revision: 38273 URL: http://svn.reactos.org/svn/reactos?rev=38273&view=rev Log: - Re-enable some Winetests now that Cm sucks less - Add missing ROS-HACK tag Removed: trunk/rostests/winetests/msi/roshack.diff Modified: trunk/rostests/winetests/comctl32/mru.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/msi.c trunk/rostests/winetests/shell32/roshack.diff trunk/rostests/winetests/shell32/systray.c Modified: trunk/rostests/winetests/comctl32/mru.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/mru.c?… ============================================================================== --- trunk/rostests/winetests/comctl32/mru.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/mru.c [iso-8859-1] Mon Dec 22 12:48:06 2008 @@ -418,10 +418,6 @@ { hComctl32 = GetModuleHandleA("comctl32.dll"); - /* The registry usage here crashes the system because of broken Cm -- remove this when Cm gets fixed */ - skip("ROS-HACK: Skipping mru tests -- Cm is broken\n"); - return; - delete_reg_entries(); if (!create_reg_entries()) return; Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… ============================================================================== --- trunk/rostests/winetests/msi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/install.c [iso-8859-1] Mon Dec 22 12:48:06 2008 @@ -4561,9 +4561,6 @@ { DWORD len; char temp_path[MAX_PATH], prev_path[MAX_PATH]; - - skip("ROS-HACK: Skipping install tests -- Cm sucks\n"); - return; init_functionpointers(); Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=3… ============================================================================== --- trunk/rostests/winetests/msi/msi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/msi.c [iso-8859-1] Mon Dec 22 12:48:06 2008 @@ -6903,8 +6903,6 @@ START_TEST(msi) { - skip("ROS-HACK: Skipping msi tests -- Cm sucks\n"); - return; init_functionpointers(); Removed: trunk/rostests/winetests/msi/roshack.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/roshack.dif… ============================================================================== --- trunk/rostests/winetests/msi/roshack.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/roshack.diff (removed) @@ -1,28 +1,0 @@ -Index: install.c -=================================================================== ---- install.c (revision 38229) -+++ install.c (working copy) -@@ -4561,6 +4561,9 @@ - { - DWORD len; - char temp_path[MAX_PATH], prev_path[MAX_PATH]; -+ -+ skip("ROS-HACK: Skipping install tests -- Cm sucks\n"); -+ return; - - init_functionpointers(); - -Index: msi.c -=================================================================== ---- msi.c (revision 38229) -+++ msi.c (working copy) -@@ -6903,6 +6903,9 @@ - - START_TEST(msi) - { -+ skip("ROS-HACK: Skipping msi tests -- Cm sucks\n"); -+ return; -+ - init_functionpointers(); - - test_usefeature(); 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] Mon Dec 22 12:48:06 2008 @@ -19,7 +19,7 @@ RECT rc; HMODULE huser32, hshell32; -+ skip("Skipping systray tests\n"); ++ skip("ROS-HACK: Skipping systray tests\n"); + return; + hshell32 = GetModuleHandleA("shell32.dll"); 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] Mon Dec 22 12:48:06 2008 @@ -138,7 +138,7 @@ RECT rc; HMODULE huser32, hshell32; - skip("Skipping systray tests\n"); + skip("ROS-HACK: Skipping systray tests\n"); return; hshell32 = GetModuleHandleA("shell32.dll");

1 0

[fireball] 38272: - Fix registry lock leakages in CmpDoOpen in failure cases. - Add support for a special case of opening existing (cached) KCBs by CmpDoOpen. - Specify a flag for that case in one specific case inside CmpParseKey, which allows us to get rid of the "\\REGISTRY" hack inside the code, fixes the 'Kcb->RefCount == 1' assertion failure, and certainly fixes registry-related regression tests. There might be some side effects in theory, but since this hack only applied to the root key, t
by fireball＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: fireball Date: Mon Dec 22 12:47:38 2008 New Revision: 38272 URL: http://svn.reactos.org/svn/reactos?rev=38272&view=rev Log: - Fix registry lock leakages in CmpDoOpen in failure cases. - Add support for a special case of opening existing (cached) KCBs by CmpDoOpen. - Specify a flag for that case in one specific case inside CmpParseKey, which allows us to get rid of the "\\REGISTRY" hack inside the code, fixes the 'Kcb->RefCount == 1' assertion failure, and certainly fixes registry-related regression tests. There might be some side effects in theory, but since this hack only applied to the root key, they shouldn't happen. Thanks to Stefan for helping in debugging and a testcase. Modified: trunk/reactos/ntoskrnl/config/cmparse.c Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Mon Dec 22 12:47:38 2008 @@ -599,37 +599,73 @@ /* If we have a KCB, make sure it's locked */ //ASSERT(CmpIsKcbLockedExclusive(*CachedKcb)); - /* Check if this is a symlink */ - if ((Node->Flags & KEY_SYM_LINK) && !(Attributes & OBJ_OPENLINK)) - { - /* Create the KCB for the symlink */ + /* Check if caller doesn't want to create a KCB */ + if (ControlFlags & CMP_OPEN_KCB_NO_CREATE) + { + /* Check if this is a symlink */ + if ((Node->Flags & KEY_SYM_LINK) && !(Attributes & OBJ_OPENLINK)) + { + /* This case for a cached KCB is not implemented yet */ + ASSERT(FALSE); + } + + /* The caller wants to open a cached KCB */ + if (!CmpReferenceKeyControlBlock(*CachedKcb)) + { + /* Release the registry lock */ + CmpUnlockRegistry(); + + /* Return failure code */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Our kcb is that one */ + Kcb = *CachedKcb; + } + else + { + /* Check if this is a symlink */ + if ((Node->Flags & KEY_SYM_LINK) && !(Attributes & OBJ_OPENLINK)) + { + /* Create the KCB for the symlink */ + Kcb = CmpCreateKeyControlBlock(Hive, + Cell, + Node, + *CachedKcb, + 0, + KeyName); + if (!Kcb) + { + /* Release registry lock and return failure */ + CmpUnlockRegistry(); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Make sure it's also locked, and set the pointer */ + //ASSERT(CmpIsKcbLockedExclusive(Kcb)); + *CachedKcb = Kcb; + + /* Release the registry lock */ + CmpUnlockRegistry(); + + /* Return reparse required */ + return STATUS_REPARSE; + } + + /* Create the KCB. FIXME: Use lock flag */ Kcb = CmpCreateKeyControlBlock(Hive, Cell, Node, *CachedKcb, 0, KeyName); - if (!Kcb) return STATUS_INSUFFICIENT_RESOURCES; - - /* Make sure it's also locked, and set the pointer */ - //ASSERT(CmpIsKcbLockedExclusive(Kcb)); - *CachedKcb = Kcb; - - /* Release the registry lock */ - CmpUnlockRegistry(); - - /* Return reparse required */ - return STATUS_REPARSE; - } - - /* Create the KCB. FIXME: Use lock flag */ - Kcb = CmpCreateKeyControlBlock(Hive, - Cell, - Node, - *CachedKcb, - 0, - KeyName); - if (!Kcb) return STATUS_INSUFFICIENT_RESOURCES; + if (!Kcb) + { + /* Release registry lock and return failure */ + CmpUnlockRegistry(); + return STATUS_INSUFFICIENT_RESOURCES; + } + } /* Make sure it's also locked, and set the pointer */ //ASSERT(CmpIsKcbLockedExclusive(Kcb)); @@ -1308,10 +1344,7 @@ &CellToRelease); if (!Node) ASSERT(FALSE); } - - /* FIXME: This hack seems required? */ - RtlInitUnicodeString(&NextName, L"\\REGISTRY"); - + /* Do the open */ Status = CmpDoOpen(Hive, Cell, @@ -1320,7 +1353,7 @@ AccessMode, Attributes, ParseContext, - 0, + CMP_OPEN_KCB_NO_CREATE /* | CMP_CREATE_KCB_KCB_LOCKED */, &Kcb, &NextName, Object);

1 0

[fireball] 38271: - Add control flags for CmpDoOpen, CmpCreateKey and CmpUnloadKey. - Add CmUnloadKey prototype.
by fireball＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: fireball Date: Mon Dec 22 12:17:23 2008 New Revision: 38271 URL: http://svn.reactos.org/svn/reactos?rev=38271&view=rev Log: - Add control flags for CmpDoOpen, CmpCreateKey and CmpUnloadKey. - Add CmUnloadKey prototype. Modified: trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Mon Dec 22 12:17:23 2008 @@ -86,10 +86,22 @@ #define CMP_LOCK_HASHES_FOR_KCB 0x2 // +// CmpDoCreate and CmpDoOpen flags +// +#define CMP_CREATE_KCB_KCB_LOCKED 0x2 +#define CMP_OPEN_KCB_NO_CREATE 0x4 + +// // EnlistKeyBodyWithKCB Flags // #define CMP_ENLIST_KCB_LOCKED_SHARED 0x1 #define CMP_ENLIST_KCB_LOCKED_EXCLUSIVE 0x2 + +// +// Unload Flags +// +#define CMP_UNLOCK_KCB_LOCKED 0x1 +#define CMP_UNLOCK_REGISTRY_LOCKED 0x2 // // Maximum size of Value Cache @@ -1418,6 +1430,13 @@ IN POBJECT_ATTRIBUTES SourceFile, IN ULONG Flags, IN PCM_KEY_BODY KeyBody +); + +NTSTATUS +NTAPI +CmUnloadKey( + IN PCM_KEY_CONTROL_BLOCK Kcb, + IN ULONG Flags ); //

1 0

[tkreuzer] 38270: Introduce new config flag BUILD_MP. Compile MP kernel and hal only when this is set to 1 to save us some time and space.
by tkreuzer＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: tkreuzer Date: Mon Dec 22 09:23:08 2008 New Revision: 38270 URL: http://svn.reactos.org/svn/reactos?rev=38270&view=rev Log: Introduce new config flag BUILD_MP. Compile MP kernel and hal only when this is set to 1 to save us some time and space. Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/config.template.rbuild trunk/reactos/hal/hal.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Mon Dec 22 09:23:08 2008 @@ -110,7 +110,9 @@ </directory> <directory name="ntoskrnl"> <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> - <xi:include href="ntoskrnl/ntkrnlmp.rbuild" /> + <if property="BUILD_MP" value="1"> + <xi:include href="ntoskrnl/ntkrnlmp.rbuild" /> + </if> </directory> <directory name="subsystems"> <xi:include href="subsystems/subsystems.rbuild" /> Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config.template.rbuild [iso-8859-1] Mon Dec 22 09:23:08 2008 @@ -85,4 +85,9 @@ --> <property name="_ELF_" value="0" /> + +<property name="BUILD_MP" value="0" /> + </group> Modified: trunk/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal.rbuild?rev=38270&r… ============================================================================== --- trunk/reactos/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal.rbuild [iso-8859-1] Mon Dec 22 09:23:08 2008 @@ -10,7 +10,9 @@ <xi:include href="halx86/hal_generic_up.rbuild" /> <xi:include href="halx86/hal_generic_pc.rbuild" /> <xi:include href="halx86/halup.rbuild" /> - <xi:include href="halx86/halmp.rbuild" /> + <if property="BUILD_MP" value="1"> + <xi:include href="halx86/halmp.rbuild" /> + </if> <xi:include href="halx86/halxbox.rbuild" /> </directory> </if>

1 0

[fireball] 38269: - Fix KCB ref leaks in Cm parse routine (thanks Stefan).
by fireball＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: fireball Date: Mon Dec 22 07:35:08 2008 New Revision: 38269 URL: http://svn.reactos.org/svn/reactos?rev=38269&view=rev Log: - Fix KCB ref leaks in Cm parse routine (thanks Stefan). Modified: trunk/reactos/ntoskrnl/config/cmparse.c Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Mon Dec 22 07:35:08 2008 @@ -977,7 +977,13 @@ /* Return hive and cell data */ *Hive = (*Kcb)->KeyHive; *Cell = (*Kcb)->KeyCell; - + + /* Make sure it's not a dead KCB */ + ASSERT((*Kcb)->RefCount > 0); + + /* Reference it */ + (VOID)CmpReferenceKeyControlBlock(*Kcb); + /* Return success for now */ return STATUS_SUCCESS; } @@ -1197,7 +1203,7 @@ if (!Kcb) ASSERT(FALSE); /* Dereference the parent and set the new one */ - //CmpDereferenceKeyControlBlock(ParentKcb); + CmpDereferenceKeyControlBlock(ParentKcb); ParentKcb = Kcb; } else @@ -1336,7 +1342,7 @@ /* Dereference the parent if it exists */ Quickie: - //if (ParentKcb) CmpDereferenceKeyControlBlock(ParentKcb); + if (ParentKcb) CmpDereferenceKeyControlBlock(ParentKcb); /* Unlock the registry */ CmpUnlockRegistry();

1 0

[sserapion] 38268: Repeat after me "typedef INT_PTR(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM); ", sorry.
by sserapion＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: sserapion Date: Mon Dec 22 00:45:49 2008 New Revision: 38268 URL: http://svn.reactos.org/svn/reactos?rev=38268&view=rev Log: Repeat after me "typedef INT_PTR(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);", sorry. Modified: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/processor.c Modified: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/processor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/processor.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/processor.c [iso-8859-1] Mon Dec 22 00:45:49 2008 @@ -14,7 +14,7 @@ #include "resource.h" HINSTANCE g_hInstance = NULL; -LRESULT CALLBACK ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam); BOOL APIENTRY @@ -74,7 +74,7 @@ wcscat(szFeatures, Feature); } -LRESULT +INT_PTR CALLBACK ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam) {

1 0

[tkreuzer] 38267: fix another instance of _STATIC_ASSERT
by tkreuzer＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: tkreuzer Date: Mon Dec 22 00:37:53 2008 New Revision: 38267 URL: http://svn.reactos.org/svn/reactos?rev=38267&view=rev Log: fix another instance of _STATIC_ASSERT Modified: trunk/reactos/include/crt/malloc.h 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] Mon Dec 22 00:37:53 2008 @@ -25,7 +25,7 @@ #endif #ifndef _STATIC_ASSERT -#define _STATIC_ASSERT(expr) typedef char __static_assert_t[(expr)?1:-1] +#define _STATIC_ASSERT(expr) typedef char __static_assert_t[(expr)] #endif /* Return codes for _heapwalk() */

1 0

[tkreuzer] 38266: Move all stuff from _mingw.h to crtdefs.h that belongs there. Get rid off MINGW_IMPORT
by tkreuzer＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: tkreuzer Date: Sun Dec 21 23:55:21 2008 New Revision: 38266 URL: http://svn.reactos.org/svn/reactos?rev=38266&view=rev Log: Move all stuff from _mingw.h to crtdefs.h that belongs there. Get rid off MINGW_IMPORT Modified: trunk/reactos/include/crt/_mingw.h trunk/reactos/include/crt/crtdefs.h trunk/reactos/include/crt/time.h 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 23:55:21 2008 @@ -4,11 +4,12 @@ * No warranty is given; refer to the file DISCLAIMER within this package. */ -#ifndef _INC_CRTDEFS -#define _INC_CRTDEFS +#ifndef _INC_MINGW +#define _INC_MINGW #define _INTEGRAL_MAX_BITS 64 +// ROS HACK! #ifndef _WIN64 #ifndef _USE_32BIT_TIME_T #define _USE_32BIT_TIME_T @@ -30,69 +31,14 @@ #define __stdcall #endif -#if defined(_MSC_VER) -# ifdef _DLL -# ifndef __MINGW_IMPORT -# define __MINGW_IMPORT __declspec(dllimport) -# endif -# ifndef _CRTIMP -# define _CRTIMP __declspec(dllimport) -# endif -# else -# ifndef __MINGW_IMPORT -# define __MINGW_IMPORT -# endif -# ifndef _CRTIMP -# define _CRTIMP -# endif -# endif -# define __DECLSPEC_SUPPORTED +#ifdef __GNUC__ + /* These compilers do support __declspec */ +# if !defined(__MINGW32__) && !defined(__MINGW64__) && !defined(__CYGWIN32__) +# define __declspec(x) __attribute__((x)) +# endif +#else # define __attribute__(x) /* nothing */ -# define __restrict__ /* nothing */ -#elif defined(__GNUC__) -# ifdef __declspec -# ifndef __MINGW_IMPORT -# ifdef _DLL -/* Note the extern. This is needed to work around GCC's -limitations in handling dllimport attribute. */ -# define __MINGW_IMPORT extern __attribute__ ((__dllimport__)) -# else -# define __MINGW_IMPORT extern -# endif -# endif -# ifndef _CRTIMP -# undef __USE_CRTIMP -# if !defined (_CRTBLD) && !defined (_SYSCRT) -# define __USE_CRTIMP 1 -# endif -# ifdef __USE_CRTIMP -# ifdef _DLL -# define _CRTIMP __attribute__ ((dllimport)) -# else -# define _CRTIMP -# endif -# else -# define _CRTIMP -# endif -# endif -# define __DECLSPEC_SUPPORTED -# else /* __declspec */ -# undef __DECLSPEC_SUPPORTED -# undef __MINGW_IMPORT -# ifndef _CRTIMP -# define _CRTIMP -# endif -# endif /* __declspec */ -#else -# ifndef __MINGW_IMPORT -# define __MINGW_IMPORT __declspec(dllimport) -# endif -# ifndef _CRTIMP -# define _CRTIMP __declspec(dllimport) -# endif -# define __DECLSPEC_SUPPORTED -# define __attribute__(x) /* nothing */ -#endif /* __GNUC__ */ +#endif #if defined (__GNUC__) && defined (__GNUC_MINOR__) #define __MINGW_GNUC_PREREQ(major, minor) \ @@ -102,22 +48,12 @@ #define __MINGW_GNUC_PREREQ(major, minor) 0 #endif -#if defined (_MSC_VER) -#define __MINGW_MSC_PREREQ(major,minor) \ - ((_MSC_VER /100) > (major) \ - || ((_MSC)VER /100) == (major) && (_MSC_VER) % 100) >=(minor))) -#else -#define __MINGW_MSC_PREREQ(major, minor) 0 -#endif - #define USE___UUIDOF 0 #ifdef __cplusplus # define __CRT_INLINE inline #else -# if defined(_MSC_VER) -# define __CRT_INLINE __inline -# elif __GNUC_STDC_INLINE__ +# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) # define __CRT_INLINE extern inline __attribute__((__gnu_inline__)) # else # define __CRT_INLINE extern __inline__ @@ -129,6 +65,16 @@ #else # ifdef __GNUC__ # define __UNUSED_PARAM(x) x __attribute__ ((__unused__)) +# else +# define __UNUSED_PARAM(x) x +# endif +#endif + +#ifdef __cplusplus +# define __unaligned +#else +# ifdef __GNUC__ +# define __unaligned __attribute((packed)) # else # define __UNUSED_PARAM(x) x # endif @@ -186,48 +132,25 @@ # define __MSVCRT_VERSION__ 0x0700 #endif -#if defined(__GNUC__) -#define __mingw_va_start(v,l) __builtin_va_start(v,l) -#define __mingw_va_end(v) __builtin_va_end(v) -#define __mingw_va_arg(v,l) __builtin_va_arg(v,l) -#define __mingw_va_copy(d,s) __builtin_va_copy(d,s) -#elif defined(_MSC_VER) -#define __mingw_va_start(v,l) __msc_va_start(v,l) -#define __mingw_va_end(v) __msc_va_end(v) -#define __mingw_va_arg(v,l) __msc_va_arg(v,l) -#define __mingw_va_copy(d,s) __msc_va_copy(d,s) -#endif - //#ifndef WINVER //#define WINVER 0x0502 //#endif -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x502 -#endif - -#ifndef _INT128_DEFINED -#define _INT128_DEFINED +//#ifndef _WIN32_WINNT +//#define _WIN32_WINNT 0x502 +//#endif + #ifdef __GNUC__ #define __int8 char #define __int16 short #define __int32 int #define __int64 long long #ifdef _WIN64 - -typedef int __int128 __attribute__ ((mode (TI))); - -#endif - -#define __ptr32 -#define __ptr64 -#define __unaligned __attribute ((packed)) -#define __forceinline extern __inline -#endif -#endif - -#ifndef _WIN32 -#error Only Win32 target is supported! + typedef int __int128 __attribute__ ((mode (TI))); +# endif +# define __ptr32 +# define __ptr64 +# define __forceinline extern __inline __attribute((always_inline)) #endif #ifdef __cplusplus @@ -240,188 +163,13 @@ #endif #endif -#undef _CRT_PACKING -#define _CRT_PACKING 8 - #ifdef _WIN64 #undef USE_MINGW_SETJMP_TWO_ARGS #define USE_MINGW_SETJMP_TWO_ARGS #endif -#pragma pack(push,_CRT_PACKING) - -#include <vadefs.h> - #ifdef __cplusplus extern "C" { -#endif - -#ifndef _CRT_STRINGIZE -#define __CRT_STRINGIZE(_Value) #_Value -#define _CRT_STRINGIZE(_Value) __CRT_STRINGIZE(_Value) -#endif - -#ifndef _CRT_WIDE -#define __CRT_WIDE(_String) L ## _String -#define _CRT_WIDE(_String) __CRT_WIDE(_String) -#endif -#ifndef _W64 -#define _W64 -#endif - -#ifndef _CRTIMP_NOIA64 -#ifdef __ia64__ -#define _CRTIMP_NOIA64 -#else -#define _CRTIMP_NOIA64 _CRTIMP -#endif -#endif - -#ifndef _CRTIMP2 -#define _CRTIMP2 _CRTIMP -#endif - -#ifndef _CRTIMP_ALTERNATIVE -#define _CRTIMP_ALTERNATIVE _CRTIMP -#define _CRT_ALTERNATIVE_IMPORTED -#endif - -#ifndef _MRTIMP2 -#define _MRTIMP2 _CRTIMP -#endif - -#ifndef _DLL -#define _DLL -#endif - -#ifndef _MT -#define _MT -#endif - -#ifndef _MCRTIMP -#define _MCRTIMP _CRTIMP -#endif - -#ifndef _CRTIMP_PURE -#define _CRTIMP_PURE _CRTIMP -#endif - -#ifndef _PGLOBAL -#define _PGLOBAL -#endif - -#ifndef _AGLOBAL -#define _AGLOBAL -#endif - -#define __STDC_SECURE_LIB__ 200411L -#define __GOT_SECURE_LIB__ __STDC_SECURE_LIB__ -#define _SECURECRT_FILL_BUFFER_PATTERN 0xFD -#define _CRT_DEPRECATE_TEXT(_Text) __declspec(deprecated) - -#ifndef _CRT_INSECURE_DEPRECATE_MEMORY -#define _CRT_INSECURE_DEPRECATE_MEMORY(_Replacement) -#endif -#ifndef _CRT_INSECURE_DEPRECATE_GLOBALS -#define _CRT_INSECURE_DEPRECATE_GLOBALS(_Replacement) -#endif -#ifndef _CRT_MANAGED_HEAP_DEPRECATE -#define _CRT_MANAGED_HEAP_DEPRECATE -#endif - -#ifndef _CRT_OBSOLETE -#define _CRT_OBSOLETE(_NewItem) -#endif - -#ifndef _SIZE_T_DEFINED -#define _SIZE_T_DEFINED -#undef size_t -#ifdef _WIN64 -#if defined(__GNUC__) && defined(__STRICT_ANSI__) - typedef unsigned int size_t __attribute__ ((mode (DI))); -#else - typedef unsigned __int64 size_t; -#endif -#else - typedef unsigned int size_t; -#endif -#endif - -#ifndef _SSIZE_T_DEFINED -#define _SSIZE_T_DEFINED -#undef ssize_t -#ifdef _WIN64 -#if defined(__GNUC__) && defined(__STRICT_ANSI__) - typedef int ssize_t __attribute__ ((mode (DI))); -#else - typedef __int64 ssize_t; -#endif -#else - typedef int ssize_t; -#endif -#endif - -#ifndef _INTPTR_T_DEFINED -#define _INTPTR_T_DEFINED -#ifndef __intptr_t_defined -#define __intptr_t_defined -#undef intptr_t -#ifdef _WIN64 -#if defined(__GNUC__) && defined(__STRICT_ANSI__) - typedef int intptr_t __attribute__ ((mode (DI))); -#else - typedef __int64 intptr_t; -#endif -#else - typedef int intptr_t; -#endif -#endif -#endif - -#ifndef _UINTPTR_T_DEFINED -#define _UINTPTR_T_DEFINED -#ifndef __uintptr_t_defined -#define __uintptr_t_defined -#undef uintptr_t -#ifdef _WIN64 -#if defined(__GNUC__) && defined(__STRICT_ANSI__) - typedef unsigned int uintptr_t __attribute__ ((mode (DI))); -#else - typedef unsigned __int64 uintptr_t; -#endif -#else - typedef unsigned int uintptr_t; -#endif -#endif -#endif - -#ifndef _PTRDIFF_T_DEFINED -#define _PTRDIFF_T_DEFINED -#ifndef _PTRDIFF_T_ -#undef ptrdiff_t -#ifdef _WIN64 -#if defined(__GNUC__) && defined(__STRICT_ANSI__) - typedef int ptrdiff_t __attribute__ ((mode (DI))); -#else - typedef __int64 ptrdiff_t; -#endif -#else - typedef int ptrdiff_t; -#endif -#endif -#endif - -#ifndef _WCHAR_T_DEFINED -#define _WCHAR_T_DEFINED -#ifndef __cplusplus - typedef unsigned short wchar_t; -#endif -#endif - -#ifndef _WCTYPE_T_DEFINED -#define _WCTYPE_T_DEFINED - typedef unsigned short wint_t; - typedef unsigned short wctype_t; #endif #ifndef __GNUC_VA_LIST @@ -434,128 +182,15 @@ typedef __gnuc_va_list va_list; #endif -#ifdef _USE_32BIT_TIME_T -#ifdef _WIN64 -#error You cannot use 32-bit time_t (_USE_32BIT_TIME_T) with _WIN64 -#undef _USE_32BIT_TIME_T -#endif -#else -#if _INTEGRAL_MAX_BITS < 64 -#define _USE_32BIT_TIME_T -#endif -#endif - -#ifndef _ERRCODE_DEFINED -#define _ERRCODE_DEFINED - typedef int errcode; - typedef int errno_t; -#endif - -#ifndef _TIME32_T_DEFINED -#define _TIME32_T_DEFINED - typedef long __time32_t; -#endif - -#ifndef _TIME64_T_DEFINED -#define _TIME64_T_DEFINED -//#if _INTEGRAL_MAX_BITS >= 64 - typedef __int64 __time64_t; -#endif -//#endif - -#ifndef _TIME_T_DEFINED -#define _TIME_T_DEFINED -#ifdef _USE_32BIT_TIME_T - typedef __time32_t time_t; -#else - typedef __time64_t time_t; -#endif -#endif - -#ifndef _CONST_RETURN -#define _CONST_RETURN -#endif - -#ifndef __CRT_UNALIGNED -#define __CRT_UNALIGNED -#endif - -#ifndef UNALIGNED -#if defined(__ia64__) || defined(__x86_64) -//#define UNALIGNED __CRT_UNALIGNED -#else -#define UNALIGNED -#endif -#endif - -#ifndef _CRT_ALIGN -#define _CRT_ALIGN(x) __attribute__ ((aligned(x))) -#endif - -#ifndef _CRTNOALIAS -#define _CRTNOALIAS -#endif - -#ifndef _CRTRESTRICT -#define _CRTRESTRICT -#endif - -#ifndef __CRTDECL -#define __CRTDECL __cdecl -#endif - -#define _ARGMAX 100 - -#ifndef _TRUNCATE -#define _TRUNCATE ((size_t)-1) -#endif - struct threadlocaleinfostruct; - struct threadmbcinfostruct; - typedef struct threadlocaleinfostruct *pthreadlocinfo; - typedef struct threadmbcinfostruct *pthreadmbcinfo; - struct __lc_time_data; - - typedef struct localeinfo_struct { - pthreadlocinfo locinfo; - pthreadmbcinfo mbcinfo; - } _locale_tstruct,*_locale_t; - -#ifndef _TAGLC_ID_DEFINED -#define _TAGLC_ID_DEFINED - typedef struct tagLC_ID { - unsigned short wLanguage; - unsigned short wCountry; - unsigned short wCodePage; - } LC_ID,*LPLC_ID; -#endif - -#ifndef _THREADLOCALEINFO -#define _THREADLOCALEINFO - typedef struct threadlocaleinfostruct { - int refcount; - unsigned int lc_codepage; - unsigned int lc_collate_cp; - unsigned long lc_handle[6]; - LC_ID lc_id[6]; - struct { - char *locale; - wchar_t *wlocale; - int *refcount; - int *wrefcount; - } lc_category[6]; - int lc_clike; - int mb_cur_max; - int *lconv_intl_refcount; - int *lconv_num_refcount; - int *lconv_mon_refcount; - struct lconv *lconv; - int *ctype1_refcount; - unsigned short *ctype1; - const unsigned short *pctype; - const unsigned char *pclmap; - const unsigned char *pcumap; - struct __lc_time_data *lc_time_curr; - } threadlocinfo; +/* Diable deprecation for now! */ +#define _CRT_SECURE_NO_DEPRECATE +#define _CRT_SECURE_NO_DEPRECATE_CORE +#ifdef __WINESRC__ +#define _CRT_NONSTDC_NO_DEPRECATE +#endif + +#if (defined(_MSC_VER) && __STDC__)// || !defined(__WINESRC__) +#define NO_OLDNAMES #endif #ifdef __cplusplus @@ -568,9 +203,7 @@ #define _CRT_UNUSED(x) (void)x #endif -#pragma pack(pop) - -/* There are here for intrin.h */ +/* These are here for intrin.h */ #ifndef _SIZE_T_DEFINED #define _SIZE_T_DEFINED #ifdef _WIN64 @@ -591,5 +224,5 @@ #include <mingw32/intrin.h> -#endif - +#endif /* !_INC_MINGW */ + Modified: trunk/reactos/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdefs.h?rev=… ============================================================================== --- trunk/reactos/include/crt/crtdefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/crtdefs.h [iso-8859-1] Sun Dec 21 23:55:21 2008 @@ -4,3 +4,389 @@ * No warranty is given; refer to the file DISCLAIMER within this package. */ #include <_mingw.h> + +#ifndef _INC_CRTDEFS +#define _INC_CRTDEFS + +#ifdef _USE_32BIT_TIME_T +#ifdef _WIN64 +#error You cannot use 32-bit time_t (_USE_32BIT_TIME_T) with _WIN64 +#undef _USE_32BIT_TIME_T +#endif +#else +#if _INTEGRAL_MAX_BITS < 64 +#define _USE_32BIT_TIME_T +#endif +#endif + +/* Compatability definition */ +#if _MSC_VER > 0 && __STDC__ +#define NO_OLDNAMES +#endif + +/** Properties ***************************************************************/ + +#undef _CRT_PACKING +#define _CRT_PACKING 8 +#pragma pack(push,_CRT_PACKING) + +#ifndef _CRT_STRINGIZE +#define __CRT_STRINGIZE(_Value) #_Value +#define _CRT_STRINGIZE(_Value) __CRT_STRINGIZE(_Value) +#endif + +#ifndef _CRT_WIDE +#define __CRT_WIDE(_String) L ## _String +#define _CRT_WIDE(_String) __CRT_WIDE(_String) +#endif + +#ifndef _W64 + #if !defined(_midl) && defined(_X86_) && _MSC_VER >= 1300 + #define _W64 __w64 + #else + #define _W64 + #endif +#endif + +#ifndef _CRTIMP + #ifdef _DLL + #define _CRTIMP __declspec(dllimport) + #else + #define _CRTIMP + #endif +#endif + +//#define _CRT_ALTERNATIVE_INLINES + +#ifndef _CRTIMP_ALT + #ifdef _DLL + #ifdef _CRT_ALTERNATIVE_INLINES + #define _CRTIMP_ALT + #else + #define _CRTIMP_ALT _CRTIMP + #define _CRT_ALTERNATIVE_IMPORTED + #endif + #else + #define _CRTIMP_ALT + #endif +#endif + +#ifndef _CRTDATA + #ifdef _M_CEE_PURE + #define _CRTDATA(x) x + #else + #define _CRTDATA(x) _CRTIMP x + #endif +#endif + +#ifndef _CRTIMP2 + #define _CRTIMP2 _CRTIMP +#endif + +#ifndef _CRTIMP_PURE + #define _CRTIMP_PURE _CRTIMP +#endif + +#ifndef _CRTIMP_ALTERNATIVE + #define _CRTIMP_ALTERNATIVE _CRTIMP + #define _CRT_ALTERNATIVE_IMPORTED +#endif + +#ifndef _CRTIMP_NOIA64 + #ifdef __ia64__ + #define _CRTIMP_NOIA64 + #else + #define _CRTIMP_NOIA64 _CRTIMP + #endif +#endif + +#ifndef _MRTIMP2 + #define _MRTIMP2 _CRTIMP +#endif + +#ifndef _MCRTIMP + #define _MCRTIMP _CRTIMP +#endif + +#ifndef _PGLOBAL + #define _PGLOBAL +#endif + +#ifndef _AGLOBAL + #define _AGLOBAL +#endif + +#ifndef _CONST_RETURN + #define _CONST_RETURN +#endif + +#ifndef UNALIGNED +#if defined(__ia64__) || defined(__x86_64) +#define UNALIGNED __unaligned +#else +#define UNALIGNED +#endif +#endif + +#ifndef _CRT_ALIGN +#define _CRT_ALIGN(x) __attribute__ ((aligned(x))) +#endif + +#ifndef _CRTNOALIAS +#define _CRTNOALIAS +#endif + +#ifndef _CRTRESTRICT +#define _CRTRESTRICT +#endif + +#ifndef __CRTDECL +#define __CRTDECL __cdecl +#endif + +#ifndef _CRT_UNUSED +#define _CRT_UNUSED(x) (void)x +#endif + +#ifndef _CONST_RETURN +#ifdef __cplusplus +#define _CONST_RETURN const +#define _CRT_CONST_CORRECT_OVERLOADS +#else +#define _CONST_RETURN +#endif +#endif + +#define __crt_typefix(ctype) + + +/** Deprecated ***************************************************************/ + +#define _CRT_DEPRECATE_TEXT(_Text) __declspec(deprecated) + +#ifndef _CRT_INSECURE_DEPRECATE +# ifdef _CRT_SECURE_NO_DEPRECATE +# define _CRT_INSECURE_DEPRECATE(_Replacement) +# else +# define _CRT_INSECURE_DEPRECATE(_Replacement) \ + _CRT_DEPRECATE_TEXT("This may be unsafe, Try " #_Replacement " instead!") +# endif +#endif + +#ifndef _CRT_INSECURE_DEPRECATE_CORE +# ifdef _CRT_SECURE_NO_DEPRECATE_CORE +# define _CRT_INSECURE_DEPRECATE_CORE(_Replacement) +# else +# define _CRT_INSECURE_DEPRECATE_CORE(_Replacement) \ + _CRT_DEPRECATE_TEXT("This may be unsafe, Try " #_Replacement " instead! Enable _CRT_SECURE_NO_DEPRECATE to avoid thie warning.") +# endif +#endif + +#ifndef _CRT_NONSTDC_DEPRECATE +# ifdef _CRT_NONSTDC_NO_DEPRECATE +# define _CRT_NONSTDC_DEPRECATE(_Replacement) +# else +# define _CRT_NONSTDC_DEPRECATE(_Replacement) \ + _CRT_DEPRECATE_TEXT("Deprecated POSIX name, Try " #_Replacement " instead!") +# endif +#endif + +#ifndef _CRT_INSECURE_DEPRECATE_MEMORY +#define _CRT_INSECURE_DEPRECATE_MEMORY(_Replacement) +#endif + +#ifndef _CRT_INSECURE_DEPRECATE_GLOBALS +#define _CRT_INSECURE_DEPRECATE_GLOBALS(_Replacement) +#endif + +#ifndef _CRT_MANAGED_HEAP_DEPRECATE +#define _CRT_MANAGED_HEAP_DEPRECATE +#endif + +#ifndef _CRT_OBSOLETE +#define _CRT_OBSOLETE(_NewItem) +#endif + +/** Constants ****************************************************************/ + +#define _ARGMAX 100 + +#ifndef _TRUNCATE +#define _TRUNCATE ((size_t)-1) +#endif + +#define __STDC_SECURE_LIB__ 200411L +#define __GOT_SECURE_LIB__ __STDC_SECURE_LIB__ +#define _SECURECRT_FILL_BUFFER_PATTERN 0xFD + + + +/** Type definitions *********************************************************/ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _SIZE_T_DEFINED +#define _SIZE_T_DEFINED +#undef size_t +#ifdef _WIN64 +#if defined(__GNUC__) && defined(__STRICT_ANSI__) + typedef unsigned int size_t __attribute__ ((mode (DI))); +#else + typedef unsigned __int64 size_t; +#endif +#else + typedef unsigned int size_t; +#endif +#endif + +#ifndef _INTPTR_T_DEFINED +#define _INTPTR_T_DEFINED +#ifndef __intptr_t_defined +#define __intptr_t_defined +#undef intptr_t +#ifdef _WIN64 +#if defined(__GNUC__) && defined(__STRICT_ANSI__) + typedef int intptr_t __attribute__ ((mode (DI))); +#else + typedef __int64 intptr_t; +#endif +#else + typedef int intptr_t; +#endif +#endif +#endif + +#ifndef _UINTPTR_T_DEFINED +#define _UINTPTR_T_DEFINED +#ifndef __uintptr_t_defined +#define __uintptr_t_defined +#undef uintptr_t +#ifdef _WIN64 +#if defined(__GNUC__) && defined(__STRICT_ANSI__) + typedef unsigned int uintptr_t __attribute__ ((mode (DI))); +#else + typedef unsigned __int64 uintptr_t; +#endif +#else + typedef unsigned int uintptr_t; +#endif +#endif +#endif + +#ifndef _PTRDIFF_T_DEFINED +#define _PTRDIFF_T_DEFINED +#ifndef _PTRDIFF_T_ +#undef ptrdiff_t +#ifdef _WIN64 +#if defined(__GNUC__) && defined(__STRICT_ANSI__) + typedef int ptrdiff_t __attribute__ ((mode (DI))); +#else + typedef __int64 ptrdiff_t; +#endif +#else + typedef int ptrdiff_t; +#endif +#endif +#endif + +#ifndef _WCHAR_T_DEFINED +#define _WCHAR_T_DEFINED +#ifndef __cplusplus + typedef unsigned short wchar_t; +#endif +#endif + +#ifndef _WCTYPE_T_DEFINED +#define _WCTYPE_T_DEFINED + typedef unsigned short wint_t; + typedef unsigned short wctype_t; +#endif + +#ifndef _ERRCODE_DEFINED +#define _ERRCODE_DEFINED + typedef int errcode; + typedef int errno_t; +#endif + +#ifndef _TIME32_T_DEFINED +#define _TIME32_T_DEFINED + typedef long __time32_t; +#endif + +#ifndef _TIME64_T_DEFINED +#define _TIME64_T_DEFINED +#if _INTEGRAL_MAX_BITS >= 64 + typedef __int64 __time64_t; +#endif +#endif + +#ifndef _TIME_T_DEFINED +#define _TIME_T_DEFINED +#ifdef _USE_32BIT_TIME_T + typedef __time32_t time_t; +#else + typedef __time64_t time_t; +#endif +#endif + + struct threadlocaleinfostruct; + typedef struct threadlocaleinfostruct *pthreadlocinfo; + + struct threadmbcinfostruct; + typedef struct threadmbcinfostruct *pthreadmbcinfo; + + struct __lc_time_data; + + typedef struct localeinfo_struct { + pthreadlocinfo locinfo; + pthreadmbcinfo mbcinfo; + } _locale_tstruct,*_locale_t; + +#ifndef _TAGLC_ID_DEFINED +#define _TAGLC_ID_DEFINED + typedef struct tagLC_ID { + unsigned short wLanguage; + unsigned short wCountry; + unsigned short wCodePage; + } LC_ID,*LPLC_ID; +#endif + +#ifndef _THREADLOCALEINFO +#define _THREADLOCALEINFO + typedef struct threadlocaleinfostruct { + int refcount; + unsigned int lc_codepage; + unsigned int lc_collate_cp; + unsigned long lc_handle[6]; + LC_ID lc_id[6]; + struct { + char *locale; + wchar_t *wlocale; + int *refcount; + int *wrefcount; + } lc_category[6]; + int lc_clike; + int mb_cur_max; + int *lconv_intl_refcount; + int *lconv_num_refcount; + int *lconv_mon_refcount; + struct lconv *lconv; + int *ctype1_refcount; + unsigned short *ctype1; + const unsigned short *pctype; + const unsigned char *pclmap; + const unsigned char *pcumap; + struct __lc_time_data *lc_time_curr; + } threadlocinfo; +#endif + + +#ifdef __cplusplus +} +#endif + +#pragma pack(pop) + +#endif /* !_INC_CRTDEFS */ 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 23:55:21 2008 @@ -121,10 +121,10 @@ #define CLOCKS_PER_SEC 1000 - __MINGW_IMPORT int _daylight; - __MINGW_IMPORT long _dstbias; - __MINGW_IMPORT long _timezone; - __MINGW_IMPORT char * _tzname[2]; + _CRTDATA(extern int _daylight); + _CRTDATA(extern long _dstbias); + _CRTDATA(extern long _timezone); + _CRTDATA(extern char * _tzname[2]); _CRTIMP errno_t __cdecl _get_daylight(int *_Daylight); _CRTIMP errno_t __cdecl _get_dstbias(long *_Daylight_savings_bias);

1 0

[sserapion] 38265: devcpux: - Fix ProcessorDlgProc definition - Convert to spec. slayer: - Convert to spec.
by sserapion＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: sserapion Date: Sun Dec 21 23:42:05 2008 New Revision: 38265 URL: http://svn.reactos.org/svn/reactos?rev=38265&view=rev Log: devcpux: - Fix ProcessorDlgProc definition - Convert to spec. slayer: - Convert to spec. Added: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec (contents, props changed) - copied, changed from r38258, branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.def branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec (contents, props changed) - copied, changed from r38258, branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.def Removed: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.def branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.def Modified: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.rbuild branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/processor.c branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.def (removed) @@ -1,7 +1,0 @@ -LIBRARY devcpux.dll - -EXPORTS - -PropSheetExtProc@12 - -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.rbuild [iso-8859-1] Sun Dec 21 23:42:05 2008 @@ -1,5 +1,5 @@ <module name="devcpux" type="win32dll" installbase="system32" installname="devcpux.dll" unicode="yes"> - <importlibrary definition="devcpux.def" /> + <importlibrary definition="devcpux.spec" /> <include base="devcpux">.</include> <include base="ReactOS">include/reactos/wine</include> <library>kernel32</library> Copied: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec (from r38258, branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec [iso-8859-1] Sun Dec 21 23:42:05 2008 @@ -1,7 +1,1 @@ -LIBRARY devcpux.dll - -EXPORTS - -PropSheetExtProc@12 - -; EOF +@ stdcall PropSheetExtProc(ptr ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec ------------------------------------------------------------------------------ svn:mergeinfo = Modified: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/processor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/processor.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/processor.c [iso-8859-1] Sun Dec 21 23:42:05 2008 @@ -14,7 +14,7 @@ #include "resource.h" HINSTANCE g_hInstance = NULL; -int APIENTRY ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam); +LRESULT CALLBACK ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam); BOOL APIENTRY @@ -74,8 +74,8 @@ wcscat(szFeatures, Feature); } -int -APIENTRY +LRESULT +CALLBACK ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam) { switch (uMessage) { Removed: branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.def (removed) @@ -1,9 +1,0 @@ -LIBRARY slayer.dll - -EXPORTS -DllCanUnloadNow@0 -DllGetClassObject@12 -DllRegisterServer@0 -DllUnregisterServer@0 - -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.rbuild [iso-8859-1] Sun Dec 21 23:42:05 2008 @@ -1,5 +1,5 @@ <module name="slayer" type="win32dll" baseaddress="${BASEADDRESS_SLAYER}" installbase="system32" installname="slayer.dll" unicode="yes"> - <importlibrary definition="slayer.def" /> + <importlibrary definition="slayer.spec" /> <include base="slayer">.</include> <library>kernel32</library> <library>user32</library> Copied: branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec (from r38258, branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec [iso-8859-1] Sun Dec 21 23:42:05 2008 @@ -1,9 +1,4 @@ -LIBRARY slayer.dll - -EXPORTS -DllCanUnloadNow@0 -DllGetClassObject@12 -DllRegisterServer@0 -DllUnregisterServer@0 - -; EOF +@ stdcall DllCanUnloadNow() +@ stdcall DllGetClassObject(long long ptr) +@ stdcall DllRegisterServer() +@ stdcall DllUnregisterServer() Propchange: branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ svn:mergeinfo =

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
71
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 December 2008