Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 27213: 50% are implmene in DD->GetCaps now
by greatlrd＠svn.reactos.org 17 Jun '07

17 Jun '07

Author: greatlrd Date: Sun Jun 17 18:14:42 2007 New Revision: 27213 URL: http://svn.reactos.org/svn/reactos?rev=27213&view=rev Log: 50% are implmene in DD->GetCaps now 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 Sun Jun 17 18:14:42 2007 @@ -455,96 +455,157 @@ Main_DirectDraw_GetCaps( LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, LPDDCAPS pHELCaps) { - HRESULT retVal = DD_OK; + HRESULT retVal = DDERR_INVALIDPARAMS; + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; DX_WINDBG_trace(); - if (!(IsBadWritePtr(pDriverCaps,sizeof(LPDDCAPS)))) - { - if (!(IsBadWritePtr(pHELCaps,sizeof(LPDDCAPS)))) - { - return DDERR_INVALIDPARAMS; - } - } - - if ((IsBadWritePtr(pDriverCaps,sizeof(LPDDCAPS)))) - { - DDSCAPS2 ddscaps = { 0 }; - DWORD dwTotal = 0; - DWORD dwFree = 0; - /* Setup hardware caps */ - - Main_DirectDraw_GetAvailableVidMem4(iface, &ddscaps, &dwTotal, &dwFree); - - - switch (pDriverCaps->dwSize) - { - case sizeof(DDCAPS_DX1): + + _SEH_TRY + { + if ((!pDriverCaps) && (!pHELCaps)) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + if (pDriverCaps) + { + /* Setup hardware caps */ + DDSCAPS2 ddscaps = { 0 }; + LPDDCORECAPS CoreCaps = (LPDDCORECAPS)&This->lpLcl->lpGbl->ddCaps; + + DWORD dwTotal = 0; + DWORD dwFree = 0; + + Main_DirectDraw_GetAvailableVidMem4(iface, &ddscaps, &dwTotal, &dwFree); + + switch (pDriverCaps->dwSize) + { + case sizeof(DDCAPS_DX1): { LPDDCAPS_DX1 myCaps = (LPDDCAPS_DX1) pDriverCaps; + + if (CoreCaps->dwSize == sizeof(DDCORECAPS)) + { + memcpy(myCaps, CoreCaps, sizeof(DDCAPS_DX1)); + } myCaps->dwVidMemFree = dwFree; myCaps->dwVidMemTotal = dwTotal; + myCaps->dwSize = sizeof(DDCAPS_DX1); + + retVal = DD_OK; } break; - case sizeof(DDCAPS_DX3): + case sizeof(DDCAPS_DX3): { LPDDCAPS_DX3 myCaps = (LPDDCAPS_DX3) pDriverCaps; + + if (CoreCaps->dwSize == sizeof(DDCORECAPS)) + { + memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCAPS_DX3)); + } myCaps->dwVidMemFree = dwFree; myCaps->dwVidMemTotal = dwTotal; + myCaps->dwSize = sizeof(DDCAPS_DX3); + + retVal = DD_OK; } break; - case sizeof(DDCAPS_DX5): + case sizeof(DDCAPS_DX5): { LPDDCAPS_DX5 myCaps = (LPDDCAPS_DX5) pDriverCaps; + + if (CoreCaps->dwSize == sizeof(DDCORECAPS)) + { + memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCORECAPS)); + } + + /* FIXME + DWORD dwNLVBCaps; + DWORD dwNLVBCaps2; + DWORD dwNLVBCKeyCaps; + DWORD dwNLVBFXCaps; + DWORD dwNLVBRops[DD_ROP_SPACE]; + */ myCaps->dwVidMemFree = dwFree; myCaps->dwVidMemTotal = dwTotal; + myCaps->dwSize = sizeof(DDCAPS_DX5); + + retVal = DD_OK; } break; - /* DDCAPS_DX6 is same as DDCAPS_DX7 */ - case sizeof(DDCAPS_DX7): + /* DDCAPS_DX6 is same as DDCAPS_DX7 */ + case sizeof(DDCAPS_DX7): { LPDDCAPS_DX7 myCaps = (LPDDCAPS_DX7) pDriverCaps; + + if (CoreCaps->dwSize == sizeof(DDCORECAPS)) + { + memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCORECAPS)); + } myCaps->dwVidMemFree = dwFree; myCaps->dwVidMemTotal = dwTotal; + + /* FIXME + DWORD dwNLVBCaps; + DWORD dwNLVBCaps2; + DWORD dwNLVBCKeyCaps; + DWORD dwNLVBFXCaps; + DWORD dwNLVBRops[DD_ROP_SPACE]; + */ + + myCaps->ddsCaps.dwCaps = ddscaps.dwCaps; + myCaps->ddsCaps.dwCaps2 = ddscaps.dwCaps2; + myCaps->ddsCaps.dwCaps3 = ddscaps.dwCaps3; + myCaps->ddsCaps.dwCaps4 = ddscaps.dwCaps4; + myCaps->dwSize = sizeof(DDCAPS_DX7); + } break; - default: - retVal = DDERR_INVALIDPARAMS; - break; - } - } - - if ((IsBadWritePtr(pHELCaps,sizeof(LPDDCAPS)))) - { - /* Setup hardware caps */ - switch (pHELCaps->dwSize) - { - case sizeof(DDCAPS_DX1): - retVal = DDERR_INVALIDPARAMS; - break; - case sizeof(DDCAPS_DX3): - retVal = DDERR_INVALIDPARAMS; - break; - case sizeof(DDCAPS_DX5): - retVal = DDERR_INVALIDPARAMS; - break; - - /* DDCAPS_DX6 is same as DDCAPS_DX7 */ - case sizeof(DDCAPS_DX7): - retVal = DDERR_INVALIDPARAMS; - break; - default: - retVal = DDERR_INVALIDPARAMS; - break; - } - } + default: + retVal = DDERR_INVALIDPARAMS; + break; + } + } + + if (pHELCaps) + { + /* Setup software caps */ + switch (pHELCaps->dwSize) + { + case sizeof(DDCAPS_DX1): + retVal = DDERR_INVALIDPARAMS; + break; + case sizeof(DDCAPS_DX3): + retVal = DDERR_INVALIDPARAMS; + break; + case sizeof(DDCAPS_DX5): + retVal = DDERR_INVALIDPARAMS; + break; + + /* DDCAPS_DX6 is same as DDCAPS_DX7 */ + case sizeof(DDCAPS_DX7): + retVal = DDERR_INVALIDPARAMS; + break; + default: + retVal = DDERR_INVALIDPARAMS; + break; + } + } + } + _SEH_HANDLE + { + retVal = DD_FALSE; + } + _SEH_END; return retVal; }

1 0

[greatlrd] 27212: GetCpas filling in how much memory we got now from HAL
by greatlrd＠svn.reactos.org 17 Jun '07

17 Jun '07

Author: greatlrd Date: Sun Jun 17 16:30:58 2007 New Revision: 27212 URL: http://svn.reactos.org/svn/reactos?rev=27212&view=rev Log: GetCpas filling in how much memory we got now from HAL 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 Sun Jun 17 16:30:58 2007 @@ -468,23 +468,53 @@ if ((IsBadWritePtr(pDriverCaps,sizeof(LPDDCAPS)))) { + DDSCAPS2 ddscaps = { 0 }; + DWORD dwTotal = 0; + DWORD dwFree = 0; /* Setup hardware caps */ + + Main_DirectDraw_GetAvailableVidMem4(iface, &ddscaps, &dwTotal, &dwFree); + + switch (pDriverCaps->dwSize) { case sizeof(DDCAPS_DX1): - retVal = DDERR_INVALIDPARAMS; - break; + { + LPDDCAPS_DX1 myCaps = (LPDDCAPS_DX1) pDriverCaps; + + myCaps->dwVidMemFree = dwFree; + myCaps->dwVidMemTotal = dwTotal; + } + break; + case sizeof(DDCAPS_DX3): - retVal = DDERR_INVALIDPARAMS; - break; + { + LPDDCAPS_DX3 myCaps = (LPDDCAPS_DX3) pDriverCaps; + + myCaps->dwVidMemFree = dwFree; + myCaps->dwVidMemTotal = dwTotal; + } + break; + case sizeof(DDCAPS_DX5): - retVal = DDERR_INVALIDPARAMS; + { + LPDDCAPS_DX5 myCaps = (LPDDCAPS_DX5) pDriverCaps; + + myCaps->dwVidMemFree = dwFree; + myCaps->dwVidMemTotal = dwTotal; + } break; /* DDCAPS_DX6 is same as DDCAPS_DX7 */ case sizeof(DDCAPS_DX7): - retVal = DDERR_INVALIDPARAMS; - break; + { + LPDDCAPS_DX7 myCaps = (LPDDCAPS_DX7) pDriverCaps; + + myCaps->dwVidMemFree = dwFree; + myCaps->dwVidMemTotal = dwTotal; + } + break; + default: retVal = DDERR_INVALIDPARAMS; break; @@ -515,6 +545,8 @@ break; } } + + return retVal; }

1 0

[greatlrd] 27211: start implement of DirectDraw_GetCaps
by greatlrd＠svn.reactos.org 17 Jun '07

17 Jun '07

Author: greatlrd Date: Sun Jun 17 15:22:23 2007 New Revision: 27211 URL: http://svn.reactos.org/svn/reactos?rev=27211&view=rev Log: start implement of DirectDraw_GetCaps Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.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 Jun 17 15:22:23 2007 @@ -131,7 +131,7 @@ } else { - /* DirectDraw4 Vtable */ + /* DirectDraw Vtable */ newThis->lpVtbl = &DirectDraw_Vtable; newThis->lpLcl = This->lpLcl; newThis->lpLink = This; @@ -450,6 +450,74 @@ //LeaveCriticalSection(&ddcs); return retVal; } + +HRESULT WINAPI +Main_DirectDraw_GetCaps( LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, + LPDDCAPS pHELCaps) +{ + HRESULT retVal = DD_OK; + + DX_WINDBG_trace(); + if (!(IsBadWritePtr(pDriverCaps,sizeof(LPDDCAPS)))) + { + if (!(IsBadWritePtr(pHELCaps,sizeof(LPDDCAPS)))) + { + return DDERR_INVALIDPARAMS; + } + } + + if ((IsBadWritePtr(pDriverCaps,sizeof(LPDDCAPS)))) + { + /* Setup hardware caps */ + switch (pDriverCaps->dwSize) + { + case sizeof(DDCAPS_DX1): + retVal = DDERR_INVALIDPARAMS; + break; + case sizeof(DDCAPS_DX3): + retVal = DDERR_INVALIDPARAMS; + break; + case sizeof(DDCAPS_DX5): + retVal = DDERR_INVALIDPARAMS; + break; + + /* DDCAPS_DX6 is same as DDCAPS_DX7 */ + case sizeof(DDCAPS_DX7): + retVal = DDERR_INVALIDPARAMS; + break; + default: + retVal = DDERR_INVALIDPARAMS; + break; + } + } + + if ((IsBadWritePtr(pHELCaps,sizeof(LPDDCAPS)))) + { + /* Setup hardware caps */ + switch (pHELCaps->dwSize) + { + case sizeof(DDCAPS_DX1): + retVal = DDERR_INVALIDPARAMS; + break; + case sizeof(DDCAPS_DX3): + retVal = DDERR_INVALIDPARAMS; + break; + case sizeof(DDCAPS_DX5): + retVal = DDERR_INVALIDPARAMS; + break; + + /* DDCAPS_DX6 is same as DDCAPS_DX7 */ + case sizeof(DDCAPS_DX7): + retVal = DDERR_INVALIDPARAMS; + break; + default: + retVal = DDERR_INVALIDPARAMS; + break; + } + } +} + + 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 Sun Jun 17 15:22:23 2007 @@ -57,13 +57,6 @@ DX_STUB; } -HRESULT WINAPI -Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, - LPDDCAPS pHELCaps) -{ - DX_WINDBG_trace(); - DX_STUB; -} HRESULT WINAPI Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface,

1 0

[greatlrd] 27210: fixing one more bugs in QueryInterface
by greatlrd＠svn.reactos.org 16 Jun '07

16 Jun '07

Author: greatlrd Date: Sun Jun 17 02:05:16 2007 New Revision: 27210 URL: http://svn.reactos.org/svn/reactos?rev=27210&view=rev Log: fixing one more bugs in QueryInterface 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 Sun Jun 17 02:05:16 2007 @@ -39,78 +39,110 @@ */ if (IsEqualGUID(&IID_IDirectDraw7, id)) { - LPDDRAWI_DIRECTDRAW_INT newThis; - DxHeapMemAlloc(newThis, sizeof(DDRAWI_DIRECTDRAW_INT)); - - if (newThis == NULL) - { - retVal = DDERR_OUTOFMEMORY; + if (This->lpVtbl != &DirectDraw7_Vtable) + { + LPDDRAWI_DIRECTDRAW_INT newThis; + DxHeapMemAlloc(newThis, sizeof(DDRAWI_DIRECTDRAW_INT)); + + if (newThis == NULL) + { + retVal = DDERR_OUTOFMEMORY; + } + else + { + /* DirectDraw7 Vtable */ + newThis->lpVtbl = &DirectDraw7_Vtable; + newThis->lpLcl = This->lpLcl; + newThis->lpLink = This; + *obj = &newThis->lpVtbl; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)newThis); + } } else { - /* DirectDraw7 Vtable */ - newThis->lpVtbl = &DirectDraw7_Vtable; - newThis->lpLcl = This->lpLcl; - newThis->lpLink = This; - *obj = &newThis->lpVtbl; - Main_DirectDraw_AddRef((LPDIRECTDRAW7)newThis); + *obj = This; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); } } else if (IsEqualGUID(&IID_IDirectDraw4, id)) { - LPDDRAWI_DIRECTDRAW_INT newThis; - DxHeapMemAlloc(newThis, sizeof(DDRAWI_DIRECTDRAW_INT)); - - if (newThis == NULL) - { - retVal = DDERR_OUTOFMEMORY; + if (This->lpVtbl != &DirectDraw4_Vtable) + { + LPDDRAWI_DIRECTDRAW_INT newThis; + DxHeapMemAlloc(newThis, sizeof(DDRAWI_DIRECTDRAW_INT)); + + if (newThis == NULL) + { + retVal = DDERR_OUTOFMEMORY; + } + else + { + /* DirectDraw4 Vtable */ + newThis->lpVtbl = &DirectDraw4_Vtable; + newThis->lpLcl = This->lpLcl; + newThis->lpLink = This; + *obj = &newThis->lpVtbl; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)newThis); + } } else { - /* DirectDraw4 Vtable */ - newThis->lpVtbl = &DirectDraw4_Vtable; - newThis->lpLcl = This->lpLcl; - newThis->lpLink = This; - *obj = &newThis->lpVtbl; - Main_DirectDraw_AddRef((LPDIRECTDRAW7)newThis); + *obj = This; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); } } else if (IsEqualGUID(&IID_IDirectDraw2, id)) { - LPDDRAWI_DIRECTDRAW_INT newThis; - DxHeapMemAlloc(newThis, sizeof(DDRAWI_DIRECTDRAW_INT)); - - if (newThis == NULL) - { - retVal = DDERR_OUTOFMEMORY; + if (This->lpVtbl != &DirectDraw2_Vtable) + { + LPDDRAWI_DIRECTDRAW_INT newThis; + DxHeapMemAlloc(newThis, sizeof(DDRAWI_DIRECTDRAW_INT)); + + if (newThis == NULL) + { + retVal = DDERR_OUTOFMEMORY; + } + else + { + /* DirectDraw4 Vtable */ + newThis->lpVtbl = &DirectDraw2_Vtable; + newThis->lpLcl = This->lpLcl; + newThis->lpLink = This; + *obj = &newThis->lpVtbl; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)newThis); + } } else { - /* DirectDraw4 Vtable */ - newThis->lpVtbl = &DirectDraw2_Vtable; - newThis->lpLcl = This->lpLcl; - newThis->lpLink = This; - *obj = &newThis->lpVtbl; - Main_DirectDraw_AddRef((LPDIRECTDRAW7)newThis); + *obj = This; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); } } else if (IsEqualGUID(&IID_IDirectDraw, id)) { - LPDDRAWI_DIRECTDRAW_INT newThis; - DxHeapMemAlloc(newThis, sizeof(DDRAWI_DIRECTDRAW_INT)); - - if (newThis == NULL) - { - retVal = DDERR_OUTOFMEMORY; + if (This->lpVtbl != &DirectDraw_Vtable) + { + LPDDRAWI_DIRECTDRAW_INT newThis; + DxHeapMemAlloc(newThis, sizeof(DDRAWI_DIRECTDRAW_INT)); + + if (newThis == NULL) + { + retVal = DDERR_OUTOFMEMORY; + } + else + { + /* DirectDraw4 Vtable */ + newThis->lpVtbl = &DirectDraw_Vtable; + newThis->lpLcl = This->lpLcl; + newThis->lpLink = This; + *obj = &newThis->lpVtbl; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)newThis); + } } else { - /* DirectDraw4 Vtable */ - newThis->lpVtbl = &DirectDraw_Vtable; - newThis->lpLcl = This->lpLcl; - newThis->lpLink = This; - *obj = &newThis->lpVtbl; - Main_DirectDraw_AddRef((LPDIRECTDRAW7)newThis); + *obj = This; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); } } else

1 0

[greatlrd] 27209: forget using addref in DirectDraw_QueryInterface, more werid bugs in ref
by greatlrd＠svn.reactos.org 16 Jun '07

16 Jun '07

Author: greatlrd Date: Sun Jun 17 00:04:01 2007 New Revision: 27209 URL: http://svn.reactos.org/svn/reactos?rev=27209&view=rev Log: forget using addref in DirectDraw_QueryInterface, more werid bugs in ref 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 Sun Jun 17 00:04:01 2007 @@ -51,9 +51,9 @@ /* DirectDraw7 Vtable */ newThis->lpVtbl = &DirectDraw7_Vtable; newThis->lpLcl = This->lpLcl; - newThis->dwIntRefCnt = 1; newThis->lpLink = This; *obj = &newThis->lpVtbl; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)newThis); } } else if (IsEqualGUID(&IID_IDirectDraw4, id)) @@ -70,9 +70,9 @@ /* DirectDraw4 Vtable */ newThis->lpVtbl = &DirectDraw4_Vtable; newThis->lpLcl = This->lpLcl; - newThis->dwIntRefCnt = 1; newThis->lpLink = This; *obj = &newThis->lpVtbl; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)newThis); } } else if (IsEqualGUID(&IID_IDirectDraw2, id)) @@ -89,9 +89,9 @@ /* DirectDraw4 Vtable */ newThis->lpVtbl = &DirectDraw2_Vtable; newThis->lpLcl = This->lpLcl; - newThis->dwIntRefCnt = 1; newThis->lpLink = This; *obj = &newThis->lpVtbl; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)newThis); } } else if (IsEqualGUID(&IID_IDirectDraw, id)) @@ -108,9 +108,9 @@ /* DirectDraw4 Vtable */ newThis->lpVtbl = &DirectDraw_Vtable; newThis->lpLcl = This->lpLcl; - newThis->dwIntRefCnt = 1; newThis->lpLink = This; *obj = &newThis->lpVtbl; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)newThis); } } else

1 0

[greatlrd] 27208: fixing couple of bugs in Main_DirectDraw_QueryInterface 1. adding create linking when u req a new directdraw interface from old one. This Type of linking is exacly same lcl pointer as the linked interface, it mean we shall not create new lcl but use the current we got. waring still bugs in DirectDraw_QueryInterface
by greatlrd＠svn.reactos.org 16 Jun '07

16 Jun '07

Author: greatlrd Date: Sat Jun 16 23:38:20 2007 New Revision: 27208 URL: http://svn.reactos.org/svn/reactos?rev=27208&view=rev Log: fixing couple of bugs in Main_DirectDraw_QueryInterface 1. adding create linking when u req a new directdraw interface from old one. This Type of linking is exacly same lcl pointer as the linked interface, it mean we shall not create new lcl but use the current we got. waring still bugs in DirectDraw_QueryInterface 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 Jun 16 23:38:20 2007 @@ -39,44 +39,79 @@ */ if (IsEqualGUID(&IID_IDirectDraw7, id)) { - /* FIXME linking */ - - /* DirectDraw7 Vtable */ - This->lpVtbl = &DirectDraw7_Vtable; - This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags + DDRAWILCL_DIRECTDRAW7; - *obj = &This->lpVtbl; - Main_DirectDraw_AddRef(iface); + LPDDRAWI_DIRECTDRAW_INT newThis; + DxHeapMemAlloc(newThis, sizeof(DDRAWI_DIRECTDRAW_INT)); + + if (newThis == NULL) + { + retVal = DDERR_OUTOFMEMORY; + } + else + { + /* DirectDraw7 Vtable */ + newThis->lpVtbl = &DirectDraw7_Vtable; + newThis->lpLcl = This->lpLcl; + newThis->dwIntRefCnt = 1; + newThis->lpLink = This; + *obj = &newThis->lpVtbl; + } } else if (IsEqualGUID(&IID_IDirectDraw4, id)) { - /* FIXME linking */ - - /* DirectDraw4 Vtable */ - This->lpVtbl = &DirectDraw4_Vtable; - This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags; - *obj = &This->lpVtbl; - Main_DirectDraw_AddRef(iface); + LPDDRAWI_DIRECTDRAW_INT newThis; + DxHeapMemAlloc(newThis, sizeof(DDRAWI_DIRECTDRAW_INT)); + + if (newThis == NULL) + { + retVal = DDERR_OUTOFMEMORY; + } + else + { + /* DirectDraw4 Vtable */ + newThis->lpVtbl = &DirectDraw4_Vtable; + newThis->lpLcl = This->lpLcl; + newThis->dwIntRefCnt = 1; + newThis->lpLink = This; + *obj = &newThis->lpVtbl; + } } else if (IsEqualGUID(&IID_IDirectDraw2, id)) { - /* FIXME linking */ - - - /* DirectDraw4 Vtable */ - This->lpVtbl = &DirectDraw2_Vtable; - This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags; - *obj = &This->lpVtbl; - Main_DirectDraw_AddRef(iface); + LPDDRAWI_DIRECTDRAW_INT newThis; + DxHeapMemAlloc(newThis, sizeof(DDRAWI_DIRECTDRAW_INT)); + + if (newThis == NULL) + { + retVal = DDERR_OUTOFMEMORY; + } + else + { + /* DirectDraw4 Vtable */ + newThis->lpVtbl = &DirectDraw2_Vtable; + newThis->lpLcl = This->lpLcl; + newThis->dwIntRefCnt = 1; + newThis->lpLink = This; + *obj = &newThis->lpVtbl; + } } else if (IsEqualGUID(&IID_IDirectDraw, id)) { - /* FIXME linking */ - - /* DirectDraw4 Vtable */ - This->lpVtbl = &DirectDraw_Vtable; - This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags; - *obj = &This->lpVtbl; - Main_DirectDraw_AddRef(iface); + LPDDRAWI_DIRECTDRAW_INT newThis; + DxHeapMemAlloc(newThis, sizeof(DDRAWI_DIRECTDRAW_INT)); + + if (newThis == NULL) + { + retVal = DDERR_OUTOFMEMORY; + } + else + { + /* DirectDraw4 Vtable */ + newThis->lpVtbl = &DirectDraw_Vtable; + newThis->lpLcl = This->lpLcl; + newThis->dwIntRefCnt = 1; + newThis->lpLink = This; + *obj = &newThis->lpVtbl; + } } else {

1 0

[frik85] 27207: RosCMS v3 update: several major improvements (including archive function, and more)
by frik85＠svn.reactos.org 16 Jun '07

16 Jun '07

1 0

[greatlrd] 27206: rewrite lite of Create_DirectDraw and add reenble options.
by greatlrd＠svn.reactos.org 16 Jun '07

16 Jun '07

Author: greatlrd Date: Sat Jun 16 22:18:04 2007 New Revision: 27206 URL: http://svn.reactos.org/svn/reactos?rev=27206&view=rev Log: rewrite lite of Create_DirectDraw and add reenble options. Modified: trunk/reactos/dll/directx/ddraw/main.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Sat Jun 16 22:18:04 2007 @@ -53,7 +53,7 @@ } else { - retVal = Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, &IID_IDirectDraw, TRUE); + retVal = Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, &IID_IDirectDraw, FALSE); } } _SEH_HANDLE @@ -97,7 +97,7 @@ } else { - retVal = Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, id, TRUE); + retVal = Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, id, FALSE); } /* Create our DirectDraw interface */ Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Sat Jun 16 22:18:04 2007 @@ -20,7 +20,7 @@ HRESULT WINAPI Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, - REFIID id, BOOL ex) + REFIID id, BOOL reenable) { LPDDRAWI_DIRECTDRAW_INT This; @@ -101,7 +101,39 @@ *pIface = (LPDIRECTDRAW)This; /* Get right interface we whant */ - if (Main_DirectDraw_QueryInterface((LPDIRECTDRAW7)This, id, (void**)&pIface) == DD_OK) + + This->lpVtbl = 0; + if (IsEqualGUID(&IID_IDirectDraw7, id)) + { + /* DirectDraw7 Vtable */ + This->lpVtbl = &DirectDraw7_Vtable; + This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags + DDRAWILCL_DIRECTDRAW7; + *pIface = (LPDIRECTDRAW)&This->lpVtbl; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); + } + else if (IsEqualGUID(&IID_IDirectDraw4, id)) + { + /* DirectDraw4 Vtable */ + This->lpVtbl = &DirectDraw4_Vtable; + *pIface = (LPDIRECTDRAW)&This->lpVtbl; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); + } + else if (IsEqualGUID(&IID_IDirectDraw2, id)) + { + /* DirectDraw2 Vtable */ + This->lpVtbl = &DirectDraw2_Vtable; + *pIface = (LPDIRECTDRAW)&This->lpVtbl; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); + } + else if (IsEqualGUID(&IID_IDirectDraw, id)) + { + /* DirectDraw4 Vtable */ + This->lpVtbl = &DirectDraw_Vtable; + *pIface = (LPDIRECTDRAW)&This->lpVtbl; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); + } + + if ( This->lpVtbl != 0) { DX_STUB_str("Got iface\n");

1 0

[greatlrd] 27205: adding allot of fix and partly implement 1. Adding table lockup for directdraw 1-6 but they are not complete 2. remove out GetDevicreIdentifer to own file it is a large functions 3. Fixed DirectDrawCreate works now 4. found out bit more how DirectDraw_QueryInterface works and comment the new found 5. add the new table to QueryInterface they are partly support now, the new IID is IID_IDirectDraw4, IID_IDirectDraw2 and IID_IDirectDraw it partly support now.
by greatlrd＠svn.reactos.org 16 Jun '07

16 Jun '07

Author: greatlrd Date: Sat Jun 16 20:42:50 2007 New Revision: 27205 URL: http://svn.reactos.org/svn/reactos?rev=27205&view=rev Log: adding allot of fix and partly implement 1. Adding table lockup for directdraw 1-6 but they are not complete 2. remove out GetDevicreIdentifer to own file it is a large functions 3. Fixed DirectDrawCreate works now 4. found out bit more how DirectDraw_QueryInterface works and comment the new found 5. add the new table to QueryInterface they are partly support now, the new IID is IID_IDirectDraw4, IID_IDirectDraw2 and IID_IDirectDraw it partly support now. Added: trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c (with props) Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/main.c Added: trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c (added) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c Sat Jun 16 20:42:50 2007 @@ -1,0 +1,190 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS DirectX + * FILE: ddraw/ddraw/GetDeviceIdentifier.c + * PURPOSE: IDirectDraw7 Implementation + * PROGRAMMER: Magnus Olsen + * + */ + +/* TODO + * We need adding digtial signarture detections for the drivers + * and count out which level the signtature driver got, the value + * shall be save to pDDDI->dwWHQLLevel, But I do not known how todo + * this part yet, That is only missing feature in this functions + * + * Write a UML digram for this api + */ + +#include "rosdraw.h" + +#include <string.h> + +/* PSEH for SEH Support */ +#include <pseh/pseh.h> +/* For DirectDraw 4 - 6 */ +HRESULT WINAPI +Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW4 iface, + LPDDDEVICEIDENTIFIER pDDDI, DWORD dwFlags) +{ + HRESULT retVal = DD_OK; + DDDEVICEIDENTIFIER2 pDDDI2; + + ZeroMemory(&pDDDI2,sizeof(DDDEVICEIDENTIFIER2)); + + _SEH_TRY + { + memcpy(&pDDDI2 , pDDDI, sizeof(DDDEVICEIDENTIFIER)); + + retVal = Main_DirectDraw_GetDeviceIdentifier7((LPDIRECTDRAW7)iface, &pDDDI2, dwFlags); + + if (IsBadWritePtr(pDDDI, sizeof(DDDEVICEIDENTIFIER))) + { + retVal = DDERR_INVALIDPARAMS; + } + else + { + memcpy(pDDDI , &pDDDI2, sizeof(DDDEVICEIDENTIFIER) ); + } + } + _SEH_HANDLE + { + retVal = DD_FALSE; + } + _SEH_END; + + return retVal; +} + +HRESULT WINAPI +Main_DirectDraw_GetDeviceIdentifier7(LPDIRECTDRAW7 iface, + LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) +{ + HRESULT retVal = DDERR_INVALIDPARAMS; + + BOOL found = FALSE; + DWORD iDevNum = 0; + DISPLAY_DEVICEA DisplayDeviceA; + HKEY hKey; + DWORD lpType = 0; + DWORD strSize = MAX_DDDEVICEID_STRING; + char *pdest; + char* pcCnvEnd; + long *lpdata; + + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT) iface; + + DX_WINDBG_trace(); + + _SEH_TRY + { + if ( (IsBadWritePtr( pDDDI, sizeof(DDDEVICEIDENTIFIER2) ) ) || + (dwFlags & ~DDGDI_GETHOSTIDENTIFIER)) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + /* now we can start getting the driver data */ + + while (1) + { + ZeroMemory(&DisplayDeviceA,sizeof(DISPLAY_DEVICEA)); + + DisplayDeviceA.cb = sizeof(DISPLAY_DEVICEA); + + if ( EnumDisplayDevicesA( NULL, iDevNum, &DisplayDeviceA, 0) == 0) + { + retVal = DDERR_INVALIDPARAMS; + break; + } + + if (!_stricmp(DisplayDeviceA.DeviceName, This->lpLcl->lpGbl->cDriverName)) + { + /* if we got another device like hardware mpeg decoder or video card or another drv */ + found = TRUE; + } + else if (DisplayDeviceA.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + /* double check if it primary driver we just found */ + if (!_stricmp( This->lpLcl->lpGbl->cDriverName, "DISPLAY")) + { + /* yeah we found it */ + found = TRUE; + } + } + + if (found == TRUE) + { + /* we found our driver now we start setup it */ + if (!_strnicmp(DisplayDeviceA.DeviceKey,"\\REGISTRY\\Machine\\",18)) + { + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, &DisplayDeviceA.DeviceKey[18], 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS ) + { + + if (RegQueryValueExA(hKey, "InstalledDisplayDrivers",0, &lpType, (LPBYTE)pDDDI->szDriver, &strSize) != ERROR_SUCCESS) + { + ZeroMemory(pDDDI->szDriver,MAX_DDDEVICEID_STRING); + } + else + { + strcat(pDDDI->szDriver,".dll"); + } + RegCloseKey(hKey); + } + + strcpy( pDDDI->szDescription, DisplayDeviceA.DeviceString); + pDDDI->liDriverVersion.HighPart = 0; + pDDDI->liDriverVersion.LowPart = 0; + + pdest = strstr(DisplayDeviceA.DeviceID,"REV_"); + pDDDI->dwRevision = strtol ( &pdest[4], &pcCnvEnd, 16); + + pdest = strstr(DisplayDeviceA.DeviceID,"SUBSYS_"); + pDDDI->dwSubSysId = strtol ( &pdest[7], &pcCnvEnd, 16); + + pdest = strstr(DisplayDeviceA.DeviceID,"DEV_"); + pDDDI->dwDeviceId = strtol ( &pdest[4], &pcCnvEnd, 16); + + pdest = strstr(DisplayDeviceA.DeviceID,"VEN_"); + pDDDI->dwVendorId =strtol ( &pdest[4], &pcCnvEnd, 16); + + /* Count out the guidDeviceIdentifier */ + memcpy(&pDDDI->guidDeviceIdentifier, &CLSID_DirectDraw,sizeof(GUID)); + + pDDDI->guidDeviceIdentifier.Data1 ^= pDDDI->dwVendorId; + + lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data2; + *lpdata ^= pDDDI->dwDeviceId; + + lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4; + *lpdata = (*lpdata ^ pDDDI->dwSubSysId) ^ pDDDI->liDriverVersion.LowPart; + + lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4[4]; + *lpdata = (*lpdata ^ pDDDI->dwRevision) ^ pDDDI->liDriverVersion.HighPart; + + /* FIXME pDDDI->dwWHQLLevel + * we leave this with no informations, I do not known + * if program care for it, I mark this api done, and + * tested, no bugs was found in it + */ + pDDDI->dwWHQLLevel = 0; + retVal = DD_OK; + } + + break; + } + + iDevNum++; + } + + } + _SEH_HANDLE + { + retVal = DD_FALSE; + } + _SEH_END; + + return retVal; +} Propchange: trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision 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 Jun 16 20:42:50 2007 @@ -8,6 +8,11 @@ * */ +/* TODO + * add warper functions for dx 1 - 6 + * map the DirectDraw4_Vtable, DirectDraw2_Vtable, DirectDraw_Vtable + * table to right version of the functions + */ #include "rosdraw.h" @@ -34,9 +39,42 @@ */ if (IsEqualGUID(&IID_IDirectDraw7, id)) { + /* FIXME linking */ + /* DirectDraw7 Vtable */ This->lpVtbl = &DirectDraw7_Vtable; This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags + DDRAWILCL_DIRECTDRAW7; + *obj = &This->lpVtbl; + Main_DirectDraw_AddRef(iface); + } + else if (IsEqualGUID(&IID_IDirectDraw4, id)) + { + /* FIXME linking */ + + /* DirectDraw4 Vtable */ + This->lpVtbl = &DirectDraw4_Vtable; + This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags; + *obj = &This->lpVtbl; + Main_DirectDraw_AddRef(iface); + } + else if (IsEqualGUID(&IID_IDirectDraw2, id)) + { + /* FIXME linking */ + + + /* DirectDraw4 Vtable */ + This->lpVtbl = &DirectDraw2_Vtable; + This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags; + *obj = &This->lpVtbl; + Main_DirectDraw_AddRef(iface); + } + else if (IsEqualGUID(&IID_IDirectDraw, id)) + { + /* FIXME linking */ + + /* DirectDraw4 Vtable */ + This->lpVtbl = &DirectDraw_Vtable; + This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags; *obj = &This->lpVtbl; Main_DirectDraw_AddRef(iface); } @@ -415,171 +453,7 @@ return ret; } -/* For DirectDraw 4 - 6 */ -HRESULT WINAPI -Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW4 iface, - LPDDDEVICEIDENTIFIER pDDDI, DWORD dwFlags) -{ - HRESULT retVal = DD_OK; - DDDEVICEIDENTIFIER2 pDDDI2; - - ZeroMemory(&pDDDI2,sizeof(DDDEVICEIDENTIFIER2)); - - _SEH_TRY - { - memcpy(&pDDDI2 , pDDDI, sizeof(DDDEVICEIDENTIFIER)); - - retVal = Main_DirectDraw_GetDeviceIdentifier7((LPDIRECTDRAW7)iface, &pDDDI2, dwFlags); - - if (IsBadWritePtr(pDDDI, sizeof(DDDEVICEIDENTIFIER))) - { - retVal = DDERR_INVALIDPARAMS; - } - else - { - memcpy(pDDDI , &pDDDI2, sizeof(DDDEVICEIDENTIFIER) ); - } - } - _SEH_HANDLE - { - retVal = DD_FALSE; - } - _SEH_END; - - return retVal; -} - -HRESULT WINAPI -Main_DirectDraw_GetDeviceIdentifier7(LPDIRECTDRAW7 iface, - LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) -{ - HRESULT retVal = DDERR_INVALIDPARAMS; - - BOOL found = FALSE; - DWORD iDevNum = 0; - DISPLAY_DEVICEA DisplayDeviceA; - HKEY hKey; - DWORD lpType = 0; - DWORD strSize = MAX_DDDEVICEID_STRING; - char *pdest; - char* pcCnvEnd; - long *lpdata; - - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT) iface; - - DX_WINDBG_trace(); - - _SEH_TRY - { - if ( (IsBadWritePtr( pDDDI, sizeof(DDDEVICEIDENTIFIER2) ) ) || - (dwFlags & ~DDGDI_GETHOSTIDENTIFIER)) - { - retVal = DDERR_INVALIDPARAMS; - _SEH_LEAVE; - } - - /* now we can start getting the driver data */ - - while (1) - { - ZeroMemory(&DisplayDeviceA,sizeof(DISPLAY_DEVICEA)); - - DisplayDeviceA.cb = sizeof(DISPLAY_DEVICEA); - - if ( EnumDisplayDevicesA( NULL, iDevNum, &DisplayDeviceA, 0) == 0) - { - retVal = DDERR_INVALIDPARAMS; - break; - } - - if (!_stricmp(DisplayDeviceA.DeviceName, This->lpLcl->lpGbl->cDriverName)) - { - /* if we got another device like hardware mpeg decoder or video card or another drv */ - found = TRUE; - } - else if (DisplayDeviceA.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) - { - /* double check if it primary driver we just found */ - if (!_stricmp( This->lpLcl->lpGbl->cDriverName, "DISPLAY")) - { - /* yeah we found it */ - found = TRUE; - } - } - - if (found == TRUE) - { - /* we found our driver now we start setup it */ - if (!_strnicmp(DisplayDeviceA.DeviceKey,"\\REGISTRY\\Machine\\",18)) - { - if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, &DisplayDeviceA.DeviceKey[18], 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS ) - { - - if (RegQueryValueExA(hKey, "InstalledDisplayDrivers",0, &lpType, (LPBYTE)pDDDI->szDriver, &strSize) != ERROR_SUCCESS) - { - ZeroMemory(pDDDI->szDriver,MAX_DDDEVICEID_STRING); - } - else - { - strcat(pDDDI->szDriver,".dll"); - } - RegCloseKey(hKey); - } - - strcpy( pDDDI->szDescription, DisplayDeviceA.DeviceString); - pDDDI->liDriverVersion.HighPart = 0; - pDDDI->liDriverVersion.LowPart = 0; - - pdest = strstr(DisplayDeviceA.DeviceID,"REV_"); - pDDDI->dwRevision = strtol ( &pdest[4], &pcCnvEnd, 16); - - pdest = strstr(DisplayDeviceA.DeviceID,"SUBSYS_"); - pDDDI->dwSubSysId = strtol ( &pdest[7], &pcCnvEnd, 16); - - pdest = strstr(DisplayDeviceA.DeviceID,"DEV_"); - pDDDI->dwDeviceId = strtol ( &pdest[4], &pcCnvEnd, 16); - - pdest = strstr(DisplayDeviceA.DeviceID,"VEN_"); - pDDDI->dwVendorId =strtol ( &pdest[4], &pcCnvEnd, 16); - - /* Count out the guidDeviceIdentifier */ - memcpy(&pDDDI->guidDeviceIdentifier, &CLSID_DirectDraw,sizeof(GUID)); - - pDDDI->guidDeviceIdentifier.Data1 ^= pDDDI->dwVendorId; - - lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data2; - *lpdata ^= pDDDI->dwDeviceId; - - lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4; - *lpdata = (*lpdata ^ pDDDI->dwSubSysId) ^ pDDDI->liDriverVersion.LowPart; - - lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4[4]; - *lpdata = (*lpdata ^ pDDDI->dwRevision) ^ pDDDI->liDriverVersion.HighPart; - - /* FIXME pDDDI->dwWHQLLevel - * we leave this with no informations, I do not known - * if program care for it, I mark this api done, and - * tested, no bugs was found in it - */ - pDDDI->dwWHQLLevel = 0; - retVal = DD_OK; - } - - break; - } - - iDevNum++; - } - - } - _SEH_HANDLE - { - retVal = DD_FALSE; - } - _SEH_END; - - return retVal; -} + /* 5 of 31 DirectDraw7_Vtable api are working simluare to windows */ /* 8 of 31 DirectDraw7_Vtable api are under devloping / testing */ @@ -617,3 +491,94 @@ Main_DirectDraw_StartModeTest, Main_DirectDraw_EvaluateMode }; + + +IDirectDraw4Vtbl DirectDraw4_Vtable = +{ + Main_DirectDraw_QueryInterface, + Main_DirectDraw_AddRef, + Main_DirectDraw_Release, + Main_DirectDraw_Compact, + Main_DirectDraw_CreateClipper, + Main_DirectDraw_CreatePalette, + Main_DirectDraw_CreateSurface4, + Main_DirectDraw_DuplicateSurface, + Main_DirectDraw_EnumDisplayModes, + Main_DirectDraw_EnumSurfaces, + Main_DirectDraw_FlipToGDISurface, + Main_DirectDraw_GetCaps, + Main_DirectDraw_GetDisplayMode, + Main_DirectDraw_GetFourCCCodes, + Main_DirectDraw_GetGDISurface, + Main_DirectDraw_GetMonitorFrequency, + Main_DirectDraw_GetScanLine, + Main_DirectDraw_GetVerticalBlankStatus, + Main_DirectDraw_Initialize, + Main_DirectDraw_RestoreDisplayMode, + Main_DirectDraw_SetCooperativeLevel, + Main_DirectDraw_SetDisplayMode, + Main_DirectDraw_WaitForVerticalBlank, + Main_DirectDraw_GetAvailableVidMem4, + Main_DirectDraw_GetSurfaceFromDC, + Main_DirectDraw_RestoreAllSurfaces, + Main_DirectDraw_TestCooperativeLevel, + Main_DirectDraw_GetDeviceIdentifier +}; + +IDirectDraw2Vtbl DirectDraw2_Vtable = +{ + Main_DirectDraw_QueryInterface, + Main_DirectDraw_AddRef, + Main_DirectDraw_Release, + Main_DirectDraw_Compact, + Main_DirectDraw_CreateClipper, + Main_DirectDraw_CreatePalette, + Main_DirectDraw_CreateSurface, + Main_DirectDraw_DuplicateSurface, + Main_DirectDraw_EnumDisplayModes, + Main_DirectDraw_EnumSurfaces, + Main_DirectDraw_FlipToGDISurface, + Main_DirectDraw_GetCaps, + Main_DirectDraw_GetDisplayMode, + Main_DirectDraw_GetFourCCCodes, + Main_DirectDraw_GetGDISurface, + Main_DirectDraw_GetMonitorFrequency, + Main_DirectDraw_GetScanLine, + Main_DirectDraw_GetVerticalBlankStatus, + Main_DirectDraw_Initialize, + Main_DirectDraw_RestoreDisplayMode, + Main_DirectDraw_SetCooperativeLevel, + Main_DirectDraw_SetDisplayMode, + Main_DirectDraw_WaitForVerticalBlank, + Main_DirectDraw_GetAvailableVidMem +}; + +IDirectDrawVtbl DirectDraw_Vtable = +{ + Main_DirectDraw_QueryInterface, + Main_DirectDraw_AddRef, + Main_DirectDraw_Release, + Main_DirectDraw_Compact, + Main_DirectDraw_CreateClipper, + Main_DirectDraw_CreatePalette, + Main_DirectDraw_CreateSurface, + Main_DirectDraw_DuplicateSurface, + Main_DirectDraw_EnumDisplayModes, + Main_DirectDraw_EnumSurfaces, + Main_DirectDraw_FlipToGDISurface, + Main_DirectDraw_GetCaps, + Main_DirectDraw_GetDisplayMode, + Main_DirectDraw_GetFourCCCodes, + Main_DirectDraw_GetGDISurface, + Main_DirectDraw_GetMonitorFrequency, + Main_DirectDraw_GetScanLine, + Main_DirectDraw_GetVerticalBlankStatus, + Main_DirectDraw_Initialize, + Main_DirectDraw_RestoreDisplayMode, + Main_DirectDraw_SetCooperativeLevel, + Main_DirectDraw_SetDisplayMode, + Main_DirectDraw_WaitForVerticalBlank +}; + + + 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 Jun 16 20:42:50 2007 @@ -45,6 +45,18 @@ return This->dwIntRefCnt; } + +HRESULT WINAPI +Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7 iface, REFIID riid, + LPVOID* ppObj) +{ + DX_WINDBG_trace(); + + DX_STUB_str("Unimplement\n"); + + return E_NOINTERFACE; +} + ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7 iface) @@ -670,7 +682,7 @@ { /*** IUnknown ***/ Main_DDrawSurface_QueryInterface, - Main_DDrawSurface_AddRef, + Main_DDrawSurface_AddRef, /* (Compact done) */ Main_DDrawSurface_Release, /*** IDirectDrawSurface ***/ Main_DDrawSurface_AddAttachedSurface, 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 Jun 16 20:42:50 2007 @@ -10,16 +10,7 @@ #include "rosdraw.h" -HRESULT WINAPI -Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7 iface, REFIID riid, - LPVOID* ppObj) -{ - DX_WINDBG_trace(); - - DX_STUB_str("Unimplement\n"); - - return E_NOINTERFACE; -} + /* MSDN: "not currently implemented." */ 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 Jun 16 20:42:50 2007 @@ -27,6 +27,7 @@ <file>ddraw_main.c</file> <file>ddraw_displaymode.c</file> <file>ddraw_setcooperativelevel.c</file> + <file>GetDeviceIdentifier.c</file> <file>ddraw_stubs.c</file> <file>callbacks_dd_hel.c</file> </directory> Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Sat Jun 16 20:42:50 2007 @@ -37,13 +37,31 @@ LPDIRECTDRAW* lplpDD, LPUNKNOWN pUnkOuter) { + HRESULT retVal = DDERR_GENERIC; /* remove this when UML digram are in place this api is finish and is working as it should */ DX_WINDBG_trace(); - return DirectDrawCreateEx(lpGUID, (LPVOID*)lplpDD, &IID_IDirectDraw2, pUnkOuter); + _SEH_TRY + { + /* check see if pUnkOuter is null or not */ + if (pUnkOuter) + { + retVal = CLASS_E_NOAGGREGATION; + } + else + { + retVal = Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, &IID_IDirectDraw, TRUE); + } + } + _SEH_HANDLE + { + } + _SEH_END; + + return retVal; } /*

1 0

[fireball] 27204: - Fix a typo.
by fireball＠svn.reactos.org 16 Jun '07

16 Jun '07

Author: fireball Date: Sat Jun 16 16:48:04 2007 New Revision: 27204 URL: http://svn.reactos.org/svn/reactos?rev=27204&view=rev Log: - Fix a typo. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s Sat Jun 16 16:48:04 2007 @@ -9,6 +9,7 @@ .globl _atan .globl _cos .globl _sin +.globl _tan .intel_syntax noprefix

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