Ros-dev March 2012

ros-dev@reactos.org

23 participants
32 discussions

Re: [ros-dev] [ros-diffs] [rharabien] 56132: [COMCTL32] - When installing dll copy manifest to winsxs\manifests directory as comctl32 before sync did. Fixes Firefox 10 regression. See issue #6910 for more details.
by Timo Kreuzer 13 Mar '12

13 Mar '12

I would prefer if ros specific code would be seperated as much as possible to avoid huge diff files. The bigger the diff file, the more likely it will cause issues in the next sync. Am 12.03.2012 15:16, schrieb rharabien(a)svn.reactos.org: > Author: rharabien > Date: Mon Mar 12 14:16:58 2012 > New Revision: 56132 > > URL: http://svn.reactos.org/svn/reactos?rev=56132&view=rev > Log: > [COMCTL32] > - When installing dll copy manifest to winsxs\manifests directory as comctl32 before sync did. Fixes Firefox 10 regression. > See issue #6910 for more details. > > Modified: > trunk/reactos/dll/win32/comctl32/commctrl.c > > Modified: trunk/reactos/dll/win32/comctl32/commctrl.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… > ============================================================================== > --- trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] Mon Mar 12 14:16:58 2012 > @@ -71,6 +71,19 @@ > > WINE_DEFAULT_DEBUG_CHANNEL(commctrl); > > +#define NAME L"microsoft.windows.common-controls" > +#define VERSION L"6.0.2600.2982" > +#define PUBLIC_KEY L"6595b64144ccf1df" > + > +#ifdef __i386__ > +#define ARCH L"x86" > +#elif defined __x86_64__ > +#define ARCH L"amd64" > +#else > +#define ARCH L"none" > +#endif > + > +static const WCHAR manifest_filename[] = ARCH L"_" NAME L"_" PUBLIC_KEY L"_" VERSION L"_none_deadbeef.manifest"; > > static LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); > > @@ -91,6 +104,67 @@ > static const WCHAR strCC32SubclassInfo[] = { > 'C','C','3','2','S','u','b','c','l','a','s','s','I','n','f','o',0 > }; > + > +static BOOL create_manifest(BOOL install) > +{ > + WCHAR *pwszBuf; > + HRSRC hResInfo; > + HGLOBAL hResData; > + PVOID pManifest; > + DWORD cchBuf, cbManifest, cbWritten; > + HANDLE hFile; > + BOOL bRet = FALSE; > + > + hResInfo = FindResourceW(COMCTL32_hModule, L"WINE_MANIFEST", RT_MANIFEST); > + if (!hResInfo) > + return FALSE; > + > + cbManifest = SizeofResource(COMCTL32_hModule, hResInfo); > + if (!cbManifest) > + return FALSE; > + > + hResData = LoadResource(COMCTL32_hModule, hResInfo); > + if (!hResData) > + return FALSE; > + > + pManifest = LockResource(hResData); > + if (!pManifest) > + return FALSE; > + > + cchBuf = GetWindowsDirectoryW(NULL, 0) * sizeof(WCHAR) + sizeof(L"\\winsxs\\manifests\\") + sizeof(manifest_filename); > + pwszBuf = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, cchBuf * sizeof(WCHAR)); > + if (!pwszBuf) > + return FALSE; > + > + GetWindowsDirectoryW(pwszBuf, cchBuf); > + lstrcatW(pwszBuf, L"\\winsxs"); > + CreateDirectoryW(pwszBuf, NULL); > + lstrcatW(pwszBuf, L"\\manifests\\"); > + CreateDirectoryW(pwszBuf, NULL); > + lstrcatW(pwszBuf, manifest_filename); > + if (install) > + { > + hFile = CreateFileW(pwszBuf, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); > + if (hFile != INVALID_HANDLE_VALUE) > + { > + if (WriteFile(hFile, pManifest, cbManifest,&cbWritten, NULL)&& cbWritten == cbManifest) > + bRet = TRUE; > + > + CloseHandle(hFile); > + > + if (!bRet) > + DeleteFileW(pwszBuf); > + else > + TRACE("created %s\n", debugstr_w(pwszBuf)); > + } > + } > + else > + bRet = DeleteFileW(pwszBuf); > + > + HeapFree(GetProcessHeap(), 0, pwszBuf); > + > + return bRet; > +} > > > /*********************************************************************** > @@ -930,6 +1004,12 @@ > HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) > { > TRACE("(%u, %s): stub\n", bInstall, debugstr_w(cmdline)); > + if (!create_manifest(bInstall)) > + { > + ERR("create_manifest failed!\n"); > + return HRESULT_FROM_WIN32(GetLastError()); > + } > + > return S_OK; > } > > > >

3 2

Re: [ros-dev] [ros-diffs] [cgutman] 56113: [HIVESYS] - Merge back many old changes from i386 to AMD64
by Cameron Gutman 12 Mar '12

12 Mar '12

On Mar 11, 2012, at 7:13 AM, cgutman(a)svn.reactos.org wrote: > Author: cgutman > Date: Sun Mar 11 11:13:15 2012 > New Revision: 56113 > > URL: http://svn.reactos.org/svn/reactos?rev=56113&view=rev > Log: > [HIVESYS] > - Merge back many old changes from i386 to AMD64 The way we do hive INFs is very far from ideal right now. I propose to create a base INF that is used to construct each hive and turning the hivexxx_arch.inf into an additional section like livecd.inf is now. This way every architecture inherits a base configuration and turning on/off services or changing certain settings can be done in the arch-specific inf. This would eliminate having to do these merge backs and also prevent tons of breakages and lost time in the future from having to merge the same change 3+ times. Regards, Cameron

3 2

INI editor for Reactos
by Aleksey Bragin 11 Mar '12

11 Mar '12

FYI -------- Original Message -------- Hi there, Someone recommended that I point out my open-source INI editor for Reactos... Here it is: http://code.google.com/p/ini-settings-editor/ It opens INI files into a pretty tab-based view for editing. Let me know if you have any comments about it.

5 7

Re: [ros-dev] [ros-diffs] [akhaldi] 56104: [CMAKE] * Fix a typo.
by Jérôme Gardou 10 Mar '12

10 Mar '12

Le 10/03/2012 19:02, akhaldi(a)svn.reactos.org a écrit : > Author: akhaldi > Date: Sat Mar 10 18:02:40 2012 > New Revision: 56104 > > URL: http://svn.reactos.org/svn/reactos?rev=56104&view=rev > Log: > [CMAKE] > * Fix a typo. > > Modified: > trunk/reactos/cmake/msvc.cmake > > Modified: trunk/reactos/cmake/msvc.cmake > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=56104… > ============================================================================== > --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) > +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Mar 10 18:02:40 2012 > @@ -178,7 +178,7 @@ > > # add our library > # NOTE: as stub file and def file are generated in one pass, depending on one is like depending on the other > - _add_library(lib${_file} STATIC EXCLUDE_FROM_ALL > + add_library(lib${_file} STATIC EXCLUDE_FROM_ALL > ${CMAKE_CURRENT_BINARY_DIR}/lib${_file}_stubs.asm) > > # set correct "link rule" > > it wasn't a typo :-)

1 0

Re: [ros-dev] buildbot failure in ReactOS on Windows_AMD64_1 VBox-Test
by caemyr＠myopera.com 10 Mar '12

10 Mar '12

Added yet another check, this time for all builders, which will stop any run passed without revision number. On Sat, Mar 10, 2012, at 05:34 AM, buildbot(a)reactos.org wrote: > The Buildbot has finished a build on builder Windows_AMD64_1 VBox-Test > while building ReactOS. > Full details are available at: > http://build.reactos.org/builders/Windows_AMD64_1%20VBox-Test/builds/5238 > > Buildbot URL: http://build.reactos.org/ > > Buildslave for this Build: Windows_AMD64_2 > > Build Reason: Triggerable(Windows_AMD64_1 VBox-Test Trigger) > Build Source Stamp: 56097 > Blamelist: > > BUILD FAILED: failed Initial preparations > > sincerely, > -The Buildbot > -- With best regards Caemyr

1 0

Re: [ros-dev] buildbot exception in ReactOS on Windows_AMD64_1 VBox-Test
by caemyr＠myopera.com 10 Mar '12

10 Mar '12

Strange vbox lockup at the end of 2nd stage. Build restarted, went fine this time. On Sat, Mar 10, 2012, at 01:24 AM, buildbot(a)reactos.org wrote: > The Buildbot has finished a build on builder Windows_AMD64_1 VBox-Test > while building ReactOS. > Full details are available at: > http://build.reactos.org/builders/Windows_AMD64_1%20VBox-Test/builds/5236 > > Buildbot URL: http://build.reactos.org/ > > Buildslave for this Build: Windows_AMD64_2 > > Build Reason: Triggerable(Windows_AMD64_1 VBox-Test Trigger) > Build Source Stamp: 56096 > Blamelist: spetreolle > > BUILD FAILED: exception test > > sincerely, > -The Buildbot > -- With best regards Caemyr

1 0

Re: [ros-dev] [ros-diffs] [jgardou] 56082: [DAMN_IT] - addendum to r56081
by Jérôme Gardou 08 Mar '12

08 Mar '12

Hey! Can't we add tests to the regular tree, and disable them with a onig flag or something. This is getting retarded, and we must be the only project separating tests and runtime in their tree. Every tester should just build them (not speaking about developers...), and we include them in nightly builds. For me this separation is just pointless... regards. Jérôme Le 07/03/2012 22:46, jgardou(a)svn.reactos.org a écrit : > Author: jgardou > Date: Wed Mar 7 21:46:15 2012 > New Revision: 56082 > > URL: http://svn.reactos.org/svn/reactos?rev=56082&view=rev > Log: > [DAMN_IT] > - addendum to r56081 > > Modified: > trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt > trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt > trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt > trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt > > Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… > ============================================================================== > --- trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt [iso-8859-1] Wed Mar 7 21:46:15 2012 > @@ -1,5 +1,5 @@ > > -spec2def(w32kdll_2k3sp2.dll w32kdll_2k3sp2.spec) > +spec2def(w32kdll_2k3sp2.dll w32kdll_2k3sp2.spec ADD_IMPORTLIB) > > add_library(w32kdll_2k3sp2 SHARED > main.c > @@ -9,4 +9,3 @@ > set_entrypoint(w32kdll_2k3sp2 0) > > add_dependencies(w32kdll_2k3sp2 psdk ) > -add_importlib_target(w32kdll_2k3sp2.spec w32kdll_2k3sp2.dll) > > Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… > ============================================================================== > --- trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt [iso-8859-1] Wed Mar 7 21:46:15 2012 > @@ -1,5 +1,5 @@ > > -spec2def(w32kdll_ros.dll w32kdll_ros.spec) > +spec2def(w32kdll_ros.dll w32kdll_ros.spec ADD_IMPORTLIB) > > add_library(w32kdll_ros SHARED > main.c > @@ -10,4 +10,3 @@ > target_link_libraries(w32kdll_ros win32ksys) > > add_dependencies(w32kdll_ros psdk) > -add_importlib_target(w32kdll_ros.spec w32kdll_ros.dll) > > Modified: trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… > ============================================================================== > --- trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt [iso-8859-1] Wed Mar 7 21:46:15 2012 > @@ -1,5 +1,5 @@ > > -spec2def(w32kdll_dll.spec w32kdll_vista.spec) > +spec2def(w32kdll_vista.spec w32kdll_vista.spec ADD_IMPORTLIB) > > add_library(w32kdll_vista SHARED > main.c > @@ -8,4 +8,3 @@ > set_entrypoint(w32kdll_vista 0) > > add_dependencies(w32kdll_vista psdk ) > -add_importlib_target(w32kdll_vista.spec w32kdll_dll.spec) > > Modified: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… > ============================================================================== > --- trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt [iso-8859-1] Wed Mar 7 21:46:15 2012 > @@ -1,4 +1,4 @@ > -spec2def(w32kdll_xpsp2.dll w32kdll_xpsp2.spec) > +spec2def(w32kdll_xpsp2.dll w32kdll_xpsp2.spec ADD_IMPORTLIB) > > add_library(w32kdll_xpsp2 SHARED > main.c > @@ -6,5 +6,4 @@ > ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_xpsp2.def) > set_entrypoint(w32kdll_xpsp2 0) > > -add_dependencies(w32kdll_xpsp2 psdk ) > -add_importlib_target(w32kdll_xpsp2.spec w32kdll_xpsp2.dll) > +add_dependencies(w32kdll_xpsp2 psdk) > >

10 18

Re: [ros-dev] [ros-diffs] [jgardou] 56083: Branch for C++. Amine will be proud.
by Aleksey Bragin 08 Mar '12

08 Mar '12

On 08.03.2012 2:27, jgardou(a)svn.reactos.org wrote: > Author: jgardou > Date: Wed Mar 7 22:27:48 2012 > New Revision: 56083 > > URL: http://svn.reactos.org/svn/reactos?rev=56083&view=rev > Log: > Branch for C++. > Amine will be proud. > Me too ;)

3 2

Re: [ros-dev] [ros-diffs] [pschweitzer] 56077: [DDK] Fix release build?
by Timo Kreuzer 08 Mar '12

08 Mar '12

This belongs into ntdef.h Am 07.03.2012 20:46, schrieb pschweitzer(a)svn.reactos.org: > Author: pschweitzer > Date: Wed Mar 7 19:46:16 2012 > New Revision: 56077 > > URL: http://svn.reactos.org/svn/reactos?rev=56077&view=rev > Log: > [DDK] > Fix release build? > > Modified: > trunk/reactos/include/ddk/wdm.h > > Modified: trunk/reactos/include/ddk/wdm.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5607… > ============================================================================== > --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) > +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Wed Mar 7 19:46:16 2012 > @@ -128,6 +128,16 @@ > #define ALLOC_DATA_PRAGMA 1 > #endif > > +/* Add NOP_FUNCTION support */ > +#ifndef NOP_FUNCTION&& (_MSC_VER>= 1210) > +#define NOP_FUNCTION __noop > +#else > +#define NOP_FUNCTION (void)0 > +#endif > +#else > +#ifndef NOP_FUNCTION > +#define NOP_FUNCTION (void)0 > +#endif > #endif > > #if defined(_WIN64) > > >

1 0

Re: [ros-dev] buildbot failure in ReactOS on Windows_AMD64_1 VBox-Test
by caemyr＠myopera.com 07 Mar '12

07 Mar '12

One last bug squashed (hopefully) - now testbot should detect missing ISO and break up runtime at prepare stage. On Wed, Mar 7, 2012, at 11:30 AM, buildbot(a)reactos.org wrote: > The Buildbot has finished a build on builder Windows_AMD64_1 VBox-Test > while building ReactOS. > Full details are available at: > http://build.reactos.org/builders/Windows_AMD64_1%20VBox-Test/builds/5220 > > Buildbot URL: http://build.reactos.org/ > > Buildslave for this Build: Windows_AMD64_2 > > Build Reason: The web-page 'rebuild' button was pressed by 'osiejka': > > Build Source Stamp: 56072 > Blamelist: > > BUILD FAILED: failed Initial preparations > > sincerely, > -The Buildbot > -- With best regards Caemyr

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev March 2012