Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[dreimer] 48036: Bug 5501: [PATCH] Adding Wing32 support by Carlo Bramini

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jul 14 10:59:32 2010 New Revision: 48036 URL: http://svn.reactos.org/svn/reactos?rev=48036&view=rev Log: Bug 5501: [PATCH] Adding Wing32 support by Carlo Bramini Added: trunk/reactos/dll/win32/wing32/ trunk/reactos/dll/win32/wing32/wing32.c (with props) trunk/reactos/dll/win32/wing32/wing32.rbuild (with props) trunk/reactos/dll/win32/wing32/wing32.spec (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild 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] Wed Jul 14 10:59:32 2010 @@ -44,9 +44,8 @@ base\applications\cmdutils\xcopy\xcopy.exe 1 base\applications\control\control.exe 1 base\applications\dxdiag\dxdiag.exe 1 +base\applications\extrac32\extrac32.exe 1 base\applications\fontview\fontview.exe 1 -base\applications\mscutils\devmgmt\devmgmt.exe 1 -base\applications\mscutils\eventvwr\eventvwr.exe 1 base\applications\games\solitaire\sol.exe 1 base\applications\games\spider\spider.exe 1 base\applications\games\winemine\winemine.exe 1 @@ -57,16 +56,20 @@ base\applications\magnify\magnify.exe 1 base\applications\mplay32\mplay32.exe 1 base\applications\msconfig\msconfig.exe 1 +base\applications\mscutils\devmgmt\devmgmt.exe 1 +base\applications\mscutils\eventvwr\eventvwr.exe 1 +base\applications\mscutils\servman\servman.exe 1 base\applications\mstsc\mstsc.exe 1 base\applications\network\arp\arp.exe 1 base\applications\network\dwnl\dwnl.exe 1 -base\applications\network\route\route.exe 1 base\applications\network\finger\finger.exe 1 base\applications\network\ftp\ftp.exe 1 base\applications\network\ipconfig\ipconfig.exe 1 +base\applications\network\net\net.exe 1 base\applications\network\netstat\netstat.exe 1 base\applications\network\nslookup\nslookup.exe 1 base\applications\network\ping\ping.exe 1 +base\applications\network\route\route.exe 1 base\applications\network\telnet\telnet.exe 1 base\applications\network\tracert\tracert.exe 1 base\applications\network\whois\whois.exe 1 @@ -79,7 +82,6 @@ base\applications\sc\sc.exe 1 base\applications\screensavers\3dtext\3dtext.scr 1 base\applications\screensavers\logon\logon.scr 1 -base\applications\mscutils\servman\servman.exe 1 base\applications\shutdown\shutdown.exe 1 base\applications\sndrec32\sndrec32.exe 1 base\applications\sndvol32\sndvol32.exe 1 @@ -93,12 +95,12 @@ base\services\eventlog\eventlog.exe 1 base\services\rpcss\rpcss.exe 1 base\services\spoolsv\spoolsv.exe 1 +base\services\svchost\svchost.exe 1 base\services\tcpsvcs\tcpsvcs.exe 1 +base\services\tcpsvcs\quotes 5 base\services\telnetd\telnetd.exe 1 -base\services\tcpsvcs\quotes 5 base\services\umpnpmgr\umpnpmgr.exe 1 base\services\wlansvc\wlansvc.exe 1 -base\services\svchost\svchost.exe 1 base\setup\setup\setup.exe 1 base\setup\vmwinst\vmwinst.exe 1 @@ -111,6 +113,7 @@ base\system\autochk\autochk.exe 1 base\system\bootok\bootok.exe 1 +base\system\expand\expand.exe 1 base\system\format\format.exe 1 base\system\lsass\lsass.exe 1 base\system\msiexec\msiexec.exe 1 @@ -118,19 +121,17 @@ base\system\rundll32\rundll32.exe 1 base\system\runonce\runonce.exe 1 base\system\services\services.exe 1 +base\system\smss\smss.exe 1 base\system\userinit\userinit.exe 1 base\system\winlogon\winlogon.exe 1 -base\system\expand\expand.exe 1 -base\system\smss\smss.exe 1 - ; Dynamic Link Libraries -dll\3rdparty\mesa32\mesa32.dll 1 +dll\3rdparty\dxtn\dxtn.dll 1 optional dll\3rdparty\libjpeg\libjpeg.dll 1 dll\3rdparty\libpng\libpng.dll 1 dll\3rdparty\libtiff\libtiff.dll 1 dll\3rdparty\libxslt\libxslt.dll 1 -dll\3rdparty\dxtn\dxtn.dll 1 optional +dll\3rdparty\mesa32\mesa32.dll 1 dll\cpl\access\access.cpl 1 dll\cpl\appwiz\appwiz.cpl 1 @@ -153,6 +154,8 @@ dll\directx\amstream\amstream.dll 1 ;dll\directx\bdaplgin\bdaplgin.ax 1 +dll\directx\d3d8thk\d3d8thk.dll 1 +dll\directx\devenum\devenum.dll 1 dll\directx\dinput\dinput.dll 1 dll\directx\dinput8\dinput8.dll 1 dll\directx\dmusic\dmusic.dll 1 @@ -160,19 +163,17 @@ dll\directx\dplayx\dplayx.dll 1 dll\directx\dsound\dsound.dll 1 dll\directx\dxdiagn\dxdiagn.dll 1 -dll\directx\wine\ddraw\ddraw.dll 1 -dll\directx\d3d8thk\d3d8thk.dll 1 -dll\directx\devenum\devenum.dll 1 dll\directx\ksproxy\ksproxy.ax 1 dll\directx\ksuser\ksuser.dll 1 dll\directx\msdmo\msdmo.dll 1 ;dll\directx\msdvbnp\msdvbnp.ax 1 ;dll\directx\msvidctl\msvidctl.dll 1 +dll\directx\qedit\qedit.dll 1 dll\directx\quartz\quartz.dll 1 -dll\directx\qedit\qedit.dll 1 +dll\directx\wine\ddraw\ddraw.dll 1 dll\directx\wine\d3d8\d3d8.dll 1 +dll\directx\wine\d3d9\d3d9.dll 1 dll\directx\wine\wined3d\wined3d.dll 1 -dll\directx\wine\d3d9\d3d9.dll 1 dll\keyboard\kbda1\kbda1.dll 1 dll\keyboard\kbda2\kbda2.dll 1 @@ -182,12 +183,12 @@ dll\keyboard\kbdarmw\kbdarmw.dll 1 dll\keyboard\kbdaze\kbdaze.dll 1 dll\keyboard\kbdazel\kbdazel.dll 1 +dll\keyboard\kbdbe\kbdbe.dll 1 +dll\keyboard\kbdbga\kbdbga.dll 1 dll\keyboard\kbdbgm\kbdbgm.dll 1 dll\keyboard\kbdbgt\kbdbgt.dll 1 dll\keyboard\kbdblr\kbdblr.dll 1 dll\keyboard\kbdbr\kbdbr.dll 1 -dll\keyboard\kbdbga\kbdbga.dll 1 -dll\keyboard\kbdbe\kbdbe.dll 1 dll\keyboard\kbdbur\kbdbur.dll 1 dll\keyboard\kbdcan\kbdcan.dll 1 dll\keyboard\kbdcr\kbdcr.dll 1 @@ -203,8 +204,8 @@ dll\keyboard\kbdgeo\kbdgeo.dll 1 dll\keyboard\kbdgerg\kbdgerg.dll 1 dll\keyboard\kbdgneo\kbdgneo.dll 1 +dll\keyboard\kbdgr\kbdgr.dll 1 dll\keyboard\kbdgrist\kbdgrist.dll 1 -dll\keyboard\kbdgr\kbdgr.dll 1 dll\keyboard\kbdhe\kbdhe.dll 1 dll\keyboard\kbdheb\kbdheb.dll 1 dll\keyboard\kbdhu\kbdhu.dll 1 @@ -218,6 +219,7 @@ dll\keyboard\kbdit\kbdit.dll 1 dll\keyboard\kbdja\kbdja.dll 1 dll\keyboard\kbdkaz\kbdkaz.dll 1 +dll\keyboard\kbdko\kbdko.dll 1 dll\keyboard\kbdla\kbdla.dll 1 dll\keyboard\kbdlt1\kbdlt1.dll 1 dll\keyboard\kbdlv\kbdlv.dll 1 @@ -252,16 +254,15 @@ dll\keyboard\kbdvntc\kbdvntc.dll 1 dll\keyboard\kbdycc\kbdycc.dll 1 dll\keyboard\kbdycl\kbdycl.dll 1 -dll\keyboard\kbdko\kbdko.dll 1 dll\ntdll\ntdll.dll 1 dll\win32\acledit\acledit.dll 1 dll\win32\aclui\aclui.dll 1 dll\win32\activeds\activeds.dll 1 +dll\win32\actxprxy\actxprxy.dll 1 dll\win32\advapi32\advapi32.dll 1 dll\win32\advpack\advpack.dll 1 -dll\win32\actxprxy\actxprxy.dll 1 dll\win32\atl\atl.dll 1 dll\win32\authz\authz.dll 1 dll\win32\avicap32\avicap32.dll 1 @@ -287,10 +288,10 @@ dll\win32\cryptui\cryptui.dll 1 dll\win32\dbghelp\dbghelp.dll 1 dll\win32\dciman32\dciman32.dll 1 -dll\win32\dwmapi\dwmapi.dll 1 dll\win32\devmgr\devmgr.dll 1 dll\win32\dhcpcsvc\dhcpcsvc.dll 1 dll\win32\dnsapi\dnsapi.dll 1 +dll\win32\dwmapi\dwmapi.dll 1 dll\win32\faultrep\faultrep.dll 1 dll\win32\fmifs\fmifs.dll 1 dll\win32\fusion\fusion.dll 1 @@ -320,6 +321,7 @@ dll\win32\loadperf\loadperf.dll 1 dll\win32\localspl\localspl.dll 1 dll\win32\localui\localui.dll 1 +dll\win32\lpk\lpk.dll 1 dll\win32\lsasrv\lsasrv.dll 1 dll\win32\lz32\lz32.dll 1 dll\win32\mapi32\mapi32.dll 1 @@ -399,8 +401,8 @@ dll\win32\rasadhlp\rasadhlp.dll 1 dll\win32\rasapi32\rasapi32.dll 1 dll\win32\rasdlg\rasdlg.dll 1 +dll\win32\rasman\rasman.dll 1 dll\win32\resutils\resutils.dll 1 -dll\win32\rasman\rasman.dll 1 dll\win32\riched20\riched20.dll 1 dll\win32\riched32\riched32.dll 1 dll\win32\rpcrt4\rpcrt4.dll 1 @@ -425,6 +427,7 @@ dll\win32\shlwapi\shlwapi.dll 1 dll\win32\slbcsp\slbcsp.dll 1 dll\win32\smdll\smdll.dll 1 +dll\win32\sndblst\sndblst.dll 1 dll\win32\snmpapi\snmpapi.dll 1 dll\win32\softpub\softpub.dll 1 dll\win32\spoolss\spoolss.dll 1 @@ -452,16 +455,19 @@ dll\win32\uxtheme\uxtheme.dll 1 dll\win32\vdmdbg\vdmdbg.dll 1 dll\win32\version\version.dll 1 +dll\win32\wdmaud.drv\wdmaud.drv 1 dll\win32\windowscodecs\windowscodecs.dll 1 dll\win32\winemp3.acm\winemp3.acm 1 dll\win32\winfax\winfax.dll 1 +dll\win32\wing32\wing32.dll 1 dll\win32\winhttp\winhttp.dll 1 dll\win32\wininet\wininet.dll 1 dll\win32\winmm\winmm.dll 1 +dll\win32\winmm\midimap\midimap.dll 1 dll\win32\winspool\winspool.drv 1 dll\win32\winsta\winsta.dll 1 +dll\win32\wintrust\wintrust.dll 1 dll\win32\wlanapi\wlanapi.dll 1 -dll\win32\wintrust\wintrust.dll 1 dll\win32\wldap32\wldap32.dll 1 dll\win32\wmi\wmi.dll 1 dll\win32\ws2_32\ws2_32.dll 1 @@ -476,18 +482,19 @@ dll\win32\xinput1_3\xinput1_3.dll 1 dll\win32\xinput9_1_0\xinput9_1_0.dll 1 dll\win32\xmllite\xmllite.dll 1 -dll\win32\winmm\midimap\midimap.dll 1 -dll\win32\wdmaud.drv\wdmaud.drv 1 ; Shell Extensions dll\shellext\deskadp\deskadp.dll 1 dll\shellext\deskmon\deskmon.dll 1 +dll\shellext\devcpux\devcpux.dll 1 +dll\shellext\fontext\fontext.dll 1 +dll\shellext\slayer\slayer.dll 1 ; Drivers +drivers\base\beep\beep.sys 2 drivers\base\bootvid\bootvid.dll 1 -drivers\base\beep\beep.sys 2 +drivers\base\nmidebug\nmidebug.sys 2 drivers\base\null\null.sys 2 -drivers\base\nmidebug\nmidebug.sys 2 drivers\battery\battc\battc.sys 2 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] Wed Jul 14 10:59:32 2010 @@ -604,6 +604,9 @@ <directory name="winfax"> <xi:include href="winfax/winfax.rbuild" /> </directory> +<directory name="wing32"> + <xi:include href="wing32/wing32.rbuild" /> +</directory> <directory name="winhttp"> <xi:include href="winhttp/winhttp.rbuild" /> </directory> Added: trunk/reactos/dll/win32/wing32/wing32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wing32/wing32.c?… ============================================================================== --- trunk/reactos/dll/win32/wing32/wing32.c (added) +++ trunk/reactos/dll/win32/wing32/wing32.c [iso-8859-1] Wed Jul 14 10:59:32 2010 @@ -1,0 +1,141 @@ +/* + * WinG support + * + * Copyright 2007 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +/*********************************************************************** + * WinGCreateDC (WING32.@) + */ +HDC CALLBACK WinGCreateDC( void ) +{ + return CreateCompatibleDC( NULL ); +} + +/*********************************************************************** + * WinGRecommendDIBFormat (WING32.@) + */ +BOOL CALLBACK WinGRecommendDIBFormat( BITMAPINFO *bmi ) +{ + if (!bmi) return FALSE; + + bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi->bmiHeader.biWidth = 320; + bmi->bmiHeader.biHeight = -1; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biBitCount = 8; + bmi->bmiHeader.biCompression = BI_RGB; + bmi->bmiHeader.biSizeImage = 0; + bmi->bmiHeader.biXPelsPerMeter = 0; + bmi->bmiHeader.biYPelsPerMeter = 0; + bmi->bmiHeader.biClrUsed = 0; + bmi->bmiHeader.biClrImportant = 0; + + return TRUE; +} + +/*********************************************************************** + * WinGCreateBitmap (WING32.@) + */ +HBITMAP CALLBACK WinGCreateBitmap( HDC hdc, BITMAPINFO *bmi, void **bits ) +{ + return CreateDIBSection( hdc, bmi, 0, bits, 0, 0 ); +} + +/*********************************************************************** + * WinGGetDIBPointer (WING32.@) + */ +void * CALLBACK WinGGetDIBPointer( HBITMAP hbmp, BITMAPINFO *bmi ) +{ + DIBSECTION ds; + + if (GetObject( hbmp, sizeof(ds), &ds ) == sizeof(ds)) + { + if (bmi != NULL) + memcpy( &bmi->bmiHeader, &ds.dsBmih, sizeof(*bmi) ); + + return ds.dsBm.bmBits; + } + return NULL; +} + +/*********************************************************************** + * WinGSetDIBColorTable (WING32.@) + */ +UINT CALLBACK WinGSetDIBColorTable( HDC hdc, UINT start, UINT end, RGBQUAD *colors ) +{ + return SetDIBColorTable( hdc, start, end, colors ); +} + +/*********************************************************************** + * WinGGetDIBColorTable (WING32.@) + */ +UINT CALLBACK WinGGetDIBColorTable( HDC hdc, UINT start, UINT end, RGBQUAD *colors ) +{ + return GetDIBColorTable( hdc, start, end, colors ); +} + +/*********************************************************************** + * WinGCreateHalfTonePalette (WING32.@) + */ +HPALETTE CALLBACK WinGCreateHalfTonePalette( void ) +{ + HDC hdc; + HPALETTE hpal; + + hdc = GetDC( NULL ); + hpal = CreateHalftonePalette( hdc ); + ReleaseDC( NULL, hdc ); + + return hpal; +} + +/*********************************************************************** + * WinGCreateHalfToneBrush (WING32.@) + */ +HBRUSH CALLBACK WinGCreateHalfToneBrush( HDC hdc, COLORREF color, INT type ) +{ + return CreateSolidBrush( color ); +} + +/*********************************************************************** + * WinGStretchBlt (WING32.@) + */ +BOOL CALLBACK WinGStretchBlt( HDC hdcDst, INT xDst, INT yDst, INT widthDst, INT heightDst, + HDC hdcSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc ) +{ + int old_blt_mode; + BOOL ret; + + old_blt_mode = SetStretchBltMode( hdcDst, COLORONCOLOR ); + ret = StretchBlt( hdcDst, xDst, yDst, widthDst, heightDst, + hdcSrc, xSrc, ySrc, widthSrc, heightSrc, SRCCOPY ); + SetStretchBltMode( hdcDst, old_blt_mode ); + return ret; +} + +/*********************************************************************** + * WinGBitBlt (WING32.@) + */ +BOOL CALLBACK WinGBitBlt( HDC hdcDst, INT xDst, INT yDst, INT width, + INT height, HDC hdcSrc, INT xSrc, INT ySrc ) +{ + return BitBlt( hdcDst, xDst, yDst, width, height, hdcSrc, xSrc, ySrc, SRCCOPY ); +} Propchange: trunk/reactos/dll/win32/wing32/wing32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wing32/wing32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wing32/wing32.rb… ============================================================================== --- trunk/reactos/dll/win32/wing32/wing32.rbuild (added) +++ trunk/reactos/dll/win32/wing32/wing32.rbuild [iso-8859-1] Wed Jul 14 10:59:32 2010 @@ -1,0 +1,11 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> +<group> +<module name="wing32" type="win32dll" entrypoint="0" installbase="system32" installname="wing32.dll" unicode="yes"> + <importlibrary definition="wing32.spec" /> + <library>user32</library> + <library>gdi32</library> + <file>wing32.c</file> + <linkerflag>--add-stdcall-alias</linkerflag> +</module> +</group> Propchange: trunk/reactos/dll/win32/wing32/wing32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wing32/wing32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wing32/wing32.sp… ============================================================================== --- trunk/reactos/dll/win32/wing32/wing32.spec (added) +++ trunk/reactos/dll/win32/wing32/wing32.spec [iso-8859-1] Wed Jul 14 10:59:32 2010 @@ -1,0 +1,10 @@ +@ stdcall WinGBitBlt(long long long long long long long long) +@ stdcall WinGCreateBitmap(long ptr ptr) +@ stdcall WinGCreateDC() +@ stdcall WinGCreateHalfToneBrush(long long long) +@ stdcall WinGCreateHalfTonePalette() +@ stdcall WinGGetDIBColorTable(long long long ptr) +@ stdcall WinGGetDIBPointer(long ptr) +@ stdcall WinGRecommendDIBFormat(ptr) +@ stdcall WinGSetDIBColorTable(long long long ptr) +@ stdcall WinGStretchBlt(long long long long long long long long long long) Propchange: trunk/reactos/dll/win32/wing32/wing32.spec ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 2 months

[jgardou] 48035: Bye bye NtUserCreateCursorHandle. Thanks GedMurphy for explaining me how to suppress that. Please clean win32k after this commit.

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Jul 14 10:23:13 2010 New Revision: 48035 URL: http://svn.reactos.org/svn/reactos?rev=48035&view=rev Log: Bye bye NtUserCreateCursorHandle. Thanks GedMurphy for explaining me how to suppress that. Please clean win32k after this commit. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Jul 14 10:23:13 2010 @@ -3165,13 +3165,6 @@ ULONG nBufSize, DWORD Reserved); -/* Use ONEPARAM_ROUTINE_CREATEEMPTYCURSOROBJECT (0x21) ? */ -HANDLE -NTAPI -NtUserCreateCursorIconHandle( - PICONINFO IconInfo, - BOOL Indirect); - /* Should be done in usermode and use NtUserGetCPD. */ ULONG_PTR Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Wed Jul 14 10:23:13 2010 @@ -494,85 +494,6 @@ /* * @implemented */ -HANDLE -APIENTRY -NtUserCreateCursorIconHandle(PICONINFO IconInfo OPTIONAL, BOOL Indirect) -{ - PCURICON_OBJECT CurIcon; - PSURFACE psurfBmp; - NTSTATUS Status; - HANDLE Ret; - DECLARE_RETURN(HANDLE); - - DPRINT("Enter NtUserCreateCursorIconHandle\n"); - UserEnterExclusive(); - - if (!(CurIcon = IntCreateCurIconHandle())) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - RETURN((HANDLE)0); - } - - Ret = CurIcon->Self; - - if (IconInfo) - { - Status = MmCopyFromCaller(&CurIcon->IconInfo, IconInfo, sizeof(ICONINFO)); - if (NT_SUCCESS(Status)) - { - /* Copy bitmaps and size info */ - if (Indirect) - { - // FIXME: WTF? - CurIcon->IconInfo.hbmMask = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmMask); - CurIcon->IconInfo.hbmColor = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmColor); - } - if (CurIcon->IconInfo.hbmColor && - (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor))) - { - CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; - CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; - SURFACE_UnlockSurface(psurfBmp); - GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL); - } - if (CurIcon->IconInfo.hbmMask && - (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask))) - { - if (CurIcon->IconInfo.hbmColor == NULL) - { - CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; - CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy >> 1; - } - SURFACE_UnlockSurface(psurfBmp); - GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); - } - - /* Calculate icon hotspot */ - if (CurIcon->IconInfo.fIcon == TRUE) - { - CurIcon->IconInfo.xHotspot = CurIcon->Size.cx >> 1; - CurIcon->IconInfo.yHotspot = CurIcon->Size.cy >> 1; - } - } - else - { - SetLastNtError(Status); - /* FIXME - Don't exit here */ - } - } - - UserDereferenceObject(CurIcon); - RETURN(Ret); - -CLEANUP: - DPRINT("Leave NtUserCreateCursorIconHandle, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - -/* - * @implemented - */ BOOL APIENTRY NtUserGetIconInfo( Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Wed Jul 14 10:23:13 2010 @@ -683,7 +683,6 @@ NtGdiOffsetWindowOrgEx 4 # NtUserBuildMenuItemList 4 -NtUserCreateCursorIconHandle 2 NtUserGetMenuDefaultItem 3 NtUserGetLastInputInfo 1 NtUserGetMinMaxInfo 3

14 years, 2 months

[jgardou] 48034: [USER32] - There is no exported "CopyCursor", it's a macro. - There is no "NtUserCreateCursorIconHandle" function in win32k. Use correct functions to create a cursorIcon handle. - Bring in WINE's CreateIconIndirect [WIN32K] - Dereference CursorIcon Object in NtUserCallOneParam - Shared Icons need their bitmaps to be unowned

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Jul 14 09:54:44 2010 New Revision: 48034 URL: http://svn.reactos.org/svn/reactos?rev=48034&view=rev Log: [USER32] - There is no exported "CopyCursor", it's a macro. - There is no "NtUserCreateCursorIconHandle" function in win32k. Use correct functions to create a cursorIcon handle. - Bring in WINE's CreateIconIndirect [WIN32K] - Dereference CursorIcon Object in NtUserCallOneParam - Shared Icons need their bitmaps to be unowned Modified: trunk/reactos/dll/win32/user32/user32.pspec trunk/reactos/dll/win32/user32/windows/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/dll/win32/user32/user32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.ps… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] Wed Jul 14 09:54:44 2010 @@ -759,7 +759,6 @@ ; @ stdcall CharNextExW(long wstr long) ; @ stdcall CharPrevExW(long wstr wstr long) ; @ stub ClientThreadConnect -@ stdcall CopyCursor(long) ; In msdn it is written, that function is available, but in win 2k3 r2 it is absent ; @ stub EnumDisplayDeviceModesA ;(str long ptr long) ; @ stub EnumDisplayDeviceModesW ;(wstr long ptr long) ; @ stdcall GetMenuIndex(ptr ptr) Modified: trunk/reactos/dll/win32/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] Wed Jul 14 09:54:44 2010 @@ -66,6 +66,25 @@ 0, 0, { (DWORD_PTR)(__FILE__ ": IconCrst") } }; static CRITICAL_SECTION IconCrst = { &critsect_debug, -1, 0, 0, 0, 0 }; + +/*********************************************************************** + * CreateCursorIconHandle + * + * Creates a handle with everything in there + */ +static +HICON +CreateCursorIconHandle( PICONINFO IconInfo ) +{ + HICON hIcon = (HICON)NtUserCallOneParam(0, //FIXME ? + ONEPARAM_ROUTINE_CREATECURICONHANDLE); + if(!hIcon) + return NULL; + + NtUserSetCursorContents(hIcon, IconInfo); + return hIcon; +} + /*********************************************************************** @@ -563,7 +582,7 @@ IconInfo.hbmColor = color; IconInfo.hbmMask = mask; - return NtUserCreateCursorIconHandle(&IconInfo, FALSE); + return CreateCursorIconHandle(&IconInfo); } @@ -1386,55 +1405,120 @@ return NtUserGetIconInfo(hIcon, iconinfo, 0, 0, 0, 0); } +/* copy an icon bitmap, even when it can't be selected into a DC */ +/* helper for CreateIconIndirect */ +static void stretch_blt_icon( HDC hdc_dst, int dst_x, int dst_y, int dst_width, int dst_height, + HBITMAP src, int width, int height ) +{ + HDC hdc = CreateCompatibleDC( 0 ); + + if (!SelectObject( hdc, src )) /* do it the hard way */ + { + BITMAPINFO *info; + void *bits; + + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) return; + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = width; + info->bmiHeader.biHeight = height; + info->bmiHeader.biPlanes = GetDeviceCaps( hdc_dst, PLANES ); + info->bmiHeader.biBitCount = GetDeviceCaps( hdc_dst, BITSPIXEL ); + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = height * get_dib_width_bytes( width, info->bmiHeader.biBitCount ); + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ); + if (bits && GetDIBits( hdc, src, 0, height, bits, info, DIB_RGB_COLORS )) + StretchDIBits( hdc_dst, dst_x, dst_y, dst_width, dst_height, + 0, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); + + HeapFree( GetProcessHeap(), 0, bits ); + HeapFree( GetProcessHeap(), 0, info ); + } + else StretchBlt( hdc_dst, dst_x, dst_y, dst_width, dst_height, hdc, 0, 0, width, height, SRCCOPY ); + + DeleteDC( hdc ); +} + /********************************************************************** * CreateIconIndirect (USER32.@) */ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) { - BITMAP ColorBitmap; - BITMAP MaskBitmap; - ICONINFO safeIconInfo; - - if(!iconinfo) - { - SetLastError(ERROR_INVALID_PARAMETER); - return (HICON)0; - } - - safeIconInfo = *iconinfo; - - if(!GetObjectW(safeIconInfo.hbmMask, sizeof(BITMAP), &MaskBitmap)) - { - return (HICON)0; - } - - /* Try to get color bitmap */ - if (GetObjectW(safeIconInfo.hbmColor, sizeof(BITMAP), &ColorBitmap)) - { - /* Compare size of color and mask bitmap*/ - if (ColorBitmap.bmWidth != MaskBitmap.bmWidth || - ColorBitmap.bmHeight != MaskBitmap.bmHeight) - { - ERR("Color and mask size are different!"); - SetLastError(ERROR_INVALID_PARAMETER); - return (HICON)0; - } - /* Test if they are inverted */ - if(ColorBitmap.bmBitsPixel == 1) - { - if(MaskBitmap.bmBitsPixel != 1) - { - safeIconInfo.hbmMask = iconinfo->hbmColor; - safeIconInfo.hbmColor = iconinfo->hbmMask; - } - else - { - /* Wine tests say so */ - safeIconInfo.hbmColor = NULL; - } - } - } - return (HICON)NtUserCreateCursorIconHandle(&safeIconInfo, TRUE); + BITMAP bmpXor, bmpAnd; + HBITMAP color = 0, mask; + int width, height; + HDC hdc; + ICONINFO iinfo; + + TRACE("color %p, mask %p, hotspot %ux%u, fIcon %d\n", + iconinfo->hbmColor, iconinfo->hbmMask, + iconinfo->xHotspot, iconinfo->yHotspot, iconinfo->fIcon); + + if (!iconinfo->hbmMask) return 0; + + GetObjectW( iconinfo->hbmMask, sizeof(bmpAnd), &bmpAnd ); + TRACE("mask: width %d, height %d, width bytes %d, planes %u, bpp %u\n", + bmpAnd.bmWidth, bmpAnd.bmHeight, bmpAnd.bmWidthBytes, + bmpAnd.bmPlanes, bmpAnd.bmBitsPixel); + + if (iconinfo->hbmColor) + { + GetObjectW( iconinfo->hbmColor, sizeof(bmpXor), &bmpXor ); + TRACE("color: width %d, height %d, width bytes %d, planes %u, bpp %u\n", + bmpXor.bmWidth, bmpXor.bmHeight, bmpXor.bmWidthBytes, + bmpXor.bmPlanes, bmpXor.bmBitsPixel); + + width = bmpXor.bmWidth; + height = bmpXor.bmHeight; + if (bmpXor.bmPlanes * bmpXor.bmBitsPixel != 1) + { + color = CreateCompatibleBitmap( screen_dc, width, height ); + mask = CreateBitmap( width, height, 1, 1, NULL ); + } + else mask = CreateBitmap( width, height * 2, 1, 1, NULL ); + } + else + { + width = bmpAnd.bmWidth; + height = bmpAnd.bmHeight; + mask = CreateBitmap( width, height, 1, 1, NULL ); + } + + hdc = CreateCompatibleDC( 0 ); + SelectObject( hdc, mask ); + stretch_blt_icon( hdc, 0, 0, width, height, iconinfo->hbmMask, bmpAnd.bmWidth, bmpAnd.bmHeight ); + + if (color) + { + SelectObject( hdc, color ); + stretch_blt_icon( hdc, 0, 0, width, height, iconinfo->hbmColor, width, height ); + } + else if (iconinfo->hbmColor) + { + stretch_blt_icon( hdc, 0, height, width, height, iconinfo->hbmColor, width, height ); + } + else height /= 2; + + DeleteDC( hdc ); + + iinfo.hbmColor = color ; + iinfo.hbmMask = mask ; + iinfo.fIcon = iconinfo->fIcon; + if (iinfo.fIcon) + { + iinfo.xHotspot = width / 2; + iinfo.yHotspot = height / 2; + } + else + { + iinfo.xHotspot = iconinfo->xHotspot; + iinfo.yHotspot = iconinfo->yHotspot; + } + + return CreateCursorIconHandle(&iinfo); } /****************************************************************************** @@ -2047,23 +2131,6 @@ return res; } -#undef CopyCursor -/* - * @implemented - */ -HCURSOR -WINAPI -CopyCursor(HCURSOR pcur) -{ - ICONINFO IconInfo; - - if(GetIconInfo((HANDLE)pcur, &IconInfo)) - { - return (HCURSOR)NtUserCreateCursorIconHandle(&IconInfo, FALSE); - } - return (HCURSOR)0; -} - /* INTERNAL ******************************************************************/ /* This callback routine is called directly after switching to gui mode */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Wed Jul 14 09:54:44 2010 @@ -1030,11 +1030,13 @@ } /* Delete old bitmaps */ - if (CurIcon->IconInfo.hbmColor != IconInfo.hbmColor) + if ((CurIcon->IconInfo.hbmColor) + && (CurIcon->IconInfo.hbmColor != IconInfo.hbmColor)) { GreDeleteObject(CurIcon->IconInfo.hbmColor); } - if (CurIcon->IconInfo.hbmMask != IconInfo.hbmMask) + if ((CurIcon->IconInfo.hbmMask) + && (CurIcon->IconInfo.hbmMask != IconInfo.hbmMask)) { GreDeleteObject(CurIcon->IconInfo.hbmMask); } @@ -1226,6 +1228,15 @@ } done: + if(Ret) + { + /* This icon is shared now */ + GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); + if(CurIcon->IconInfo.hbmColor) + { + GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL); + } + } UserDereferenceObject(CurIcon); RETURN(Ret); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Wed Jul 14 09:54:44 2010 @@ -195,6 +195,7 @@ case ONEPARAM_ROUTINE_CREATECURICONHANDLE: { PCURICON_OBJECT CurIcon; + DWORD_PTR Result ; if (!(CurIcon = IntCreateCurIconHandle())) { @@ -202,7 +203,9 @@ RETURN(0); } - RETURN((DWORD_PTR)CurIcon->Self); + Result = (DWORD_PTR)CurIcon->Self; + UserDereferenceObject(CurIcon); + RETURN(Result); } case ONEPARAM_ROUTINE_GETCURSORPOSITION:

14 years, 2 months

[gadamopoulos] 48033: [win32k] - Remove test code

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Jul 14 07:51:54 2010 New Revision: 48033 URL: http://svn.reactos.org/svn/reactos?rev=48033&view=rev Log: [win32k] - Remove test code Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Wed Jul 14 07:51:54 2010 @@ -25,11 +25,6 @@ PSWM_WINDOW NTAPI SwmGetForegroundWindow(BOOLEAN TopMost); VOID NTAPI SwmClipAllWindows(); - -VOID NTAPI SwmDumpRegion(struct region *Region); -VOID NTAPI SwmDumpWindows(); -VOID NTAPI SwmDebugDrawWindows(); -VOID NTAPI SwmTest(); /* GLOBALS *******************************************************************/ @@ -957,186 +952,6 @@ { DPRINT1("Failure initializing SWM resource!\n"); } - - //SwmTest(); -} - -VOID -NTAPI -SwmDumpRegion(struct region *Region) -{ - ULONG i; - - //get_region_extents(Region, &ExtRect); - - for (i=0; i<Region->num_rects; i++) - { - DbgPrint("(%d,%d)-(%d,%d) ", Region->rects[i].left, Region->rects[i].top, - Region->rects[i].right, Region->rects[i].bottom); - } - - DbgPrint("\n"); -} - -VOID -NTAPI -SwmDumpWindows() -{ - PLIST_ENTRY Current; - PSWM_WINDOW Window; - - DPRINT1("Windows in z order: "); - - /* Traverse the list to find our window */ - Current = SwmWindows.Flink; - while(Current != &SwmWindows) - { - Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); - - DbgPrint("%x regions: \n", Window->hwnd); - SwmDumpRegion(Window->Visible); - - /* Advance to the next window */ - Current = Current->Flink; - } - - DbgPrint("\n"); -} - -VOID -NTAPI -SwmDebugDrawRect(HDC hDC, rectangle_t *Rect, ULONG Color) -{ -#if 0 - PDC pDC; - ULONG Scale = 4; - - /* Get a pointer to the DC */ - pDC = DC_LockDc(hDC); - - pDC->dclevel.pbrLine->BrushObject.iSolidColor = Color; - - GreRectangle(pDC, Rect->left / Scale, Rect->top / Scale, Rect->right / Scale, Rect->bottom / Scale); - - /* Release the object */ - DC_UnlockDc(pDC); -#endif -} - -VOID -NTAPI -SwmDebugDrawRegion(HDC hDC, struct region *Region, ULONG Color) -{ -#if 0 - PDC pDC; - ULONG Scale = 4, i; - - if (is_region_empty(Region)) return; - - /* Get a pointer to the DC */ - pDC = DC_LockDc(hDC); - - pDC->dclevel.pbrLine->BrushObject.iSolidColor = Color; - - for (i=0; i<Region->num_rects; i++) - GreRectangle(pDC, Region->rects[i].left / Scale, Region->rects[i].top / Scale, - Region->rects[i].right / Scale, Region->rects[i].bottom / Scale); - - /* Release the object */ - DC_UnlockDc(pDC); -#endif -} - -VOID -NTAPI -SwmDebugDrawWindows() -{ -#if 0 - PLIST_ENTRY Current; - PSWM_WINDOW Window; - HDC ScreenDc = 0; - ROS_DCINFO RosDc = {0}; - PEBRUSHOBJ Brush, BrushBack; - PDC pDC; - RECTL rcSafeBounds; - - /* Create a dc */ - RosGdiCreateDC(&RosDc, &ScreenDc, L"", L"", L"", NULL); - - /* Create a pen and select it */ - Brush = GreCreateSolidBrush(NULL, RGB(0xFF, 0, 0)); - - /* Get a pointer to the DC */ - pDC = DC_LockDc(ScreenDc); - GreFreeBrush(pDC->dclevel.pbrLine); - pDC->dclevel.pbrLine = Brush; - - /* Set the clipping object */ - IntEngDeleteClipRegion(pDC->CombinedClip); - RECTL_vSetRect(&rcSafeBounds, - 0, - 0, - 640, - 480); - - pDC->CombinedClip = IntEngCreateClipRegion(1, &rcSafeBounds, &rcSafeBounds); - - /* Clear the area */ - BrushBack = pDC->dclevel.pbrFill; - pDC->dclevel.pbrFill = GreCreateSolidBrush(NULL, RGB(0,0,0)); - GreRectangle(pDC, 0, 0, 800/4, 600/4); - GreFreeBrush(pDC->dclevel.pbrFill); - pDC->dclevel.pbrFill = BrushBack; - - DC_UnlockDc(pDC); - - /* Traverse the list to find our window */ - Current = SwmWindows.Flink; - while(Current != &SwmWindows) - { - Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); - - SwmDebugDrawRect(ScreenDc, &Window->Window, RGB(0,0,255)); - SwmDebugDrawRegion(ScreenDc, Window->Visible, RGB(255,0,0)); - - /* Advance to the next window */ - Current = Current->Flink; - } - - /* Delete screen dc */ - GreFreeBrush(Brush); - RosGdiDeleteDC(ScreenDc); -#endif -} - -VOID -NTAPI -SwmTest() -{ -#if 0 - RECT rect; - HWND hwnd; - - /* "desktop" */ - hwnd = (HWND)1; - rect.left = 0; rect.top = 0; - rect.right = 100; rect.bottom = 100; - SwmAddWindow(hwnd, &rect); - - /* win1 */ - hwnd = (HWND)2; - rect.left = 40; rect.top = 40; - rect.right = 60; rect.bottom = 60; - SwmAddWindow(hwnd, &rect); - - /* win2 */ - hwnd = (HWND)3; - rect.left = 50; rect.top = 50; - rect.right = 70; rect.bottom = 70; - SwmAddWindow(hwnd, &rect); - - SwmDumpWindows(); -#endif } /* EOF */

14 years, 2 months

[fireball] 48032: [WINENT] - Start porting clipboard implementation from Wine. Notepad is already able to copy/paste text. Code cleanup will follow in a few days.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Jul 13 22:39:30 2010 New Revision: 48032 URL: http://svn.reactos.org/svn/reactos?rev=48032&view=rev Log: [WINENT] - Start porting clipboard implementation from Wine. Notepad is already able to copy/paste text. Code cleanup will follow in a few days. Added: branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c (with props) Modified: branches/arwinss/reactos/dll/win32/winent.drv/main.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.h branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… Modified: branches/arwinss/reactos/dll/win32/winent.drv/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…

14 years, 2 months

[jgardou] 48031: [USER32] - Partly merge 48026

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Jul 13 21:38:34 2010 New Revision: 48031 URL: http://svn.reactos.org/svn/reactos?rev=48031&view=rev Log: [USER32] - Partly merge 48026 Modified: trunk/reactos/ (props changed) trunk/reactos/dll/win32/user32/windows/cursoricon.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jul 13 21:38:34 2010 @@ -1,4 +1,4 @@ /branches/header-work:45691-47721 -/branches/reactos-yarotows:46372,46848,46966,47800 +/branches/reactos-yarotows:46372,46848,46966,47800,48026 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882 Modified: trunk/reactos/dll/win32/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] Tue Jul 13 21:38:34 2010 @@ -1393,6 +1393,7 @@ { BITMAP ColorBitmap; BITMAP MaskBitmap; + ICONINFO safeIconInfo; if(!iconinfo) { @@ -1400,13 +1401,15 @@ return (HICON)0; } - if(!GetObjectW(iconinfo->hbmMask, sizeof(BITMAP), &MaskBitmap)) + safeIconInfo = *iconinfo; + + if(!GetObjectW(safeIconInfo.hbmMask, sizeof(BITMAP), &MaskBitmap)) { return (HICON)0; } /* Try to get color bitmap */ - if (GetObjectW(iconinfo->hbmColor, sizeof(BITMAP), &ColorBitmap)) + if (GetObjectW(safeIconInfo.hbmColor, sizeof(BITMAP), &ColorBitmap)) { /* Compare size of color and mask bitmap*/ if (ColorBitmap.bmWidth != MaskBitmap.bmWidth || @@ -1416,8 +1419,22 @@ SetLastError(ERROR_INVALID_PARAMETER); return (HICON)0; } + /* Test if they are inverted */ + if(ColorBitmap.bmBitsPixel == 1) + { + if(MaskBitmap.bmBitsPixel != 1) + { + safeIconInfo.hbmMask = iconinfo->hbmColor; + safeIconInfo.hbmColor = iconinfo->hbmMask; + } + else + { + /* Wine tests say so */ + safeIconInfo.hbmColor = NULL; + } + } } - return (HICON)NtUserCreateCursorIconHandle(iconinfo, TRUE); + return (HICON)NtUserCreateCursorIconHandle(&safeIconInfo, TRUE); } /******************************************************************************

14 years, 2 months

[jgardou] 48030: Svn wins by KO. Part 4 of (let's hope) 4

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Jul 13 20:45:07 2010 New Revision: 48030 URL: http://svn.reactos.org/svn/reactos?rev=48030&view=rev Log: Svn wins by KO. Part 4 of (let's hope) 4 Added: branches/reactos-yarotows/include/reactos/mc/pciclass.mc (with props) Added: branches/reactos-yarotows/include/reactos/mc/pciclass.mc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… ============================================================================== --- branches/reactos-yarotows/include/reactos/mc/pciclass.mc (added) +++ branches/reactos-yarotows/include/reactos/mc/pciclass.mc [iso-8859-1] Tue Jul 13 20:45:07 2010 @@ -1,0 +1,599 @@ +MessageId=0 +SymbolicName=NONE +Language=English +PCI Device +. + +MessageId=1 +SymbolicName=NONE +Language=English +VGA Device +. + +MessageId=256 +SymbolicName=NONE +Language=English +SCSI Controller +. + +MessageId=257 +SymbolicName=NONE +Language=English +IDE Controller +. + +MessageId=258 +SymbolicName=NONE +Language=English +Floppy Controller +. + +MessageId=259 +SymbolicName=NONE +Language=English +IPI Controller +. + +MessageId=260 +SymbolicName=NONE +Language=English +RAID Controller +. + +MessageId=261 +SymbolicName=NONE +Language=English +ATA Controller +. + +MessageId=262 +SymbolicName=NONE +Language=English +Serial ATA Controller +. + +MessageId=263 +SymbolicName=NONE +Language=English +SAS Controller +. + +MessageId=384 +SymbolicName=NONE +Language=English +Mass Storage Controller +. + +MessageId=512 +SymbolicName=NONE +Language=English +Ethernet Controller +. + +MessageId=513 +SymbolicName=NONE +Language=English +Token Ring Network Controller +. + +MessageId=514 +SymbolicName=NONE +Language=English +FDDI Network Controller +. + +MessageId=515 +SymbolicName=NONE +Language=English +ATM Network Controller +. + +MessageId=516 +SymbolicName=NONE +Language=English +ISDN Controller +. + +MessageId=517 +SymbolicName=NONE +Language=English +WorldFip Controller +. + +MessageId=640 +SymbolicName=NONE +Language=English +Network Controller +. + +MessageId=768 +SymbolicName=NONE +Language=English +Video Controller (VGA Compatible) +. + +MessageId=769 +SymbolicName=NONE +Language=English +Video Controller (VGA Compatible) +. + +MessageId=770 +SymbolicName=NONE +Language=English +3D Video Controller +. + +MessageId=896 +SymbolicName=NONE +Language=English +Video Controller +. + +MessageId=1024 +SymbolicName=NONE +Language=English +Multimedia Video Controller +. + +MessageId=1025 +SymbolicName=NONE +Language=English +Multimedia Audio Controller +. + +MessageId=1026 +SymbolicName=NONE +Language=English +Computer Telephony Device +. + +MessageId=1152 +SymbolicName=NONE +Language=English +Multimedia Controller +. + +MessageId=1280 +SymbolicName=NONE +Language=English +PCI Memory +. + +MessageId=1281 +SymbolicName=NONE +Language=English +PCI FLASH Memory +. + +MessageId=1408 +SymbolicName=NONE +Language=English +PCI Memory Controller +. + +MessageId=1536 +SymbolicName=NONE +Language=English +PCI HOST Bridge +. + +MessageId=1537 +SymbolicName=NONE +Language=English +PCI to ISA Bridge +. + +MessageId=1538 +SymbolicName=NONE +Language=English +PCI to EISA Bridge +. + +MessageId=1539 +SymbolicName=NONE +Language=English +PCI to Micro Channel Bridge +. + +MessageId=1540 +SymbolicName=NONE +Language=English +PCI to PCI Bridge +. + +MessageId=1541 +SymbolicName=NONE +Language=English +PCI to PCMCIA Bridge +. + +MessageId=1542 +SymbolicName=NONE +Language=English +PCI to NUBUS Bridge +. + +MessageId=1543 +SymbolicName=NONE +Language=English +PCI to CARDBUS Bridge +. + +MessageId=1544 +SymbolicName=NONE +Language=English +PCI to RACEway Bridge +. + +MessageId=1545 +SymbolicName=NONE +Language=English +Semi-transparent PCI to PCI Bridge +. + +MessageId=1546 +SymbolicName=NONE +Language=English +Infiniband to PCI Host Bridge +. + +MessageId=1664 +SymbolicName=NONE +Language=English +Other PCI Bridge Device +. + +MessageId=1792 +SymbolicName=NONE +Language=English +PCI Serial Port +. + +MessageId=1793 +SymbolicName=NONE +Language=English +PCI Parallel Port +. + +MessageId=1794 +SymbolicName=NONE +Language=English +PCI Multiport Serial Controller +. + +MessageId=1795 +SymbolicName=NONE +Language=English +PCI Modem +. + +MessageId=1796 +SymbolicName=NONE +Language=English +PCI GBIB Controller +. + +MessageId=1797 +SymbolicName=NONE +Language=English +PCI Smart Card +. + +MessageId=1920 +SymbolicName=NONE +Language=English +PCI Simple Communications Controller +. + +MessageId=2048 +SymbolicName=NONE +Language=English +System Interrupt Controller +. + +MessageId=2049 +SymbolicName=NONE +Language=English +System DMA Controller +. + +MessageId=2050 +SymbolicName=NONE +Language=English +System Timer +. + +MessageId=2051 +SymbolicName=NONE +Language=English +Real Time CLock +. + +MessageId=2052 +SymbolicName=NONE +Language=English +Generic PCI Hot-Plug Controller +. + +MessageId=2053 +SymbolicName=NONE +Language=English +SD Host Controller +. + +MessageId=2173 +SymbolicName=NONE +Language=English +Base System Device +. + +MessageId=2304 +SymbolicName=NONE +Language=English +PCI Keyboard Controller +. + +MessageId=2305 +SymbolicName=NONE +Language=English +PCI Digitizer +. + +MessageId=2306 +SymbolicName=NONE +Language=English +PCI Mouse Controller +. + +MessageId=2307 +SymbolicName=NONE +Language=English +PCI Scanner Controller +. + +MessageId=2308 +SymbolicName=NONE +Language=English +PCI Gameport Controller +. + +MessageId=2432 +SymbolicName=NONE +Language=English +PCI Input Device +. + +MessageId=2560 +SymbolicName=NONE +Language=English +Docking Station +. + +MessageId=2688 +SymbolicName=NONE +Language=English +Docking Station (Unknown type) +. + +MessageId=2816 +SymbolicName=NONE +Language=English +386 Processor +. + +MessageId=2817 +SymbolicName=NONE +Language=English +486 Processor +. + +MessageId=2818 +SymbolicName=NONE +Language=English +Pentium Processor +. + +MessageId=2832 +SymbolicName=NONE +Language=English +ALPHA Processor +. + +MessageId=2848 +SymbolicName=NONE +Language=English +PowerPC Processor +. + +MessageId=2880 +SymbolicName=NONE +Language=English +Coprocessor +. + +MessageId=3072 +SymbolicName=NONE +Language=English +IEEE 1394 Controller +. + +MessageId=3073 +SymbolicName=NONE +Language=English +ACCESS Bus Controller +. + +MessageId=3074 +SymbolicName=NONE +Language=English +SSA Controller +. + +MessageId=3075 +SymbolicName=NONE +Language=English +Universal Serial Bus (USB) Controller +. + +MessageId=3076 +SymbolicName=NONE +Language=English +Fibre Channel Controller +. + +MessageId=3077 +SymbolicName=NONE +Language=English +SM Bus Controller +. + +MessageId=3078 +SymbolicName=NONE +Language=English +Infiniband Controller +. + +MessageId=3079 +SymbolicName=NONE +Language=English +IPMI Interface +. + +MessageId=3080 +SymbolicName=NONE +Language=English +SERCOS Interface +. + +MessageId=3081 +SymbolicName=NONE +Language=English +CANbus Controller +. + +MessageId=3328 +SymbolicName=NONE +Language=English +iRDA Compatible Controller +. + +MessageId=3329 +SymbolicName=NONE +Language=English +Consumer IR Controller +. + +MessageId=3344 +SymbolicName=NONE +Language=English +RF Controller +. + +MessageId=3345 +SymbolicName=NONE +Language=English +Bluetooth Controller +. + +MessageId=3346 +SymbolicName=NONE +Language=English +Broadband Controller +. + +MessageId=3360 +SymbolicName=NONE +Language=English +Ethernet 802.11a Controller +. + +MessageId=3361 +SymbolicName=NONE +Language=English +Ethernet 802.11b Controller +. + +MessageId=3456 +SymbolicName=NONE +Language=English +PCI Wireless Controller +. + +MessageId=3584 +SymbolicName=NONE +Language=English +Intelligent I/O (I2O) Controller +. + +MessageId=3841 +SymbolicName=NONE +Language=English +Satellite Communications Television Controller +. + +MessageId=3842 +SymbolicName=NONE +Language=English +Satellite Communications Audio Controller +. + +MessageId=3843 +SymbolicName=NONE +Language=English +Satellite Communications Voice Controller +. + +MessageId=3844 +SymbolicName=NONE +Language=English +Satellite Communications Data Controller +. + +MessageId=4096 +SymbolicName=NONE +Language=English +Network and Computing Encryption/Decryption Controller +. + +MessageId=4112 +SymbolicName=NONE +Language=English +Entertainment Encryption/Decryption Controller +. + +MessageId=4224 +SymbolicName=NONE +Language=English +PCI Encryption/Decryption Controller +. + +MessageId=4352 +SymbolicName=NONE +Language=English +DPIO Module +. + +MessageId=4353 +SymbolicName=NONE +Language=English +Performance Counters +. + +MessageId=4368 +SymbolicName=NONE +Language=English +PCI Communications Synchronization plus Time and Frequency Test/Measurement Controller +. + +MessageId=4384 +SymbolicName=NONE +Language=English +Management Card +. + +MessageId=4480 +SymbolicName=NONE +Language=English +PCI Data Acquisition and Signal Processing Controller +. Propchange: branches/reactos-yarotows/include/reactos/mc/pciclass.mc ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 2 months

[jgardou] 48029: I'll never bet again against svn... Add forgotten file, part 3 of x (Should be the last) Thanks Usurp.

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Jul 13 19:04:04 2010 New Revision: 48029 URL: http://svn.reactos.org/svn/reactos?rev=48029&view=rev Log: I'll never bet again against svn... Add forgotten file, part 3 of x (Should be the last) Thanks Usurp. Added: branches/reactos-yarotows/ntoskrnl/vf/ (with props) branches/reactos-yarotows/ntoskrnl/vf/driver.c (with props) Propchange: branches/reactos-yarotows/ntoskrnl/vf/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Jul 13 19:04:04 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/reactos-yarotows/ntoskrnl/vf/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/reactos-yarotows/ntoskrnl/vf/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/reactos-yarotows/ntoskrnl/vf/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/reactos-yarotows/ntoskrnl/vf/driver.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/vf/dr… ============================================================================== --- branches/reactos-yarotows/ntoskrnl/vf/driver.c (added) +++ branches/reactos-yarotows/ntoskrnl/vf/driver.c [iso-8859-1] Tue Jul 13 19:04:04 2010 @@ -1,0 +1,46 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/vf/driver.c + * PURPOSE: Driver Verifier Device Driver Interface + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +VfIsVerificationEnabled(IN VF_OBJECT_TYPE VfObjectType, + IN PVOID Object OPTIONAL) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +VOID +NTAPI +VfFailDeviceNode(IN PDEVICE_OBJECT PhysicalDeviceObject, + IN ULONG BugCheckMajorCode, + IN ULONG BugCheckMinorCode, + IN VF_FAILURE_CLASS FailureClass, + IN OUT PULONG AssertionControl, + IN PSTR DebuggerMessageText, + IN PSTR ParameterFormatString, + ...) +{ + UNIMPLEMENTED; +} + +/* EOF */ Propchange: branches/reactos-yarotows/ntoskrnl/vf/driver.c ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 2 months

[jgardou] 48028: Amine lost his bet, part 2 of x

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Jul 13 18:56:03 2010 New Revision: 48028 URL: http://svn.reactos.org/svn/reactos?rev=48028&view=rev Log: Amine lost his bet, part 2 of x Added: branches/reactos-yarotows/include/reactos/drivers/acpi/ (with props) branches/reactos-yarotows/include/reactos/drivers/acpi/acpi.h (with props) branches/reactos-yarotows/include/reactos/drivers/pci/ (with props) branches/reactos-yarotows/include/reactos/drivers/pci/pci.h (with props) Propchange: branches/reactos-yarotows/include/reactos/drivers/acpi/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Jul 13 18:56:03 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/reactos-yarotows/include/reactos/drivers/acpi/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/reactos-yarotows/include/reactos/drivers/acpi/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/reactos-yarotows/include/reactos/drivers/acpi/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/reactos-yarotows/include/reactos/drivers/acpi/acpi.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… ============================================================================== --- branches/reactos-yarotows/include/reactos/drivers/acpi/acpi.h (added) +++ branches/reactos-yarotows/include/reactos/drivers/acpi/acpi.h [iso-8859-1] Tue Jul 13 18:56:03 2010 @@ -1,0 +1,222 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: include/reactos/drivers/acpi/acpi.h + * PURPOSE: ACPI Tables and NT Registry Data + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +// +// ACPI BIOS Registry Component Configuration Data +// +typedef struct _ACPI_E820_ENTRY +{ + PHYSICAL_ADDRESS Base; + LARGE_INTEGER Length; + ULONGLONG Type; +} ACPI_E820_ENTRY, *PACPI_E820_ENTRY; + +typedef struct _ACPI_BIOS_MULTI_NODE +{ + PHYSICAL_ADDRESS RsdtAddress; + ULONGLONG Count; + ACPI_E820_ENTRY E820Entry[1]; +} ACPI_BIOS_MULTI_NODE, *PACPI_BIOS_MULTI_NODE; + +// +// ACPI Signatures +// +#define RSDP_SIGNATURE 0x2052545020445352 // "RSD PTR " +#define FACS_SIGNATURE 0x53434146 // "FACS" +#define FADT_SIGNATURE 0x50434146 // "FACP" +#define RSDT_SIGNATURE 0x54445352 // "RSDT" +#define APIC_SIGNATURE 0x43495041 // "APIC" +#define DSDT_SIGNATURE 0x54445344 // "DSDT" +#define SSDT_SIGNATURE 0x54445353 // "SSDT" +#define PSDT_SIGNATURE 0x54445350 // "PSDT" +#define SBST_SIGNATURE 0x54534253 // "SBST" +#define DBGP_SIGNATURE 0x50474244 // "DBGP" +#define XSDT_SIGNATURE 'TDSX' +#define BOOT_SIGNATURE 'TOOB' +#define SRAT_SIGNATURE 'TARS' +#define WDRT_SIGNATURE 'TRDW' + +// +// FADT Flags +// +#define ACPI_TMR_VAL_EXT 0x100 + +// +// ACPI Generic Register Address +// +typedef struct _GEN_ADDR +{ + UCHAR AddressSpaceID; + UCHAR BitWidth; + UCHAR BitOffset; + UCHAR Reserved; + PHYSICAL_ADDRESS Address; +} GEN_ADDR, *PGEN_ADDR; + +// +// ACPI BIOS Structures (packed) +// +#include <pshpack1.h> +typedef struct _RSDP +{ + ULONGLONG Signature; + UCHAR Checksum; + UCHAR OEMID[6]; + UCHAR Reserved[1]; + ULONG RsdtAddress; +} RSDP; +typedef RSDP *PRSDP; + +typedef struct _DESCRIPTION_HEADER +{ + ULONG Signature; + ULONG Length; + UCHAR Revision; + UCHAR Checksum; + UCHAR OEMID[6]; + UCHAR OEMTableID[8]; + ULONG OEMRevision; + UCHAR CreatorID[4]; + ULONG CreatorRev; +} DESCRIPTION_HEADER; +typedef DESCRIPTION_HEADER *PDESCRIPTION_HEADER; + +typedef struct _FACS +{ + ULONG Signature; + ULONG Length; + ULONG HardwareSignature; + ULONG pFirmwareWakingVector; + ULONG GlobalLock; + ULONG Flags; + PHYSICAL_ADDRESS x_FirmwareWakingVector; + UCHAR version; + UCHAR Reserved[32]; +} FACS; +typedef FACS *PFACS; + +typedef struct _FADT +{ + DESCRIPTION_HEADER Header; + ULONG facs; + ULONG dsdt; + UCHAR int_model; + UCHAR pm_profile; + USHORT sci_int_vector; + ULONG smi_cmd_io_port; + UCHAR acpi_on_value; + UCHAR acpi_off_value; + UCHAR s4bios_req; + UCHAR pstate_control; + ULONG pm1a_evt_blk_io_port; + ULONG pm1b_evt_blk_io_port; + ULONG pm1a_ctrl_blk_io_port; + ULONG pm1b_ctrl_blk_io_port; + ULONG pm2_ctrl_blk_io_port; + ULONG pm_tmr_blk_io_port; + ULONG gp0_blk_io_port; + ULONG gp1_blk_io_port; + UCHAR pm1_evt_len; + UCHAR pm1_ctrl_len; + UCHAR pm2_ctrl_len; + UCHAR pm_tmr_len; + UCHAR gp0_blk_len; + UCHAR gp1_blk_len; + UCHAR gp1_base; + UCHAR cstate_control; + USHORT lvl2_latency; + USHORT lvl3_latency; + USHORT flush_size; + USHORT flush_stride; + UCHAR duty_offset; + UCHAR duty_width; + UCHAR day_alarm_index; + UCHAR month_alarm_index; + UCHAR century_alarm_index; + USHORT boot_arch; + UCHAR reserved3[1]; + ULONG flags; + GEN_ADDR reset_reg; + UCHAR reset_val; + UCHAR reserved4[3]; + PHYSICAL_ADDRESS x_firmware_ctrl; + PHYSICAL_ADDRESS x_dsdt; + GEN_ADDR x_pm1a_evt_blk; + GEN_ADDR x_pm1b_evt_blk; + GEN_ADDR x_pm1a_ctrl_blk; + GEN_ADDR x_pm1b_ctrl_blk; + GEN_ADDR x_pm2_ctrl_blk; + GEN_ADDR x_pm_tmr_blk; + GEN_ADDR x_gp0_blk; + GEN_ADDR x_gp1_blk; +} FADT; +typedef FADT *PFADT; + +typedef struct _DSDT +{ + DESCRIPTION_HEADER Header; + UCHAR DiffDefBlock[ANYSIZE_ARRAY]; +} DSDT; +typedef DSDT *PDSDT; + +typedef struct _RSDT +{ + DESCRIPTION_HEADER Header; + ULONG Tables[ANYSIZE_ARRAY]; +} RSDT; +typedef RSDT *PRSDT; + +typedef struct _XSDT +{ + DESCRIPTION_HEADER Header; + PHYSICAL_ADDRESS Tables[ANYSIZE_ARRAY]; +} XSDT; +typedef XSDT *PXSDT; +#include <poppack.h> + +// +// Microsoft-specific (pretty much) ACPI Tables, normal MS ABI packing +// +typedef struct _DEBUG_PORT_TABLE +{ + DESCRIPTION_HEADER Header; + UCHAR InterfaceType; + UCHAR Reserved[3]; + GEN_ADDR BaseAddress; +} DEBUG_PORT_TABLE, *PDEBUG_PORT_TABLE; + +typedef struct _WATCHDOG_TABLE +{ + DESCRIPTION_HEADER Header; + GEN_ADDR ControlRegister; + GEN_ADDR CountRegister; + USHORT PciDeviceId; + USHORT PciVendorId; + UCHAR PciBus; + UCHAR PciDevice; + UCHAR PciFunction; + UCHAR PciSegment; + USHORT MaxCount; + UCHAR Units; +} WATCHDOG_TABLE, *PWATCHDOG_TABLE; + +typedef struct _BOOT_TABLE +{ + DESCRIPTION_HEADER Header; + UCHAR CMOSIndex; + UCHAR Reserved[3]; +} BOOT_TABLE, *PBOOT_TABLE; + +typedef struct _ACPI_SRAT +{ + DESCRIPTION_HEADER Header; + UCHAR TableRevision; + ULONG Reserved[2]; +} ACPI_SRAT, *PACPI_SRAT; + +/* EOF */ Propchange: branches/reactos-yarotows/include/reactos/drivers/acpi/acpi.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/reactos-yarotows/include/reactos/drivers/pci/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Jul 13 18:56:03 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/reactos-yarotows/include/reactos/drivers/pci/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/reactos-yarotows/include/reactos/drivers/pci/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/reactos-yarotows/include/reactos/drivers/pci/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/reactos-yarotows/include/reactos/drivers/pci/pci.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… ============================================================================== --- branches/reactos-yarotows/include/reactos/drivers/pci/pci.h (added) +++ branches/reactos-yarotows/include/reactos/drivers/pci/pci.h [iso-8859-1] Tue Jul 13 18:56:03 2010 @@ -1,0 +1,125 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: include/reactos/drivers/pci/pci.h + * PURPOSE: Internal, Shared, PCI Definitions + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +// +// PCI Hack Flags +// +#define PCI_HACK_LOCK_RESOURCES 0x0000000000000004LL +#define PCI_HACK_NO_ENUM_AT_ALL 0x0000000000000008LL +#define PCI_HACK_ENUM_NO_RESOURCE 0x0000000000000010LL +#define PCI_HACK_AVOID_D1D2_FOR_SLD 0x0000000000000020LL +#define PCI_HACK_NEVER_DISCONNECT 0x0000000000000040LL +#define PCI_HACK_DONT_DISABLE 0x0000000000000080LL +#define PCI_HACK_MULTIFUNCTION 0x0000000000000100LL +#define PCI_HACK_UNUSED_200 0x0000000000000200LL +#define PCI_HACK_IGNORE_NON_STICKY_ISA 0x0000000000000400LL +#define PCI_HACK_UNUSED_800 0x0000000000000800LL +#define PCI_HACK_DOUBLE_DECKER 0x0000000000001000LL +#define PCI_HACK_ONE_CHILD 0x0000000000002000LL +#define PCI_HACK_PRESERVE_COMMAND 0x0000000000004000LL +#define PCI_HACK_DEFAULT_CARDBUS_WINDOWS 0x0000000000008000LL +#define PCI_HACK_CB_SHARE_CMD_BITS 0x0000000000010000LL +#define PCI_HACK_IGNORE_ROOT_TOPOLOGY 0x0000000000020000LL +#define PCI_HACK_SUBTRACTIVE_DECODE 0x0000000000040000LL +#define PCI_HACK_NO_EXPRESS_CAP 0x0000000000080000LL +#define PCI_HACK_NO_ASPM_FOR_EXPRESS_LINK 0x0000000000100000LL +#define PCI_HACK_CLEAR_INT_DISABLE_FOR_MSI 0x0000000000200000LL +#define PCI_HACK_NO_SUBSYSTEM 0x0000000000400000LL +#define PCI_HACK_COMMAND_REWRITE 0x0000000000800000LL +#define PCI_HACK_AVOID_HARDWARE_ISA_BIT 0x0000000001000000LL +#define PCI_HACK_FORCE_BRIDGE_WINDOW_ALIGNMENT 0x0000000002000000LL +#define PCI_HACK_NOT_MSI_HT_CONVERTER 0x0000000004000000LL +#define PCI_HACK_PCI_HACK_SBR_ON_LINK_STATE_CHANGE 0x0000000008000000LL +#define PCI_HACK_PCI_HACK_LINK_DISABLE_ON_SLOT_PWRDN 0x0000000010000000LL +#define PCI_HACK_NO_PM_CAPS 0x0000000020000000LL +#define PCI_HACK_DONT_DISABLE_DECODES 0x0000000040000000LL +#define PCI_HACK_NO_SUBSYSTEM_AFTER_D3 0x0000000080000000LL +#define PCI_HACK_VIDEO_LEGACY_DECODE 0x0000000100000000LL +#define PCI_HACK_FAKE_CLASS_CODE 0x0000000200000000LL +#define PCI_HACK_UNUSED_40000000 0x0000000400000000LL +#define PCI_HACK_UNUSED_80000000 0x0000000800000000LL +#define PCI_HACK_FAIL_QUERY_REMOVE 0x0000001000000000LL +#define PCI_HACK_CRITICAL_DEVICE 0x0000002000000000LL +#define PCI_HACK_UNUSED_4000000000 0x0000004000000000LL +#define PCI_HACK_BROKEN_SUBTRACTIVE_DECODE 0x0000008000000000LL +#define PCI_HACK_NO_REVISION_AFTER_D3 0x0000010000000000LL +#define PCI_HACK_ENABLE_MSI_MAPPING 0x0000020000000000LL +#define PCI_HACK_DISABLE_PM_DOWNSTREAM_PCI_BRIDGE 0x0000040000000000LL + +// +// Bit encodes for PCI_COMMON_CONFIG.u.type1.BridgeControl +// +#define PCI_ENABLE_BRIDGE_PARITY_ERROR 0x0001 +#define PCI_ENABLE_BRIDGE_SERR 0x0002 +#define PCI_ENABLE_BRIDGE_ISA 0x0004 +#define PCI_ENABLE_BRIDGE_VGA 0x0008 +#define PCI_ENABLE_BRIDGE_MASTER_ABORT_SERR 0x0020 +#define PCI_ASSERT_BRIDGE_RESET 0x0040 +#define PCI_ENABLE_BRIDGE_VGA_16BIT 0x0010 + +// +// PCI IRQ Routing Table in BIOS/Registry (Signature: PIR$) +// +#include <pshpack1.h> +typedef struct _PIN_INFO +{ + UCHAR Link; + USHORT InterruptMap; +} PIN_INFO, *PPIN_INFO; + +typedef struct _SLOT_INFO +{ + UCHAR BusNumber; + UCHAR DeviceNumber; + PIN_INFO PinInfo[4]; + UCHAR SlotNumber; + UCHAR Reserved; +} SLOT_INFO, *PSLOT_INFO; + +typedef struct _PCI_IRQ_ROUTING_TABLE +{ + ULONG Signature; + USHORT Version; + USHORT TableSize; + UCHAR RouterBus; + UCHAR RouterDevFunc; + USHORT ExclusiveIRQs; + ULONG CompatibleRouter; + ULONG MiniportData; + UCHAR Reserved[11]; + UCHAR Checksum; + SLOT_INFO Slot[ANYSIZE_ARRAY]; +} PCI_IRQ_ROUTING_TABLE, *PPCI_IRQ_ROUTING_TABLE; +#include <poppack.h> + +// +// PCI Registry Information +// +typedef struct _PCI_REGISTRY_INFO +{ + UCHAR MajorRevision; + UCHAR MinorRevision; + UCHAR NoBuses; // Number Of Buses + UCHAR HardwareMechanism; +} PCI_REGISTRY_INFO, *PPCI_REGISTRY_INFO; + +// +// PCI Card Descriptor in Registry +// +typedef struct _PCI_CARD_DESCRIPTOR +{ + ULONG Flags; + USHORT VendorID; + USHORT DeviceID; + USHORT RevisionID; + USHORT SubsystemVendorID; + USHORT SubsystemID; + USHORT Reserved; +} PCI_CARD_DESCRIPTOR, *PPCI_CARD_DESCRIPTOR; + +/* EOF */ Propchange: branches/reactos-yarotows/include/reactos/drivers/pci/pci.h ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 2 months

[jgardou] 48027: [WIN32K] - Remove useless chack and comment from UserDrawIconEx

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Jul 13 18:38:19 2010 New Revision: 48027 URL: http://svn.reactos.org/svn/reactos?rev=48027&view=rev Log: [WIN32K] - Remove useless chack and comment from UserDrawIconEx Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Tue Jul 13 18:38:19 2010 @@ -1324,12 +1324,9 @@ return FALSE; } - /* NtGdiCreateCompatibleBitmap will create a monochrome bitmap - when cxWidth or cyHeight is 0 */ + /* Check for alpha */ if (hbmColor && (bmpColor.bmBitsPixel == 32) - && (cxWidth != 0) - && (cyHeight != 0) && (diFlags & DI_IMAGE)) { SURFACE *psurfOff = NULL;

14 years, 2 months

← Newer
1
...
33
34
35
36
37
38
39
...
47
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 July 2010