Ros-diffs September 2015

ros-diffs@reactos.org

17 participants
535 discussions

[jimtabor] 69250: [User32] - Fix return for SCROLLBARINFO RECT to use screen coordinates. See CORE-9225.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Sep 16 07:13:03 2015 New Revision: 69250 URL: http://svn.reactos.org/svn/reactos?rev=69250&view=rev Log: [User32] - Fix return for SCROLLBARINFO RECT to use screen coordinates. See CORE-9225. Modified: trunk/reactos/win32ss/user/user32/controls/scrollbar.c trunk/reactos/win32ss/user/user32/user32.spec Modified: trunk/reactos/win32ss/user/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/scrollbar.c [iso-8859-1] Wed Sep 16 07:13:03 2015 @@ -1502,6 +1502,21 @@ /* * @implemented */ +BOOL WINAPI GetScrollBarInfo(HWND hwnd, LONG idObject, LPSCROLLBARINFO info) +{ + BOOL Ret; + PWND pWnd = ValidateHwnd(hwnd); + TRACE("hwnd=%p idObject=%d info=%p\n", hwnd, idObject, info); + if (!pWnd) return FALSE; + Ret = NtUserGetScrollBarInfo(hwnd, idObject, info); // This will be fixed once SB is server side. + /* rcScrollBar needs to be in screen coordinates */ + OffsetRect( &(info->rcScrollBar), pWnd->rcWindow.left, pWnd->rcWindow.top ); + return Ret; +} + +/* + * @implemented + */ BOOL WINAPI DECLSPEC_HOTPATCH Modified: trunk/reactos/win32ss/user/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/user32… ============================================================================== --- trunk/reactos/win32ss/user/user32/user32.spec [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/user32.spec [iso-8859-1] Wed Sep 16 07:13:03 2015 @@ -345,7 +345,7 @@ 342 stdcall GetReasonTitleFromReasonCode(long long long) 343 stdcall GetRegisteredRawInputDevices(ptr ptr long) # GetRipFlags -345 stdcall GetScrollBarInfo(long long ptr) NtUserGetScrollBarInfo +345 stdcall GetScrollBarInfo(long long ptr) ; NtUserGetScrollBarInfo 346 stdcall GetScrollInfo(long long ptr) 347 stdcall GetScrollPos(long long) 348 stdcall GetScrollRange(long long ptr ptr)

9 years, 3 months

[jimtabor] 69249: [User32] - Fix wine sync, Notify parent after capture is released, see CORE-10194.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Sep 16 04:15:35 2015 New Revision: 69249 URL: http://svn.reactos.org/svn/reactos?rev=69249&view=rev Log: [User32] - Fix wine sync, Notify parent after capture is released, see CORE-10194. Modified: trunk/reactos/win32ss/user/user32/controls/button.c Modified: trunk/reactos/win32ss/user/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] Wed Sep 16 04:15:35 2015 @@ -398,6 +398,8 @@ break; /* fall through */ case WM_LBUTTONUP: + { + BOOL TellParent = FALSE; //// ReactOS see note below. state = get_button_state( hWnd ); if (!(state & BUTTON_BTNPRESSED)) break; state &= BUTTON_NSTATES; @@ -425,9 +427,11 @@ (state & BST_INDETERMINATE) ? 0 : ((state & 3) + 1), 0 ); break; } - BUTTON_NOTIFY_PARENT(hWnd, BN_CLICKED); + TellParent = TRUE; // <---- Fix CORE-10194, Notify parent after capture is released. } ReleaseCapture(); + if (TellParent) BUTTON_NOTIFY_PARENT(hWnd, BN_CLICKED); + } break; case WM_CAPTURECHANGED:

9 years, 3 months

[sginsberg] 69248: [HAL] Get rid off REGISTERCALL ("regparm(3)" for GCC) and replace with good old NTAPI (stdcall). Such an obsession with avoiding stack usage is not healthy nor makes much sense t...

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Sep 15 23:03:42 2015 New Revision: 69248 URL: http://svn.reactos.org/svn/reactos?rev=69248&view=rev Log: [HAL] Get rid off REGISTERCALL ("regparm(3)" for GCC) and replace with good old NTAPI (stdcall). Such an obsession with avoiding stack usage is not healthy nor makes much sense today (or even a long time before today) with processors that have a decent L1 cache, whose "cost of access" is basically the same as to that of a register, and with processors being capable of recognising basic access patterns to ensure frequently used memory (read: stack) is in the cache. Slapping FASTCALL/regparm on frequently used code does not ensure it actually operates faster. You want to know what really hurts performance (and cache)? Slapping FORCEINLINE on everything like if it was some kind of asm macro, making code needlessly bloated. Modified: trunk/reactos/hal/halx86/include/halp.h trunk/reactos/hal/halx86/up/pic.c Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Tue Sep 15 23:03:42 2015 @@ -10,12 +10,6 @@ #define INIT_SECTION /* Done via alloc_text for MSC */ #endif - -#ifdef _MSC_VER -#define REGISTERCALL FASTCALL -#else -#define REGISTERCALL __attribute__((regparm(3))) -#endif #ifdef CONFIG_SMP #define HAL_BUILD_TYPE (DBG ? PRCB_BUILD_DEBUG : 0) @@ -430,14 +424,14 @@ typedef BOOLEAN -( REGISTERCALL *PHAL_DISMISS_INTERRUPT)( +(NTAPI *PHAL_DISMISS_INTERRUPT)( IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql ); BOOLEAN -REGISTERCALL +NTAPI HalpDismissIrqGeneric( IN KIRQL Irql, IN ULONG Irq, @@ -445,7 +439,7 @@ ); BOOLEAN -REGISTERCALL +NTAPI HalpDismissIrq15( IN KIRQL Irql, IN ULONG Irq, @@ -453,7 +447,7 @@ ); BOOLEAN -REGISTERCALL +NTAPI HalpDismissIrq13( IN KIRQL Irql, IN ULONG Irq, @@ -461,7 +455,7 @@ ); BOOLEAN -REGISTERCALL +NTAPI HalpDismissIrq07( IN KIRQL Irql, IN ULONG Irq, @@ -469,7 +463,7 @@ ); BOOLEAN -REGISTERCALL +NTAPI HalpDismissIrqLevel( IN KIRQL Irql, IN ULONG Irq, @@ -477,7 +471,7 @@ ); BOOLEAN -REGISTERCALL +NTAPI HalpDismissIrq15Level( IN KIRQL Irql, IN ULONG Irq, @@ -485,7 +479,7 @@ ); BOOLEAN -REGISTERCALL +NTAPI HalpDismissIrq13Level( IN KIRQL Irql, IN ULONG Irq, @@ -493,7 +487,7 @@ ); BOOLEAN -REGISTERCALL +NTAPI HalpDismissIrq07Level( IN KIRQL Irql, IN ULONG Irq, Modified: trunk/reactos/hal/halx86/up/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.c?rev=69… ============================================================================== --- trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] Tue Sep 15 23:03:42 2015 @@ -843,7 +843,7 @@ } BOOLEAN -REGISTERCALL +NTAPI HalpDismissIrqGeneric(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -853,7 +853,7 @@ } BOOLEAN -REGISTERCALL +NTAPI HalpDismissIrq15(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -889,7 +889,7 @@ BOOLEAN -REGISTERCALL +NTAPI HalpDismissIrq13(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -902,7 +902,7 @@ } BOOLEAN -REGISTERCALL +NTAPI HalpDismissIrq07(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -986,7 +986,7 @@ } BOOLEAN -REGISTERCALL +NTAPI HalpDismissIrqLevel(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -996,7 +996,7 @@ } BOOLEAN -REGISTERCALL +NTAPI HalpDismissIrq15Level(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -1031,7 +1031,7 @@ } BOOLEAN -REGISTERCALL +NTAPI HalpDismissIrq13Level(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -1044,7 +1044,7 @@ } BOOLEAN -REGISTERCALL +NTAPI HalpDismissIrq07Level(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql)

9 years, 3 months

[rnaumann] 69247: [SHELL33] fix a typo and the icon id's in recyclebin reg script. Now the icons are correct again. CORE-10193

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Tue Sep 15 21:26:08 2015 New Revision: 69247 URL: http://svn.reactos.org/svn/reactos?rev=69247&view=rev Log: [SHELL33] fix a typo and the icon id's in recyclebin reg script. Now the icons are correct again. CORE-10193 Modified: trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs [iso-8859-1] Tue Sep 15 21:26:08 2015 @@ -9,8 +9,8 @@ val 'LocalizedString' = e '@%%SystemRoot%%\system32\SHELL32.dll,-8964' DefaultIcon = e '%%SystemRoot%%\System32\shell32.dll,31' { - val Empty = e '%%SystemRoot%%\System32\shell32.dll,30' - val Full = e '%%SystemRoot%%\System32\shell32.dll,31' + val Empty = e '%%SystemRoot%%\System32\shell32.dll,31' + val Full = e '%%SystemRoot%%\System32\shell32.dll,32' } InprocServer32 = s '%MODULE%' { Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Tue Sep 15 21:26:08 2015 @@ -528,7 +528,7 @@ #define IDI_SHELL_WEB_BROWSER 512 #define IDI_SHELL_IDEA 1001 #define IDI_SHELL_PRINTER_OK2 1002 -#define IDI_SHELL_SERVEROK 1003 +#define IDI_SHELL_SERVER_OK 1003 #define IDI_SHELL_HELP_FILE1 1004 #define IDI_SHELL_FILE_MOVE1 1005 #define IDI_SHELL_FILE_PRINT 1006

9 years, 3 months

[hbelusca] 69246: [NTVDM] Correctly call the device strategy/interrupt routines. Should fix a bunch of weird errors. This also fixes the NTVDM crash when Command&Conquer terminates, however it does...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Sep 15 20:09:11 2015 New Revision: 69246 URL: http://svn.reactos.org/svn/reactos?rev=69246&view=rev Log: [NTVDM] Correctly call the device strategy/interrupt routines. Should fix a bunch of weird errors. This also fixes the NTVDM crash when Command&Conquer terminates, however it doesn't fix the DOS/4GW exception it encounters. CORE-9678 Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] Tue Sep 15 20:09:11 2015 @@ -58,8 +58,8 @@ RtlMoveMemory(&Sda->Request, Request, Request->RequestLength); /* Call the strategy routine, and then the interrupt routine */ - Call16(HIWORD(Driver), DriverBlock->StrategyRoutine); - Call16(HIWORD(Driver), DriverBlock->InterruptRoutine); + RunCallback16(&DosContext, MAKELONG(DriverBlock->StrategyRoutine , HIWORD(Driver))); + RunCallback16(&DosContext, MAKELONG(DriverBlock->InterruptRoutine, HIWORD(Driver))); /* Get the request structure from ES:BX */ RtlMoveMemory(Request, &Sda->Request, Request->RequestLength);

9 years, 3 months

[rnaumann] 69245: use the same file as 33.ico for 142.ico. should fix CORE-10193

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Tue Sep 15 19:56:53 2015 New Revision: 69245 URL: http://svn.reactos.org/svn/reactos?rev=69245&view=rev Log: use the same file as 33.ico for 142.ico. should fix CORE-10193 Modified: trunk/reactos/dll/win32/shell32/res/icons/142.ico Modified: trunk/reactos/dll/win32/shell32/res/icons/142.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available.

9 years, 3 months

[sginsberg] 69244: Completely disable the debug register assertions in the trap exit code for KDBG as it sets them improperly. These checks should not have been added for KDBG to begin with and wou...

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Sep 15 17:55:14 2015 New Revision: 69244 URL: http://svn.reactos.org/svn/reactos?rev=69244&view=rev Log: Completely disable the debug register assertions in the trap exit code for KDBG as it sets them improperly. These checks should not have been added for KDBG to begin with and would have made any usage of address breakpoints inside KDBG end up in a trap exit breakpoint. Whoever knows KDBG better than I do please investigate. However, enable the DR7 debug check for KD as it handles the debug registers just fine. The likelihood of loading a driver that modifies a debug register (which would be the only other thing triggering this) is pretty slim. Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] Tue Sep 15 17:55:14 2015 @@ -153,6 +153,8 @@ __debugbreak(); } + /* FIXME: KDBG messes around with these improperly */ +#if !defined(KDBG) /* Check DR values */ if (KiUserTrap(TrapFrame)) { @@ -175,8 +177,9 @@ CheckDr(1, Prcb->ProcessorState.SpecialRegisters.KernelDr1); CheckDr(2, Prcb->ProcessorState.SpecialRegisters.KernelDr2); CheckDr(3, Prcb->ProcessorState.SpecialRegisters.KernelDr3); - //CheckDr(7, Prcb->ProcessorState.SpecialRegisters.KernelDr7); - } + CheckDr(7, Prcb->ProcessorState.SpecialRegisters.KernelDr7); + } +#endif StopChecking = FALSE; }

9 years, 3 months

[tfaber] 69243: [KMTESTS:MM] - Keep the number of tests constant in MmMdl because Testman

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Sep 15 16:46:28 2015 New Revision: 69243 URL: http://svn.reactos.org/svn/reactos?rev=69243&view=rev Log: [KMTESTS:MM] - Keep the number of tests constant in MmMdl because Testman Modified: trunk/rostests/kmtests/ntos_mm/MmMdl.c Modified: trunk/rostests/kmtests/ntos_mm/MmMdl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmMdl.c?r… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmMdl.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmMdl.c [iso-8859-1] Tue Sep 15 16:46:28 2015 @@ -120,8 +120,11 @@ ok(MdlPageCount < 2UL * 1024 * 1024 * 1024 / PAGE_SIZE, "MdlPageCount = %lu\n", MdlPageCount); for (i = 0; i < MdlPageCount; i++) { - ok(MdlPages[i] != 0 && MdlPages[i] != (PFN_NUMBER)-1, - "MdlPages[%lu] = 0x%I64x\n", i, (ULONGLONG)MdlPages[i]); + if (MdlPages[i] == 0 || + MdlPages[i] == (PFN_NUMBER)-1) + { + ok(0, "MdlPages[%lu] = 0x%I64x\n", i, (ULONGLONG)MdlPages[i]); + } } SystemVa = MmMapLockedPagesSpecifyCache(Mdl, KernelMode,

9 years, 3 months

[sginsberg] 69242: Fix a load of assumptions about default calling convention, a lot more remain.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Sep 15 13:15:28 2015 New Revision: 69242 URL: http://svn.reactos.org/svn/reactos?rev=69242&view=rev Log: Fix a load of assumptions about default calling convention, a lot more remain. Modified: trunk/reactos/base/services/svchost/svchost.c trunk/reactos/base/system/smss/smss.c trunk/reactos/boot/freeldr/fdebug/fdebug.c trunk/reactos/include/crt/string.h trunk/reactos/include/crt/time.h trunk/reactos/include/psdk/winddi.h trunk/reactos/lib/3rdparty/freetype/include/config/ftconfig.h trunk/reactos/lib/sdk/crt/include/internal/mingw-w64/internal.h trunk/reactos/lib/sdk/crt/startup/atonexit.c trunk/reactos/lib/sdk/crt/startup/charmax.c trunk/reactos/lib/sdk/crt/startup/crt0_w.c trunk/reactos/lib/sdk/crt/startup/crt_handler.c trunk/reactos/lib/sdk/crt/startup/crtdll.c trunk/reactos/lib/sdk/crt/startup/crtexe.c trunk/reactos/lib/sdk/crt/string/tcslen.h trunk/reactos/lib/sdk/crt/string/tcsnlen.h trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c trunk/reactos/win32ss/pch.h Modified: trunk/reactos/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -1243,6 +1243,7 @@ } VOID +__cdecl wmainCRTStartup ( VOID ) Modified: trunk/reactos/base/system/smss/smss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smss.c?re… ============================================================================== --- trunk/reactos/base/system/smss/smss.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smss.c [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -445,6 +445,7 @@ } NTSTATUS +__cdecl _main(IN INT argc, IN PCHAR argv[], IN PCHAR envp[], Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.c [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -37,7 +37,7 @@ LRESULT CALLBACK CaptureDialogProc(HWND, UINT, WPARAM, LPARAM); VOID EnableFileMenuItemByID(UINT Id, BOOL Enable); VOID CheckLocalEchoMenuItem(BOOL Checked); -VOID Rs232Thread(VOID* Parameter); +VOID __cdecl Rs232Thread(VOID* Parameter); int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, @@ -437,7 +437,7 @@ CheckMenuItem(hFileMenu, IDM_FILE_LOCALECHO, MF_BYCOMMAND|(Checked ? MF_CHECKED : MF_UNCHECKED)); } -VOID Rs232Thread(VOID* Parameter) +VOID __cdecl Rs232Thread(VOID* Parameter) { BYTE Byte; TCHAR String[MAX_PATH]; Modified: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=6… ============================================================================== --- trunk/reactos/include/crt/string.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/string.h [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -672,6 +672,7 @@ _CRTIMP wchar_t* + __cdecl wcsncat( wchar_t *_Dest, const wchar_t *_Source, Modified: trunk/reactos/include/crt/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/time.h?rev=692… ============================================================================== --- trunk/reactos/include/crt/time.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/time.h [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -388,10 +388,10 @@ #ifdef _USE_32BIT_TIME_T /* Do it like this to be compatible to msvcrt.dll on 32 bit windows XP and before */ __CRT_INLINE wchar_t *__cdecl _wctime32(const time_t *_Time) { return _wctime(_Time); } -__CRT_INLINE errno_t _wctime32_s(wchar_t *_Buffer, size_t _SizeInWords,const __time32_t *_Time) { return _wctime32_s(_Buffer, _SizeInWords, _Time); } +__CRT_INLINE errno_t __cdecl _wctime32_s(wchar_t *_Buffer, size_t _SizeInWords,const __time32_t *_Time) { return _wctime32_s(_Buffer, _SizeInWords, _Time); } #else __CRT_INLINE wchar_t *__cdecl _wctime(const time_t *_Time) { return _wctime64(_Time); } -__CRT_INLINE errno_t _wctime_s(wchar_t *_Buffer, size_t _SizeInWords,const time_t *_Time) { return _wctime64_s(_Buffer, _SizeInWords, _Time); } +__CRT_INLINE errno_t __cdecl _wctime_s(wchar_t *_Buffer, size_t _SizeInWords,const time_t *_Time) { return _wctime64_s(_Buffer, _SizeInWords, _Time); } #endif #endif Modified: trunk/reactos/include/psdk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winddi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winddi.h [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -2450,7 +2450,7 @@ _In_ DWORD cjPrinterData); #endif /* !USERMODE_DRIVER */ -typedef int (CDECL *SORTCOMP)(const void *pv1, const void *pv2); +typedef int (__cdecl /*CDECL*/ *SORTCOMP)(const void *pv1, const void *pv2); ENGAPI VOID Modified: trunk/reactos/lib/3rdparty/freetype/include/config/ftconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… ============================================================================== --- trunk/reactos/lib/3rdparty/freetype/include/config/ftconfig.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/freetype/include/config/ftconfig.h [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -387,9 +387,9 @@ #ifndef FT_EXPORT #ifdef __cplusplus -#define FT_EXPORT( x ) extern "C" x -#else -#define FT_EXPORT( x ) extern x +#define FT_EXPORT( x ) extern "C" x __cdecl +#else +#define FT_EXPORT( x ) extern x __cdecl #endif #endif /* !FT_EXPORT */ @@ -398,9 +398,9 @@ #ifndef FT_EXPORT_DEF #ifdef __cplusplus -#define FT_EXPORT_DEF( x ) extern "C" x -#else -#define FT_EXPORT_DEF( x ) extern x +#define FT_EXPORT_DEF( x ) extern "C" x __cdecl +#else +#define FT_EXPORT_DEF( x ) extern x __cdecl #endif #endif /* !FT_EXPORT_DEF */ Modified: trunk/reactos/lib/sdk/crt/include/internal/mingw-w64/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/mingw-w64/internal.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/mingw-w64/internal.h [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -21,7 +21,7 @@ #ifdef __REACTOS__ #include "malloc.h" struct _exception; -__declspec(dllimport) void __setusermatherr(int (__cdecl *)(struct _exception *)); +__declspec(dllimport) void __cdecl __setusermatherr(int (__cdecl *)(struct _exception *)); #define __mingw_fprintf fprintf #define __mingw_vfprintf vfprintf #endif Modified: trunk/reactos/lib/sdk/crt/startup/atonexit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/atonex… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/atonexit.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/atonexit.c [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -24,7 +24,7 @@ _PVFV *__onexitbegin; _PVFV *__onexitend; -extern _CRTIMP _onexit_t __dllonexit (_onexit_t, _PVFV**, _PVFV**); +extern _CRTIMP _onexit_t __cdecl __dllonexit (_onexit_t, _PVFV**, _PVFV**); extern _onexit_t (__cdecl * __MINGW_IMP_SYMBOL(_onexit)) (_onexit_t func); /* Choose a different name to prevent name conflicts. The CRT one works fine. */ Modified: trunk/reactos/lib/sdk/crt/startup/charmax.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/charma… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/charmax.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/charmax.c [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -7,13 +7,13 @@ #include <sect_attribs.h> #include <internal.h> -__declspec(dllimport) int __lconv_init (void); +__declspec(dllimport) int __cdecl __lconv_init (void); int mingw_initcharmax = 0; int _charmax = 255; -static int my_lconv_init(void) +static int __cdecl my_lconv_init(void) { return __lconv_init(); } Modified: trunk/reactos/lib/sdk/crt/startup/crt0_w.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/crt0_w… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/crt0_w.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/crt0_w.c [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -14,10 +14,10 @@ extern LPWSTR __mingw_winmain_lpCmdLine; extern DWORD __mingw_winmain_nShowCmd; -int wmain (int, wchar_t **, wchar_t **); +int __cdecl wmain (int, wchar_t **, wchar_t **); /*ARGSUSED*/ -int wmain (int __UNUSED_PARAM(flags), +int __cdecl wmain (int __UNUSED_PARAM(flags), wchar_t ** __UNUSED_PARAM(cmdline), wchar_t ** __UNUSED_PARAM(inst)) { Modified: trunk/reactos/lib/sdk/crt/startup/crt_handler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/crt_ha… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/crt_handler.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/crt_handler.c [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -40,7 +40,7 @@ PBYTE _GetPEImageBase (void); int __mingw_init_ehandler (void); -extern void _fpreset (void); +extern void __cdecl _fpreset (void); #if defined(_WIN64) && !defined(_MSC_VER) EXCEPTION_DISPOSITION __mingw_SEH_error_handler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); @@ -90,7 +90,7 @@ return 1; } -extern void _fpreset (void); +extern void __cdecl _fpreset (void); EXCEPTION_DISPOSITION __mingw_SEH_error_handler (struct _EXCEPTION_RECORD* ExceptionRecord, Modified: trunk/reactos/lib/sdk/crt/startup/crtdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/crtdll… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/crtdll.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/crtdll.c [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -54,11 +54,12 @@ extern WINBOOL WINAPI DllEntryPoint (HANDLE, DWORD, LPVOID); -static int pre_c_init (void); +static int __cdecl pre_c_init (void); _CRTALLOC(".CRT$XIAA") _PIFV pcinit = pre_c_init; static int +__cdecl pre_c_init (void) { _PVFV *onexitbegin; Modified: trunk/reactos/lib/sdk/crt/startup/crtexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/crtexe… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/crtexe.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/crtexe.c [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -39,7 +39,7 @@ /* This symbol is defined by ld. */ extern IMAGE_DOS_HEADER __ImageBase; -extern void _fpreset (void); +extern void __cdecl _fpreset (void); #define SPACECHAR _T(' ') #define DQUOTECHAR _T('\"') @@ -147,11 +147,11 @@ #endif } -static int __tmainCRTStartup (void); - -int WinMainCRTStartup (void); - -int WinMainCRTStartup (void) +static int __cdecl __tmainCRTStartup (void); + +int __cdecl WinMainCRTStartup (void); + +int __cdecl WinMainCRTStartup (void) { int ret = 255; #ifdef __SEH__ @@ -173,13 +173,13 @@ return ret; } -int mainCRTStartup (void); +int __cdecl mainCRTStartup (void); #ifdef _WIN64 int __mingw_init_ehandler (void); #endif -int mainCRTStartup (void) +int __cdecl mainCRTStartup (void) { int ret = 255; #ifdef __SEH__ @@ -202,7 +202,8 @@ } static -__declspec(noinline) int +__declspec(noinline) +int __cdecl __tmainCRTStartup (void) { _TCHAR *lpszCommandLine = NULL; @@ -410,7 +411,7 @@ #else #define __UNUSED_PARAM_1 __UNUSED_PARAM #endif -static void +static void __cdecl __mingw_invalidParameterHandler (const wchar_t * __UNUSED_PARAM_1(expression), const wchar_t * __UNUSED_PARAM_1(function), const wchar_t * __UNUSED_PARAM_1(file), Modified: trunk/reactos/lib/sdk/crt/string/tcslen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/tcslen.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/tcslen.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/tcslen.h [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -6,7 +6,7 @@ #pragma function(_tcslen) #endif /* _MSC_VER */ -size_t _tcslen(const _TCHAR * str) +size_t __cdecl _tcslen(const _TCHAR * str) { const _TCHAR * s; Modified: trunk/reactos/lib/sdk/crt/string/tcsnlen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/tcsnlen… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/tcsnlen.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/tcsnlen.h [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -2,7 +2,7 @@ #include <stddef.h> #include <tchar.h> -size_t _tcsnlen(const _TCHAR * str, size_t count) +size_t __cdecl _tcsnlen(const _TCHAR * str, size_t count) { const _TCHAR * s; Modified: trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/ros… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -511,6 +511,7 @@ } void +__cdecl _assert ( const char *exp, const char *file, Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -641,7 +641,7 @@ return(STATUS_VARIABLE_NOT_FOUND); } -static int +static int __cdecl DbgCompareChannels(const void * a, const void * b) { return wcscmp((WCHAR*)a, ((DBG_CHANNEL*)b)->Name); Modified: trunk/reactos/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?rev=69242&r1… ============================================================================== --- trunk/reactos/win32ss/pch.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/pch.h [iso-8859-1] Tue Sep 15 13:15:28 2015 @@ -42,6 +42,10 @@ #define _USE_MATH_DEFINES #include <math.h> #include <intrin.h> + +// Needed because windef.h messes up CDECL for whatever +#undef CDECL +#define CDECL __cdecl /* Avoid type casting, by defining RECT to RECTL */ #define RECT RECTL

9 years, 3 months

[pschweitzer] 69241: [CMD] - Fix a broken check - Plug a memory leak

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Sep 15 11:14:58 2015 New Revision: 69241 URL: http://svn.reactos.org/svn/reactos?rev=69241&view=rev Log: [CMD] - Fix a broken check - Plug a memory leak Modified: trunk/reactos/base/shell/cmd/replace.c Modified: trunk/reactos/base/shell/cmd/replace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/replace.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/replace.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/replace.c [iso-8859-1] Tue Sep 15 11:14:58 2015 @@ -100,9 +100,10 @@ hFileDest = CreateFile(dest, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - if (hFileSrc == INVALID_HANDLE_VALUE) + if (hFileDest == INVALID_HANDLE_VALUE) { ConOutResPrintf(STRING_COPY_ERROR1, dest); + CloseHandle (hFileSrc); return 0; }

9 years, 3 months

← Newer
1
...
15
16
17
18
19
20
21
...
54
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2015