Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[dreimer] 30832: Update Documentation (Part 1 of X).

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Nov 28 11:18:51 2007 New Revision: 30832 URL: http://svn.reactos.org/svn/reactos?rev=30832&view=rev Log: Update Documentation (Part 1 of X). Modified: trunk/tools/RosBE/RosBE-Windows/Documentation/files/adv.html trunk/tools/RosBE/RosBE-Windows/Documentation/files/basic.html trunk/tools/RosBE/RosBE-Windows/Documentation/files/features.html trunk/tools/RosBE/RosBE-Windows/Documentation/files/intro.html Modified: trunk/tools/RosBE/RosBE-Windows/Documentation/files/adv.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Document… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Documentation/files/adv.html (original) +++ trunk/tools/RosBE/RosBE-Windows/Documentation/files/adv.html Wed Nov 28 11:18:51 2007 @@ -1,12 +1,26 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>Advanced Features</title> - <meta name="author" content="Daniel Reimer"> - <meta name="description" content="Lists the Advanced Features of RosBE"> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Advanced Features</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" + content="Lists the Advanced Features of RosBE"> </head> <body> -SVN 1.4.5 is included in RosBE. Manual can be found here: +MinGW GCC 4.1.3 is included in RosBE. Manual can be found here: <a + href="http://www.mingw.org/">http://www.mingw.org/</a>and <a + href="http://gcc.gnu.org/">http://gcc.gnu.org</a> +Binutils 2.18.50 is included in RosBE. Manual can be found here: <a + href="http://www.gnu.org/software/binutils/">http://www.gnu.org/software/binutils</a> +SVN 1.4.5 is included in RosBE. Manual can be found here: <a + href="http://subversion.tigris.org/">http://subversion.tigris.org</a> +CCache 2.4 is included in RosBE. Manual can be found here: <a + href="http://ccache.samba.org/">http://ccache.samba.org</a> +GDB 6.7.1 is included in RosBE. Manual can be found here: <a + href="http://www.gnu.org/software/gdb/">http://www.gnu.org/software/gdb</a> +NASM 2.00 is included in RosBE. Manual can be found here: <a + href="http://nasm.sourceforge.net/">http://nasm.sourceforge.net</a> + </body> </html> Modified: trunk/tools/RosBE/RosBE-Windows/Documentation/files/basic.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Document… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Documentation/files/basic.html (original) +++ trunk/tools/RosBE/RosBE-Windows/Documentation/files/basic.html Wed Nov 28 11:18:51 2007 @@ -33,7 +33,8 @@ located in the RosBE directory, instructions for doing so are contained within the file.</dd> <dt>basedir</dt> - <dd>Usage: basedir</dd> + <dd>Usage: basedir + </dd> <dd>Switches back to the ReactOS source directory.</dd> <dt>chdefdir</dt> <dd>Usage: chdefdir [OPTIONS]</dd> @@ -42,10 +43,12 @@ Trees. Exiting RosBE sets back to the Default. </dd> <dd> <ul> - <li> <dfn>default</dfn> - Sets back to the Default Source Folder -without a restart of RosBE.</li> + <li> <dfn>previous </dfn>- Switch to the previous ReactOS +source directory.</li> </ul> </dd> + <dt>chdefgcc [PATH]</dt> + <dd>Change the MinGW/GCC directory for the current RosBE session.</dd> <dt>clean</dt> <dd>Usage: clean [logs]</dd> <dd> Fully cleans the ReactOS source directory and does a better job @@ -68,7 +71,10 @@ <dd> <ul> <li> <dfn>delete</dfn> - Deletes the created configuration File -and so sets back to default settings. </li> +and so sets back to default settings.</li> + <li>update - Deletes the +old created configuration file and updates it with a new, default one. + </li> </ul> </dd> <dt>help</dt> @@ -80,7 +86,7 @@ <dd> Starts the RosBE Configuration Program. </dd> <dt>raddr2line</dt> - <dd>Usage: raddr2line [OPTIONS]</dd> + <dd>Usage: raddr2line [FILE] [ADDRESS]</dd> <dd> This Command translates program addresses of BSODs into file names and line numbers of the Code it was built of to assist Developers to find specific Bugs in ReactOS. This Tool is mainly a Dev Tool. @@ -88,21 +94,24 @@ something. </dd> <dd> <ul> - <li> <dfn>first parameter</dfn> - has to be the Executable to be -analyzed. </li> - <li> <dfn>second parameter</dfn> - has to be the address to be -translated. If you don't set the needed Parameters, you will be asked -for them. </li> + <li> <dfn>FILE</dfn> - This can be either a fully specified path +or just the file name [you can use a partial name ie. ntdll*] of the +executable to be analyzed. When using just a file the current directory +and all sub-directories are searched.<dfn></dfn></li> + <li><dfn>ADDRESS</dfn> - The address to be translated. + <dfn></dfn></li> </ul> </dd> <dt>scut</dt> <dd>Usage: scut [OPTIONS]</dd> <dd>Defines, Edits, Removes, Switches and Defaults to Shortcutted Source Directories. scut started without a parameter or with the name -of a Shortcut as parameter sets this Shortcut active. </dd> +of a Shortcut as parameter sets this Shortcut active. + </dd> <dd> <ul> - <li> <dfn>add</dfn> - Adds a Shortcut to a sourcecode. </li> + <li> <dfn>list</dfn> - Lists all shortcuts and their paths. <dfn></dfn></li> + <li><dfn>add</dfn> - Adds a Shortcut to a sourcecode.</li> <li> <dfn>rem</dfn> - Deletes a specific shortcut. </li> <li> <dfn>edit</dfn> - Lets you edit a specific shortcut. </li> <li> <dfn>def</dfn> - Chooses Default Shortcut which is enabled Modified: trunk/tools/RosBE/RosBE-Windows/Documentation/files/features.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Document… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Documentation/files/features.html (original) +++ trunk/tools/RosBE/RosBE-Windows/Documentation/files/features.html Wed Nov 28 11:18:51 2007 @@ -1,21 +1,21 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>Features</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Lists the Features of RosBE" name="description"> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Features</title> + <meta content="Daniel Reimer" name="author"> + <meta content="Lists the Features of RosBE" name="description"> </head> <body> - <ul> - <li>Creating, Cleaning and Updating the Tree with included SVN and sSVN.</li> - <li>Building the Source (Multi Core Optimized)*</li> - <li>Maintain Several Trees at once.</li> - <li>Configure the Tree Settings with an easy to use editor.</li> - <li>Help for Debugging, thanks to included GDB and raddr2line.</li> - <li>Support for non Admin Rights Account.*</li> - </ul> - - * = This Feature is not supported under Windows Vista! +<ul> + <li>Creating, Cleaning and Updating the Tree with included SVN and +sSVN.</li> + <li>Building the Source (Multi Core Optimized)</li> + <li>Maintain Several Trees at once.</li> + <li>Configure the Tree Settings with an easy to use editor.</li> + <li>Help for Debugging, thanks to included GDB and raddr2line.</li> + <li>Support for non Admin Rights Account.*</li> +</ul> +* = This Feature is not supported under Windows Vista! </body> </html> Modified: trunk/tools/RosBE/RosBE-Windows/Documentation/files/intro.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Document… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Documentation/files/intro.html (original) +++ trunk/tools/RosBE/RosBE-Windows/Documentation/files/intro.html Wed Nov 28 11:18:51 2007 @@ -1,29 +1,41 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>Introduction</title> - <meta name="author" content="Daniel Reimer"> - <meta name="description" content="Shows the Introduction to RosBE"> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Introduction</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" content="Shows the Introduction to RosBE"> </head> <body> First of all, lets answer the main question: What is RosBE? -Its a Environment for building ReactOS on your own, its based on GCC 4.1.3 +Its a Environment for building ReactOS on your own, its based on GCC +4.1.3 Compiler and aims to be the one and only Build Environment for absolute Beginners up to skilled devs. - Realizing this wide spectrum in one BE is quite difficult of course. -How, as an example, do you tell a newbie how to use SVN or maintain/update a +How, as an example, do you tell a newbie how to use SVN or +maintain/update a Source tree? -Easy. This package has the typical, well known SVN for all advanced devs and a -slim Version specially made for newbies, called sSVN (Simple SVN), which only -does the main stuff and has no difficult to understand or even dangerous, if -wrong used, functions. Additionally it checks the working folder, if its empty -or not. If its no empty folder, it does not even allow the User to continue. - +Easy. This package has the typical, well known SVN for all advanced +devs and a +slim Version specially made for newbies, called sSVN (Simple SVN), +which only +does the main stuff and has no difficult to understand or even +dangerous, if +wrong used, functions. Additionally it checks the working folder, if +its empty +or not. If its no empty folder, it does not even allow the User to +continue. And this is just the beginning of a big list of features. Devs will be happy with the included GDB and raddr2line. -Multi Core PC Users will love "makex" which automatically detects the number of -CPU Cores and optimizes the Build process to that Number. +Multi Core PC Users will love "makex" which automatically detects the +number of +CPU Cores and optimizes the Build process to that Number. +Easy to maintain several trees by making Shortcuts to the paths with +our tool, SCut. +Setting of a dozen of build parameters with a easy to understand +Configurator App. +etc... + </body> </html>

16 years, 9 months

[jimtabor] 30831: - Removed NtGdiGet/SetStretchBltMode, updated all related files. - Implement GetHFONT & Get/SetLayout/Width. - Add layout types to PSDK. - Updates and small cleanups.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Nov 28 10:52:51 2007 New Revision: 30831 URL: http://svn.reactos.org/svn/reactos?rev=30831&view=rev Log: - Removed NtGdiGet/SetStretchBltMode, updated all related files. - Implement GetHFONT & Get/SetLayout/Width. - Add layout types to PSDK. - Updates and small cleanups. Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/hacks… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/hacks.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/hacks.c Wed Nov 28 10:52:51 2007 @@ -64,17 +64,6 @@ * @implemented * */ -int -STDCALL -GetStretchBltMode(HDC hdc) -{ - return NtGdiGetStretchBltMode(hdc); -} - -/* - * @implemented - * - */ BOOL STDCALL OffsetViewportOrgEx(HDC hdc, Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Wed Nov 28 10:52:51 2007 @@ -61,17 +61,6 @@ { /* FIXME share memory */ return NtGdiSetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbmi, fuColorUse); -} - -/* - * @unimplemented - */ -int -STDCALL -SetStretchBltMode(HDC hdc, int iStretchMode) -{ - /* FIXME share memory */ - return NtGdiSetStretchBltMode(hdc, iStretchMode); } /* @@ -1439,31 +1428,6 @@ } /* - * @unimplemented - */ -HFONT -STDCALL -GetHFONT(HDC dc) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -DWORD -STDCALL -GetLayout(HDC hdc -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* * @implemented */ BOOL @@ -1583,33 +1547,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } - -/* - * @unimplemented - */ -DWORD -STDCALL -SetLayout(HDC hdc, - DWORD dwLayout) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -DWORD -STDCALL -SetLayoutWidth(HDC hdc,LONG wox,DWORD dwLayout) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - /* * @implemented Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Wed Nov 28 10:52:51 2007 @@ -1515,7 +1515,7 @@ if ( !pLDC ) { SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + return NULL; } if (pLDC->iType == LDC_EMFLDC) { @@ -1560,11 +1560,134 @@ else { SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + return 0; } #endif if ((Mode == Dc_Attr->iMapMode) && (Mode != MM_ISOTROPIC)) return Mode; return GetAndSetDCDWord( hdc, GdiGetSetMapMode, Mode, 0, 0, 0 ); } - +/* + * @implemented + * + */ +int +STDCALL +GetStretchBltMode(HDC hdc) +{ + PDC_ATTR Dc_Attr; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return 0; + return Dc_Attr->lStretchBltMode; +} + +/* + * @implemented + */ +int +STDCALL +SetStretchBltMode(HDC hdc, int iStretchMode) +{ + INT oSMode; + PDC_ATTR Dc_Attr; +#if 0 + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetStretchBltMode( hdc, iStretchMode); + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetStretchBltMode( hdc, iStretchMode); + } + } + } +#endif + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return 0; + + oSMode = Dc_Attr->lStretchBltMode; + Dc_Attr->lStretchBltMode = iStretchMode; + + // Wine returns an error here. We set the default. + if ((iStretchMode <= 0) || (iStretchMode > MAXSTRETCHBLTMODE)) iStretchMode = WHITEONBLACK; + + Dc_Attr->jStretchBltMode = iStretchMode; + + return oSMode; +} + +/* + * @implemented + */ +HFONT +STDCALL +GetHFONT(HDC hdc) +{ + PDC_ATTR Dc_Attr; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return NULL; + return Dc_Attr->hlfntNew; +} + +/* + * @implemented + */ +DWORD +STDCALL +GetLayout(HDC hdc +) +{ + PDC_ATTR Dc_Attr; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return GDI_ERROR; + return Dc_Attr->dwLayout; +} + + +/* + * @implemented + */ +DWORD +STDCALL +SetLayout(HDC hdc, + DWORD dwLayout) +{ +#if 0 + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetLayout( hdc, dwLayout); + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetLayout( hdc, dwLayout); + } + } + } +#endif + if (!GdiIsHandleValid((HGDIOBJ) hdc)) return GDI_ERROR; + return NtGdiSetLayout( hdc, -1, dwLayout); +} + +/* + * @implemented + */ +DWORD +STDCALL +SetLayoutWidth(HDC hdc,LONG wox,DWORD dwLayout) +{ + if (!GdiIsHandleValid((HGDIOBJ) hdc)) return GDI_ERROR; + return NtGdiSetLayout( hdc, wox, dwLayout); +} + Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h (original) +++ trunk/reactos/include/psdk/wingdi.h Wed Nov 28 10:52:51 2007 @@ -1193,7 +1193,10 @@ #define WGL_SWAP_UNDERLAY14 0x20000000 #define WGL_SWAP_UNDERLAY15 0x40000000 #define AC_SRC_OVER 0 -#define LAYOUT_RTL 1 +#define LAYOUT_RTL 1 // Right to left +#define LAYOUT_BTT 2 // Bottom to top +#define LAYOUT_VBH 4 // Vertical before horizontal +#define LAYOUT_ORIENTATIONMASK (LAYOUT_RTL | LAYOUT_BTT | LAYOUT_VBH) #define LAYOUT_BITMAPORIENTATIONPRESERVED 8 #if (WINVER > 0x400) #define CS_ENABLE 0x00000001 Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Wed Nov 28 10:52:51 2007 @@ -276,9 +276,6 @@ NtGdiGetPixelFormat(HDC hDC); /* Should be done in user-mode using shared GDI Objects. */ -INT STDCALL NtGdiGetStretchBltMode(HDC hDC); - -/* Should be done in user-mode using shared GDI Objects. */ UINT STDCALL NtGdiGetTextCharset(HDC hDC); @@ -388,9 +385,6 @@ STDCALL NtGdiSetMapperFlags(HDC hDC, DWORD Flag); - -/* Needs to be done in user-mode, using shared GDI Object Attributes. */ -INT STDCALL NtGdiSetStretchBltMode(HDC hDC, INT stretchBltMode); /* Needs to be done in user-mode. */ BOOL Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Wed Nov 28 10:52:51 2007 @@ -378,6 +378,9 @@ HDC hNext; HDC hPrev; + RECTL erclWindow; + RECTL erclBounds; + CLIPOBJ *CombinedClip; XLATEOBJ *XlateBrush; XLATEOBJ *XlatePen; Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Wed Nov 28 10:52:51 2007 @@ -42,6 +42,7 @@ PERESOURCE hsemDevLock; + PVOID pvGammaRamp; PVOID pfnSync; DHPDEV PDev; @@ -112,6 +113,7 @@ UINT FASTCALL NtGdiSetTextAlign(HDC hDC, UINT Mode); UINT STDCALL NtGdiGetTextAlign(HDC hDC); COLORREF STDCALL NtGdiGetTextColor(HDC hDC); +INT STDCALL NtGdiSetStretchBltMode(HDC hDC, INT stretchBltMode); /* For Metafile and MetaEnhFile not in windows this struct taken from wine cvs 15/9-2006*/ typedef struct Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c Wed Nov 28 10:52:51 2007 @@ -959,5 +959,43 @@ return TRUE; } + /* + * @unimplemented + */ +DWORD +APIENTRY +NtGdiSetLayout( + IN HDC hdc, + IN LONG wox, + IN DWORD dwLayout) +{ + PDC dc; + PDC_ATTR Dc_Attr; + DWORD oLayout; + + dc = DC_LockDc(hdc); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return GDI_ERROR; + } + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + Dc_Attr->dwLayout = dwLayout; + oLayout = Dc_Attr->dwLayout; + + if (!(dwLayout & LAYOUT_ORIENTATIONMASK)) + { + DC_UnlockDc(dc); + return oLayout; + } + +// DC_UpdateXforms(dc); + DC_UnlockDc(dc); + + UNIMPLEMENTED; + return GDI_ERROR; +} /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Nov 28 10:52:51 2007 @@ -827,11 +827,15 @@ ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.cPlanes; DPRINT("Bits per pel: %u\n", NewDC->w.bitsPerPixel); - if (! CreateAsIC) + if (!CreateAsIC) { NewDC->PalIndexed = NtGdiGetStockObject(DEFAULT_PALETTE); NewDC->w.hPalette = PrimarySurface.DevInfo.hpalDefault; nDc_Attr->jROP2 = R2_COPYPEN; + + NewDC->erclWindow.top = NewDC->erclWindow.left = 0; + NewDC->erclWindow.right = ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.ulHorzRes; + NewDC->erclWindow.bottom = ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.ulVertRes; DC_UnlockDc( NewDC ); @@ -1189,6 +1193,7 @@ if(!nDc_Attr) nDc_Attr = &newdc->Dc_Attr; newdc->w.flags = dc->w.flags | DC_SAVED; + nDc_Attr->dwLayout = Dc_Attr->dwLayout; nDc_Attr->hpen = Dc_Attr->hpen; nDc_Attr->hbrush = Dc_Attr->hbrush; nDc_Attr->hlfntNew = Dc_Attr->hlfntNew; @@ -1272,6 +1277,7 @@ dc->w.hDevice = dcs->w.hDevice; #endif + Dc_Attr->dwLayout = sDc_Attr->dwLayout; dc->w.totalExtent = dcs->w.totalExtent; Dc_Attr->jROP2 = sDc_Attr->jROP2; Dc_Attr->jFillMode = sDc_Attr->jFillMode; Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Wed Nov 28 10:52:51 2007 @@ -3172,20 +3172,6 @@ /* * @unimplemented */ -DWORD -APIENTRY -NtGdiSetLayout( - IN HDC hdc, - IN LONG wox, - IN DWORD dwLayout) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ INT APIENTRY NtGdiStretchDIBitsInternal( 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 (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Nov 28 10:52:51 2007 @@ -683,7 +683,6 @@ NtGdiSetEnhMetaFileBits 2 NtGdiSetICMProfile 2 NtGdiSetMapperFlags 2 -NtGdiSetStretchBltMode 2 NtGdiSetViewportExtEx 4 NtGdiSetViewportOrgEx 4 NtGdiSetWindowExtEx 4 @@ -749,7 +748,6 @@ NtGdiGetICMProfile 3 NtGdiGetLogColorSpace 3 NtGdiGetPixelFormat 1 -NtGdiGetStretchBltMode 1 NtGdiGetTextExtentPoint32 4 NtGdiOffsetViewportOrgEx 4 NtGdiOffsetWindowOrgEx 4

16 years, 9 months

[greatlrd] 30830: hopply this will make wined3d more happy, implement all need it flags for wglGetPixelFormatAttribfvARB and wglGetPixelFormatAttribivARB that wined3d using

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Nov 28 03:10:13 2007 New Revision: 30830 URL: http://svn.reactos.org/svn/reactos?rev=30830&view=rev Log: hopply this will make wined3d more happy, implement all need it flags for wglGetPixelFormatAttribfvARB and wglGetPixelFormatAttribivARB that wined3d using Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c Wed Nov 28 03:10:13 2007 @@ -773,6 +773,24 @@ /* WGL_ARB_pixel_format */ #define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000 #define WGL_SUPPORT_OPENGL_ARB 0x2010 +#define WGL_STEREO_ARB 0x2012 +#define WGL_PIXEL_TYPE_ARB 0x2013 +#define WGL_COLOR_BITS_ARB 0x2014 +#define WGL_RED_BITS_ARB 0x2015 +#define WGL_RED_SHIFT_ARB 0x2016 +#define WGL_GREEN_BITS_ARB 0x2017 +#define WGL_GREEN_SHIFT_ARB 0x2018 +#define WGL_BLUE_BITS_ARB 0x2019 +#define WGL_BLUE_SHIFT_ARB 0x201A +#define WGL_ALPHA_BITS_ARB 0x201B +#define WGL_ALPHA_SHIFT_ARB 0x201C +#define WGL_ACCUM_BITS_ARB 0x201D +#define WGL_ACCUM_RED_BITS_ARB 0x201E +#define WGL_ACCUM_GREEN_BITS_ARB 0x201F +#define WGL_ACCUM_BLUE_BITS_ARB 0x2020 +#define WGL_ACCUM_ALPHA_BITS_ARB 0x2021 +#define WGL_DEPTH_BITS_ARB 0x2022 +#define WGL_STENCIL_BITS_ARB 0x2023 GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribivARB (HDC hdc, @@ -792,11 +810,35 @@ case WGL_NUMBER_PIXEL_FORMATS_ARB : piValues[i] = (int)npfd; retVal = TRUE; - break; - - case WGL_SUPPORT_OPENGL_ARB: - piValues[i] = (int)TRUE; + + case WGL_SUPPORT_OPENGL_ARB: + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.dwFlags & ~PFD_SUPPORT_OPENGL; retVal = TRUE; + break; + + case WGL_RED_BITS_ARB : + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cRedBits; + break; + + case WGL_GREEN_BITS_ARB : + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cGreenBits; + break; + + case WGL_BLUE_BITS_ARB : + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cBlueBits; + break; + + case WGL_ALPHA_BITS_ARB : + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAlphaBits; + break; + + case WGL_DEPTH_BITS_ARB : + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cDepthBits; + break; + + case WGL_STENCIL_BITS_ARB : + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAuxBuffers; + break; default : SetLastError(0); @@ -825,11 +867,35 @@ case WGL_NUMBER_PIXEL_FORMATS_ARB : pfValues[i] = (FLOAT)npfd; retVal = TRUE; - break; - - case WGL_SUPPORT_OPENGL_ARB: - pfValues[i] = (FLOAT)TRUE; + + case WGL_SUPPORT_OPENGL_ARB: + pfValues[i] = (FLOAT) (pfd[iPixelFormat - 1].pfd.dwFlags & ~PFD_SUPPORT_OPENGL); retVal = TRUE; + break; + + case WGL_RED_BITS_ARB : + pfValues[i] = (FLOAT)pfd[iPixelFormat - 1].pfd.cRedBits; + break; + + case WGL_GREEN_BITS_ARB : + pfValues[i] = (FLOAT)pfd[iPixelFormat - 1].pfd.cGreenBits; + break; + + case WGL_BLUE_BITS_ARB : + pfValues[i] = (FLOAT)pfd[iPixelFormat - 1].pfd.cBlueBits; + break; + + case WGL_ALPHA_BITS_ARB : + pfValues[i] = (FLOAT)pfd[iPixelFormat - 1].pfd.cAlphaBits; + break; + + case WGL_DEPTH_BITS_ARB : + pfValues[i] = (FLOAT)pfd[iPixelFormat - 1].pfd.cDepthBits; + break; + + case WGL_STENCIL_BITS_ARB : + pfValues[i] = (FLOAT)pfd[iPixelFormat - 1].pfd.cAuxBuffers; + break; default : SetLastError(0);

16 years, 9 months

[cwittich] 30829: translated some DPRINTs from GreatLordish into a human readable format

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Nov 28 03:09:52 2007 New Revision: 30829 URL: http://svn.reactos.org/svn/reactos?rev=30829&view=rev Log: translated some DPRINTs from GreatLordish into a human readable format Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Wed Nov 28 03:09:52 2007 @@ -53,7 +53,7 @@ ghDxGraphics = EngLoadImage(L"drivers\\dxg.sys"); if (!ghDxGraphics) { - DPRINT1("Warring no dxg.sys in ReactOS"); + DPRINT1("Warning: dxg.sys not found\n"); Status = STATUS_DLL_NOT_FOUND; } else @@ -85,7 +85,7 @@ gpfnCleanupDxGraphics = NULL; EngUnloadImage( ghDxGraphics); ghDxGraphics = NULL; - DPRINT1("Warring no init of DirectX graphic interface"); + DPRINT1("Warning: DirectX graphics interface can not be initialized\n"); } else { @@ -100,7 +100,7 @@ gpDxFuncs[lstDrvFN[t].iFunc].iFunc =lstDrvFN[t].iFunc; gpDxFuncs[lstDrvFN[t].iFunc].pfn =lstDrvFN[t].pfn; } - DPRINT1("DirectX interface is Activated"); + DPRINT1("DirectX interface is activated\n"); } /* return the status */ } @@ -132,7 +132,7 @@ Status = DxDdStartupDxGraphics(0,NULL,0,NULL,NULL, Proc); if (!NT_SUCCESS(Status)) { - DPRINT1("Warring : Fail to statup the directx interface"); + DPRINT1("Warning : Failed to create the directx interface\n"); return 0; } @@ -141,11 +141,11 @@ if (pfnDdCreateDirectDrawObject == NULL) { - DPRINT1("Warring no pfnDdCreateDirectDrawObject"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdCreateDirectDrawObject"); + DPRINT1("Warning: no pfnDdCreateDirectDrawObject\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys DdCreateDirectDrawObject\n"); return pfnDdCreateDirectDrawObject(hdc); } @@ -196,11 +196,11 @@ if (pfnDxgGenericThunk == NULL) { - DPRINT1("Warring no pfnDxgGenericThunk"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDxgGenericThunk"); + DPRINT1("Warning: no pfnDxgGenericThunk\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDxgGenericThunk\n"); return pfnDxgGenericThunk(ulIndex, ulHandle, pdwSizeOfPtr1, pvPtr1, pdwSizeOfPtr2, pvPtr2); } @@ -218,11 +218,11 @@ if (pfnDdGetDriverState == NULL) { - DPRINT1("Warring no pfnDdGetDriverState"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdGetDriverState"); + DPRINT1("Warning: no pfnDdGetDriverState\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys DdGetDriverState\n"); return pfnDdGetDriverState(pdata); } @@ -241,11 +241,11 @@ if (pfnDdColorControl == NULL) { - DPRINT1("Warring no pfnDdColorControl"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdColorControl"); + DPRINT1("Warning: no pfnDdColorControl\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys DdColorControl\n"); return pfnDdColorControl(hSurface,puColorControlData); } @@ -269,11 +269,11 @@ if (pfnDdCreateSurfaceObject == NULL) { - DPRINT1("Warring no pfnDdCreateSurfaceObject"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdCreateSurfaceObject"); + DPRINT1("Warning: no pfnDdCreateSurfaceObject\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdCreateSurfaceObject\n"); return pfnDdCreateSurfaceObject(hDirectDrawLocal, hSurface, puSurfaceLocal, puSurfaceMore, puSurfaceGlobal, bComplete); } @@ -291,11 +291,11 @@ if (pfnDdDeleteDirectDrawObject == NULL) { - DPRINT1("Warring no pfnDdDeleteDirectDrawObject"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdDeleteDirectDrawObject"); + DPRINT1("Warning: no pfnDdDeleteDirectDrawObject\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdDeleteDirectDrawObject\n"); return pfnDdDeleteDirectDrawObject(hDirectDrawLocal); } @@ -313,11 +313,11 @@ if (pfnDdDeleteSurfaceObject == NULL) { - DPRINT1("Warring no pfnDdDeleteSurfaceObject"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdDeleteSurfaceObject"); + DPRINT1("Warning: no pfnDdDeleteSurfaceObject\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys DdDeleteSurfaceObject\n"); return pfnDdDeleteSurfaceObject(hSurface); } @@ -345,11 +345,11 @@ if (pfnDdQueryDirectDrawObject == NULL) { - DPRINT1("Warring no pfnDdQueryDirectDrawObject"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdQueryDirectDrawObject"); + DPRINT1("Warning: no pfnDdQueryDirectDrawObject\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdQueryDirectDrawObject\n"); return pfnDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, puvmList, puNumFourCC, puFourCC); } @@ -370,11 +370,11 @@ if (pfnDdReenableDirectDrawObject == NULL) { - DPRINT1("Warring no pfnDdReenableDirectDrawObject"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdReenableDirectDrawObject"); + DPRINT1("Warning: no pfnDdReenableDirectDrawObject\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdReenableDirectDrawObject\n"); return pfnDdReenableDirectDrawObject(hDirectDrawLocal, pubNewMode); } @@ -395,11 +395,11 @@ if (pfnDdGetDriverInfo == NULL) { - DPRINT1("Warring no pfnDdGetDriverInfo"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdGetDriverInfo"); + DPRINT1("Warning: no pfnDdGetDriverInfo\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdGetDriverInfo\n"); return pfnDdGetDriverInfo(hDirectDrawLocal, puGetDriverInfoData); } @@ -419,11 +419,11 @@ if (pfnDdGetAvailDriverMemory == NULL) { - DPRINT1("Warring no pfnDdGetAvailDriverMemory"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdGetAvailDriverMemory"); + DPRINT1("Warning: no pfnDdGetAvailDriverMemory\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdGetAvailDriverMemory\n"); return pfnDdGetAvailDriverMemory(hDirectDrawLocal, puGetAvailDriverMemoryData); } @@ -444,11 +444,11 @@ if (pfnDdSetExclusiveMode == NULL) { - DPRINT1("Warring no pfnDdSetExclusiveMode"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdSetExclusiveMode"); + DPRINT1("Warning: no pfnDdSetExclusiveMode\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdSetExclusiveMode\n"); return pfnDdSetExclusiveMode(hDirectDraw, puSetExclusiveModeData); } @@ -469,11 +469,11 @@ if (pfnDdFlipToGDISurface == NULL) { - DPRINT1("Warring no pfnDdFlipToGDISurface"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdFlipToGDISurface"); + DPRINT1("Warning: no pfnDdFlipToGDISurface\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdFlipToGDISurface\n"); return pfnDdFlipToGDISurface(hDirectDraw, puFlipToGDISurfaceData); } @@ -493,11 +493,11 @@ if (pfnDdGetDC == NULL) { - DPRINT1("Warring no pfnDdGetDC"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdGetDC"); + DPRINT1("Warning: no pfnDdGetDC\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdGetDC\n"); return pfnDdGetDC(hSurface, puColorTable); } @@ -518,11 +518,11 @@ if (pfnDdGetDxHandle == NULL) { - DPRINT1("Warring no pfnDdGetDxHandle"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdGetDxHandle"); + DPRINT1("Warning: no pfnDdGetDxHandle\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdGetDxHandle\n"); return pfnDdGetDxHandle(hDirectDraw, hSurface, bRelease); } @@ -541,11 +541,11 @@ if (pfnDdReleaseDC == NULL) { - DPRINT1("Warring no pfnDdReleaseDC"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdReleaseDC"); + DPRINT1("Warning: no pfnDdReleaseDC\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdReleaseDC\n"); return pfnDdReleaseDC(hSurface); } @@ -565,11 +565,11 @@ if (pfnDdResetVisrgn == NULL) { - DPRINT1("Warring no pfnDdResetVisrgn"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdResetVisrgn"); + DPRINT1("Warning: no pfnDdResetVisrgn\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdResetVisrgn\n"); return pfnDdResetVisrgn(hSurface, hwnd); } @@ -589,11 +589,11 @@ if (pfnDdSetGammaRamp == NULL) { - DPRINT1("Warring no pfnDdSetGammaRamp"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdSetGammaRamp"); + DPRINT1("Warning: no pfnDdSetGammaRamp\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdSetGammaRamp\n"); return pfnDdSetGammaRamp(hDirectDraw, hdc, lpGammaRamp); }

16 years, 9 months

[greatlrd] 30828: start implement wglGetPixelFormatAttribivARB and wglGetPixelFormatAttribfARB

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Nov 28 02:41:57 2007 New Revision: 30828 URL: http://svn.reactos.org/svn/reactos?rev=30828&view=rev Log: start implement wglGetPixelFormatAttribivARB and wglGetPixelFormatAttribfARB Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h (original) +++ trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h Wed Nov 28 02:41:57 2007 @@ -114,8 +114,8 @@ GLAPI BOOL GLAPIENTRY wglChoosePixelFormatARB (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); GLAPI BOOL GLAPIENTRY wglSwapIntervalEXT (int interval); GLAPI int GLAPIENTRY wglGetSwapIntervalEXT (void); -GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); -GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues); +GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues); +GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues); GLAPI BOOL GLAPIENTRY wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc); GLAPI HANDLE GLAPIENTRY wglGetCurrentReadDCARB(void); GLAPI HPBUFFERARB GLAPIENTRY wglCreatePbufferARB (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c Wed Nov 28 02:41:57 2007 @@ -771,16 +771,40 @@ } /* WGL_ARB_pixel_format */ +#define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000 +#define WGL_SUPPORT_OPENGL_ARB 0x2010 + GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, - const int *piAttributes, + int *piAttributes, int *piValues) { - SetLastError(0); - return FALSE; + BOOL retVal = FALSE; + int i; + + for (i=0;i<nAttributes;i++) + { + switch (piAttributes[i]) + { + case WGL_NUMBER_PIXEL_FORMATS_ARB : + piValues[i] = (int)npfd; + retVal = TRUE; + break; + + case WGL_SUPPORT_OPENGL_ARB: + piValues[i] = (int)TRUE; + retVal = TRUE; + + default : + SetLastError(0); + break; + } + } + + return retVal; } GLAPI BOOL GLAPIENTRY @@ -788,11 +812,32 @@ int iPixelFormat, int iLayerPlane, UINT nAttributes, - const int *piAttributes, + int *piAttributes, FLOAT *pfValues) { - SetLastError(0); - return FALSE; + BOOL retVal = FALSE; + int i; + + for (i=0;i<nAttributes;i++) + { + switch (piAttributes[i]) + { + case WGL_NUMBER_PIXEL_FORMATS_ARB : + pfValues[i] = (FLOAT)npfd; + retVal = TRUE; + break; + + case WGL_SUPPORT_OPENGL_ARB: + pfValues[i] = (FLOAT)TRUE; + retVal = TRUE; + + default : + SetLastError(0); + break; + } + } + + return retVal; } GLAPI BOOL GLAPIENTRY Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c Wed Nov 28 02:41:57 2007 @@ -55,8 +55,8 @@ GLAPI BOOL GLAPIENTRY wglChoosePixelFormatARB (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); GLAPI BOOL GLAPIENTRY wglSwapIntervalEXT (int interval); GLAPI int GLAPIENTRY wglGetSwapIntervalEXT (void); -GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); -GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues); +GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues); +GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues); GLAPI BOOL GLAPIENTRY wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc); GLAPI HANDLE GLAPIENTRY wglGetCurrentReadDCARB(void); GLAPI HPBUFFERARB GLAPIENTRY wglCreatePbufferARB (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);

16 years, 9 months

[cwittich] 30827: use ExAllocatePoolWithTag instead of ExAllocatePool

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Nov 28 02:25:56 2007 New Revision: 30827 URL: http://svn.reactos.org/svn/reactos?rev=30827&view=rev Log: use ExAllocatePoolWithTag instead of ExAllocatePool Modified: trunk/reactos/drivers/filesystems/vfat/fcb.c Modified: trunk/reactos/drivers/filesystems/vfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/f… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/fcb.c (original) +++ trunk/reactos/drivers/filesystems/vfat/fcb.c Wed Nov 28 02:25:56 2007 @@ -76,7 +76,7 @@ else PathNameBufferLength = 0; - Fcb->PathNameBuffer = ExAllocatePool(NonPagedPool, PathNameBufferLength); + Fcb->PathNameBuffer = ExAllocatePoolWithTag(NonPagedPool, PathNameBufferLength, TAG_FCB); if (!Fcb->PathNameBuffer) { /* FIXME: what to do if no more memory? */ @@ -454,7 +454,7 @@ { return STATUS_OBJECT_NAME_INVALID; } - PathNameBuffer = ExAllocatePool(NonPagedPool, PathNameLength + sizeof(WCHAR)); + PathNameBuffer = ExAllocatePoolWithTag(NonPagedPool, PathNameLength + sizeof(WCHAR), TAG_FCB); if (!PathNameBuffer) { return STATUS_INSUFFICIENT_RESOURCES;

16 years, 9 months

[greatlrd] 30826: Fix ddraw start in windows again and activate the debug msg again.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Nov 28 00:32:59 2007 New Revision: 30826 URL: http://svn.reactos.org/svn/reactos?rev=30826&view=rev Log: Fix ddraw start in windows again and activate the debug msg again. Added: trunk/reactos/dll/directx/ddraw/resource.h (with props) Modified: trunk/reactos/dll/directx/ddraw/ddraw.rc trunk/reactos/dll/directx/ddraw/main.c trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/ddraw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rc… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rc (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rc Wed Nov 28 00:32:59 2007 @@ -1,4 +1,6 @@ /* $Id$ */ + +#include "resource.h" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS/Win32 - DDraw\0" @@ -11,3 +13,9 @@ #define REACTOS_STR_PRODUCT_VERSION "5.3.2600.2180" #include <reactos/version.rc> + +STRINGTABLE DISCARDABLE +{ +STR_PRIMARY_DISPLAY, "Primary Display Driver" +} + Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Wed Nov 28 00:32:59 2007 @@ -11,7 +11,7 @@ #include "rosdraw.h" - +HMODULE hDllModule = 0; /* PSEH for SEH Support */ #include <pseh/pseh.h> @@ -220,28 +220,51 @@ LONG rc; BOOL EnumerateAttachedSecondaries = FALSE; DWORD privateDWFlags = 0; - - DX_WINDBG_trace(); - - rc = RegOpenKeyA(HKEY_LOCAL_MACHINE, REGSTR_PATH_DDHW, &hKey); - if (rc == ERROR_SUCCESS) - { - /* Enumerate Attached Secondaries */ - cbData = sizeof(DWORD); - rc = RegQueryValueExA(hKey, "EnumerateAttachedSecondaries", NULL, NULL, (LPBYTE)&Value, &cbData); + CHAR strMsg[RC_STRING_MAX_SIZE]; + HRESULT retVal = DDERR_INVALIDPARAMS; + + DX_WINDBG_trace(); + + if ((IsBadCodePtr((LPVOID)lpCallback) == 0) && + ((dwFlags & ~(DDENUM_NONDISPLAYDEVICES | + DDENUM_DETACHEDSECONDARYDEVICES | + DDENUM_ATTACHEDSECONDARYDEVICES)) == 0)) + { + LoadStringA(hDllModule, STR_PRIMARY_DISPLAY, (LPSTR)&strMsg, RC_STRING_MAX_SIZE); + + rc = RegOpenKeyA(HKEY_LOCAL_MACHINE, REGSTR_PATH_DDHW, &hKey); if (rc == ERROR_SUCCESS) { - if (Value != 0) - { - EnumerateAttachedSecondaries = TRUE; - privateDWFlags = DDENUM_ATTACHEDSECONDARYDEVICES; - } - } - RegCloseKey(hKey); - } - - // not finish - return DDERR_UNSUPPORTED; + /* Enumerate Attached Secondaries */ + cbData = sizeof(DWORD); + rc = RegQueryValueExA(hKey, "EnumerateAttachedSecondaries", NULL, NULL, (LPBYTE)&Value, &cbData); + if (rc == ERROR_SUCCESS) + { + if (Value != 0) + { + EnumerateAttachedSecondaries = TRUE; + privateDWFlags = DDENUM_ATTACHEDSECONDARYDEVICES; + } + } + RegCloseKey(hKey); + } + + /* Call the user supplyed callback function */ + rc = lpCallback(NULL, strMsg, "display", lpContext, NULL); + + /* If the callback function returns DDENUMRET_CANCEL, we will stop enumerating devices now */ + if(rc == DDENUMRET_CANCEL) + { + retVal = DD_OK; + } + else + { + // not finish + retVal = DDERR_UNSUPPORTED; + } + } + + return retVal; } HRESULT @@ -249,6 +272,8 @@ DirectDrawEnumerateW(LPDDENUMCALLBACKW lpCallback, LPVOID lpContext) { + DX_WINDBG_trace(); + return DDERR_UNSUPPORTED; } @@ -258,6 +283,8 @@ LPVOID lpContext, DWORD dwFlags) { + DX_WINDBG_trace(); + return DDERR_UNSUPPORTED; } @@ -339,6 +366,8 @@ DWORD retCode = DD_OK; LPD3DHAL_DP2COMMAND dp2command = lpCmd; + DX_WINDBG_trace(); + /* prevent it crash if null pointer are being sent */ if ( (lpCmd == NULL) || (lpRetCmd == NULL) ) { @@ -388,39 +417,46 @@ WINAPI AcquireDDThreadLock() { - EnterCriticalSection(&ddcs); + DX_WINDBG_trace(); + + EnterCriticalSection(&ddcs); } VOID WINAPI ReleaseDDThreadLock() { - LeaveCriticalSection(&ddcs); -} + DX_WINDBG_trace(); + + LeaveCriticalSection(&ddcs); +} + BOOL APIENTRY DllMain( HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved ) { - BOOL retStatus; + + hDllModule = hModule; + + DX_WINDBG_trace(); + + switch(ul_reason_for_call) { case DLL_PROCESS_DETACH: - //DeleteCriticalSection( &ddcs ); - retStatus = TRUE; + DeleteCriticalSection( &ddcs ); break; case DLL_PROCESS_ATTACH: - //DisableThreadLibraryCalls( hModule ); - //InitializeCriticalSection( &ddcs ); - //EnterCriticalSection( &ddcs ); - //LeaveCriticalSection( &ddcs ); - retStatus = FALSE; + DisableThreadLibraryCalls( hModule ); + InitializeCriticalSection( &ddcs ); + EnterCriticalSection( &ddcs ); + LeaveCriticalSection( &ddcs ); break; default: - retStatus = TRUE; break; } - return retStatus; - -} + + return TRUE; +} Added: trunk/reactos/dll/directx/ddraw/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/resource… ============================================================================== --- trunk/reactos/dll/directx/ddraw/resource.h (added) +++ trunk/reactos/dll/directx/ddraw/resource.h Wed Nov 28 00:32:59 2007 @@ -1,0 +1,8 @@ + + +#define RC_STRING_MAX_SIZE 512 + +#define STR_PRIMARY_DISPLAY 100 + + +/* EOF */ Propchange: trunk/reactos/dll/directx/ddraw/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Wed Nov 28 00:32:59 2007 @@ -12,6 +12,8 @@ #include "Ddraw/ddraw.h" #include "Surface/surface.h" #include "Clipper/clipper.h" + +#include "resource.h" /* DirectDraw startup code only internal use */ extern DDRAWI_DIRECTDRAW_GBL ddgbl; @@ -234,7 +236,7 @@ return DD_OK; -#if 0 +#if 1 #define DX_STUB_str(x) \ { \ char buffer[1024]; \

16 years, 9 months

[jimtabor] 30825: Fix typo!

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Nov 28 00:04:25 2007 New Revision: 30825 URL: http://svn.reactos.org/svn/reactos?rev=30825&view=rev Log: Fix typo! Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Wed Nov 28 00:04:25 2007 @@ -1992,7 +1992,7 @@ } Rect.left += XMove; - Rect.Top += YMove; + Rect.top += YMove; Rect.right += XMove; Rect.bottom += YMove;

16 years, 9 months

[jimtabor] 30824: Correct the offset in NtUserGetMenuItemRect. It was unfinished.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Nov 27 23:56:18 2007 New Revision: 30824 URL: http://svn.reactos.org/svn/reactos?rev=30824&view=rev Log: Correct the offset in NtUserGetMenuItemRect. It was unfinished. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Tue Nov 27 23:56:18 2007 @@ -1947,7 +1947,8 @@ LPRECT lprcItem) { ROSMENUINFO mi; - HWND referenceHwnd; + PWINDOW_OBJECT ReferenceWnd; + LONG XMove, YMove; RECT Rect; NTSTATUS Status; PMENU_OBJECT Menu; @@ -1967,20 +1968,34 @@ else RETURN(FALSE); - referenceHwnd = hWnd; - if(!hWnd) { if(!UserMenuInfo(Menu, &mi, FALSE)) RETURN( FALSE); if(mi.Wnd == 0) RETURN( FALSE); - referenceHwnd = mi.Wnd; /* Okay we found it, so now what do we do? */ - } - - if (lprcItem == NULL) - RETURN( FALSE); - + } + + if (lprcItem == NULL) RETURN( FALSE); + + if (!(ReferenceWnd = UserGetWindowObject(mi.Wnd))) RETURN( FALSE); + + if(MenuItem->fType & MF_POPUP) + { + XMove = ReferenceWnd->Wnd->ClientRect.left; + YMove = ReferenceWnd->Wnd->ClientRect.top; + } + else + { + XMove = ReferenceWnd->Wnd->WindowRect.left; + YMove = ReferenceWnd->Wnd->WindowRect.top; + } + + Rect.left += XMove; + Rect.Top += YMove; + Rect.right += XMove; + Rect.bottom += YMove; + Status = MmCopyToCaller(lprcItem, &Rect, sizeof(RECT)); if (! NT_SUCCESS(Status)) {

16 years, 9 months

[greatlrd] 30823: Last stubbing we need for mesa icd interface was done by Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) ----------------------------------------------------------------------------------------------------------------------

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Nov 27 22:55:19 2007 New Revision: 30823 URL: http://svn.reactos.org/svn/reactos?rev=30823&view=rev Log: Last stubbing we need for mesa icd interface was done by Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) ---------------------------------------------------------------------------------------------------------------------- Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h (original) +++ trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h Tue Nov 27 22:55:19 2007 @@ -101,18 +101,41 @@ WGLAPI int GLAPIENTRY wglUseFontOutlinesW(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT); #ifndef __MINGW32__ + +typedef void *HPBUFFERARB; + WGLAPI int GLAPIENTRY SwapBuffers(HDC); WGLAPI int GLAPIENTRY ChoosePixelFormat(HDC,const PIXELFORMATDESCRIPTOR *); WGLAPI int GLAPIENTRY DescribePixelFormat(HDC,int,unsigned int,LPPIXELFORMATDESCRIPTOR); WGLAPI int GLAPIENTRY GetPixelFormat(HDC); WGLAPI int GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *); + +GLAPI const char * GLAPIENTRY wglGetExtensionsStringEXT (void); +GLAPI BOOL GLAPIENTRY wglChoosePixelFormatARB (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); +GLAPI BOOL GLAPIENTRY wglSwapIntervalEXT (int interval); +GLAPI int GLAPIENTRY wglGetSwapIntervalEXT (void); +GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); +GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues); +GLAPI BOOL GLAPIENTRY wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc); +GLAPI HANDLE GLAPIENTRY wglGetCurrentReadDCARB(void); +GLAPI HPBUFFERARB GLAPIENTRY wglCreatePbufferARB (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); +GLAPI HDC GLAPIENTRY wglGetPbufferDCARB (HPBUFFERARB hPbuffer); +GLAPI int GLAPIENTRY wglReleasePbufferDCARB (HPBUFFERARB hPbuffer, HDC hDC); +GLAPI BOOL GLAPIENTRY wglDestroyPbufferARB (HPBUFFERARB hPbuffer); +GLAPI BOOL GLAPIENTRY wglQueryPbufferARB (HPBUFFERARB hPbuffer, int iAttribute, int *piValue); +GLAPI HANDLE GLAPIENTRY wglCreateBufferRegionARB(HDC hDC, int iLayerPlane, UINT uType); +GLAPI VOID GLAPIENTRY wglDeleteBufferRegionARB(HANDLE hRegion); +GLAPI BOOL GLAPIENTRY wglSaveBufferRegionARB(HANDLE hRegion, int x, int y, int width, int height); +GLAPI BOOL GLAPIENTRY wglRestoreBufferRegionARB(HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc); +GLAPI BOOL GLAPIENTRY wglSetPbufferAttribARB (HPBUFFERARB hPbuffer, const int *piAttribList); +GLAPI BOOL GLAPIENTRY wglBindTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); +GLAPI BOOL GLAPIENTRY wglReleaseTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); #endif #ifndef WGL_ARB_extensions_string #define WGL_ARB_extensions_string 1 WGLAPI const char * GLAPIENTRY wglGetExtensionsStringARB(HDC hdc); - #endif /* WGL_ARB_extensions_string */ Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c Tue Nov 27 22:55:19 2007 @@ -795,3 +795,126 @@ return FALSE; } +GLAPI BOOL GLAPIENTRY +wglMakeContextCurrentARB(HDC hDrawDC, + HDC hReadDC, + HGLRC hglrc) +{ + SetLastError(0); + return FALSE; +} + +GLAPI HANDLE GLAPIENTRY +wglGetCurrentReadDCARB(void) +{ + SetLastError(0); + return NULL; +} + +typedef void *HPBUFFERARB; + +/* WGL_ARB_pbuffer */ +GLAPI HPBUFFERARB GLAPIENTRY +wglCreatePbufferARB (HDC hDC, + int iPixelFormat, + int iWidth, + int iHeight, + const int *piAttribList) +{ + SetLastError(0); + return NULL; +} + +GLAPI HDC GLAPIENTRY +wglGetPbufferDCARB (HPBUFFERARB hPbuffer) +{ + SetLastError(0); + return NULL; +} + +GLAPI int GLAPIENTRY +wglReleasePbufferDCARB (HPBUFFERARB hPbuffer, HDC hDC) +{ + SetLastError(0); + return -1; +} + +GLAPI BOOL GLAPIENTRY +wglDestroyPbufferARB (HPBUFFERARB hPbuffer) +{ + SetLastError(0); + return FALSE; +} + +GLAPI BOOL GLAPIENTRY +wglQueryPbufferARB (HPBUFFERARB hPbuffer, + int iAttribute, + int *piValue) +{ + SetLastError(0); + return FALSE; +} + +GLAPI HANDLE GLAPIENTRY +wglCreateBufferRegionARB(HDC hDC, + int iLayerPlane, + UINT uType) +{ + SetLastError(0); + return NULL; +} + +GLAPI VOID GLAPIENTRY +wglDeleteBufferRegionARB(HANDLE hRegion) +{ + SetLastError(0); + return; +} + +GLAPI BOOL GLAPIENTRY +wglSaveBufferRegionARB(HANDLE hRegion, + int x, + int y, + int width, + int height) +{ + SetLastError(0); + return FALSE; +} + +GLAPI BOOL GLAPIENTRY +wglRestoreBufferRegionARB(HANDLE hRegion, + int x, + int y, + int width, + int height, + int xSrc, + int ySrc) +{ + SetLastError(0); + return FALSE; +} + +/* WGL_ARB_render_texture */ +GLAPI BOOL GLAPIENTRY +wglSetPbufferAttribARB (HPBUFFERARB hPbuffer, + const int *piAttribList) +{ + SetLastError(0); + return FALSE; +} + +GLAPI BOOL GLAPIENTRY +wglBindTexImageARB (HPBUFFERARB hPbuffer, int iBuffer) +{ + SetLastError(0); + return FALSE; +} + +GLAPI BOOL GLAPIENTRY +wglReleaseTexImageARB (HPBUFFERARB hPbuffer, int iBuffer) +{ + SetLastError(0); + return FALSE; +} + Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c Tue Nov 27 22:55:19 2007 @@ -49,12 +49,28 @@ #include "mtypes.h" #include "glapi.h" +typedef void *HPBUFFERARB; + GLAPI const char * GLAPIENTRY wglGetExtensionsStringEXT (void); GLAPI BOOL GLAPIENTRY wglChoosePixelFormatARB (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); GLAPI BOOL GLAPIENTRY wglSwapIntervalEXT (int interval); GLAPI int GLAPIENTRY wglGetSwapIntervalEXT (void); GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues); +GLAPI BOOL GLAPIENTRY wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc); +GLAPI HANDLE GLAPIENTRY wglGetCurrentReadDCARB(void); +GLAPI HPBUFFERARB GLAPIENTRY wglCreatePbufferARB (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); +GLAPI HDC GLAPIENTRY wglGetPbufferDCARB (HPBUFFERARB hPbuffer); +GLAPI int GLAPIENTRY wglReleasePbufferDCARB (HPBUFFERARB hPbuffer, HDC hDC); +GLAPI BOOL GLAPIENTRY wglDestroyPbufferARB (HPBUFFERARB hPbuffer); +GLAPI BOOL GLAPIENTRY wglQueryPbufferARB (HPBUFFERARB hPbuffer, int iAttribute, int *piValue); +GLAPI HANDLE GLAPIENTRY wglCreateBufferRegionARB(HDC hDC, int iLayerPlane, UINT uType); +GLAPI VOID GLAPIENTRY wglDeleteBufferRegionARB(HANDLE hRegion); +GLAPI BOOL GLAPIENTRY wglSaveBufferRegionARB(HANDLE hRegion, int x, int y, int width, int height); +GLAPI BOOL GLAPIENTRY wglRestoreBufferRegionARB(HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc); +GLAPI BOOL GLAPIENTRY wglSetPbufferAttribARB (HPBUFFERARB hPbuffer, const int *piAttribList); +GLAPI BOOL GLAPIENTRY wglBindTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); +GLAPI BOOL GLAPIENTRY wglReleaseTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); #define MAX_MESA_ATTRS 20 @@ -325,20 +341,20 @@ {"wglGetPixelFormatAttribivARB", (PROC)wglGetPixelFormatAttribivARB}, {"wglGetPixelFormatAttribfvARB", (PROC)wglGetPixelFormatAttribfvARB}, {"wglChoosePixelFormatARB", (PROC)wglChoosePixelFormatARB}, -// {"wglCreatePbufferARB", (PROC)wglCreatePbufferARB}, -// {"wglGetPbufferDCARB", (PROC)wglGetPbufferDCARB}, -// {"wglReleasePbufferDCARB", (PROC)wglReleasePbufferDCARB}, -// {"wglDestroyPbufferARB", (PROC)wglDestroyPbufferARB}, -// {"wglQueryPbufferARB", (PROC)wglQueryPbufferARB}, -// {"wglSetPbufferAttribARB", (PROC)wglSetPbufferAttribARB}, -// {"wglBindTexImageARB", (PROC)wglBindTexImageARB}, -// {"wglReleaseTexImageARB", (PROC)wglReleaseTexImageARB}, -// {"wglCreateBufferRegionARB", (PROC)wglCreateBufferRegionARB}, -// {"wglDeleteBufferRegionARB", (PROC)wglDeleteBufferRegionARB}, -// {"wglSaveBufferRegionARB", (PROC)wglSaveBufferRegionARB}, -// {"wglRestoreBufferRegionARB", (PROC)wglRestoreBufferRegionARB}, -// {"wglMakeContextCurrentARB", (PROC)wglMakeContextCurrentARB}, -// {"wglGetCurrentReadDCARB", (PROC)wglGetCurrentReadDCARB}, + {"wglCreatePbufferARB", (PROC)wglCreatePbufferARB}, + {"wglGetPbufferDCARB", (PROC)wglGetPbufferDCARB}, + {"wglReleasePbufferDCARB", (PROC)wglReleasePbufferDCARB}, + {"wglDestroyPbufferARB", (PROC)wglDestroyPbufferARB}, + {"wglQueryPbufferARB", (PROC)wglQueryPbufferARB}, + {"wglSetPbufferAttribARB", (PROC)wglSetPbufferAttribARB}, + {"wglBindTexImageARB", (PROC)wglBindTexImageARB}, + {"wglReleaseTexImageARB", (PROC)wglReleaseTexImageARB}, + {"wglCreateBufferRegionARB", (PROC)wglCreateBufferRegionARB}, + {"wglDeleteBufferRegionARB", (PROC)wglDeleteBufferRegionARB}, + {"wglSaveBufferRegionARB", (PROC)wglSaveBufferRegionARB}, + {"wglRestoreBufferRegionARB", (PROC)wglRestoreBufferRegionARB}, + {"wglMakeContextCurrentARB", (PROC)wglMakeContextCurrentARB}, + {"wglGetCurrentReadDCARB", (PROC)wglGetCurrentReadDCARB}, {NULL, NULL} };

16 years, 9 months

← Newer
1
...
7
8
9
10
11
12
13
...
89
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 November 2007