Ros-diffs May 2007

ros-diffs@reactos.org

17 participants
322 discussions

[greatlrd] 26756: adding more check for createsurface

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 13 20:51:15 2007 New Revision: 26756 URL: http://svn.reactos.org/svn/reactos?rev=26756&view=rev Log: adding more check for createsurface Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun May 13 20:51:15 2007 @@ -12,7 +12,7 @@ /* * all param have been checked if they are vaild before they are call to * Internal_CreateSurface, if not please fix the code in the functions - * call to Internal_CreateSurface, ppSurf are being vaildate in + * call to Internal_CreateSurface, ppSurf,pDDSD,pDDraw are being vaildate in * Internal_CreateSurface */ @@ -20,47 +20,69 @@ Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { + DDSURFACEDESC2 desc; + + /* Test se if the pointers are vaild */ + if ((IsBadReadPtr(pDDraw,sizeof(LPDDRAWI_DIRECTDRAW_INT))) || + (IsBadReadPtr(pDDSD,sizeof(LPDDSURFACEDESC2))) || + (IsBadWritePtr(ppSurf,sizeof(LPDIRECTDRAWSURFACE7))) || + (IsBadReadPtr(ppSurf,sizeof(LPDIRECTDRAWSURFACE7)))) + { + return DDERR_INVALIDPARAMS; + } + + /* make local backup of DDSURFACEDESC2 */ + RtlCopyMemory(&desc, pDDSD, sizeof(DDSURFACEDESC2)); /* * pDDSD->dwCaps can not contain both DDSCAPS_SYSTEMMEMORY and DDSCAPS_VIDEOMEMORY * if both are define ddraw.dll will return error code 0x88760064 */ - if ( (pDDSD->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) && - (pDDSD->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + if ( (desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) && + (desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) { return DDERR_INVALIDCAPS; } /* check if pDDSD.dwFlags DDSD_LPSURFACE is set or not */ - if (pDDSD->dwFlags & DDSD_LPSURFACE) - { - - if (pDDSD->ddsCaps.dwCaps & ( DDSCAPS_COMPLEX | DDSCAPS_RESERVED2 | DDSCAPS_RESERVED3 | + if (desc.dwFlags & DDSD_LPSURFACE) + { + /* + * DDSD_LPSURFACE flag is set now we start vaildate see if + * pDDSD->lpSurface are a pointer or not + */ + if (IsBadReadPtr(desc.lpSurface,sizeof(LPVOID)) || + (desc.dwFlags - (desc.dwFlags & DDSD_ALL))) + { + return DDERR_INVALIDPARAMS; + } + + /* only support dx7 interface for DDSD_LPSURFACE older interface do not support it */ + if (pDDraw->lpVtbl != &DirectDraw7_Vtable) + { + return DDERR_INVALIDPARAMS; + } + + /* vaildate the caps */ + if (desc.ddsCaps.dwCaps & ( DDSCAPS_COMPLEX | DDSCAPS_RESERVED2 | DDSCAPS_RESERVED3 | DDSCAPS_VIDEOPORT | DDSCAPS_PRIMARYSURFACE | DDSCAPS_OVERLAY )) { return DDERR_INVALIDCAPS; } - /* - * DDSD_LPSURFACE flag is set now we start vaildate see if - * pDDSD->lpSurface are a pointer or not - */ - if (IsBadReadPtr(pDDSD->lpSurface,sizeof(LPVOID)) || - (pDDSD->dwFlags - (pDDSD->dwFlags & DDSD_ALL))) - { - return DDERR_INVALIDPARAMS; - } - /* more code will follow */ } else { - /* - * DDSD_LPSURFACE flag is not set we do not handler this case yet - */ - - /* more code will follow */ - } + /* + * DDSD_LPSURFACE flag are not set + * remove all wrong flags are being set + */ + + desc.dwFlags = desc.dwFlags & DDSD_ALL; + } + + return DDERR_GENERIC; } Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sun May 13 20:51:15 2007 @@ -18,6 +18,7 @@ extern WCHAR classname[128]; extern WNDCLASSW wnd_class; extern CRITICAL_SECTION ddcs; +extern IDirectDraw7Vtbl DirectDraw7_Vtable; HRESULT WINAPI StartDirectDraw(LPDIRECTDRAW* iface, LPGUID pGUID, BOOL reenable); HRESULT WINAPI StartDirectDrawHal(LPDIRECTDRAW* iface, BOOL reenable);

17 years, 5 months

[mbosma] 26755: Beginning of CreateSurface test.

by mbosma＠svn.reactos.org

Author: mbosma Date: Sun May 13 20:37:58 2007 New Revision: 26755 URL: http://svn.reactos.org/svn/reactos?rev=26755&view=rev Log: Beginning of CreateSurface test. Added: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp (with props) Modified: trunk/rostests/dxtest/ddraw/testlist.cpp trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp Modified: trunk/rostests/dxtest/ddraw/testlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/testlist.cpp… ============================================================================== --- trunk/rostests/dxtest/ddraw/testlist.cpp (original) +++ trunk/rostests/dxtest/ddraw/testlist.cpp Sun May 13 20:37:58 2007 @@ -7,13 +7,15 @@ /* include the tests */ #include "tests/CreateDDraw.cpp" #include "tests/DisplayModes.cpp" +#include "tests/CreateSurface.cpp" /* The List of tests */ TEST TestList[] = { { "DirectDrawCreate(Ex)", Test_CreateDDraw }, { "IDirectDraw::SetCooperativeLevel", Test_SetCooperativeLevel }, - // { "IDirectDraw::EnumDisplayModes/SetDisplayMode", Test_DisplayModes } // uncomment this test if you have enough time and patience + // { "IDirectDraw::EnumDisplayModes/SetDisplayMode", Test_DisplayModes }, // uncomment this test if you have enough time and patience + { "IDirectDraw::CreateSurface", Test_CreateSurface } }; /* The function that gives us the number of tests */ Added: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp (added) +++ trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp Sun May 13 20:37:58 2007 @@ -1,0 +1,46 @@ + +HWND CreateBasicWindow (VOID); + +BOOL Test_CreateSurface (INT* passed, INT* failed) +{ + LPDIRECTDRAW7 DirectDraw; + LPDIRECTDRAWSURFACE7 DirectDrawSurface; + HWND hwnd; + + /* Preparations */ + if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) + { + printf("ERROR: Failed to set up ddraw\n"); + return FALSE; + } + + if(!( hwnd = CreateBasicWindow() )) + { + printf("ERROR: Failed to create window\n"); + DirectDraw->Release(); + return FALSE; + } + + if (DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL) != DD_OK) + { + printf("ERROR: you not set cooperative level\n"); + DirectDraw->Release(); + return 0; + } + + /* The Test */ + + DDSURFACEDESC2 Desc = { 0 }; + + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, (IUnknown*)0xdeadbeef) == CLASS_E_NOAGGREGATION ); + TEST ( DirectDraw->CreateSurface(NULL, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS ); + TEST ( DirectDraw->CreateSurface(&Desc, NULL, NULL) == DDERR_INVALIDPARAMS ); + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS ); + + Desc.dwSize = sizeof (DDSURFACEDESC2); + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS ); + + DirectDraw->Release(); + + return TRUE; +} Propchange: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Displa… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp Sun May 13 20:37:58 2007 @@ -42,6 +42,8 @@ TEST ( DirectDraw->SetDisplayMode (800, 600, 0, 0, 0) == DD_OK ); TEST ( DirectDraw->SetDisplayMode (0, 0, 16, 0, 0) == DD_OK ); + // does this change the display mode to DDSCL_EXCLUSIVE ? + // Now try getting vaild modes from driver TEST (DirectDraw->EnumDisplayModes(DDEDM_STANDARDVGAMODES, NULL, (PVOID)&Context, NULL) == DDERR_INVALIDPARAMS); TEST (DirectDraw->EnumDisplayModes(0, NULL, (PVOID)&Context, (LPDDENUMMODESCALLBACK2)DummyEnumDisplayModes) == DD_OK );

17 years, 5 months

[hpoussin] 26754: Move itss.idl to the place it belongs

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun May 13 18:38:27 2007 New Revision: 26754 URL: http://svn.reactos.org/svn/reactos?rev=26754&view=rev Log: Move itss.idl to the place it belongs Added: trunk/reactos/include/reactos/wine/itss.idl - copied unchanged from r26686, trunk/reactos/dll/win32/hhctrl.ocx/itss.idl trunk/reactos/include/reactos/wine/wineheaders.rbuild (with props) Removed: trunk/reactos/dll/win32/hhctrl.ocx/itss.idl Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild trunk/reactos/include/reactos/reactos.rbuild trunk/reactos/include/reactos/wine/ (props changed) Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild Sun May 13 18:38:27 2007 @@ -8,6 +8,7 @@ <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> + <dependency>wineheaders</dependency> <library>wine</library> <library>uuid</library> <library>kernel32</library> @@ -27,7 +28,6 @@ <file>hhctrl.c</file> <file>regsvr.c</file> <file>webbrowser.c</file> - <file>itss.idl</file> <file>hhctrl.rc</file> <file>hhctrl.ocx.spec</file> </module> Removed: trunk/reactos/dll/win32/hhctrl.ocx/itss.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/itss.… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/itss.idl (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/itss.idl (removed) @@ -1,95 +1,0 @@ -/* - * Copyright (C) 2004 Mike McCormack - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -import "oaidl.idl"; - -typedef struct _ITS_Control_Data -{ - UINT cdwControlData; - UINT adwControlData[1]; - -} ITS_Control_Data, *PITS_Control_Data; - -typedef enum ECompactionLev { - COMPACT_DATA = 0, - COMPACT_DATA_AND_PATH -} ECompactionLev; - -[ - object, - uuid(88cc31de-27ab-11d0-9df9-00a0c922e6ec), - pointer_default(unique) -] -interface IITStorage : IUnknown -{ - HRESULT StgCreateDocfile( - [in] const WCHAR * pwcsName, - [in] DWORD grfMode, - [in] DWORD reserved, - [out] IStorage ** ppstgOpen); - - HRESULT StgCreateDocfileOnILockBytes( - [in] ILockBytes * plkbyt, - [in] DWORD grfMode, - [in] DWORD reserved, - [out] IStorage ** ppstgOpen); - - - HRESULT StgIsStorageFile( - [in] const WCHAR * pwcsName); - - HRESULT StgIsStorageILockBytes( - [in] ILockBytes * plkbyt); - - HRESULT StgOpenStorage( - [in] const WCHAR * pwcsName, - [in] IStorage * pstgPriority, - [in] DWORD grfMode, - [in] SNB snbExclude, - [in] DWORD reserved, - [out] IStorage ** ppstgOpen); - - HRESULT StgOpenStorageOnILockBytes( - [in] ILockBytes * plkbyt, - [in] IStorage * pStgPriority, - [in] DWORD grfMode, - [in] SNB snbExclude, - [in] DWORD reserved, - [out] IStorage ** ppstgOpen); - - HRESULT StgSetTimes( - [in] WCHAR const * lpszName, - [in] FILETIME const * pctime, - [in] FILETIME const * patime, - [in] FILETIME const * pmtime); - - HRESULT SetControlData( - [in] PITS_Control_Data pControlData); - - HRESULT DefaultControlData( - [out] PITS_Control_Data * ppControlData); - - HRESULT Compact( - [in] const WCHAR * pwcsName, - [in] ECompactionLev iLev); -} - -cpp_quote("DEFINE_GUID(CLSID_ITStorage,0x5d02926a,0x212e,0x11d0,0x9d,0xf9,0x00,0xa0,0xc9,0x22,0xe6,0xec);") -cpp_quote("DEFINE_GUID(CLSID_MSFSStore,0xd54eee56,0xaaab,0x11d0,0x9e,0x1d,0x00,0xa0,0xc9,0x22,0xe6,0xec);") -cpp_quote("DEFINE_GUID(CLSID_MSITStore,0x9d148290,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6);") -cpp_quote("DEFINE_GUID(CLSID_ITSProtocol,0x9d148291,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6);") Modified: trunk/reactos/include/reactos/reactos.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/reactos.rb… ============================================================================== --- trunk/reactos/include/reactos/reactos.rbuild (original) +++ trunk/reactos/include/reactos/reactos.rbuild Sun May 13 18:38:27 2007 @@ -1,3 +1,8 @@ +<group> <directory name="idl"> <xi:include href="idl/idl.rbuild" /> </directory> +<directory name="wine"> + <xi:include href="wine/wineheaders.rbuild" /> +</directory> +</group> Propchange: trunk/reactos/include/reactos/wine/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun May 13 18:38:27 2007 @@ -1,0 +1,1 @@ +itss.h Added: trunk/reactos/include/reactos/wine/wineheaders.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wineh… ============================================================================== --- trunk/reactos/include/reactos/wine/wineheaders.rbuild (added) +++ trunk/reactos/include/reactos/wine/wineheaders.rbuild Sun May 13 18:38:27 2007 @@ -1,0 +1,3 @@ +<module name="wineheaders" type="idlheader"> + <file>itss.idl</file> +</module> Propchange: trunk/reactos/include/reactos/wine/wineheaders.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 5 months

[greatlrd] 26753: adding more check

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 13 17:14:54 2007 New Revision: 26753 URL: http://svn.reactos.org/svn/reactos?rev=26753&view=rev Log: adding more check Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun May 13 17:14:54 2007 @@ -34,11 +34,19 @@ /* check if pDDSD.dwFlags DDSD_LPSURFACE is set or not */ if (pDDSD->dwFlags & DDSD_LPSURFACE) { + + if (pDDSD->ddsCaps.dwCaps & ( DDSCAPS_COMPLEX | DDSCAPS_RESERVED2 | DDSCAPS_RESERVED3 | + DDSCAPS_VIDEOPORT | DDSCAPS_PRIMARYSURFACE | DDSCAPS_OVERLAY )) + { + return DDERR_INVALIDCAPS; + } + /* * DDSD_LPSURFACE flag is set now we start vaildate see if * pDDSD->lpSurface are a pointer or not */ - if (IsBadReadPtr(pDDSD->lpSurface,sizeof(LPVOID))) + if (IsBadReadPtr(pDDSD->lpSurface,sizeof(LPVOID)) || + (pDDSD->dwFlags - (pDDSD->dwFlags & DDSD_ALL))) { return DDERR_INVALIDPARAMS; }

17 years, 5 months

[greatlrd] 26752: fixing two return code thx Ventron for the info for one of the return code

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 13 16:43:51 2007 New Revision: 26752 URL: http://svn.reactos.org/svn/reactos?rev=26752&view=rev Log: fixing two return code thx Ventron for the info for one of the return code Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun May 13 16:43:51 2007 @@ -28,8 +28,30 @@ if ( (pDDSD->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) && (pDDSD->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) { - /* translate the error code I got back to a name */ - return 0x88760064; + return DDERR_INVALIDCAPS; + } + + /* check if pDDSD.dwFlags DDSD_LPSURFACE is set or not */ + if (pDDSD->dwFlags & DDSD_LPSURFACE) + { + /* + * DDSD_LPSURFACE flag is set now we start vaildate see if + * pDDSD->lpSurface are a pointer or not + */ + if (IsBadReadPtr(pDDSD->lpSurface,sizeof(LPVOID))) + { + return DDERR_INVALIDPARAMS; + } + + /* more code will follow */ + } + else + { + /* + * DDSD_LPSURFACE flag is not set we do not handler this case yet + */ + + /* more code will follow */ } return DDERR_GENERIC;

17 years, 5 months

[greatlrd] 26751: adding smore check for createsurface, (still does not create a surface)

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 13 16:11:41 2007 New Revision: 26751 URL: http://svn.reactos.org/svn/reactos?rev=26751&view=rev Log: adding smore check for createsurface, (still does not create a surface) Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sun May 13 16:11:41 2007 @@ -136,6 +136,12 @@ if (pUnkOuter) { /* FIXME send back right return code */ + return DDERR_GENERIC; + } + + if (pDDSD) + { + /* FIXME send back right return code */ return DDERR_GENERIC; } Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun May 13 16:11:41 2007 @@ -9,17 +9,27 @@ */ #include "rosdraw.h" +/* + * all param have been checked if they are vaild before they are call to + * Internal_CreateSurface, if not please fix the code in the functions + * call to Internal_CreateSurface, ppSurf are being vaildate in + * Internal_CreateSurface + */ + HRESULT Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { - if (!pDDraw->lpLcl->dwLocalFlags & DDRAWILCL_DIRECTDRAW7) - { - /* it is directdraw 1-6 so no DirectD3D support */ - } - else - { - /* directdraw 7 support */ + + /* + * pDDSD->dwCaps can not contain both DDSCAPS_SYSTEMMEMORY and DDSCAPS_VIDEOMEMORY + * if both are define ddraw.dll will return error code 0x88760064 + */ + if ( (pDDSD->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) && + (pDDSD->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + /* translate the error code I got back to a name */ + return 0x88760064; } return DDERR_GENERIC;

17 years, 5 months

[mbosma] 26750: Add debugging macro to get error code and test for display modes (commented out because it checks every single display mode and thus takes fairly long).

by mbosma＠svn.reactos.org

Author: mbosma Date: Sun May 13 16:09:44 2007 New Revision: 26750 URL: http://svn.reactos.org/svn/reactos?rev=26750&view=rev Log: Add debugging macro to get error code and test for display modes (commented out because it checks every single display mode and thus takes fairly long). Added: trunk/rostests/dxtest/ddraw/debug.cpp (with props) trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp (with props) Modified: trunk/rostests/dxtest/ddraw/testlist.cpp trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Added: trunk/rostests/dxtest/ddraw/debug.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/debug.cpp?re… ============================================================================== --- trunk/rostests/dxtest/ddraw/debug.cpp (added) +++ trunk/rostests/dxtest/ddraw/debug.cpp Sun May 13 16:09:44 2007 @@ -1,0 +1,111 @@ + +#define GetCode(X) printf("%s\n", DDErrorString(X)); + +PCHAR DDErrorString (HRESULT hResult) +{ + switch (hResult) + { + case DD_OK: return "DD_OK"; + case DDERR_ALREADYINITIALIZED: return "DDERR_ALREADYINITIALIZED"; + case DDERR_CANNOTATTACHSURFACE: return "DDERR_CANNOTATTACHSURFACE"; + case DDERR_CANNOTDETACHSURFACE: return "DDERR_CANNOTDETACHSURFACE"; + case DDERR_CURRENTLYNOTAVAIL: return "DDERR_CURRENTLYNOTAVAIL"; + case DDERR_EXCEPTION: return "DDERR_EXCEPTION"; + case DDERR_GENERIC: return "DDERR_GENERIC"; + case DDERR_HEIGHTALIGN: return "DDERR_HEIGHTALIGN"; + case DDERR_INCOMPATIBLEPRIMARY: return "DDERR_INCOMPATIBLEPRIMARY"; + case DDERR_INVALIDCAPS: return "DDERR_INVALIDCAPS"; + case DDERR_INVALIDCLIPLIST: return "DDERR_INVALIDCLIPLIST"; + case DDERR_INVALIDMODE: return "DDERR_INVALIDMODE"; + case DDERR_INVALIDOBJECT: return "DDERR_INVALIDOBJECT"; + case DDERR_INVALIDPARAMS: return "DDERR_INVALIDPARAMS"; + case DDERR_INVALIDPIXELFORMAT: return "DDERR_INVALIDPIXELFORMAT"; + case DDERR_INVALIDRECT: return "DDERR_INVALIDRECT"; + case DDERR_LOCKEDSURFACES: return "DDERR_LOCKEDSURFACES"; + case DDERR_NO3D: return "DDERR_NO3D"; + case DDERR_NOALPHAHW: return "DDERR_NOALPHAHW"; + case DDERR_NOCLIPLIST: return "DDERR_NOCLIPLIST"; + case DDERR_NOCOLORCONVHW: return "DDERR_NOCOLORCONVHW"; + case DDERR_NOCOOPERATIVELEVELSET: return "DDERR_NOCOOPERATIVELEVELSET"; + case DDERR_NOCOLORKEY: return "DDERR_NOCOLORKEY"; + case DDERR_NOCOLORKEYHW: return "DDERR_NOCOLORKEYHW"; + case DDERR_NODIRECTDRAWSUPPORT: return "DDERR_NODIRECTDRAWSUPPORT"; + case DDERR_NOEXCLUSIVEMODE: return "DDERR_NOEXCLUSIVEMODE"; + case DDERR_NOFLIPHW: return "DDERR_NOFLIPHW"; + case DDERR_NOGDI: return "DDERR_NOGDI"; + case DDERR_NOMIRRORHW: return "DDERR_NOMIRRORHW"; + case DDERR_NOTFOUND: return "DDERR_NOTFOUND"; + case DDERR_NOOVERLAYHW: return "DDERR_NOOVERLAYHW"; + case DDERR_NORASTEROPHW: return "DDERR_NORASTEROPHW"; + case DDERR_NOROTATIONHW: return "DDERR_NOROTATIONHW"; + case DDERR_NOSTRETCHHW: return "DDERR_NOSTRETCHHW"; + case DDERR_NOT4BITCOLOR: return "DDERR_NOT4BITCOLOR"; + case DDERR_NOT4BITCOLORINDEX: return "DDERR_NOT4BITCOLORINDEX"; + case DDERR_NOT8BITCOLOR: return "DDERR_NOT8BITCOLOR"; + case DDERR_NOTEXTUREHW: return "DDERR_NOTEXTUREHW"; + case DDERR_NOVSYNCHW: return "DDERR_NOVSYNCHW"; + case DDERR_NOZBUFFERHW: return "DDERR_NOZBUFFERHW"; + case DDERR_NOZOVERLAYHW: return "DDERR_NOZOVERLAYHW"; + case DDERR_OUTOFCAPS: return "DDERR_OUTOFCAPS"; + case DDERR_OUTOFMEMORY: return "DDERR_OUTOFMEMORY"; + case DDERR_OUTOFVIDEOMEMORY: return "DDERR_OUTOFVIDEOMEMORY"; + case DDERR_OVERLAYCANTCLIP: return "DDERR_OVERLAYCANTCLIP"; + case DDERR_OVERLAYCOLORKEYONLYONEACTIVE: return "DDERR_OVERLAYCOLORKEYONLYONEACTIVE"; + case DDERR_PALETTEBUSY: return "DDERR_PALETTEBUSY"; + case DDERR_COLORKEYNOTSET: return "DDERR_COLORKEYNOTSET"; + case DDERR_SURFACEALREADYATTACHED: return "DDERR_SURFACEALREADYATTACHED"; + case DDERR_SURFACEALREADYDEPENDENT: return "DDERR_SURFACEALREADYDEPENDENT"; + case DDERR_SURFACEBUSY: return "DDERR_SURFACEBUSY"; + case DDERR_CANTLOCKSURFACE: return "DDERR_CANTLOCKSURFACE"; + case DDERR_SURFACEISOBSCURED: return "DDERR_SURFACEISOBSCURED"; + case DDERR_SURFACELOST: return "DDERR_SURFACELOST"; + case DDERR_SURFACENOTATTACHED: return "DDERR_SURFACENOTATTACHED"; + case DDERR_TOOBIGHEIGHT: return "DDERR_TOOBIGHEIGHT"; + case DDERR_TOOBIGSIZE: return "DDERR_TOOBIGSIZE"; + case DDERR_TOOBIGWIDTH: return "DDERR_TOOBIGWIDTH"; + case DDERR_UNSUPPORTED: return "DDERR_UNSUPPORTED"; + case DDERR_UNSUPPORTEDFORMAT: return "DDERR_UNSUPPORTEDFORMAT"; + case DDERR_UNSUPPORTEDMASK: return "DDERR_UNSUPPORTEDMASK"; + case DDERR_VERTICALBLANKINPROGRESS: return "DDERR_VERTICALBLANKINPROGRESS"; + case DDERR_WASSTILLDRAWING: return "DDERR_WASSTILLDRAWING"; + case DDERR_XALIGN: return "DDERR_XALIGN"; + case DDERR_INVALIDDIRECTDRAWGUID: return "DDERR_INVALIDDIRECTDRAWGUID"; + case DDERR_DIRECTDRAWALREADYCREATED: return "DDERR_DIRECTDRAWALREADYCREATED"; + case DDERR_NODIRECTDRAWHW: return "DDERR_NODIRECTDRAWHW"; + case DDERR_PRIMARYSURFACEALREADYEXISTS: return "DDERR_PRIMARYSURFACEALREADYEXISTS"; + case DDERR_NOEMULATION: return "DDERR_NOEMULATION"; + case DDERR_REGIONTOOSMALL: return "DDERR_REGIONTOOSMALL"; + case DDERR_CLIPPERISUSINGHWND: return "DDERR_CLIPPERISUSINGHWND"; + case DDERR_NOCLIPPERATTACHED: return "DDERR_NOCLIPPERATTACHED"; + case DDERR_NOHWND: return "DDERR_NOHWND"; + case DDERR_HWNDSUBCLASSED: return "DDERR_HWNDSUBCLASSED"; + case DDERR_HWNDALREADYSET: return "DDERR_HWNDALREADYSET"; + case DDERR_NOPALETTEATTACHED: return "DDERR_NOPALETTEATTACHED"; + case DDERR_NOPALETTEHW: return "DDERR_NOPALETTEHW"; + case DDERR_BLTFASTCANTCLIP: return "DDERR_BLTFASTCANTCLIP"; + case DDERR_NOBLTHW: return "DDERR_NOBLTHW"; + case DDERR_NODDROPSHW: return "DDERR_NODDROPSHW"; + case DDERR_OVERLAYNOTVISIBLE: return "DDERR_OVERLAYNOTVISIBLE"; + case DDERR_NOOVERLAYDEST: return "DDERR_NOOVERLAYDEST"; + case DDERR_INVALIDPOSITION: return "DDERR_INVALIDPOSITION"; + case DDERR_NOTAOVERLAYSURFACE: return "DDERR_NOTAOVERLAYSURFACE"; + case DDERR_EXCLUSIVEMODEALREADYSET: return "DDERR_EXCLUSIVEMODEALREADYSET"; + case DDERR_NOTFLIPPABLE: return "DDERR_NOTFLIPPABLE"; + case DDERR_CANTDUPLICATE: return "DDERR_CANTDUPLICATE"; + case DDERR_NOTLOCKED: return "DDERR_NOTLOCKED"; + case DDERR_CANTCREATEDC: return "DDERR_CANTCREATEDC"; + case DDERR_NODC: return "DDERR_NODC"; + case DDERR_WRONGMODE: return "DDERR_WRONGMODE"; + case DDERR_IMPLICITLYCREATED: return "DDERR_IMPLICITLYCREATED"; + case DDERR_NOTPALETTIZED: return "DDERR_NOTPALETTIZED"; + case DDERR_UNSUPPORTEDMODE: return "DDERR_UNSUPPORTEDMODE"; + case DDERR_NOMIPMAPHW: return "DDERR_NOMIPMAPHW"; + case DDERR_INVALIDSURFACETYPE: return "DDERR_INVALIDSURFACETYPE"; + case DDERR_DCALREADYCREATED: return "DDERR_DCALREADYCREATED"; + case DDERR_CANTPAGELOCK: return "DDERR_CANTPAGELOCK"; + case DDERR_CANTPAGEUNLOCK: return "DDERR_CANTPAGEUNLOCK"; + case DDERR_NOTPAGELOCKED: return "DDERR_NOTPAGELOCKED"; + case DDERR_NOTINITIALIZED: return "DDERR_NOTINITIALIZED"; + } + return "Unknown Error"; +} Propchange: trunk/rostests/dxtest/ddraw/debug.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/debug.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: trunk/rostests/dxtest/ddraw/testlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/testlist.cpp… ============================================================================== --- trunk/rostests/dxtest/ddraw/testlist.cpp (original) +++ trunk/rostests/dxtest/ddraw/testlist.cpp Sun May 13 16:09:44 2007 @@ -2,15 +2,18 @@ #define _DDRAWTESTLIST_H #include "ddrawtest.h" +#include "debug.cpp" /* include the tests */ #include "tests/CreateDDraw.cpp" +#include "tests/DisplayModes.cpp" /* The List of tests */ TEST TestList[] = { { "DirectDrawCreate(Ex)", Test_CreateDDraw }, - { "IDirectDraw::SetCooperativeLevel", Test_SetCooperativeLevel } + { "IDirectDraw::SetCooperativeLevel", Test_SetCooperativeLevel }, + // { "IDirectDraw::EnumDisplayModes/SetDisplayMode", Test_DisplayModes } // uncomment this test if you have enough time and patience }; /* The function that gives us the number of tests */ Modified: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Sun May 13 16:09:44 2007 @@ -7,7 +7,7 @@ LPDIRECTDRAW7 DirectDraw; IDirectDraw* DirectDraw2; - /*** FIXME: Test first parameter ***/ + /*** FIXME: Test first parameter using EnumDisplayDrivers ***/ TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, (IUnknown*)0xdeadbeef) == CLASS_E_NOAGGREGATION); TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw4, NULL) == DDERR_INVALIDPARAMS); @@ -36,16 +36,16 @@ DirectDraw->Release(); return FALSE; } - + /* The Test */ TEST ( DirectDraw->SetCooperativeLevel (NULL, DDSCL_FULLSCREEN) == DDERR_INVALIDPARAMS ); TEST ( DirectDraw->SetCooperativeLevel (NULL, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) == DDERR_INVALIDPARAMS ); + TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN) == DDERR_INVALIDPARAMS); TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL | DDSCL_ALLOWMODEX) == DDERR_INVALIDPARAMS ); TEST ( DirectDraw->SetCooperativeLevel ((HWND)0xdeadbeef, DDSCL_NORMAL) == DDERR_INVALIDPARAMS); TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) == DD_OK); TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE | DDSCL_ALLOWMODEX) == DD_OK); - TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL | DDSCL_FULLSCREEN) == DD_OK); TEST ( DirectDraw->SetCooperativeLevel (NULL, DDSCL_NORMAL) == DD_OK ); TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL) == DD_OK ); Added: trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Displa… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp (added) +++ trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp Sun May 13 16:09:44 2007 @@ -1,0 +1,55 @@ +typedef struct +{ + INT* passed; + INT* failed; + LPDIRECTDRAW7 DirectDraw; +} ENUMCONTEXT; + +HRESULT CALLBACK DummyEnumDisplayModes( LPDDSURFACEDESC2 pDDSD, ENUMCONTEXT* Context ) +{ + return DDENUMRET_OK; +} + +HRESULT CALLBACK EnumDisplayModes( LPDDSURFACEDESC2 pDDSD, ENUMCONTEXT* Context ) +{ + INT* passed = Context->passed; + INT* failed = Context->failed; + TEST ( Context->DirectDraw->SetDisplayMode (pDDSD->dwWidth, pDDSD->dwHeight, pDDSD->ddpfPixelFormat.dwRGBBitCount, pDDSD->dwRefreshRate, 0) == DD_OK); + return DDENUMRET_OK; +} + +BOOL Test_DisplayModes (INT* passed, INT* failed) +{ + /*** FIXME: Also test with surface as parameter; try busy/locked surface as well ***/ + LPDIRECTDRAW7 DirectDraw; + + /* Preparations */ + if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) + { + printf("ERROR: Failed to set up ddraw\n"); + return FALSE; + } + + ENUMCONTEXT Context = {passed, failed, DirectDraw}; + + /* The Test */ + + // First try with some generic display modes + TEST ( DirectDraw->SetDisplayMode (1586, 895, 0, 0, 0) == DDERR_UNSUPPORTED ); + TEST ( DirectDraw->SetDisplayMode (0, 0, 0, 0, 0x123) == DDERR_INVALIDPARAMS ); + + TEST ( DirectDraw->SetDisplayMode (0, 0, 0, 0, 0) == DD_OK ); + TEST ( DirectDraw->SetDisplayMode (800, 600, 0, 0, 0) == DD_OK ); + TEST ( DirectDraw->SetDisplayMode (0, 0, 16, 0, 0) == DD_OK ); + + // Now try getting vaild modes from driver + TEST (DirectDraw->EnumDisplayModes(DDEDM_STANDARDVGAMODES, NULL, (PVOID)&Context, NULL) == DDERR_INVALIDPARAMS); + TEST (DirectDraw->EnumDisplayModes(0, NULL, (PVOID)&Context, (LPDDENUMMODESCALLBACK2)DummyEnumDisplayModes) == DD_OK ); + TEST (DirectDraw->EnumDisplayModes(DDEDM_REFRESHRATES, NULL, (PVOID)&Context, (LPDDENUMMODESCALLBACK2)DummyEnumDisplayModes) == DD_OK ); + TEST (DirectDraw->EnumDisplayModes(DDEDM_STANDARDVGAMODES, NULL, (PVOID)&Context, (LPDDENUMMODESCALLBACK2)DummyEnumDisplayModes) == DD_OK ); + TEST (DirectDraw->EnumDisplayModes(DDEDM_STANDARDVGAMODES|DDEDM_REFRESHRATES, NULL, (PVOID)&Context, (LPDDENUMMODESCALLBACK2)EnumDisplayModes) == DD_OK); + + DirectDraw->Release(); + + return TRUE; +} Propchange: trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision

17 years, 5 months

[mbosma] 26749: SetCooperativeLevel Test

by mbosma＠svn.reactos.org

Author: mbosma Date: Sun May 13 13:58:47 2007 New Revision: 26749 URL: http://svn.reactos.org/svn/reactos?rev=26749&view=rev Log: SetCooperativeLevel Test Modified: trunk/rostests/dxtest/ddraw/testlist.cpp trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Modified: trunk/rostests/dxtest/ddraw/testlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/testlist.cpp… ============================================================================== --- trunk/rostests/dxtest/ddraw/testlist.cpp (original) +++ trunk/rostests/dxtest/ddraw/testlist.cpp Sun May 13 13:58:47 2007 @@ -9,7 +9,8 @@ /* The List of tests */ TEST TestList[] = { - { "CreateDDraw", Test_CreateDDraw } + { "DirectDrawCreate(Ex)", Test_CreateDDraw }, + { "IDirectDraw::SetCooperativeLevel", Test_SetCooperativeLevel } }; /* The function that gives us the number of tests */ Modified: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Sun May 13 13:58:47 2007 @@ -1,13 +1,13 @@ #include "ddrawtest.h" -PCHAR DDErrorString (HRESULT hResult); +HWND CreateBasicWindow (VOID); BOOL Test_CreateDDraw (INT* passed, INT* failed) { LPDIRECTDRAW7 DirectDraw; IDirectDraw* DirectDraw2; - // FIXME: Test first parameter + /*** FIXME: Test first parameter ***/ TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, (IUnknown*)0xdeadbeef) == CLASS_E_NOAGGREGATION); TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw4, NULL) == DDERR_INVALIDPARAMS); @@ -17,3 +17,64 @@ return TRUE; } + +BOOL Test_SetCooperativeLevel (INT* passed, INT* failed) +{ + HWND hwnd; + LPDIRECTDRAW7 DirectDraw; + + /* Preparations */ + if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) + { + printf("ERROR: Failed to set up ddraw\n"); + return FALSE; + } + + if(!( hwnd = CreateBasicWindow() )) + { + printf("ERROR: Failed to create window\n"); + DirectDraw->Release(); + return FALSE; + } + + /* The Test */ + TEST ( DirectDraw->SetCooperativeLevel (NULL, DDSCL_FULLSCREEN) == DDERR_INVALIDPARAMS ); + TEST ( DirectDraw->SetCooperativeLevel (NULL, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) == DDERR_INVALIDPARAMS ); + TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL | DDSCL_ALLOWMODEX) == DDERR_INVALIDPARAMS ); + TEST ( DirectDraw->SetCooperativeLevel ((HWND)0xdeadbeef, DDSCL_NORMAL) == DDERR_INVALIDPARAMS); + + TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) == DD_OK); + TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE | DDSCL_ALLOWMODEX) == DD_OK); + TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL | DDSCL_FULLSCREEN) == DD_OK); + TEST ( DirectDraw->SetCooperativeLevel (NULL, DDSCL_NORMAL) == DD_OK ); + TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL) == DD_OK ); + + DirectDraw->Release(); + + return TRUE; +} + +LONG WINAPI BasicWindowProc (HWND hwnd, UINT message, UINT wParam, LONG lParam) +{ + switch (message) + { + case WM_DESTROY: + { + PostQuitMessage (0); + return 0; + } break; + } + + return DefWindowProc (hwnd, message, wParam, lParam); +} + +HWND CreateBasicWindow (VOID) +{ + WNDCLASS wndclass = {0}; + wndclass.lpfnWndProc = BasicWindowProc; + wndclass.hInstance = GetModuleHandle(NULL); + wndclass.lpszClassName = "DDrawTest"; + RegisterClass(&wndclass); + + return CreateWindow("DDrawTest", "ReactOS DirectDraw Test", WS_POPUP, 0, 0, 10, 10, NULL, NULL, GetModuleHandle(NULL), NULL); +}

17 years, 5 months

[greatlrd] 26748: fixing more linux build issue

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 13 12:47:35 2007 New Revision: 26748 URL: http://svn.reactos.org/svn/reactos?rev=26748&view=rev Log: fixing more linux build issue Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Sun May 13 12:47:35 2007 @@ -34,7 +34,7 @@ <file>callbacks_surf_hel.c</file> <file>createsurface.c</file> </directory> - <directory name="clipper"> + <directory name="Clipper"> <file>clipper_stubs.c</file> </directory> <directory name="Color"> @@ -49,7 +49,7 @@ <directory name="Palette"> <file>palette_stubs.c</file> </directory> - <directory name="videoport"> + <directory name="Videoport"> <file>videoport_stubs.c</file> </directory> </module>

17 years, 5 months

[dgorbachev] 26747: Update Polish translation. Patch by Caemyr. Bug report #2249.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun May 13 12:46:14 2007 New Revision: 26747 URL: http://svn.reactos.org/svn/reactos?rev=26747&view=rev Log: Update Polish translation. Patch by Caemyr. Bug report #2249. Modified: trunk/reactos/dll/win32/newdev/lang/pl-PL.rc Modified: trunk/reactos/dll/win32/newdev/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/newdev/lang/pl-PL.rc Sun May 13 12:46:14 2007 @@ -1,5 +1,6 @@ /* * translated by TestamenT + * corrected by Caemyr * testament(a)users.sourceforge.net * https://sourceforge.net/projects/reactospl * @@ -18,7 +19,7 @@ IDC_STATIC,120,21,195,16 LTEXT "Nacinij dalej aby kontynuowaæ.",IDC_STATIC,120,169,195,17 LTEXT "NIEZNANE URZ¥DZENIE",IDC_DEVICE,134,36,164,11 - LTEXT "UWAGA! ISNTALACJA WYBRANEGO U¯¥DZENIA MO¯E ZAWIEIÆ TWÓJ KONPUTER B¥C UNIEMO¯LIWIÆ PONOWNE W£¥CZENIE!",IDC_STATIC,120,59,195,16 + LTEXT "UWAGA! NIEODPOWIEDNI STEROWNIK MO¿E ZDESTABILIZOWAÆ B¥D NAWET ZAWIESIÆ SYSTEM!",IDC_STATIC,120,59,195,16 CONTROL "Zainstaluj sterownik automatycznie",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "Zainstaluj sterownik z okrelonego miejsca",IDC_RADIO_MANUAL, @@ -31,10 +32,10 @@ CAPTION "Instalacja urz¹dzenia" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Nie udana instalacj",IDC_FINISHTITLE,120,8,195,24 - LTEXT "Urz¹dzenie nie mog³o zostaæ zainstalowane, poniewa¿ sterownik nie zosta³ znaleziony.", + LTEXT "Instalacja nieudana",IDC_FINISHTITLE,120,8,195,24 + LTEXT "Instalacja zakoñczona niepowodzeniem, sterownik dla tego urz¹dzenia nie zosta³ znaleziony.", IDC_STATIC,120,40,195,19 - LTEXT "Nacinij wstecz je¿eli masz sterownik na dysku lub cie¿kê do sterownika.", + LTEXT "Nacinij wstecz je¿eli chcesz podaæ cie¿kê do sterownika.", IDC_STATIC,120,98,181,24 CONTROL "Nie pokazuj wiêcej tej wiadomoci",IDC_DONOTSHOWDLG,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 @@ -46,8 +47,8 @@ CAPTION "Instalacja urz¹dzenia" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Nie udana instalacj",IDC_FINISHTITLE,120,8,195,24 - LTEXT "Urz¹dzenie nie mog³o zostaæ zainstalowane, poniewa¿ pojawi³ siê nie spodziewany b³¹d.", + LTEXT "Instalacja nieudana",IDC_FINISHTITLE,120,8,195,24 + LTEXT "Instalacja zakoñczona niepowodzeniem, z powodu wyst¹pienia nieoczekiwanego b³¹du.", IDC_STATIC,120,40,195,19 LTEXT "NIEZNANE URZ¥DZENIE",IDC_DEVICE,134,55,164,11 END @@ -63,7 +64,7 @@ BS_AUTORADIOBUTTON,27,98,171,12 CONTROL "Szukaj w nonikach wymiennych",IDC_CHECK_MEDIA,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9 - CONTROL "Uwzglêdnij t¹ cie¿kê",IDC_CHECK_PATH,"Button",BS_AUTOCHECKBOX | + CONTROL "Uwzglêdnij podan¹ cie¿kê",IDC_CHECK_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,47,54,162,10 PUSHBUTTON "Przejrzyj",IDC_BROWSE,248,69,50,14 COMBOBOX IDC_COMBO_PATH,61,71,176,12,CBS_DROPDOWN | CBS_SORT | @@ -93,9 +94,9 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Instalacja zakoñczona",IDC_FINISHTITLE,120,8,195,11 - LTEXT "Potrzebujesz zrestartowaæ, by skoñczyæ instalacje z:", + LTEXT "Nale¿y zrestartowaæ komputer, zakanczanie instalacji:", IDC_STATIC,120,32,195,19 - LTEXT "Nacinij zakoñcz aby zamkn¹æ kreatora.",IDC_STATIC,120,174, + LTEXT "Nacinij zakoñcz aby zamkn¹æ kreator.",IDC_STATIC,120,174, 179,11 LTEXT "NIEZNANE URZ¥DZENIE",IDC_DEVICE,148,53,147,12 END @@ -109,7 +110,7 @@ LTEXT "Instalacja zakoñczona",IDC_FINISHTITLE,120,8,195,11 LTEXT "Kreator zakoñczy³ instalacje sterownika dla:", IDC_STATIC,120,32,195,19 - LTEXT "Nacinij zakoñcz aby zamkn¹æ kreatora.",IDC_STATIC,120,174, + LTEXT "Nacinij zakoñcz aby zamkn¹æ kreator.",IDC_STATIC,120,174, 179,11 LTEXT "NIEZNANE URZ¥DZENIE",IDC_DEVICE,148,53,147,12 END

17 years, 5 months

← Newer
1
...
15
16
17
18
19
20
21
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2007