Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 28490: - part 2/2 - update french translation for sysdm by Pierre Schweitzer (heis_spiter at hotmail dot com) See issue #2588 for more details.
by janderwald＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: janderwald Date: Fri Aug 24 00:11:28 2007 New Revision: 28490 URL: http://svn.reactos.org/svn/reactos?rev=28490&view=rev Log: - part 2/2 - update french translation for sysdm by Pierre Schweitzer (heis_spiter at hotmail dot com) See issue #2588 for more details. Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc Fri Aug 24 00:11:28 2007 @@ -268,8 +268,8 @@ IDS_PETABYTE "PB de RAM" IDS_VARIABLE "Variable" IDS_VALUE "Valeur" - IDS_NO_DUMP "(None)" - IDS_MINI_DUMP "Minidump(64KB)" - IDS_KERNEL_DUMP "Kernel dump" - IDS_FULL_DUMP "Complete dump" -END + IDS_NO_DUMP "(Aucun)" + IDS_MINI_DUMP "Mini cliché(64KB)" + IDS_KERNEL_DUMP "Cliché du noyau" + IDS_FULL_DUMP "Cliché complet" +END

1 0

[janderwald] 28489: - part 1/2 - add french translation for logoff by Pierre Schweitzer (heis_spiter at hotmail dot com) - also add german translation See issue #2588 for more details.
by janderwald＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: janderwald Date: Fri Aug 24 00:10:36 2007 New Revision: 28489 URL: http://svn.reactos.org/svn/reactos?rev=28489&view=rev Log: - part 1/2 - add french translation for logoff by Pierre Schweitzer (heis_spiter at hotmail dot com) - also add german translation See issue #2588 for more details. Added: trunk/reactos/base/applications/logoff/lang/de-DE.rc (with props) trunk/reactos/base/applications/logoff/lang/fr-FR.rc (with props) Modified: trunk/reactos/base/applications/logoff/rsrc.rc Added: trunk/reactos/base/applications/logoff/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/de-DE.rc (added) +++ trunk/reactos/base/applications/logoff/lang/de-DE.rc Fri Aug 24 00:10:36 2007 @@ -1,0 +1,15 @@ +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + +IDS_USAGE, "Beendet eine Sitzung.\n\n\ + /v\t\tZeigt Informationen zu den Aktionen an, die gerade ausgeführt werden.\n\ + /?\t\tZeigt diese Informationen an.\n\n" + +IDS_LOGOFF_REMOTE, "Beendet eine Siztung auf einem Server." +IDS_LOGOFF_LOCAL, "Beendet eine Sitzung auf dem aktuellen Server." + +IDS_ILLEGAL_PARAM, "Ungültige(r) Parameter\n" +} +/* EOF */ Propchange: trunk/reactos/base/applications/logoff/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/logoff/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/logoff/lang/fr-FR.rc Fri Aug 24 00:10:36 2007 @@ -1,0 +1,15 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + +IDS_USAGE, "Termine une session.\n\n\ + /v\t\tAffiche des informations sur les actions réalisées.\n\ + /?\t\tAffiche ces informations.\n\n" + +IDS_LOGOFF_REMOTE, "Termine une session sur une machine distante." +IDS_LOGOFF_LOCAL, "Termine la session courante sur cette machine." + +IDS_ILLEGAL_PARAM, "Paramètre(s) invalide(s)\n" +} +/* EOF */ Propchange: trunk/reactos/base/applications/logoff/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/logoff/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/r… ============================================================================== --- trunk/reactos/base/applications/logoff/rsrc.rc (original) +++ trunk/reactos/base/applications/logoff/rsrc.rc Fri Aug 24 00:10:36 2007 @@ -1,5 +1,7 @@ #include <windows.h> #include "resource.h" +#include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/fr-FR.rc" #include "lang/nb-NO.rc"

1 0

[dreimer] 28488: - Update all SF Links to one of the fastest Mirrors. puzzle is EVIL! - Fix some broken Links - Update some Files to newer Versions.
by dreimer＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: dreimer Date: Fri Aug 24 00:03:37 2007 New Revision: 28488 URL: http://svn.reactos.org/svn/reactos?rev=28488&view=rev Log: - Update all SF Links to one of the fastest Mirrors. puzzle is EVIL! - Fix some broken Links - Update some Files to newer Versions. Modified: trunk/rosapps/downloader/downloader.xml Modified: trunk/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.xml?… ============================================================================== --- trunk/rosapps/downloader/downloader.xml (original) +++ trunk/rosapps/downloader/downloader.xml Fri Aug 24 00:03:37 2007 @@ -12,14 +12,14 @@ <licence>MPL/GPL/LGPL</licence> <version>2.0.0.6</version> <description>The most popular and one of the best free Web Browsers out there.</description> - <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/latest/win…</location> + <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/2.0.0.6/wi…</location> </application> <application name="Thunderbird 1.5"> - <regname>Mozilla Thunderbird (1.5)</regname> + <regname>Mozilla Thunderbird (1.5.0.12)</regname> <licence>MPL/GPL/LGPL</licence> - <version>1.5.0.9</version> + <version>1.5.0.12</version> <description>The most popular and one of the best free Mail Clients out there.</description> - <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/thunderbird/releases/latest…</location> + <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/thunderbird/releases/1.5.0.…</location> </application> <application name="Thunderbird 2.0"> <regname>Mozilla Thunderbird (2.0.0.6)</regname> @@ -65,10 +65,10 @@ </category> <category name="Office" icon="2"> <application name="Abiword"> - <regname>"AbiWord 2.4.6 (remove only)"</regname> - <version>2.4.6</version> + <regname>"AbiWord 2.5.2 (remove only)"</regname> + <version>2.5.2</version> <description>Word processor.</description> - <location>http://www.abiword.org/downloads/abiword/2.4.6/Windows/abiword-setup-2.4.6.…</location> + <location>http://www.abiword.org/downloads/abiword/2.5.2/Windows/abiword-setup-2.5.2.…</location> </application> <application name="OpenOffice"> <regname>OpenOffice.org 2.2</regname> @@ -109,13 +109,13 @@ <regname>MinGW 5.1.3</regname> <version>5.1.3</version> <description>A Port of the GNU toolchain with GCC, GDB, GNU make, etc.</description> - <location>http://puzzle.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe</location> + <location>http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe</location> </application> <application name="FreeBASIC"> <regname>FreeBASIC 0.17b</regname> <version>0.17b</version> <description>Open Source BASIC Compiler. The BASIC syntax is compatible to QBASIC.</description> - <location>http://switch.dl.sourceforge.net/sourceforge/fbc/FreeBASIC-v0.17b-win32.exe</location> + <location>http://ovh.dl.sourceforge.net/sourceforge/fbc/FreeBASIC-v0.18.1b-win32.exe</location> </application> </category> <category name="Games & Fun" icon="6"> @@ -139,27 +139,27 @@ <regname>LBreakout2 2.4.1</regname> <version>2.4.1</version> <description>Breakout Clone using SDL libs.</description> - <location>http://switch.dl.sourceforge.net/sourceforge/lgames/lbreakout2-2.4.1-win32.…</location> + <location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lbreakout2-2.4.1-win32.exe</location> </application> <application name="LGeneral"> <regname>LGeneral 1.1</regname> <version>1.1</version> <description>Panzer General Clone using SDL libs.</description> - <location>http://kent.dl.sourceforge.net/sourceforge/lgames/lgeneral-1.1-win32.exe</location> + <location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lgeneral-1.1-win32.exe</location> </application> <application name="LMarbles"> <regname>LMarbles 1.0.6</regname> <version>1.0.6</version> <description>Atomix Clone using SDL libs.</description> - <location>http://heanet.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe</location> + <location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe</location> </application> </category> <category name="Tools" icon="7"> <application name="7-Zip"> - <regname>7-Zip 4.42</regname> - <version>4.42</version> + <regname>7-Zip 4.52</regname> + <version>4.52</version> <description>Utility to create and open 7zip, zip, tar, rar and other archive files.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z442.exe</location> + <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z452.exe</location> </application> <application name="uTorrent"> <regname>µTorrent</regname> @@ -183,7 +183,7 @@ <application name="DOSBox"> <version>0.71</version> <description>DOSBox is a DOS emulator.</description> - <location>http://puzzle.dl.sourceforge.net/sourceforge/dosbox/DOSBox0.71-win32-instal…</location> + <location>http://ovh.dl.sourceforge.net/sourceforge/dosbox/DOSBox0.71-win32-installer…</location> </application> </category> </tree>

1 0

[greatlrd] 28487: commit my verify list with api that been tested and works same/simluare as windows xp, in windows 2000/xp
by greatlrd＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: greatlrd Date: Thu Aug 23 23:56:57 2007 New Revision: 28487 URL: http://svn.reactos.org/svn/reactos?rev=28487&view=rev Log: commit my verify list with api that been tested and works same/simluare as windows xp, in windows 2000/xp Added: trunk/reactos/dll/win32/gdi32/good api.def (with props) Added: trunk/reactos/dll/win32/gdi32/good api.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/good%20api… ============================================================================== --- trunk/reactos/dll/win32/gdi32/good api.def (added) +++ trunk/reactos/dll/win32/gdi32/good api.def Thu Aug 23 23:56:57 2007 @@ -1,0 +1,30 @@ +; gdi32.def +; +; ReactOS Operating System +; Api List that have been verify it works same as windows XP +; and no bugs have been found in gdi32.dll, but bugs +; can still exists, for it have not been checked in win32k.sys +; if bugs exists their or verify +; + +BRUSHOBJ_pvAllocRbrush@8 +BRUSHOBJ_pvGetRbrush@4 +BRUSHOBJ_ulGetBrushColor@4 +CreateEllipticRgn@16 +CreatePenIndirect@4 +BRUSHOBJ_hGetColorTransform@4 +CLIPOBJ_ppoGetPath@4 +CreatePalette@4 +ChoosePixelFormat@8 +CreateEllipticRgnIndirect@4 +CLIPOBJ_bEnum@12 +CreateRoundRectRgn@24 +AddFontResourceExW@12 +CreateRectRgnIndirect@4 +CombineTransform@12 +CreateHalftonePalette@4 +CreateDiscardableBitmap@12 +CLIPOBJ_cEnumStart@20 +AnyLinkedFonts@0 +AddFontResourceA@4 +AddFontResourceW@4 Propchange: trunk/reactos/dll/win32/gdi32/good api.def ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 28486: - Set NULL Io cancel routine, fixes an assert when using usb storage driver.
by fireball＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: fireball Date: Thu Aug 23 23:41:38 2007 New Revision: 28486 URL: http://svn.reactos.org/svn/reactos?rev=28486&view=rev Log: - Set NULL Io cancel routine, fixes an assert when using usb storage driver. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c Thu Aug 23 23:41:38 2007 @@ -1449,6 +1449,7 @@ //this device has its irp queued if (status == STATUS_CANCELLED) { + usb_dbg_print(DBGLVL_MAXIMUM, ("umss_complete_request(): status of irp is cancelled\n")); IoAcquireCancelSpinLock(&old_irql); if (dev_obj->CurrentIrp == pirp) { @@ -1462,8 +1463,15 @@ } } else + { // all requests come to this point from the irp queue IoStartNextPacket(dev_obj, FALSE); + + // we are going to complete the request, so set it's cancel routine to NULL + IoAcquireCancelSpinLock(&old_irql); + (void)IoSetCancelRoutine(pirp, NULL); + IoReleaseCancelSpinLock(old_irql); + } pirp->IoStatus.Status = status;

1 0

[greatlrd] 28485: Kill reactos own syscall api NtGdiCreatePolygonRgn, it have been redirect to another ros own syscall named NtGdiCreatePolyPolygonRgn. see my last commit for gdi32
by greatlrd＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: greatlrd Date: Thu Aug 23 23:33:21 2007 New Revision: 28485 URL: http://svn.reactos.org/svn/reactos?rev=28485&view=rev Log: Kill reactos own syscall api NtGdiCreatePolygonRgn, it have been redirect to another ros own syscall named NtGdiCreatePolyPolygonRgn. see my last commit for gdi32 Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c Thu Aug 23 23:33:21 2007 @@ -3421,100 +3421,6 @@ return hrgn; } -HRGN -STDCALL -NtGdiCreatePolygonRgn(CONST PPOINT pt, - INT Count, - INT PolyFillMode) -{ - POINT *SafePoints; - NTSTATUS Status = STATUS_SUCCESS; - HRGN hRgn; - - - if (pt == NULL || Count == 0 || - (PolyFillMode != WINDING && PolyFillMode != ALTERNATE)) - { - /* Windows doesn't set a last error here */ - return (HRGN)0; - } - - if (Count == 1) - { - /* can't create a region with only one point! */ - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return (HRGN)0; - } - - if (Count == 2) - { - /* Windows creates an empty region! */ - ROSRGNDATA *rgn; - - if(!(hRgn = RGNDATA_AllocRgn(1))) - { - return (HRGN)0; - } - if(!(rgn = RGNDATA_LockRgn(hRgn))) - { - NtGdiDeleteObject(hRgn); - return (HRGN)0; - } - - EMPTY_REGION(rgn); - - RGNDATA_UnlockRgn(rgn); - return hRgn; - } - - _SEH_TRY - { - ProbeForRead(pt, - Count * sizeof(POINT), - 1); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return (HRGN)0; - } - - if (!(SafePoints = ExAllocatePoolWithTag(PagedPool, Count * sizeof(POINT), TAG_REGION))) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return (HRGN)0; - } - - _SEH_TRY - { - /* pointers were already probed! */ - RtlCopyMemory(SafePoints, - pt, - Count * sizeof(POINT)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if (!NT_SUCCESS(Status)) - { - ExFreePool(SafePoints); - SetLastNtError(Status); - return (HRGN)0; - } - - hRgn = IntCreatePolyPolgonRgn(SafePoints, &Count, 1, PolyFillMode); - - ExFreePool(SafePoints); - return hRgn; -} HRGN STDCALL 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 Thu Aug 23 23:33:21 2007 @@ -752,7 +752,6 @@ NtGdiCopyEnhMetaFile 2 NtGdiCreateDIBitmap 6 NtGdiCreateEnhMetaFile 4 -NtGdiCreatePolygonRgn 3 NtGdiCreatePolyPolygonRgn 4 NtGdiCreateScalableFontResource 4 NtGdiDeleteEnhMetaFile 1

1 0

[greatlrd] 28484: remove redirect of CreatePolyPolygonRgn@16 and implement own stub for it, it is hacked, it should doing, return (HRGN) NtGdiPolyPolyDraw(fnPolyFillMode, lppt, lpPolyCounts, nCount, 6 ); remove redirect of CreatePolygonRgn@12 and implement own stub for it, it is hacked, it should doing return NtGdiPolyPolyDraw(fnPolyFillMode,lppt,cPoints,1,6); remove redirect of CreateRectRgn@16 and implement own stub for it, some part need be done in user mode Fix CreateRectRgnIndirect it call
by greatlrd＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: greatlrd Date: Thu Aug 23 23:21:16 2007 New Revision: 28484 URL: http://svn.reactos.org/svn/reactos?rev=28484&view=rev Log: remove redirect of CreatePolyPolygonRgn@16 and implement own stub for it, it is hacked, it should doing, return (HRGN) NtGdiPolyPolyDraw(fnPolyFillMode, lppt, lpPolyCounts, nCount, 6 ); remove redirect of CreatePolygonRgn@12 and implement own stub for it, it is hacked, it should doing return NtGdiPolyPolyDraw(fnPolyFillMode,lppt,cPoints,1,6); remove redirect of CreateRectRgn@16 and implement own stub for it, some part need be done in user mode Fix CreateRectRgnIndirect it call now on CreateRectRgn for some part need be done in user mode, and it crash if NULL comes in as param, like windows does. Fix CreatePenIndirect ir call now on CreatePen for some stuff need be done in user mode. Add comment to CreatePen it need be fix. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/objects/pen.c trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Thu Aug 23 23:21:16 2007 @@ -76,19 +76,19 @@ CreateMetaFileW@4 CreatePalette@4 CreatePatternBrush@4 - -ClearBitmapAttributes@8 -ClearBrushAttributes@8 CreatePen@12 CreatePenIndirect@4 -CreatePolyPolygonRgn@16=NtGdiCreatePolyPolygonRgn@16 -CreatePolygonRgn@12=NtGdiCreatePolygonRgn@12 -CreateRectRgn@16=NtGdiCreateRectRgn@16 +CreatePolyPolygonRgn@16 +CreatePolygonRgn@12 +CreateRectRgn@16 CreateRectRgnIndirect@4 CreateRoundRectRgn@24=NtGdiCreateRoundRectRgn@24 CreateScalableFontResourceA@16 CreateScalableFontResourceW@16 CreateSolidBrush@4 + +ClearBitmapAttributes@8 +ClearBrushAttributes@8 DPtoLP@12 DeleteColorSpace@4 DeleteDC@4 Modified: trunk/reactos/dll/win32/gdi32/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pe… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/pen.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/pen.c Thu Aug 23 23:21:16 2007 @@ -8,19 +8,10 @@ */ HPEN WINAPI CreatePenIndirect( - const LOGPEN *plgpn) + const LOGPEN *lplgpn) { - if (plgpn) - { - return NtGdiCreatePen(plgpn->lopnStyle, - /* FIXME: MSDN says in docs for LOGPEN: - "If the pointer member is NULL, the pen is one pixel - wide on raster devices." Do we need to handle this? */ - plgpn->lopnWidth.x, - plgpn->lopnColor, - NULL); - } - return NULL; + /* Note same behoir as Windows 2000/XP/VISTA, they do not care if plgpn is NULL´, it will crash */ + return CreatePen(lplgpn->lopnStyle, lplgpn->lopnWidth.x, lplgpn->lopnColor); } /* @@ -32,6 +23,7 @@ int nWidth, COLORREF crColor) { + /* FIXME Some part need be done in user mode */ return NtGdiCreatePen(nPenStyle, nWidth, crColor, NULL); } Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c Thu Aug 23 23:21:16 2007 @@ -24,30 +24,41 @@ HRGN hrgn ) { - return NtGdiGetRandomRgn(hdc, hrgn, 1); + return NtGdiGetRandomRgn(hdc, hrgn, 1); } HRGN WINAPI -CreatePolygonRgn( const POINT* Point, int Count, int Mode) +CreatePolygonRgn( const POINT* lppt, int cPoints, int fnPolyFillMode) { - return CreatePolyPolygonRgn(Point, (const INT*)&Count, 1, Mode); + /* FIXME NtGdiPolyPolyDraw */ +#if 0 + return NtGdiPolyPolyDraw(fnPolyFillMode,lppt,cPoints,1,6); +#else + return CreatePolyPolygonRgn(lppt, (const INT*)&cPoints, 1, fnPolyFillMode); +#endif } HRGN WINAPI -CreatePolyPolygonRgn( const POINT* Point, - const INT* Count, - int inPolygons, - int Mode) +CreatePolyPolygonRgn( const POINT* lppt, + const INT* lpPolyCounts, + int nCount, + int fnPolyFillMode) { - return (HRGN) NtGdiPolyPolyDraw( (HDC) Mode, - (PPOINT) Point, - (PULONG) Count, - (ULONG) inPolygons, + /* FIXME NtGdiPolyPolyDraw */ +#if 0 + return (HRGN) NtGdiPolyPolyDraw( (HDC) fnPolyFillMode, + (PPOINT) lppt, + (PULONG) lpPolyCounts, + (ULONG) nCount, GdiPolyPolyRgn ); +#else + return NtGdiCreatePolyPolygonRgn( (PPOINT)lppt, (PINT)lpPolyCounts, nCount, fnPolyFillMode); +#endif + } HRGN @@ -61,18 +72,22 @@ } +HRGN +WINAPI +CreateRectRgn(int x1, int y1, int x2,int y2) +{ + /* FIXME Some part need be done in user mode */ + return NtGdiCreateRectRgn(x1,y1,x2,y2); +} + + HRGN WINAPI CreateRectRgnIndirect( const RECT *prc ) { - if (prc) - { - return NtGdiCreateRectRgn(prc->left, - prc->top, - prc->right, - prc->bottom); - } - return NULL; + /* Notes if prc is NULL it will crash on All Windows NT I checked 2000/XP/VISTA */ + return CreateRectRgn(prc->left, prc->top, prc->right, prc->bottom); + }

1 0

[fireball] 28483: - Small NDK headers update
by fireball＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: fireball Date: Thu Aug 23 23:20:28 2007 New Revision: 28483 URL: http://svn.reactos.org/svn/reactos?rev=28483&view=rev Log: - Small NDK headers update Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/cmfuncs.h trunk/reactos/include/ndk/halfuncs.h trunk/reactos/include/ndk/mmtypes.h trunk/reactos/include/reactos/arc/arc.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Thu Aug 23 23:20:28 2007 @@ -1354,6 +1354,8 @@ #define IO_SOUND_INCREMENT 8 #define IO_VIDEO_INCREMENT 1 #define SEMAPHORE_INCREMENT 1 + +#define MM_MAXIMUM_DISK_IO_SIZE (0x10000) typedef struct _IRP { CSHORT Type; @@ -4740,6 +4742,11 @@ IoModifyAccess } LOCK_OPERATION; +typedef ULONG PFN_COUNT; + +typedef LONG SPFN_NUMBER, *PSPFN_NUMBER; +typedef ULONG PFN_NUMBER, *PPFN_NUMBER; + typedef enum _MM_SYSTEM_SIZE { MmSmallSystem, MmMediumSystem, @@ -5274,6 +5281,12 @@ ULONG StallScaleFactor; /* 4C */ UCHAR SpareUnused; /* 50 */ UCHAR Number; /* 51 */ + UCHAR Spare0; + UCHAR SecondLevelCacheAssociativity; + ULONG VdmAlert; + ULONG KernelReserved[14]; // For use by the kernel + ULONG SecondLevelCacheSize; + ULONG HalReserved[16]; // For use by Hal } KPCR, *PKPCR; /* 54 */ typedef struct _KFLOATING_SAVE { @@ -5333,6 +5346,9 @@ #define MM_USER_PROBE_ADDRESS MmUserProbeAddress #define MM_LOWEST_USER_ADDRESS (PVOID)0x10000 #define MM_LOWEST_SYSTEM_ADDRESS (PVOID)0xC0C00000 + +#define MM_KSEG0_BASE MM_SYSTEM_RANGE_START +#define MM_SYSTEM_SPACE_END 0xFFFFFFFF #define KI_USER_SHARED_DATA 0xffdf0000 #define SharedUserData ((KUSER_SHARED_DATA * CONST) KI_USER_SHARED_DATA) Modified: trunk/reactos/include/ndk/cmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cmfuncs.h (original) +++ trunk/reactos/include/ndk/cmfuncs.h Thu Aug 23 23:20:28 2007 @@ -113,7 +113,7 @@ NTSTATUS NTAPI NtInitializeRegistry( - BOOLEAN SetUpBoot + USHORT Flag ); NTSYSCALLAPI @@ -420,13 +420,6 @@ NTSYSAPI NTSTATUS NTAPI -ZwInitializeRegistry( - BOOLEAN SetUpBoot -); - -NTSYSAPI -NTSTATUS -NTAPI ZwLoadKey( IN POBJECT_ATTRIBUTES KeyObjectAttributes, IN POBJECT_ATTRIBUTES FileObjectAttributes @@ -571,6 +564,13 @@ NTSYSAPI NTSTATUS NTAPI +ZwInitializeRegistry( + USHORT Flag +); + +NTSYSAPI +NTSTATUS +NTAPI ZwUnloadKey( IN POBJECT_ATTRIBUTES KeyObjectAttributes ); Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h (original) +++ trunk/reactos/include/ndk/halfuncs.h Thu Aug 23 23:20:28 2007 @@ -55,8 +55,6 @@ // The DDK steals these away from you. // #ifdef _MSC_VER -void _enable(void); -void _disable(void); #pragma intrinsic(_enable) #pragma intrinsic(_disable) #endif Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h (original) +++ trunk/reactos/include/ndk/mmtypes.h Thu Aug 23 23:20:28 2007 @@ -244,7 +244,7 @@ MMPTE_TRANSITION Trans; MMPTE_SUBSECTION Subsect; MMPTE_LIST List; - }; + } u; } MMPTE, *PMMPTE; // @@ -430,6 +430,7 @@ MMSUBSECTION_FLAGS SubsectionFlags; } u; ULONG StartingSector; + ULONG NumberOfFullSectors; PMMPTE SubsectionBase; ULONG UnusedPtes; ULONG PtesInSubsection; @@ -578,8 +579,10 @@ // typedef struct _MMSUPPORT { +#if (NTDDI_VERSION >= NTDDI_WS03) + LIST_ENTRY WorkingSetExpansionLinks; +#endif #if (NTDDI_VERSION >= NTDDI_LONGHORN) - LIST_ENTRY WorkingSetExpansionLinks; USHORT LastTrimpStamp; USHORT NextPageColor; #else @@ -591,12 +594,12 @@ #if (NTDDI_VERSION >= NTDDI_LONGHORN) ULONG Spare0; #else - ULONG WorkingSetSize; + ULONG GrowthSinceLastEstimate; #endif ULONG MinimumWorkingSetSize; ULONG MaximumWorkingSetSize; - PMMWSL MmWorkingSetList; -#if (NTDDI_VERSION < NTDDI_LONGHORN) + PMMWSL VmWorkingSetList; +#if (NTDDI_VERSION < NTDDI_WS03) LIST_ENTRY WorkingSetExpansionLinks; #endif ULONG Claim; @@ -604,15 +607,18 @@ ULONG Spare; ULONG WorkingSetPrivateSize; ULONG WorkingSetSizeOverhead; - ULONG WorkingSetSize; - PKEVENT ExitEvent; - EX_PUSH_LOCK WorkingSetMutex; - PVOID AccessLog; #else ULONG NextEstimationSlot; ULONG NextAgingSlot; ULONG EstimatedAvailable; - ULONG GrowthSinceLastEstimate; +#endif + ULONG WorkingSetSize; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PKEVENT ExitEvent; +#endif + EX_PUSH_LOCK WorkingSetMutex; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PVOID AccessLog; #endif } MMSUPPORT, *PMMSUPPORT; Modified: trunk/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?… ============================================================================== --- trunk/reactos/include/reactos/arc/arc.h (original) +++ trunk/reactos/include/reactos/arc/arc.h Thu Aug 23 23:20:28 2007 @@ -315,7 +315,7 @@ { PVOID CommonDataArea; ULONG MachineType; - ULONG Reserved; + ULONG VirtualBias; } I386_LOADER_BLOCK, *PI386_LOADER_BLOCK; // Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Thu Aug 23 23:20:28 2007 @@ -661,7 +661,7 @@ NTSTATUS NTAPI -NtInitializeRegistry (IN BOOLEAN SetUpBoot) +NtInitializeRegistry (IN USHORT Flag) { NTSTATUS Status; @@ -673,7 +673,7 @@ /* Save boot log file */ IopSaveBootLogToFile(); - Status = CmiInitHives (SetUpBoot); + Status = CmiInitHives (Flag); CmiRegistryInitialized = TRUE; Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h Thu Aug 23 23:20:28 2007 @@ -15,6 +15,7 @@ /* DDK/IFS/NDK Headers */ #ifdef _MSC_VER +#include <excpt.h> #include <ntdef.h> #undef DECLSPEC_IMPORT #define DECLSPEC_IMPORT

1 0

[jimtabor] 28482: Fix build?
by jimtabor＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: jimtabor Date: Thu Aug 23 22:35:46 2007 New Revision: 28482 URL: http://svn.reactos.org/svn/reactos?rev=28482&view=rev Log: Fix build? Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/color.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/color.c Thu Aug 23 22:35:46 2007 @@ -235,7 +235,7 @@ } } - return NtGdiCreatePaletteInternal((LOGPALETTE *)&Palette, Palette->palNumEntries); + return NtGdiCreatePaletteInternal((LOGPALETTE *)&Palette, Palette.NumberOfEntries); }

1 0

[tkreuzer] 28481: move NtGdiGetSetBoundsrect from paintobj.c to dc.c, remove paintobj.c
by tkreuzer＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: tkreuzer Date: Thu Aug 23 21:28:24 2007 New Revision: 28481 URL: http://svn.reactos.org/svn/reactos?rev=28481&view=rev Log: move NtGdiGetSetBoundsrect from paintobj.c to dc.c, remove paintobj.c Removed: trunk/reactos/subsystems/win32/win32k/objects/paintobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild 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 Thu Aug 23 21:28:24 2007 @@ -3168,4 +3168,26 @@ return Ret; } +DWORD +APIENTRY +NtGdiGetBoundsRect( + IN HDC hdc, + OUT LPRECT prc, + IN DWORD f) +{ + DPRINT("stub"); + return DCB_RESET; /* bounding rectangle always empty */ +} + +DWORD +APIENTRY +NtGdiSetBoundsRect( + IN HDC hdc, + IN LPRECT prc, + IN DWORD f) +{ + DPRINT("stub"); + return DCB_DISABLE; /* bounding rectangle always empty */ +} + /* EOF */ Removed: trunk/reactos/subsystems/win32/win32k/objects/paintobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/paintobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/paintobj.c (removed) @@ -1,47 +1,0 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ */ - -#include <w32k.h> - -#define NDEBUG -#include <debug.h> - -DWORD -APIENTRY -NtGdiGetBoundsRect( - IN HDC hdc, - OUT LPRECT prc, - IN DWORD f) -{ - DPRINT("stub"); - return DCB_RESET; /* bounding rectangle always empty */ -} - -DWORD -APIENTRY -NtGdiSetBoundsRect( - IN HDC hdc, - IN LPRECT prc, - IN DWORD f) -{ - DPRINT("stub"); - return DCB_DISABLE; /* bounding rectangle always empty */ -} -/* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Thu Aug 23 21:28:24 2007 @@ -148,7 +148,6 @@ <file>icm.c</file> <file>line.c</file> <file>metafile.c</file> - <file>paintobj.c</file> <file>palobj.c</file> <file>path.c</file> <file>pen.c</file>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs