Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 30820: - implement Options_RunDLL, Options_RunDLLA, Options_RunDLLW
by janderwald＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: janderwald Date: Tue Nov 27 21:14:06 2007 New Revision: 30820 URL: http://svn.reactos.org/svn/reactos?rev=30820&view=rev Log: - implement Options_RunDLL, Options_RunDLLA, Options_RunDLLW Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shellord.c Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec Tue Nov 27 21:14:06 2007 @@ -205,12 +205,15 @@ 213 stdcall Printers_RegisterWindowW(wstr long ptr ptr) 214 stdcall Printers_UnregisterWindow(long long) 215 stdcall -noname SHStartNetConnectionDialog(long str long) + 255 stdcall Options_RunDLL(ptr ptr str long) 243 stdcall @(long long) shell32_243 244 stdcall -noname SHInitRestricted(ptr ptr) 249 stdcall -noname PathParseIconLocation(ptr) PathParseIconLocationAW 250 stdcall -noname PathRemoveExtension(ptr) PathRemoveExtensionAW 251 stdcall -noname PathRemoveArgs(ptr) PathRemoveArgsAW + 255 stdcall Options_RunDLLA(ptr ptr str long) 256 stdcall @(ptr ptr) SHELL32_256 + 260 stdcall Options_RunDLLW(ptr ptr wstr long) #299 stub Shl1632_ThunkData32 #300 stub Shl3216_ThunkData32 Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c (original) +++ trunk/reactos/dll/win32/shell32/shellord.c Tue Nov 27 21:14:06 2007 @@ -2069,3 +2069,27 @@ return S_OK; } + +/************************************************************************* + * Options_RunDLL (SHELL32.@) + */ +VOID WINAPI Options_RunDLL(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdShow) +{ + + PostMessage(GetShellWindow(), WM_USER+22, StrToIntA(cmd), 0); +} +/************************************************************************* + * Options_RunDLLA (SHELL32.@) + */ +VOID WINAPI Options_RunDLLA(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdShow) +{ + PostMessage(GetShellWindow(), WM_USER+22, StrToIntA(cmd), 0); +} + +/************************************************************************* + * Options_RunDLLW (SHELL32.@) + */ +VOID WINAPI Options_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow) +{ + PostMessage(GetShellWindow(), WM_USER+22, StrToIntW(cmd), 0); +}

1 0

[dreimer] 30819: Fix a typo
by dreimer＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: dreimer Date: Tue Nov 27 19:39:18 2007 New Revision: 30819 URL: http://svn.reactos.org/svn/reactos?rev=30819&view=rev Log: Fix a typo Modified: trunk/reactos/dll/3rdparty/dxtn/dxtn.rbuild Modified: trunk/reactos/dll/3rdparty/dxtn/dxtn.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/dxtn.rbu… ============================================================================== --- trunk/reactos/dll/3rdparty/dxtn/dxtn.rbuild (original) +++ trunk/reactos/dll/3rdparty/dxtn/dxtn.rbuild Tue Nov 27 19:39:18 2007 @@ -1,4 +1,4 @@ -<module name="dxtn" type="win32dll" entrypoint="0" installbase="system32" installname="dxnt.dll" allowwarnings="true"> +<module name="dxtn" type="win32dll" entrypoint="0" installbase="system32" installname="dxtn.dll" allowwarnings="true"> <importlibrary definition="dxtn.def" /> <include base="dxtn">.</include> <define name="__USE_W32API" />

1 0

[fireball] 30818: - Add a reset of a "failure" flag in a successive case. Previous behavior was scary, that once a failure occured, it was always freeing all further entries. - Readd what was removed in 30812. - Herve Poussineaue really did all work on tracing down the problem, spending much time writing debug/check routines, I would not spot this bug without him. See issue #2545 for more details.
by fireball＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: fireball Date: Tue Nov 27 16:27:39 2007 New Revision: 30818 URL: http://svn.reactos.org/svn/reactos?rev=30818&view=rev Log: - Add a reset of a "failure" flag in a successive case. Previous behavior was scary, that once a failure occured, it was always freeing all further entries. - Readd what was removed in 30812. - Herve Poussineaue really did all work on tracing down the problem, spending much time writing debug/check routines, I would not spot this bug without him. See issue #2545 for more details. Modified: trunk/reactos/ntoskrnl/ex/handle.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c (original) +++ trunk/reactos/ntoskrnl/ex/handle.c Tue Nov 27 16:27:39 2007 @@ -1120,8 +1120,12 @@ HandleTableEntry, NewEntry)) { - /* Lock the entry */ + /* Clear failure flag */ + Failed = FALSE; + + /* Lock the entry, increase the handle count */ NewEntry->Value |= EXHANDLE_TABLE_ENTRY_LOCK_BIT; + NewTable->HandleCount++; } else {

1 0

[fireball] 30817: - Display kernelmode source file:line in KeRosDumpStackFrames() too if KDBG is enabled.
by fireball＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: fireball Date: Tue Nov 27 15:51:08 2007 New Revision: 30817 URL: http://svn.reactos.org/svn/reactos?rev=30817&view=rev Log: - Display kernelmode source file:line in KeRosDumpStackFrames() too if KDBG is enabled. Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=3081… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Tue Nov 27 15:51:08 2007 @@ -263,9 +263,14 @@ /* Get the base for this file */ if (KiPcToFileHeader((PVOID)Addr, &LdrEntry, FALSE, &InSystem)) { - /* Print out the module name */ - Addr -= (ULONG_PTR)LdrEntry->DllBase; - DbgPrint("<%wZ: %x>", &LdrEntry->FullDllName, Addr); +#ifdef KDBG + if (!KdbSymPrintAddress((PVOID)Addr)) +#endif + { + /* Print out the module name */ + Addr -= (ULONG_PTR)LdrEntry->DllBase; + DbgPrint("<%wZ: %x>", &LdrEntry->FullDllName, Addr); + } } else if (Addr) {

1 0

[greatlrd] 30816: Updating d3d9 from winehq.org cvs/git date 27/11-2007
by greatlrd＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: greatlrd Date: Tue Nov 27 14:24:22 2007 New Revision: 30816 URL: http://svn.reactos.org/svn/reactos?rev=30816&view=rev Log: Updating d3d9 from winehq.org cvs/git date 27/11-2007 Modified: trunk/reactos/dll/directx/wine/d3d9/device.c Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/device.c (original) +++ trunk/reactos/dll/directx/wine/d3d9/device.c Tue Nov 27 14:24:22 2007 @@ -603,6 +603,7 @@ } } else { WARN("Call to IWineD3DDevice_GetDepthStencilSurface failed\n"); + *ppZStencilSurface = NULL; } LeaveCriticalSection(&d3d9_cs); return hr; @@ -1127,6 +1128,7 @@ if (hr != S_OK) return NULL; hr = IDirect3DDevice9Impl_CreateVertexDeclaration((IDirect3DDevice9 *) This, elements, &pDecl); + HeapFree(GetProcessHeap(), 0, elements); /* CreateVertexDeclaration makes a copy */ if (hr != S_OK) return NULL; if(This->declArraySize == This->numConvertedDecls) {

1 0

[greatlrd] 30815: Updating d3d8 from winehq.org cvs/git date 27/11-2007
by greatlrd＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: greatlrd Date: Tue Nov 27 14:23:43 2007 New Revision: 30815 URL: http://svn.reactos.org/svn/reactos?rev=30815&view=rev Log: Updating d3d8 from winehq.org cvs/git date 27/11-2007 Modified: trunk/reactos/dll/directx/wine/d3d8/device.c Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/device.c (original) +++ trunk/reactos/dll/directx/wine/d3d8/device.c Tue Nov 27 14:23:43 2007 @@ -106,6 +106,7 @@ for(i = 0; i < This->numConvertedDecls; i++) { IWineD3DVertexDeclaration_Release(This->decls[i].decl); } + HeapFree(GetProcessHeap(), 0, This->decls); IWineD3DDevice_Uninit3D(This->WineD3DDevice, D3D8CB_DestroyDepthStencilSurface, D3D8CB_DestroySwapChain); IWineD3DDevice_Release(This->WineD3DDevice);

1 0

[greatlrd] 30814: part 2/2 Updating wined3d from winehq.org cvs/git date 27/11-2007 this update solv allot of bugs in wined3d ------------------------------------------ Include one ReactOS specify hack. do not use gdi32.dll use opengl32.dll instead.
by greatlrd＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: greatlrd Date: Tue Nov 27 14:16:57 2007 New Revision: 30814 URL: http://svn.reactos.org/svn/reactos?rev=30814&view=rev Log: part 2/2 Updating wined3d from winehq.org cvs/git date 27/11-2007 this update solv allot of bugs in wined3d ------------------------------------------ Include one ReactOS specify hack. do not use gdi32.dll use opengl32.dll instead. Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/baseshader.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cubetexture.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/pixelshader.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c trunk/reactos/dll/directx/wine/wined3d/vertexshader.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c Tue Nov 27 14:16:57 2007 @@ -468,7 +468,7 @@ break; case WINED3DSPR_CONST: if(param & WINED3DSHADER_ADDRMODE_RELATIVE) { - if(reg - This->rel_offset >= 0) { + if(reg >= This->rel_offset) { sprintf(tmpReg, "C[A0.x + %u]", reg - This->rel_offset); } else { sprintf(tmpReg, "C[A0.x - %u]", -reg + This->rel_offset); @@ -1723,10 +1723,14 @@ if (GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) glDisable(GL_FRAGMENT_PROGRAM_ARB); } +static void shader_arb_destroy(IWineD3DBaseShader *iface) { +} + const shader_backend_t arb_program_shader_backend = { &shader_arb_select, &shader_arb_select_depth_blt, &shader_arb_load_constants, &shader_arb_cleanup, - &shader_arb_color_correction + &shader_arb_color_correction, + &shader_arb_destroy }; Modified: trunk/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/baseshader.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/baseshader.c Tue Nov 27 14:16:57 2007 @@ -447,12 +447,16 @@ else if (WINED3DSPR_MISCTYPE == regtype && reg == 0 && pshader) reg_maps->vpos = 1; - else if(WINED3DSPR_CONST == regtype && !pshader && - param & WINED3DSHADER_ADDRMODE_RELATIVE) { - if(reg <= ((IWineD3DVertexShaderImpl *) This)->min_rel_offset) { - ((IWineD3DVertexShaderImpl *) This)->min_rel_offset = reg; - } else if(reg >= ((IWineD3DVertexShaderImpl *) This)->max_rel_offset) { - ((IWineD3DVertexShaderImpl *) This)->max_rel_offset = reg; + else if(WINED3DSPR_CONST == regtype) { + if(param & WINED3DSHADER_ADDRMODE_RELATIVE) { + if(!pshader) { + if(reg <= ((IWineD3DVertexShaderImpl *) This)->min_rel_offset) { + ((IWineD3DVertexShaderImpl *) This)->min_rel_offset = reg; + } else if(reg >= ((IWineD3DVertexShaderImpl *) This)->max_rel_offset) { + ((IWineD3DVertexShaderImpl *) This)->max_rel_offset = reg; + } + } + reg_maps->usesrelconstF = TRUE; } } } @@ -1058,7 +1062,7 @@ } } -void shader_delete_constant_list( +static void shader_delete_constant_list( struct list* clist) { struct list *ptr; @@ -1076,10 +1080,56 @@ static void shader_none_select_depth_blt(IWineD3DDevice *iface) {} static void shader_none_load_constants(IWineD3DDevice *iface, char usePS, char useVS) {} static void shader_none_cleanup(IWineD3DDevice *iface) {} +static void shader_none_color_correction(SHADER_OPCODE_ARG* arg) {} +static void shader_none_destroy(IWineD3DBaseShader *iface) {} const shader_backend_t none_shader_backend = { &shader_none_select, &shader_none_select_depth_blt, &shader_none_load_constants, - &shader_none_cleanup + &shader_none_cleanup, + &shader_none_color_correction, + &shader_none_destroy }; + +/* ******************************************* + IWineD3DPixelShader IUnknown parts follow + ******************************************* */ +HRESULT WINAPI IWineD3DBaseShaderImpl_QueryInterface(IWineD3DBaseShader *iface, REFIID riid, LPVOID *ppobj) +{ + IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)iface; + TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IWineD3DBase) + || IsEqualGUID(riid, &IID_IWineD3DBaseShader) + || IsEqualGUID(riid, &IID_IWineD3DPixelShader)) { + IUnknown_AddRef(iface); + *ppobj = This; + return S_OK; + } + *ppobj = NULL; + return E_NOINTERFACE; +} + +ULONG WINAPI IWineD3DBaseShaderImpl_AddRef(IWineD3DBaseShader *iface) { + IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; + TRACE("(%p) : AddRef increasing from %d\n", This, This->baseShader.ref); + return InterlockedIncrement(&This->baseShader.ref); +} + +ULONG WINAPI IWineD3DBaseShaderImpl_Release(IWineD3DBaseShader *iface) { + IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)iface; + IWineD3DDeviceImpl *deviceImpl = (IWineD3DDeviceImpl *) This->baseShader.device; + ULONG ref; + TRACE("(%p) : Releasing from %d\n", This, This->baseShader.ref); + ref = InterlockedDecrement(&This->baseShader.ref); + if (ref == 0) { + deviceImpl->shader_backend->shader_destroy(iface); + HeapFree(GetProcessHeap(), 0, This->baseShader.function); + shader_delete_constant_list(&This->baseShader.constantsF); + shader_delete_constant_list(&This->baseShader.constantsB); + shader_delete_constant_list(&This->baseShader.constantsI); + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/context.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/context.c Tue Nov 27 14:16:57 2007 @@ -860,10 +860,17 @@ /* Activate the opengl context */ if(context != This->activeContext) { BOOL ret; - TRACE("Switching gl ctx to %p, hdc=%p ctx=%p\n", context, context->hdc, context->glCtx); - ret = pwglMakeCurrent(context->hdc, context->glCtx); - if(ret == FALSE) { - ERR("Failed to activate the new context\n"); + + /* Prevent an unneeded context switch as those are expensive */ + if(context->glCtx && (context->glCtx == pwglGetCurrentContext())) { + TRACE("Already using gl context %p\n", context->glCtx); + } + else { + TRACE("Switching gl ctx to %p, hdc=%p ctx=%p\n", context, context->hdc, context->glCtx); + ret = pwglMakeCurrent(context->hdc, context->glCtx); + if(ret == FALSE) { + ERR("Failed to activate the new context\n"); + } } This->activeContext = context; } Modified: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/cubetexture.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/cubetexture.c Tue Nov 27 14:16:57 2007 @@ -230,40 +230,8 @@ static void WINAPI IWineD3DCubeTextureImpl_ApplyStateChanges(IWineD3DCubeTexture *iface, const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]) { - IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; - float matrix[16]; + TRACE("(%p) : relay to BaseTexture\n", iface); IWineD3DBaseTextureImpl_ApplyStateChanges((IWineD3DBaseTexture *)iface, textureStates, samplerStates); - - - /* Apply non-power2 mappings and texture offsets so long as the texture coords aren't projected or generated */ - if(This->pow2scalingFactor != 1.0f) { - if((textureStates[WINED3DTSS_TEXCOORDINDEX] & 0xFFFF0000) == WINED3DTSS_TCI_PASSTHRU && - (~textureStates[WINED3DTSS_TEXTURETRANSFORMFLAGS] & WINED3DTTFF_PROJECTED)) { - - glMatrixMode(GL_TEXTURE); - memset(matrix, 0 , sizeof(matrix)); - - matrix[0] = This->pow2scalingFactor; - matrix[5] = This->pow2scalingFactor; - matrix[10] = This->pow2scalingFactor; -#if 0 /* Translation fixup is no longer required (here for reminder) */ - matrix[12] = -0.25f / (float)This->edgeLength; - matrix[13] = -0.75f / (float)This->edgeLength; - matrix[14] = -0.25f / (float)This->edgeLength; -#endif - TRACE("(%p) Setup Matrix:\n", This); - TRACE(" %f %f %f %f\n", matrix[0], matrix[1], matrix[2], matrix[3]); - TRACE(" %f %f %f %f\n", matrix[4], matrix[5], matrix[6], matrix[7]); - TRACE(" %f %f %f %f\n", matrix[8], matrix[9], matrix[10], matrix[11]); - TRACE(" %f %f %f %f\n", matrix[12], matrix[13], matrix[14], matrix[15]); - TRACE("\n"); - glMultMatrixf(matrix); - } else { - /* I don't expect nonpower 2 textures to be used with generated texture coordinates, but if they are present a fixme. */ - FIXME("Non-power2 texture being used with generated texture coords\n"); - } - } - } Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/device.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/device.c Tue Nov 27 14:16:57 2007 @@ -71,8 +71,8 @@ object=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3D##type##Impl)); \ D3DMEMCHECK(object, pp##type); \ object->lpVtbl = &IWineD3D##type##_Vtbl; \ - object->parent = parent; \ - object->ref = 1; \ + object->parent = parent; \ + object->baseShader.ref = 1; \ object->baseShader.device = (IWineD3DDevice*) This; \ list_init(&object->baseShader.linked_programs); \ *pp##type = (IWineD3D##type *) object; \ @@ -179,9 +179,9 @@ /* NOTE: You must release the parent if the object was created via a callback ** ***************************/ - if (This->resources != NULL ) { + if (!list_empty(&This->resources)) { FIXME("(%p) Device released with resources still bound, acceptable but unexpected\n", This); - dumpResources(This->resources); + dumpResources(&This->resources); } if(This->contexts) ERR("Context array not freed!\n"); @@ -880,9 +880,11 @@ /** FIXME: add support for real non-power-two if it's provided by the video card **/ /* Precalculated scaling for 'faked' non power of two texture coords */ - object->pow2scalingFactorX = (((float)Width) / ((float)pow2Width)); - object->pow2scalingFactorY = (((float)Height) / ((float)pow2Height)); - TRACE(" xf(%f) yf(%f)\n", object->pow2scalingFactorX, object->pow2scalingFactorY); + object->baseTexture.pow2Matrix[0] = (((float)Width) / ((float)pow2Width)); + object->baseTexture.pow2Matrix[5] = (((float)Height) / ((float)pow2Height)); + object->baseTexture.pow2Matrix[10] = 1.0; + object->baseTexture.pow2Matrix[15] = 1.0; + TRACE(" xf(%f) yf(%f)\n", object->baseTexture.pow2Matrix[0], object->baseTexture.pow2Matrix[5]); /* Calculate levels for mip mapping */ if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) { @@ -976,6 +978,12 @@ object->height = Height; object->depth = Depth; + /* Is NP2 support for volumes needed? */ + object->baseTexture.pow2Matrix[ 0] = 1.0; + object->baseTexture.pow2Matrix[ 5] = 1.0; + object->baseTexture.pow2Matrix[10] = 1.0; + object->baseTexture.pow2Matrix[15] = 1.0; + /* Calculate levels for mip mapping */ if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) { if(!GL_SUPPORT(SGIS_GENERATE_MIPMAP)) { @@ -1112,7 +1120,10 @@ object->edgeLength = EdgeLength; /* TODO: support for native non-power 2 */ /* Precalculated scaling for 'faked' non power of two texture coords */ - object->pow2scalingFactor = ((float)EdgeLength) / ((float)pow2EdgeLength); + object->baseTexture.pow2Matrix[ 0] = ((float)EdgeLength) / ((float)pow2EdgeLength); + object->baseTexture.pow2Matrix[ 5] = ((float)EdgeLength) / ((float)pow2EdgeLength); + object->baseTexture.pow2Matrix[10] = ((float)EdgeLength) / ((float)pow2EdgeLength); + object->baseTexture.pow2Matrix[15] = 1.0; /* Calculate levels for mip mapping */ if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) { @@ -1578,7 +1589,7 @@ /* Under directX swapchains share the depth stencil, so only create one depth-stencil */ if (pPresentationParameters->EnableAutoDepthStencil && hr == WINED3D_OK) { TRACE("Creating depth stencil buffer\n"); - if (This->depthStencilBuffer == NULL ) { + if (This->auto_depth_stencil_buffer == NULL ) { hr = D3DCB_CreateDepthStencil((IUnknown *) This->parent, parent, object->presentParms.BackBufferWidth, @@ -1587,10 +1598,10 @@ object->presentParms.MultiSampleType, object->presentParms.MultiSampleQuality, FALSE /* FIXME: Discard */, - &This->depthStencilBuffer, + &This->auto_depth_stencil_buffer, NULL /* pShared (always null)*/ ); - if (This->depthStencilBuffer != NULL) - IWineD3DSurface_SetContainer(This->depthStencilBuffer, 0); + if (This->auto_depth_stencil_buffer != NULL) + IWineD3DSurface_SetContainer(This->auto_depth_stencil_buffer, 0); } /** TODO: A check on width, height and multisample types @@ -2054,7 +2065,7 @@ This->lastThread = GetCurrentThreadId(); /* Depth Stencil support */ - This->stencilBufferTarget = This->depthStencilBuffer; + This->stencilBufferTarget = This->auto_depth_stencil_buffer; if (NULL != This->stencilBufferTarget) { IWineD3DSurface_AddRef(This->stencilBufferTarget); } @@ -2206,8 +2217,8 @@ /* Release the buffers (with sanity checks)*/ TRACE("Releasing the depth stencil buffer at %p\n", This->stencilBufferTarget); if(This->stencilBufferTarget != NULL && (IWineD3DSurface_Release(This->stencilBufferTarget) >0)){ - if(This->depthStencilBuffer != This->stencilBufferTarget) - FIXME("(%p) Something's still holding the depthStencilBuffer\n",This); + if(This->auto_depth_stencil_buffer != This->stencilBufferTarget) + FIXME("(%p) Something's still holding the stencilBufferTarget\n",This); } This->stencilBufferTarget = NULL; @@ -2218,11 +2229,11 @@ TRACE("Setting rendertarget to NULL\n"); This->render_targets[0] = NULL; - if (This->depthStencilBuffer) { - if(D3DCB_DestroyDepthStencilSurface(This->depthStencilBuffer) > 0) { - FIXME("(%p) Something's still holding the depthStencilBuffer\n", This); - } - This->depthStencilBuffer = NULL; + if (This->auto_depth_stencil_buffer) { + if(D3DCB_DestroyDepthStencilSurface(This->auto_depth_stencil_buffer) > 0) { + FIXME("(%p) Something's still holding the auto depth stencil buffer\n", This); + } + This->auto_depth_stencil_buffer = NULL; } for(i=0; i < This->NumberOfSwapChains; i++) { @@ -6045,7 +6056,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice* iface, IWineD3DSurface **ppZStencilSurface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - *ppZStencilSurface = This->depthStencilBuffer; + *ppZStencilSurface = This->stencilBufferTarget; TRACE("(%p) : zStencilSurface returning %p\n", This, *ppZStencilSurface); if(*ppZStencilSurface != NULL) { @@ -6387,7 +6398,7 @@ HRESULT hr = WINED3D_OK; IWineD3DSurface *tmp; - TRACE("(%p) Swapping z-buffer\n",This); + TRACE("(%p) Swapping z-buffer. Old = %p, new = %p\n",This, This->stencilBufferTarget, pNewZStencil); if (pNewZStencil == This->stencilBufferTarget) { TRACE("Trying to do a NOP SetRenderTarget operation\n"); @@ -6611,18 +6622,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_TestCooperativeLevel(IWineD3DDevice* iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + IWineD3DResourceImpl *resource; TRACE("(%p) : state (%u)\n", This, This->state); + /* TODO: Implement wrapping of the WndProc so that mimimize and maxamise can be monitored and the states adjusted. */ switch (This->state) { case WINED3D_OK: return WINED3D_OK; case WINED3DERR_DEVICELOST: { - ResourceList *resourceList = This->resources; - while (NULL != resourceList) { - if (((IWineD3DResourceImpl *)resourceList->resource)->resource.pool == WINED3DPOOL_DEFAULT /* TODO: IWineD3DResource_GetPool(resourceList->resource)*/) - return WINED3DERR_DEVICENOTRESET; - resourceList = resourceList->next; + LIST_FOR_EACH_ENTRY(resource, &This->resources, IWineD3DResourceImpl, resource.resource_list_entry) { + if (resource->resource.pool == WINED3DPOOL_DEFAULT) + return WINED3DERR_DEVICENOTRESET; } return WINED3DERR_DEVICELOST; } @@ -6865,51 +6876,17 @@ *****************************************************/ static void WINAPI IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3DResource *resource){ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - ResourceList* resourceList; - - TRACE("(%p) : resource %p\n", This, resource); - /* add a new texture to the frot of the linked list */ - resourceList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ResourceList)); - resourceList->resource = resource; - - /* Get the old head */ - resourceList->next = This->resources; - - This->resources = resourceList; - TRACE("Added resource %p with element %p pointing to %p\n", resource, resourceList, resourceList->next); - - return; + + TRACE("(%p) : Adding Resource %p\n", This, resource); + list_add_head(&This->resources, &((IWineD3DResourceImpl *) resource)->resource.resource_list_entry); } static void WINAPI IWineD3DDeviceImpl_RemoveResource(IWineD3DDevice *iface, IWineD3DResource *resource){ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - ResourceList* resourceList = NULL; - ResourceList* previousResourceList = NULL; - - TRACE("(%p) : resource %p\n", This, resource); - - resourceList = This->resources; - - while (resourceList != NULL) { - if(resourceList->resource == resource) break; - previousResourceList = resourceList; - resourceList = resourceList->next; - } - - if (resourceList == NULL) { - FIXME("Attempted to remove resource %p that hasn't been stored\n", resource); - return; - } else { - TRACE("Found resource %p with element %p pointing to %p (previous %p)\n", resourceList->resource, resourceList, resourceList->next, previousResourceList); - } - /* make sure we don't leave a hole in the list */ - if (previousResourceList != NULL) { - previousResourceList->next = resourceList->next; - } else { - This->resources = resourceList->next; - } - - return; + + TRACE("(%p) : Removing resource %p\n", This, resource); + + list_remove(&((IWineD3DResourceImpl *) resource)->resource.resource_list_entry); } Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/directx.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/directx.c Tue Nov 27 14:16:57 2007 @@ -40,89 +40,91 @@ static const struct { const char *extension_string; GL_SupportedExt extension; + DWORD version; } EXTENSION_MAP[] = { /* APPLE */ - {"GL_APPLE_client_storage", APPLE_CLIENT_STORAGE}, - {"GL_APPLE_fence", APPLE_FENCE}, - {"GL_APPLE_flush_render", APPLE_FLUSH_RENDER}, - {"GL_APPLE_ycbcr_422", APPLE_YCBCR_422}, + {"GL_APPLE_client_storage", APPLE_CLIENT_STORAGE, 0 }, + {"GL_APPLE_fence", APPLE_FENCE, 0 }, + {"GL_APPLE_flush_render", APPLE_FLUSH_RENDER, 0 }, + {"GL_APPLE_ycbcr_422", APPLE_YCBCR_422, 0 }, /* ATI */ - {"GL_ATI_separate_stencil", ATI_SEPARATE_STENCIL}, - {"GL_ATI_texture_env_combine3", ATI_TEXTURE_ENV_COMBINE3}, - {"GL_ATI_texture_mirror_once", ATI_TEXTURE_MIRROR_ONCE}, - {"GL_ATI_envmap_bumpmap", ATI_ENVMAP_BUMPMAP}, + {"GL_ATI_separate_stencil", ATI_SEPARATE_STENCIL, 0 }, + {"GL_ATI_texture_env_combine3", ATI_TEXTURE_ENV_COMBINE3, 0 }, + {"GL_ATI_texture_mirror_once", ATI_TEXTURE_MIRROR_ONCE, 0 }, + {"GL_ATI_envmap_bumpmap", ATI_ENVMAP_BUMPMAP, 0 }, /* ARB */ - {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS}, - {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM}, - {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER}, - {"GL_ARB_half_float_pixel", ARB_HALF_FLOAT_PIXEL}, - {"GL_ARB_imaging", ARB_IMAGING}, - {"GL_ARB_multisample", ARB_MULTISAMPLE}, /* needs GLX_ARB_MULTISAMPLE as well */ - {"GL_ARB_multitexture", ARB_MULTITEXTURE}, - {"GL_ARB_occlusion_query", ARB_OCCLUSION_QUERY}, - {"GL_ARB_pixel_buffer_object", ARB_PIXEL_BUFFER_OBJECT}, - {"GL_ARB_point_parameters", ARB_POINT_PARAMETERS}, - {"GL_ARB_point_sprite", ARB_POINT_SPRITE}, - {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP}, - {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION}, - {"GL_ARB_texture_cube_map", ARB_TEXTURE_CUBE_MAP}, - {"GL_ARB_texture_env_add", ARB_TEXTURE_ENV_ADD}, - {"GL_ARB_texture_env_combine", ARB_TEXTURE_ENV_COMBINE}, - {"GL_ARB_texture_env_dot3", ARB_TEXTURE_ENV_DOT3}, - {"GL_ARB_texture_float", ARB_TEXTURE_FLOAT}, - {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT}, - {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO}, - {"GL_ARB_vertex_blend", ARB_VERTEX_BLEND}, - {"GL_ARB_vertex_buffer_object", ARB_VERTEX_BUFFER_OBJECT}, - {"GL_ARB_vertex_program", ARB_VERTEX_PROGRAM}, - {"GL_ARB_vertex_shader", ARB_VERTEX_SHADER}, + {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS, 0 }, + {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM, 0 }, + {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER, 0 }, + {"GL_ARB_half_float_pixel", ARB_HALF_FLOAT_PIXEL, 0 }, + {"GL_ARB_imaging", ARB_IMAGING, 0 }, + {"GL_ARB_multisample", ARB_MULTISAMPLE, 0 }, /* needs GLX_ARB_MULTISAMPLE as well */ + {"GL_ARB_multitexture", ARB_MULTITEXTURE, 0 }, + {"GL_ARB_occlusion_query", ARB_OCCLUSION_QUERY, 0 }, + {"GL_ARB_pixel_buffer_object", ARB_PIXEL_BUFFER_OBJECT, 0 }, + {"GL_ARB_point_parameters", ARB_POINT_PARAMETERS, 0 }, + {"GL_ARB_point_sprite", ARB_POINT_SPRITE, 0 }, + {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP, 0 }, + {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION, 0 }, + {"GL_ARB_texture_cube_map", ARB_TEXTURE_CUBE_MAP, 0 }, + {"GL_ARB_texture_env_add", ARB_TEXTURE_ENV_ADD, 0 }, + {"GL_ARB_texture_env_combine", ARB_TEXTURE_ENV_COMBINE, 0 }, + {"GL_ARB_texture_env_dot3", ARB_TEXTURE_ENV_DOT3, 0 }, + {"GL_ARB_texture_float", ARB_TEXTURE_FLOAT, 0 }, + {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT, 0 }, + {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO, 0 }, + {"GL_ARB_vertex_blend", ARB_VERTEX_BLEND, 0 }, + {"GL_ARB_vertex_buffer_object", ARB_VERTEX_BUFFER_OBJECT, 0 }, + {"GL_ARB_vertex_program", ARB_VERTEX_PROGRAM, 0 }, + {"GL_ARB_vertex_shader", ARB_VERTEX_SHADER, 0 }, + {"GL_ARB_shader_objects", ARB_SHADER_OBJECTS, 0 }, /* EXT */ - {"GL_EXT_blend_minmax", EXT_BLEND_MINMAX}, - {"GL_EXT_fog_coord", EXT_FOG_COORD}, - {"GL_EXT_framebuffer_blit", EXT_FRAMEBUFFER_BLIT}, - {"GL_EXT_framebuffer_object", EXT_FRAMEBUFFER_OBJECT}, - {"GL_EXT_paletted_texture", EXT_PALETTED_TEXTURE}, - {"GL_EXT_point_parameters", EXT_POINT_PARAMETERS}, - {"GL_EXT_secondary_color", EXT_SECONDARY_COLOR}, - {"GL_EXT_stencil_two_side", EXT_STENCIL_TWO_SIDE}, - {"GL_EXT_stencil_wrap", EXT_STENCIL_WRAP}, - {"GL_EXT_texture3D", EXT_TEXTURE3D}, - {"GL_EXT_texture_compression_s3tc", EXT_TEXTURE_COMPRESSION_S3TC}, - {"GL_EXT_texture_env_add", EXT_TEXTURE_ENV_ADD}, - {"GL_EXT_texture_env_combine", EXT_TEXTURE_ENV_COMBINE}, - {"GL_EXT_texture_env_dot3", EXT_TEXTURE_ENV_DOT3}, - {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB}, - {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC}, - {"GL_EXT_texture_lod", EXT_TEXTURE_LOD}, - {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS}, - {"GL_EXT_vertex_shader", EXT_VERTEX_SHADER}, - {"GL_EXT_vertex_weighting", EXT_VERTEX_WEIGHTING}, + {"GL_EXT_blend_minmax", EXT_BLEND_MINMAX, 0 }, + {"GL_EXT_fog_coord", EXT_FOG_COORD, 0 }, + {"GL_EXT_framebuffer_blit", EXT_FRAMEBUFFER_BLIT, 0 }, + {"GL_EXT_framebuffer_object", EXT_FRAMEBUFFER_OBJECT, 0 }, + {"GL_EXT_paletted_texture", EXT_PALETTED_TEXTURE, 0 }, + {"GL_EXT_point_parameters", EXT_POINT_PARAMETERS, 0 }, + {"GL_EXT_secondary_color", EXT_SECONDARY_COLOR, 0 }, + {"GL_EXT_stencil_two_side", EXT_STENCIL_TWO_SIDE, 0 }, + {"GL_EXT_stencil_wrap", EXT_STENCIL_WRAP, 0 }, + {"GL_EXT_texture3D", EXT_TEXTURE3D, MAKEDWORD_VERSION(1, 2) }, + {"GL_EXT_texture_compression_s3tc", EXT_TEXTURE_COMPRESSION_S3TC, 0 }, + {"GL_EXT_texture_env_add", EXT_TEXTURE_ENV_ADD, 0 }, + {"GL_EXT_texture_env_combine", EXT_TEXTURE_ENV_COMBINE, 0 }, + {"GL_EXT_texture_env_dot3", EXT_TEXTURE_ENV_DOT3, 0 }, + {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB, 0 }, + {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC, 0 }, + {"GL_EXT_texture_lod", EXT_TEXTURE_LOD, 0 }, + {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS, 0 }, + {"GL_EXT_vertex_shader", EXT_VERTEX_SHADER, 0 }, + {"GL_EXT_vertex_weighting", EXT_VERTEX_WEIGHTING, 0 }, /* NV */ - {"GL_NV_half_float", NV_HALF_FLOAT}, - {"GL_NV_fence", NV_FENCE}, - {"GL_NV_fog_distance", NV_FOG_DISTANCE}, - {"GL_NV_fragment_program", NV_FRAGMENT_PROGRAM}, - {"GL_NV_fragment_program2", NV_FRAGMENT_PROGRAM2}, - {"GL_NV_register_combiners", NV_REGISTER_COMBINERS}, - {"GL_NV_register_combiners2", NV_REGISTER_COMBINERS2}, - {"GL_NV_texgen_reflection", NV_TEXGEN_REFLECTION}, - {"GL_NV_texture_env_combine4", NV_TEXTURE_ENV_COMBINE4}, - {"GL_NV_texture_shader", NV_TEXTURE_SHADER}, - {"GL_NV_texture_shader2", NV_TEXTURE_SHADER2}, - {"GL_NV_texture_shader3", NV_TEXTURE_SHADER3}, - {"GL_NV_occlusion_query", NV_OCCLUSION_QUERY}, - {"GL_NV_vertex_program", NV_VERTEX_PROGRAM}, - {"GL_NV_vertex_program1_1", NV_VERTEX_PROGRAM1_1}, - {"GL_NV_vertex_program2", NV_VERTEX_PROGRAM2}, - {"GL_NV_vertex_program3", NV_VERTEX_PROGRAM3}, - {"GL_NV_depth_clamp", NV_DEPTH_CLAMP}, + {"GL_NV_half_float", NV_HALF_FLOAT, 0 }, + {"GL_NV_fence", NV_FENCE, 0 }, + {"GL_NV_fog_distance", NV_FOG_DISTANCE, 0 }, + {"GL_NV_fragment_program", NV_FRAGMENT_PROGRAM, 0 }, + {"GL_NV_fragment_program2", NV_FRAGMENT_PROGRAM2, 0 }, + {"GL_NV_register_combiners", NV_REGISTER_COMBINERS, 0 }, + {"GL_NV_register_combiners2", NV_REGISTER_COMBINERS2, 0 }, + {"GL_NV_texgen_reflection", NV_TEXGEN_REFLECTION, 0 }, + {"GL_NV_texture_env_combine4", NV_TEXTURE_ENV_COMBINE4, 0 }, + {"GL_NV_texture_shader", NV_TEXTURE_SHADER, 0 }, + {"GL_NV_texture_shader2", NV_TEXTURE_SHADER2, 0 }, + {"GL_NV_texture_shader3", NV_TEXTURE_SHADER3, 0 }, + {"GL_NV_occlusion_query", NV_OCCLUSION_QUERY, 0 }, + {"GL_NV_vertex_program", NV_VERTEX_PROGRAM, 0 }, + {"GL_NV_vertex_program1_1", NV_VERTEX_PROGRAM1_1, 0 }, + {"GL_NV_vertex_program2", NV_VERTEX_PROGRAM2, 0 }, + {"GL_NV_vertex_program3", NV_VERTEX_PROGRAM3, 0 }, + {"GL_NV_depth_clamp", NV_DEPTH_CLAMP, 0 }, /* SGI */ - {"GL_SGIS_generate_mipmap", SGIS_GENERATE_MIPMAP}, + {"GL_SGIS_generate_mipmap", SGIS_GENERATE_MIPMAP, 0 }, }; /********************************************************** @@ -439,6 +441,17 @@ checkGLcall("ARB vp offset limit test cleanup\n"); return ret; +} + +static DWORD ver_for_ext(GL_SupportedExt ext) +{ + unsigned int i; + for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) { + if(EXTENSION_MAP[i].extension == ext) { + return EXTENSION_MAP[i].version; + } + } + return 0; } BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { @@ -623,12 +636,6 @@ gl_info->vs_arb_constantsF = 0; gl_info->ps_arb_constantsF = 0; -/* Now work out what GL support this card really has */ -#define USE_GL_FUNC(type, pfn) gl_info->pfn = (type) pwglGetProcAddress(#pfn); - GL_EXT_FUNCS_GEN; - WGL_EXT_FUNCS_GEN; -#undef USE_GL_FUNC - /* Retrieve opengl defaults */ glGetIntegerv(GL_MAX_CLIP_PLANES, &gl_max); gl_info->max_clipplanes = min(WINED3DMAXUSERCLIPPLANES, gl_max); @@ -683,6 +690,31 @@ gl_info->supported[EXTENSION_MAP[i].extension] = TRUE; break; } + } + } + /* Now work out what GL support this card really has */ +#define USE_GL_FUNC(type, pfn, ext, replace) { \ + DWORD ver = ver_for_ext(ext); \ + if(gl_info->supported[ext]) gl_info->pfn = (type) pwglGetProcAddress(#pfn); \ + else if(ver && ver <= gl_info->gl_driver_version) gl_info->pfn = (type) pwglGetProcAddress(#replace); \ + else gl_info->pfn = NULL; \ + } + GL_EXT_FUNCS_GEN; +#undef USE_GL_FUNC + +#define USE_GL_FUNC(type, pfn, ext, replace) gl_info->pfn = (type) pwglGetProcAddress(#pfn); + WGL_EXT_FUNCS_GEN; +#undef USE_GL_FUNC + + /* Now mark all the extensions supported which are included in the opengl core version. Do this *after* + * loading the functions, otherwise the code above will load the extension entry points instead of the + * core functions, which may not work + */ + for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) { + if (gl_info->supported[EXTENSION_MAP[i].extension] == FALSE && + EXTENSION_MAP[i].version <= gl_info->gl_driver_version && EXTENSION_MAP[i].version) { + TRACE_(d3d_caps)(" GL CORE: %s support\n", EXTENSION_MAP[i].extension_string); + gl_info->supported[EXTENSION_MAP[i].extension] = TRUE; } } @@ -726,7 +758,7 @@ if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { GLint tmp; glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &tmp); - gl_info->max_fragment_samplers = min(8, tmp); + gl_info->max_fragment_samplers = min(MAX_FRAGMENT_SAMPLERS, tmp); } else { gl_info->max_fragment_samplers = max(gl_info->max_fragment_samplers, gl_max); } @@ -1070,9 +1102,10 @@ } else if(WINE_D3D7_CAPABLE(gl_info)) { gl_info->gl_card = CARD_ATI_RADEON_7200; /* Radeon 7000/7100/7200/7500 */ vidmem = 32; /* There are models with up to 64MB */ - } else + } else { gl_info->gl_card = CARD_ATI_RAGE_128PRO; vidmem = 16; /* There are 16-32MB models */ + } break; case VENDOR_INTEL: if (strstr(gl_info->gl_renderer, "915GM")) { @@ -2662,6 +2695,7 @@ object->adapter = numAdapters ? &Adapters[Adapter] : NULL; IWineD3D_AddRef(object->wineD3D); object->parent = parent; + list_init(&object->resources); if(This->dxVersion == 7) { object->surface_alignment = 8; @@ -2825,10 +2859,7 @@ #else #define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn); /* To bypass the opengl32 thunks load wglGetProcAddress from gdi32 (glXGetProcAddress wrapper) instead of opengl32's */ - - /* ReactOS hack, we do not have wglGetProcAddress implement in gdi32.dll yet, */ mod_gl = GetModuleHandleA("opengl32.dll"); - #endif } Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/drawprim.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/drawprim.c Tue Nov 27 14:16:57 2007 @@ -630,7 +630,7 @@ static void depth_copy(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DSurfaceImpl *depth_stencil = (IWineD3DSurfaceImpl *)This->depthStencilBuffer; + IWineD3DSurfaceImpl *depth_stencil = (IWineD3DSurfaceImpl *)This->auto_depth_stencil_buffer; /* Only copy the depth buffer if there is one. */ if (!depth_stencil) return; Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c Tue Nov 27 14:16:57 2007 @@ -199,6 +199,11 @@ } checkGLcall("glUniform4fvARB()"); + if(!This->baseShader.load_local_constsF) { + TRACE("No need to load local float constants for this shader\n"); + return; + } + /* Load immediate constants */ if (TRACE_ON(d3d_shader)) { LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { @@ -288,7 +293,7 @@ for (i=0; i<max_constants; ++i) { if (NULL == constants_set || constants_set[i]) { - TRACE_(d3d_constants)("Loading constants %i: %i;\n", i, constants[i*4]); + TRACE_(d3d_constants)("Loading constants %i: %i;\n", i, constants[i]); /* TODO: Benchmark and see if it would be beneficial to store the * locations of the constants to avoid looking up each time */ @@ -296,7 +301,7 @@ tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); if (tmp_loc != -1) { /* We found this uniform name in the program - go ahead and send the data */ - GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, &constants[i*4])); + GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, &constants[i])); checkGLcall("glUniform1ivARB"); } } @@ -464,6 +469,7 @@ IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; int i; unsigned int extra_constants_needed = 0; + local_constant* lconst; /* There are some minor differences between pixel and vertex shaders */ char pshader = shader_is_pshader_version(This->baseShader.hex_version); @@ -527,9 +533,9 @@ extra_constants_needed++; } else { ps_impl->srgb_mode_hardcoded = 1; - shader_addline(buffer, "const vec4 srgb_mul_low = {%f, %f, %f, %f};\n", + shader_addline(buffer, "const vec4 srgb_mul_low = vec4(%f, %f, %f, %f);\n", srgb_mul_low, srgb_mul_low, srgb_mul_low, srgb_mul_low); - shader_addline(buffer, "const vec4 srgb_comparison = {%f, %f, %f, %f};\n", + shader_addline(buffer, "const vec4 srgb_comparison = vec4(%f, %f, %f, %f);\n", srgb_cmp, srgb_cmp, srgb_cmp, srgb_cmp); } } else { @@ -551,7 +557,7 @@ * actually used, only the max limit of the shader version */ FIXME("Cannot find a free uniform for vpos correction params\n"); - shader_addline(buffer, "const vec4 ycorrection = {%f, %f, 0.0, 0.0};\n", + shader_addline(buffer, "const vec4 ycorrection = vec4(%f, %f, 0.0, 0.0);\n", device->render_offscreen ? 0.0 : ((IWineD3DSurfaceImpl *) device->render_targets[0])->currentDesc.Height, device->render_offscreen ? 1.0 : -1.0); } @@ -639,6 +645,15 @@ /* Temporary variables for matrix operations */ shader_addline(buffer, "vec4 tmp0;\n"); shader_addline(buffer, "vec4 tmp1;\n"); + + /* Hardcodeable local constants */ + if(!This->baseShader.load_local_constsF) { + LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { + float *value = (float *) lconst->value; + shader_addline(buffer, "const vec4 LC%u = vec4(%f, %f, %f, %f);\n", lconst->idx, + value[0], value[1], value[2], value[3]); + } + } /* Start the main program */ shader_addline(buffer, "void main() {\n"); @@ -734,6 +749,17 @@ } } +static BOOL constant_is_local(IWineD3DBaseShaderImpl* This, DWORD reg) { + local_constant* lconst; + + if(This->baseShader.load_local_constsF) return FALSE; + LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { + if(lconst->idx == reg) return TRUE; + } + return FALSE; + +} + /** Writes the GLSL variable name that corresponds to the register that the * DX opcode parameter is trying to access */ static void shader_glsl_get_register_name( @@ -819,8 +845,13 @@ } } - } else - sprintf(tmpStr, "%s[%u]", prefix, reg); + } else { + if(constant_is_local(This, reg)) { + sprintf(tmpStr, "LC%u", reg); + } else { + sprintf(tmpStr, "%s[%u]", prefix, reg); + } + } break; } @@ -1532,9 +1563,17 @@ } else { switch(arg->opcode->opcode) { case WINED3DSIO_SLT: - shader_addline(arg->buffer, "step(%s, %s));\n", src0_param.param_str, src1_param.param_str); + /* Step(src0, src1) is not suitable here because if src0 == src1 SLT is supposed, + * to return 0.0 but step returns 1.0 because step is not < x + * An alternative is a bvec compare padded with an unused secound component. + * step(src1 * -1.0, src0 * -1.0) is not an option because it suffers from the same + * issue. Playing with not() is not possible either because not() does not accept + * a scalar. + */ + shader_addline(arg->buffer, "(%s < %s) ? 1.0 : 0.0);\n", src0_param.param_str, src1_param.param_str); break; case WINED3DSIO_SGE: + /* Here we can use the step() function and safe a conditional */ shader_addline(arg->buffer, "step(%s, %s));\n", src1_param.param_str, src0_param.param_str); break; default: @@ -3137,10 +3176,44 @@ GL_EXTCALL(glUseProgramObjectARB(0)); } +static void shader_glsl_destroy(IWineD3DBaseShader *iface) { + struct list *linked_programs; + IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *) iface; + WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *) This->baseShader.device)->adapter->gl_info; + + /* Note: Do not use QueryInterface here to find out which shader type this is because this code + * can be called from IWineD3DBaseShader::Release + */ + char pshader = shader_is_pshader_version(This->baseShader.hex_version); + + if(This->baseShader.prgId == 0) return; + linked_programs = &This->baseShader.linked_programs; + + TRACE("Deleting linked programs\n"); + if (linked_programs->next) { + struct glsl_shader_prog_link *entry, *entry2; + + if(pshader) { + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, struct glsl_shader_prog_link, pshader_entry) { + delete_glsl_program_entry(This->baseShader.device, entry); + } + } else { + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, struct glsl_shader_prog_link, vshader_entry) { + delete_glsl_program_entry(This->baseShader.device, entry); + } + } + } + + TRACE("Deleting shader object %u\n", This->baseShader.prgId); + GL_EXTCALL(glDeleteObjectARB(This->baseShader.prgId)); + checkGLcall("glDeleteObjectARB"); +} + const shader_backend_t glsl_shader_backend = { &shader_glsl_select, &shader_glsl_select_depth_blt, &shader_glsl_load_constants, &shader_glsl_cleanup, - &shader_glsl_color_correction + &shader_glsl_color_correction, + &shader_glsl_destroy }; Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/palette.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/palette.c Tue Nov 27 14:16:57 2007 @@ -107,7 +107,7 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface, DWORD Flags, DWORD Start, DWORD Count, PALETTEENTRY *PalEnt) { IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface; - ResourceList *res; + IWineD3DResourceImpl *res; TRACE("(%p)->(%08x,%d,%d,%p)\n",This,Flags,Start,Count,PalEnt); @@ -134,11 +134,11 @@ /* If the palette is attached to the render target, update all render targets */ - for(res = This->wineD3DDevice->resources; res != NULL; res=res->next) { - if(IWineD3DResource_GetType(res->resource) == WINED3DRTYPE_SURFACE) { - IWineD3DSurfaceImpl *impl = (IWineD3DSurfaceImpl *) res->resource; + LIST_FOR_EACH_ENTRY(res, &This->wineD3DDevice->resources, IWineD3DResourceImpl, resource.resource_list_entry) { + if(IWineD3DResource_GetType((IWineD3DResource *) res) == WINED3DRTYPE_SURFACE) { + IWineD3DSurfaceImpl *impl = (IWineD3DSurfaceImpl *) res; if(impl->palette == This) - IWineD3DSurface_RealizePalette( (IWineD3DSurface *) res->resource); + IWineD3DSurface_RealizePalette((IWineD3DSurface *) res); } } Modified: trunk/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/pixelshader.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/pixelshader.c Tue Nov 27 14:16:57 2007 @@ -42,62 +42,17 @@ #endif #define GLNAME_REQUIRE_GLSL ((const char *)1) -/* ******************************************* - IWineD3DPixelShader IUnknown parts follow - ******************************************* */ -static HRESULT WINAPI IWineD3DPixelShaderImpl_QueryInterface(IWineD3DPixelShader *iface, REFIID riid, LPVOID *ppobj) -{ - IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; - TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IWineD3DBase) - || IsEqualGUID(riid, &IID_IWineD3DBaseShader) - || IsEqualGUID(riid, &IID_IWineD3DPixelShader)) { - IUnknown_AddRef(iface); - *ppobj = This; - return S_OK; - } - *ppobj = NULL; - return E_NOINTERFACE; + +static HRESULT WINAPI IWineD3DPixelShaderImpl_QueryInterface(IWineD3DPixelShader *iface, REFIID riid, LPVOID *ppobj) { + return IWineD3DBaseShaderImpl_QueryInterface((IWineD3DBaseShader *) iface, riid, ppobj); } static ULONG WINAPI IWineD3DPixelShaderImpl_AddRef(IWineD3DPixelShader *iface) { - IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; - TRACE("(%p) : AddRef increasing from %d\n", This, This->ref); - return InterlockedIncrement(&This->ref); -} - -static void destroy_glsl_pshader(IWineD3DPixelShaderImpl *This) { - struct list *linked_programs = &This->baseShader.linked_programs; - - TRACE("Deleting linked programs\n"); - if (linked_programs->next) { - struct glsl_shader_prog_link *entry, *entry2; - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, struct glsl_shader_prog_link, pshader_entry) { - delete_glsl_program_entry(This->baseShader.device, entry); - } - } - - TRACE("Deleting shader object %u\n", This->baseShader.prgId); - GL_EXTCALL(glDeleteObjectARB(This->baseShader.prgId)); - checkGLcall("glDeleteObjectARB"); + return IWineD3DBaseShaderImpl_AddRef((IWineD3DBaseShader *) iface); } static ULONG WINAPI IWineD3DPixelShaderImpl_Release(IWineD3DPixelShader *iface) { - IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; - ULONG ref; - TRACE("(%p) : Releasing from %d\n", This, This->ref); - ref = InterlockedDecrement(&This->ref); - if (ref == 0) { - if (This->baseShader.shader_mode == SHADER_GLSL && This->baseShader.prgId != 0) { - destroy_glsl_pshader(This); - } - shader_delete_constant_list(&This->baseShader.constantsF); - shader_delete_constant_list(&This->baseShader.constantsB); - shader_delete_constant_list(&This->baseShader.constantsI); - HeapFree(GetProcessHeap(), 0, This); - } - return ref; + return IWineD3DBaseShaderImpl_Release((IWineD3DBaseShader *) iface); } /* ******************************************* @@ -586,6 +541,7 @@ } } } + This->baseShader.load_local_constsF = FALSE; This->baseShader.shader_mode = deviceImpl->ps_selected_mode; @@ -675,9 +631,7 @@ This->baseShader.recompile_count++; } - if (This->baseShader.shader_mode == SHADER_GLSL && This->baseShader.prgId != 0) { - destroy_glsl_pshader(This); - } + deviceImpl->shader_backend->shader_destroy((IWineD3DBaseShader *) iface); } /* We don't need to compile */ Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/resource.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/resource.c Tue Nov 27 14:16:57 2007 @@ -248,12 +248,11 @@ return WINED3D_OK; } -void dumpResources(ResourceList *resources) { - ResourceList *iterator = resources; - - while(iterator) { - FIXME("Leftover resource %p with type %d,%s\n", iterator->resource, IWineD3DResource_GetType(iterator->resource), debug_d3dresourcetype(IWineD3DResource_GetType(iterator->resource))); - iterator = iterator->next; +void dumpResources(struct list *list) { + IWineD3DResourceImpl *resource; + + LIST_FOR_EACH_ENTRY(resource, list, IWineD3DResourceImpl, resource.resource_list_entry) { + FIXME("Leftover resource %p with type %d,%s\n", resource, IWineD3DResource_GetType((IWineD3DResource *) resource), debug_d3dresourcetype(IWineD3DResource_GetType((IWineD3DResource *) resource))); } } Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/state.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/state.c Tue Nov 27 14:16:57 2007 @@ -107,6 +107,7 @@ static void state_zenable(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { /* No z test without depth stencil buffers */ if(stateblock->wineD3DDevice->stencilBufferTarget == NULL) { + TRACE("No Z buffer - disabling depth test\n"); glDisable(GL_DEPTH_TEST); /* This also disables z writing in gl */ checkGLcall("glDisable GL_DEPTH_TEST"); return; @@ -1903,6 +1904,7 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD texUnit = state - STATE_TRANSFORM(WINED3DTS_TEXTURE0); DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[texUnit]; + BOOL generated; /* Ignore this when a vertex shader is used, or if the streams aren't sorted out yet */ if(use_vs(stateblock->wineD3DDevice) || @@ -1924,15 +1926,24 @@ WARN("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); return; } + generated = (stateblock->textureState[texUnit][WINED3DTSS_TEXCOORDINDEX] & 0xFFFF0000) != WINED3DTSS_TCI_PASSTHRU; set_texture_matrix((float *)&stateblock->transforms[WINED3DTS_TEXTURE0 + texUnit].u.m[0][0], stateblock->textureState[texUnit][WINED3DTSS_TEXTURETRANSFORMFLAGS], - (stateblock->textureState[texUnit][WINED3DTSS_TEXCOORDINDEX] & 0xFFFF0000) != WINED3DTSS_TCI_PASSTHRU, + generated, context->last_was_rhw, stateblock->wineD3DDevice->strided_streams.u.s.texCoords[texUnit].dwStride ? stateblock->wineD3DDevice->strided_streams.u.s.texCoords[texUnit].dwType: WINED3DDECLTYPE_UNUSED); + /* The sampler applying function calls us if this changes */ + if(context->lastWasPow2Texture[texUnit] && stateblock->textures[texUnit]) { + if(generated) { + FIXME("Non-power2 texture being used with generated texture coords\n"); + } + TRACE("Non power two matrix multiply fixup\n"); + glMultMatrixf(((IWineD3DTextureImpl *) stateblock->textures[texUnit])->baseTexture.pow2Matrix); + } } static void unloadTexCoords(IWineD3DStateBlockImpl *stateblock) { @@ -2288,19 +2299,19 @@ */ if(!GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO) && sampler < MAX_TEXTURES) { if(stateblock->textureDimensions[sampler] == GL_TEXTURE_2D) { - if(((IWineD3DTextureImpl *) stateblock->textures[sampler])->pow2scalingFactorX != 1.0 || - ((IWineD3DTextureImpl *) stateblock->textures[sampler])->pow2scalingFactorY != 1.0 ) { + if(((IWineD3DTextureImpl *) stateblock->textures[sampler])->baseTexture.pow2Matrix[0] != 1.0 || + ((IWineD3DTextureImpl *) stateblock->textures[sampler])->baseTexture.pow2Matrix[5] != 1.0 ) { texIsPow2 = TRUE; } } else if(stateblock->textureDimensions[sampler] == GL_TEXTURE_CUBE_MAP_ARB) { - if(((IWineD3DCubeTextureImpl *) stateblock->textures[sampler])->pow2scalingFactor != 1.0) { + if(((IWineD3DCubeTextureImpl *) stateblock->textures[sampler])->baseTexture.pow2Matrix[0] != 1.0) { texIsPow2 = TRUE; } } if(texIsPow2 || context->lastWasPow2Texture[sampler]) { + context->lastWasPow2Texture[sampler] = texIsPow2; transform_texture(STATE_TRANSFORM(WINED3DTS_TEXTURE0 + stateblock->wineD3DDevice->texUnitMap[sampler]), stateblock, context); - context->lastWasPow2Texture[sampler] = texIsPow2; } } @@ -3425,6 +3436,19 @@ FIXME("Clipping not supported with vertex shaders\n"); warned = TRUE; } + if(wasrhw) { + /* Apply the transform matrices when switching from rhw drawing to vertex shaders. Vertex + * shaders themselves do not need it it, but the matrices are not reapplied automatically when + * switching back from vertex shaders to fixed function processing. So make sure we leave the + * fixed function vertex processing states back in a sane state before switching to shaders + */ + if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION))) { + transform_projection(STATE_TRANSFORM(WINED3DTS_PROJECTION), stateblock, context); + } + if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(0)))) { + transform_world(STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(0)), stateblock, context); + } + } } } @@ -3597,12 +3621,15 @@ } static void scissorrect(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *) stateblock->wineD3DDevice->swapchains[0]; RECT *pRect = &stateblock->scissorRect; RECT windowRect; UINT winHeight; - GetClientRect(swapchain->win_handle, &windowRect); + windowRect.left = 0; + windowRect.top = 0; + windowRect.right = ((IWineD3DSurfaceImpl *) stateblock->wineD3DDevice->render_targets[0])->currentDesc.Width; + windowRect.bottom = ((IWineD3DSurfaceImpl *) stateblock->wineD3DDevice->render_targets[0])->currentDesc.Height; + /* Warning: glScissor uses window coordinates, not viewport coordinates, so our viewport correction does not apply * Warning2: Even in windowed mode the coords are relative to the window, not the screen */ Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/stateblock.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/stateblock.c Tue Nov 27 14:16:57 2007 @@ -1055,7 +1055,7 @@ TRACE("Render states\n"); /* Render states: */ - if (ThisDevice->depthStencilBuffer != NULL) { + if (ThisDevice->auto_depth_stencil_buffer != NULL) { IWineD3DDevice_SetRenderState(device, WINED3DRS_ZENABLE, WINED3DZB_TRUE); } else { IWineD3DDevice_SetRenderState(device, WINED3DRS_ZENABLE, WINED3DZB_FALSE); Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/surface.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/surface.c Tue Nov 27 14:16:57 2007 @@ -57,7 +57,7 @@ checkGLcall("glActiveTextureARB"); } IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(0)); - IWineD3DSurface_PreLoad((IWineD3DSurface *) This); + IWineD3DSurface_BindTexture((IWineD3DSurface *) This); if (This->resource.format == WINED3DFMT_DXT1 || This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 || @@ -2186,6 +2186,30 @@ return WINED3D_OK; } +static void WINAPI IWineD3DSurfaceImpl_BindTexture(IWineD3DSurface *iface) { + /* TODO: check for locks */ + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + IWineD3DBaseTexture *baseTexture = NULL; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + + TRACE("(%p)Checking to see if the container is a base texture\n", This); + if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&baseTexture) == WINED3D_OK) { + TRACE("Passing to container\n"); + IWineD3DBaseTexture_BindTexture(baseTexture); + IWineD3DBaseTexture_Release(baseTexture); + } else { + TRACE("(%p) : Binding surface\n", This); + + if(!device->isInDraw) { + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + } + ENTER_GL(); + glBindTexture(This->glDescription.target, This->glDescription.textureName); + LEAVE_GL(); + } + return; +} + #include <errno.h> #include <stdio.h> HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const char* filename) { @@ -3131,6 +3155,10 @@ checkGLcall("glDisable(GL_ALPHA_TEST)"); } + /* Flush in case the drawable is used by multiple GL contexts */ + if(dstSwapchain && (dstSwapchain->num_contexts >= 2)) + glFlush(); + /* Unbind the texture */ glBindTexture(GL_TEXTURE_2D, 0); checkGLcall("glEnable glBindTexture"); @@ -3481,6 +3509,8 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT *rect_in) { struct coords coords[4]; RECT rect; + IWineD3DSwapChain *swapchain = NULL; + HRESULT hr; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; if(rect_in) { @@ -3601,6 +3631,15 @@ checkGLcall("glEnable(GL_TEXTURE_2D)"); glDisable(GL_TEXTURE_CUBE_MAP_ARB); checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); + } + + hr = IWineD3DSurface_GetContainer((IWineD3DSurface*)This, &IID_IWineD3DSwapChain, (void **) &swapchain); + if(hr == WINED3D_OK && swapchain) { + /* Make sure to flush the buffers. This is needed in apps like Red Alert II and Tiberian SUN that use multiple WGL contexts. */ + if(((IWineD3DSwapChainImpl*)swapchain)->num_contexts >= 2) + glFlush(); + + IWineD3DSwapChain_Release(swapchain); } LEAVE_GL(); } @@ -3830,6 +3869,7 @@ /* Internal use: */ IWineD3DSurfaceImpl_AddDirtyRect, IWineD3DSurfaceImpl_LoadTexture, + IWineD3DSurfaceImpl_BindTexture, IWineD3DSurfaceImpl_SaveSnapshot, IWineD3DBaseSurfaceImpl_SetContainer, IWineD3DSurfaceImpl_SetGlTextureDesc, Modified: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/surface_base.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/surface_base.c Tue Nov 27 14:16:57 2007 @@ -1628,3 +1628,8 @@ return WINED3D_OK; } + +void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface) { + ERR("Should not be called on base texture\n"); + return; +} Modified: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c Tue Nov 27 14:16:57 2007 @@ -805,6 +805,7 @@ /* Internal use: */ IWineGDISurfaceImpl_AddDirtyRect, IWineGDISurfaceImpl_LoadTexture, + IWineD3DBaseSurfaceImpl_BindTexture, IWineGDISurfaceImpl_SaveSnapshot, IWineD3DBaseSurfaceImpl_SetContainer, IWineGDISurfaceImpl_SetGlTextureDesc, Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/swapchain.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/swapchain.c Tue Nov 27 14:16:57 2007 @@ -106,6 +106,9 @@ HeapFree(GetProcessHeap(), 0, This->backBuffer); } + for(i = 0; i < This->num_contexts; i++) { + DestroyContext(This->wineD3DDevice, This->context[i]); + } /* Restore the screen resolution if we rendered in fullscreen * This will restore the screen resolution to what it was before creating the swapchain. In case of d3d8 and d3d9 * this will be the original desktop resolution. In case of d3d7 this will be a NOP because ddraw sets the resolution @@ -117,9 +120,6 @@ mode.RefreshRate = 0; mode.Format = This->orig_fmt; IWineD3DDevice_SetDisplayMode((IWineD3DDevice *) This->wineD3DDevice, 0, &mode); - } - for(i = 0; i < This->num_contexts; i++) { - DestroyContext(This->wineD3DDevice, This->context[i]); } HeapFree(GetProcessHeap(), 0, This->context); Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/texture.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/texture.c Tue Nov 27 14:16:57 2007 @@ -213,39 +213,8 @@ static void WINAPI IWineD3DTextureImpl_ApplyStateChanges(IWineD3DTexture *iface, const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]) { - IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; - float matrix[16]; + TRACE("(%p) : relay to BaseTexture\n", iface); IWineD3DBaseTextureImpl_ApplyStateChanges((IWineD3DBaseTexture *)iface, textureStates, samplerStates); - - /** non-power2 fixups using texture matrix **/ - if(This->pow2scalingFactorX != 1.0f || This->pow2scalingFactorY != 1.0f) { - /* Apply non-power2 mappings and texture offsets so long as the texture coords aren't projected or generated */ - if(((textureStates[WINED3DTSS_TEXCOORDINDEX] & 0xFFFF0000) == WINED3DTSS_TCI_PASSTHRU) && - (~textureStates[WINED3DTSS_TEXTURETRANSFORMFLAGS] & WINED3DTTFF_PROJECTED)) { - glMatrixMode(GL_TEXTURE); - memset(matrix, 0 , sizeof(matrix)); - matrix[0] = This->pow2scalingFactorX; - matrix[5] = This->pow2scalingFactorY; -#if 0 /* this isn't needed any more, I changed the translation in drawprim.c to 0.9/width instead of 1/width and everything lines up ok. left here as a reminder */ - matrix[12] = -0.25f / (float)This->width; - matrix[13] = -0.75f / (float)This->height; -#endif - matrix[10] = 1; - matrix[15] = 1; - TRACE("(%p) Setup Matrix:\n", This); - TRACE(" %f %f %f %f\n", matrix[0], matrix[1], matrix[2], matrix[3]); - TRACE(" %f %f %f %f\n", matrix[4], matrix[5], matrix[6], matrix[7]); - TRACE(" %f %f %f %f\n", matrix[8], matrix[9], matrix[10], matrix[11]); - TRACE(" %f %f %f %f\n", matrix[12], matrix[13], matrix[14], matrix[15]); - TRACE("\n"); - - glMultMatrixf(matrix); - } else { - /* I don't expect nonpower 2 textures to be used with generated texture coordinates, but if they are present a fixme. */ - FIXME("Non-power2 texture being used with generated texture coords\n"); - } - } - } /* ******************************************* Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c Tue Nov 27 14:16:57 2007 @@ -120,7 +120,7 @@ const WINED3DVERTEXELEMENT *elements, size_t element_count) { IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface; HRESULT hr = WINED3D_OK; - int i; + int i, j; char isPreLoaded[MAX_STREAMS]; TRACE("(%p) : d3d version %d\n", This, ((IWineD3DImpl *)This->wineD3DDevice->wineD3D)->dxVersion); @@ -162,8 +162,35 @@ This->num_streams++; isPreLoaded[This->pDeclarationWine[i].Stream] = 1; } - } - + + /* Create a sorted array containing the attribute declarations that are of type + * D3DCOLOR. D3DCOLOR requires swizzling of the r and b component, and if the + * declaration of one attribute changes the vertex shader needs recompilation. + * Having a sorted array of the attributes allows efficient comparison of the + * declaration against a shader + */ + if(This->pDeclarationWine[i].Type == WINED3DDECLTYPE_D3DCOLOR) { + for(j = 0; j < This->num_swizzled_attribs; j++) { + if(This->swizzled_attribs[j].usage > This->pDeclarationWine[i].Usage || + (This->swizzled_attribs[j].usage == This->pDeclarationWine[i].Usage && + This->swizzled_attribs[j].idx > This->pDeclarationWine[i].UsageIndex)) { + memmove(&This->swizzled_attribs[j + 1], &This->swizzled_attribs[j], + sizeof(This->swizzled_attribs) - (sizeof(This->swizzled_attribs[0]) * (j - 1))); + break; + } + } + + This->swizzled_attribs[j].usage = This->pDeclarationWine[i].Usage; + This->swizzled_attribs[j].idx = This->pDeclarationWine[i].UsageIndex; + This->num_swizzled_attribs++; + } + } + + TRACE("Swizzled attributes found:\n"); + for(i = 0; i < This->num_swizzled_attribs; i++) { + TRACE("%u: %s%d\n", i, + debug_d3ddeclusage(This->swizzled_attribs[i].usage), This->swizzled_attribs[i].idx); + } TRACE("Returning\n"); return hr; } Modified: trunk/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/vertexshader.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/vertexshader.c Tue Nov 27 14:16:57 2007 @@ -263,29 +263,95 @@ unsigned int regnum) { IWineD3DVertexShaderImpl* This = (IWineD3DVertexShaderImpl*) iface; - IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; - IWineD3DVertexDeclarationImpl *vertexDeclaration = (IWineD3DVertexDeclarationImpl *)deviceImpl->stateBlock->vertexDecl; DWORD usage_token = This->semantics_in[regnum].usage; DWORD usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; DWORD usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; - if (vertexDeclaration) { - int i; - /* Find the declaration element that matches our register, then check - * if it has D3DCOLOR as it's type. This works for both d3d8 and d3d9. */ - for (i = 0; i < vertexDeclaration->declarationWNumElements-1; ++i) { - WINED3DVERTEXELEMENT *element = vertexDeclaration->pDeclarationWine + i; - if (match_usage(element->Usage, element->UsageIndex, usage, usage_idx)) { - return element->Type == WINED3DDECLTYPE_D3DCOLOR; + int i; + + for(i = 0; i < This->num_swizzled_attribs; i++) { + if(This->swizzled_attribs[i].usage == usage && + This->swizzled_attribs[i].idx == usage_idx) { + return TRUE; + } + } + return FALSE; +} + +static inline void find_swizzled_attribs(IWineD3DVertexDeclaration *declaration, IWineD3DVertexShaderImpl *This) { + UINT num = 0, i, j; + UINT numoldswizzles = This->num_swizzled_attribs; + IWineD3DVertexDeclarationImpl *decl = (IWineD3DVertexDeclarationImpl *) declaration; + + DWORD usage_token, usage, usage_idx; + BOOL found; + + attrib_declaration oldswizzles[sizeof(This->swizzled_attribs) / sizeof(This->swizzled_attribs[0])]; + + /* Back up the old swizzles to keep attributes that are undefined in the current declaration */ + memcpy(oldswizzles, This->swizzled_attribs, sizeof(oldswizzles)); + + memset(This->swizzled_attribs, 0, sizeof(This->swizzled_attribs[0]) * MAX_ATTRIBS); + + for(i = 0; i < decl->num_swizzled_attribs; i++) { + for(j = 0; j < MAX_ATTRIBS; j++) { + usage_token = This->semantics_in[j].usage; + usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; + usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + + if(decl->swizzled_attribs[i].usage == usage && + decl->swizzled_attribs[i].idx == usage_idx) { + This->swizzled_attribs[num].usage = usage; + This->swizzled_attribs[num].idx = usage_idx; + num++; } } } - ERR("Either no vertexdeclaration present, or register not matched. This should never happen.\n"); - return FALSE; -} - + /* Add previously converted attributes back in if they are not defined in the current declaration */ + for(i = 0; i < numoldswizzles; i++) { + + found = FALSE; + for(j = 0; j < decl->declarationWNumElements; j++) { + if(oldswizzles[i].usage == decl->pDeclarationWine[j].Usage && + oldswizzles[i].idx == decl->pDeclarationWine[j].UsageIndex) { + found = TRUE; + } + } + if(found) { + /* This previously converted attribute is declared in the current declaration. Either it is + * already in the new array, or it should not be there. Skip it + */ + continue; + } + /* We have a previously swizzled attribute that is not defined by the current vertex declaration. + * Insert it into the new conversion array to keep it in the old defined state. Otherwise we end up + * recompiling if the old decl is used again because undefined attributes are reset to no swizzling. + * In the reverse way(attribute was not swizzled and is not declared in new declaration) the attrib + * stays unswizzled as well because it isn't found in the oldswizzles array + */ + for(j = 0; j < num; j++) { + if(oldswizzles[i].usage > This->swizzled_attribs[j].usage || ( + oldswizzles[i].usage == This->swizzled_attribs[j].usage && + oldswizzles[i].idx > This->swizzled_attribs[j].idx)) { + memmove(&This->swizzled_attribs[j + 1], &This->swizzled_attribs[j], + sizeof(This->swizzled_attribs) - (sizeof(This->swizzled_attribs[0]) * (j - 1))); + break; + } + } + This->swizzled_attribs[j].usage = oldswizzles[i].usage; + This->swizzled_attribs[j].idx = oldswizzles[i].idx; + num++; + } + + TRACE("New swizzled attributes array\n"); + for(i = 0; i < num; i++) { + TRACE("%d: %s(%d), %d\n", i, debug_d3ddeclusage(This->swizzled_attribs[i].usage), + This->swizzled_attribs[i].usage, This->swizzled_attribs[i].idx); + } + This->num_swizzled_attribs = num; +} /** Generate a vertex shader string using either GL_VERTEX_PROGRAM_ARB or GLSL and send it to the card */ static VOID IWineD3DVertexShaderImpl_GenerateShader( @@ -294,7 +360,10 @@ CONST DWORD *pFunction) { IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; + IWineD3DVertexDeclaration *decl = ((IWineD3DDeviceImpl *) This->baseShader.device)->stateBlock->vertexDecl; SHADER_BUFFER buffer; + + find_swizzled_attribs(decl, This); #if 0 /* FIXME: Use the buffer that is held by the device, this is ok since fixups will be skipped for software shaders it also requires entering a critical section but cuts down the runtime footprint of wined3d and any memory fragmentation that may occur... */ @@ -349,9 +418,7 @@ * before the homogenous divide, so we have to take the w into account: z = ((z / w) * 2 - 1) * w, * which is the same as z = z / 2 - w. */ - shader_addline(&buffer, "tmp0 = gl_Position;\n"); - shader_addline(&buffer, "gl_Position.z = tmp0.z * 2.0;\n"); - shader_addline(&buffer, "gl_Position.z = gl_Position.z - gl_Position.w;\n"); + shader_addline(&buffer, "gl_Position.z = gl_Position.z * 2.0 - gl_Position.w;\n"); shader_addline(&buffer, "}\n"); @@ -399,8 +466,8 @@ * 1.0 or -1.0 to turn the rendering upside down for offscreen rendering. PosFixup.x * contains 1.0 to allow a mad, but arb vs swizzles are too restricted for that. */ - shader_addline(&buffer, "ADD TMP_OUT.x, TMP_OUT.x, posFixup.z;"); - shader_addline(&buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, posFixup.w;"); + shader_addline(&buffer, "ADD TMP_OUT.x, TMP_OUT.x, posFixup.z;\n"); + shader_addline(&buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, posFixup.w;\n"); /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * and the glsl equivalent @@ -439,56 +506,16 @@ /* ******************************************* IWineD3DVertexShader IUnknown parts follow ******************************************* */ -static HRESULT WINAPI IWineD3DVertexShaderImpl_QueryInterface(IWineD3DVertexShader *iface, REFIID riid, LPVOID *ppobj) -{ - IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; - TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IWineD3DBase) - || IsEqualGUID(riid, &IID_IWineD3DBaseShader) - || IsEqualGUID(riid, &IID_IWineD3DVertexShader)) { - IUnknown_AddRef(iface); - *ppobj = This; - return S_OK; - } - *ppobj = NULL; - return E_NOINTERFACE; -} - -static ULONG WINAPI IWineD3DVertexShaderImpl_AddRef(IWineD3DVertexShader *iface) { - IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; - TRACE("(%p) : AddRef increasing from %d\n", This, This->ref); - return InterlockedIncrement(&This->ref); +static HRESULT WINAPI IWineD3DVertexShaderImpl_QueryInterface(IWineD3DVertexShader *iface, REFIID riid, LPVOID *ppobj) { + return IWineD3DBaseShaderImpl_QueryInterface((IWineD3DBaseShader *) iface, riid, ppobj); +} + +static ULONG WINAPI IWineD3DVertexShaderImpl_AddRef(IWineD3DVertexShader *iface) { + return IWineD3DBaseShaderImpl_AddRef((IWineD3DBaseShader *) iface); } static ULONG WINAPI IWineD3DVertexShaderImpl_Release(IWineD3DVertexShader *iface) { - IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; - ULONG ref; - TRACE("(%p) : Releasing from %d\n", This, This->ref); - ref = InterlockedDecrement(&This->ref); - if (ref == 0) { - if (This->baseShader.shader_mode == SHADER_GLSL && This->baseShader.prgId != 0) { - struct list *linked_programs = &This->baseShader.linked_programs; - - TRACE("Deleting linked programs\n"); - if (linked_programs->next) { - struct glsl_shader_prog_link *entry, *entry2; - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, struct glsl_shader_prog_link, vshader_entry) { - delete_glsl_program_entry(This->baseShader.device, entry); - } - } - - TRACE("Deleting shader object %u\n", This->baseShader.prgId); - GL_EXTCALL(glDeleteObjectARB(This->baseShader.prgId)); - checkGLcall("glDeleteObjectARB"); - } - shader_delete_constant_list(&This->baseShader.constantsF); - shader_delete_constant_list(&This->baseShader.constantsB); - shader_delete_constant_list(&This->baseShader.constantsI); - HeapFree(GetProcessHeap(), 0, This); - - } - return ref; + return IWineD3DBaseShaderImpl_Release((IWineD3DBaseShader *) iface); } /* ******************************************* @@ -587,6 +614,7 @@ This->rel_offset = 0; } } + This->baseShader.load_local_constsF = This->baseShader.reg_maps.usesrelconstF && !list_empty(&This->baseShader.constantsF); /* copy the function ... because it will certainly be released by application */ if (NULL != pFunction) { @@ -641,14 +669,86 @@ return WINED3D_OK; } +static inline BOOL swizzled_attribs_differ(IWineD3DVertexShaderImpl *This, IWineD3DVertexDeclarationImpl *vdecl) { + UINT i, j, k; + BOOL found; + + DWORD usage_token; + DWORD usage; + DWORD usage_idx; + + for(i = 0; i < vdecl->declarationWNumElements; i++) { + for(j = 0; j < MAX_ATTRIBS; j++) { + if(!This->baseShader.reg_maps.attributes) continue; + + usage_token = This->semantics_in[j].usage; + usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; + usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + + if(vdecl->pDeclarationWine[i].Usage != usage || + vdecl->pDeclarationWine[i].UsageIndex != usage_idx) { + continue; + } + + found = FALSE; + for(k = 0; k < This->num_swizzled_attribs; k++) { + if(This->swizzled_attribs[k].usage == usage && + This->swizzled_attribs[k].idx == usage_idx) { + found = TRUE; + } + } + if(!found && vdecl->pDeclarationWine[i].Type == WINED3DDECLTYPE_D3DCOLOR) { + TRACE("Attribute %s%d is D3DCOLOR now but wasn't before\n", + debug_d3ddeclusage(usage), usage_idx); + return TRUE; + } + if( found && vdecl->pDeclarationWine[i].Type != WINED3DDECLTYPE_D3DCOLOR) { + TRACE("Attribute %s%d was D3DCOLOR before but is not any more\n", + debug_d3ddeclusage(usage), usage_idx); + return TRUE; + } + } + } + return FALSE; +} + static HRESULT WINAPI IWineD3DVertexShaderImpl_CompileShader(IWineD3DVertexShader *iface) { IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; + IWineD3DVertexDeclarationImpl *vdecl; CONST DWORD *function = This->baseShader.function; + IWineD3DDeviceImpl *deviceImpl = (IWineD3DDeviceImpl *) This->baseShader.device; TRACE("(%p) : function %p\n", iface, function); /* We're already compiled. */ - if (This->baseShader.is_compiled) return WINED3D_OK; + if (This->baseShader.is_compiled) { + vdecl = (IWineD3DVertexDeclarationImpl *) deviceImpl->stateBlock->vertexDecl; + + if(This->num_swizzled_attribs != vdecl->num_swizzled_attribs || + memcmp(This->swizzled_attribs, vdecl->swizzled_attribs, sizeof(vdecl->swizzled_attribs[0]) * This->num_swizzled_attribs) != 0) { + + /* The swizzled attributes differ between shader and declaration. This doesn't necessarily mean + * we have to recompile, but we have to take a deeper look at see if the attribs that differ + * are declared in the decl and used in the shader + */ + if(swizzled_attribs_differ(This, vdecl)) { + WARN("Recompiling vertex shader %p due to D3DCOLOR input changes\n", This); + goto recompile; + } + WARN("Swizzled attribute validation required an expensive comparison\n"); + } + + return WINED3D_OK; + + recompile: + if(This->recompile_count < 50) { + This->recompile_count++; + } else { + FIXME("Vertexshader %p recompiled more than 50 times\n", This); + } + + deviceImpl->shader_backend->shader_destroy((IWineD3DBaseShader *) iface); + } /* We don't need to compile */ if (!function) { Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h Tue Nov 27 14:16:57 2007 @@ -44,11 +44,6 @@ #include "wine/list.h" #define ceilf(x) (float)ceil((double)x) -BOOL WINAPI -DllMain(IN HINSTANCE hinstDLL, - IN DWORD dwReason, - IN LPVOID lpvReserved); - /* Hash table functions */ typedef unsigned int (hash_function_t)(void *key); typedef BOOL (compare_function_t)(void *keya, void *keyb); @@ -217,6 +212,7 @@ void (*shader_load_constants)(IWineD3DDevice *iface, char usePS, char useVS); void (*shader_cleanup)(IWineD3DDevice *iface); void (*shader_color_correction)(struct SHADER_OPCODE_ARG *arg); + void (*shader_destroy)(IWineD3DBaseShader *iface); } shader_backend_t; extern const shader_backend_t glsl_shader_backend; @@ -631,13 +627,8 @@ /* allocate one pbuffer per surface */ extern BOOL pbuffer_per_surface; -typedef struct ResourceList { - IWineD3DResource *resource; - struct ResourceList *next; -} ResourceList; - /* A helper function that dumps a resource list */ -void dumpResources(ResourceList *resources); +void dumpResources(struct list *list); /***************************************************************************** * IWineD3DDevice implementation structure @@ -687,11 +678,11 @@ IWineD3DSwapChain **swapchains; UINT NumberOfSwapChains; - ResourceList *resources; /* a linked list to track resources created by the device */ + struct list resources; /* a linked list to track resources created by the device */ /* Render Target Support */ IWineD3DSurface **render_targets; - IWineD3DSurface *depthStencilBuffer; + IWineD3DSurface *auto_depth_stencil_buffer; IWineD3DSurface **fbo_color_attachments; IWineD3DSurface *fbo_depth_attachment; @@ -827,6 +818,7 @@ BYTE *allocatedMemory; /* Pointer to the real data location */ BYTE *heapMemory; /* Pointer to the HeapAlloced block of memory */ struct list privateData; + struct list resource_list_entry; } IWineD3DResourceClass; @@ -930,6 +922,7 @@ BOOL is_srgb; UINT srgb_mode_change_count; WINED3DFORMAT shader_conversion_group; + float pow2Matrix[16]; } IWineD3DBaseTextureClass; typedef struct IWineD3DBaseTextureImpl @@ -956,8 +949,6 @@ UINT width; UINT height; - float pow2scalingFactorX; - float pow2scalingFactorY; } IWineD3DTextureImpl; @@ -977,8 +968,6 @@ IWineD3DSurface *surfaces[6][MAX_LEVELS]; UINT edgeLength; - float pow2scalingFactor; - } IWineD3DCubeTextureImpl; extern const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl; @@ -1102,12 +1091,6 @@ /* PBO */ GLuint pbo; - -#if 0 - /* precalculated x and y scalings for texture coords */ - float pow2scalingFactorX; /* = (Width / pow2Width ) */ - float pow2scalingFactorY; /* = (Height / pow2Height) */ -#endif RECT lockedRect; RECT dirtyRect; @@ -1174,6 +1157,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, WINEDDBLTFX *DDBltFx, WINED3DTEXTUREFILTERTYPE Filter); HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, DWORD dsty, IWineD3DSurface *Source, RECT *rsrc, DWORD trans); HRESULT WINAPI IWineD3DBaseSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags); +void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface); const void *WINAPI IWineD3DSurfaceImpl_GetData(IWineD3DSurface *iface); @@ -1252,6 +1236,13 @@ /***************************************************************************** * IWineD3DVertexDeclaration implementation structure */ +typedef struct attrib_declaration { + DWORD usage; + DWORD idx; +} attrib_declaration; + +#define MAX_ATTRIBS 16 + typedef struct IWineD3DVertexDeclarationImpl { /* IUnknown Information */ const IWineD3DVertexDeclarationVtbl *lpVtbl; @@ -1266,6 +1257,10 @@ DWORD streams[MAX_STREAMS]; UINT num_streams; BOOL position_transformed; + + /* Ordered array of declaration types that need swizzling in a vshader */ + attrib_declaration swizzled_attribs[MAX_ATTRIBS]; + UINT num_swizzled_attribs; } IWineD3DVertexDeclarationImpl; extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl; @@ -1641,7 +1636,6 @@ #define MAX_REG_TEXCRD 8 #define MAX_REG_INPUT 12 #define MAX_REG_OUTPUT 12 -#define MAX_ATTRIBS 16 #define MAX_CONST_I 16 #define MAX_CONST_B 16 @@ -1675,6 +1669,7 @@ DWORD samplers[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; char bumpmat, luminanceparams; char usesnrm, vpos, usesdsy; + char usesrelconstF; /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth; @@ -1760,9 +1755,6 @@ extern const SHADER_OPCODE* shader_get_opcode( IWineD3DBaseShader *iface, const DWORD code); - -extern void shader_delete_constant_list( - struct list* clist); void delete_glsl_program_entry(IWineD3DDevice *iface, struct glsl_shader_prog_link *entry); @@ -1895,15 +1887,17 @@ */ typedef struct IWineD3DBaseShaderClass { + LONG ref; DWORD hex_version; SHADER_LIMITS limits; SHADER_PARSE_STATE parse_state; CONST SHADER_OPCODE *shader_ins; - CONST DWORD *function; + DWORD *function; UINT functionLength; GLuint prgId; BOOL is_compiled; UINT cur_loop_depth, cur_loop_regno; + BOOL load_local_constsF; /* Type of shader backend */ int shader_mode; @@ -1936,11 +1930,14 @@ typedef struct IWineD3DBaseShaderImpl { /* IUnknown */ const IWineD3DBaseShaderVtbl *lpVtbl; - LONG ref; /* IWineD3DBaseShader */ IWineD3DBaseShaderClass baseShader; } IWineD3DBaseShaderImpl; + +HRESULT WINAPI IWineD3DBaseShaderImpl_QueryInterface(IWineD3DBaseShader *iface, REFIID riid, LPVOID *ppobj); +ULONG WINAPI IWineD3DBaseShaderImpl_AddRef(IWineD3DBaseShader *iface); +ULONG WINAPI IWineD3DBaseShaderImpl_Release(IWineD3DBaseShader *iface); extern HRESULT shader_get_registers_used( IWineD3DBaseShader *iface, @@ -2050,7 +2047,6 @@ typedef struct IWineD3DVertexShaderImpl { /* IUnknown parts*/ const IWineD3DVertexShaderVtbl *lpVtbl; - LONG ref; /* Note: Ref counting not required */ /* IWineD3DBaseShader */ IWineD3DBaseShaderClass baseShader; @@ -2063,12 +2059,17 @@ /* Vertex shader input and output semantics */ semantic semantics_in [MAX_ATTRIBS]; semantic semantics_out [MAX_REG_OUTPUT]; + + /* Ordered array of attributes that are swizzled */ + attrib_declaration swizzled_attribs [MAX_ATTRIBS]; + UINT num_swizzled_attribs; /* run time datas... */ VSHADERDATA *data; UINT min_rel_offset, max_rel_offset; UINT rel_offset; + UINT recompile_count; #if 0 /* needs reworking */ /* run time datas */ VSHADERINPUTDATA input; @@ -2091,7 +2092,6 @@ typedef struct IWineD3DPixelShaderImpl { /* IUnknown parts */ const IWineD3DPixelShaderVtbl *lpVtbl; - LONG ref; /* Note: Ref counting not required */ /* IWineD3DBaseShader */ IWineD3DBaseShaderClass baseShader;

1 0

[greatlrd] 30813: part 1/2 Updating wined3d from winehq.org cvs/git date 27/11-2007 this update solv allot of bugs in wined3d
by greatlrd＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: greatlrd Date: Tue Nov 27 14:15:08 2007 New Revision: 30813 URL: http://svn.reactos.org/svn/reactos?rev=30813&view=rev Log: part 1/2 Updating wined3d from winehq.org cvs/git date 27/11-2007 this update solv allot of bugs in wined3d Modified: trunk/reactos/include/reactos/wine/wined3d_gl.h trunk/reactos/include/reactos/wine/wined3d_interface.h Modified: trunk/reactos/include/reactos/wine/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… ============================================================================== --- trunk/reactos/include/reactos/wine/wined3d_gl.h (original) +++ trunk/reactos/include/reactos/wine/wined3d_gl.h Tue Nov 27 14:15:08 2007 @@ -3169,6 +3169,7 @@ ARB_VERTEX_BLEND, ARB_VERTEX_BUFFER_OBJECT, ARB_VERTEX_SHADER, + ARB_SHADER_OBJECTS, /* EXT */ EXT_BLEND_MINMAX, EXT_FOG_COORD, @@ -3237,370 +3238,274 @@ #define GL_EXT_FUNCS_GEN \ /** ARB Extensions **/ \ /* GL_ARB_draw_buffers */ \ - USE_GL_FUNC(PGLFNDRAWBUFFERSARBPROC, glDrawBuffersARB); \ + USE_GL_FUNC(PGLFNDRAWBUFFERSARBPROC, glDrawBuffersARB, ARB_DRAW_BUFFERS, NULL );\ /* GL_ARB_imaging, GL_EXT_blend_minmax */ \ - USE_GL_FUNC(PGLFNBLENDCOLORPROC, glBlendColorEXT); \ - USE_GL_FUNC(PGLFNBLENDEQUATIONPROC, glBlendEquationEXT); \ + USE_GL_FUNC(PGLFNBLENDCOLORPROC, glBlendColorEXT, EXT_BLEND_MINMAX, NULL );\ + USE_GL_FUNC(PGLFNBLENDEQUATIONPROC, glBlendEquationEXT, EXT_BLEND_MINMAX, NULL );\ /* GL_ARB_multisample */ \ - USE_GL_FUNC(WINED3D_PFNGLSAMPLECOVERAGEARBPROC, glSampleCoverageARB); \ + USE_GL_FUNC(WINED3D_PFNGLSAMPLECOVERAGEARBPROC, glSampleCoverageARB, ARB_MULTISAMPLE, NULL );\ /* GL_ARB_multitexture */ \ - USE_GL_FUNC(WINED3D_PFNGLACTIVETEXTUREARBPROC, glActiveTextureARB); \ - USE_GL_FUNC(WINED3D_PFNGLCLIENTACTIVETEXTUREARBPROC, glClientActiveTextureARB); \ - USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD1FARBPROC, glMultiTexCoord1fARB); \ - USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD2FARBPROC, glMultiTexCoord2fARB); \ - USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD3FARBPROC, glMultiTexCoord3fARB); \ - USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD4FARBPROC, glMultiTexCoord4fARB); \ + USE_GL_FUNC(WINED3D_PFNGLACTIVETEXTUREARBPROC, glActiveTextureARB, ARB_MULTITEXTURE, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLCLIENTACTIVETEXTUREARBPROC, glClientActiveTextureARB, ARB_MULTITEXTURE, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD1FARBPROC, glMultiTexCoord1fARB, ARB_MULTITEXTURE, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD2FARBPROC, glMultiTexCoord2fARB, ARB_MULTITEXTURE, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD3FARBPROC, glMultiTexCoord3fARB, ARB_MULTITEXTURE, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD4FARBPROC, glMultiTexCoord4fARB, ARB_MULTITEXTURE, NULL );\ /* GL_ARB_occlusion_query */ \ - USE_GL_FUNC(PGLFNGENQUERIESARBPROC, glGenQueriesARB); \ - USE_GL_FUNC(PGLFNDELETEQUERIESARBPROC, glDeleteQueriesARB); \ - USE_GL_FUNC(PGLFNBEGINQUERYARBPROC, glBeginQueryARB); \ - USE_GL_FUNC(PGLFNENDQUERYARBPROC, glEndQueryARB); \ - USE_GL_FUNC(PGLFNGETQUERYOBJECTIVARBPROC, glGetQueryObjectivARB); \ - USE_GL_FUNC(PGLFNGETQUERYOBJECTUIVARBPROC, glGetQueryObjectuivARB); \ + USE_GL_FUNC(PGLFNGENQUERIESARBPROC, glGenQueriesARB, ARB_OCCLUSION_QUERY, NULL );\ + USE_GL_FUNC(PGLFNDELETEQUERIESARBPROC, glDeleteQueriesARB, ARB_OCCLUSION_QUERY, NULL );\ + USE_GL_FUNC(PGLFNBEGINQUERYARBPROC, glBeginQueryARB, ARB_OCCLUSION_QUERY, NULL );\ + USE_GL_FUNC(PGLFNENDQUERYARBPROC, glEndQueryARB, ARB_OCCLUSION_QUERY, NULL );\ + USE_GL_FUNC(PGLFNGETQUERYOBJECTIVARBPROC, glGetQueryObjectivARB, ARB_OCCLUSION_QUERY, NULL );\ + USE_GL_FUNC(PGLFNGETQUERYOBJECTUIVARBPROC, glGetQueryObjectuivARB, ARB_OCCLUSION_QUERY, NULL );\ /* GL_ARB_point_parameters */ \ - USE_GL_FUNC(PGLFNGLPOINTPARAMETERFARBPROC, glPointParameterfARB); \ - USE_GL_FUNC(PGLFNGLPOINTPARAMETERFVARBPROC, glPointParameterfvARB); \ + USE_GL_FUNC(PGLFNGLPOINTPARAMETERFARBPROC, glPointParameterfARB, ARB_POINT_PARAMETERS, NULL );\ + USE_GL_FUNC(PGLFNGLPOINTPARAMETERFVARBPROC, glPointParameterfvARB, ARB_POINT_PARAMETERS, NULL );\ /* GL_ARB_texture_compression */ \ - USE_GL_FUNC(PGLFNCOMPRESSEDTEXIMAGE2DPROC, glCompressedTexImage2DARB); \ - USE_GL_FUNC(PGLFNCOMPRESSEDTEXIMAGE3DPROC, glCompressedTexImage3DARB); \ - USE_GL_FUNC(PGLFNCOMPRESSEDTEXSUBIMAGE2DPROC, glCompressedTexSubImage2DARB); \ - USE_GL_FUNC(PGLFNCOMPRESSEDTEXSUBIMAGE3DPROC, glCompressedTexSubImage3DARB); \ - USE_GL_FUNC(PGLFNGETCOMPRESSEDTEXIMAGEPROC, glGetCompressedTexImageARB); \ + USE_GL_FUNC(PGLFNCOMPRESSEDTEXIMAGE2DPROC, glCompressedTexImage2DARB, ARB_TEXTURE_COMPRESSION,NULL );\ + USE_GL_FUNC(PGLFNCOMPRESSEDTEXIMAGE3DPROC, glCompressedTexImage3DARB, ARB_TEXTURE_COMPRESSION,NULL );\ + USE_GL_FUNC(PGLFNCOMPRESSEDTEXSUBIMAGE2DPROC, glCompressedTexSubImage2DARB, ARB_TEXTURE_COMPRESSION,NULL );\ + USE_GL_FUNC(PGLFNCOMPRESSEDTEXSUBIMAGE3DPROC, glCompressedTexSubImage3DARB, ARB_TEXTURE_COMPRESSION,NULL );\ + USE_GL_FUNC(PGLFNGETCOMPRESSEDTEXIMAGEPROC, glGetCompressedTexImageARB, ARB_TEXTURE_COMPRESSION,NULL );\ /* GL_ARB_vertex_blend */ \ - USE_GL_FUNC(PGLFNGLWEIGHTPOINTERARB, glWeightPointerARB); \ - USE_GL_FUNC(PGLFNGLWEIGHTBV, glWeightbvARB); \ - USE_GL_FUNC(PGLFNGLWEIGHTSV, glWeightsvARB); \ - USE_GL_FUNC(PGLFNGLWEIGHTIV, glWeightivARB); \ - USE_GL_FUNC(PGLFNGLWEIGHTFV, glWeightfvARB); \ - USE_GL_FUNC(PGLFNGLWEIGHTDV, glWeightdvARB); \ - USE_GL_FUNC(PGLFNGLWEIGHTUBV, glWeightubvARB); \ - USE_GL_FUNC(PGLFNGLWEIGHTUSV, glWeightusvARB); \ - USE_GL_FUNC(PGLFNGLWEIGHTUIV, glWeightuivARB); \ - USE_GL_FUNC(PGLFNGLVERTEXBLENDARB, glVertexBlendARB); \ + USE_GL_FUNC(PGLFNGLWEIGHTPOINTERARB, glWeightPointerARB, ARB_VERTEX_BLEND, NULL );\ + USE_GL_FUNC(PGLFNGLWEIGHTBV, glWeightbvARB, ARB_VERTEX_BLEND, NULL );\ + USE_GL_FUNC(PGLFNGLWEIGHTSV, glWeightsvARB, ARB_VERTEX_BLEND, NULL );\ + USE_GL_FUNC(PGLFNGLWEIGHTIV, glWeightivARB, ARB_VERTEX_BLEND, NULL );\ + USE_GL_FUNC(PGLFNGLWEIGHTFV, glWeightfvARB, ARB_VERTEX_BLEND, NULL );\ + USE_GL_FUNC(PGLFNGLWEIGHTDV, glWeightdvARB, ARB_VERTEX_BLEND, NULL );\ + USE_GL_FUNC(PGLFNGLWEIGHTUBV, glWeightubvARB, ARB_VERTEX_BLEND, NULL );\ + USE_GL_FUNC(PGLFNGLWEIGHTUSV, glWeightusvARB, ARB_VERTEX_BLEND, NULL );\ + USE_GL_FUNC(PGLFNGLWEIGHTUIV, glWeightuivARB, ARB_VERTEX_BLEND, NULL );\ + USE_GL_FUNC(PGLFNGLVERTEXBLENDARB, glVertexBlendARB, ARB_VERTEX_BLEND, NULL );\ /* GL_ARB_vertex_buffer_object */ \ - USE_GL_FUNC(PGLFNBINDBUFFERARBPROC, glBindBufferARB); \ - USE_GL_FUNC(PGLFNDELETEBUFFERSARBPROC, glDeleteBuffersARB); \ - USE_GL_FUNC(PGLFNGENBUFFERSARBPROC, glGenBuffersARB); \ - USE_GL_FUNC(PGLFNISBUFFERARBPROC, glIsBufferARB); \ - USE_GL_FUNC(PGLFNBUFFERDATAARBPROC, glBufferDataARB); \ - USE_GL_FUNC(PGLFNBUFFERSUBDATAARBPROC, glBufferSubDataARB); \ - USE_GL_FUNC(PGLFNGETBUFFERSUBDATAARBPROC, glGetBufferSubDataARB); \ - USE_GL_FUNC(PGLFNMAPBUFFERARBPROC, glMapBufferARB); \ - USE_GL_FUNC(PGLFNUNMAPBUFFERARBPROC, glUnmapBufferARB); \ - USE_GL_FUNC(PGLFNGETBUFFERPARAMETERIVARBPROC, glGetBufferParameterivARB); \ - USE_GL_FUNC(PGLFNGETBUFFERPOINTERVARBPROC, glGetBufferPointervARB); \ + USE_GL_FUNC(PGLFNBINDBUFFERARBPROC, glBindBufferARB, ARB_VERTEX_BUFFER_OBJECT,NULL);\ + USE_GL_FUNC(PGLFNDELETEBUFFERSARBPROC, glDeleteBuffersARB, ARB_VERTEX_BUFFER_OBJECT,NULL);\ + USE_GL_FUNC(PGLFNGENBUFFERSARBPROC, glGenBuffersARB, ARB_VERTEX_BUFFER_OBJECT,NULL);\ + USE_GL_FUNC(PGLFNISBUFFERARBPROC, glIsBufferARB, ARB_VERTEX_BUFFER_OBJECT,NULL);\ + USE_GL_FUNC(PGLFNBUFFERDATAARBPROC, glBufferDataARB, ARB_VERTEX_BUFFER_OBJECT,NULL);\ + USE_GL_FUNC(PGLFNBUFFERSUBDATAARBPROC, glBufferSubDataARB, ARB_VERTEX_BUFFER_OBJECT,NULL);\ + USE_GL_FUNC(PGLFNGETBUFFERSUBDATAARBPROC, glGetBufferSubDataARB, ARB_VERTEX_BUFFER_OBJECT,NULL);\ + USE_GL_FUNC(PGLFNMAPBUFFERARBPROC, glMapBufferARB, ARB_VERTEX_BUFFER_OBJECT,NULL);\ + USE_GL_FUNC(PGLFNUNMAPBUFFERARBPROC, glUnmapBufferARB, ARB_VERTEX_BUFFER_OBJECT,NULL);\ + USE_GL_FUNC(PGLFNGETBUFFERPARAMETERIVARBPROC, glGetBufferParameterivARB, ARB_VERTEX_BUFFER_OBJECT,NULL);\ + USE_GL_FUNC(PGLFNGETBUFFERPOINTERVARBPROC, glGetBufferPointervARB, ARB_VERTEX_BUFFER_OBJECT,NULL);\ /** EXT Extensions **/ \ /* GL_EXT_fog_coord */ \ - USE_GL_FUNC(PGLFNGLFOGCOORDFEXTPROC, glFogCoordfEXT); \ - USE_GL_FUNC(PGLFNGLFOGCOORDFVEXTPROC, glFogCoordfvEXT); \ - USE_GL_FUNC(PGLFNGLFOGCOORDDEXTPROC, glFogCoorddEXT); \ - USE_GL_FUNC(PGLFNGLFOGCOORDDVEXTPROC, glFogCoordvEXT); \ - USE_GL_FUNC(PGLFNGLFOGCOORDPOINTEREXTPROC, glFogCoordPointerEXT); \ + USE_GL_FUNC(PGLFNGLFOGCOORDFEXTPROC, glFogCoordfEXT, EXT_FOG_COORD, NULL );\ + USE_GL_FUNC(PGLFNGLFOGCOORDFVEXTPROC, glFogCoordfvEXT, EXT_FOG_COORD, NULL );\ + USE_GL_FUNC(PGLFNGLFOGCOORDDEXTPROC, glFogCoorddEXT, EXT_FOG_COORD, NULL );\ + USE_GL_FUNC(PGLFNGLFOGCOORDDVEXTPROC, glFogCoordvEXT, EXT_FOG_COORD, NULL );\ + USE_GL_FUNC(PGLFNGLFOGCOORDPOINTEREXTPROC, glFogCoordPointerEXT, EXT_FOG_COORD, NULL );\ /* GL_EXT_framebuffer_object */ \ - USE_GL_FUNC(PGLFNGLISRENDERBUFFEREXTPROC, glIsRenderbufferEXT); \ - USE_GL_FUNC(PGLFNGLBINDRENDERBUFFEREXTPROC, glBindRenderbufferEXT); \ - USE_GL_FUNC(PGLFNGLDELETERENDERBUFFERSEXTPROC, glDeleteRenderbuffersEXT); \ - USE_GL_FUNC(PGLFNGLGENRENDERBUFFERSEXTPROC, glGenRenderbuffersEXT); \ - USE_GL_FUNC(PGLFNGLRENDERBUFFERSTORAGEEXTPROC, glRenderbufferStorageEXT); \ - USE_GL_FUNC(PGLFNGLISFRAMEBUFFEREXTPROC, glIsFramebufferEXT); \ - USE_GL_FUNC(PGLFNGLBINDFRAMEBUFFEREXTPROC, glBindFramebufferEXT); \ - USE_GL_FUNC(PGLFNGLDELETEFRAMEBUFFERSEXTPROC, glDeleteFramebuffersEXT); \ - USE_GL_FUNC(PGLFNGLGENFRAMEBUFFERSEXTPROC, glGenFramebuffersEXT); \ - USE_GL_FUNC(PGLFNGLCHECKFRAMEBUFFERSTATUSEXTPROC, glCheckFramebufferStatusEXT); \ - USE_GL_FUNC(PGLFNGLFRAMEBUFFERTEXTURE1DEXTPROC, glFramebufferTexture1DEXT); \ - USE_GL_FUNC(PGLFNGLFRAMEBUFFERTEXTURE2DEXTPROC, glFramebufferTexture2DEXT); \ - USE_GL_FUNC(PGLFNGLFRAMEBUFFERTEXTURE3DEXTPROC, glFramebufferTexture3DEXT); \ - USE_GL_FUNC(PGLFNGLFRAMEBUFFERRENDERBUFFEREXTPROC, glFramebufferRenderbufferEXT); \ - USE_GL_FUNC(PGLFNGLGENERATEMIPMAPEXTPROC, glGenerateMipmapEXT); \ - USE_GL_FUNC(PGLFNGLGETRENDERBUFFERPARAMETERIVEXTPROC, glGetRenderbufferParameterivEXT); \ - USE_GL_FUNC(PGLFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC, glGetFramebufferAttachmentParameterivEXT); \ + USE_GL_FUNC(PGLFNGLISRENDERBUFFEREXTPROC, glIsRenderbufferEXT, EXT_FRAMEBUFFER_OBJECT, NULL );\ + USE_GL_FUNC(PGLFNGLBINDRENDERBUFFEREXTPROC, glBindRenderbufferEXT, EXT_FRAMEBUFFER_OBJECT, NULL );\ + USE_GL_FUNC(PGLFNGLDELETERENDERBUFFERSEXTPROC, glDeleteRenderbuffersEXT, EXT_FRAMEBUFFER_OBJECT, NULL );\ + USE_GL_FUNC(PGLFNGLGENRENDERBUFFERSEXTPROC, glGenRenderbuffersEXT, EXT_FRAMEBUFFER_OBJECT, NULL );\ + USE_GL_FUNC(PGLFNGLRENDERBUFFERSTORAGEEXTPROC, glRenderbufferStorageEXT, EXT_FRAMEBUFFER_OBJECT, NULL );\ + USE_GL_FUNC(PGLFNGLISFRAMEBUFFEREXTPROC, glIsFramebufferEXT, EXT_FRAMEBUFFER_OBJECT, NULL );\ + USE_GL_FUNC(PGLFNGLBINDFRAMEBUFFEREXTPROC, glBindFramebufferEXT, EXT_FRAMEBUFFER_OBJECT, NULL );\ + USE_GL_FUNC(PGLFNGLDELETEFRAMEBUFFERSEXTPROC, glDeleteFramebuffersEXT, EXT_FRAMEBUFFER_OBJECT, NULL );\ + USE_GL_FUNC(PGLFNGLGENFRAMEBUFFERSEXTPROC, glGenFramebuffersEXT, EXT_FRAMEBUFFER_OBJECT, NULL );\ + USE_GL_FUNC(PGLFNGLCHECKFRAMEBUFFERSTATUSEXTPROC, glCheckFramebufferStatusEXT, EXT_FRAMEBUFFER_OBJECT, NULL );\ + USE_GL_FUNC(PGLFNGLFRAMEBUFFERTEXTURE1DEXTPROC, glFramebufferTexture1DEXT, EXT_FRAMEBUFFER_OBJECT, NULL );\ + USE_GL_FUNC(PGLFNGLFRAMEBUFFERTEXTURE2DEXTPROC, glFramebufferTexture2DEXT, EXT_FRAMEBUFFER_OBJECT, NULL );\ + USE_GL_FUNC(PGLFNGLFRAMEBUFFERTEXTURE3DEXTPROC, glFramebufferTexture3DEXT, EXT_FRAMEBUFFER_OBJECT, NULL );\ + USE_GL_FUNC(PGLFNGLFRAMEBUFFERRENDERBUFFEREXTPROC, glFramebufferRenderbufferEXT, EXT_FRAMEBUFFER_OBJECT, NULL );\ + USE_GL_FUNC(PGLFNGLGENERATEMIPMAPEXTPROC, glGenerateMipmapEXT, EXT_FRAMEBUFFER_OBJECT, NULL );\ + USE_GL_FUNC(PGLFNGLGETRENDERBUFFERPARAMETERIVEXTPROC, glGetRenderbufferParameterivEXT, EXT_FRAMEBUFFER_OBJECT, NULL );\ + USE_GL_FUNC(PGLFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC, glGetFramebufferAttachmentParameterivEXT, EXT_FRAMEBUFFER_OBJECT, NULL );\ /* GL_EXT_framebuffer_blit */ \ - USE_GL_FUNC(PGLFNGLBLITFRAMEBUFFEREXTPROC, glBlitFramebufferEXT); \ + USE_GL_FUNC(PGLFNGLBLITFRAMEBUFFEREXTPROC, glBlitFramebufferEXT, EXT_FRAMEBUFFER_BLIT, NULL );\ /* GL_EXT_paletted_texture */ \ - USE_GL_FUNC(PGLFNGLCOLORTABLEEXTPROC, glColorTableEXT); \ + USE_GL_FUNC(PGLFNGLCOLORTABLEEXTPROC, glColorTableEXT, EXT_PALETTED_TEXTURE, NULL );\ /* GL_EXT_point_parameters */ \ - USE_GL_FUNC(PGLFNGLPOINTPARAMETERFEXTPROC, glPointParameterfEXT); \ - USE_GL_FUNC(PGLFNGLPOINTPARAMETERFVEXTPROC, glPointParameterfvEXT); \ + USE_GL_FUNC(PGLFNGLPOINTPARAMETERFEXTPROC, glPointParameterfEXT, EXT_POINT_PARAMETERS, NULL );\ + USE_GL_FUNC(PGLFNGLPOINTPARAMETERFVEXTPROC, glPointParameterfvEXT, EXT_POINT_PARAMETERS, NULL );\ /* GL_EXT_secondary_color */ \ - USE_GL_FUNC(PGLFNGLSECONDARYCOLOR3UBEXTPROC, glSecondaryColor3ubEXT); \ - USE_GL_FUNC(PGLFNGLSECONDARYCOLOR3FEXTPROC, glSecondaryColor3fEXT); \ - USE_GL_FUNC(PGLFNGLSECONDARYCOLOR3FVEXTPROC, glSecondaryColor3fvEXT); \ - USE_GL_FUNC(PGLFNGLSECONDARYCOLORPOINTEREXTPROC, glSecondaryColorPointerEXT); \ + USE_GL_FUNC(PGLFNGLSECONDARYCOLOR3UBEXTPROC, glSecondaryColor3ubEXT, EXT_SECONDARY_COLOR, NULL );\ + USE_GL_FUNC(PGLFNGLSECONDARYCOLOR3FEXTPROC, glSecondaryColor3fEXT, EXT_SECONDARY_COLOR, NULL );\ + USE_GL_FUNC(PGLFNGLSECONDARYCOLOR3FVEXTPROC, glSecondaryColor3fvEXT, EXT_SECONDARY_COLOR, NULL );\ + USE_GL_FUNC(PGLFNGLSECONDARYCOLORPOINTEREXTPROC, glSecondaryColorPointerEXT, EXT_SECONDARY_COLOR, NULL );\ /* GL_EXT_texture3D */ \ - USE_GL_FUNC(PGLFNGLTEXIMAGE3DEXTPROC, glTexImage3DEXT); \ - USE_GL_FUNC(PGLFNGLTEXSUBIMAGE3DEXTPROC, glTexSubImage3DEXT); \ + USE_GL_FUNC(PGLFNGLTEXIMAGE3DEXTPROC, glTexImage3DEXT, EXT_TEXTURE3D, glTexImage3D);\ + USE_GL_FUNC(PGLFNGLTEXSUBIMAGE3DEXTPROC, glTexSubImage3DEXT, EXT_TEXTURE3D, glTexSubImage3D);\ /* GL_ARB_vertex_program */ \ - USE_GL_FUNC(PGLFNGENPROGRAMSARBPROC, glGenProgramsARB); \ - USE_GL_FUNC(PGLFNBINDPROGRAMARBPROC, glBindProgramARB); \ - USE_GL_FUNC(PGLFNPROGRAMSTRINGARBPROC, glProgramStringARB); \ - USE_GL_FUNC(PGLFNDELETEPROGRAMSARBPROC, glDeleteProgramsARB); \ - USE_GL_FUNC(PGLFNPROGRAMENVPARAMETER4FVARBPROC, glProgramEnvParameter4fvARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIBPOINTERARBPROC, glVertexAttribPointerARB); \ - USE_GL_FUNC(PGLFNENABLEVERTEXATTRIBARRAYARBPROC, glEnableVertexAttribArrayARB); \ - USE_GL_FUNC(PGLFNDISABLEVERTEXATTRIBARRAYARBPROC, glDisableVertexAttribArrayARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB1DARBPROC, glVertexAttrib1dARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB1DVARBPROC, glVertexAttrib1dvARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB1FARBPROC, glVertexAttrib1fARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB1FVARBPROC, glVertexAttrib1fvARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB1SARBPROC, glVertexAttrib1sARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB1SVARBPROC, glVertexAttrib1svARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB2DARBPROC, glVertexAttrib2dARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB2DVARBPROC, glVertexAttrib2dvARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB2FARBPROC, glVertexAttrib2fARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB2FVARBPROC, glVertexAttrib2fvARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB2SARBPROC, glVertexAttrib2sARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB2SVARBPROC, glVertexAttrib2svARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB3DARBPROC, glVertexAttrib3dARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB3DVARBPROC, glVertexAttrib3dvARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB3FARBPROC, glVertexAttrib3fARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB3FVARBPROC, glVertexAttrib3fvARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB3SARBPROC, glVertexAttrib3sARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB3SVARBPROC, glVertexAttrib3svARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4NBVARBPROC, glVertexAttrib4NbvARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4NIVARBPROC, glVertexAttrib4NivARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4NSVARBPROC, glVertexAttrib4NsvARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4NUBARBPROC, glVertexAttrib4NubARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4NUBVARBPROC, glVertexAttrib4NubvARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4NUIVARBPROC, glVertexAttrib4NuivARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4NUSVARBPROC, glVertexAttrib4NusvARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4BVARBPROC, glVertexAttrib4bvARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4DARBPROC, glVertexAttrib4dARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4DVARBPROC, glVertexAttrib4dvARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4FARBPROC, glVertexAttrib4fARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4FVARBPROC, glVertexAttrib4fvARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4IVARBPROC, glVertexAttrib4ivARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4SARBPROC, glVertexAttrib4sARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4SVARBPROC, glVertexAttrib4svARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4UBVARBPROC, glVertexAttrib4ubvARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4UIVARBPROC, glVertexAttrib4uivARB); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4USVARBPROC, glVertexAttrib4usvARB); \ - USE_GL_FUNC(PGLFNGETPROGRAMIVARBPROC, glGetProgramivARB); \ + USE_GL_FUNC(PGLFNGENPROGRAMSARBPROC, glGenProgramsARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNBINDPROGRAMARBPROC, glBindProgramARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNPROGRAMSTRINGARBPROC, glProgramStringARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNDELETEPROGRAMSARBPROC, glDeleteProgramsARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNPROGRAMENVPARAMETER4FVARBPROC, glProgramEnvParameter4fvARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIBPOINTERARBPROC, glVertexAttribPointerARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNENABLEVERTEXATTRIBARRAYARBPROC, glEnableVertexAttribArrayARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNDISABLEVERTEXATTRIBARRAYARBPROC, glDisableVertexAttribArrayARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB1DARBPROC, glVertexAttrib1dARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB1DVARBPROC, glVertexAttrib1dvARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB1FARBPROC, glVertexAttrib1fARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB1FVARBPROC, glVertexAttrib1fvARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB1SARBPROC, glVertexAttrib1sARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB1SVARBPROC, glVertexAttrib1svARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB2DARBPROC, glVertexAttrib2dARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB2DVARBPROC, glVertexAttrib2dvARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB2FARBPROC, glVertexAttrib2fARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB2FVARBPROC, glVertexAttrib2fvARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB2SARBPROC, glVertexAttrib2sARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB2SVARBPROC, glVertexAttrib2svARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB3DARBPROC, glVertexAttrib3dARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB3DVARBPROC, glVertexAttrib3dvARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB3FARBPROC, glVertexAttrib3fARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB3FVARBPROC, glVertexAttrib3fvARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB3SARBPROC, glVertexAttrib3sARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB3SVARBPROC, glVertexAttrib3svARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4NBVARBPROC, glVertexAttrib4NbvARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4NIVARBPROC, glVertexAttrib4NivARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4NSVARBPROC, glVertexAttrib4NsvARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4NUBARBPROC, glVertexAttrib4NubARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4NUBVARBPROC, glVertexAttrib4NubvARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4NUIVARBPROC, glVertexAttrib4NuivARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4NUSVARBPROC, glVertexAttrib4NusvARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4BVARBPROC, glVertexAttrib4bvARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4DARBPROC, glVertexAttrib4dARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4DVARBPROC, glVertexAttrib4dvARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4FARBPROC, glVertexAttrib4fARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4FVARBPROC, glVertexAttrib4fvARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4IVARBPROC, glVertexAttrib4ivARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4SARBPROC, glVertexAttrib4sARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4SVARBPROC, glVertexAttrib4svARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4UBVARBPROC, glVertexAttrib4ubvARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4UIVARBPROC, glVertexAttrib4uivARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4USVARBPROC, glVertexAttrib4usvARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNGETPROGRAMIVARBPROC, glGetProgramivARB, ARB_VERTEX_PROGRAM, NULL );\ /* GL_ARB_shader_objects */ \ - USE_GL_FUNC(WINED3D_PFNGLGETOBJECTPARAMETERIVARBPROC, glGetObjectParameterivARB); \ - USE_GL_FUNC(WINED3D_PFNGLGETOBJECTPARAMETERFVARBPROC, glGetObjectParameterfvARB); \ - USE_GL_FUNC(WINED3D_PFNGLGETUNIFORMLOCATIONARBPROC, glGetUniformLocationARB); \ - USE_GL_FUNC(WINED3D_PFNGLGETACTIVEUNIFORMARBPROC, glGetActiveUniformARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORM1IARBPROC, glUniform1iARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORM2IARBPROC, glUniform2iARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORM3IARBPROC, glUniform3iARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORM4IARBPROC, glUniform4iARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORM1IARBPROC, glUniform1fARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORM2FARBPROC, glUniform2fARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORM3FARBPROC, glUniform3fARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORM4FARBPROC, glUniform4fARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORM1FVARBPROC, glUniform1fvARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORM2FVARBPROC, glUniform2fvARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORM3FVARBPROC, glUniform3fvARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORM4FVARBPROC, glUniform4fvARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORM1IVARBPROC, glUniform1ivARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORM2IVARBPROC, glUniform2ivARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORM3IVARBPROC, glUniform3ivARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORM4IVARBPROC, glUniform4ivARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORMMATRIX2FVARBPROC, glUniformMatrix2fvARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORMMATRIX3FVARBPROC, glUniformMatrix3fvARB); \ - USE_GL_FUNC(WINED3D_PFNGLUNIFORMMATRIX4FVARBPROC, glUniformMatrix4fvARB); \ - USE_GL_FUNC(WINED3D_PFNGLGETUNIFORMFVARBPROC, glGetUniform4fvARB); \ - USE_GL_FUNC(WINED3D_PFNGLGETUNIFORMIVARBPROC, glGetUniform4ivARB); \ - USE_GL_FUNC(WINED3D_PFNGLGETINFOLOGARBPROC, glGetInfoLogARB); \ - USE_GL_FUNC(WINED3D_PFNGLUSEPROGRAMOBJECTARBPROC, glUseProgramObjectARB); \ - USE_GL_FUNC(WINED3D_PFNGLCREATESHADEROBJECTARBPROC, glCreateShaderObjectARB); \ - USE_GL_FUNC(WINED3D_PFNGLSHADERSOURCEARBPROC, glShaderSourceARB); \ - USE_GL_FUNC(WINED3D_PFNGLCOMPILESHADERARBPROC, glCompileShaderARB); \ - USE_GL_FUNC(WINED3D_PFNGLCREATEPROGRAMOBJECTARBPROC, glCreateProgramObjectARB); \ - USE_GL_FUNC(WINED3D_PFNGLATTACHOBJECTARBPROC, glAttachObjectARB); \ - USE_GL_FUNC(WINED3D_PFNGLLINKPROGRAMARBPROC, glLinkProgramARB); \ - USE_GL_FUNC(WINED3D_PFNGLDETACHOBJECTARBPROC, glDetachObjectARB); \ - USE_GL_FUNC(WINED3D_PFNGLDELETEOBJECTARBPROC, glDeleteObjectARB); \ - USE_GL_FUNC(WINED3D_PFNGLVALIDATEPROGRAMARBPROC, glValidateProgramARB); \ - USE_GL_FUNC(WINED3D_PFNGLGETATTACHEDOBJECTSARBPROC, glGetAttachedObjectsARB); \ - USE_GL_FUNC(WINED3D_PFNGLGETHANDLEARBPROC, glGetHandleARB); \ - USE_GL_FUNC(WINED3D_PFNGLGETSHADERSOURCEARBPROC, glGetShaderSourceARB); \ - USE_GL_FUNC(WINED3D_PFNGLBINDATTRIBLOCATIONARBPROC, glBindAttribLocationARB); \ - USE_GL_FUNC(WINED3D_PFNGLGETATTRIBLOCATIONARBPROC, glGetAttribLocationARB); \ + USE_GL_FUNC(WINED3D_PFNGLGETOBJECTPARAMETERIVARBPROC, glGetObjectParameterivARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLGETOBJECTPARAMETERFVARBPROC, glGetObjectParameterfvARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLGETUNIFORMLOCATIONARBPROC, glGetUniformLocationARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLGETACTIVEUNIFORMARBPROC, glGetActiveUniformARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORM1IARBPROC, glUniform1iARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORM2IARBPROC, glUniform2iARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORM3IARBPROC, glUniform3iARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORM4IARBPROC, glUniform4iARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORM1IARBPROC, glUniform1fARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORM2FARBPROC, glUniform2fARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORM3FARBPROC, glUniform3fARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORM4FARBPROC, glUniform4fARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORM1FVARBPROC, glUniform1fvARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORM2FVARBPROC, glUniform2fvARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORM3FVARBPROC, glUniform3fvARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORM4FVARBPROC, glUniform4fvARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORM1IVARBPROC, glUniform1ivARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORM2IVARBPROC, glUniform2ivARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORM3IVARBPROC, glUniform3ivARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORM4IVARBPROC, glUniform4ivARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORMMATRIX2FVARBPROC, glUniformMatrix2fvARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORMMATRIX3FVARBPROC, glUniformMatrix3fvARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUNIFORMMATRIX4FVARBPROC, glUniformMatrix4fvARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLGETUNIFORMFVARBPROC, glGetUniform4fvARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLGETUNIFORMIVARBPROC, glGetUniform4ivARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLGETINFOLOGARBPROC, glGetInfoLogARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLUSEPROGRAMOBJECTARBPROC, glUseProgramObjectARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLCREATESHADEROBJECTARBPROC, glCreateShaderObjectARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLSHADERSOURCEARBPROC, glShaderSourceARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLCOMPILESHADERARBPROC, glCompileShaderARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLCREATEPROGRAMOBJECTARBPROC, glCreateProgramObjectARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLATTACHOBJECTARBPROC, glAttachObjectARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLLINKPROGRAMARBPROC, glLinkProgramARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLDETACHOBJECTARBPROC, glDetachObjectARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLDELETEOBJECTARBPROC, glDeleteObjectARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLVALIDATEPROGRAMARBPROC, glValidateProgramARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLGETATTACHEDOBJECTSARBPROC, glGetAttachedObjectsARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLGETHANDLEARBPROC, glGetHandleARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLGETSHADERSOURCEARBPROC, glGetShaderSourceARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLBINDATTRIBLOCATIONARBPROC, glBindAttribLocationARB, ARB_SHADER_OBJECTS, NULL );\ + USE_GL_FUNC(WINED3D_PFNGLGETATTRIBLOCATIONARBPROC, glGetAttribLocationARB, ARB_SHADER_OBJECTS, NULL );\ /* GL_EXT_stencil_two_side */ \ - USE_GL_FUNC(PGLFNACTIVESTENCILFACEEXTPROC, glActiveStencilFaceEXT); \ + USE_GL_FUNC(PGLFNACTIVESTENCILFACEEXTPROC, glActiveStencilFaceEXT, EXT_STENCIL_TWO_SIDE, NULL );\ /* GL_ATI_separate_stencil */ \ - USE_GL_FUNC(PGLFNSTENCILOPSEPARATEATIPROC, glStencilOpSeparateATI); \ - USE_GL_FUNC(PGLFNSTENCILFUNCSEPARATEATIPROC, glStencilFuncSeparateATI); \ + USE_GL_FUNC(PGLFNSTENCILOPSEPARATEATIPROC, glStencilOpSeparateATI, ATI_SEPARATE_STENCIL, NULL );\ + USE_GL_FUNC(PGLFNSTENCILFUNCSEPARATEATIPROC, glStencilFuncSeparateATI, ATI_SEPARATE_STENCIL, NULL );\ /* GL_NV_half_float */ \ - USE_GL_FUNC(PGLFNVERTEX2HNVPROC, glVertex2hNV); \ - USE_GL_FUNC(PGLFNVERTEX2HVNVPROC, glVertex2hvNV); \ - USE_GL_FUNC(PGLFNVERTEX3HNVPROC, glVertex3hNV); \ - USE_GL_FUNC(PGLFNVERTEX3HVNVPROC, glVertex3hvNV); \ - USE_GL_FUNC(PGLFNVERTEX4HNVPROC, glVertex4hNV); \ - USE_GL_FUNC(PGLFNVERTEX4HVNVPROC, glVertex4hvNV); \ - USE_GL_FUNC(PGLFNNORMAL3HNVPROC, glNormal3hNV); \ - USE_GL_FUNC(PGLFNNORMAL3HVNVPROC, glNormal3hvNV); \ - USE_GL_FUNC(PGLFNCOLOR3HNVPROC, glColor3hNV); \ - USE_GL_FUNC(PGLFNCOLOR3HVNVPROC, glColor3hvNV); \ - USE_GL_FUNC(PGLFNCOLOR4HNVPROC, glColor4hNV); \ - USE_GL_FUNC(PGLFNCOLOR4HVNVPROC, glColor4hvNV); \ - USE_GL_FUNC(PGLFNTEXCOORD1HNVPROC, glTexCoord1hNV); \ - USE_GL_FUNC(PGLFNTEXCOORD1HVNVPROC, glTexCoord1hvNV); \ - USE_GL_FUNC(PGLFNTEXCOORD2HNVPROC, glTexCoord2hNV); \ - USE_GL_FUNC(PGLFNTEXCOORD2HVNVPROC, glTexCoord2hvNV); \ - USE_GL_FUNC(PGLFNTEXCOORD3HNVPROC, glTexCoord3hNV); \ - USE_GL_FUNC(PGLFNTEXCOORD3HVNVPROC, glTexCoord3hvNV); \ - USE_GL_FUNC(PGLFNTEXCOORD4HNVPROC, glTexCoord4hNV); \ - USE_GL_FUNC(PGLFNTEXCOORD4HVNVPROC, glTexCoord4hvNV); \ - USE_GL_FUNC(PGLFNMULTITEXCOORD1HNVPROC, glMultiTexCoord1hNV); \ - USE_GL_FUNC(PGLFNMULTITEXCOORD1HVNVPROC, glMultiTexCoord1hvNV); \ - USE_GL_FUNC(PGLFNMULTITEXCOORD2HNVPROC, glMultiTexCoord2hNV); \ - USE_GL_FUNC(PGLFNMULTITEXCOORD2HVNVPROC, glMultiTexCoord2hvNV); \ - USE_GL_FUNC(PGLFNMULTITEXCOORD3HNVPROC, glMultiTexCoord3hNV); \ - USE_GL_FUNC(PGLFNMULTITEXCOORD3HVNVPROC, glMultiTexCoord3hvNV); \ - USE_GL_FUNC(PGLFNMULTITEXCOORD4HNVPROC, glMultiTexCoord4hNV); \ - USE_GL_FUNC(PGLFNMULTITEXCOORD4HVNVPROC, glMultiTexCoord4hvNV); \ - USE_GL_FUNC(PGLFNFOGCOORDHNVPROC, glFogCoordhNV); \ - USE_GL_FUNC(PGLFNFOGCOORDHVNVPROC, glFogCoordhvNV); \ - USE_GL_FUNC(PGLFNSECONDARYCOLOR3HNVPROC, glSecondaryColor3hNV); \ - USE_GL_FUNC(PGLFNSECONDARYCOLOR3HVNVPROC, glSecondaryColor3hvNV); \ - USE_GL_FUNC(PGLFNVERTEXWEIGHTHNVPROC, glVertexWeighthNV); \ - USE_GL_FUNC(PGLFNVERTEXWEIGHTHVNVPROC, glVertexWeighthvNV); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB1HNVPROC, glVertexAttrib1hNV); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB1HVNVPROC, glVertexAttrib1hvNV); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB2HNVPROC, glVertexAttrib2hNV); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB2HVNVPROC, glVertexAttrib2hvNV); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB3HNVPROC, glVertexAttrib3hNV); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB3HVNVPROC, glVertexAttrib3hvNV); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4HNVPROC, glVertexAttrib4hNV); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4HVNVPROC, glVertexAttrib4hvNV); \ - USE_GL_FUNC(PGLFNVERTEXATTRIBS1HVNVPROC, glVertexAttribs1hvNV); \ - USE_GL_FUNC(PGLFNVERTEXATTRIBS2HVNVPROC, glVertexAttribs2hvNV); \ - USE_GL_FUNC(PGLFNVERTEXATTRIBS3HVNVPROC, glVertexAttribs3hvNV); \ - USE_GL_FUNC(PGLFNVERTEXATTRIBS4HVNVPROC, glVertexAttribs4hvNV); \ + USE_GL_FUNC(PGLFNVERTEX2HNVPROC, glVertex2hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEX2HVNVPROC, glVertex2hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEX3HNVPROC, glVertex3hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEX3HVNVPROC, glVertex3hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEX4HNVPROC, glVertex4hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEX4HVNVPROC, glVertex4hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNNORMAL3HNVPROC, glNormal3hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNNORMAL3HVNVPROC, glNormal3hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNCOLOR3HNVPROC, glColor3hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNCOLOR3HVNVPROC, glColor3hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNCOLOR4HNVPROC, glColor4hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNCOLOR4HVNVPROC, glColor4hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNTEXCOORD1HNVPROC, glTexCoord1hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNTEXCOORD1HVNVPROC, glTexCoord1hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNTEXCOORD2HNVPROC, glTexCoord2hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNTEXCOORD2HVNVPROC, glTexCoord2hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNTEXCOORD3HNVPROC, glTexCoord3hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNTEXCOORD3HVNVPROC, glTexCoord3hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNTEXCOORD4HNVPROC, glTexCoord4hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNTEXCOORD4HVNVPROC, glTexCoord4hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNMULTITEXCOORD1HNVPROC, glMultiTexCoord1hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNMULTITEXCOORD1HVNVPROC, glMultiTexCoord1hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNMULTITEXCOORD2HNVPROC, glMultiTexCoord2hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNMULTITEXCOORD2HVNVPROC, glMultiTexCoord2hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNMULTITEXCOORD3HNVPROC, glMultiTexCoord3hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNMULTITEXCOORD3HVNVPROC, glMultiTexCoord3hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNMULTITEXCOORD4HNVPROC, glMultiTexCoord4hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNMULTITEXCOORD4HVNVPROC, glMultiTexCoord4hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNFOGCOORDHNVPROC, glFogCoordhNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNFOGCOORDHVNVPROC, glFogCoordhvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNSECONDARYCOLOR3HNVPROC, glSecondaryColor3hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNSECONDARYCOLOR3HVNVPROC, glSecondaryColor3hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEXWEIGHTHNVPROC, glVertexWeighthNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEXWEIGHTHVNVPROC, glVertexWeighthvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB1HNVPROC, glVertexAttrib1hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB1HVNVPROC, glVertexAttrib1hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB2HNVPROC, glVertexAttrib2hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB2HVNVPROC, glVertexAttrib2hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB3HNVPROC, glVertexAttrib3hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB3HVNVPROC, glVertexAttrib3hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4HNVPROC, glVertexAttrib4hNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIB4HVNVPROC, glVertexAttrib4hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIBS1HVNVPROC, glVertexAttribs1hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIBS2HVNVPROC, glVertexAttribs2hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIBS3HVNVPROC, glVertexAttribs3hvNV, NV_HALF_FLOAT, NULL );\ + USE_GL_FUNC(PGLFNVERTEXATTRIBS4HVNVPROC, glVertexAttribs4hvNV, NV_HALF_FLOAT, NULL );\ /* GL_NV_register_combiners */ \ - USE_GL_FUNC(PGLFNCOMBINERINPUTNVPROC, glCombinerInputNV); \ - USE_GL_FUNC(PGLFNCOMBINEROUTPUTNVPROC, glCombinerOutputNV); \ - USE_GL_FUNC(PGLFNCOMBINERPARAMETERFNVPROC, glCombinerParameterfNV); \ - USE_GL_FUNC(PGLFNCOMBINERPARAMETERFVNVPROC, glCombinerParameterfvNV); \ - USE_GL_FUNC(PGLFNCOMBINERPARAMETERINVPROC, glCombinerParameteriNV); \ - USE_GL_FUNC(PGLFNCOMBINERPARAMETERIVNVPROC, glCombinerParameterivNV); \ - USE_GL_FUNC(PGLFNFINALCOMBINERINPUTNVPROC, glFinalCombinerInputNV); \ + USE_GL_FUNC(PGLFNCOMBINERINPUTNVPROC, glCombinerInputNV, NV_REGISTER_COMBINERS, NULL );\ + USE_GL_FUNC(PGLFNCOMBINEROUTPUTNVPROC, glCombinerOutputNV, NV_REGISTER_COMBINERS, NULL );\ + USE_GL_FUNC(PGLFNCOMBINERPARAMETERFNVPROC, glCombinerParameterfNV, NV_REGISTER_COMBINERS, NULL );\ + USE_GL_FUNC(PGLFNCOMBINERPARAMETERFVNVPROC, glCombinerParameterfvNV, NV_REGISTER_COMBINERS, NULL );\ + USE_GL_FUNC(PGLFNCOMBINERPARAMETERINVPROC, glCombinerParameteriNV, NV_REGISTER_COMBINERS, NULL );\ + USE_GL_FUNC(PGLFNCOMBINERPARAMETERIVNVPROC, glCombinerParameterivNV, NV_REGISTER_COMBINERS, NULL );\ + USE_GL_FUNC(PGLFNFINALCOMBINERINPUTNVPROC, glFinalCombinerInputNV, NV_REGISTER_COMBINERS, NULL );\ /* GL_NV_fence */ \ - USE_GL_FUNC(PGLFNGENFENCESNVPROC, glGenFencesNV); \ - USE_GL_FUNC(PGLFNDELETEFENCESNVPROC, glDeleteFencesNV); \ - USE_GL_FUNC(PGLFNSETFENCENVPROC, glSetFenceNV); \ - USE_GL_FUNC(PGLFNTESTFENCENVPROC, glTestFenceNV); \ - USE_GL_FUNC(PGLFNFINISHFENCENVPROC, glFinishFenceNV); \ - USE_GL_FUNC(PGLFNISFENCENVPROC, glIsFenceNV); \ - USE_GL_FUNC(PGLFNGETFENCEIVNVPROC, glGetFenceivNV); \ + USE_GL_FUNC(PGLFNGENFENCESNVPROC, glGenFencesNV, NV_FENCE, NULL );\ + USE_GL_FUNC(PGLFNDELETEFENCESNVPROC, glDeleteFencesNV, NV_FENCE, NULL );\ + USE_GL_FUNC(PGLFNSETFENCENVPROC, glSetFenceNV, NV_FENCE, NULL );\ + USE_GL_FUNC(PGLFNTESTFENCENVPROC, glTestFenceNV, NV_FENCE, NULL );\ + USE_GL_FUNC(PGLFNFINISHFENCENVPROC, glFinishFenceNV, NV_FENCE, NULL );\ + USE_GL_FUNC(PGLFNISFENCENVPROC, glIsFenceNV, NV_FENCE, NULL );\ + USE_GL_FUNC(PGLFNGETFENCEIVNVPROC, glGetFenceivNV, NV_FENCE, NULL );\ /* GL_APPLE_fence */ \ - USE_GL_FUNC(PGLFNGENFENCESAPPLEPROC, glGenFencesAPPLE); \ - USE_GL_FUNC(PGLFNDELETEFENCESAPPLEPROC, glDeleteFencesAPPLE); \ - USE_GL_FUNC(PGLFNSETFENCEAPPLEPROC, glSetFenceAPPLE); \ - USE_GL_FUNC(PGLFNTESTFENCEAPPLEPROC, glTestFenceAPPLE); \ - USE_GL_FUNC(PGLFNFINISHFENCEAPPLEPROC, glFinishFenceAPPLE); \ - USE_GL_FUNC(PGLFNISFENCEAPPLEPROC, glIsFenceAPPLE); \ - USE_GL_FUNC(PGLFNTESTOBJECTAPPLEPROC, glTestObjectAPPLE); \ - USE_GL_FUNC(PGLFNFINISHOBJECTAPPLEPROC, glFinishObjectAPPLE); \ + USE_GL_FUNC(PGLFNGENFENCESAPPLEPROC, glGenFencesAPPLE, APPLE_FENCE, NULL );\ + USE_GL_FUNC(PGLFNDELETEFENCESAPPLEPROC, glDeleteFencesAPPLE, APPLE_FENCE, NULL );\ + USE_GL_FUNC(PGLFNSETFENCEAPPLEPROC, glSetFenceAPPLE, APPLE_FENCE, NULL );\ + USE_GL_FUNC(PGLFNTESTFENCEAPPLEPROC, glTestFenceAPPLE, APPLE_FENCE, NULL );\ + USE_GL_FUNC(PGLFNFINISHFENCEAPPLEPROC, glFinishFenceAPPLE, APPLE_FENCE, NULL );\ + USE_GL_FUNC(PGLFNISFENCEAPPLEPROC, glIsFenceAPPLE, APPLE_FENCE, NULL );\ + USE_GL_FUNC(PGLFNTESTOBJECTAPPLEPROC, glTestObjectAPPLE, APPLE_FENCE, NULL );\ + USE_GL_FUNC(PGLFNFINISHOBJECTAPPLEPROC, glFinishObjectAPPLE, APPLE_FENCE, NULL );\ /* GL_ATI_envmap_bumpmap */ \ - USE_GL_FUNC(PGLFNTEXBUMPPARAMETERIVATIPROC, glTexBumpParameterivATI); \ - USE_GL_FUNC(PGLFNTEXBUMPPARAMETERFVATIPROC, glTexBumpParameterfvATI); \ - USE_GL_FUNC(PGLFNGETTEXBUMPPARAMETERIVATIPROC, glGetTexBumpParameterivATI); \ - USE_GL_FUNC(PGLFNGETTEXBUMPPARAMETERFVATIPROC, glGetTexBumpParameterfvATI); \ + USE_GL_FUNC(PGLFNTEXBUMPPARAMETERIVATIPROC, glTexBumpParameterivATI, ATI_ENVMAP_BUMPMAP, NULL );\ + USE_GL_FUNC(PGLFNTEXBUMPPARAMETERFVATIPROC, glTexBumpParameterfvATI, ATI_ENVMAP_BUMPMAP, NULL );\ + USE_GL_FUNC(PGLFNGETTEXBUMPPARAMETERIVATIPROC, glGetTexBumpParameterivATI, ATI_ENVMAP_BUMPMAP, NULL );\ + USE_GL_FUNC(PGLFNGETTEXBUMPPARAMETERFVATIPROC, glGetTexBumpParameterfvATI, ATI_ENVMAP_BUMPMAP, NULL );\ /* GLX_SGI_video_sync */ \ - USE_GL_FUNC(PGLXFNGETVIDEOSYNCSGIPROC, glXGetVideoSyncSGI); \ - USE_GL_FUNC(PGLXFNWAITVIDEOSYNCSGIPROC, glXWaitVideoSyncSGI); \ + USE_GL_FUNC(PGLXFNGETVIDEOSYNCSGIPROC, glXGetVideoSyncSGI, SGI_VIDEO_SYNC, NULL );\ + USE_GL_FUNC(PGLXFNWAITVIDEOSYNCSGIPROC, glXWaitVideoSyncSGI, SGI_VIDEO_SYNC, NULL );\ /* GL_APPLE_flush_render */ \ - USE_GL_FUNC(PGLFNFLUSHRENDERAPPLEPROC, glFlushRenderApple); \ - USE_GL_FUNC(PGLFNFINISHRENDERAPPLEPROC, glFinishRenderApple); \ - -/* OpenGL 2.0 functions */ -#define GL2_FUNCS_GEN \ - USE_GL_FUNC(PGLFNBLENDEQUATIONSEPARATEPROC, glBlendEquationSeparate); \ - USE_GL_FUNC(PGLFNDRAWBUFFERSPROC, glDrawBuffers); \ - USE_GL_FUNC(PGLFNSTENCILOPSEPARATEPROC, glStencilOpSeparate); \ - USE_GL_FUNC(PGLFNSTENCILFUNCSEPARATEPROC, glStencilFuncSeparate); \ - USE_GL_FUNC(PGLFNSTENCILMASKSEPARATEPROC, glStencilMaskSeparate); \ - USE_GL_FUNC(PGLFNATTACHSHADERPROC, glAttachShader); \ - USE_GL_FUNC(PGLFNBINDATTRIBLOCATIONPROC, glBindAttribLocation); \ - USE_GL_FUNC(PGLFNCOMPILESHADERPROC, glCompileShader); \ - USE_GL_FUNC(PGLFNCREATEPROGRAMPROC, glCreateProgram); \ - USE_GL_FUNC(PGLFNCREATESHADERPROC, glCreateShader); \ - USE_GL_FUNC(PGLFNDELETEPROGRAMPROC, glDeleteProgram); \ - USE_GL_FUNC(PGLFNDELETESHADERPROC, glDeleteShader); \ - USE_GL_FUNC(PGLFNDETACHSHADERPROC, glDetachShader); \ - USE_GL_FUNC(PGLFNDISABLEVERTEXATTRIBARRAYPROC, glDisableVertexAttribArray); \ - USE_GL_FUNC(PGLFNENABLEVERTEXATTRIBARRAYPROC, glEnableVertexAttribArray); \ - USE_GL_FUNC(PGLFNGETACTIVEATTRIBPROC, glGetActiveAttrib); \ - USE_GL_FUNC(PGLFNGETACTIVEUNIFORMPROC, glGetActiveUniform); \ - USE_GL_FUNC(PGLFNGETATTACHEDSHADERSPROC, glGetAttachedShaders); \ - USE_GL_FUNC(PGLFNGETATTRIBLOCATIONPROC, glGetAttribLocation); \ - USE_GL_FUNC(PGLFNGETPROGRAMIVPROC, glGetProgramiv); \ - USE_GL_FUNC(PGLFNGETPROGRAMINFOLOGPROC, glGetProgramInfoLog); \ - USE_GL_FUNC(PGLFNGETSHADERIVPROC, glGetShaderiv); \ - USE_GL_FUNC(PGLFNGETSHADERINFOLOGPROC, glGetShaderInfoLog); \ - USE_GL_FUNC(PGLFNGETSHADERSOURCEPROC, glGetShaderSource); \ - USE_GL_FUNC(PGLFNGETUNIFORMLOCATIONPROC, glGetUniformLocation); \ - USE_GL_FUNC(PGLFNGETUNIFORMFVPROC, glGetUniformfv); \ - USE_GL_FUNC(PGLFNGETUNIFORMIVPROC, glGetUniformiv); \ - USE_GL_FUNC(PGLFNGETVERTEXATTRIBDVPROC, glGetVertexAttribdv); \ - USE_GL_FUNC(PGLFNGETVERTEXATTRIBFVPROC, glGetVertexAttribfv); \ - USE_GL_FUNC(PGLFNGETVERTEXATTRIBIVPROC, glGetVertexAttribiv); \ - USE_GL_FUNC(PGLFNGETVERTEXATTRIBPOINTERVPROC, glGetVertexAttribPointerv); \ - USE_GL_FUNC(PGLFNISPROGRAMPROC, glIsProgram); \ - USE_GL_FUNC(PGLFNISSHADERPROC, glIsShader); \ - USE_GL_FUNC(PGLFNLINKPROGRAMPROC, glLinkProgram); \ - USE_GL_FUNC(PGLFNSHADERSOURCEPROC, glShaderSource); \ - USE_GL_FUNC(PGLFNUSEPROGRAMPROC, glUseProgram); \ - USE_GL_FUNC(PGLFNUNIFORM1FPROC, glUniform1f); \ - USE_GL_FUNC(PGLFNUNIFORM2FPROC, glUniform2f); \ - USE_GL_FUNC(PGLFNUNIFORM3FPROC, glUniform3f); \ - USE_GL_FUNC(PGLFNUNIFORM4FPROC, glUniform4f); \ - USE_GL_FUNC(PGLFNUNIFORM1IPROC, glUniform1i); \ - USE_GL_FUNC(PGLFNUNIFORM2IPROC, glUniform2i); \ - USE_GL_FUNC(PGLFNUNIFORM3IPROC, glUniform3i); \ - USE_GL_FUNC(PGLFNUNIFORM4IPROC, glUniform4i); \ - USE_GL_FUNC(PGLFNUNIFORM1FVPROC, glUniform1fv); \ - USE_GL_FUNC(PGLFNUNIFORM2FVPROC, glUniform2fv); \ - USE_GL_FUNC(PGLFNUNIFORM3FVPROC, glUniform3fv); \ - USE_GL_FUNC(PGLFNUNIFORM4FVPROC, glUniform4fv); \ - USE_GL_FUNC(PGLFNUNIFORM1IVPROC, glUniform1iv); \ - USE_GL_FUNC(PGLFNUNIFORM2IVPROC, glUniform2iv); \ - USE_GL_FUNC(PGLFNUNIFORM3IVPROC, glUniform3iv); \ - USE_GL_FUNC(PGLFNUNIFORM4IVPROC, glUniform4iv); \ - USE_GL_FUNC(PGLFNUNIFORMMATRIX2FVPROC, glUniformMatrix2fv); \ - USE_GL_FUNC(PGLFNUNIFORMMATRIX3FVPROC, glUniformMatrix3fv); \ - USE_GL_FUNC(PGLFNUNIFORMMATRIX4FVPROC, glUniformMatrix4fv); \ - USE_GL_FUNC(PGLFNVALIDATEPROGRAMPROC, glValidateProgram); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB1DPROC, glVertexAttrib1d); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB1DVPROC, glVertexAttrib1dv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB1FPROC, glVertexAttrib1f); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB1FVPROC, glVertexAttrib1fv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB1SPROC, glVertexAttrib1s); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB1SVPROC, glVertexAttrib1sv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB2DPROC, glVertexAttrib2d); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB2DVPROC, glVertexAttrib2dv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB2FPROC, glVertexAttrib2f); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB2FVPROC, glVertexAttrib2fv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB2SPROC, glVertexAttrib2s); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB2SVPROC, glVertexAttrib2sv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB3DPROC, glVertexAttrib3d); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB3DVPROC, glVertexAttrib3dv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB3FPROC, glVertexAttrib3f); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB3FVPROC, glVertexAttrib3fv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB3SPROC, glVertexAttrib3s); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB3SVPROC, glVertexAttrib3sv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4NBVPROC, glVertexAttrib4Nbv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4NIVPROC, glVertexAttrib4Niv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4NSVPROC, glVertexAttrib4Nsv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4NUBPROC, glVertexAttrib4Nub); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4NUBVPROC, glVertexAttrib4Nubv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4NUIVPROC, glVertexAttrib4Nuiv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4NUSVPROC, glVertexAttrib4Nusv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4BVPROC, glVertexAttrib4bv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4DPROC, glVertexAttrib4d); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4DVPROC, glVertexAttrib4dv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4FPROC, glVertexAttrib4f); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4FVPROC, glVertexAttrib4fv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4IVPROC, glVertexAttrib4iv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4SVPROC, glVertexAttrib4sv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4UBVPROC, glVertexAttrib4ubv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4UIVPROC, glVertexAttrib4uiv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIB4USVPROC, glVertexAttrib4usv); \ - USE_GL_FUNC(PGLFNVERTEXATTRIBPOINTERPROC, glVertexAttribPointer); \ - + USE_GL_FUNC(PGLFNFLUSHRENDERAPPLEPROC, glFlushRenderApple, APPLE_FLUSH_RENDER, NULL );\ + USE_GL_FUNC(PGLFNFINISHRENDERAPPLEPROC, glFinishRenderApple, APPLE_FLUSH_RENDER, NULL ); /**************************************************** * OpenGL WGL defines and functions pointer @@ -3691,17 +3596,17 @@ #endif #define WGL_EXT_FUNCS_GEN \ - USE_GL_FUNC(WINED3D_PFNWGLGETEXTENSIONSSTRINGARBPROC, wglGetExtensionsStringARB); \ - USE_GL_FUNC(WINED3D_PFNWGLGETPIXELFORMATATTRIBIVARBPROC, wglGetPixelFormatAttribivARB); \ - USE_GL_FUNC(WINED3D_PFNWGLGETPIXELFORMATATTRIBFVARBPROC, wglGetPixelFormatAttribfvARB); \ - USE_GL_FUNC(WINED3D_PFNWGLCHOOSEPIXELFORMATARBPROC, wglChoosePixelFormatARB); \ - USE_GL_FUNC(WINED3D_PFNWGLMAKECONTEXTCURRENTARBPROC, wglMakeContextCurrentARB); \ - USE_GL_FUNC(WINED3D_PFNWGLGETCURRENTREADDCARBPROC, wglGetCurrentReadDCARB); \ - USE_GL_FUNC(WINED3D_PFNWGLCREATEPBUFFERARBPROC, wglCreatePbufferARB); \ - USE_GL_FUNC(WINED3D_PFNWGLGETPBUFFERDCARBPROC, wglGetPbufferDCARB); \ - USE_GL_FUNC(WINED3D_PFNWGLRELEASEPBUFFERDCARBPROC, wglReleasePbufferDCARB); \ - USE_GL_FUNC(WINED3D_PFNWGLDESTROYPBUFFERARBPROC, wglDestroyPbufferARB); \ - USE_GL_FUNC(WINED3D_PFNWGLQUERYPBUFFERARBPROC, wglQueryPbufferARB); + USE_GL_FUNC(WINED3D_PFNWGLGETEXTENSIONSSTRINGARBPROC, wglGetExtensionsStringARB, 0, NULL); \ + USE_GL_FUNC(WINED3D_PFNWGLGETPIXELFORMATATTRIBIVARBPROC, wglGetPixelFormatAttribivARB, 0, NULL); \ + USE_GL_FUNC(WINED3D_PFNWGLGETPIXELFORMATATTRIBFVARBPROC, wglGetPixelFormatAttribfvARB, 0, NULL); \ + USE_GL_FUNC(WINED3D_PFNWGLCHOOSEPIXELFORMATARBPROC, wglChoosePixelFormatARB, 0, NULL); \ + USE_GL_FUNC(WINED3D_PFNWGLMAKECONTEXTCURRENTARBPROC, wglMakeContextCurrentARB, 0, NULL); \ + USE_GL_FUNC(WINED3D_PFNWGLGETCURRENTREADDCARBPROC, wglGetCurrentReadDCARB, 0, NULL); \ + USE_GL_FUNC(WINED3D_PFNWGLCREATEPBUFFERARBPROC, wglCreatePbufferARB, 0, NULL); \ + USE_GL_FUNC(WINED3D_PFNWGLGETPBUFFERDCARBPROC, wglGetPbufferDCARB, 0, NULL); \ + USE_GL_FUNC(WINED3D_PFNWGLRELEASEPBUFFERDCARBPROC, wglReleasePbufferDCARB, 0, NULL); \ + USE_GL_FUNC(WINED3D_PFNWGLDESTROYPBUFFERARBPROC, wglDestroyPbufferARB, 0, NULL); \ + USE_GL_FUNC(WINED3D_PFNWGLQUERYPBUFFERARBPROC, wglQueryPbufferARB, 0, NULL); /**************************************************** @@ -3713,7 +3618,7 @@ WINED3DFORMAT conversion_group; } GlPixelFormatDesc; -#define USE_GL_FUNC(type, pfn) type pfn; +#define USE_GL_FUNC(type, pfn, ext, replace) type pfn; typedef struct _WineD3D_GL_Info { DWORD glx_version; @@ -3771,9 +3676,6 @@ GL_EXT_FUNCS_GEN; /** OpenGL WGL functions ptr */ WGL_EXT_FUNCS_GEN; - /** OpenGL 2.0 functions ptr */ - /* GL2_FUNCS_GEN; */ - /**/ GlPixelFormatDesc *gl_formats; } WineD3D_GL_Info; Modified: trunk/reactos/include/reactos/wine/wined3d_interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… ============================================================================== --- trunk/reactos/include/reactos/wine/wined3d_interface.h (original) +++ trunk/reactos/include/reactos/wine/wined3d_interface.h Tue Nov 27 14:15:08 2007 @@ -1134,6 +1134,7 @@ /* Internally used methods */ STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pRect) PURE; STDMETHOD(LoadTexture)(THIS, BOOL srgb_mode) PURE; + STDMETHOD_(void, BindTexture)(THIS) PURE; STDMETHOD(SaveSnapshot)(THIS_ const char *filename) PURE; STDMETHOD(SetContainer)(THIS_ IWineD3DBase *container) PURE; STDMETHOD_(void,SetGlTextureDesc)(THIS_ UINT textureName, int target) PURE; @@ -1191,6 +1192,7 @@ /*** IWineD3DSurface (Internal, no d3d mapping) methods ***/ #define IWineD3DSurface_AddDirtyRect(p,a) (p)->lpVtbl->AddDirtyRect(p,a) #define IWineD3DSurface_LoadTexture(p,a) (p)->lpVtbl->LoadTexture(p,a) +#define IWineD3DSurface_BindTexture(p) (p)->lpVtbl->BindTexture(p) #define IWineD3DSurface_SaveSnapshot(p,a) (p)->lpVtbl->SaveSnapshot(p,a) #define IWineD3DSurface_SetContainer(p,a) (p)->lpVtbl->SetContainer(p,a) #define IWineD3DSurface_SetGlTextureDesc(p,a,b) (p)->lpVtbl->SetGlTextureDesc(p,a,b)

1 0

[hpoussin] 30812: No need to increment handle count, it is already done in ExpAllocateHandleTableEntry()
by hpoussin＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: hpoussin Date: Tue Nov 27 11:41:27 2007 New Revision: 30812 URL: http://svn.reactos.org/svn/reactos?rev=30812&view=rev Log: No need to increment handle count, it is already done in ExpAllocateHandleTableEntry() Modified: trunk/reactos/ntoskrnl/ex/handle.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c (original) +++ trunk/reactos/ntoskrnl/ex/handle.c Tue Nov 27 11:41:27 2007 @@ -1120,9 +1120,8 @@ HandleTableEntry, NewEntry)) { - /* Lock the entry, increase the handle count */ + /* Lock the entry */ NewEntry->Value |= EXHANDLE_TABLE_ENTRY_LOCK_BIT; - NewTable->HandleCount++; } else {

1 0

[hpoussin] 30811: Better compatibility with MS Windows recycle bin Add traces
by hpoussin＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: hpoussin Date: Tue Nov 27 11:22:16 2007 New Revision: 30811 URL: http://svn.reactos.org/svn/reactos?rev=30811&view=rev Log: Better compatibility with MS Windows recycle bin Add traces Modified: trunk/reactos/lib/recyclebin/readme.txt trunk/reactos/lib/recyclebin/recyclebin.c trunk/reactos/lib/recyclebin/recyclebin_generic.c trunk/reactos/lib/recyclebin/recyclebin_generic_enumerator.c trunk/reactos/lib/recyclebin/recyclebin_private.h trunk/reactos/lib/recyclebin/recyclebin_v5.c trunk/reactos/lib/recyclebin/recyclebin_v5.h trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c Modified: trunk/reactos/lib/recyclebin/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/readme.txt?… ============================================================================== --- trunk/reactos/lib/recyclebin/readme.txt (original) +++ trunk/reactos/lib/recyclebin/readme.txt Tue Nov 27 11:22:16 2007 @@ -4,7 +4,6 @@ TODO - Empty a recycle bin containing directories (v5) - Set security on recycle bin folder -- Delete files > 4Gb - Make the library thread-safe 3 levels Modified: trunk/reactos/lib/recyclebin/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin.… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin.c (original) +++ trunk/reactos/lib/recyclebin/recyclebin.c Tue Nov 27 11:22:16 2007 @@ -10,12 +10,16 @@ #include "recyclebin_private.h" #include <stdio.h> +WINE_DEFAULT_DEBUG_CHANNEL(recyclebin); + BOOL WINAPI CloseRecycleBinHandle( IN HANDLE hDeletedFile) { IRecycleBinFile *rbf = (IRecycleBinFile *)hDeletedFile; HRESULT hr; + + TRACE("(%p)\n", hDeletedFile); hr = IRecycleBinFile_Release(rbf); if (SUCCEEDED(hr)) @@ -35,6 +39,8 @@ LPWSTR FileNameW = NULL; BOOL ret = FALSE; + TRACE("(%s)\n", debugstr_a(FileName)); + /* Check parameters */ if (FileName == NULL) { @@ -67,6 +73,8 @@ { IRecycleBin *prb; HRESULT hr; + + TRACE("(%s)\n", debugstr_w(FileName)); hr = GetDefaultRecycleBin(NULL, &prb); if (!SUCCEEDED(hr)) @@ -93,6 +101,8 @@ LPWSTR szRootW = NULL; BOOL ret = FALSE; + TRACE("(%s)\n", debugstr_a(pszRoot)); + if (pszRoot) { len = MultiByteToWideChar(CP_ACP, 0, pszRoot, -1, NULL, 0); @@ -121,6 +131,8 @@ { IRecycleBin *prb; HRESULT hr; + + TRACE("(%s)\n", debugstr_w(pszRoot)); hr = GetDefaultRecycleBin(pszRoot, &prb); if (!SUCCEEDED(hr)) @@ -149,6 +161,8 @@ LPWSTR szRootW = NULL; BOOL ret = FALSE; + TRACE("(%s, %p, %p)\n", debugstr_a(pszRoot), pFnCallback, Context); + if (pszRoot) { len = MultiByteToWideChar(CP_ACP, 0, pszRoot, -1, NULL, 0); @@ -181,6 +195,8 @@ IRecycleBinEnumList *prbel = NULL; IRecycleBinFile *prbf; HRESULT hr; + + TRACE("(%s, %p, %p)\n", debugstr_w(pszRoot), pFnCallback, Context); hr = GetDefaultRecycleBin(NULL, &prb); if (!SUCCEEDED(hr)) @@ -231,6 +247,8 @@ DWORD BufferSizeW = 0; BOOL ret = FALSE; + TRACE("(%p, %lu, %p, %p)\n", hDeletedFile, BufferSize, FileDetails, RequiredSize); + if (BufferSize >= FIELD_OFFSET(DELETED_FILE_DETAILS_A, FileName)) { BufferSizeW = FIELD_OFFSET(DELETED_FILE_DETAILS_W, FileName) @@ -274,6 +292,8 @@ HRESULT hr; SIZE_T NameSize, Needed; + TRACE("(%p, %lu, %p, %p)\n", hDeletedFile, BufferSize, FileDetails, RequiredSize); + hr = IRecycleBinFile_GetFileName(rbf, 0, NULL, &NameSize); if (!SUCCEEDED(hr)) goto cleanup; @@ -321,6 +341,8 @@ IRecycleBinFile *rbf = (IRecycleBinFile *)hDeletedFile; HRESULT hr; + TRACE("(%p)\n", hDeletedFile); + hr = IRecycleBinFile_Restore(rbf); if (SUCCEEDED(hr)) return TRUE; @@ -339,6 +361,8 @@ IUnknown *pUnk; HRESULT hr; + TRACE("(%s, %p)\n", debugstr_w(pszVolume), pprb); + if (!pprb) return E_POINTER; Modified: trunk/reactos/lib/recyclebin/recyclebin_generic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_generic.c (original) +++ trunk/reactos/lib/recyclebin/recyclebin_generic.c Tue Nov 27 11:22:16 2007 @@ -19,7 +19,7 @@ }; static HRESULT STDMETHODCALLTYPE -RecycleBinGenericVtbl_RecycleBin_QueryInterface( +RecycleBinGeneric_RecycleBin_QueryInterface( IRecycleBin *This, REFIID riid, void **ppvObject) @@ -46,7 +46,7 @@ } static ULONG STDMETHODCALLTYPE -RecycleBinGenericVtbl_RecycleBin_AddRef( +RecycleBinGeneric_RecycleBin_AddRef( IRecycleBin *This) { struct RecycleBinGeneric *s = CONTAINING_RECORD(This, struct RecycleBinGeneric, recycleBinImpl); @@ -55,8 +55,17 @@ return refCount; } +static VOID +RecycleBinGeneric_Destructor( + struct RecycleBinGeneric *s) +{ + TRACE("(%p)\n", s); + + CoTaskMemFree(s); +} + static ULONG STDMETHODCALLTYPE -RecycleBinGenericVtbl_RecycleBin_Release( +RecycleBinGeneric_RecycleBin_Release( IRecycleBin *This) { struct RecycleBinGeneric *s = CONTAINING_RECORD(This, struct RecycleBinGeneric, recycleBinImpl); @@ -67,13 +76,13 @@ refCount = InterlockedDecrement((PLONG)&s->ref); if (refCount == 0) - CoTaskMemFree(s); + RecycleBinGeneric_Destructor(s); return refCount; } static HRESULT STDMETHODCALLTYPE -RecycleBinGenericVtbl_RecycleBin_DeleteFile( +RecycleBinGeneric_RecycleBin_DeleteFile( IN IRecycleBin *This, IN LPCWSTR szFileName) { @@ -140,7 +149,7 @@ } static HRESULT STDMETHODCALLTYPE -RecycleBinGenericVtbl_RecycleBin_EmptyRecycleBin( +RecycleBinGeneric_RecycleBin_EmptyRecycleBin( IN IRecycleBin *This) { WCHAR szVolumeName[MAX_PATH]; @@ -161,7 +170,7 @@ swprintf(szVolumeName, L"%c:\\", 'A' + i); if (GetDriveTypeW(szVolumeName) != DRIVE_FIXED) continue; - + hr = GetDefaultRecycleBin(szVolumeName, &prb); if (!SUCCEEDED(hr)) return hr; @@ -174,22 +183,22 @@ } static HRESULT STDMETHODCALLTYPE -RecycleBinGenericVtbl_RecycleBin_EnumObjects( +RecycleBinGeneric_RecycleBin_EnumObjects( IN IRecycleBin *This, OUT IRecycleBinEnumList **ppEnumList) { TRACE("(%p, %p)\n", This, ppEnumList); - return RecycleBinGeneric_Enumerator_Constructor(ppEnumList); + return RecycleBinGenericEnum_Constructor(ppEnumList); } CONST_VTBL struct IRecycleBinVtbl RecycleBinGenericVtbl = { - RecycleBinGenericVtbl_RecycleBin_QueryInterface, - RecycleBinGenericVtbl_RecycleBin_AddRef, - RecycleBinGenericVtbl_RecycleBin_Release, - RecycleBinGenericVtbl_RecycleBin_DeleteFile, - RecycleBinGenericVtbl_RecycleBin_EmptyRecycleBin, - RecycleBinGenericVtbl_RecycleBin_EnumObjects, + RecycleBinGeneric_RecycleBin_QueryInterface, + RecycleBinGeneric_RecycleBin_AddRef, + RecycleBinGeneric_RecycleBin_Release, + RecycleBinGeneric_RecycleBin_DeleteFile, + RecycleBinGeneric_RecycleBin_EmptyRecycleBin, + RecycleBinGeneric_RecycleBin_EnumObjects, }; HRESULT RecycleBinGeneric_Constructor(OUT IUnknown **ppUnknown) Modified: trunk/reactos/lib/recyclebin/recyclebin_generic_enumerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_generic_enumerator.c (original) +++ trunk/reactos/lib/recyclebin/recyclebin_generic_enumerator.c Tue Nov 27 11:22:16 2007 @@ -58,6 +58,17 @@ return refCount; } +static VOID +RecycleBinGenericEnum_Destructor( + struct RecycleBinGenericEnum *s) +{ + TRACE("(%p)\n", s); + + if (s->current) + IRecycleBinEnumList_Release(s->current); + CoTaskMemFree(s); +} + static ULONG STDMETHODCALLTYPE RecycleBinGenericEnum_RecycleBinEnumList_Release( IN IRecycleBinEnumList *This) @@ -70,11 +81,7 @@ refCount = InterlockedDecrement((PLONG)&s->ref); if (refCount == 0) - { - if (s->current) - IRecycleBinEnumList_Release(s->current); - CoTaskMemFree(s); - } + RecycleBinGenericEnum_Destructor(s); return refCount; } @@ -213,7 +220,7 @@ }; HRESULT -RecycleBinGeneric_Enumerator_Constructor( +RecycleBinGenericEnum_Constructor( OUT IRecycleBinEnumList **pprbel) { struct RecycleBinGenericEnum *s; Modified: trunk/reactos/lib/recyclebin/recyclebin_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_private.h (original) +++ trunk/reactos/lib/recyclebin/recyclebin_private.h Tue Nov 27 11:22:16 2007 @@ -3,21 +3,12 @@ #include <wine/debug.h> /* Defines */ -#define RECYCLEBIN_MAGIC 0x6e694252 -#define DELETEDFILE_MAGIC 0x6e694253 #define RECYCLE_BIN_DIRECTORY_WITH_ACL L"RECYCLER" #define RECYCLE_BIN_DIRECTORY_WITHOUT_ACL L"RECYCLED" #define RECYCLE_BIN_FILE_NAME L"INFO2" #define ROUND_UP(N, S) ((( (N) + (S) - 1) / (S) ) * (S) ) - -/* List manipulation */ -#define InitializeListHead(le) (void)((le)->Flink = (le)->Blink = (le)) -#define InsertTailList(le,e) do { PLIST_ENTRY b = (le)->Blink; (e)->Flink = (le); (e)->Blink = b; b->Flink = (e); (le)->Blink = (e); } while (0) -#define RemoveEntryList(Entry) { PLIST_ENTRY _EX_Blink, _EX_Flink; _EX_Flink = (Entry)->Flink; _EX_Blink = (Entry)->Blink; _EX_Blink->Flink = _EX_Flink; _EX_Flink->Blink = _EX_Blink; } - -/* Typedefs */ /* Structures on disk */ @@ -26,8 +17,8 @@ typedef struct _INFO2_HEADER { DWORD dwVersion; - DWORD dwNumberOfEntries; - DWORD dwHighestRecordUniqueId; + DWORD dwNumberOfEntries; /* unused */ + DWORD dwHighestRecordUniqueId; /* unused */ DWORD dwRecordSize; DWORD dwTotalLogicalSize; } INFO2_HEADER, *PINFO2_HEADER; @@ -42,7 +33,7 @@ /* recyclebin_generic_enumerator.c */ -HRESULT RecycleBinGeneric_Enumerator_Constructor(OUT IRecycleBinEnumList **pprbel); +HRESULT RecycleBinGenericEnum_Constructor(OUT IRecycleBinEnumList **pprbel); /* recyclebin_v5.c */ Modified: trunk/reactos/lib/recyclebin/recyclebin_v5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5.c (original) +++ trunk/reactos/lib/recyclebin/recyclebin_v5.c Tue Nov 27 11:22:16 2007 @@ -67,7 +67,7 @@ }; static HRESULT STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_QueryInterface( +RecycleBin5_RecycleBin5_QueryInterface( IRecycleBin5 *This, REFIID riid, void **ppvObject) @@ -105,6 +105,19 @@ return refCount; } +static VOID +RecycleBin5_Destructor( + struct RecycleBin5 *s) +{ + TRACE("(%p)\n", s); + + if (s->hInfo && s->hInfo != INVALID_HANDLE_VALUE) + CloseHandle(s->hInfo); + if (s->hInfoMapped) + CloseHandle(s->hInfoMapped); + CoTaskMemFree(s); +} + static ULONG STDMETHODCALLTYPE RecycleBin5_RecycleBin5_Release( IRecycleBin5 *This) @@ -117,11 +130,7 @@ refCount = InterlockedDecrement((PLONG)&s->ref); if (refCount == 0) - { - CloseHandle(s->hInfo); - CloseHandle(s->hInfoMapped); - CoTaskMemFree(s); - } + RecycleBin5_Destructor(s); return refCount; } @@ -141,8 +150,8 @@ HANDLE hFile = INVALID_HANDLE_VALUE; PINFO2_HEADER pHeader = NULL; PDELETED_FILE_RECORD pDeletedFile; - ULARGE_INTEGER fileSize; - DWORD dwAttributes; + ULARGE_INTEGER FileSize; + DWORD dwAttributes, dwEntries; SYSTEMTIME SystemTime; DWORD ClusterSize, BytesPerSector, SectorsPerCluster; HRESULT hr; @@ -209,37 +218,51 @@ hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } - pDeletedFile = ((PDELETED_FILE_RECORD)(pHeader + 1)) + pHeader->dwNumberOfEntries; + + /* Get number of entries */ + FileSize.u.LowPart = GetFileSize(s->hInfo, &FileSize.u.HighPart); + if (FileSize.u.LowPart < sizeof(INFO2_HEADER)) + { + UnmapViewOfFile(pHeader); + return HRESULT_FROM_WIN32(GetLastError()); + } + dwEntries = (DWORD)((FileSize.QuadPart - sizeof(INFO2_HEADER)) / sizeof(DELETED_FILE_RECORD)) - 1; + pDeletedFile = ((PDELETED_FILE_RECORD)(pHeader + 1)) + dwEntries; /* Get file size */ #if 0 - if (!GetFileSizeEx(hFile, (PLARGE_INTEGER)&fileSize)) + if (!GetFileSizeEx(hFile, (PLARGE_INTEGER)&FileSize)) { hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } #else - fileSize.u.LowPart = GetFileSize(hFile, &fileSize.u.HighPart); - if (fileSize.u.LowPart == INVALID_FILE_SIZE && GetLastError() != NO_ERROR) + FileSize.u.LowPart = GetFileSize(hFile, &FileSize.u.HighPart); + if (FileSize.u.LowPart == INVALID_FILE_SIZE && GetLastError() != NO_ERROR) { hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } #endif /* Check if file size is > 4Gb */ - if (fileSize.u.HighPart != 0) - { - /* FIXME: how to delete files >= 4Gb? */ - hr = E_NOTIMPL; - goto cleanup; - } - pHeader->dwTotalLogicalSize += fileSize.u.LowPart; + if (FileSize.u.HighPart != 0) + { + /* Yes, this recyclebin can't support this file */ + hr = HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED); + goto cleanup; + } + pHeader->dwTotalLogicalSize += FileSize.u.LowPart; /* Generate new name */ - pHeader->dwHighestRecordUniqueId++; Extension = wcsrchr(szFullName, '.'); ZeroMemory(pDeletedFile, sizeof(DELETED_FILE_RECORD)); - pDeletedFile->dwRecordUniqueId = pHeader->dwHighestRecordUniqueId; + if (dwEntries == 0) + pDeletedFile->dwRecordUniqueId = 0; + else + { + PDELETED_FILE_RECORD pLastDeleted = ((PDELETED_FILE_RECORD)(pHeader + 1)) + dwEntries - 1; + pDeletedFile->dwRecordUniqueId = pLastDeleted->dwRecordUniqueId + 1; + } pDeletedFile->dwDriveNumber = tolower(szFullName[0]) - 'a'; _snwprintf(DeletedFileName, MAX_PATH, L"%s\\D%c%lu%s", s->Folder, pDeletedFile->dwDriveNumber + 'a', pDeletedFile->dwRecordUniqueId, Extension); @@ -258,7 +281,7 @@ hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } - pDeletedFile->dwPhysicalFileSize = ROUND_UP(fileSize.u.LowPart, ClusterSize); + pDeletedFile->dwPhysicalFileSize = ROUND_UP(FileSize.u.LowPart, ClusterSize); /* Set name */ wcscpy(pDeletedFile->FileNameW, szFullName); @@ -268,7 +291,6 @@ SetLastError(ERROR_INVALID_NAME); goto cleanup; } - pHeader->dwNumberOfEntries++; /* Move file */ if (MoveFileW(szFullName, DeletedFileName)) @@ -323,7 +345,7 @@ TRACE("(%p, %p)\n", This, ppEnumList); - hr = RecycleBin5_Enumerator_Constructor(This, s->hInfo, s->hInfoMapped, s->Folder, &pUnk); + hr = RecycleBin5Enum_Constructor(This, s->hInfo, s->hInfoMapped, s->Folder, &pUnk); if (!SUCCEEDED(hr)) return hr; @@ -353,7 +375,7 @@ if (s->EnumeratorCount != 0) return E_FAIL; - + pHeader = MapViewOfFile(s->hInfoMapped, FILE_MAP_WRITE, 0, 0, 0); if (!pHeader) return HRESULT_FROM_WIN32(GetLastError()); @@ -729,13 +751,7 @@ if (!SUCCEEDED(hr)) { if (s) - { - if (s->hInfo && s->hInfo != INVALID_HANDLE_VALUE) - CloseHandle(s->hInfo); - if (s->hInfoMapped) - CloseHandle(s->hInfoMapped); - CoTaskMemFree(s); - } + RecycleBin5_Destructor(s); } return hr; } Modified: trunk/reactos/lib/recyclebin/recyclebin_v5.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5.h (original) +++ trunk/reactos/lib/recyclebin/recyclebin_v5.h Tue Nov 27 11:22:16 2007 @@ -97,7 +97,7 @@ #endif HRESULT -RecycleBin5_Enumerator_Constructor( +RecycleBin5Enum_Constructor( IN IRecycleBin5 *prb, IN HANDLE hInfo, IN HANDLE hInfoMapped, Modified: trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c (original) +++ trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c Tue Nov 27 11:22:16 2007 @@ -57,6 +57,16 @@ return refCount; } +static VOID +RecycleBin5File_Destructor( + struct RecycleBin5File *s) +{ + TRACE("(%p)\n", s); + + IRecycleBin5_Release(s->recycleBin); + CoTaskMemFree(s); +} + static ULONG STDMETHODCALLTYPE RecycleBin5File_RecycleBinFile_Release( IN IRecycleBinFile *This) @@ -69,10 +79,7 @@ refCount = InterlockedDecrement((PLONG)&s->ref); if (refCount == 0) - { - IRecycleBin5_Release(s->recycleBin); - CoTaskMemFree(s); - } + RecycleBin5File_Destructor(s); return refCount; } @@ -240,7 +247,7 @@ }; static HRESULT -RecycleBin5_File_Constructor( +RecycleBin5File_Constructor( IN IRecycleBin5 *prb, IN LPCWSTR Folder, IN PDELETED_FILE_RECORD pDeletedFile, @@ -272,6 +279,11 @@ IRecycleBin5_AddRef(s->recycleBin); *ppFile = &s->recycleBinFileImpl; wsprintfW(s->FullName, L"%s\\D%c%lu%s", Folder, pDeletedFile->dwDriveNumber + 'a', pDeletedFile->dwRecordUniqueId, Extension); + if (GetFileAttributesW(s->FullName) == INVALID_FILE_ATTRIBUTES) + { + RecycleBin5File_Destructor(s); + return E_FAIL; + } return S_OK; } @@ -324,6 +336,18 @@ return refCount; } +static VOID +RecycleBin5Enum_Destructor( + struct RecycleBin5Enum *s) +{ + TRACE("(%p)\n", s); + + IRecycleBin5_OnClosing(s->recycleBin, &s->recycleBinEnumImpl); + UnmapViewOfFile(s->pInfo); + IRecycleBin5_Release(s->recycleBin); + CoTaskMemFree(s); +} + static ULONG STDMETHODCALLTYPE RecycleBin5Enum_RecycleBinEnumList_Release( IN IRecycleBinEnumList *This) @@ -336,12 +360,7 @@ refCount = InterlockedDecrement((PLONG)&s->ref); if (refCount == 0) - { - IRecycleBin5_OnClosing(s->recycleBin, This); - UnmapViewOfFile(s->pInfo); - IRecycleBin5_Release(s->recycleBin); - CoTaskMemFree(s); - } + RecycleBin5Enum_Destructor(s); return refCount; } @@ -377,15 +396,10 @@ pDeletedFile = (DELETED_FILE_RECORD *)(pHeader + 1) + i; for (; i < dwEntries && fetched < celt; i++) { - hr = RecycleBin5_File_Constructor(s->recycleBin, s->szPrefix, pDeletedFile, &rgelt[fetched]); - if (!SUCCEEDED(hr)) - { - for (i = 0; i < fetched; i++) - IRecycleBinFile_Release(rgelt[i]); - return hr; - } + hr = RecycleBin5File_Constructor(s->recycleBin, s->szPrefix, pDeletedFile, &rgelt[fetched]); + if (SUCCEEDED(hr)) + fetched++; pDeletedFile++; - fetched++; } s->dwCurrent = i; @@ -429,7 +443,7 @@ }; HRESULT -RecycleBin5_Enumerator_Constructor( +RecycleBin5Enum_Constructor( IN IRecycleBin5 *prb, IN HANDLE hInfo, IN HANDLE hInfoMapped,

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