[greatlrd] 25014: remove trunk stuff. for it was wine idea, if you reading msdn and test ms ddraw you can not use other interface that IID_IDirectDraw7 but wine allown you use older IID interface. But It will be hell to support DirectX 1-6 IID_IDirectDraw, IID_IDirectDraw2, IID_IDirectDraw4 so we doing like microsoft kill it. and this check can be use to detect if it wine ddraw or not. like test if other that IID_IDirectDraw7 are vaild.
Author: greatlrd Date: Sat Dec 2 13:20:33 2006 New Revision: 25014
URL: http://svn.reactos.org/svn/reactos?rev=25014&view=rev Log: remove trunk stuff. for it was wine idea, if you reading msdn and test ms ddraw you can not use other interface that IID_IDirectDraw7 but wine allown you use older IID interface. But It will be hell to support DirectX 1-6 IID_IDirectDraw, IID_IDirectDraw2, IID_IDirectDraw4 so we doing like microsoft kill it. and this check can be use to detect if it wine ddraw or not. like test if other that IID_IDirectDraw7 are vaild.
Removed: trunk/reactos/dll/directx/ddraw/thunks/ Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/main.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h
Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rbu... ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Sat Dec 2 13:20:33 2006 @@ -36,9 +36,4 @@ <file>ddraw_main.c</file> <file>surface_main.c</file> </directory> - - <directory name="thunks"> - <file>ddraw_thunk.c</file> - <file>surface_thunk.c</file> - </directory> </module>
Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?re... ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Sat Dec 2 13:20:33 2006 @@ -48,7 +48,7 @@ return CLASS_E_NOAGGREGATION; } - return Create_DirectDraw (lpGUID, lplpDD, &IID_IDirectDraw, FALSE); + return Create_DirectDraw (lpGUID, lplpDD, &IID_IDirectDraw7, FALSE); }
/*
Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddra... ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sat Dec 2 13:20:33 2006 @@ -32,24 +32,6 @@ { /* DirectDraw7 Vtable */ This->lpVtbl = &DirectDraw7_Vtable; - *obj = &This->lpVtbl; - } - else if (IsEqualGUID(&IID_IDirectDraw, id)) - { - /* DirectDraw1 Vtable */ - This->lpVtbl = &DirectDraw_Vtable; - *obj = &This->lpVtbl; - } - else if (IsEqualGUID(&IID_IDirectDraw2, id)) - { - /* DirectDraw2 Vtable */ - This->lpVtbl = &DirectDraw2_Vtable; - *obj = &This->lpVtbl; - } - else if (IsEqualGUID(&IID_IDirectDraw4, id)) - { - /* DirectDraw4 Vtable */ - This->lpVtbl = &DirectDraw4_Vtable; *obj = &This->lpVtbl; } else
Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h... ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sat Dec 2 13:20:33 2006 @@ -620,11 +620,11 @@ */
-//#define DX_WINDBG_trace() -//#define DX_STUB -//#define DX_STUB_DD_OK return DD_OK; -//#define DX_STUB_str(x) printf("%s",x); -//#define DX_WINDBG_trace_res +#define DX_WINDBG_trace() +#define DX_STUB +#define DX_STUB_DD_OK return DD_OK; +#define DX_STUB_str(x) printf("%s",x); +#define DX_WINDBG_trace_res
/* use this if want doing a trace from a program @@ -635,58 +635,58 @@ This marco does not create warings when you compile */
-#define DX_STUB \ -{ \ - static BOOL firstcall = TRUE; \ - if (firstcall) \ - { \ - char buffer[1024]; \ - sprintf ( buffer, "Function %s is not implemented yet (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ - OutputDebugStringA(buffer); \ - firstcall = FALSE; \ - } \ -} \ - return DDERR_UNSUPPORTED; - -#define DX_STUB_DD_OK \ -{ \ - static BOOL firstcall = TRUE; \ - if (firstcall) \ - { \ - char buffer[1024]; \ - sprintf ( buffer, "Function %s is not implemented yet (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ - OutputDebugStringA(buffer); \ - firstcall = FALSE; \ - } \ -} \ - return DD_OK; - - -#define DX_STUB_str(x) \ - { \ - char buffer[1024]; \ - sprintf ( buffer, "Function %s %s (%s:%d)\n", __FUNCTION__,x,__FILE__,__LINE__ ); \ - OutputDebugStringA(buffer); \ - } - -#define DX_WINDBG_trace() \ - static BOOL firstcallx = TRUE; \ - if (firstcallx) \ - { \ - char buffer[1024]; \ - sprintf ( buffer, "Enter Function %s (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ - OutputDebugStringA(buffer); \ - firstcallx = TRUE; \ - } - -#define DX_WINDBG_trace_res(width,height,bpp) \ - static BOOL firstcallxx = TRUE; \ - if (firstcallxx) \ - { \ - char buffer[1024]; \ - sprintf ( buffer, "Setmode have been req width=%d, height=%d bpp=%d\n",width,height,bpp); \ - OutputDebugStringA(buffer); \ - firstcallxx = FALSE; \ - } +//#define DX_STUB \ +//{ \ +// static BOOL firstcall = TRUE; \ +// if (firstcall) \ +// { \ +// char buffer[1024]; \ +// sprintf ( buffer, "Function %s is not implemented yet (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ +// OutputDebugStringA(buffer); \ +// firstcall = FALSE; \ +// } \ +//} \ +// return DDERR_UNSUPPORTED; +// +//#define DX_STUB_DD_OK \ +//{ \ +// static BOOL firstcall = TRUE; \ +// if (firstcall) \ +// { \ +// char buffer[1024]; \ +// sprintf ( buffer, "Function %s is not implemented yet (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ +// OutputDebugStringA(buffer); \ +// firstcall = FALSE; \ +// } \ +//} \ +// return DD_OK; +// +// +//#define DX_STUB_str(x) \ +// { \ +// char buffer[1024]; \ +// sprintf ( buffer, "Function %s %s (%s:%d)\n", __FUNCTION__,x,__FILE__,__LINE__ ); \ +// OutputDebugStringA(buffer); \ +// } +// +//#define DX_WINDBG_trace() \ +// static BOOL firstcallx = TRUE; \ +// if (firstcallx) \ +// { \ +// char buffer[1024]; \ +// sprintf ( buffer, "Enter Function %s (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ +// OutputDebugStringA(buffer); \ +// firstcallx = TRUE; \ +// } +// +//#define DX_WINDBG_trace_res(width,height,bpp) \ +// static BOOL firstcallxx = TRUE; \ +// if (firstcallxx) \ +// { \ +// char buffer[1024]; \ +// sprintf ( buffer, "Setmode have been req width=%d, height=%d bpp=%d\n",width,height,bpp); \ +// OutputDebugStringA(buffer); \ +// firstcallxx = FALSE; \ +// }
#endif /* __DDRAW_PRIVATE */
-
greatlrd＠svn.reactos.org