From f249b4f16dbbb6921821a2d5b26d73668473cb00 Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Thu, 22 Nov 2007 19:36:16 +0000 Subject: [PATCH] Implement DirectDrawEnumerateW, DirectDrawEnumerateExW they always return DDERR_UNSUPPORTED svn path=/trunk/; revision=30682 --- reactos/dll/directx/ddraw/main.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/reactos/dll/directx/ddraw/main.c b/reactos/dll/directx/ddraw/main.c index 637a008d77e..e32f935fc64 100644 --- a/reactos/dll/directx/ddraw/main.c +++ b/reactos/dll/directx/ddraw/main.c @@ -204,17 +204,6 @@ DirectDrawEnumerateA( LPDDENUMCALLBACKA lpCallback, return retValue; } - -/* - * UNIMPLEMENT - */ - -HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW lpCallback, - LPVOID lpContext) -{ - DX_STUB; -} - /* * UNIMPLEMENT */ @@ -255,9 +244,13 @@ DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA lpCallback, return DDERR_UNSUPPORTED; } -/* - * UNIMPLEMENT - */ +HRESULT +WINAPI +DirectDrawEnumerateW(LPDDENUMCALLBACKW lpCallback, + LPVOID lpContext) +{ + return DDERR_UNSUPPORTED; +} HRESULT WINAPI @@ -265,10 +258,12 @@ DirectDrawEnumerateExW(LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags) { - /* Note this function are not longer supported in ddraw in windows 2003 */ - DX_STUB; + return DDERR_UNSUPPORTED; } + + + /* See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/ Display_d/hh/Display_d/d3d_21ac30ea-9803-401e-b541-6b08af79653d.xml.asp @@ -376,7 +371,7 @@ D3DParseUnknownCommand( LPVOID lpCmd, (dp2command->bCommand >= D3DDP2OP_LINELIST) ) // dp2command->bCommand >= with 15 to 255 { /* set error code for command 0 to 3, 8 and 15 to 255 */ - retCode = E_FAIL; + retCode = DDERR_INVALIDPARAMS; } else { /* set error code for 4 - 7, 9 - 12, 14 */