Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 26742: On win XP the gdi handle index can be > 0x3fff, so change GDI_HANDLE_INDEX_MASK to 0x0000ffff to not fail on win XP on higher handle index.
by tkreuzer＠svn.reactos.org 13 May '07

13 May '07

Author: tkreuzer Date: Sun May 13 04:57:09 2007 New Revision: 26742 URL: http://svn.reactos.org/svn/reactos?rev=26742&view=rev Log: On win XP the gdi handle index can be > 0x3fff, so change GDI_HANDLE_INDEX_MASK to 0x0000ffff to not fail on win XP on higher handle index. Modified: trunk/rostests/win32/gdi32/gditest.h Modified: trunk/rostests/win32/gdi32/gditest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/gditest.h?rev… ============================================================================== --- trunk/rostests/win32/gdi32/gditest.h (original) +++ trunk/rostests/win32/gdi32/gditest.h Sun May 13 04:57:09 2007 @@ -19,7 +19,7 @@ printf("Test failed in %s:%d (%s)\n", __FILE__, __LINE__, #x);\ }; -#define GDI_HANDLE_INDEX_MASK 0x00003fff // (GDI_HANDLE_COUNT - 1) +#define GDI_HANDLE_INDEX_MASK 0x0000ffff // (GDI_HANDLE_COUNT - 1) #define GDI_HANDLE_TYPE_MASK 0x007f0000 #define GDI_HANDLE_STOCK_MASK 0x00800000 #define GDI_HANDLE_REUSE_MASK 0xff000000

1 0

[dgorbachev] 26741: Check result of ANSI -> Unicode conversion, which can fail in the case of memory shortage.
by dgorbachev＠svn.reactos.org 12 May '07

12 May '07

Author: dgorbachev Date: Sun May 13 02:54:58 2007 New Revision: 26741 URL: http://svn.reactos.org/svn/reactos?rev=26741&view=rev Log: Check result of ANSI -> Unicode conversion, which can fail in the case of memory shortage. Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c Sun May 13 02:54:58 2007 @@ -1329,12 +1329,18 @@ PLDR_DATA_TABLE_ENTRY* Module, BOOLEAN Load) { + ANSI_STRING AnsiDllName; UNICODE_STRING DllName; NTSTATUS Status; DPRINT("LdrpGetOrLoadModule() called for %s\n", Name); - RtlCreateUnicodeStringFromAsciiz (&DllName, Name); + RtlInitAnsiString(&AnsiDllName, Name); + Status = RtlAnsiStringToUnicodeString(&DllName, &AnsiDllName, TRUE); + if (!NT_SUCCESS(Status)) + { + return Status; + } Status = LdrFindEntryForName (&DllName, Module, Load); if (Load && !NT_SUCCESS(Status))

1 0

[mbosma] 26740: Add it to build.
by mbosma＠svn.reactos.org 12 May '07

12 May '07

Author: mbosma Date: Sat May 12 23:43:23 2007 New Revision: 26740 URL: http://svn.reactos.org/svn/reactos?rev=26740&view=rev Log: Add it to build. Modified: trunk/rostests/dxtest/directory.rbuild Modified: trunk/rostests/dxtest/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/directory.rbuild?r… ============================================================================== --- trunk/rostests/dxtest/directory.rbuild (original) +++ trunk/rostests/dxtest/directory.rbuild Sat May 12 23:43:23 2007 @@ -1,3 +1,7 @@ +<directory name="ddraw"> + <xi:include href="ddraw/ddraw.rbuild" /> +</directory> + <directory name="win32kdxtest"> <xi:include href="win32kdxtest/win32kdxtest.rbuild" /> </directory>

1 0

[mbosma] 26739: Start of ddraw test case.
by mbosma＠svn.reactos.org 12 May '07

12 May '07

Author: mbosma Date: Sat May 12 23:43:01 2007 New Revision: 26739 URL: http://svn.reactos.org/svn/reactos?rev=26739&view=rev Log: Start of ddraw test case. Added: trunk/rostests/dxtest/ddraw/ddraw.rbuild trunk/rostests/dxtest/ddraw/ddraw_test.c (with props) trunk/rostests/dxtest/ddraw/ddrawtest.h (with props) trunk/rostests/dxtest/ddraw/testlist.cpp (with props) trunk/rostests/dxtest/ddraw/tests/ trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp (with props) Added: trunk/rostests/dxtest/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/ddraw.rbuild… ============================================================================== --- trunk/rostests/dxtest/ddraw/ddraw.rbuild (added) +++ trunk/rostests/dxtest/ddraw/ddraw.rbuild Sat May 12 23:43:01 2007 @@ -1,0 +1,12 @@ +<module name="ddraw_test" type="win32cui" allowwarnings="true"> + <include base="ddraw_test">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>ddraw</library> + <library>dxguid</library> + <file>ddraw_test.c</file> + <file>testlist.cpp</file> +</module> Added: trunk/rostests/dxtest/ddraw/ddraw_test.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/ddraw_test.c… ============================================================================== --- trunk/rostests/dxtest/ddraw/ddraw_test.c (added) +++ trunk/rostests/dxtest/ddraw/ddraw_test.c Sat May 12 23:43:01 2007 @@ -1,0 +1,51 @@ +#include <stdio.h> +#include <stdlib.h> + +#include "ddrawtest.h" + +INT NumTests(void); + +int main(int argc, char *argv[]) +{ + INT Num = NumTests(); + INT i, j; + INT passed, failed, opassed, ofailed; + + opassed = 0; + ofailed = 0; + printf("DirectDraw tests\n"); + if (argc > 1) + { + for (i = 1; i < argc; i++) + { + for (j = 0; j < NumTests(); j++) + { + if (stricmp(argv[i], TestList[j].Test) == 0) + { + passed = 0; + failed = 0; + TestList[j].Proc(&passed, &failed); + opassed += passed; + ofailed += failed; + printf(" tests: %d, passed: %d, failed: %d\n\n", passed+failed, passed, failed); + } + } + } + } + else + { + for (i = 0; i < Num; i++) + { + passed = 0; + failed = 0; + printf("Test: %s\n", TestList[i].Test); + TestList[i].Proc(&passed, &failed); + opassed += passed; + ofailed += failed; + printf(" tests: %d, passed: %d, failed: %d\n\n", passed+failed, passed, failed); + } + } + printf("\nOverall tests: %d, passed: %d, failed: %d\n", opassed+ofailed, opassed, ofailed); + + return ofailed; +} Propchange: trunk/rostests/dxtest/ddraw/ddraw_test.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/ddraw_test.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: trunk/rostests/dxtest/ddraw/ddrawtest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/ddrawtest.h?… ============================================================================== --- trunk/rostests/dxtest/ddraw/ddrawtest.h (added) +++ trunk/rostests/dxtest/ddraw/ddrawtest.h Sat May 12 23:43:01 2007 @@ -1,0 +1,34 @@ +#ifndef _DDRAWTEST_H +#define _DDRAWTEST_H + +#define WINVER 0x501 + +#include <stdio.h> +#include <windows.h> +#include <ddraw.h> + +#define TEST(x) \ + if (x)\ + {\ + (*passed)++;\ + } else {\ + (*failed)++;\ + printf("Test failed in %s:%d (%s)\n", __FILE__, __LINE__, #x);\ + }; + + +/* The type definitions */ +typedef BOOL (*TESTPROC)(INT*, INT*); + +typedef struct tagTEST +{ + CHAR* Test; + TESTPROC Proc; +} TEST, *PTEST; + + +extern TEST TestList[]; + +#endif /* _DDRAWTEST_H */ + +/* EOF */ Propchange: trunk/rostests/dxtest/ddraw/ddrawtest.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/ddrawtest.h ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: 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 (added) +++ trunk/rostests/dxtest/ddraw/testlist.cpp Sat May 12 23:43:01 2007 @@ -1,0 +1,23 @@ +#ifndef _DDRAWTESTLIST_H +#define _DDRAWTESTLIST_H + +#include "ddrawtest.h" + +/* include the tests */ +#include "tests/CreateDDraw.cpp" + +/* The List of tests */ +TEST TestList[] = +{ + { "CreateDDraw", Test_CreateDDraw } +}; + +/* The function that gives us the number of tests */ +extern "C" INT NumTests(void) +{ + return sizeof(TestList) / sizeof(TEST); +} + +#endif /* _DDRAWTESTLIST_H */ + +/* EOF */ Propchange: trunk/rostests/dxtest/ddraw/testlist.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/testlist.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: 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 (added) +++ trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Sat May 12 23:43:01 2007 @@ -1,0 +1,19 @@ +#include "ddrawtest.h" + +PCHAR DDErrorString (HRESULT hResult); + +BOOL Test_CreateDDraw (INT* passed, INT* failed) +{ + LPDIRECTDRAW7 DirectDraw; + IDirectDraw* DirectDraw2; + + // 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); + TEST (DirectDrawCreateEx(NULL, NULL, IID_IDirectDraw7, NULL) == DDERR_INVALIDPARAMS); + TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) == DD_OK); + TEST (DirectDrawCreate(NULL ,&DirectDraw2, NULL) == DD_OK); + + return TRUE; +} Propchange: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision

1 0

[greatlrd] 26738: commit some bugfix for ddraw createsurface, fixing comping as well
by greatlrd＠svn.reactos.org 12 May '07

12 May '07

Author: greatlrd Date: Sat May 12 23:20:54 2007 New Revision: 26738 URL: http://svn.reactos.org/svn/reactos?rev=26738&view=rev Log: commit some bugfix for ddraw createsurface, fixing comping as well Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface.h trunk/reactos/dll/directx/ddraw/rosdraw.h 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 Sat May 12 23:20:54 2007 @@ -29,6 +29,7 @@ { /* DirectDraw7 Vtable */ This->lpVtbl = &DirectDraw7_Vtable; + This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags + DDRAWILCL_DIRECTDRAW7; *obj = &This->lpVtbl; } else @@ -155,11 +156,11 @@ if (pDDSD->dwSize == sizeof(DDSURFACEDESC)) { - CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2,pDDSD); + CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2, (LPDDSURFACEDESC)pDDSD); } else if (pDDSD->dwSize == sizeof(DDSURFACEDESC2)) { - RtlCopyMemory(&dd_desc_v2,pDDSD,sizeof(DDSURFACEDESC2)); + RtlCopyMemory(&dd_desc_v2, pDDSD,sizeof(DDSURFACEDESC2)); } else { @@ -168,13 +169,13 @@ } /* check if this process belong to this ddraw */ - if ( dd_int->lcl->dwProcessId != GetCurrentProcessId() ) + if ( dd_int->lpLcl->dwProcessId != GetCurrentProcessId() ) { /* FIXME send back right return code */ return DDERR_GENERIC; } - ret = internal_CreateSurface(dd_int,dd_desc_v2,ppSurf,pUnkOuter); + ret = Internal_CreateSurface(dd_int,&dd_desc_v2, ppSurf,pUnkOuter); LeaveCriticalSection(&ddcs); return ret; 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 Sat May 12 23:20:54 2007 @@ -10,11 +10,19 @@ #include "rosdraw.h" HRESULT -Internal_CreateSurface(LPDDRAWI_DIRECTDRAW_INT pDDraw, - LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, - LPDDSURFACEDESC2 pDDSD) -{ - return DDERR_GENERIC; +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 */ + } + + return DDERR_GENERIC; } void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc) Modified: trunk/reactos/dll/directx/ddraw/Surface/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface.h (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface.h Sat May 12 23:20:54 2007 @@ -71,4 +71,4 @@ HRESULT CreateOverlaySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDSURFACEDESC2 pDDSD); HRESULT CreateBackBufferSurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD); HRESULT CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That,LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD); -HRESULT Internal_CreateSurface(LPDDRAWI_DIRECTDRAW_INT, LPDDRAWI_DDRAWSURFACE_LCL*, LPDDSURFACEDESC2); + 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 Sat May 12 23:20:54 2007 @@ -24,6 +24,8 @@ HRESULT WINAPI StartDirectDrawHel(LPDIRECTDRAW* iface, BOOL reenable); HRESULT WINAPI Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, REFIID id, BOOL ex); HRESULT WINAPI ReCreateDirectDraw(LPDIRECTDRAW* iface); +HRESULT Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD, + LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter); /* convert DDSURFACEDESC to DDSURFACEDESC2 */ void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc);

1 0

[greatlrd] 26737: fixing smaller bugs
by greatlrd＠svn.reactos.org 12 May '07

12 May '07

Author: greatlrd Date: Sat May 12 22:33:28 2007 New Revision: 26737 URL: http://svn.reactos.org/svn/reactos?rev=26737&view=rev Log: fixing smaller bugs 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 Sat May 12 22:33:28 2007 @@ -130,10 +130,13 @@ DX_WINDBG_trace(); + /* FIXME vaildate input pointers or warp everthing with SEH */ + if (pUnkOuter) - return DDERR_GENERIC; - - /* FIXME vaildate input pointers or warp everthing with SEH */ + { + /* FIXME send back right return code */ + return DDERR_GENERIC; + } EnterCriticalSection(&ddcs); @@ -164,12 +167,20 @@ return DDERR_INVALIDPARAMS; } - /* FIXME add one gbl check with one pDDSD check */ - ret = Internal_CreateSurface(dd_int,ppSurf,&dd_desc_v2); + /* check if this process belong to this ddraw */ + if ( dd_int->lcl->dwProcessId != GetCurrentProcessId() ) + { + /* FIXME send back right return code */ + return DDERR_GENERIC; + } + + ret = internal_CreateSurface(dd_int,dd_desc_v2,ppSurf,pUnkOuter); LeaveCriticalSection(&ddcs); return ret; } + + IDirectDraw7Vtbl DirectDraw7_Vtable = { 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 Sat May 12 22:33:28 2007 @@ -21,6 +21,7 @@ { RtlZeroMemory(dst_pDesc,sizeof(DDSURFACEDESC2)); RtlCopyMemory(dst_pDesc,src_pDesc,sizeof(DDSURFACEDESC)); + dst_pDesc->dwSize = sizeof(DDSURFACEDESC2); }

1 0

[mbosma] 26736: Create Internal_CreateSurface stub.
by mbosma＠svn.reactos.org 12 May '07

12 May '07

Author: mbosma Date: Sat May 12 21:50:09 2007 New Revision: 26736 URL: http://svn.reactos.org/svn/reactos?rev=26736&view=rev Log: Create Internal_CreateSurface stub. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface.h 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 Sat May 12 21:50:09 2007 @@ -130,6 +130,9 @@ DX_WINDBG_trace(); + if (pUnkOuter) + return DDERR_GENERIC; + /* FIXME vaildate input pointers or warp everthing with SEH */ EnterCriticalSection(&ddcs); @@ -162,7 +165,7 @@ } /* FIXME add one gbl check with one pDDSD check */ - // ret = internal_CreateSurface(iface,dd_desc_v2,ppSurf,pUnkOuter); + ret = Internal_CreateSurface(dd_int,ppSurf,&dd_desc_v2); LeaveCriticalSection(&ddcs); return ret; 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 Sat May 12 21:50:09 2007 @@ -9,6 +9,13 @@ */ #include "rosdraw.h" +HRESULT +Internal_CreateSurface(LPDDRAWI_DIRECTDRAW_INT pDDraw, + LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, + LPDDSURFACEDESC2 pDDSD) +{ + return DDERR_GENERIC; +} void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc) { Modified: trunk/reactos/dll/directx/ddraw/Surface/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface.h (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface.h Sat May 12 21:50:09 2007 @@ -71,3 +71,4 @@ HRESULT CreateOverlaySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDSURFACEDESC2 pDDSD); HRESULT CreateBackBufferSurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD); HRESULT CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That,LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD); +HRESULT Internal_CreateSurface(LPDDRAWI_DIRECTDRAW_INT, LPDDRAWI_DDRAWSURFACE_LCL*, LPDDSURFACEDESC2);

1 0

[greatlrd] 26735: implement internal api CopyDDSurfDescToDDSurfDesc2
by greatlrd＠svn.reactos.org 12 May '07

12 May '07

Author: greatlrd Date: Sat May 12 21:48:27 2007 New Revision: 26735 URL: http://svn.reactos.org/svn/reactos?rev=26735&view=rev Log: implement internal api CopyDDSurfDescToDDSurfDesc2 Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/rosdraw.h 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 Sat May 12 21:48:27 2007 @@ -149,11 +149,7 @@ if (pDDSD->dwSize == sizeof(DDSURFACEDESC)) { - - RtlZeroMemory(&dd_desc_v2,sizeof(DDSURFACEDESC2)); - /* FIXME implement CopyDDSurfDescToDDSurfDesc2 - CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2,pDDSD); - */ + CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2,pDDSD); } else if (pDDSD->dwSize == sizeof(DDSURFACEDESC2)) { 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 Sat May 12 21:48:27 2007 @@ -8,6 +8,13 @@ * */ #include "rosdraw.h" + + +void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc) +{ + RtlZeroMemory(dst_pDesc,sizeof(DDSURFACEDESC2)); + RtlCopyMemory(dst_pDesc,src_pDesc,sizeof(DDSURFACEDESC)); +} HRESULT 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 Sat May 12 21:48:27 2007 @@ -25,6 +25,9 @@ HRESULT WINAPI Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, REFIID id, BOOL ex); HRESULT WINAPI ReCreateDirectDraw(LPDIRECTDRAW* iface); +/* convert DDSURFACEDESC to DDSURFACEDESC2 */ +void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc); + /* DirectDraw Cleanup code only internal use */ VOID Cleanup(LPDIRECTDRAW7 iface);

1 0

[mbosma] 26734: - outsourced DirectDraw_SetCooperativeLevel - adjusted .c file headers
by mbosma＠svn.reactos.org 12 May '07

12 May '07

Author: mbosma Date: Sat May 12 21:30:37 2007 New Revision: 26734 URL: http://svn.reactos.org/svn/reactos?rev=26734&view=rev Log: - outsourced DirectDraw_SetCooperativeLevel - adjusted .c file headers Added: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c (with props) Modified: trunk/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c trunk/reactos/dll/directx/ddraw/Color/color_stubs.c trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c trunk/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c trunk/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c trunk/reactos/dll/directx/ddraw/Palette/palette_stubs.c trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c trunk/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c trunk/reactos/dll/directx/ddraw/ddraw.rbuild Modified: trunk/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Clipper/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c Sat May 12 21:30:37 2007 @@ -1,8 +1,8 @@ /* $Id: clipper.c 24690 2006-11-05 21:19:53Z greatlrd $ * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/clipper.c + * PROJECT: ReactOS DirectX + * FILE: ddraw/clipper/clipper_stubs.c * PURPOSE: IDirectDrawClipper Implementation * PROGRAMMER: Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Color/color_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Color/co… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Color/color_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Color/color_stubs.c Sat May 12 21:30:37 2007 @@ -1,8 +1,8 @@ /* $Id: color.c 24690 2006-11-05 21:19:53Z greatlrd $ * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/color.c + * PROJECT: ReactOS DirectX + * FILE: ddraw/color/color.c * PURPOSE: IDirectDrawColorControl Implementation * PROGRAMMER: Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/ca… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c Sat May 12 21:30:37 2007 @@ -1,9 +1,9 @@ -/* $Id: surface_hel.c 21519 2006-04-08 21:05:49Z greatlrd $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/soft/surface.c - * PURPOSE: DirectDraw Software Implementation + * PROJECT: ReactOS DirectX + * FILE: ddraw/ddraw/callbacks_dd_hel.c + * PURPOSE: HEL Callbacks for Direct Draw * PROGRAMMER: Magnus Olsen * */ 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 Sat May 12 21:30:37 2007 @@ -1,8 +1,8 @@ /* $Id$ * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/ddraw.c + * PROJECT: ReactOS DirectX + * FILE: ddraw/ddraw/ddraw_main.c * PURPOSE: IDirectDraw7 Implementation * PROGRAMMER: Magnus Olsen, Maarten Bosma * @@ -170,174 +170,6 @@ LeaveCriticalSection(&ddcs); return ret; -} - -/* - */ -HRESULT WINAPI -Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface, HWND hwnd, DWORD cooplevel) -{ - DX_WINDBG_trace(); - -/* - * Code from wine, this functions have been cut and paste from wine 0.9.35 - * and have been modify allot and are still in devloping so it match with - * msdn document struct and flags - */ - - HWND window; - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; - - /* Get the old window */ - window = (HWND) This->lpLcl->hWnd; -#if 0 // this check is totally invalid if you ask me - mbosma - if(!window) - { - return DDERR_NOHWND; - } -#endif - - /* Tests suggest that we need one of them: */ - if(!(cooplevel & (DDSCL_SETFOCUSWINDOW | - DDSCL_NORMAL | - DDSCL_EXCLUSIVE ))) - { - return DDERR_INVALIDPARAMS; - } - - /* Handle those levels first which set various hwnds */ - if(cooplevel & DDSCL_SETFOCUSWINDOW) - { - /* This isn't compatible with a lot of flags */ - if(cooplevel & ( DDSCL_MULTITHREADED | - DDSCL_FPUSETUP | - DDSCL_FPUPRESERVE | - DDSCL_ALLOWREBOOT | - DDSCL_ALLOWMODEX | - DDSCL_SETDEVICEWINDOW | - DDSCL_NORMAL | - DDSCL_EXCLUSIVE | - DDSCL_FULLSCREEN ) ) - { - return DDERR_INVALIDPARAMS; - } - - else if(This->lpLcl->dwLocalFlags & DDRAWILCL_SETCOOPCALLED) - { - return DDERR_HWNDALREADYSET; - } - else if( (This->lpLcl->dwLocalFlags & DDRAWILCL_ISFULLSCREEN) && window) - { - return DDERR_HWNDALREADYSET; - } - - This->lpLcl->hFocusWnd = (ULONG_PTR) hwnd; - - - /* Won't use the hwnd param for anything else */ - hwnd = NULL; - - /* Use the focus window for drawing too */ - This->lpLcl->hWnd = This->lpLcl->hFocusWnd; - - } - - /* DDSCL_NORMAL or DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE */ - if(cooplevel & DDSCL_NORMAL) - { - /* Can't coexist with fullscreen or exclusive */ - if(cooplevel & (DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) ) - return DDERR_INVALIDPARAMS; - - - /* Switching from fullscreen? */ - if(This->lpLcl->dwLocalFlags & DDRAWILCL_ISFULLSCREEN) - { - /* Restore the display mode */ - Main_DirectDraw_RestoreDisplayMode(iface); - - This->lpLcl->dwLocalFlags &= ~DDRAWILCL_ISFULLSCREEN; - This->lpLcl->dwLocalFlags &= ~DDRAWILCL_HASEXCLUSIVEMODE; - This->lpLcl->dwLocalFlags &= ~DDRAWILCL_ALLOWMODEX; - } - - /* Don't override focus windows or private device windows */ - if( hwnd && - !(This->lpLcl->hFocusWnd) && - !(This->lpLcl->dwObsolete1) && - (hwnd != window) ) - { - This->lpLcl->hWnd = (ULONG_PTR)hwnd; - } - - /* FIXME GL - IWineD3DDevice_SetFullscreen(This->wineD3DDevice, - FALSE); - */ - } - else if(cooplevel & DDSCL_FULLSCREEN) - { - /* Needs DDSCL_EXCLUSIVE */ - if(!(cooplevel & DDSCL_EXCLUSIVE) ) - return DDERR_INVALIDPARAMS; - - /* Switch from normal to full screen mode? */ - if (!(This->lpLcl->dwLocalFlags & DDRAWILCL_HASEXCLUSIVEMODE)) - { - /* FIXME GL - IWineD3DDevice_SetFullscreen(This->wineD3DDevice, - TRUE); - */ - } - - /* Don't override focus windows or private device windows */ - if( hwnd && - !(This->lpLcl->hFocusWnd) && - !(This->lpLcl->dwObsolete1) && - (hwnd != window) ) - { - This->lpLcl->hWnd = (ULONG_PTR) hwnd; - } - } - else if(cooplevel & DDSCL_EXCLUSIVE) - { - return DDERR_INVALIDPARAMS; - } - - if(cooplevel & DDSCL_CREATEDEVICEWINDOW) - { - /* Don't create a device window if a focus window is set */ - if( !This->lpLcl->hFocusWnd) - { - HWND devicewindow = CreateWindowExW(0, classname, L"DDraw device window", - WS_POPUP, 0, 0, - GetSystemMetrics(SM_CXSCREEN), - GetSystemMetrics(SM_CYSCREEN), - NULL, NULL, GetModuleHandleW(0), NULL); - - ShowWindow(devicewindow, SW_SHOW); /* Just to be sure */ - - This->lpLcl->dwObsolete1 = (DWORD)devicewindow; - } - } - - if(cooplevel & DDSCL_MULTITHREADED && !(This->lpLcl->dwLocalFlags & DDRAWILCL_MULTITHREADED)) - { - /* FIXME GL - * IWineD3DDevice_SetMultithreaded(This->wineD3DDevice); - */ - } - - - - /* Store the cooperative_level */ - - /* FIXME GL - * This->cooperative_level |= cooplevel; - */ - - return DD_OK; - } IDirectDraw7Vtbl DirectDraw7_Vtable = Added: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c (added) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c Sat May 12 21:30:37 2007 @@ -1,0 +1,176 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS DirectX + * FILE: ddraw/ddraw/ddraw_main.c + * PURPOSE: IDirectDraw7::SetCooperativeLevel Implementation + * PROGRAMMER: Magnus Olsen + * + */ + +#include "rosdraw.h" + +HRESULT WINAPI +Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface, HWND hwnd, DWORD cooplevel) +{ + DX_WINDBG_trace(); + +/* + * Code from wine, this functions have been cut and paste from wine 0.9.35 + * and have been modify allot and are still in devloping so it match with + * msdn document struct and flags + */ + + HWND window; + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + + /* Get the old window */ + window = (HWND) This->lpLcl->hWnd; +#if 0 // this check is totally invalid if you ask me - mbosma + if(!window) + { + return DDERR_NOHWND; + } +#endif + + /* Tests suggest that we need one of them: */ + if(!(cooplevel & (DDSCL_SETFOCUSWINDOW | + DDSCL_NORMAL | + DDSCL_EXCLUSIVE ))) + { + return DDERR_INVALIDPARAMS; + } + + /* Handle those levels first which set various hwnds */ + if(cooplevel & DDSCL_SETFOCUSWINDOW) + { + /* This isn't compatible with a lot of flags */ + if(cooplevel & ( DDSCL_MULTITHREADED | + DDSCL_FPUSETUP | + DDSCL_FPUPRESERVE | + DDSCL_ALLOWREBOOT | + DDSCL_ALLOWMODEX | + DDSCL_SETDEVICEWINDOW | + DDSCL_NORMAL | + DDSCL_EXCLUSIVE | + DDSCL_FULLSCREEN ) ) + { + return DDERR_INVALIDPARAMS; + } + + else if(This->lpLcl->dwLocalFlags & DDRAWILCL_SETCOOPCALLED) + { + return DDERR_HWNDALREADYSET; + } + else if( (This->lpLcl->dwLocalFlags & DDRAWILCL_ISFULLSCREEN) && window) + { + return DDERR_HWNDALREADYSET; + } + + This->lpLcl->hFocusWnd = (ULONG_PTR) hwnd; + + + /* Won't use the hwnd param for anything else */ + hwnd = NULL; + + /* Use the focus window for drawing too */ + This->lpLcl->hWnd = This->lpLcl->hFocusWnd; + + } + + /* DDSCL_NORMAL or DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE */ + if(cooplevel & DDSCL_NORMAL) + { + /* Can't coexist with fullscreen or exclusive */ + if(cooplevel & (DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) ) + return DDERR_INVALIDPARAMS; + + + /* Switching from fullscreen? */ + if(This->lpLcl->dwLocalFlags & DDRAWILCL_ISFULLSCREEN) + { + /* Restore the display mode */ + Main_DirectDraw_RestoreDisplayMode(iface); + + This->lpLcl->dwLocalFlags &= ~DDRAWILCL_ISFULLSCREEN; + This->lpLcl->dwLocalFlags &= ~DDRAWILCL_HASEXCLUSIVEMODE; + This->lpLcl->dwLocalFlags &= ~DDRAWILCL_ALLOWMODEX; + } + + /* Don't override focus windows or private device windows */ + if( hwnd && + !(This->lpLcl->hFocusWnd) && + !(This->lpLcl->dwObsolete1) && + (hwnd != window) ) + { + This->lpLcl->hWnd = (ULONG_PTR)hwnd; + } + + /* FIXME GL + IWineD3DDevice_SetFullscreen(This->wineD3DDevice, + FALSE); + */ + } + else if(cooplevel & DDSCL_FULLSCREEN) + { + /* Needs DDSCL_EXCLUSIVE */ + if(!(cooplevel & DDSCL_EXCLUSIVE) ) + return DDERR_INVALIDPARAMS; + + /* Switch from normal to full screen mode? */ + if (!(This->lpLcl->dwLocalFlags & DDRAWILCL_HASEXCLUSIVEMODE)) + { + /* FIXME GL + IWineD3DDevice_SetFullscreen(This->wineD3DDevice, + TRUE); + */ + } + + /* Don't override focus windows or private device windows */ + if( hwnd && + !(This->lpLcl->hFocusWnd) && + !(This->lpLcl->dwObsolete1) && + (hwnd != window) ) + { + This->lpLcl->hWnd = (ULONG_PTR) hwnd; + } + } + else if(cooplevel & DDSCL_EXCLUSIVE) + { + return DDERR_INVALIDPARAMS; + } + + if(cooplevel & DDSCL_CREATEDEVICEWINDOW) + { + /* Don't create a device window if a focus window is set */ + if( !This->lpLcl->hFocusWnd) + { + HWND devicewindow = CreateWindowExW(0, classname, L"DDraw device window", + WS_POPUP, 0, 0, + GetSystemMetrics(SM_CXSCREEN), + GetSystemMetrics(SM_CYSCREEN), + NULL, NULL, GetModuleHandleW(0), NULL); + + ShowWindow(devicewindow, SW_SHOW); /* Just to be sure */ + + This->lpLcl->dwObsolete1 = (DWORD)devicewindow; + } + } + + if(cooplevel & DDSCL_MULTITHREADED && !(This->lpLcl->dwLocalFlags & DDRAWILCL_MULTITHREADED)) + { + /* FIXME GL + * IWineD3DDevice_SetMultithreaded(This->wineD3DDevice); + */ + } + + + + /* Store the cooperative_level */ + + /* FIXME GL + * This->cooperative_level |= cooplevel; + */ + + return DD_OK; +} Propchange: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c Sat May 12 21:30:37 2007 @@ -1,8 +1,8 @@ /* $Id$ * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: ddraw\ddraw\ddraw_stubs.c + * PROJECT: ReactOS DirectX + * FILE: ddraw/ddraw/ddraw_stubs.c * PURPOSE: IDirectDraw7 Implementation * PROGRAMMER: Magnus Olsen, Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Gamma/ga… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c Sat May 12 21:30:37 2007 @@ -1,8 +1,8 @@ /* $Id: gamma.c 24690 2006-11-05 21:19:53Z greatlrd $ * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/gamma.c + * PROJECT: ReactOS DirectX + * FILE: ddraw/gamma/gamma_stubs.c * PURPOSE: IDirectDrawGamma Implementation * PROGRAMMER: Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Kernel/k… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c Sat May 12 21:30:37 2007 @@ -1,8 +1,8 @@ /* $Id: kernel.c 24690 2006-11-05 21:19:53Z greatlrd $ * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/kernel.c + * PROJECT: ReactOS DirectX + * FILE: ddraw/kernel/kernel_stubs.c * PURPOSE: IDirectDrawKernel and IDirectDrawSurfaceKernel Implementation * PROGRAMMER: Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Palette/palette_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Palette/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Palette/palette_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Palette/palette_stubs.c Sat May 12 21:30:37 2007 @@ -1,8 +1,8 @@ /* $Id: palette.c 24690 2006-11-05 21:19:53Z greatlrd $ * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/palette.c + * PROJECT: ReactOS DirectX + * FILE: ddraw/palette/palette_stubs.c * PURPOSE: IDirectDrawPalette Implementation * PROGRAMMER: Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c Sat May 12 21:30:37 2007 @@ -1,10 +1,10 @@ -/* $Id: main.c 21434 2006-04-01 19:12:56Z greatlrd $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/ddraw/ddraw.c - * PURPOSE: DirectDraw Library - * PROGRAMMER: Magnus Olsen (greatlrd) + * PROJECT: ReactOS DirectX + * FILE: ddraw/surface/callbacks_surf_hel.c + * PURPOSE: HEL Callbacks For Surface APIs + * PROGRAMMER: Magnus Olsen * */ 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 Sat May 12 21:30:37 2007 @@ -1,4 +1,12 @@ - +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS DirectX + * FILE: ddraw/surface/createsurface.c + * PURPOSE: IDirectDrawSurface7 Creation + * PROGRAMMER: Magnus Olsen + * + */ #include "rosdraw.h" Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Sat May 12 21:30:37 2007 @@ -1,8 +1,8 @@ /* $Id$ * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/ + * PROJECT: ReactOS DirectX + * FILE: ddraw/surface/surface_main.c * PURPOSE: IDirectDrawSurface7 Implementation * PROGRAMMER: Magnus Olsen, Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c Sat May 12 21:30:37 2007 @@ -1,8 +1,8 @@ /* $Id$ * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: + * PROJECT: ReactOS DirectX + * FILE: ddraw/surface/surface_stubs.c * PURPOSE: IDirectDrawSurface7 Implementation * PROGRAMMER: Magnus Olsen, Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Videopor… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c Sat May 12 21:30:37 2007 @@ -1,8 +1,8 @@ /* $Id: videoport.c 22739 2006-07-01 12:08:35Z greatlrd $ * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/videoport.c + * PROJECT: ReactOS DirectX + * FILE: ddraw/videoport/videoport_stubs.c * PURPOSE: IDirectDrawVideoPort, DDVideoPortContainer and IDirectDrawVideoPortNotify Implementation * PROGRAMMER: Maarten Bosma * 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 Sat May 12 21:30:37 2007 @@ -24,6 +24,7 @@ <directory name="Ddraw"> <file>ddraw_stubs.c</file> + <file>ddraw_setcooperativelevel.c</file> <file>ddraw_main.c</file> <file>callbacks_dd_hel.c</file> </directory>

1 0

[greatlrd] 26733: start implement Main_DirectDraw_CreateSurface we need now finish internal_CreateSurface and CopyDDSurfDescToDDSurfDesc2
by greatlrd＠svn.reactos.org 12 May '07

12 May '07

Author: greatlrd Date: Sat May 12 21:23:48 2007 New Revision: 26733 URL: http://svn.reactos.org/svn/reactos?rev=26733&view=rev Log: start implement Main_DirectDraw_CreateSurface we need now finish internal_CreateSurface and CopyDDSurfDescToDDSurfDesc2 Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.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 Sat May 12 21:23:48 2007 @@ -122,15 +122,54 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { - - DX_WINDBG_trace(); - EnterCriticalSection(&ddcs); - - /* code here */ + HRESULT ret; + DDSURFACEDESC2 dd_desc_v2; + LPDDRAWI_DIRECTDRAW_INT dd_int; + LPDDRAWI_DIRECTDRAW_LCL dd_lcl; + LPDDRAWI_DIRECTDRAW_GBL dd_gbl; + + DX_WINDBG_trace(); + + /* FIXME vaildate input pointers or warp everthing with SEH */ + + EnterCriticalSection(&ddcs); + + ret = DDERR_GENERIC; + + dd_int = (LPDDRAWI_DIRECTDRAW_INT)iface; + dd_lcl = dd_int->lpLcl; + dd_gbl = dd_lcl->lpGbl; + + if (dd_lcl->dwLocalFlags == 0) + { + LeaveCriticalSection(&ddcs); + /* FIXME send back right return code */ + return DDERR_GENERIC; + } + + if (pDDSD->dwSize == sizeof(DDSURFACEDESC)) + { + + RtlZeroMemory(&dd_desc_v2,sizeof(DDSURFACEDESC2)); + /* FIXME implement CopyDDSurfDescToDDSurfDesc2 + CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2,pDDSD); + */ + } + else if (pDDSD->dwSize == sizeof(DDSURFACEDESC2)) + { + RtlCopyMemory(&dd_desc_v2,pDDSD,sizeof(DDSURFACEDESC2)); + } + else + { + LeaveCriticalSection(&ddcs); + return DDERR_INVALIDPARAMS; + } + + /* FIXME add one gbl check with one pDDSD check */ + // ret = internal_CreateSurface(iface,dd_desc_v2,ppSurf,pUnkOuter); LeaveCriticalSection(&ddcs); - - DX_STUB; + return ret; } /*

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs