Ros-dev May 2011

ros-dev@reactos.org

27 participants
31 discussions

Re: [ros-dev] [ros-diffs] [osiejka] 51874: [RPCSS] Addenum. This change slipped past in commit 51873. Fix name of irot header include, which should be irot.h and not irot_s.h. Fixes rpcss build in MSVC.

by Ged Murphy

That was very confusing :) -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of osiejka(a)svn.reactos.org Sent: 23 May 2011 22:49 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [osiejka] 51874: [RPCSS] Addenum. This change slipped past in commit 51873. Fix name of irot header include, which should be irot.h and not irot_s.h. Fixes rpcss build in MSVC. Author: osiejka Date: Mon May 23 21:49:12 2011 New Revision: 51874 URL: http://svn.reactos.org/svn/reactos?rev=51874&view=rev Log: [RPCSS] Addenum. This change slipped past in commit 51873. Fix name of irot header include, which should be irot.h and not irot_s.h. Fixes rpcss build in MSVC. Modified: trunk/reactos/base/services/rpcss/irotp.c Modified: trunk/reactos/base/services/rpcss/irotp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/irotp.… ============================================================================== --- trunk/reactos/base/services/rpcss/irotp.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/irotp.c [iso-8859-1] Mon May 23 21:49:12 2011 @@ -1,5 +1,5 @@ /* - * Running Object Table + * Running Object Table * * Copyright 2007 Robert Shearman *

13 years, 8 months

Missing header in rpcss

by Olaf Siejka

It was spotted by MSVC build: P:\Trunk_slave\MSVC-trunk\build\base\services\rpcss\irotp.c(28) : fatal error C1083: Cannot open include file: 'irot_s.h': No such file or directory LINK : fatal error LNK1104: cannot open file 'CMakeFiles/rpcss.dir/irotp.c.obj' In base\services\rpcss\irotp.c:28 we see: #include "irot_s.h" This file is not present in ReactOS trunk. In WINE's RPCSS http://source.winehq.org/git/wine.git/blob/HEAD:/programs/rpcss/irotp.c :28 we have: #include "irot.h" which is also missing, and listed in .gitignore: http://source.winehq.org/git/wine.git/blob?f=.gitignore 260 programs/rpcss/irot.h 261 programs/rpcss/irot_s.c I think we can safely clean it up, perhaps adding proper line to ros-diff, but i would like to ask you guys for confirmation. Regards

13 years, 8 months

Re: [ros-dev] [ros-diffs] [jimtabor] 51835: [Win32k|User32] - Move creation of the scrollbar Gray brush from user32 to win32k. - Noticed a color and pattern (patchy white pattern) difference when using GreCreateBitmap and i...

by Timo Kreuzer

Hi, I suspect its an alignment issue, since GreCreateBitmap requires 32bit alignment, while CreateBitmap uses 16 bit alignment. So changing + static const WORD wPattern55AA[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa }; to + static const DWORD wPattern55AA[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa }; Should do the trick. Am 21.05.2011 08:34, schrieb jimtabor(a)svn.reactos.org: > Author: jimtabor > Date: Sat May 21 06:34:02 2011 > New Revision: 51835 > > URL: http://svn.reactos.org/svn/reactos?rev=51835&view=rev > Log: > [Win32k|User32] > - Move creation of the scrollbar Gray brush from user32 to win32k. > - Noticed a color and pattern (patchy white pattern) difference when using GreCreateBitmap and it did not work the same as the main function. Correcting this fixed the Gray brush. Someone from YAROTOWS needs to look into this. > > Modified: > trunk/reactos/dll/win32/user32/windows/defwnd.c > trunk/reactos/subsystems/win32/win32k/include/brush.h > trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c > trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c > trunk/reactos/subsystems/win32/win32k/objects/brush.c > > Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… > ============================================================================== > --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat May 21 06:34:02 2011 > @@ -927,8 +927,8 @@ > HBRUSH > DefWndControlColor(HDC hDC, UINT ctlType) > { > - if (CTLCOLOR_SCROLLBAR == ctlType) > - { > + if (ctlType == CTLCOLOR_SCROLLBAR) > + { > HBRUSH hb = GetSysColorBrush(COLOR_SCROLLBAR); > COLORREF bk = GetSysColor(COLOR_3DHILIGHT); > SetTextColor(hDC, GetSysColor(COLOR_3DFACE)); > @@ -938,37 +938,24 @@ > * we better use 0x55aa bitmap brush to make scrollbar's background > * look different from the window background. > */ > - if (bk == GetSysColor(COLOR_WINDOW)) > - { > - static const WORD wPattern55AA[] = > - { > - 0x5555, 0xaaaa, 0x5555, 0xaaaa, > - 0x5555, 0xaaaa, 0x5555, 0xaaaa > - }; > - static HBITMAP hPattern55AABitmap = NULL; > - static HBRUSH hPattern55AABrush = NULL; > - if (hPattern55AABrush == NULL) > - { > - hPattern55AABitmap = CreateBitmap(8, 8, 1, 1, wPattern55AA); > - hPattern55AABrush = CreatePatternBrush(hPattern55AABitmap); > - } > - return hPattern55AABrush; > - } > - UnrealizeObject(hb); > + if ( bk == GetSysColor(COLOR_WINDOW)) > + return gpsi->hbrGray; > + > + UnrealizeObject( hb ); > return hb; > - } > + } > > SetTextColor(hDC, GetSysColor(COLOR_WINDOWTEXT)); > > - if ((CTLCOLOR_EDIT == ctlType) || (CTLCOLOR_LISTBOX == ctlType)) > - { > + if ((ctlType == CTLCOLOR_EDIT) || (ctlType == CTLCOLOR_LISTBOX)) > + { > SetBkColor(hDC, GetSysColor(COLOR_WINDOW)); > - } > + } > else > - { > + { > SetBkColor(hDC, GetSysColor(COLOR_3DFACE)); > return GetSysColorBrush(COLOR_3DFACE); > - } > + } > > return GetSysColorBrush(COLOR_WINDOW); > } > > Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] (original) > +++ trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] Sat May 21 06:34:02 2011 > @@ -129,3 +129,5 @@ > VOID FASTCALL FreeObjectAttr(PVOID); > > BOOL FASTCALL IntGdiSetBrushOwner(PBRUSH,DWORD); > +BOOL FASTCALL GreSetBrushOwner(HBRUSH,DWORD); > + > > Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) > +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Sat May 21 06:34:02 2011 > @@ -92,6 +92,8 @@ > HANDLE hPowerRequestEvent, > HANDLE hMediaRequestEvent) > { > + static const WORD wPattern55AA[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa }; > + HBITMAP hPattern55AABitmap = NULL; > NTSTATUS Status; > > // Set W32PF_Flags |= (W32PF_READSCREENACCESSGRANTED | W32PF_IOWINSTA) > @@ -125,6 +127,14 @@ > > CsrInit(); > > + if (gpsi->hbrGray == NULL) > + { > + hPattern55AABitmap = GreCreateBitmap(8, 8, 1, 1, (LPBYTE)wPattern55AA); > + gpsi->hbrGray = IntGdiCreatePatternBrush(hPattern55AABitmap); > + GreDeleteObject(hPattern55AABitmap); > + GreSetBrushOwner(gpsi->hbrGray, GDI_OBJ_HMGR_PUBLIC); > + } > + > return STATUS_SUCCESS; > } > > > Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) > +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sat May 21 06:34:02 2011 > @@ -154,15 +154,23 @@ > IN UINT cBitsPixel, > IN OPTIONAL PVOID pvBits) > { > + HBITMAP hbmp; > /* Call the extended function */ > - return GreCreateBitmapEx(nWidth, > + hbmp = GreCreateBitmapEx(nWidth, > nHeight, > 0, /* auto width */ > BitmapFormat(cBitsPixel * cPlanes, BI_RGB), > 0, /* no bitmap flags */ > 0, /* auto size */ > - pvBits, > - DDB_SURFACE /* DDB */); > + NULL, > + DDB_SURFACE /* DDB */); > + if (pvBits&& hbmp) > + { > + PSURFACE psurf = SURFACE_ShareLockSurface(hbmp); > + UnsafeSetBitmapBits(psurf, 0, pvBits); > + SURFACE_ShareUnlockSurface(psurf); > + } > + return hbmp; > } > > HBITMAP > > Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) > +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Sat May 21 06:34:02 2011 > @@ -59,6 +59,19 @@ > GDIOBJ_vSetObjectOwner(&pbr->BaseObject, ulOwner); > > return TRUE; > +} > + > +BOOL > +FASTCALL > +GreSetBrushOwner(HBRUSH hBrush, ULONG ulOwner) > +{ > + BOOL Ret; > + PBRUSH pbrush; > + > + pbrush = BRUSH_ShareLockBrush(hBrush); > + Ret = IntGdiSetBrushOwner(pbrush, ulOwner); > + BRUSH_ShareUnlockBrush(pbrush); > + return Ret; > } > > BOOL > > >

13 years, 8 months

unsubscribe

by He Junyan

13 years, 8 months

shell32 vs. shell32_new

by Gregor Schneider

Hi ros-dev, I've seen shell32_new being added into trunk by r51768, but haven't heard of anything else about it. From what I can see it changes shell32 from C to C++, which looks like a good move. Problematic seems to me that it is completely out of sync with trunk's shell32 (judging from the translations alone). It might also be annoying for merging future patches, since the C to C++ move changes the code substantially. So are there any plans concering shell32_new? Do I have to merge all code changes in C and C++ or is shell32(_old) going to be dumped anytime soon? Best regards, Gregor

13 years, 8 months

Re: [ros-dev] [ros-diffs] [ekohl] 51813: [MSPORTS] - Implement a simple class installer that assigns the friendly name "Serial Port (COMx)" to all serial ports. - Enable the class installer in ports.inf. - Add parallel port...

by Alex Ionescu

The source code for msports is already available in the DDK. -- Best regards, Alex Ionescu On 2011-05-17, at 3:24 PM, ekohl(a)svn.reactos.org wrote: > Author: ekohl > Date: Tue May 17 19:24:19 2011 > New Revision: 51813 > > URL: http://svn.reactos.org/svn/reactos?rev=51813&view=rev > Log: > [MSPORTS] > - Implement a simple class installer that assigns the friendly name "Serial Port (COMx)" to all serial ports. > - Enable the class installer in ports.inf. > - Add parallel port installer configuration to ports.inf (disabled). > > Added: > trunk/reactos/dll/win32/msports/ (with props) > trunk/reactos/dll/win32/msports/CMakeLists.txt (with props) > trunk/reactos/dll/win32/msports/classinst.c (with props) > trunk/reactos/dll/win32/msports/msports.c (with props) > trunk/reactos/dll/win32/msports/msports.rbuild (with props) > trunk/reactos/dll/win32/msports/msports.rc (with props) > trunk/reactos/dll/win32/msports/msports.spec (with props) > Modified: > trunk/reactos/baseaddress.cmake > trunk/reactos/baseaddress.rbuild > trunk/reactos/boot/bootdata/packages/reactos.dff > trunk/reactos/dll/win32/CMakeLists.txt > trunk/reactos/dll/win32/win32.rbuild > trunk/reactos/media/inf/ports.inf > > Modified: trunk/reactos/baseaddress.cmake > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.cmake?rev=5181… > ============================================================================== > --- trunk/reactos/baseaddress.cmake [iso-8859-1] (original) > +++ trunk/reactos/baseaddress.cmake [iso-8859-1] Tue May 17 19:24:19 2011 > @@ -49,6 +49,7 @@ > set(baseaddress_netid 0x5f660000) > set(baseaddress_ntprint 0x5f6a0000) > set(baseaddress_mssip32 0x60430000) > +set(baseaddress_msports 0x60450000) > set(baseaddress_msisip 0x60b10000) > set(baseaddress_inseng 0x61000000) > set(baseaddress_qedit 0x611c0000) > > Modified: trunk/reactos/baseaddress.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=518… > ============================================================================== > --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) > +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Tue May 17 19:24:19 2011 > @@ -52,6 +52,7 @@ > <property name="BASEADDRESS_NETID" value="0x5f660000" /> > <property name="BASEADDRESS_NTPRINT" value="0x5f6a0000" /> > <property name="BASEADDRESS_MSSIP32" value="0x60430000" /> > + <property name="BASEADDRESS_MSPORTS" value="0x60450000" /> > <property name="BASEADDRESS_MSISIP" value="0x60b10000" /> > <property name="BASEADDRESS_INSENG" value="0x61000000" /> > <property name="BASEADDRESS_QEDIT" value="0x611c0000" /> > > Modified: trunk/reactos/boot/bootdata/packages/reactos.dff > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… > ============================================================================== > --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) > +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue May 17 19:24:19 2011 > @@ -357,6 +357,7 @@ > dll\win32\msisip\msisip.dll 1 > dll\win32\msisys.ocx\msisys.ocx 1 > dll\win32\msnet32\msnet32.dll 1 > +dll\win32\msports\msports.dll 1 > dll\win32\msrle32\msrle32.dll 1 > dll\win32\mssign32\mssign32.dll 1 > dll\win32\mssip32\mssip32.dll 1 > > Modified: trunk/reactos/dll/win32/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… > ============================================================================== > --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Tue May 17 19:24:19 2011 > @@ -99,6 +99,7 @@ > add_subdirectory(msisip) > add_subdirectory(msisys.ocx) > #add_subdirectory(msnet32) #to be deleted in trunk. > +add_subdirectory(msports) > add_subdirectory(msrle32) > add_subdirectory(mssign32) > add_subdirectory(mssip32) > > Propchange: trunk/reactos/dll/win32/msports/ > ------------------------------------------------------------------------------ > --- bugtraq:logregex (added) > +++ bugtraq:logregex Tue May 17 19:24:19 2011 > @@ -1,0 +1,2 @@ > +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? > +(\d+) > > Propchange: trunk/reactos/dll/win32/msports/ > ------------------------------------------------------------------------------ > bugtraq:message = See issue #%BUGID% for more details. > > Propchange: trunk/reactos/dll/win32/msports/ > ------------------------------------------------------------------------------ > bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% > > Propchange: trunk/reactos/dll/win32/msports/ > ------------------------------------------------------------------------------ > tsvn:logminsize = 10 > > Added: trunk/reactos/dll/win32/msports/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/CMakeLis… > ============================================================================== > --- trunk/reactos/dll/win32/msports/CMakeLists.txt (added) > +++ trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] Tue May 17 19:24:19 2011 > @@ -1,0 +1,24 @@ > + > +set_unicode() > + > +spec2def(msports.dll msports.spec) > + > +list(APPEND SOURCE > + classinst.c > + msports.c > + parallel.c > + serial.c > + msports.rc > + ${CMAKE_CURRENT_BINARY_DIR}/msports_stubs.c > + ${CMAKE_CURRENT_BINARY_DIR}/msports.def) > + > +add_library(msports SHARED ${SOURCE}) > + > +set_module_type(msports win32dll) > + > +target_link_libraries(msports wine) > + > +add_importlibs(msports comctl32 setupapi advapi32 user32 kernel32 ntdll) > + > +add_cd_file(TARGET msports DESTINATION reactos/system32 FOR all) > +add_importlib_target(msports.spec) > > Propchange: trunk/reactos/dll/win32/msports/CMakeLists.txt > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: trunk/reactos/dll/win32/msports/CMakeLists.txt > ------------------------------------------------------------------------------ > svn:keywords = author date id revision > > Added: trunk/reactos/dll/win32/msports/classinst.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/classins… > ============================================================================== > --- trunk/reactos/dll/win32/msports/classinst.c (added) > +++ trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] Tue May 17 19:24:19 2011 > @@ -1,0 +1,250 @@ > +/* > + * PROJECT: ReactOS system libraries > + * LICENSE: GPL - See COPYING in the top level directory > + * FILE: dlls\win32\msports\classinst.c > + * PURPOSE: Ports class installer > + * PROGRAMMERS: Copyright 2011 Eric Kohl > + */ > + > +#include <windows.h> > +#include <setupapi.h> > +#include <wine/debug.h> > + > +WINE_DEFAULT_DEBUG_CHANNEL(msports); > + > + > +typedef enum _PORT_TYPE > +{ > + UnknownPort, > + ParallelPort, > + SerialPort > +} PORT_TYPE; > + > + > +static DWORD > +InstallSerialPort(IN HDEVINFO DeviceInfoSet, > + IN PSP_DEVINFO_DATA DeviceInfoData) > +{ > + LPWSTR pszFriendlyName = L"Serial Port (COMx)"; > + > + TRACE("InstallSerialPort(%p, %p)\n", > + DeviceInfoSet, DeviceInfoData); > + > + /* Install the device */ > + if (!SetupDiInstallDevice(DeviceInfoSet, > + DeviceInfoData)) > + { > + return GetLastError(); > + } > + > + /* Set the friendly name for the device */ > + SetupDiSetDeviceRegistryPropertyW(DeviceInfoSet, > + DeviceInfoData, > + SPDRP_FRIENDLYNAME, > + (LPBYTE)pszFriendlyName, > + (wcslen(pszFriendlyName) + 1) * sizeof(WCHAR)); > + > + return ERROR_SUCCESS; > +} > + > + > +static DWORD > +InstallParallelPort(IN HDEVINFO DeviceInfoSet, > + IN PSP_DEVINFO_DATA DeviceInfoData) > +{ > + FIXME("InstallParallelPort(%p, %p)\n", > + DeviceInfoSet, DeviceInfoData); > + return ERROR_DI_DO_DEFAULT; > +} > + > + > +VOID > +InstallDeviceData(IN HDEVINFO DeviceInfoSet, > + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) > +{ > + HKEY hKey = NULL; > + HINF hInf = INVALID_HANDLE_VALUE; > + SP_DRVINFO_DATA DriverInfoData; > + PSP_DRVINFO_DETAIL_DATA DriverInfoDetailData; > + WCHAR InfSectionWithExt[256]; > + BYTE buffer[2048]; > + DWORD dwRequired; > + > + TRACE("InstallDeviceData()\n"); > + > + hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, > + DeviceInfoData, > + DICS_FLAG_GLOBAL, > + 0, > + DIREG_DRV, > + NULL, > + NULL); > + if (hKey == NULL) > + goto done; > + > + DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA); > + if (!SetupDiGetSelectedDriverW(DeviceInfoSet, > + DeviceInfoData, > + &DriverInfoData)) > + { > + goto done; > + } > + > + DriverInfoDetailData = (PSP_DRVINFO_DETAIL_DATA)buffer; > + DriverInfoDetailData->cbSize = sizeof(SP_DRVINFO_DETAIL_DATA); > + if (!SetupDiGetDriverInfoDetailW(DeviceInfoSet, > + DeviceInfoData, > + &DriverInfoData, > + DriverInfoDetailData, > + 2048, > + &dwRequired)) > + { > + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) > + goto done; > + } > + > + TRACE("Inf file name: %S\n", DriverInfoDetailData->InfFileName); > + > + hInf = SetupOpenInfFileW(DriverInfoDetailData->InfFileName, > + NULL, > + INF_STYLE_WIN4, > + NULL); > + if (hInf == INVALID_HANDLE_VALUE) > + goto done; > + > + TRACE("Section name: %S\n", DriverInfoDetailData->SectionName); > + > + SetupDiGetActualSectionToInstallW(hInf, > + DriverInfoDetailData->SectionName, > + InfSectionWithExt, > + 256, > + NULL, > + NULL); > + > + TRACE("InfSectionWithExt: %S\n", InfSectionWithExt); > + > + SetupInstallFromInfSectionW(NULL, > + hInf, > + InfSectionWithExt, > + SPINST_REGISTRY, > + hKey, > + NULL, > + 0, > + NULL, > + NULL, > + NULL, > + NULL); > + > + TRACE("Done\n"); > + > +done:; > + if (hKey != NULL) > + RegCloseKey(hKey); > + > + if (hInf != INVALID_HANDLE_VALUE) > + SetupCloseInfFile(hInf); > +} > + > + > + > +PORT_TYPE > +GetPortType(IN HDEVINFO DeviceInfoSet, > + IN PSP_DEVINFO_DATA DeviceInfoData) > +{ > + HKEY hKey = NULL; > + DWORD dwSize; > + DWORD dwType = 0; > + BYTE bData = 0; > + PORT_TYPE PortType = UnknownPort; > + LONG lError; > + > + TRACE("GetPortType()\n"); > + > + hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, > + DeviceInfoData, > + DICS_FLAG_GLOBAL, > + 0, > + DIREG_DRV, > + NULL, > + NULL); > + if (hKey == NULL) > + { > + goto done; > + } > + > + dwSize = sizeof(BYTE); > + lError = RegQueryValueExW(hKey, > + L"PortSubClass", > + NULL, > + &dwType, > + &bData, > + &dwSize); > + > + TRACE("lError: %ld\n", lError); > + TRACE("dwSize: %lu\n", dwSize); > + TRACE("dwType: %lu\n", dwType); > + > + if (lError == ERROR_SUCCESS && > + dwSize == sizeof(BYTE) && > + dwType == REG_BINARY) > + { > + if (bData == 0) > + PortType = ParallelPort; > + else > + PortType = SerialPort; > + } > + > +done:; > + if (hKey != NULL) > + RegCloseKey(hKey); > + > + TRACE("GetPortType() returns %u \n", PortType); > + > + return PortType; > +} > + > + > +static DWORD > +InstallPort(IN HDEVINFO DeviceInfoSet, > + IN PSP_DEVINFO_DATA DeviceInfoData) > +{ > + PORT_TYPE PortType; > + > + InstallDeviceData(DeviceInfoSet, DeviceInfoData); > + > + PortType = GetPortType(DeviceInfoSet, DeviceInfoData); > + switch (PortType) > + { > + case ParallelPort: > + return InstallParallelPort(DeviceInfoSet, DeviceInfoData); > + > + case SerialPort: > + return InstallSerialPort(DeviceInfoSet, DeviceInfoData); > + > + default: > + return ERROR_DI_DO_DEFAULT; > + } > +} > + > + > +DWORD > +WINAPI > +PortsClassInstaller(IN DI_FUNCTION InstallFunction, > + IN HDEVINFO DeviceInfoSet, > + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) > +{ > + TRACE("PortsClassInstaller(%lu, %p, %p)\n", > + InstallFunction, DeviceInfoSet, DeviceInfoData); > + > + switch (InstallFunction) > + { > + case DIF_INSTALLDEVICE: > + return InstallPort(DeviceInfoSet, DeviceInfoData); > + > + default: > + TRACE("Install function %u ignored\n", InstallFunction); > + return ERROR_DI_DO_DEFAULT; > + } > +} > + > +/* EOF */ > > Propchange: trunk/reactos/dll/win32/msports/classinst.c > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: trunk/reactos/dll/win32/msports/classinst.c > ------------------------------------------------------------------------------ > svn:keywords = author date id revision > > Added: trunk/reactos/dll/win32/msports/msports.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… > ============================================================================== > --- trunk/reactos/dll/win32/msports/msports.c (added) > +++ trunk/reactos/dll/win32/msports/msports.c [iso-8859-1] Tue May 17 19:24:19 2011 > @@ -1,0 +1,33 @@ > +/* > + * PROJECT: Ports installer library > + * LICENSE: GPL - See COPYING in the top level directory > + * FILE: dll/win32/msports/msports.c > + * PURPOSE: Library main function > + * COPYRIGHT: Copyright 2011 Eric Kohl > + */ > + > +#include <windows.h> > +#include <wine/debug.h> > + > + > +WINE_DEFAULT_DEBUG_CHANNEL(msports); > + > + > +BOOL > +WINAPI > +DllMain(HINSTANCE hinstDll, > + DWORD dwReason, > + LPVOID reserved) > +{ > + switch (dwReason) > + { > + case DLL_PROCESS_ATTACH: > + TRACE("DLL_PROCESS_ATTACH\n"); > + DisableThreadLibraryCalls(hinstDll); > + break; > + } > + > + return TRUE; > +} > + > +/* EOF */ > > Propchange: trunk/reactos/dll/win32/msports/msports.c > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: trunk/reactos/dll/win32/msports/msports.c > ------------------------------------------------------------------------------ > svn:keywords = author date id revision > > Added: trunk/reactos/dll/win32/msports/msports.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… > ============================================================================== > --- trunk/reactos/dll/win32/msports/msports.rbuild (added) > +++ trunk/reactos/dll/win32/msports/msports.rbuild [iso-8859-1] Tue May 17 19:24:19 2011 > @@ -1,0 +1,11 @@ > +<module name="msports" type="win32dll" baseaddress="${BASEADDRESS_MSPORTS}" installbase="system32" installname="msports.dll" unicode="yes"> > + <include base="msports">.</include> > + <importlibrary definition="msports.spec" /> > + <library>wine</library> > + <library>kernel32</library> > + <library>advapi32</library> > + <library>setupapi</library> > + <file>classinst.c</file> > + <file>msports.c</file> > + <file>msports.rc</file> > +</module> > > Propchange: trunk/reactos/dll/win32/msports/msports.rbuild > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: trunk/reactos/dll/win32/msports/msports.rbuild > ------------------------------------------------------------------------------ > svn:keywords = author date id revision > > Added: trunk/reactos/dll/win32/msports/msports.rc > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… > ============================================================================== > --- trunk/reactos/dll/win32/msports/msports.rc (added) > +++ trunk/reactos/dll/win32/msports/msports.rc [iso-8859-1] Tue May 17 19:24:19 2011 > @@ -1,0 +1,7 @@ > +#include <windows.h> > + > +#define REACTOS_VERSION_DLL > +#define REACTOS_STR_FILE_DESCRIPTION "Ports Class Installer\0" > +#define REACTOS_STR_INTERNAL_NAME "msports\0" > +#define REACTOS_STR_ORIGINAL_FILENAME "msports.dll\0" > +#include <reactos/version.rc> > > Propchange: trunk/reactos/dll/win32/msports/msports.rc > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: trunk/reactos/dll/win32/msports/msports.rc > ------------------------------------------------------------------------------ > svn:keywords = author date id revision > > Added: trunk/reactos/dll/win32/msports/msports.spec > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… > ============================================================================== > --- trunk/reactos/dll/win32/msports/msports.spec (added) > +++ trunk/reactos/dll/win32/msports/msports.spec [iso-8859-1] Tue May 17 19:24:19 2011 > @@ -1,0 +1,12 @@ > +@ stub ComDBClaimNextFreePort > +@ stub ComDBClaimPort > +@ stub ComDBClose > +@ stub ComDBGetCurrentPortUsage > +@ stub ComDBOpen > +@ stub ComDBReleasePort > +@ stub ComDBResizeDatabase > +@ stdcall LibMain(ptr long ptr) DllMain > +@ stub ParallelPortPropPageProvider > +@ stdcall PortsClassInstaller(long ptr ptr) > +@ stub SerialDisplayAdvancedSettings > +@ stub SerialPortPropPageProvider > > Propchange: trunk/reactos/dll/win32/msports/msports.spec > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: trunk/reactos/dll/win32/msports/msports.spec > ------------------------------------------------------------------------------ > svn:keywords = author date id revision > > Modified: trunk/reactos/dll/win32/win32.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… > ============================================================================== > --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Tue May 17 19:24:19 2011 > @@ -295,6 +295,9 @@ > <directory name="msnet32"> > <xi:include href="msnet32/msnet32.rbuild" /> > </directory> > +<directory name="msports"> > + <xi:include href="msports/msports.rbuild" /> > +</directory> > <directory name="msrle32"> > <xi:include href="msrle32/msrle32.rbuild" /> > </directory> > > Modified: trunk/reactos/media/inf/ports.inf > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=51… > ============================================================================== > Binary files - no diff available. > >

13 years, 8 months

msports commit (51813) - CMakeLists.txt references nonexistent files

by Adam

When I was trying to build trunk (using Cmake) the configure.cmd did not complete. Host tools were OK but reactos directory was not. I tracked the issue to /dll/win32/msports/CMakeLists.txt which contained references to two nonexistent files (serial.c and parallel.c) and commenting them out allowed the build to continue (albeit with an error at the very end) there.

13 years, 8 months

Re: [ros-dev] [ros-diffs] [tkreuzer] 51748: [NTOSKRNL] Patch by Paolo Bonzini <bonzini [at] gnu [dot] org> Fix implementation of ExInterlockedAddLargeStatistic The old version wasn't really atomic. See issue #6223 for more ...

by Alex Ionescu

Congrats on once again breaking another key part of Windows compatibility. This function is DOCUMENTED to tear. It was DESIGNED that way on purpose. Utter failure, once more. Best regards, Alex Ionescu On Sat, May 14, 2011 at 12:29 PM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Sat May 14 19:29:42 2011 > New Revision: 51748 > > URL: http://svn.reactos.org/svn/reactos?rev=51748&view=rev > Log: > [NTOSKRNL] > Patch by Paolo Bonzini <bonzini [at] gnu [dot] org> > Fix implementation of ExInterlockedAddLargeStatistic > The old version wasn't really atomic. > > See issue #6223 for more details. > > Modified: > trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S > > Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/fastinter… > > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S [iso-8859-1] > (original) > +++ trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S [iso-8859-1] Sat May > 14 19:29:42 2011 > @@ -4,8 +4,9 @@ > * FILE: ntoskrnl/ex/i386/fastinterlck_asm.S > * PURPOSE: FASTCALL Interlocked Functions > * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) > - */ > - > + * Paolo Bonzini <bonzini [at] gnu [dot] org> > + */ > + > /* INCLUDES > ******************************************************************/ > > #include <asm.inc> > @@ -31,25 +32,55 @@ > */ > PUBLIC @ExInterlockedAddLargeStatistic@8 > @ExInterlockedAddLargeStatistic@8: > - > -#ifdef CONFIG_SMP > - /* Do the addition */ > - lock add [ecx], edx > - > - /* Check for carry bit and return */ > - jb .l1 > - ret > - > -.l1: > - /* Add carry */ > - lock adc dword ptr [ecx+4], 0 > -#else > - /* Do the addition and add the carry */ > - add dword ptr [ecx], edx > - adc dword ptr [ecx+4], 0 > -#endif > - /* Return */ > - ret > + push ebp > + push ebx > + mov ebp, ecx > + > +Again: > + /* Load comparand in eax for cmpxchg */ > + mov eax, [ebp] > + > + /* Compute low word of the result in ebx */ > + mov ebx, edx > + add ebx, eax > + > + /* Carry needs cmpxchg8b */ > + jc Slow > + > + /* Fast path still needs to be atomic, so use cmpxchg and retry if it > fails > + * Hopefully it will still get through this path :) */ > + LOCK cmpxchg [ecx], ebx > + jnz Again > + > + /* Thats it */ > + pop ebx > + pop ebp > + ret > + > +Slow: > + /* Save increment across cmpxchg8b */ > + push edx > + > + /* Finish loading comparand in edx:eax */ > + mov edx, [ebp+4] > + > + /* Result in ecx:ebx (we know there's carry) */ > + lea ecx, [edx+1] > + > + /* Do a full exchange */ > + LOCK cmpxchg8b [ebp] > + > + /* restore increment */ > + pop edx > + > + /* Need to retry */ > + jnz Again > + > + /* Thats it */ > + pop ebx > + pop ebp > + ret > + > > /*ULONG > *FASTCALL > > >

13 years, 8 months

Current patch review assignment

by Olaf Siejka

Hiya Attached, you will find a rough draft of current patch assignment proposals. I`m trying to keep it in realtime, so several of those are already in place. As usual, please comment if you find you shouldn't be reviewing assigned patch. Best regards

13 years, 8 months

Compatibility List moderation

by Javier Agustìn Fernàndez Arroyo

Speaking about bug reports drama, im still watching how there are several people that are still sending totally useless compatibility test results to ROS database... I want to ask for a moderation system for that, and i would want to offer myself to moderate new incoming results, such as Wine system....

13 years, 8 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev May 2011