Ros-dev

ros-dev@reactos.org

5788 discussions

Re: [ros-dev] [ros-diffs] [akhaldi] 66500: [KERNEL32_VISTA] Add and export InitOnceExecuteOnce(). CORE-9246

by Alex Ionescu

Why are we adding Wineisms to core binaries like kernel32? These functions should be in NTDLL and not in kernel32, and they are badly written anyway. Best regards, Alex Ionescu On Sat, Feb 28, 2015 at 10:46 AM, <akhaldi(a)svn.reactos.org> wrote: > Author: akhaldi > Date: Sat Feb 28 15:46:43 2015 > New Revision: 66500 > > URL: http://svn.reactos.org/svn/reactos?rev=66500&view=rev > Log: > [KERNEL32_VISTA] Add and export InitOnceExecuteOnce(). CORE-9246 > > Added: > trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c (with > props) > Modified: > trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt > trunk/reactos/dll/win32/kernel32_vista/kernel32_vista.spec > > Modified: trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/C… > > ============================================================================== > --- trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt > [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt > [iso-8859-1] Sat Feb 28 15:46:43 2015 > @@ -8,15 +8,11 @@ > list(APPEND SOURCE > DllMain.c > GetTickCount64.c > + InitOnceExecuteOnce.c > ${CMAKE_CURRENT_BINARY_DIR}/kernel32_vista.def) > > add_library(kernel32_vista SHARED ${SOURCE}) > set_module_type(kernel32_vista win32dll HOTPATCHABLE ENTRYPOINT DllMain > 12) > -add_importlibs(kernel32_vista kernel32) > - > -if(MSVC) > - add_importlibs(kernel32_vista ntdll) > -endif() > - > +add_importlibs(kernel32_vista kernel32 ntdll) > add_dependencies(kernel32_vista psdk) > add_cd_file(TARGET kernel32_vista DESTINATION reactos/system32 FOR all) > > Added: trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/I… > > ============================================================================== > --- trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c > (added) > +++ trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c > [iso-8859-1] Sat Feb 28 15:46:43 2015 > @@ -0,0 +1,118 @@ > + > +#include "k32_vista.h" > + > +#include <ndk/exfuncs.h> > +#include <wine/config.h> > +#include <wine/port.h> > + > +/* Taken from Wine ntdll/sync.c */ > + > +HANDLE keyed_event = NULL; > + > +static DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG > flags, void **context ) > +{ > + if (flags & RTL_RUN_ONCE_CHECK_ONLY) > + { > + ULONG_PTR val = (ULONG_PTR)once->Ptr; > + > + if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; > + if ((val & 3) != 2) return STATUS_UNSUCCESSFUL; > + if (context) *context = (void *)(val & ~3); > + return STATUS_SUCCESS; > + } > + > + for (;;) > + { > + ULONG_PTR next, val = (ULONG_PTR)once->Ptr; > + > + switch (val & 3) > + { > + case 0: /* first time */ > + if (!interlocked_cmpxchg_ptr( &once->Ptr, > + (flags & RTL_RUN_ONCE_ASYNC) ? > (void *)3 : (void *)1, 0 )) > + return STATUS_PENDING; > + break; > + > + case 1: /* in progress, wait */ > + if (flags & RTL_RUN_ONCE_ASYNC) return > STATUS_INVALID_PARAMETER; > + next = val & ~3; > + if (interlocked_cmpxchg_ptr( &once->Ptr, (void > *)((ULONG_PTR)&next | 1), > + (void *)val ) == (void *)val) > + NtWaitForKeyedEvent( keyed_event, &next, FALSE, NULL ); > + break; > + > + case 2: /* done */ > + if (context) *context = (void *)(val & ~3); > + return STATUS_SUCCESS; > + > + case 3: /* in progress, async */ > + if (!(flags & RTL_RUN_ONCE_ASYNC)) return > STATUS_INVALID_PARAMETER; > + return STATUS_PENDING; > + } > + } > +} > + > +static DWORD WINAPI RtlpRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, > void *context ) > +{ > + if ((ULONG_PTR)context & 3) return STATUS_INVALID_PARAMETER; > + > + if (flags & RTL_RUN_ONCE_INIT_FAILED) > + { > + if (context) return STATUS_INVALID_PARAMETER; > + if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; > + } > + else context = (void *)((ULONG_PTR)context | 2); > + > + for (;;) > + { > + ULONG_PTR val = (ULONG_PTR)once->Ptr; > + > + switch (val & 3) > + { > + case 1: /* in progress */ > + if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val > ) != (void *)val) break; > + val &= ~3; > + while (val) > + { > + ULONG_PTR next = *(ULONG_PTR *)val; > + NtReleaseKeyedEvent( keyed_event, (void *)val, FALSE, > NULL ); > + val = next; > + } > + return STATUS_SUCCESS; > + > + case 3: /* in progress, async */ > + if (!(flags & RTL_RUN_ONCE_ASYNC)) return > STATUS_INVALID_PARAMETER; > + if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val > ) != (void *)val) break; > + return STATUS_SUCCESS; > + > + default: > + return STATUS_UNSUCCESSFUL; > + } > + } > +} > + > +static DWORD WINAPI RtlpRunOnceExecuteOnce( RTL_RUN_ONCE *once, > PRTL_RUN_ONCE_INIT_FN func, > + void *param, void **context ) > +{ > + DWORD ret = RtlRunOnceBeginInitialize( once, 0, context ); > + > + if (ret != STATUS_PENDING) return ret; > + > + if (!func( once, param, context )) > + { > + RtlpRunOnceComplete( once, RTL_RUN_ONCE_INIT_FAILED, NULL ); > + return STATUS_UNSUCCESSFUL; > + } > + > + return RtlpRunOnceComplete( once, 0, context ? *context : NULL ); > +} > + > +/* Taken from Wine kernel32/sync.c */ > + > +/* > + * @implemented > + */ > +BOOL NTAPI InitOnceExecuteOnce( INIT_ONCE *once, PINIT_ONCE_FN func, void > *param, void **context ) > +{ > + return !RtlpRunOnceExecuteOnce( once, (PRTL_RUN_ONCE_INIT_FN)func, > param, context ); > +} > > Propchange: trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c > > ------------------------------------------------------------------------------ > svn:eol-style = native > > Modified: trunk/reactos/dll/win32/kernel32_vista/kernel32_vista.spec > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/k… > > ============================================================================== > --- trunk/reactos/dll/win32/kernel32_vista/kernel32_vista.spec > [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32_vista/kernel32_vista.spec > [iso-8859-1] Sat Feb 28 15:46:43 2015 > @@ -1,2 +1,3 @@ > > @ stdcall -ret64 GetTickCount64() > +@ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) > > >

9 years, 6 months

New Patchbot

by Colin Finck

Hi all, Based on Hermès' suggestion, I've transformed our Debug-Buildbot "Trunk_x86_GCCLin Debug" into a Patchbot. That means, it will continue to build each SVN revision as usual, but you can also force a build and enter a patch ID. Your build will then be patched accordingly. After building and testing, you will have: * The patched regtest ISO at http://iso.reactos.org/regtestcd/ * A test result in Testman with source "Patched Trunk_x86_GCCLin (KVM)" These changes will be applied to the other Buildslaves too once our servers are all back up. Cheers, Colin

9 years, 6 months

Re: [ros-dev] [ros-diffs] [gadamopoulos] 66457: [USER32] - button.c: Use NtUserAlterWindowStyle where wine uses WIN_SetStyle (usage and parameters were confirmed with windbg) [NTUSER] - Implement NtUserAlterWindowStyle. Fix...

by Timo Kreuzer

Why don't we use a macro or wrapper function, unstead of hacking shared code everywhere? Am 25.02.2015 um 21:02 schrieb gadamopoulos(a)svn.reactos.org: > Author: gadamopoulos > Date: Wed Feb 25 20:02:10 2015 > New Revision: 66457 > > URL: http://svn.reactos.org/svn/reactos?rev=66457&view=rev > Log: > [USER32] > - button.c: Use NtUserAlterWindowStyle where wine uses WIN_SetStyle (usage and parameters were confirmed with windbg) > > [NTUSER] > - Implement NtUserAlterWindowStyle. > > Fixes remaining failures in user32:msg_controls test. > > Modified: > trunk/reactos/win32ss/user/ntuser/ntstubs.c > trunk/reactos/win32ss/user/ntuser/window.c > trunk/reactos/win32ss/user/user32/controls/button.c > > Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… > ============================================================================== > --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) > +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Wed Feb 25 20:02:10 2015 > @@ -1157,19 +1157,6 @@ > return 0; > } > > -/* > - * @unimplemented > - */ > -DWORD APIENTRY > -NtUserAlterWindowStyle(DWORD Unknown0, > - DWORD Unknown1, > - DWORD Unknown2) > -{ > - STUB > - > - return(0); > -} > - > BOOL APIENTRY NtUserAddClipboardFormatListener( > HWND hwnd > ) > > Modified: trunk/reactos/win32ss/user/ntuser/window.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… > ============================================================================== > --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) > +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Wed Feb 25 20:02:10 2015 > @@ -3537,8 +3537,8 @@ > return FALSE; > } > > -LONG FASTCALL > -co_UserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) > +static LONG > +co_IntSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi, BOOL bAlter) > { > PWND Window, Parent; > PWINSTATION_OBJECT WindowStation; > @@ -3597,6 +3597,7 @@ > Style.styleNew &= ~WS_EX_WINDOWEDGE; > > Window->ExStyle = (DWORD)Style.styleNew; > + > co_IntSendMessage(hWnd, WM_STYLECHANGED, GWL_EXSTYLE, (LPARAM) &Style); > break; > > @@ -3604,7 +3605,9 @@ > OldValue = (LONG) Window->style; > Style.styleOld = OldValue; > Style.styleNew = NewValue; > - co_IntSendMessage(hWnd, WM_STYLECHANGING, GWL_STYLE, (LPARAM) &Style); > + > + if (!bAlter) > + co_IntSendMessage(hWnd, WM_STYLECHANGING, GWL_STYLE, (LPARAM) &Style); > > /* WS_CLIPSIBLINGS can't be reset on top-level windows */ > if (Window->spwndParent == UserGetDesktopWindow()) Style.styleNew |= WS_CLIPSIBLINGS; > @@ -3621,7 +3624,9 @@ > DceResetActiveDCEs( Window ); > } > Window->style = (DWORD)Style.styleNew; > - co_IntSendMessage(hWnd, WM_STYLECHANGED, GWL_STYLE, (LPARAM) &Style); > + > + if (!bAlter) > + co_IntSendMessage(hWnd, WM_STYLECHANGED, GWL_STYLE, (LPARAM) &Style); > break; > > case GWL_WNDPROC: > @@ -3672,6 +3677,13 @@ > return( OldValue); > } > > + > +LONG FASTCALL > +co_UserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) > +{ > + return co_IntSetWindowLong(hWnd, Index, NewValue, Ansi, FALSE); > +} > + > /* > * NtUserSetWindowLong > * > @@ -3686,24 +3698,45 @@ > LONG APIENTRY > NtUserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) > { > - DECLARE_RETURN(LONG); > - > - TRACE("Enter NtUserSetWindowLong\n"); > + LONG ret; > + > UserEnterExclusive(); > > if (hWnd == IntGetDesktopWindow()) > { > EngSetLastError(STATUS_ACCESS_DENIED); > - RETURN( 0); > - } > - > - RETURN( co_UserSetWindowLong(hWnd, Index, NewValue, Ansi)); > - > -CLEANUP: > - TRACE("Leave NtUserSetWindowLong, ret=%i\n",_ret_); > + UserLeave(); > + return 0; > + } > + > + ret = co_IntSetWindowLong(hWnd, Index, NewValue, Ansi, FALSE); > + > UserLeave(); > - END_CLEANUP; > -} > + > + return ret; > +} > + > +DWORD APIENTRY > +NtUserAlterWindowStyle(HWND hWnd, DWORD Index, LONG NewValue) > +{ > + LONG ret; > + > + UserEnterExclusive(); > + > + if (hWnd == IntGetDesktopWindow()) > + { > + EngSetLastError(STATUS_ACCESS_DENIED); > + UserLeave(); > + return 0; > + } > + > + ret = co_IntSetWindowLong(hWnd, Index, NewValue, FALSE, TRUE); > + > + UserLeave(); > + > + return ret; > +} > + > > /* > * NtUserSetWindowWord > > 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 Feb 25 20:02:10 2015 > @@ -298,11 +298,10 @@ > /* XP turns a BS_USERBUTTON into BS_PUSHBUTTON */ > if (btn_type == BS_USERBUTTON ) > { > + style = (style & ~BS_TYPEMASK) | BS_PUSHBUTTON; > #ifdef __REACTOS__ > - style = (style & ~BS_TYPEMASK) | BS_PUSHBUTTON; > - SetWindowLongPtrW( hWnd, GWL_STYLE, style ); > + NtUserAlterWindowStyle(hWnd, GWL_STYLE, style ); > #else > - style = (style & ~BS_TYPEMASK) | BS_PUSHBUTTON; > WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style ); > #endif > } > @@ -508,8 +507,11 @@ > if ((wParam & BS_TYPEMASK) >= MAX_BTN_TYPE) break; > btn_type = wParam & BS_TYPEMASK; > style = (style & ~BS_TYPEMASK) | btn_type; > - SetWindowLongPtrW( hWnd, GWL_STYLE, style ); > - //WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style ); > +#ifdef __REACTOS__ > + NtUserAlterWindowStyle(hWnd, GWL_STYLE, style ); > +#else > + WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style ); > +#endif > > /* Only redraw if lParam flag is set.*/ > if (lParam) > @@ -565,7 +567,7 @@ > #ifdef __REACTOS__ > if (wParam) style |= WS_TABSTOP; > else style &= ~WS_TABSTOP; > - SetWindowLongPtrW( hWnd, GWL_STYLE, style ); > + NtUserAlterWindowStyle(hWnd, GWL_STYLE, style ); > #else > if (wParam) WIN_SetStyle( hWnd, WS_TABSTOP, 0 ); > else WIN_SetStyle( hWnd, 0, WS_TABSTOP ); > > >

9 years, 6 months

Status Meeting (February 2015)

by Aleksey Bragin

Hello, Let me invite you to the monthly status meeting taking place 26th of February, 19:00 UTC. IRC service will only be started shortly before the meeting. Your participation passwords and server address will be emailed to you shortly before the meeting starts, and they are going to be different once again as they are not stored in any database. Hopefully it's not much of inconvenience. If someone still is not getting passwords sent before a meeting - please email Pierre before the meeting started to get one. Please send agenda proposals to me before the meeting, so that we can start with a proposed agenda. And join Mumble! :-) Regards, Aleksey Bragin

9 years, 6 months

VirtualBox Testslave

by Colin Finck

Hi all, As tests have shown that VirtualBox doesn't work properly inside an already virtualized environment, ReactOS Deutschland e.V. has just ordered a tiny Intel NUC that will serve as a VirtualBox Testslave. We plan to set it up right next to our Buildslaves, so that every ISO could possibly be regression-tested under VirtualBox. As a start, we plan to test the builds of the new MSVC Builder. The machine is powerful enough though to eventually test multiple ISOs simultaneously. I don't know about the current state of sysreg2 regarding VirtualBox support. To let this all happen as soon as possible, please ensure sysreg2 can fully handle VirtualBox once I set up the machine. Cheers, Colin

9 years, 6 months

Re: [ros-dev] [ros-diffs] [jimtabor] 66464: [User32_WINETEST] - Move test_SetFocus first as it is done originally. Refer to read past wine CVS logs for the reason.

by Thomas Faber

I don't care about the reason. Tests that fail on Windows are broken, period. In this order the tests fail on Windows. On 2015-02-26 09:38, jimtabor(a)svn.reactos.org wrote: > Author: jimtabor > Date: Thu Feb 26 08:38:00 2015 > New Revision: 66464 > > URL: http://svn.reactos.org/svn/reactos?rev=66464&view=rev > Log: > [User32_WINETEST] > - Move test_SetFocus first as it is done originally. Refer to read past wine CVS logs for the reason. > > Modified: > trunk/rostests/winetests/user32/msg.c > > Modified: trunk/rostests/winetests/user32/msg.c > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… > ============================================================================== > --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) > +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Thu Feb 26 08:38:00 2015 > @@ -14717,8 +14717,8 @@ > START_TEST(msg_focus) > { > init_tests(); > + test_SetFocus(); > test_SetActiveWindow(); > - test_SetFocus(); > > /* HACK: For some reason test_SetForegroundWindow fails on Windows unless > * we do this */

9 years, 6 months

[ros-diffs] [gadamopoulos] 66454: [USER32_WINETEST] and [ros-diffs] [gadamopoulos] 66457: [USER32] - button.c: Use NtUserAlterWindowStyle

by James Tabor

Hi! The message testing, LOL just made more work for Amine... Okay AlterWindowStyle, could it be better to place it in WIN_SetStyle as a wrapper, maybe? WIN_SetStyle is just glue code for ReactOS. James

9 years, 6 months

[ros-diffs] [tkreuzer] 66444: [USER32_APITEST] Add some test for GetDCEx that highlight the ridiculous implementation of owned and class DCs.

by James Tabor

Author: tkreuzer Date: Tue Feb 24 23:15:08 2015 New Revision: 66444 [USER32_APITEST] Add some test for GetDCEx that highlight the ridiculous implementation of owned and class DCs. Hello All! What is ridiculous is the attitude of our smart A__ developers! James

9 years, 6 months

win32k C++ suggestion

by Timo Kreuzer

Hi I'd like to propose introducing C++ to win32k. Don't worry, this is not a suggestion to rewrite everything from scratch in C++, but to gradually introduce C++. The reason is not "That's what Windows does", but the fact that especially GDI would heavily benefit in terms of code simplicity, clarily and quality from using C++. A lot of the interfaces are already in a C++ object style way, but still code can bypass interfaces and directly modify structure members, even if it is not supposed to be done that way. Unless there are strong objections, I'd post a design / style / roadmap suggestion soon. If people feel strongly about it, we can defer this to after a 0.4.0 release. Regards, Timo

9 years, 7 months

Re: [ros-dev] [ros-diffs] [jgardou] 66334: [NTOSKRNL/MM] - MiIsEntireRangeCommitted: Ensure the PTE we are checking is really faulted in. - Prefer MiPteToPde and MiPdeToPte (which should really be called MiFirstPteInPde) in...

by Alex Ionescu

it might fix an assert but the patch is incorrect. will this also take 6 months to revert? Best regards, Alex Ionescu On Tue, Feb 17, 2015 at 6:19 AM, <jgardou(a)svn.reactos.org> wrote: > Author: jgardou > Date: Tue Feb 17 14:19:05 2015 > New Revision: 66334 > > URL: http://svn.reactos.org/svn/reactos?rev=66334&view=rev > Log: > [NTOSKRNL/MM] > - MiIsEntireRangeCommitted: Ensure the PTE we are checking is really > faulted in. > - Prefer MiPteToPde and MiPdeToPte (which should really be called > MiFirstPteInPde) instead of MiAddressToPte and MiPteToAddress > Fixes weird failed ASSERT in page fault handler when using DPH. > > Modified: > trunk/reactos/ntoskrnl/mm/ARM3/virtual.c > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… > > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Feb 17 > 14:19:05 2015 > @@ -1994,14 +1994,13 @@ > if (OnBoundary) > { > /* Is this PDE demand zero? */ > - PointerPde = MiAddressToPte(PointerPte); > + PointerPde = MiPteToPde(PointerPte); > if (PointerPde->u.Long != 0) > { > /* It isn't -- is it valid? */ > if (PointerPde->u.Hard.Valid == 0) > { > /* Nope, fault it in */ > - PointerPte = MiPteToAddress(PointerPde); > MiMakeSystemAddressValid(PointerPte, Process); > } > } > @@ -2009,13 +2008,13 @@ > { > /* The PTE was already valid, so move to the next one */ > PointerPde++; > - PointerPte = MiPteToAddress(PointerPde); > + PointerPte = MiPdeToPte(PointerPde); > > /* Is the entire VAD committed? If not, fail */ > if (!Vad->u.VadFlags.MemCommit) return FALSE; > > - /* Everything is committed so far past the range, return > true */ > - if (PointerPte > LastPte) return TRUE; > + /* New loop iteration with our new, on-boundary PTE. */ > + continue; > } > } > > > >

9 years, 7 months

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-dev