Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[mpiulachs] 33286: -Move shellext folder to a more appropriate location. shell extensions are COM objects which extends the abilities of MS Windows explorer and not regular Win32 Dlls as they don't export APIs (part 1/2)
by mpiulachs＠svn.reactos.org 04 May '08

04 May '08

Author: mpiulachs Date: Sun May 4 18:46:26 2008 New Revision: 33286 URL: http://svn.reactos.org/svn/reactos?rev=33286&view=rev Log: -Move shellext folder to a more appropriate location. shell extensions are COM objects which extends the abilities of MS Windows explorer and not regular Win32 Dlls as they don't export APIs (part 1/2) Added: trunk/reactos/dll/shellext/ - copied from r33280, trunk/reactos/dll/win32/shellext/ Removed: trunk/reactos/dll/win32/shellext/ Modified: trunk/reactos/dll/dll.rbuild trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/dll/dll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/dll.rbuild?rev=33286&r… ============================================================================== --- trunk/reactos/dll/dll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/dll.rbuild [iso-8859-1] Sun May 4 18:46:26 2008 @@ -16,6 +16,9 @@ <directory name="ntdll"> <xi:include href="ntdll/ntdll.rbuild" /> </directory> +<directory name="shellext"> + <xi:include href="shellext/shellext.rbuild" /> +</directory> <directory name="win32"> <xi:include href="win32/win32.rbuild" /> </directory> Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sun May 4 18:46:26 2008 @@ -277,9 +277,6 @@ <directory name="shell32"> <xi:include href="shell32/shell32.rbuild" /> </directory> -<directory name="shellext"> - <xi:include href="shellext/shellext.rbuild" /> -</directory> <directory name="shfolder"> <xi:include href="shfolder/shfolder.rbuild" /> </directory>

1 0

[mpiulachs] 33285: -replace the non defined ${MP} property by a constant boolean value for now. ${MP} was removed long time ago
by mpiulachs＠svn.reactos.org 04 May '08

04 May '08

Author: mpiulachs Date: Sun May 4 18:32:43 2008 New Revision: 33285 URL: http://svn.reactos.org/svn/reactos?rev=33285&view=rev Log: -replace the non defined ${MP} property by a constant boolean value for now. ${MP} was removed long time ago Modified: trunk/reactos/hal/hal/hal.rbuild Modified: trunk/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.rbuild?rev=332… ============================================================================== --- trunk/reactos/hal/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal.rbuild [iso-8859-1] Sun May 4 18:32:43 2008 @@ -11,9 +11,9 @@ <file>hal.rc</file> </module> <if property="ARCH" value="i386"> - <module ifnot="${MP}" name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halup"> + <module ifnot="false" name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halup"> </module> - <module if="${MP}" name="halmpalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halmp"> + <module if="false" name="halmpalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halmp"> </module> </if> <if property="ARCH" value="powerpc">

1 0

[jimtabor] 33284: Impement DxEngSetDCState, DxEngIsHdevLockedByCurrentThread and DxEngUn & ReferenceHdev.
by jimtabor＠svn.reactos.org 04 May '08

04 May '08

Author: jimtabor Date: Sun May 4 18:17:10 2008 New Revision: 33284 URL: http://svn.reactos.org/svn/reactos?rev=33284&view=rev Log: Impement DxEngSetDCState, DxEngIsHdevLockedByCurrentThread and DxEngUn & ReferenceHdev. Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] Sun May 4 18:17:10 2008 @@ -81,7 +81,7 @@ BOOLEAN STDCALL DxEngLockHdev(HDEV hdev); BOOLEAN STDCALL DxEngUnlockHdev(HDEV hdev); DWORD_PTR STDCALL DxEngGetDCState(HDC hDC, DWORD type); -DWORD STDCALL DxEngReferenceHdev(HDEV hdev); +BOOLEAN STDCALL DxEngReferenceHdev(HDEV hdev); BOOLEAN STDCALL DxEngLockShareSem(); BOOLEAN STDCALL DxEngUnlockShareSem(); DWORD STDCALL DxEngScreenAccessCheck(); @@ -99,14 +99,14 @@ HDC STDCALL DxEngCreateMemoryDC(HDEV hDev); -DWORD STDCALL DxEngIsHdevLockedByCurrentThread(DWORD x1); -DWORD STDCALL DxEngUnreferenceHdev(DWORD x1); +BOOLEAN STDCALL DxEngIsHdevLockedByCurrentThread(HDEV hDev); +BOOLEAN STDCALL DxEngUnreferenceHdev(HDEV hDev); DWORD STDCALL DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD STDCALL DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD STDCALL DxEngSpSpritesVisible(DWORD x1); HDC STDCALL DxEngGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd); BOOLEAN STDCALL DxEngDeleteDC(HDC hdc, BOOL Force); -DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3); +BOOLEAN STDCALL DxEngSetDCState(HDC hDC, DWORD SetType, DWORD Set); DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2); DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2); DWORD STDCALL DxEngDeleteSurface(DWORD x1); 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Sun May 4 18:17:10 2008 @@ -261,5 +261,7 @@ UINT STDCALL IntGdiGetTextAlign(HDC hDC); COLORREF STDCALL IntGdiGetTextColor(HDC hDC); INT STDCALL IntGdiSetStretchBltMode(HDC hDC, INT stretchBltMode); +VOID FASTCALL IntGdiReferencePdev(PGDIDEVICE pPDev); +VOID FASTCALL IntGdiUnreferencePdev(PGDIDEVICE pPDev, DWORD CleanUpType); #endif /* not __WIN32K_DC_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Sun May 4 18:17:10 2008 @@ -592,12 +592,11 @@ /************************************************************************/ /* DxEngReferenceHdev */ /************************************************************************/ -DWORD +BOOLEAN STDCALL DxEngReferenceHdev(HDEV hDev) { - UNIMPLEMENTED; - + IntGdiReferencePdev((PGDIDEVICE) hDev);; /* ALWAYS return true */ return TRUE; } @@ -680,24 +679,24 @@ /************************************************************************/ /* DxEngIsHdevLockedByCurrentThread */ /************************************************************************/ -DWORD -STDCALL -DxEngIsHdevLockedByCurrentThread(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; +BOOLEAN +STDCALL +DxEngIsHdevLockedByCurrentThread(HDEV hDev) +{ // base on EngIsSemaphoreOwnedByCurrentThread w/o the Ex call. + PERESOURCE pSem = ((PGDIDEVICE)hDev)->hsemDevLock; + return pSem->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)PsGetCurrentThread(); } /************************************************************************/ /* DxEngUnreferenceHdev */ /************************************************************************/ -DWORD -STDCALL -DxEngUnreferenceHdev(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; +BOOLEAN +STDCALL +DxEngUnreferenceHdev(HDEV hDev) +{ + IntGdiUnreferencePdev((PGDIDEVICE) hDev, 0); + return TRUE; // Always true. } /************************************************************************/ @@ -757,10 +756,27 @@ /************************************************************************/ /* DxEngSetDCState */ /************************************************************************/ -DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3) -{ - UNIMPLEMENTED; - return FALSE; +BOOLEAN +STDCALL +DxEngSetDCState(HDC hDC, DWORD SetType, DWORD Set) +{ + BOOLEAN Ret = FALSE; + PDC pDC = DC_LockDc(hDC); + + if (pDC) + { + if (SetType == 1) + { + if ( Set ) + pDC->DC_Flags |= DC_FLAG_FULLSCREEN; + else + pDC->DC_Flags &= ~DC_FLAG_FULLSCREEN; + Ret = TRUE; + } + DC_UnlockDc(pDC); + return Ret; // Everything else returns FALSE. + } + return Ret; } /************************************************************************/ 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Sun May 4 18:17:10 2008 @@ -2699,6 +2699,19 @@ return &PrimarySurface; } +VOID FASTCALL +IntGdiReferencePdev(PGDIDEVICE pPDev) +{ + pPDev->cPdevRefs++; +} + +VOID FASTCALL +IntGdiUnreferencePdev(PGDIDEVICE pPDev, DWORD CleanUpType) +{ + pPDev->cPdevRefs--; +} + + #define SIZEOF_DEVMODEW_300 188 #define SIZEOF_DEVMODEW_400 212 #define SIZEOF_DEVMODEW_500 220

1 0

[greatlrd] 33283: remove more of no working macro DXG_GET_INDEX_FUNCTION
by greatlrd＠svn.reactos.org 04 May '08

04 May '08

Author: greatlrd Date: Sun May 4 16:30:15 2008 New Revision: 33283 URL: http://svn.reactos.org/svn/reactos?rev=33283&view=rev Log: remove more of no working macro DXG_GET_INDEX_FUNCTION Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c [iso-8859-1] Sun May 4 16:30:15 2008 @@ -103,10 +103,7 @@ HANDLE hDDSurfaceTarget, PDD_FLIPVPORTDATA puFlipVPortData) { - PGD_DVPFLIPVIDEOPORT pfnDvpFlipVideoPort = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpFlipVideoPort, pfnDvpFlipVideoPort); + PGD_DVPFLIPVIDEOPORT pfnDvpFlipVideoPort = (PGD_DVPFLIPVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpFlipVideoPort].pfn; if (pfnDvpFlipVideoPort == NULL) { @@ -127,10 +124,7 @@ NtGdiDvpGetVideoPortBandwidth(HANDLE hVideoPort, PDD_GETVPORTBANDWIDTHDATA puGetVPortBandwidthData) { - PGD_DVPGETVIDEOPORTBANDWITH pfnDvpGetVideoPortBandwidth = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortBandwidth, pfnDvpGetVideoPortBandwidth); + PGD_DVPGETVIDEOPORTBANDWITH pfnDvpGetVideoPortBandwidth = (PGD_DVPGETVIDEOPORTBANDWITH)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortBandwidth].pfn; if (pfnDvpGetVideoPortBandwidth == NULL) { @@ -151,10 +145,7 @@ NtGdiDvpGetVideoPortFlipStatus(HANDLE hDirectDraw, PDD_GETVPORTFLIPSTATUSDATA puGetVPortFlipStatusData) { - PGD_DXDVPGETVIDEOPORTFLIPSTATUS pfnDvpGetVideoPortFlipStatus = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortFlipStatus, pfnDvpGetVideoPortFlipStatus); + PGD_DXDVPGETVIDEOPORTFLIPSTATUS pfnDvpGetVideoPortFlipStatus = (PGD_DXDVPGETVIDEOPORTFLIPSTATUS)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortFlipStatus].pfn; if (pfnDvpGetVideoPortFlipStatus == NULL) { @@ -175,10 +166,7 @@ NtGdiDvpGetVideoPortInputFormats(HANDLE hVideoPort, PDD_GETVPORTINPUTFORMATDATA puGetVPortInputFormatData) { - PGD_DXDVPGETVIDEOPORTINPUTFORMATS pfnDvpGetVideoPortInputFormats = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortInputFormats, pfnDvpGetVideoPortInputFormats); + PGD_DXDVPGETVIDEOPORTINPUTFORMATS pfnDvpGetVideoPortInputFormats = (PGD_DXDVPGETVIDEOPORTINPUTFORMATS)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortInputFormats].pfn; if (pfnDvpGetVideoPortInputFormats == NULL) { Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c [iso-8859-1] Sun May 4 16:30:15 2008 @@ -25,10 +25,7 @@ LPSURFACEALIGNMENT lpAlignment, LPLONG lpNewPitch) { - PGD_HEAPVIDMEMALLOCALIGNED pfnHeapVidMemAllocAligned = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdHeapVidMemAllocAligned, pfnHeapVidMemAllocAligned); + PGD_HEAPVIDMEMALLOCALIGNED pfnHeapVidMemAllocAligned = (PGD_HEAPVIDMEMALLOCALIGNED)gpDxFuncs[DXG_INDEX_DxDdHeapVidMemAllocAligned].pfn; if (pfnHeapVidMemAllocAligned == NULL) { @@ -48,10 +45,7 @@ VidMemFree(LPVMEMHEAP pvmh, FLATPTR ptr) { - PGD_VIDMEMFREE pfnVidMemFree = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdHeapVidMemFree, pfnVidMemFree); + PGD_VIDMEMFREE pfnVidMemFree = (PGD_VIDMEMFREE)gpDxFuncs[DXG_INDEX_DxDdHeapVidMemFree].pfn; if (pfnVidMemFree == NULL) { @@ -73,10 +67,7 @@ SIZE_T cj, ULONG tag) { - PGD_ENGALLOCPRIVATEUSERMEM pfnEngAllocPrivateUserMem = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdAllocPrivateUserMem, pfnEngAllocPrivateUserMem); + PGD_ENGALLOCPRIVATEUSERMEM pfnEngAllocPrivateUserMem = (PGD_ENGALLOCPRIVATEUSERMEM)gpDxFuncs[DXG_INDEX_DxDdAllocPrivateUserMem].pfn; if (pfnEngAllocPrivateUserMem == NULL) { @@ -96,10 +87,7 @@ EngFreePrivateUserMem(PDD_SURFACE_LOCAL psl, PVOID pv) { - PGD_ENGFREEPRIVATEUSERMEM pfnEngFreePrivateUserMem = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdFreePrivateUserMem, pfnEngFreePrivateUserMem); + PGD_ENGFREEPRIVATEUSERMEM pfnEngFreePrivateUserMem = (PGD_ENGFREEPRIVATEUSERMEM)gpDxFuncs[DXG_INDEX_DxDdFreePrivateUserMem].pfn; if (pfnEngFreePrivateUserMem == NULL) {

1 0

[mpiulachs] 33282: - simple but colorful new GDI screensaver
by mpiulachs＠svn.reactos.org 04 May '08

04 May '08

Author: mpiulachs Date: Sun May 4 16:10:36 2008 New Revision: 33282 URL: http://svn.reactos.org/svn/reactos?rev=33282&view=rev Log: - simple but colorful new GDI screensaver Added: trunk/rosapps/applications/screensavers/circles/ trunk/rosapps/applications/screensavers/circles/circles.c (with props) trunk/rosapps/applications/screensavers/circles/circles.rbuild (with props) trunk/rosapps/applications/screensavers/circles/circles.rc (with props) trunk/rosapps/applications/screensavers/circles/circles.spec (with props) trunk/rosapps/applications/screensavers/circles/lang/ trunk/rosapps/applications/screensavers/circles/lang/en-US.rc (with props) trunk/rosapps/applications/screensavers/circles/resource.h (with props) Modified: trunk/rosapps/applications/screensavers/screensavers.rbuild Added: trunk/rosapps/applications/screensavers/circles/circles.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.c (added) +++ trunk/rosapps/applications/screensavers/circles/circles.c [iso-8859-1] Sun May 4 16:10:36 2008 @@ -1,0 +1,120 @@ +/* + * Copyright 2008 Marc Piulachs (marc.piulachs(a)codexchange.net) + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include <windows.h> +#include <scrnsave.h> +#include <tchar.h> +#include "resource.h" + +#define RANDOM_COLOR (rand () % 256) + +#define APPNAME _T("Circles") +#define APP_TIMER 1 +#define APP_TIMER_INTERVAL 100 +#define MAX_CIRCLES 50 + +int circlesCount; +int width, x, y; + +LRESULT WINAPI ScreenSaverProc (HWND hwnd, UINT iMsg, WPARAM wparam, + LPARAM lparam) +{ + HDC hdc; + RECT rect; + HBRUSH hbrush, hbrushOld; + + switch (iMsg) + { + case WM_CREATE: + { + SetTimer ( + hwnd, + APP_TIMER, + APP_TIMER_INTERVAL, + NULL); + } + break; + case WM_DESTROY: + { + KillTimer (hwnd, APP_TIMER); + PostQuitMessage (0); + return 0; + } + break; + case WM_TIMER: + { + hdc = GetDC (hwnd); + GetClientRect (hwnd, &rect); + hbrush = CreateSolidBrush (RGB (RANDOM_COLOR, RANDOM_COLOR, RANDOM_COLOR)); + hbrushOld = SelectObject (hdc, hbrush); + + x = rand () % rect.right; + y = rand () % rect.bottom; + + /* the circle will be 10% of total screen */ + width = rect.right / 10; + if (rect.bottom / 10 < width) + width = rect.bottom / 10; + + /* Draw circle on screen */ + Ellipse ( + hdc, + x, + y, + x + width, + y + width); + + //Track the number of painted circles on scren + circlesCount++; + if (circlesCount == MAX_CIRCLES) + { + InvalidateRect (hwnd, NULL, TRUE); + circlesCount = 0; + } + + SelectObject (hdc, hbrushOld); + DeleteObject (hbrush); + ReleaseDC (hwnd, hdc); + + return 0; + } + } + + return DefScreenSaverProc (hwnd, iMsg, wparam, lparam); +} + + +BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return FALSE; +} + +// This function is only called one time before opening the configuration dialog. +// Use it to show a message that no configuration is necesssary and return FALSE to indicate that no configuration dialog shall be opened. +BOOL WINAPI RegisterDialogClasses(HANDLE hInst) +{ + TCHAR szMessage[256]; + TCHAR szTitle[25]; + + LoadString(hInst, IDS_TEXT, szMessage, sizeof(szMessage) / sizeof(TCHAR)); + LoadString(hInst, IDS_DESCRIPTION, szTitle, sizeof(szTitle) / sizeof(TCHAR)); + + MessageBox(NULL, szMessage, szTitle, MB_OK | MB_ICONEXCLAMATION); + + return FALSE; +} Propchange: trunk/rosapps/applications/screensavers/circles/circles.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/circles/circles.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.rbuild (added) +++ trunk/rosapps/applications/screensavers/circles/circles.rbuild [iso-8859-1] Sun May 4 16:10:36 2008 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="circles" type="win32scr" installbase="system32" unicode="true"> + <importlibrary definition="circles.spec.def" /> + <include base="circles">.</include> + <library>scrnsave</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + + <metadata description = "Simple Circles GDI screensaver" /> + + <file>circles.c</file> + <file>circles.rc</file> + <file>circles.spec</file> +</module> Propchange: trunk/rosapps/applications/screensavers/circles/circles.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/circles/circles.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.rc (added) +++ trunk/rosapps/applications/screensavers/circles/circles.rc [iso-8859-1] Sun May 4 16:10:36 2008 @@ -1,0 +1,14 @@ +#include <windows.h> +#include <scrnsave.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Circles ScreenSaver\0" +#define REACTOS_STR_INTERNAL_NAME "circles\0" +#define REACTOS_STR_ORIGINAL_FILENAME "circles.scr\0" + +#include <reactos/version.rc> + +#include "lang/en-US.rc" Propchange: trunk/rosapps/applications/screensavers/circles/circles.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/circles/circles.spec URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.spec (added) +++ trunk/rosapps/applications/screensavers/circles/circles.spec [iso-8859-1] Sun May 4 16:10:36 2008 @@ -1,0 +1,2 @@ +@ stdcall ScreenSaverProc(ptr long ptr ptr) +@ stdcall ScreenSaverConfigureDialog(ptr long ptr ptr) Propchange: trunk/rosapps/applications/screensavers/circles/circles.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/circles/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/lang/en-US.rc (added) +++ trunk/rosapps/applications/screensavers/circles/lang/en-US.rc [iso-8859-1] Sun May 4 16:10:36 2008 @@ -1,0 +1,7 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Circles" + IDS_TEXT "No options need to be set." +END Propchange: trunk/rosapps/applications/screensavers/circles/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/circles/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/resource.h (added) +++ trunk/rosapps/applications/screensavers/circles/resource.h [iso-8859-1] Sun May 4 16:10:36 2008 @@ -1,0 +1,3 @@ +#define IDS_TEXT 3 +#define IDB_WORKSTATION 0x100 +#define IDB_SERVER 0x200 Propchange: trunk/rosapps/applications/screensavers/circles/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/screensavers.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/screensavers.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/screensavers.rbuild [iso-8859-1] Sun May 4 16:10:36 2008 @@ -1,6 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="circles"> + <xi:include href="circles/circles.rbuild" /> + </directory> <directory name="cylfrac"> <xi:include href="cylfrac/cylfrac.rbuild" /> </directory>

1 0

[mpiulachs] 33281: - Add language name tooltip to kbswitch systray icon
by mpiulachs＠svn.reactos.org 04 May '08

04 May '08

Author: mpiulachs Date: Sun May 4 15:58:15 2008 New Revision: 33281 URL: http://svn.reactos.org/svn/reactos?rev=33281&view=rev Log: - Add language name tooltip to kbswitch systray icon Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c trunk/reactos/base/applications/kbswitch/kbswitch.h Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sun May 4 15:58:15 2008 @@ -15,6 +15,9 @@ static BOOL GetLayoutID(LPTSTR szLayoutNum, LPTSTR szLCID); + +static BOOL +GetLayoutName(LPTSTR szLayoutNum, LPTSTR szName); HINSTANCE hInst; HANDLE hProcessHeap; @@ -95,15 +98,19 @@ { NOTIFYICONDATA tnid; TCHAR szLCID[CCH_LAYOUT_ID + 1]; + TCHAR szName[MAX_PATH]; GetLayoutID(_T("1"), szLCID); + GetLayoutName(_T("1"), szName); tnid.cbSize = sizeof(NOTIFYICONDATA); tnid.hWnd = hwnd; tnid.uID = 1; - tnid.uFlags = NIF_ICON | NIF_MESSAGE; + tnid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; tnid.uCallbackMessage = WM_NOTIFYICONMSG; tnid.hIcon = CreateTrayIcon(szLCID); + + lstrcpyn(tnid.szTip, szName, sizeof(tnid.szTip)); Shell_NotifyIcon(NIM_ADD, &tnid); } @@ -121,16 +128,18 @@ } static VOID -UpdateTrayIcon(HWND hwnd, LPTSTR szLCID) +UpdateTrayIcon(HWND hwnd, LPTSTR szLCID, LPTSTR szName) { NOTIFYICONDATA tnid; tnid.cbSize = sizeof(NOTIFYICONDATA); tnid.hWnd = hwnd; tnid.uID = 1; - tnid.uFlags = NIF_ICON | NIF_MESSAGE; + tnid.uFlags = NIF_ICON | NIF_MESSAGE |NIF_TIP; tnid.uCallbackMessage = WM_NOTIFYICONMSG; tnid.hIcon = CreateTrayIcon(szLCID); + + lstrcpyn(tnid.szTip, szName, sizeof(tnid.szTip)); Shell_NotifyIcon(NIM_MODIFY, &tnid); } @@ -259,13 +268,15 @@ HKL hKl; TCHAR szLayoutNum[CCH_ULONG_DEC + 1]; TCHAR szLCID[CCH_LAYOUT_ID + 1]; + TCHAR szName[MAX_PATH]; _ultot(uLayoutNum, szLayoutNum, 10); GetLayoutID(szLayoutNum, szLCID); + GetLayoutName(szLayoutNum, szName); CreateTrayIcon(szLCID); // Switch to the new keyboard layout - UpdateTrayIcon(hwnd, szLCID); + UpdateTrayIcon(hwnd, szLCID, szName); hKl = LoadKeyboardLayout(szLCID, KLF_ACTIVATE); SystemParametersInfo(SPI_SETDEFAULTINPUTLANG, 0, &hKl, SPIF_SENDWININICHANGE); EnumWindows(EnumWindowsProc, (LPARAM) hKl); @@ -411,6 +422,15 @@ } break; + case WM_SETTINGCHANGE: + { + if (wParam == SPI_SETDEFAULTINPUTLANG) + { + //FIXME: Should detect default language changes by CPL applet or by other tools and update UI + } + } + break; + case WM_DESTROY: DestroyMenu(hLeftPopupMenu); DestroyMenu(hRightPopupMenu); Modified: trunk/reactos/base/applications/kbswitch/kbswitch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.h [iso-8859-1] Sun May 4 15:58:15 2008 @@ -1,6 +1,7 @@ #include <stdio.h> #include <stdlib.h> #include <windows.h> +#include <winuser.h> #include <tchar.h> #include "resource.h"

1 0

[cfinck] 33280: First look into %_ROSBE_BASEDIR% for the specified directory and use it if it exists. This makes it possible to just call "chdefgcc 3.4.5" instead of "chdefgcc full\path\to\the\3.4.5\directory" if there is a "3.4.5" directory in the RosBE installation directory.
by cfinck＠svn.reactos.org 04 May '08

04 May '08

Author: cfinck Date: Sun May 4 15:26:34 2008 New Revision: 33280 URL: http://svn.reactos.org/svn/reactos?rev=33280&view=rev Log: First look into %_ROSBE_BASEDIR% for the specified directory and use it if it exists. This makes it possible to just call "chdefgcc 3.4.5" instead of "chdefgcc full\path\to\the\3.4.5\directory" if there is a "3.4.5" directory in the RosBE installation directory. Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] Sun May 4 15:26:34 2008 @@ -24,14 +24,18 @@ call :INTERACTIVE ) -if not exist "%_1%\." ( +if exist "%_ROSBE_BASEDIR%\%_1%\." ( + set _1="%_ROSBE_BASEDIR%\%_1%" +) else if not exist "%_1%\." ( echo ERROR: The path specified doesn't seem to exist. goto :EOC ) + if not exist "%_1%\bin\gcc.exe" ( echo ERROR: No MinGW/GCC found in the specified path. goto :EOC ) + set _ROSBE_MINGWPATH=%_1% echo Location: %_ROSBE_MINGWPATH% call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd"

1 0

[mpiulachs] 33279: - Fix logon screensaver preview
by mpiulachs＠svn.reactos.org 04 May '08

04 May '08

Author: mpiulachs Date: Sun May 4 15:10:26 2008 New Revision: 33279 URL: http://svn.reactos.org/svn/reactos?rev=33279&view=rev Log: - Fix logon screensaver preview Modified: trunk/reactos/base/applications/screensavers/logon/logon.c Modified: trunk/reactos/base/applications/screensavers/logon/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.c [iso-8859-1] Sun May 4 15:10:26 2008 @@ -29,9 +29,6 @@ #define APP_TIMER 1 #define APP_TIMER_INTERVAL 2000 -#define BITMAP_HEIGHT 240 -#define BITMAP_WIDTH 340 - HBITMAP GetScreenSaverBitmap (void) { OSVERSIONINFOEX osvi; @@ -61,8 +58,6 @@ { case WM_CREATE: { - GetClientRect(hWnd, &rect); - bitmap = GetScreenSaverBitmap (); if(bitmap == NULL) @@ -87,25 +82,44 @@ BITMAP bm; /* Bitmap structure as seen in bmWidth & bmHeight */ PAINTSTRUCT ps; + // Obtain window coordinates. + GetClientRect (hWnd, &rect); + HDC hdc = BeginPaint(hWnd, &ps); HDC hdcMem = CreateCompatibleDC(hdc); HBITMAP hbmOld = SelectObject(hdcMem, bitmap); - GetObject(bitmap, sizeof(bm), &bm); + GetObject(bitmap, sizeof(bm), &bm); - bm.bmWidth = 1000; - bm.bmHeight = 700; - - BitBlt( - hdc, - RANDOM (0, rect.right - BITMAP_WIDTH), - RANDOM (0, rect.bottom - BITMAP_HEIGHT), - bm.bmWidth, - bm.bmHeight, - hdcMem, - 5, - 5, - SRCCOPY); + if (rect.right < bm.bmWidth || + rect.bottom < bm.bmHeight) + { + StretchBlt( + hdc, + RANDOM (0, rect.right - (bm.bmWidth /5)), + RANDOM (0, rect.bottom - (bm.bmHeight /5)), + bm.bmWidth /5, + bm.bmHeight /5, + hdcMem, + 0, + 0, + bm.bmWidth, + bm.bmHeight, + SRCCOPY); + } + else + { + BitBlt( + hdc, + RANDOM (0, rect.right - bm.bmWidth), + RANDOM (0, rect.bottom - bm.bmHeight), + bm.bmWidth, + bm.bmHeight, + hdcMem, + 0, + 0, + SRCCOPY); + } SelectObject(hdcMem, hbmOld); DeleteDC(hdcMem);

1 0

[greatlrd] 33278: Fixed one test so it be more fair.
by greatlrd＠svn.reactos.org 04 May '08

04 May '08

Author: greatlrd Date: Sun May 4 14:58:33 2008 New Revision: 33278 URL: http://svn.reactos.org/svn/reactos?rev=33278&view=rev Log: Fixed one test so it be more fair. Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] Sun May 4 14:58:33 2008 @@ -210,14 +210,20 @@ RTEST( pHalInfo->ddCaps.dwFXAlphaCaps == 0); - /* if this fail we do not have a dx driver install acodring ms, some version of windows it + /* basic dx 2 is found if this flags not set + * if this fail we do not have a dx driver install acodring ms, some version of windows it * is okay this fail and drv does then only support basic dx + * */ - RTEST( (pHalInfo->dwFlags & (DDHALINFO_GETDRIVERINFOSET | DDHALINFO_GETDRIVERINFO2)) != 0 ); + if (pHalInfo->dwFlags != 0) + { + RTEST( (pHalInfo->dwFlags & (DDHALINFO_GETDRIVERINFOSET | DDHALINFO_GETDRIVERINFO2)) != 0 ); + RTEST( ( (DWORD)pHalInfo->GetDriverInfo & 0x80000000) != 0 ); + ASSERT( ((DWORD)pHalInfo->GetDriverInfo & 0x80000000) != 0 ); + } /* point to kmode direcly to the graphic drv, the drv is kmode and it is kmode address we getting back*/ - RTEST( ( (DWORD)pHalInfo->GetDriverInfo & (~0x80000000)) != 0 ); - ASSERT( ((DWORD)pHalInfo->GetDriverInfo & (~0x80000000)) != 0 ); + /* the pHalInfo->ddCaps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE will be ignore, only way detect it proper follow code, * this will be fill in of all drv, it is not only for 3d stuff, this always fill by win32k.sys or dxg.sys depns

1 0

[dchapyshev] 33277: - Synchronize with wine head
by dchapyshev＠svn.reactos.org 04 May '08

04 May '08

Author: dchapyshev Date: Sun May 4 14:41:25 2008 New Revision: 33277 URL: http://svn.reactos.org/svn/reactos?rev=33277&view=rev Log: - Synchronize with wine head Modified: trunk/reactos/dll/win32/gdiplus/brush.c trunk/reactos/dll/win32/gdiplus/customlinecap.c trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/matrix.c trunk/reactos/dll/win32/gdiplus/stringformat.c Modified: trunk/reactos/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/brush.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] Sun May 4 14:41:25 2008 @@ -131,21 +131,53 @@ return Ok; } +GpStatus WINGDIPAPI GdipCreateLineBrushI(GDIPCONST GpPoint* startpoint, + GDIPCONST GpPoint* endpoint, ARGB startcolor, ARGB endcolor, + GpWrapMode wrap, GpLineGradient **line) +{ + GpPointF stF; + GpPointF endF; + + if(!startpoint || !endpoint) + return InvalidParameter; + + stF.X = (REAL)startpoint->X; + stF.Y = (REAL)startpoint->Y; + endF.X = (REAL)endpoint->X; + endF.X = (REAL)endpoint->Y; + + return GdipCreateLineBrush(&stF, &endF, startcolor, endcolor, wrap, line); +} + +GpStatus WINGDIPAPI GdipCreateLineBrushFromRect(GDIPCONST GpRectF* rect, + ARGB startcolor, ARGB endcolor, LinearGradientMode mode, GpWrapMode wrap, + GpLineGradient **line) +{ + GpPointF start, end; + + if(!line || !rect) + return InvalidParameter; + + start.X = rect->X; + start.Y = rect->Y; + end.X = rect->X + rect->Width; + end.Y = rect->Y + rect->Height; + + return GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line); +} + GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect* rect, ARGB startcolor, ARGB endcolor, LinearGradientMode mode, GpWrapMode wrap, GpLineGradient **line) { - GpPointF start, end; - - if(!line || !rect) - return InvalidParameter; - - start.X = (REAL) rect->X; - start.Y = (REAL) rect->Y; - end.X = (REAL) (rect->X + rect->Width); - end.Y = (REAL) (rect->Y + rect->Height); - - return GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line); + GpRectF rectF; + + rectF.X = (REAL) rect->X; + rectF.Y = (REAL) rect->Y; + rectF.Width = (REAL) rect->Width; + rectF.Height = (REAL) rect->Height; + + return GdipCreateLineBrushFromRect(&rectF, startcolor, endcolor, mode, wrap, line); } GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, @@ -191,6 +223,34 @@ (*grad)->focus.Y = 0.0; return Ok; +} + +GpStatus WINGDIPAPI GdipCreatePathGradientI(GDIPCONST GpPoint* points, + INT count, GpWrapMode wrap, GpPathGradient **grad) +{ + GpPointF *pointsF; + GpStatus ret; + INT i; + + if(!points || !grad) + return InvalidParameter; + + if(count <= 0) + return OutOfMemory; + + pointsF = GdipAlloc(sizeof(GpPointF) * count); + if(!pointsF) + return OutOfMemory; + + for(i = 0; i < count; i++){ + pointsF[i].X = (REAL)points[i].X; + pointsF[i].Y = (REAL)points[i].Y; + } + + ret = GdipCreatePathGradient(pointsF, count, wrap, grad); + GdipFree(pointsF); + + return ret; } /* FIXME: path gradient brushes not truly supported (drawn as solid brushes) */ @@ -428,6 +488,25 @@ return Ok; } +GpStatus WINGDIPAPI GdipGetPathGradientCenterPointI(GpPathGradient *grad, + GpPoint *point) +{ + GpStatus ret; + GpPointF ptf; + + if(!point) + return InvalidParameter; + + ret = GdipGetPathGradientCenterPoint(grad,&ptf); + + if(ret == Ok){ + point->X = roundr(ptf.X); + point->Y = roundr(ptf.Y); + } + + return ret; +} + GpStatus WINGDIPAPI GdipGetPathGradientFocusScales(GpPathGradient *grad, REAL *x, REAL *y) { @@ -563,6 +642,20 @@ return Ok; } +GpStatus WINGDIPAPI GdipSetPathGradientCenterPointI(GpPathGradient *grad, + GpPoint *point) +{ + GpPointF ptf; + + if(!point) + return InvalidParameter; + + ptf.X = (REAL)point->X; + ptf.Y = (REAL)point->Y; + + return GdipSetPathGradientCenterPoint(grad,&ptf); +} + GpStatus WINGDIPAPI GdipSetPathGradientFocusScales(GpPathGradient *grad, REAL x, REAL y) { @@ -657,6 +750,29 @@ GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient *brush, ARGB color1, ARGB color2) { + if(!brush) + return InvalidParameter; + + brush->startcolor = color1; + brush->endcolor = color2; + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetLineColors(GpLineGradient *brush, ARGB *colors) +{ + if(!brush || !colors) + return InvalidParameter; + + colors[0] = brush->startcolor; + colors[1] = brush->endcolor; + + return Ok; +} + +GpStatus WINGDIPAPI GdipSetLineLinearBlend(GpLineGradient *brush, REAL focus, + REAL scale) +{ static int calls; if(!(calls++)) @@ -665,8 +781,8 @@ return NotImplemented; } -GpStatus WINGDIPAPI GdipSetLineLinearBlend(GpLineGradient *brush, REAL focus, - REAL scale) +GpStatus WINGDIPAPI GdipSetLinePresetBlend(GpLineGradient *brush, + GDIPCONST ARGB *blend, GDIPCONST REAL* positions, INT count) { static int calls; @@ -676,8 +792,8 @@ return NotImplemented; } -GpStatus WINGDIPAPI GdipSetLinePresetBlend(GpLineGradient *brush, - GDIPCONST ARGB *blend, GDIPCONST REAL* positions, INT count) +GpStatus WINGDIPAPI GdipSetLineTransform(GpLineGradient *brush, + GDIPCONST GpMatrix *matrix) { static int calls; @@ -687,13 +803,33 @@ return NotImplemented; } -GpStatus WINGDIPAPI GdipSetLineTransform(GpLineGradient *brush, - GDIPCONST GpMatrix *matrix) -{ - static int calls; - - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; -} +GpStatus WINGDIPAPI GdipGetLineRect(GpLineGradient *brush, GpRectF *rect) +{ + if(!brush || !rect) + return InvalidParameter; + + rect->X = (brush->startpoint.X < brush->endpoint.X ? brush->startpoint.X: brush->endpoint.X); + rect->Y = (brush->startpoint.Y < brush->endpoint.Y ? brush->startpoint.Y: brush->endpoint.Y); + + rect->Width = fabs(brush->startpoint.X - brush->endpoint.X); + rect->Height = fabs(brush->startpoint.Y - brush->endpoint.Y); + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetLineRectI(GpLineGradient *brush, GpRect *rect) +{ + GpRectF rectF; + GpStatus ret; + + ret = GdipGetLineRect(brush, &rectF); + + if(ret == Ok){ + rect->X = roundr(rectF.X); + rect->Y = roundr(rectF.Y); + rect->Width = roundr(rectF.Width); + rect->Height = roundr(rectF.Height); + } + + return ret; +} Modified: trunk/reactos/dll/win32/gdiplus/customlinecap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/customli… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/customlinecap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/customlinecap.c [iso-8859-1] Sun May 4 14:41:25 2008 @@ -184,3 +184,13 @@ return NotImplemented; } + +GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap *customCap, GpLineCap *baseCap) +{ + if(!customCap || !baseCap) + return InvalidParameter; + + *baseCap = customCap->cap; + + return Ok; +} Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] Sun May 4 14:41:25 2008 @@ -88,6 +88,24 @@ return Ok; } +GpStatus WINGDIPAPI GdipCreateFontFromDC(HDC hdc, GpFont **font) +{ + HFONT hfont; + LOGFONTW lfw; + + if(!font) + return InvalidParameter; + + hfont = (HFONT)GetCurrentObject(hdc, OBJ_FONT); + if(!hfont) + return GenericError; + + if(!GetObjectW(hfont, sizeof(LOGFONTW), &lfw)) + return GenericError; + + return GdipCreateFontFromLogfontW(hdc, &lfw, font); +} + /* FIXME: use graphics */ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW *lfw) @@ -99,3 +117,16 @@ return Ok; } + +GpStatus WINGDIPAPI GdipCloneFont(GpFont *font, GpFont **cloneFont) +{ + if(!font || !cloneFont) + return InvalidParameter; + + *cloneFont = GdipAlloc(sizeof(GpFont)); + if(!*cloneFont) return OutOfMemory; + + **cloneFont = *font; + + return Ok; +} Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] Sun May 4 14:41:25 2008 @@ -1,9 +1,9 @@ @ stdcall GdipAddPathArc(ptr long long long long long long) -@ stub GdipAddPathArcI -@ stub GdipAddPathBezier +@ stdcall GdipAddPathArcI(ptr long long long long long long) +@ stdcall GdipAddPathBezier(ptr long long long long long long long long) @ stdcall GdipAddPathBezierI(ptr long long long long long long long long) @ stdcall GdipAddPathBeziers(ptr ptr long) -@ stub GdipAddPathBeziersI +@ stdcall GdipAddPathBeziersI(ptr ptr long) @ stub GdipAddPathClosedCurve2 @ stub GdipAddPathClosedCurve2I @ stub GdipAddPathClosedCurve @@ -15,10 +15,10 @@ @ stub GdipAddPathCurve @ stub GdipAddPathCurveI @ stdcall GdipAddPathEllipse(ptr long long long long) -@ stub GdipAddPathEllipseI +@ stdcall GdipAddPathEllipseI(ptr long long long long) @ stdcall GdipAddPathLine2(ptr ptr long) -@ stub GdipAddPathLine2I -@ stub GdipAddPathLine +@ stdcall GdipAddPathLine2I(ptr ptr long) +@ stdcall GdipAddPathLine(ptr long long long long) @ stdcall GdipAddPathLineI(ptr long long long long) @ stdcall GdipAddPathPath(ptr ptr long) @ stub GdipAddPathPie @@ -50,7 +50,7 @@ @ stub GdipCloneBitmapAreaI @ stdcall GdipCloneBrush(ptr ptr) @ stdcall GdipCloneCustomLineCap(ptr ptr) -@ stub GdipCloneFont +@ stdcall GdipCloneFont(ptr ptr) @ stub GdipCloneFontFamily @ stub GdipCloneImage @ stub GdipCloneImageAttributes @@ -58,7 +58,7 @@ @ stdcall GdipClonePath(ptr ptr) @ stdcall GdipClonePen(ptr ptr) @ stub GdipCloneRegion -@ stub GdipCloneStringFormat +@ stdcall GdipCloneStringFormat(ptr ptr) @ stdcall GdipClosePathFigure(ptr) @ stdcall GdipClosePathFigures(ptr) @ stub GdipCombineRegionPath @@ -86,9 +86,9 @@ @ stub GdipCreateEffect @ stub GdipCreateFont @ stub GdipCreateFontFamilyFromName -@ stub GdipCreateFontFromDC -@ stdcall GdipCreateFontFromLogfontA(ptr ptr ptr) -@ stdcall GdipCreateFontFromLogfontW(ptr ptr ptr) +@ stdcall GdipCreateFontFromDC(long ptr) +@ stdcall GdipCreateFontFromLogfontA(long ptr ptr) +@ stdcall GdipCreateFontFromLogfontW(long ptr ptr) @ stdcall GdipCreateFromHDC2(long long ptr) @ stdcall GdipCreateFromHDC(long ptr) @ stdcall GdipCreateFromHWND(long ptr) @@ -99,14 +99,14 @@ @ stub GdipCreateHatchBrush @ stdcall GdipCreateImageAttributes(ptr) @ stdcall GdipCreateLineBrush(ptr ptr long long long ptr) -@ stub GdipCreateLineBrushFromRect +@ stdcall GdipCreateLineBrushFromRect(ptr long long long long ptr) @ stdcall GdipCreateLineBrushFromRectI(ptr long long long long ptr) @ stub GdipCreateLineBrushFromRectWithAngle @ stub GdipCreateLineBrushFromRectWithAngleI -@ stub GdipCreateLineBrushI +@ stdcall GdipCreateLineBrushI(ptr ptr long long long ptr) @ stdcall GdipCreateMatrix2(long long long long long long ptr) @ stdcall GdipCreateMatrix3(ptr ptr ptr) -@ stub GdipCreateMatrix3I +@ stdcall GdipCreateMatrix3I(ptr ptr ptr) @ stdcall GdipCreateMatrix(ptr) @ stdcall GdipCreateMetafileFromEmf(ptr long ptr) @ stub GdipCreateMetafileFromFile @@ -114,11 +114,11 @@ @ stdcall GdipCreateMetafileFromWmf(ptr long ptr ptr) @ stub GdipCreateMetafileFromWmfFile @ stdcall GdipCreatePath2(ptr ptr long long ptr) -@ stub GdipCreatePath2I +@ stdcall GdipCreatePath2I(ptr ptr long long ptr) @ stdcall GdipCreatePath(long ptr) @ stdcall GdipCreatePathGradient(ptr long long ptr) @ stdcall GdipCreatePathGradientFromPath(ptr ptr) -@ stub GdipCreatePathGradientI +@ stdcall GdipCreatePathGradientI(ptr long long ptr) @ stdcall GdipCreatePathIter(ptr ptr) @ stdcall GdipCreatePen1(long long long ptr) @ stdcall GdipCreatePen2(ptr long long ptr) @@ -164,15 +164,15 @@ @ stub GdipDrawClosedCurve @ stub GdipDrawClosedCurveI @ stdcall GdipDrawCurve2(ptr ptr ptr long long) -@ stub GdipDrawCurve2I +@ stdcall GdipDrawCurve2I(ptr ptr ptr long long) @ stub GdipDrawCurve3 @ stub GdipDrawCurve3I -@ stub GdipDrawCurve -@ stub GdipDrawCurveI +@ stdcall GdipDrawCurve(ptr ptr ptr long) +@ stdcall GdipDrawCurveI(ptr ptr ptr long) @ stub GdipDrawDriverString @ stub GdipDrawEllipse @ stub GdipDrawEllipseI -@ stub GdipDrawImage +@ stdcall GdipDrawImage(ptr ptr long long) @ stub GdipDrawImageFX @ stdcall GdipDrawImageI(ptr ptr long long) @ stub GdipDrawImagePointRect @@ -180,9 +180,9 @@ @ stub GdipDrawImagePoints @ stub GdipDrawImagePointsI @ stdcall GdipDrawImagePointsRect(ptr ptr ptr long long long long long long ptr ptr ptr) -@ stub GdipDrawImagePointsRectI -@ stub GdipDrawImageRect -@ stub GdipDrawImageRectI +@ stdcall GdipDrawImagePointsRectI(ptr ptr ptr long long long long long long ptr ptr ptr) +@ stdcall GdipDrawImageRect(ptr ptr long long long long) +@ stdcall GdipDrawImageRectI(ptr ptr long long long long) @ stdcall GdipDrawImageRectRect(ptr ptr long long long long long long long long long ptr long ptr) @ stdcall GdipDrawImageRectRectI(ptr ptr long long long long long long long long long ptr long ptr) @ stdcall GdipDrawLine(ptr ptr long long long long) @@ -191,13 +191,13 @@ @ stdcall GdipDrawLinesI(ptr ptr ptr long) @ stdcall GdipDrawPath(ptr ptr ptr) @ stdcall GdipDrawPie(ptr ptr long long long long long long) -@ stub GdipDrawPieI -@ stub GdipDrawPolygon -@ stub GdipDrawPolygonI -@ stub GdipDrawRectangle +@ stdcall GdipDrawPieI(ptr ptr long long long long long long) +@ stdcall GdipDrawPolygon(ptr ptr ptr long) +@ stdcall GdipDrawPolygonI(ptr ptr ptr long) +@ stdcall GdipDrawRectangle(ptr ptr long long long long) @ stdcall GdipDrawRectangleI(ptr ptr long long long long) @ stdcall GdipDrawRectangles(ptr ptr ptr long) -@ stub GdipDrawRectanglesI +@ stdcall GdipDrawRectanglesI(ptr ptr ptr long) @ stdcall GdipDrawString(ptr ptr long ptr ptr ptr ptr) @ stub GdipEmfToWmfBits @ stub GdipEndContainer @@ -217,19 +217,19 @@ @ stub GdipFillClosedCurve2I @ stub GdipFillClosedCurve @ stub GdipFillClosedCurveI -@ stub GdipFillEllipse -@ stub GdipFillEllipseI +@ stdcall GdipFillEllipse(ptr ptr long long long long) +@ stdcall GdipFillEllipseI(ptr ptr long long long long) @ stdcall GdipFillPath(ptr ptr ptr) @ stdcall GdipFillPie(ptr ptr long long long long long long) -@ stub GdipFillPieI +@ stdcall GdipFillPieI(ptr ptr long long long long long long) @ stub GdipFillPolygon2 @ stub GdipFillPolygon2I @ stdcall GdipFillPolygon(ptr ptr ptr long long) @ stdcall GdipFillPolygonI(ptr ptr ptr long long) @ stdcall GdipFillRectangle(ptr ptr long long long long) @ stdcall GdipFillRectangleI(ptr ptr long long long long) -@ stub GdipFillRectangles -@ stub GdipFillRectanglesI +@ stdcall GdipFillRectangles(ptr ptr ptr long) +@ stdcall GdipFillRectanglesI(ptr ptr ptr long) @ stub GdipFillRegion @ stdcall GdipFindFirstImageItem(ptr ptr) @ stub GdipFindNextImageItem @@ -249,15 +249,15 @@ @ stub GdipGetClipBoundsI @ stdcall GdipGetCompositingMode(ptr ptr) @ stdcall GdipGetCompositingQuality(ptr ptr) -@ stub GdipGetCustomLineCapBaseCap +@ stdcall GdipGetCustomLineCapBaseCap(ptr ptr) @ stdcall GdipGetCustomLineCapBaseInset(ptr ptr) @ stub GdipGetCustomLineCapStrokeCaps @ stub GdipGetCustomLineCapStrokeJoin @ stub GdipGetCustomLineCapType @ stub GdipGetCustomLineCapWidthScale @ stub GdipGetDC -@ stub GdipGetDpiX -@ stub GdipGetDpiY +@ stdcall GdipGetDpiX(ptr ptr) +@ stdcall GdipGetDpiY(ptr ptr) @ stub GdipGetEffectParameterSize @ stub GdipGetEffectParameters @ stub GdipGetEmHeight @@ -302,12 +302,12 @@ @ stdcall GdipGetInterpolationMode(ptr ptr) @ stub GdipGetLineBlend @ stub GdipGetLineBlendCount -@ stub GdipGetLineColors +@ stdcall GdipGetLineColors(ptr ptr) @ stdcall GdipGetLineGammaCorrection(ptr ptr) @ stub GdipGetLinePresetBlend @ stub GdipGetLinePresetBlendCount -@ stub GdipGetLineRect -@ stub GdipGetLineRectI +@ stdcall GdipGetLineRect(ptr ptr) +@ stdcall GdipGetLineRectI(ptr ptr) @ stub GdipGetLineSpacing @ stub GdipGetLineTransform @ stub GdipGetLineWrapMode @@ -329,7 +329,7 @@ @ stub GdipGetPathGradientBlendCount @ stub GdipGetPathGradientCenterColor @ stdcall GdipGetPathGradientCenterPoint(ptr ptr) -@ stub GdipGetPathGradientCenterPointI +@ stdcall GdipGetPathGradientCenterPointI(ptr ptr) @ stdcall GdipGetPathGradientFocusScales(ptr ptr ptr) @ stdcall GdipGetPathGradientGammaCorrection(ptr ptr) @ stub GdipGetPathGradientPath @@ -344,10 +344,10 @@ @ stub GdipGetPathGradientWrapMode @ stub GdipGetPathLastPoint @ stdcall GdipGetPathPoints(ptr ptr long) -@ stub GdipGetPathPointsI +@ stdcall GdipGetPathPointsI(ptr ptr long) @ stdcall GdipGetPathTypes(ptr ptr long) @ stdcall GdipGetPathWorldBounds(ptr ptr ptr ptr) -@ stub GdipGetPathWorldBoundsI +@ stdcall GdipGetPathWorldBoundsI(ptr ptr ptr ptr) @ stdcall GdipGetPenBrushFill(ptr ptr) @ stdcall GdipGetPenColor(ptr ptr) @ stub GdipGetPenCompoundArray @@ -418,8 +418,8 @@ @ stub GdipIsEmptyRegion @ stub GdipIsEqualRegion @ stub GdipIsInfiniteRegion -@ stub GdipIsMatrixEqual -@ stub GdipIsMatrixIdentity +@ stdcall GdipIsMatrixEqual(ptr ptr ptr) +@ stdcall GdipIsMatrixIdentity(ptr ptr) @ stub GdipIsMatrixInvertible @ stub GdipIsOutlineVisiblePathPoint @ stdcall GdipIsOutlineVisiblePathPointI(ptr long long ptr ptr ptr) @@ -447,7 +447,7 @@ @ stub GdipMultiplyPathGradientTransform @ stub GdipMultiplyPenTransform @ stub GdipMultiplyTextureTransform -@ stub GdipMultiplyWorldTransform +@ stdcall GdipMultiplyWorldTransform(ptr ptr long) @ stub GdipNewInstalledFontCollection @ stub GdipNewPrivateFontCollection @ stdcall GdipPathIterCopyData(ptr ptr ptr ptr long long) @@ -551,7 +551,7 @@ @ stub GdipSetPathGradientBlend @ stdcall GdipSetPathGradientCenterColor(ptr long) @ stdcall GdipSetPathGradientCenterPoint(ptr ptr) -@ stub GdipSetPathGradientCenterPointI +@ stdcall GdipSetPathGradientCenterPointI(ptr ptr) @ stdcall GdipSetPathGradientFocusScales(ptr long long) @ stdcall GdipSetPathGradientGammaCorrection(ptr long) @ stub GdipSetPathGradientLinearBlend @@ -604,7 +604,7 @@ @ stub GdipStringFormatGetGenericTypographic @ stub GdipTestControl @ stdcall GdipTransformMatrixPoints(ptr ptr long) -@ stub GdipTransformMatrixPointsI +@ stdcall GdipTransformMatrixPointsI(ptr ptr long) @ stdcall GdipTransformPath(ptr ptr) @ stub GdipTransformPoints @ stub GdipTransformPointsI @@ -619,8 +619,8 @@ @ stub GdipTranslateRegionI @ stub GdipTranslateTextureTransform @ stdcall GdipTranslateWorldTransform(ptr long long long) -@ stub GdipVectorTransformMatrixPoints -@ stub GdipVectorTransformMatrixPointsI +@ stdcall GdipVectorTransformMatrixPoints(ptr ptr long) +@ stdcall GdipVectorTransformMatrixPointsI(ptr ptr long) @ stub GdipWarpPath @ stub GdipWidenPath @ stub GdipWindingModeOutline Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Sun May 4 14:41:25 2008 @@ -1006,6 +1006,37 @@ return retval; } +GpStatus WINGDIPAPI GdipDrawCurve(GpGraphics *graphics, GpPen *pen, + GDIPCONST GpPointF *points, INT count) +{ + return GdipDrawCurve2(graphics,pen,points,count,1.0); +} + +GpStatus WINGDIPAPI GdipDrawCurveI(GpGraphics *graphics, GpPen *pen, + GDIPCONST GpPoint *points, INT count) +{ + GpPointF *pointsF; + GpStatus ret; + INT i; + + if(!points || count <= 0) + return InvalidParameter; + + pointsF = GdipAlloc(sizeof(GpPointF)*count); + if(!pointsF) + return OutOfMemory; + + for(i = 0; i < count; i++){ + pointsF[i].X = (REAL)points[i].X; + pointsF[i].Y = (REAL)points[i].Y; + } + + ret = GdipDrawCurve(graphics,pen,pointsF,count); + GdipFree(pointsF); + + return ret; +} + /* Approximates cardinal spline with Bezier curves. */ GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count, REAL tension) @@ -1059,6 +1090,37 @@ return retval; } +GpStatus WINGDIPAPI GdipDrawCurve2I(GpGraphics *graphics, GpPen *pen, + GDIPCONST GpPoint *points, INT count, REAL tension) +{ + GpPointF *pointsF; + GpStatus ret; + INT i; + + if(!points || count <= 0) + return InvalidParameter; + + pointsF = GdipAlloc(sizeof(GpPointF)*count); + if(!pointsF) + return OutOfMemory; + + for(i = 0; i < count; i++){ + pointsF[i].X = (REAL)points[i].X; + pointsF[i].Y = (REAL)points[i].Y; + } + + ret = GdipDrawCurve2(graphics,pen,pointsF,count,tension); + GdipFree(pointsF); + + return ret; +} + +GpStatus WINGDIPAPI GdipDrawImage(GpGraphics *graphics, GpImage *image, REAL x, REAL y) +{ + /* IPicture::Render uses LONG coords */ + return GdipDrawImageI(graphics,image,roundr(x),roundr(y)); +} + GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics *graphics, GpImage *image, INT x, INT y) { @@ -1100,7 +1162,7 @@ srcx, srcy, srcwidth, srcheight, srcUnit, imageAttributes, callback, callbackData); - if(!graphics || !image || !points || !imageAttributes || count != 3) + if(!graphics || !image || !points || count != 3) return InvalidParameter; if(srcUnit == UnitInch) @@ -1139,6 +1201,27 @@ return Ok; } +GpStatus WINGDIPAPI GdipDrawImagePointsRectI(GpGraphics *graphics, GpImage *image, + GDIPCONST GpPoint *points, INT count, INT srcx, INT srcy, INT srcwidth, + INT srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, + DrawImageAbort callback, VOID * callbackData) +{ + GpPointF pointsF[3]; + INT i; + + if(!points || count!=3) + return InvalidParameter; + + for(i = 0; i < count; i++){ + pointsF[i].X = (REAL)points[i].X; + pointsF[i].Y = (REAL)points[i].Y; + } + + return GdipDrawImagePointsRect(graphics, image, pointsF, count, (REAL)srcx, (REAL)srcy, + (REAL)srcwidth, (REAL)srcheight, srcUnit, imageAttributes, + callback, callbackData); +} + GpStatus WINGDIPAPI GdipDrawImageRectRect(GpGraphics *graphics, GpImage *image, REAL dstx, REAL dsty, REAL dstwidth, REAL dstheight, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, GpUnit srcUnit, @@ -1177,6 +1260,31 @@ srcwidth, srcheight, srcUnit, imageAttributes, callback, callbackData); } +GpStatus WINGDIPAPI GdipDrawImageRect(GpGraphics *graphics, GpImage *image, + REAL x, REAL y, REAL width, REAL height) +{ + RectF bounds; + GpUnit unit; + GpStatus ret; + + if(!graphics || !image) + return InvalidParameter; + + ret = GdipGetImageBounds(image, &bounds, &unit); + if(ret != Ok) + return ret; + + return GdipDrawImageRectRect(graphics, image, x, y, width, height, + bounds.X, bounds.Y, bounds.Width, bounds.Height, + unit, NULL, NULL, NULL); +} + +GpStatus WINGDIPAPI GdipDrawImageRectI(GpGraphics *graphics, GpImage *image, + INT x, INT y, INT width, INT height) +{ + return GdipDrawImageRect(graphics, image, (REAL)x, (REAL)y, (REAL)width, (REAL)height); +} + GpStatus WINGDIPAPI GdipDrawLine(GpGraphics *graphics, GpPen *pen, REAL x1, REAL y1, REAL x2, REAL y2) { @@ -1308,8 +1416,14 @@ return Ok; } -GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x, - INT y, INT width, INT height) +GpStatus WINGDIPAPI GdipDrawPieI(GpGraphics *graphics, GpPen *pen, INT x, + INT y, INT width, INT height, REAL startAngle, REAL sweepAngle) +{ + return GdipDrawPie(graphics,pen,(REAL)x,(REAL)y,(REAL)width,(REAL)height,startAngle,sweepAngle); +} + +GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics *graphics, GpPen *pen, REAL x, + REAL y, REAL width, REAL height) { INT save_state; GpPointF ptf[4]; @@ -1338,6 +1452,12 @@ return Ok; } +GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x, + INT y, INT width, INT height) +{ + return GdipDrawRectangle(graphics,pen,(REAL)x,(REAL)y,(REAL)width,(REAL)height); +} + GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics *graphics, GpPen *pen, GDIPCONST GpRectF* rects, INT count) { @@ -1378,6 +1498,33 @@ GdipFree(pti); return Ok; +} + +GpStatus WINGDIPAPI GdipDrawRectanglesI(GpGraphics *graphics, GpPen *pen, + GDIPCONST GpRect* rects, INT count) +{ + GpRectF *rectsF; + GpStatus ret; + INT i; + + if(!rects || count<=0) + return InvalidParameter; + + rectsF = GdipAlloc(sizeof(GpRectF) * count); + if(!rectsF) + return OutOfMemory; + + for(i = 0;i < count;i++){ + rectsF[i].X = (REAL)rects[i].X; + rectsF[i].Y = (REAL)rects[i].Y; + rectsF[i].Width = (REAL)rects[i].Width; + rectsF[i].Height = (REAL)rects[i].Height; + } + + ret = GdipDrawRectangles(graphics, pen, rectsF, count); + GdipFree(rectsF); + + return ret; } GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string, @@ -1535,6 +1682,41 @@ return Ok; } +GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics *graphics, GpBrush *brush, REAL x, + REAL y, REAL width, REAL height) +{ + INT save_state; + GpPointF ptf[2]; + POINT pti[2]; + + if(!graphics || !brush) + return InvalidParameter; + + ptf[0].X = x; + ptf[0].Y = y; + ptf[1].X = x + width; + ptf[1].Y = y + height; + + save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); + SelectObject(graphics->hdc, brush->gdibrush); + SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); + + transform_and_round_points(graphics, pti, ptf, 2); + + Ellipse(graphics->hdc, pti[0].x, pti[0].y, pti[1].x, pti[1].y); + + RestoreDC(graphics->hdc, save_state); + + return Ok; +} + +GpStatus WINGDIPAPI GdipFillEllipseI(GpGraphics *graphics, GpBrush *brush, INT x, + INT y, INT width, INT height) +{ + return GdipFillEllipse(graphics,brush,(REAL)x,(REAL)y,(REAL)width,(REAL)height); +} + GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path) { INT save_state; @@ -1585,6 +1767,12 @@ RestoreDC(graphics->hdc, save_state); return Ok; +} + +GpStatus WINGDIPAPI GdipFillPieI(GpGraphics *graphics, GpBrush *brush, INT x, + INT y, INT width, INT height, REAL startAngle, REAL sweepAngle) +{ + return GdipFillPie(graphics,brush,(REAL)x,(REAL)y,(REAL)width,(REAL)height,startAngle,sweepAngle); } GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics *graphics, GpBrush *brush, @@ -1732,6 +1920,50 @@ RestoreDC(graphics->hdc, save_state); return Ok; +} + +GpStatus WINGDIPAPI GdipFillRectangles(GpGraphics *graphics, GpBrush *brush, GDIPCONST GpRectF *rects, + INT count) +{ + GpStatus ret; + INT i; + + if(!rects) + return InvalidParameter; + + for(i = 0; i < count; i++){ + ret = GdipFillRectangle(graphics, brush, rects[i].X, rects[i].Y, rects[i].Width, rects[i].Height); + if(ret != Ok) return ret; + } + + return Ok; +} + +GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics *graphics, GpBrush *brush, GDIPCONST GpRect *rects, + INT count) +{ + GpRectF *rectsF; + GpStatus ret; + INT i; + + if(!rects || count <= 0) + return InvalidParameter; + + rectsF = GdipAlloc(sizeof(GpRectF)*count); + if(!rectsF) + return OutOfMemory; + + for(i = 0; i < count; i++){ + rectsF[i].X = (REAL)rects[i].X; + rectsF[i].Y = (REAL)rects[i].Y; + rectsF[i].X = (REAL)rects[i].Width; + rectsF[i].Height = (REAL)rects[i].Height; + } + + ret = GdipFillRectangles(graphics,brush,rectsF,count); + GdipFree(rectsF); + + return ret; } /* FIXME: Compositing mode is not used anywhere except the getter/setter. */ @@ -2122,3 +2354,85 @@ return NotImplemented; } + +GpStatus WINGDIPAPI GdipDrawPolygon(GpGraphics *graphics,GpPen *pen,GDIPCONST GpPointF *points, + INT count) +{ + INT save_state; + POINT *pti; + + if(!graphics || !pen || count<=0) + return InvalidParameter; + + pti = GdipAlloc(sizeof(POINT) * count); + + save_state = prepare_dc(graphics, pen); + SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); + + transform_and_round_points(graphics, pti, (GpPointF*)points, count); + Polygon(graphics->hdc, pti, count); + + restore_dc(graphics, save_state); + GdipFree(pti); + + return Ok; +} + +GpStatus WINGDIPAPI GdipDrawPolygonI(GpGraphics *graphics,GpPen *pen,GDIPCONST GpPoint *points, + INT count) +{ + GpStatus ret; + GpPointF *ptf; + INT i; + + if(count<=0) return InvalidParameter; + ptf = GdipAlloc(sizeof(GpPointF) * count); + + for(i = 0;i < count; i++){ + ptf[i].X = (REAL)points[i].X; + ptf[i].Y = (REAL)points[i].Y; + } + + ret = GdipDrawPolygon(graphics,pen,ptf,count); + GdipFree(ptf); + + return ret; +} + +GpStatus WINGDIPAPI GdipGetDpiX(GpGraphics *graphics, REAL* dpi) +{ + if(!graphics || !dpi) + return InvalidParameter; + + *dpi = (REAL)GetDeviceCaps(graphics->hdc, LOGPIXELSX); + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetDpiY(GpGraphics *graphics, REAL* dpi) +{ + if(!graphics || !dpi) + return InvalidParameter; + + *dpi = (REAL)GetDeviceCaps(graphics->hdc, LOGPIXELSY); + + return Ok; +} + +GpStatus WINGDIPAPI GdipMultiplyWorldTransform(GpGraphics *graphics, GDIPCONST GpMatrix *matrix, + GpMatrixOrder order) +{ + GpMatrix m; + GpStatus ret; + + if(!graphics || !matrix) + return InvalidParameter; + + m = *(graphics->worldtrans); + + ret = GdipMultiplyMatrix(&m, (GpMatrix*)matrix, order); + if(ret == Ok) + *(graphics->worldtrans) = m; + + return ret; +} Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Sun May 4 14:41:25 2008 @@ -97,8 +97,14 @@ return Ok; } -GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath *path, INT x1, INT y1, INT x2, - INT y2, INT x3, INT y3, INT x4, INT y4) +GpStatus WINGDIPAPI GdipAddPathArcI(GpPath *path, INT x1, INT y1, INT x2, + INT y2, REAL startAngle, REAL sweepAngle) +{ + return GdipAddPathArc(path,(REAL)x1,(REAL)y1,(REAL)x2,(REAL)y2,startAngle,sweepAngle); +} + +GpStatus WINGDIPAPI GdipAddPathBezier(GpPath *path, REAL x1, REAL y1, REAL x2, + REAL y2, REAL x3, REAL y3, REAL x4, REAL y4) { INT old_count; @@ -110,14 +116,14 @@ old_count = path->pathdata.Count; - path->pathdata.Points[old_count].X = (REAL) x1; - path->pathdata.Points[old_count].Y = (REAL) y1; - path->pathdata.Points[old_count + 1].X = (REAL) x2; - path->pathdata.Points[old_count + 1].Y = (REAL) y2; - path->pathdata.Points[old_count + 2].X = (REAL) x3; - path->pathdata.Points[old_count + 2].Y = (REAL) y3; - path->pathdata.Points[old_count + 3].X = (REAL) x4; - path->pathdata.Points[old_count + 3].Y = (REAL) y4; + path->pathdata.Points[old_count].X = x1; + path->pathdata.Points[old_count].Y = y1; + path->pathdata.Points[old_count + 1].X = x2; + path->pathdata.Points[old_count + 1].Y = y2; + path->pathdata.Points[old_count + 2].X = x3; + path->pathdata.Points[old_count + 2].Y = y3; + path->pathdata.Points[old_count + 3].X = x4; + path->pathdata.Points[old_count + 3].Y = y4; path->pathdata.Types[old_count] = (path->newfigure ? PathPointTypeStart : PathPointTypeLine); @@ -131,6 +137,13 @@ return Ok; } +GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath *path, INT x1, INT y1, INT x2, + INT y2, INT x3, INT y3, INT x4, INT y4) +{ + return GdipAddPathBezier(path,(REAL)x1,(REAL)y1,(REAL)x2,(REAL)y2,(REAL)x3,(REAL)y3, + (REAL)x4,(REAL)y4); +} + GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath *path, GDIPCONST GpPointF *points, INT count) { @@ -156,6 +169,31 @@ path->pathdata.Count += count; return Ok; +} + +GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath *path, GDIPCONST GpPoint *points, + INT count) +{ + GpPointF *ptsF; + GpStatus ret; + INT i; + + if(!points || ((count - 1) % 3)) + return InvalidParameter; + + ptsF = GdipAlloc(sizeof(GpPointF) * count); + if(!ptsF) + return OutOfMemory; + + for(i = 0; i < count; i++){ + ptsF[i].X = (REAL)points[i].X; + ptsF[i].Y = (REAL)points[i].Y; + } + + ret = GdipAddPathBeziers(path, ptsF, count); + GdipFree(ptsF); + + return ret; } GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath *path, REAL x, REAL y, REAL width, @@ -188,6 +226,12 @@ return Ok; } +GpStatus WINGDIPAPI GdipAddPathEllipseI(GpPath *path, INT x, INT y, INT width, + INT height) +{ + return GdipAddPathEllipse(path,(REAL)x,(REAL)y,(REAL)width,(REAL)height); +} + GpStatus WINGDIPAPI GdipAddPathLine2(GpPath *path, GDIPCONST GpPointF *points, INT count) { @@ -217,7 +261,31 @@ return Ok; } -GpStatus WINGDIPAPI GdipAddPathLineI(GpPath *path, INT x1, INT y1, INT x2, INT y2) +GpStatus WINGDIPAPI GdipAddPathLine2I(GpPath *path, GDIPCONST GpPoint *points, INT count) +{ + GpPointF *pointsF; + INT i; + GpStatus stat; + + if(count <= 0) + return InvalidParameter; + + pointsF = GdipAlloc(sizeof(GpPointF) * count); + if(!pointsF) return OutOfMemory; + + for(i = 0;i < count; i++){ + pointsF[i].X = (REAL)points[i].X; + pointsF[i].Y = (REAL)points[i].Y; + } + + stat = GdipAddPathLine2(path, pointsF, count); + + GdipFree(pointsF); + + return stat; +} + +GpStatus WINGDIPAPI GdipAddPathLine(GpPath *path, REAL x1, REAL y1, REAL x2, REAL y2) { INT old_count; @@ -229,10 +297,10 @@ old_count = path->pathdata.Count; - path->pathdata.Points[old_count].X = (REAL) x1; - path->pathdata.Points[old_count].Y = (REAL) y1; - path->pathdata.Points[old_count + 1].X = (REAL) x2; - path->pathdata.Points[old_count + 1].Y = (REAL) y2; + path->pathdata.Points[old_count].X = x1; + path->pathdata.Points[old_count].Y = y1; + path->pathdata.Points[old_count + 1].X = x2; + path->pathdata.Points[old_count + 1].Y = y2; path->pathdata.Types[old_count] = (path->newfigure ? PathPointTypeStart : PathPointTypeLine); @@ -242,6 +310,11 @@ path->pathdata.Count += 2; return Ok; +} + +GpStatus WINGDIPAPI GdipAddPathLineI(GpPath *path, INT x1, INT y1, INT x2, INT y2) +{ + return GdipAddPathLine(path, (REAL)x1, (REAL)y1, (REAL)x2, (REAL)y2); } GpStatus WINGDIPAPI GdipAddPathPath(GpPath *path, GDIPCONST GpPath* addingPath, @@ -373,6 +446,27 @@ return Ok; } +GpStatus WINGDIPAPI GdipCreatePath2I(GDIPCONST GpPoint* points, + GDIPCONST BYTE* types, INT count, GpFillMode fill, GpPath **path) +{ + GpPointF *ptF; + GpStatus ret; + INT i; + + ptF = GdipAlloc(sizeof(GpPointF)*count); + + for(i = 0;i < count; i++){ + ptF[i].X = (REAL)points[i].X; + ptF[i].Y = (REAL)points[i].Y; + } + + ret = GdipCreatePath2(ptF, types, count, fill, path); + + GdipFree(ptF); + + return ret; +} + GpStatus WINGDIPAPI GdipDeletePath(GpPath *path) { if(!path) @@ -406,6 +500,29 @@ memcpy(points, path->pathdata.Points, path->pathdata.Count * sizeof(GpPointF)); return Ok; +} + +GpStatus WINGDIPAPI GdipGetPathPointsI(GpPath *path, GpPoint* points, INT count) +{ + GpStatus ret; + GpPointF *ptf; + INT i; + + if(count <= 0) + return InvalidParameter; + + ptf = GdipAlloc(sizeof(GpPointF)*count); + if(!ptf) return OutOfMemory; + + ret = GdipGetPathPoints(path,ptf,count); + if(ret == Ok) + for(i = 0;i < count;i++){ + points[i].X = roundr(ptf[i].X); + points[i].Y = roundr(ptf[i].Y); + }; + GdipFree(ptf); + + return ret; } GpStatus WINGDIPAPI GdipGetPathTypes(GpPath *path, BYTE* types, INT count) @@ -506,6 +623,24 @@ return Ok; } +GpStatus WINGDIPAPI GdipGetPathWorldBoundsI(GpPath* path, GpRect* bounds, + GDIPCONST GpMatrix *matrix, GDIPCONST GpPen *pen) +{ + GpStatus ret; + GpRectF boundsF; + + ret = GdipGetPathWorldBounds(path,&boundsF,matrix,pen); + + if(ret == Ok){ + bounds->X = roundr(boundsF.X); + bounds->Y = roundr(boundsF.Y); + bounds->Width = roundr(boundsF.Width); + bounds->Height = roundr(boundsF.Height); + } + + return ret; +} + GpStatus WINGDIPAPI GdipGetPointCount(GpPath *path, INT *count) { if(!path) Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Sun May 4 14:41:25 2008 @@ -759,6 +759,7 @@ IPicture_get_Handle(pic, &hbm); IPicture_get_CurDC(pic, &hdc); + ZeroMemory(&bmi, sizeof(bmi)); bmch = (BITMAPCOREHEADER*) (&bmi.bmiHeader); bmch->bcSize = sizeof(BITMAPCOREHEADER); Modified: trunk/reactos/dll/win32/gdiplus/matrix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/matrix.c… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/matrix.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/matrix.c [iso-8859-1] Sun May 4 14:41:25 2008 @@ -89,6 +89,23 @@ return Ok; } +GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect *rect, GDIPCONST GpPoint *pt, + GpMatrix **matrix) +{ + GpRectF rectF; + GpPointF ptF; + + rectF.X = (REAL)rect->X; + rectF.Y = (REAL)rect->Y; + rectF.Width = (REAL)rect->Width; + rectF.Height = (REAL)rect->Height; + + ptF.X = (REAL)pt->X; + ptF.Y = (REAL)pt->Y; + + return GdipCreateMatrix3(&rectF, &ptF, matrix); +} + GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix *matrix, GpMatrix **clone) { if(!matrix || !clone) @@ -242,6 +259,33 @@ return Ok; } +GpStatus WINGDIPAPI GdipTransformMatrixPointsI(GpMatrix *matrix, GpPoint *pts, INT count) +{ + GpPointF *ptsF; + GpStatus ret; + INT i; + + ptsF = GdipAlloc(sizeof(GpPointF) * count); + if(!ptsF) + return OutOfMemory; + + for(i = 0; i < count; i++){ + ptsF[i].X = (REAL)pts[i].X; + ptsF[i].Y = (REAL)pts[i].Y; + } + + ret = GdipTransformMatrixPoints(matrix, ptsF, count); + + if(ret == Ok) + for(i = 0; i < count; i++){ + pts[i].X = roundr(ptsF[i].X); + pts[i].Y = roundr(ptsF[i].Y); + } + GdipFree(ptsF); + + return ret; +} + GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix *matrix, REAL offsetX, REAL offsetY, GpMatrixOrder order) { @@ -264,3 +308,82 @@ return Ok; } + +GpStatus WINGDIPAPI GdipVectorTransformMatrixPoints(GpMatrix *matrix, GpPointF *pts, INT count) +{ + REAL x, y; + INT i; + + if(!matrix || !pts) + return InvalidParameter; + + for(i = 0; i < count; i++) + { + x = pts[i].X; + y = pts[i].Y; + + pts[i].X = x * matrix->matrix[0] + y * matrix->matrix[2]; + pts[i].Y = x * matrix->matrix[1] + y * matrix->matrix[3]; + } + + return Ok; +} + +GpStatus WINGDIPAPI GdipVectorTransformMatrixPointsI(GpMatrix *matrix, GpPoint *pts, INT count) +{ + GpPointF *ptsF; + GpStatus ret; + INT i; + + ptsF = GdipAlloc(sizeof(GpPointF) * count); + if(!ptsF) + return OutOfMemory; + + for(i = 0; i < count; i++){ + ptsF[i].X = (REAL)pts[i].X; + ptsF[i].Y = (REAL)pts[i].Y; + } + + ret = GdipVectorTransformMatrixPoints(matrix, ptsF, count); + /* store back */ + if(ret == Ok) + for(i = 0; i < count; i++){ + pts[i].X = roundr(ptsF[i].X); + pts[i].Y = roundr(ptsF[i].Y); + } + GdipFree(ptsF); + + return ret; +} + +GpStatus WINGDIPAPI GdipIsMatrixEqual(GDIPCONST GpMatrix *matrix, GDIPCONST GpMatrix *matrix2, + BOOL *result) +{ + if(!matrix || !matrix2 || !result) + return InvalidParameter; + /* based on single array member of GpMatrix */ + *result = (memcmp(matrix->matrix, matrix2->matrix, sizeof(GpMatrix)) == 0); + + return Ok; +} + +GpStatus WINGDIPAPI GdipIsMatrixIdentity(GDIPCONST GpMatrix *matrix, BOOL *result) +{ + GpMatrix *e; + GpStatus ret; + BOOL isIdentity; + + if(!matrix || !result) + return InvalidParameter; + + ret = GdipCreateMatrix(&e); + if(ret != Ok) return ret; + + ret = GdipIsMatrixEqual(matrix, e, &isIdentity); + if(ret == Ok) + *result = isIdentity; + + GdipFree(e); + + return ret; +} Modified: trunk/reactos/dll/win32/gdiplus/stringformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/stringfo… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/stringformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/stringformat.c [iso-8859-1] Sun May 4 14:41:25 2008 @@ -152,3 +152,18 @@ return Ok; } + +GpStatus WINGDIPAPI GdipCloneStringFormat(GDIPCONST GpStringFormat *format, GpStringFormat **newFormat) +{ + if(!format || !newFormat) + return InvalidParameter; + + *newFormat = GdipAlloc(sizeof(GpStringFormat)); + if(!*newFormat) return OutOfMemory; + + **newFormat = *format; + + TRACE("%p %p\n",format,newFormat); + + return Ok; +}

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008