August 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : user32: Apply the SendMessage recursion counter to DispatchMessage too.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: bcc1bb2b36774163766a0522d2d7f80fdf09abc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcc1bb2b36774163766a0522d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 27 13:07:30 2008 +0200 user32: Apply the SendMessage recursion counter to DispatchMessage too. --- dlls/user32/message.c | 6 ------ dlls/user32/winproc.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 522ff38..5990133 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -52,7 +52,6 @@ WINE_DECLARE_DEBUG_CHANNEL(key); #define WM_NCMOUSELAST (WM_NCMOUSEFIRST+(WM_MOUSELAST-WM_MOUSEFIRST)) #define MAX_PACK_COUNT 4 -#define MAX_SENDMSG_RECURSION 64 #define SYS_TIMER_RATE 55 /* min. timer rate in ms (actually 54.925)*/ @@ -1613,14 +1612,10 @@ static BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode, BOOL same_thread, enum wm_char_mapping mapping ) { - struct user_thread_info *thread_info = get_user_thread_info(); LRESULT result = 0; CWPSTRUCT cwp; CWPRETSTRUCT cwpret; - if (thread_info->recursion_count > MAX_SENDMSG_RECURSION) return 0; - thread_info->recursion_count++; - if (msg & 0x80000000) { result = handle_internal_message( hwnd, msg, wparam, lparam ); @@ -1646,7 +1641,6 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar cwpret.hwnd = hwnd; HOOK_CallHooks( WH_CALLWNDPROCRET, HC_ACTION, same_thread, (LPARAM)&cwpret, unicode ); done: - thread_info->recursion_count--; return result; } diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 6de86e8..ac5ec41 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -53,6 +53,7 @@ typedef struct tagWINDOWPROC #define WINPROC_HANDLE (~0UL >> 16) #define MAX_WINPROCS 8192 #define BUILTIN_WINPROCS 9 /* first BUILTIN_WINPROCS entries are reserved for builtin procs */ +#define MAX_WINPROC_RECURSION 64 WNDPROC EDIT_winproc_handle = 0; @@ -2177,6 +2178,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) { + struct user_thread_info *thread_info = get_user_thread_info(); WND *wndPtr; WINDOWPROC *proc; @@ -2192,6 +2194,9 @@ BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, if (!proc) return TRUE; + if (thread_info->recursion_count > MAX_WINPROC_RECURSION) return FALSE; + thread_info->recursion_count++; + if (unicode) { if (proc->procW) @@ -2210,6 +2215,7 @@ BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, else WINPROC_CallProc32ATo16( call_window_proc16, hwnd, msg, wParam, lParam, result, proc->proc16 ); } + thread_info->recursion_count--; return TRUE; }

1 0

Stefan Dösinger : wined3d: Make the texture stage mapping nvrc independent.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 462ddaa25404cd1a07135f5d7acdd2e298d7dfad URL: http://source.winehq.org/git/wine.git/?a=commit;h=462ddaa25404cd1a07135f5d7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 21 13:23:38 2008 -0500 wined3d: Make the texture stage mapping nvrc independent. --- dlls/wined3d/device.c | 3 ++- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 98b1910..a569e96 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3750,7 +3750,8 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { device_update_fixed_function_usage_map(This); - if (!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->lowest_disabled_stage <= This->max_ffp_textures) { + if (This->max_ffp_textures == This->max_ffp_texture_stages || + This->stateBlock->lowest_disabled_stage <= This->max_ffp_textures) { for (i = 0; i < This->stateBlock->lowest_disabled_stage; ++i) { if (!This->fixed_function_usage_map[i]) continue; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c897e70..53ea543 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3608,6 +3608,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, object->frag_pipe = frag_pipeline; frag_pipeline->get_caps(DeviceType, &GLINFO_LOCATION, &ffp_caps); object->max_ffp_textures = ffp_caps.MaxSimultaneousTextures; + object->max_ffp_texture_stages = ffp_caps.MaxTextureBlendStages; compile_state_table(object->StateTable, object->multistate_funcs, &GLINFO_LOCATION, ffp_vertexstate_template, frag_pipeline, misc_state_template); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8daee2d..fdb56b5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -859,7 +859,7 @@ struct IWineD3DDeviceImpl const struct fragment_pipeline *frag_pipe; const struct blit_shader *blitter; - unsigned int max_ffp_textures; + unsigned int max_ffp_textures, max_ffp_texture_stages; /* To store */ BOOL view_ident; /* true iff view matrix is identity */

1 0

Alistair Leslie-Hughes : msxml3: Correct unsupported functions in IDispatchEx.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: ac29a3d838ed122af1d8cd9c447e55966a0cfdc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac29a3d838ed122af1d8cd9c4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 27 16:33:40 2008 +1000 msxml3: Correct unsupported functions in IDispatchEx. --- dlls/msxml3/dispex.c | 14 +++++++------- dlls/msxml3/tests/domdoc.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 4156c78..438cf48 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -542,42 +542,42 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { DispatchEx *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); - return S_OK; + TRACE("Not implemented in native msxml3 (%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); + return E_NOTIMPL; } static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) { DispatchEx *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x)\n", This, id); + TRACE("Not implemented in native msxml3 (%p)->(%x)\n", This, id); return E_NOTIMPL; } static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) { DispatchEx *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex); + TRACE("Not implemented in native msxml3 (%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex); return E_NOTIMPL; } static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName) { DispatchEx *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x %p)\n", This, id, pbstrName); + TRACE("Not implemented in native msxml3 (%p)->(%x %p)\n", This, id, pbstrName); return E_NOTIMPL; } static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) { DispatchEx *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x %x %p)\n", This, grfdex, id, pid); + TRACE(" Not implemented in native msxml3 (%p)->(%x %x %p)\n", This, grfdex, id, pid); return E_NOTIMPL; } static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk) { DispatchEx *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%p)\n", This, ppunk); + TRACE("Not implemented in native msxml3 (%p)->(%p)\n", This, ppunk); return E_NOTIMPL; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8a48882..8af6b02 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -26,6 +26,7 @@ #include "ole2.h" #include "xmldom.h" #include "msxml2.h" +#include "msxml2did.h" #include "dispex.h" #include <stdio.h> #include <assert.h> @@ -1544,7 +1545,39 @@ static void test_getElementsByTagName(void) r = IXMLDOMNodeList_QueryInterface( node_list, &IID_IDispatchEx, (void**)&dispex ); ok( r == S_OK, "rets %08x\n", r); if( r == S_OK ) + { + DISPID dispid = DISPID_XMLDOM_NODELIST_RESET; + DWORD dwProps = 0; + BSTR sName; + IUnknown *pUnk; + + sName = SysAllocString( szstar ); + r = IDispatchEx_DeleteMemberByName(dispex, sName, fdexNameCaseSensitive); + ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); + SysFreeString( sName ); + + r = IDispatchEx_DeleteMemberByDispID(dispex, dispid); + ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); + + r = IDispatchEx_GetMemberProperties(dispex, dispid, grfdexPropCanAll, &dwProps); + ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); + ok(dwProps == 0, "expected 0 got %d\n", dwProps); + + r = IDispatchEx_GetMemberName(dispex, dispid, &sName); + ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); + if(sName) + SysFreeString(sName); + + r = IDispatchEx_GetNextDispID(dispex, fdexEnumDefault, DISPID_XMLDOM_NODELIST_RESET, &dispid); + ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); + + r = IDispatchEx_GetNameSpaceParent(dispex, &pUnk); + ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); + if(r == S_OK) + IUnknown_Release(pUnk); + IDispatchEx_Release( dispex ); + } IXMLDOMNodeList_Release( node_list );

1 0

Stefan Dösinger : wined3d: Remove dead code.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: a674ae71ae6b599214f19a52dc1265545cc3be70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a674ae71ae6b599214f19a52d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 21 13:14:38 2008 -0500 wined3d: Remove dead code. --- dlls/wined3d/device.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 92c3f75..98b1910 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4603,9 +4603,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *if This->stateBlock->lowest_disabled_stage = i; TRACE("New lowest disabled: %d\n", i); } - if(GL_SUPPORT(NV_REGISTER_COMBINERS) && !This->stateBlock->pixelShader) { - /* TODO: Built a stage -> texture unit mapping for register combiners */ - } } IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(Stage, Type));

1 0

Stefan Dösinger : wined3d: Remove unneeded code.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 0e2713a1e15ad0814581497879798ee9678593ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e2713a1e15ad081458149787… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 21 13:16:07 2008 -0500 wined3d: Remove unneeded code. The fixed function backend disables the extension. Also messing with the final combiner shouldn't be needed if nvrc is disabled. --- dlls/wined3d/context.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fb3fcc4..66206bd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -740,10 +740,6 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex /* Disable all textures. The caller can then bind a texture it wants to blit * from */ - if(GL_SUPPORT(NV_REGISTER_COMBINERS)) { - glDisable(GL_REGISTER_COMBINERS_NV); - checkGLcall("glDisable(GL_REGISTER_COMBINERS_NV)"); - } if (GL_SUPPORT(ARB_MULTITEXTURE)) { /* The blitting code uses (for now) the fixed function pipeline, so make sure to reset all fixed * function texture unit. No need to care for higher samplers @@ -855,11 +851,6 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_SPECULARENABLE), StateTable); checkGLcall("glDisable(GL_COLOR_SUM_EXT)"); } - if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { - GL_EXTCALL(glFinalCombinerInputNV(GL_VARIABLE_B_NV, GL_SPARE0_NV, GL_UNSIGNED_IDENTITY_NV, GL_RGB)); - Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_SPECULARENABLE), StateTable); - checkGLcall("glFinalCombinerInputNV"); - } /* Setup transforms */ glMatrixMode(GL_MODELVIEW);

1 0

Stefan Dösinger : wined3d: Handle texture transforms in the TEXTURETRANSFORMFLAGS state.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 8f20b882bb36a2eb04234e727ca45c9921715e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f20b882bb36a2eb04234e727… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 26 14:25:56 2008 -0500 wined3d: Handle texture transforms in the TEXTURETRANSFORMFLAGS state. This is a nop by itself, but it makes it easier for fragment pipelines to read WINED3DTSS_TEXTURETRANSFORMFLAGS. --- dlls/wined3d/state.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 31c76ae..22b0e7b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3105,7 +3105,7 @@ void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext } static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - DWORD texUnit = state - STATE_TRANSFORM(WINED3DTS_TEXTURE0); + DWORD texUnit = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[texUnit]; BOOL generated; int coordIdx; @@ -3375,7 +3375,7 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine /* Update the texture matrix */ if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_TEXTURE0 + stage))) { - transform_texture(STATE_TRANSFORM(WINED3DTS_TEXTURE0 + stage), stateblock, context); + transform_texture(STATE_TEXTURESTAGE(stage, WINED3DTSS_TEXTURETRANSFORMFLAGS), stateblock, context); } if(!isStateDirty(context, STATE_VDECL) && context->namedArraysLoaded) { @@ -3448,7 +3448,7 @@ static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, W if(texIsPow2 || context->lastWasPow2Texture[sampler]) { context->lastWasPow2Texture[sampler] = texIsPow2; - transform_texture(STATE_TRANSFORM(WINED3DTS_TEXTURE0 + stateblock->wineD3DDevice->texUnitMap[sampler]), stateblock, context); + transform_texture(STATE_TEXTURESTAGE(stateblock->wineD3DDevice->texUnitMap[sampler], WINED3DTSS_TEXTURETRANSFORMFLAGS), stateblock, context); } } } @@ -4624,7 +4624,7 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W int i; for(i = 0; i < MAX_TEXTURES; i++) { if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_TEXTURE0 + i))) { - transform_texture(STATE_TRANSFORM(WINED3DTS_TEXTURE0 + i), stateblock, context); + transform_texture(STATE_TEXTURESTAGE(i, WINED3DTSS_TEXTURETRANSFORMFLAGS), stateblock, context); } } } @@ -5053,14 +5053,14 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { /* Transform states follow */ { STATE_TRANSFORM(WINED3DTS_VIEW), { STATE_TRANSFORM(WINED3DTS_VIEW), transform_view }, 0 }, { STATE_TRANSFORM(WINED3DTS_PROJECTION), { STATE_TRANSFORM(WINED3DTS_PROJECTION), transform_projection}, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE0), { STATE_TRANSFORM(WINED3DTS_TEXTURE0), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE1), { STATE_TRANSFORM(WINED3DTS_TEXTURE1), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE2), { STATE_TRANSFORM(WINED3DTS_TEXTURE2), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE3), { STATE_TRANSFORM(WINED3DTS_TEXTURE3), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE4), { STATE_TRANSFORM(WINED3DTS_TEXTURE4), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE5), { STATE_TRANSFORM(WINED3DTS_TEXTURE5), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE6), { STATE_TRANSFORM(WINED3DTS_TEXTURE6), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE7), { STATE_TRANSFORM(WINED3DTS_TEXTURE7), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE0), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE1), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE2), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE3), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE4), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE5), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE6), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE7), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX( 0)), { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX( 0)), transform_world }, 0 }, { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX( 1)), { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX( 1)), transform_world }, 0 }, { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX( 2)), { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX( 2)), transform_world }, 0 }, @@ -5317,14 +5317,14 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(253)), { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(253)), transform_world }, 0 }, { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(254)), { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(254)), transform_world }, 0 }, { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(255)), { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(255)), transform_world }, 0 }, - { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE0), transform_texture }, 0 }, - { STATE_TEXTURESTAGE(1,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE1), transform_texture }, 0 }, - { STATE_TEXTURESTAGE(2,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE2), transform_texture }, 0 }, - { STATE_TEXTURESTAGE(3,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE3), transform_texture }, 0 }, - { STATE_TEXTURESTAGE(4,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE4), transform_texture }, 0 }, - { STATE_TEXTURESTAGE(5,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE5), transform_texture }, 0 }, - { STATE_TEXTURESTAGE(6,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE6), transform_texture }, 0 }, - { STATE_TEXTURESTAGE(7,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE7), transform_texture }, 0 }, + { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS),transform_texture }, 0 }, + { STATE_TEXTURESTAGE(1,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(1,WINED3DTSS_TEXTURETRANSFORMFLAGS),transform_texture }, 0 }, + { STATE_TEXTURESTAGE(2,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(2,WINED3DTSS_TEXTURETRANSFORMFLAGS),transform_texture }, 0 }, + { STATE_TEXTURESTAGE(3,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(3,WINED3DTSS_TEXTURETRANSFORMFLAGS),transform_texture }, 0 }, + { STATE_TEXTURESTAGE(4,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(4,WINED3DTSS_TEXTURETRANSFORMFLAGS),transform_texture }, 0 }, + { STATE_TEXTURESTAGE(5,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(5,WINED3DTSS_TEXTURETRANSFORMFLAGS),transform_texture }, 0 }, + { STATE_TEXTURESTAGE(6,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(6,WINED3DTSS_TEXTURETRANSFORMFLAGS),transform_texture }, 0 }, + { STATE_TEXTURESTAGE(7,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(7,WINED3DTSS_TEXTURETRANSFORMFLAGS),transform_texture }, 0 }, { STATE_TEXTURESTAGE(0, WINED3DTSS_TEXCOORDINDEX), { STATE_TEXTURESTAGE(0, WINED3DTSS_TEXCOORDINDEX), tex_coordindex }, 0 }, { STATE_TEXTURESTAGE(1, WINED3DTSS_TEXCOORDINDEX), { STATE_TEXTURESTAGE(1, WINED3DTSS_TEXCOORDINDEX), tex_coordindex }, 0 }, { STATE_TEXTURESTAGE(2, WINED3DTSS_TEXCOORDINDEX), { STATE_TEXTURESTAGE(2, WINED3DTSS_TEXCOORDINDEX), tex_coordindex }, 0 },

1 0

Stefan Dösinger : wined3d: Update the arbfp shader on a texturetransformflags change.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: dda59e361c1be741ff5f5088bd40b100f3a6e787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dda59e361c1be741ff5f5088b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 17 00:15:55 2008 +0200 wined3d: Update the arbfp shader on a texturetransformflags change. --- dlls/wined3d/arb_program_shader.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index eb3eed8..86faaf2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2962,6 +2962,12 @@ static void state_arbfp_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, Win } } +static void textransform(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + if(!isStateDirty(context, STATE_PIXELSHADER)) { + fragment_prog_arbfp(state, stateblock, context); + } +} + #undef GLINFO_LOCATION static const struct StateEntryTemplate arbfp_fragmentstate_template[] = { @@ -3099,6 +3105,14 @@ static const struct StateEntryTemplate arbfp_fragmentstate_template[] = { { STATE_RENDER(WINED3DRS_FOGTABLEMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, { STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, { STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), { STATE_PIXELSHADER, fragment_prog_arbfp }, 0 }, + {STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(0, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, + {STATE_TEXTURESTAGE(1,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(1, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, + {STATE_TEXTURESTAGE(2,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(2, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, + {STATE_TEXTURESTAGE(3,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(3, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, + {STATE_TEXTURESTAGE(4,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(4, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, + {STATE_TEXTURESTAGE(5,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(5, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, + {STATE_TEXTURESTAGE(6,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(6, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, + {STATE_TEXTURESTAGE(7,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(7, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, {0 /* Terminate */, { 0, 0 }, 0 }, };

1 0

Stefan Dösinger : wined3d: Remove some junk.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 43fe6b0bcfcdfb1265b51cf54a29a4feef8f67a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43fe6b0bcfcdfb1265b51cf54… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 21 12:47:14 2008 -0500 wined3d: Remove some junk. --- dlls/wined3d/drawprim.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index b0f6a53..3be34d3 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -32,14 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); #include <stdio.h> #include <math.h> -#if 0 /* TODO */ -extern IWineD3DVertexShaderImpl* VertexShaders[64]; -extern IWineD3DVertexDeclarationImpl* VertexShaderDeclarations[64]; -extern IWineD3DPixelShaderImpl* PixelShaders[64]; - -#undef GL_VERSION_1_4 /* To be fixed, caused by mesa headers */ -#endif - /* Issues the glBegin call for gl given the primitive type and count */ static DWORD primitiveToGl(WINED3DPRIMITIVETYPE PrimitiveType, DWORD NumPrimitives,

1 0

Stefan Dösinger : wined3d: Disable D3DFMT_R3G3B2.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 6bbcc5050bd18b348aae125ce337e75d8c5f2998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bbcc5050bd18b348aae125ce… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 19 13:57:13 2008 +0200 wined3d: Disable D3DFMT_R3G3B2. --- dlls/wined3d/directx.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 356dd52..7742347 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2202,7 +2202,6 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DDEVTYPE DeviceType, WINE case WINED3DFMT_X1R5G5B5: case WINED3DFMT_A1R5G5B5: case WINED3DFMT_A4R4G4B4: - case WINED3DFMT_R3G3B2: case WINED3DFMT_A8: case WINED3DFMT_X4R4G4B4: case WINED3DFMT_A8B8G8R8: @@ -2213,6 +2212,10 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DDEVTYPE DeviceType, WINE TRACE_(d3d_caps)("[OK]\n"); return TRUE; + case WINED3DFMT_R3G3B2: + TRACE_(d3d_caps)("[FAILED] - Not supported on Windows\n"); + return FALSE; + /***** * supported: Palettized */

1 0

Stefan Dösinger : wined3d: Advertise a few line caps.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 97b57931d0f9fb09f90264e611987cf551d69045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b57931d0f9fb09f90264e61… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 19 16:34:54 2008 +0200 wined3d: Advertise a few line caps. --- dlls/wined3d/directx.c | 14 ++++++++------ include/d3d9caps.h | 1 + include/wine/wined3d_caps.h | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7742347..c897e70 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3252,12 +3252,14 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, } else pCaps->VolumeTextureAddressCaps = 0; - pCaps->LineCaps = WINED3DLINECAPS_TEXTURE | - WINED3DLINECAPS_ZTEST; - /* FIXME: Add - WINED3DLINECAPS_BLEND - WINED3DLINECAPS_ALPHACMP - WINED3DLINECAPS_FOG */ + pCaps->LineCaps = WINED3DLINECAPS_TEXTURE | + WINED3DLINECAPS_ZTEST | + WINED3DLINECAPS_BLEND | + WINED3DLINECAPS_ALPHACMP | + WINED3DLINECAPS_FOG; + /* WINED3DLINECAPS_ANTIALIAS is not supported on Windows, and dx and gl seem to have a different + * idea how generating the smoothing alpha values works; the result is different + */ pCaps->MaxTextureWidth = GL_LIMITS(texture_size); pCaps->MaxTextureHeight = GL_LIMITS(texture_size); diff --git a/include/d3d9caps.h b/include/d3d9caps.h index c66d291..8ed6598 100644 --- a/include/d3d9caps.h +++ b/include/d3d9caps.h @@ -67,6 +67,7 @@ #define D3DLINECAPS_BLEND 0x04 #define D3DLINECAPS_ALPHACMP 0x08 #define D3DLINECAPS_FOG 0x10 +#define D3DLINECAPS_ANTIALIAS 0x20 #define D3DPBLENDCAPS_ZERO 0x00000001 #define D3DPBLENDCAPS_ONE 0x00000002 diff --git a/include/wine/wined3d_caps.h b/include/wine/wined3d_caps.h index 91fa788..1cfbbd4 100644 --- a/include/wine/wined3d_caps.h +++ b/include/wine/wined3d_caps.h @@ -53,6 +53,7 @@ #define WINED3DLINECAPS_BLEND 0x00000004 #define WINED3DLINECAPS_ALPHACMP 0x00000008 #define WINED3DLINECAPS_FOG 0x00000010 +#define WINED3DLINECAPS_ANTIALIAS 0x00000020 #define WINED3DMAX30SHADERINSTRUCTIONS 32768 #define WINED3DMIN30SHADERINSTRUCTIONS 512

1 0