| Index: ddraw/glDirectDraw.cpp |
| — | — | @@ -343,7 +343,7 @@ |
| 344 | 344 | else return 0;
|
| 345 | 345 | }
|
| 346 | 346 |
|
| 347 | | -HRESULT EnumDisplayModes(DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback)
|
| | 347 | +HRESULT EnumDisplayModes1(DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback)
|
| 348 | 348 | {
|
| 349 | 349 | if(!lpEnumModesCallback) return DDERR_INVALIDPARAMS;
|
| 350 | 350 | if (dwFlags & 0xFFFFFFFC) return DDERR_INVALIDPARAMS;
|
| — | — | @@ -457,7 +457,7 @@ |
| 458 | 458 | free(modes);
|
| 459 | 459 | return DD_OK;
|
| 460 | 460 | }
|
| 461 | | -HRESULT EnumDisplayModes(DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback)
|
| | 461 | +HRESULT EnumDisplayModes2(DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback)
|
| 462 | 462 | {
|
| 463 | 463 | bool match;
|
| 464 | 464 | DWORD modenum = 0;
|
| — | — | @@ -1009,7 +1009,7 @@ |
| 1010 | 1010 | TRACE_ENTER(5,14,this,9,dwFlags,14,lpDDSurfaceDesc2,14,lpContext,14,lpEnumModesCallback);
|
| 1011 | 1011 | if(!this) TRACE_RET(HRESULT,23,DDERR_INVALIDOBJECT);
|
| 1012 | 1012 | if(!lpEnumModesCallback) TRACE_RET(HRESULT,23,DDERR_INVALIDPARAMS);
|
| 1013 | | - HRESULT ret = ::EnumDisplayModes(dwFlags,lpDDSurfaceDesc2,lpContext,lpEnumModesCallback);
|
| | 1013 | + HRESULT ret = EnumDisplayModes2(dwFlags,lpDDSurfaceDesc2,lpContext,lpEnumModesCallback);
|
| 1014 | 1014 | TRACE_EXIT(23,ret);
|
| 1015 | 1015 | return ret;
|
| 1016 | 1016 | }
|
| — | — | @@ -2141,7 +2141,7 @@ |
| 2142 | 2142 | {
|
| 2143 | 2143 | TRACE_ENTER(5,14,this,9,dwFlags,14,lpDDSurfaceDesc,14,lpContext,14,lpEnumModesCallback);
|
| 2144 | 2144 | if(!this) TRACE_RET(HRESULT,23,DDERR_INVALIDOBJECT);
|
| 2145 | | - TRACE_RET(HRESULT,23,::EnumDisplayModes(dwFlags,lpDDSurfaceDesc,lpContext,lpEnumModesCallback));
|
| | 2145 | + TRACE_RET(HRESULT,23,EnumDisplayModes1(dwFlags,lpDDSurfaceDesc,lpContext,lpEnumModesCallback));
|
| 2146 | 2146 | }
|
| 2147 | 2147 | HRESULT WINAPI glDirectDraw1::EnumSurfaces(DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback)
|
| 2148 | 2148 | {
|
| — | — | @@ -2342,7 +2342,7 @@ |
| 2343 | 2343 | {
|
| 2344 | 2344 | TRACE_ENTER(5,14,this,9,dwFlags,14,lpDDSurfaceDesc,14,lpContext,14,lpEnumModesCallback);
|
| 2345 | 2345 | if(!this) TRACE_RET(HRESULT,23,DDERR_INVALIDOBJECT);
|
| 2346 | | - TRACE_RET(HRESULT,23,::EnumDisplayModes(dwFlags,lpDDSurfaceDesc,lpContext,lpEnumModesCallback));
|
| | 2346 | + TRACE_RET(HRESULT,23,EnumDisplayModes1(dwFlags,lpDDSurfaceDesc,lpContext,lpEnumModesCallback));
|
| 2347 | 2347 | }
|
| 2348 | 2348 | HRESULT WINAPI glDirectDraw2::EnumSurfaces(DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback)
|
| 2349 | 2349 | {
|
| — | — | @@ -2570,7 +2570,7 @@ |
| 2571 | 2571 | {
|
| 2572 | 2572 | TRACE_ENTER(5,14,this,9,dwFlags,14,lpDDSurfaceDesc,14,lpContext,14,lpEnumModesCallback);
|
| 2573 | 2573 | if(!this) TRACE_RET(HRESULT,23,DDERR_INVALIDOBJECT);
|
| 2574 | | - TRACE_RET(HRESULT,23,::EnumDisplayModes(dwFlags,lpDDSurfaceDesc,lpContext,lpEnumModesCallback));
|
| | 2574 | + TRACE_RET(HRESULT,23,EnumDisplayModes2(dwFlags,lpDDSurfaceDesc,lpContext,lpEnumModesCallback));
|
| 2575 | 2575 | }
|
| 2576 | 2576 | HRESULT WINAPI glDirectDraw4::EnumSurfaces(DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpEnumSurfacesCallback)
|
| 2577 | 2577 | {
|