March 2007 - Wine-commits - list.winehq.org

Andrew Talbot : comdlg32: Replace const pointer parameters with correct pointers to const.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 3c842c0d1ecf323e2064b8cba7b0cf5e3d8c930c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c842c0d1ecf323e2064b8cba… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Mar 6 20:39:56 2007 +0000 comdlg32: Replace const pointer parameters with correct pointers to const. --- dlls/comdlg32/filedlg31.c | 2 +- dlls/comdlg32/filedlg31.h | 2 +- dlls/comdlg32/fontdlg16.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index e835901..989ec28 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -696,7 +696,7 @@ static LPWSTR FD31_DupToW(LPCSTR str, DWORD size) * FD31_MapOfnStructA [internal] * map a 32 bits Ansi structure to an Unicode one */ -void FD31_MapOfnStructA(const LPOPENFILENAMEA ofnA, LPOPENFILENAMEW ofnW, BOOL open) +void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, BOOL open) { UNICODE_STRING usBuffer; diff --git a/dlls/comdlg32/filedlg31.h b/dlls/comdlg32/filedlg31.h index 8e5c7f0..0c20e33 100644 --- a/dlls/comdlg32/filedlg31.h +++ b/dlls/comdlg32/filedlg31.h @@ -54,7 +54,7 @@ extern BOOL FD31_Init(void); extern PFD31_DATA FD31_AllocPrivate(LPARAM lParam, UINT dlgType, PFD31_CALLBACKS callbacks, DWORD data); extern void FD31_DestroyPrivate(PFD31_DATA lfs); -extern void FD31_MapOfnStructA(LPOPENFILENAMEA ofnA, LPOPENFILENAMEW ofnW, BOOL open); +extern void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, BOOL open); extern void FD31_FreeOfnW(LPOPENFILENAMEW ofnW); extern BOOL FD31_CallWindowProc(PFD31_DATA lfs, UINT wMsg, WPARAM wParam, LPARAM lParam); diff --git a/dlls/comdlg32/fontdlg16.c b/dlls/comdlg32/fontdlg16.c index c5f11df..297952c 100644 --- a/dlls/comdlg32/fontdlg16.c +++ b/dlls/comdlg32/fontdlg16.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); static const WCHAR strWineFontData16[] = {'_','_','W','I','N','E','_','F','O','N','T','D','L','G','D','A','T','A','1','6',0}; -static void FONT_LogFont16To32W( const LPLOGFONT16 font16, LPLOGFONTW font32 ) +static void FONT_LogFont16To32W( const LOGFONT16 *font16, LPLOGFONTW font32 ) { font32->lfHeight = font16->lfHeight; font32->lfWidth = font16->lfWidth;

1 0

Rob Shearman : ole32: Fix a use-after-free of the file moniker in the running object table tests .
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: ac8d035f3d69a81a75fc2eca2d45406e91f3d009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac8d035f3d69a81a75fc2eca2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 6 17:57:45 2007 +0000 ole32: Fix a use-after-free of the file moniker in the running object table tests. --- dlls/ole32/tests/moniker.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 6203ea6..f603f72 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -588,7 +588,6 @@ static void test_ROT(void) hr = IRunningObjectTable_Register(pROT, 0, (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); - IMoniker_Release(pMoniker); ok_more_than_one_lock();

1 0

Rob Shearman : ole32: Fix a failing CoUnmarshalInterface test on Windows.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 7a6a63f8fcfd3e0be8752477e84cfb14f9f2dc69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a6a63f8fcfd3e0be8752477e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 6 17:58:21 2007 +0000 ole32: Fix a failing CoUnmarshalInterface test on Windows. --- dlls/ole32/tests/compobj.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 9dc2d2d..2d2cf12 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -542,8 +542,16 @@ static void test_CoUnmarshalInterface(void) ok_ole_success(hr, "CreateStreamOnHGlobal"); hr = CoUnmarshalInterface(pStream, &IID_IUnknown, (void **)&pProxy); + todo_wine + ok(hr == CO_E_NOTINITIALIZED, "CoUnmarshalInterface should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); + + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoUnmarshalInterface(pStream, &IID_IUnknown, (void **)&pProxy); ok(hr == STG_E_READFAULT, "CoUnmarshalInterface should have returned STG_E_READFAULT instead of 0x%08x\n", hr); + CoUninitialize(); + hr = CoUnmarshalInterface(pStream, &IID_IUnknown, NULL); ok(hr == E_INVALIDARG, "CoUnmarshalInterface should have returned E_INVALIDARG instead of 0x%08x\n", hr);

1 0

Stefan Dösinger : wined3d: Clearing the depth stencil buffer fails without a depth stencil buffer.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 5f159452ef4d7ca75122a8d812008a3a19e0fdb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f159452ef4d7ca75122a8d81… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 6 13:35:56 2007 +0100 wined3d: Clearing the depth stencil buffer fails without a depth stencil buffer. --- dlls/d3d9/tests/device.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 18 ++++++---- 2 files changed, 92 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 19862db..365b783 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1157,6 +1157,87 @@ cleanup: if(hwnd) DestroyWindow(hwnd); } +static void test_depthstenciltest(void) +{ + HRESULT hr; + HWND hwnd = NULL; + IDirect3D9 *pD3d = NULL; + IDirect3DDevice9 *pDevice = NULL; + D3DPRESENT_PARAMETERS d3dpp; + D3DDISPLAYMODE d3ddm; + IDirect3DSurface9 *pDepthStencil = NULL; + DWORD state; + + pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); + ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); + hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + ok(hwnd != NULL, "Failed to create window\n"); + if (!pD3d || !hwnd) goto cleanup; + + IDirect3D9_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferWidth = 800; + d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferFormat = d3ddm.Format; + d3dpp.EnableAutoDepthStencil = TRUE; + d3dpp.AutoDepthStencilFormat = D3DFMT_D16; + + hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); + ok(hr == D3D_OK, "IDirect3D9_CreateDevice failed with %s\n", DXGetErrorString9(hr)); + if(!pDevice) goto cleanup; + + hr = IDirect3DDevice9_GetDepthStencilSurface(pDevice, &pDepthStencil); + ok(hr == D3D_OK && pDepthStencil != NULL, "IDirect3DDevice9_GetDepthStencilSurface failed with %s\n", DXGetErrorString9(hr)); + + /* Try to clear */ + hr = IDirect3DDevice9_Clear(pDevice, 0, NULL, D3DCLEAR_ZBUFFER, 0x00000000, 1.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetDepthStencilSurface(pDevice, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetDepthStencilSurface failed with %s\n", DXGetErrorString9(hr)); + + /* This left the render states untouched! */ + hr = IDirect3DDevice9_GetRenderState(pDevice, D3DRS_ZENABLE, &state); + ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderState failed with %s\n", DXGetErrorString9(hr)); + ok(state == D3DZB_TRUE, "D3DRS_ZENABLE is %s\n", state == D3DZB_FALSE ? "D3DZB_FALSE" : (state == D3DZB_TRUE ? "D3DZB_TRUE" : "D3DZB_USEW")); + hr = IDirect3DDevice9_GetRenderState(pDevice, D3DRS_ZWRITEENABLE, &state); + ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderState failed with %s\n", DXGetErrorString9(hr)); + ok(state == TRUE, "D3DRS_ZWRITEENABLE is %s\n", state ? "TRUE" : "FALSE"); + hr = IDirect3DDevice9_GetRenderState(pDevice, D3DRS_STENCILENABLE, &state); + ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderState failed with %s\n", DXGetErrorString9(hr)); + ok(state == FALSE, "D3DRS_STENCILENABLE is %s\n", state ? "TRUE" : "FALSE"); + hr = IDirect3DDevice9_GetRenderState(pDevice, D3DRS_STENCILWRITEMASK, &state); + ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderState failed with %s\n", DXGetErrorString9(hr)); + ok(state == 0xffffffff, "D3DRS_STENCILWRITEMASK is 0x%08x\n", state); + + /* This is supposed to fail now */ + hr = IDirect3DDevice9_Clear(pDevice, 0, NULL, D3DCLEAR_ZBUFFER, 0x00000000, 1.0, 0); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetRenderState(pDevice, D3DRS_ZENABLE, D3DZB_FALSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetDepthStencilSurface(pDevice, pDepthStencil); + ok(hr == D3D_OK, "IDirect3DDevice9_SetDepthStencilSurface failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_GetRenderState(pDevice, D3DRS_ZENABLE, &state); + ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderState failed with %s\n", DXGetErrorString9(hr)); + ok(state == D3DZB_FALSE, "D3DRS_ZENABLE is %s\n", state == D3DZB_FALSE ? "D3DZB_FALSE" : (state == D3DZB_TRUE ? "D3DZB_TRUE" : "D3DZB_USEW")); + + /* Now it works again */ + hr = IDirect3DDevice9_Clear(pDevice, 0, NULL, D3DCLEAR_ZBUFFER, 0x00000000, 1.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + +cleanup: + if(pDepthStencil) IDirect3DSurface9_Release(pDepthStencil); + if(pD3d) IDirect3D9_Release(pD3d); + if(pDevice) IDirect3D9_Release(pDevice); + if(hwnd) DestroyWindow(hwnd); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -1178,5 +1259,6 @@ START_TEST(device) test_reset(); test_scene(); test_limits(); + test_depthstenciltest(); } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6a78b23..7436ecb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1744,7 +1744,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR LEAVE_GL(); /* Clear the screen */ - IWineD3DDevice_Clear((IWineD3DDevice *) This, 0, NULL, WINED3DCLEAR_STENCIL|WINED3DCLEAR_ZBUFFER|WINED3DCLEAR_TARGET, 0x00, 1.0, 0); + IWineD3DDevice_Clear((IWineD3DDevice *) This, 0, NULL, + WINED3DCLEAR_TARGET | pPresentationParameters->EnableAutoDepthStencil ? WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL : 0, + 0x00, 1.0, 0); This->d3d_initialized = TRUE; return WINED3D_OK; @@ -4123,9 +4125,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun DWORD Flags, WINED3DCOLOR Color, float Z, DWORD Stencil) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - /* TODO: From MSDN This method fails if you specify the WINED3DCLEAR_ZBUFFER or WINED3DCLEAR_STENCIL flags when the - render target does not have an attached depth buffer. Similarly, if you specify the WINED3DCLEAR_STENCIL flag - when the depth-buffer format does not contain stencil buffer information, this method fails. */ GLbitfield glMask = 0; unsigned int i; CONST WINED3DRECT* curRect; @@ -4133,6 +4132,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun TRACE("(%p) Count (%d), pRects (%p), Flags (%x), Z (%f), Stencil (%d)\n", This, Count, pRects, Flags, Z, Stencil); + if(Flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL) && This->stencilBufferTarget == NULL) { + WARN("Clearing depth and/or stencil without a depth stencil buffer attached, returning WINED3DERR_INVALIDCALL\n"); + /* TODO: What about depth stencil buffers without stencil bits? */ + return WINED3DERR_INVALIDCALL; + } + ENTER_GL(); glEnable(GL_SCISSOR_TEST); @@ -5160,16 +5165,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice * * stencil buffer and incure an extra memory overhead ******************************************************/ - tmp = This->stencilBufferTarget; This->stencilBufferTarget = pNewZStencil; /* should we be calling the parent or the wined3d surface? */ if (NULL != This->stencilBufferTarget) IWineD3DSurface_AddRef(This->stencilBufferTarget); if (NULL != tmp) IWineD3DSurface_Release(tmp); hr = WINED3D_OK; - /** TODO: glEnable/glDisable on depth/stencil depending on - * pNewZStencil is NULL and the depth/stencil is enabled in d3d - **********************************************************/ + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { set_depth_stencil_fbo(iface, pNewZStencil); }

1 0

Stefan Dösinger : wined3d: Disable depth stencil related states without a depth stencil buffer.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 6886b237ad71c58023a59caeba3c8ed177f4ebcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6886b237ad71c58023a59caeb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 6 13:54:05 2007 +0100 wined3d: Disable depth stencil related states without a depth stencil buffer. Except with fbos, it is not possible to remove the depth stencil buffer from the opengl frame buffer, so when the d3d app sets a NULL depth stencil disable all states that work with the depth stencil buffer. --- dlls/wined3d/device.c | 7 +++++++ dlls/wined3d/state.c | 20 +++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7436ecb..654bf13 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5175,6 +5175,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice * if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { set_depth_stencil_fbo(iface, pNewZStencil); } + + if((!tmp && pNewZStencil) || (!pNewZStencil && tmp)) { + /* Swapping NULL / non NULL depth stencil affects the depth and tests */ + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ZENABLE)); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_STENCILENABLE)); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_STENCILWRITEMASK)); + } } return hr; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c56ce67..00f4876 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -105,6 +105,13 @@ static void state_lighting(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine } static void state_zenable(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + /* No z test without depth stencil buffers */ + if(stateblock->wineD3DDevice->stencilBufferTarget == NULL) { + glDisable(GL_DEPTH_TEST); /* This also disables z writing in gl */ + checkGLcall("glDisable GL_DEPTH_TEST"); + return; + } + switch ((WINED3DZBUFFERTYPE) stateblock->renderState[WINED3DRS_ZENABLE]) { case WINED3DZB_FALSE: glDisable(GL_DEPTH_TEST); @@ -611,6 +618,13 @@ state_stencil(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *c GLint depthFail_ccw = GL_KEEP; GLint stencilPass_ccw = GL_KEEP; + /* No stencil test without a stencil buffer */ + if(stateblock->wineD3DDevice->stencilBufferTarget == NULL) { + glDisable(GL_STENCIL_TEST); + checkGLcall("glDisable GL_STENCIL_TEST"); + return; + } + if( stateblock->set.renderState[WINED3DRS_STENCILENABLE] ) onesided_enable = stateblock->renderState[WINED3DRS_STENCILENABLE]; if( stateblock->set.renderState[WINED3DRS_TWOSIDEDSTENCILMODE] ) @@ -664,7 +678,11 @@ state_stencil(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *c } static void state_stencilwrite(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - glStencilMask(stateblock->renderState[WINED3DRS_STENCILWRITEMASK]); + if(stateblock->wineD3DDevice->stencilBufferTarget) { + glStencilMask(stateblock->renderState[WINED3DRS_STENCILWRITEMASK]); + } else { + glStencilMask(0); + } checkGLcall("glStencilMask"); }

1 0

Stefan Dösinger : wined3d: Do not specify the viewport origin upside down when doing offscreen rendering .
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 81aeae32497822302e43bc5a3e31b22cbb9ec0e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81aeae32497822302e43bc5a3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 6 14:56:58 2007 +0100 wined3d: Do not specify the viewport origin upside down when doing offscreen rendering. The gl viewport origin is the lower left corner of the window, in d3d it is the upper right corner. This is corrected when setting the viewport. However, when we are doing offscreen rendering, this is reversed. So do not flip the viewport origin when rendering offscreen. --- dlls/wined3d/device.c | 4 ++++ dlls/wined3d/state.c | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 654bf13..3ec9f40 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5134,6 +5134,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, viewport.MaxZ = 1.0f; viewport.MinZ = 0.0f; IWineD3DDeviceImpl_SetViewport(iface, &viewport); + /* Make sure the viewport state is dirty, because the render_offscreen thing affects it. + * SetViewport may catch NOP viewport changes, which would occur when switching between equally sized targets + */ + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VIEWPORT); /* Activate the new render target for now. This shouldn't stay here, but is needed until all methods using gl activate the * ctx properly. diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 00f4876..cf1b7f4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3015,11 +3015,17 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W static void viewport(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { glDepthRange(stateblock->viewport.MinZ, stateblock->viewport.MaxZ); checkGLcall("glDepthRange"); - /* Note: GL requires lower left, DirectX supplies upper left */ - /* TODO: replace usage of renderTarget with context management */ - glViewport(stateblock->viewport.X, - (((IWineD3DSurfaceImpl *)stateblock->wineD3DDevice->render_targets[0])->currentDesc.Height - (stateblock->viewport.Y + stateblock->viewport.Height)), - stateblock->viewport.Width, stateblock->viewport.Height); + /* Note: GL requires lower left, DirectX supplies upper left. This is reversed when using offscreen rendering + */ + if(stateblock->wineD3DDevice->render_offscreen) { + glViewport(stateblock->viewport.X, + stateblock->viewport.Y, + stateblock->viewport.Width, stateblock->viewport.Height); + } else { + glViewport(stateblock->viewport.X, + (((IWineD3DSurfaceImpl *)stateblock->wineD3DDevice->render_targets[0])->currentDesc.Height - (stateblock->viewport.Y + stateblock->viewport.Height)), + stateblock->viewport.Width, stateblock->viewport.Height); + } checkGLcall("glViewport");

1 0

Rob Shearman : server: A general solution for handling MAXIMUM_ALLOWED access right has been implemented so remove the workarounds .
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 221e01abd2584d5e40c4b1b3a6c198a377f960c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=221e01abd2584d5e40c4b1b3a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 6 17:57:10 2007 +0000 server: A general solution for handling MAXIMUM_ALLOWED access right has been implemented so remove the workarounds. --- server/registry.c | 2 -- server/token.c | 1 - 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/server/registry.c b/server/registry.c index ce15503..531bf97 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1713,7 +1713,6 @@ DECL_HANDLER(create_key) struct unicode_str name, class; unsigned int access = req->access; - if (access & MAXIMUM_ALLOWED) access = KEY_ALL_ACCESS; /* FIXME: needs general solution */ reply->hkey = 0; if (req->namelen > get_req_data_size()) @@ -1752,7 +1751,6 @@ DECL_HANDLER(open_key) struct unicode_str name; unsigned int access = req->access; - if (access & MAXIMUM_ALLOWED) access = KEY_ALL_ACCESS; /* FIXME: needs general solution */ reply->hkey = 0; /* NOTE: no access rights are required to open the parent key, only the child key */ if ((parent = get_parent_hkey_obj( req->parent ))) diff --git a/server/token.c b/server/token.c index 573634b..278b6d1 100644 --- a/server/token.c +++ b/server/token.c @@ -1208,7 +1208,6 @@ DECL_HANDLER(duplicate_token) privilege_add( token, &privilege->luid, privilege->enabled ); access = req->access; - if (access & MAXIMUM_ALLOWED) access = TOKEN_ALL_ACCESS; /* FIXME: needs general solution */ reply->new_handle = alloc_handle( current->process, token, access, req->attributes); release_object( token ); }

1 0

Stefan Dösinger : wined3d: Use an aux buffer as blitting helper if available.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: daeffc897bc22253312d8b62634e3a6fa83e6cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=daeffc897bc22253312d8b626… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 4 23:47:57 2007 +0100 wined3d: Use an aux buffer as blitting helper if available. This helps performance a bit because the function does not have to wait for the 2nd read to finish before returning. Only do that if we have an aux buffer to mess with for free though. --- dlls/wined3d/surface.c | 48 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2a1cc60..c4eefc9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2261,12 +2261,24 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine float left, right, top, bottom; /* Texture coordinates */ UINT fbwidth = Src->currentDesc.Width; UINT fbheight = Src->currentDesc.Height; + GLenum drawBuffer = GL_BACK; TRACE("Using hwstretch blit\n"); /* Activate the Proper context for reading from the source surface, set it up for blitting */ ENTER_GL(); ActivateContext(myDevice, SrcSurface, CTXUSAGE_BLIT); + /* Try to use an aux buffer for drawing the rectangle. This way it doesn't need restoring. + * This way we don't have to wait for the 2nd readback to finish to leave this function. + */ + if(GL_LIMITS(aux_buffers) >= 2) { + /* Got more than one aux buffer? Use the 2nd aux buffer */ + drawBuffer = GL_AUX1; + } else if((swapchain || myDevice->offscreenBuffer == GL_BACK) && GL_LIMITS(aux_buffers) >= 1) { + /* Only one aux buffer, but it isn't used (Onscreen rendering, or non-aux orm)? Use it! */ + drawBuffer = GL_AUX0; + } + if(!swapchain && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { glGenTextures(1, &backup); checkGLcall("glGenTextures\n"); @@ -2350,6 +2362,9 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); + glDrawBuffer(drawBuffer); + glReadBuffer(drawBuffer); + glBegin(GL_QUADS); /* bottom left */ glTexCoord2f(left, bottom); @@ -2383,23 +2398,28 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine glBindTexture(GL_TEXTURE_2D, backup ? backup : Src->glDescription.textureName); checkGLcall("glBindTexture(GL_TEXTURE_2D, Src->glDescription.textureName)"); - glBegin(GL_QUADS); - /* top left */ - glTexCoord2f(0.0, (float) fbheight / (float) Src->pow2Height); - glVertex2i(0, 0); + if(drawBuffer == GL_BACK) { + glBegin(GL_QUADS); + /* top left */ + glTexCoord2f(0.0, (float) fbheight / (float) Src->pow2Height); + glVertex2i(0, 0); - /* bottom left */ - glTexCoord2f(0.0, 0.0); - glVertex2i(0, fbheight); + /* bottom left */ + glTexCoord2f(0.0, 0.0); + glVertex2i(0, fbheight); - /* bottom right */ - glTexCoord2f((float) fbwidth / (float) Src->pow2Width, 0.0); - glVertex2i(fbwidth, Src->currentDesc.Height); + /* bottom right */ + glTexCoord2f((float) fbwidth / (float) Src->pow2Width, 0.0); + glVertex2i(fbwidth, Src->currentDesc.Height); - /* top right */ - glTexCoord2f((float) fbwidth / (float) Src->pow2Width, (float) fbheight / (float) Src->pow2Height); - glVertex2i(fbwidth, 0); - glEnd(); + /* top right */ + glTexCoord2f((float) fbwidth / (float) Src->pow2Width, (float) fbheight / (float) Src->pow2Height); + glVertex2i(fbwidth, 0); + glEnd(); + } else { + /* Restore the old draw buffer */ + glDrawBuffer(GL_BACK); + } /* Cleanup */ if(src != Src->glDescription.textureName && src != backup) {

1 0

Stefan Dösinger : wined3d: WINED3DFMT_U8V8 is signed.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: ae57138eae7ce20b75eb8e768b38d3ed1e2f34a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae57138eae7ce20b75eb8e768… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 5 21:40:47 2007 +0100 wined3d: WINED3DFMT_U8V8 is signed. Plain OpenGL does not provide any signed pixel formats, so the unsigned GL_RGB is used for loading perturbation data into pixel shaders that use texbem. For correct loading, the signedness has to be considered. --- dlls/wined3d/arb_program_shader.c | 22 +++++++++++----------- dlls/wined3d/surface.c | 14 +++++++++----- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e483033..79148e5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -693,17 +693,6 @@ void pshader_hw_texreg2gb(SHADER_OPCODE_ARG* arg) { } void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { -#if 0 - SHADER_BUFFER* buffer = arg->buffer; - DWORD reg1 = arg->dst & WINED3DSP_REGNUM_MASK; - DWORD reg2 = arg->src[0] & WINED3DSP_REGNUM_MASK; - char dst_str[8]; - - /* FIXME: Should apply the BUMPMAPENV matrix */ - sprintf(dst_str, "T%u", reg1); - shader_addline(buffer, "ADD TMP.rg, fragment.texcoord[%u], T%u;\n", reg1, reg2); - shader_hw_sample(arg, reg1, dst_str, "TMP"); -#endif IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; DWORD dst = arg->dst; @@ -720,6 +709,17 @@ void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { if(This->bumpenvmatconst) { /*shader_addline(buffer, "MOV T%u, fragment.texcoord[%u];\n", 1, 1); Not needed - done already */ + + /* Plain GL does not have any signed formats suitable for that instruction. + * So the surface loading code converts the -128 ... 127 signed integers to + * 0 ... 255 unsigned ones. The following line undoes that. + * + * TODO: Both GL_NV_texture_shader and GL_ATI_envmap_bumpmap provide pixel formats + * suitable for loading the Direct3D perturbation data. If one of them is used, do + * not correct the signedness + */ + shader_addline(buffer, "MAD T%u, T%u, coefmul.x, -one;\n", src, src); + shader_addline(buffer, "SWZ TMP2, bumpenvmat, x, z, 0, 0;\n"); shader_addline(buffer, "DP3 TMP.r, TMP2, T%u;\n", src); shader_addline(buffer, "SWZ TMP2, bumpenvmat, y, w, 0, 0;\n"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 95b7cc7..2a1cc60 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1451,6 +1451,10 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ break; case WINED3DFMT_V8U8: + /* TODO: GL_NV_texture_shader and GL_ATI_envmap_bumpmap provide suitable formats. + * use one of them instead of converting + * Remember to adjust the texbem instruction in the shader + */ *convert = CONVERT_V8U8; *format = GL_BGR; *internal = GL_RGB8; @@ -1581,15 +1585,15 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN { unsigned int x, y; short *Source; - char *Dest; + unsigned char *Dest; for(y = 0; y < height; y++) { Source = (short *) (src + y * pitch); - Dest = (char *) (dst + y * outpitch); + Dest = (unsigned char *) (dst + y * outpitch); for (x = 0; x < width; x++ ) { long color = (*Source++); - Dest[0] = color >> 8; - Dest[1] = color; - Dest[2] = 0xff; + /* B */ Dest[0] = 0xff; + /* G */ Dest[1] = (color >> 8) + 128; /* V */ + /* R */ Dest[2] = (color) + 128; /* U */ Dest += 3; } }

1 0

Stefan Dösinger : wined3d: Store the number of aux buffers in the gl limits structure.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 5f05906f3b6a1ccb3e4673b2901aed15a3a435e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f05906f3b6a1ccb3e4673b29… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 4 23:29:28 2007 +0100 wined3d: Store the number of aux buffers in the gl limits structure. --- dlls/wined3d/device.c | 5 +---- dlls/wined3d/directx.c | 4 ++++ include/wine/wined3d_gl.h | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index af28e96..6a78b23 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1730,10 +1730,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR case ORM_BACKBUFFER: { - GLint auxBuffers; - glGetIntegerv(GL_AUX_BUFFERS, &auxBuffers); - TRACE("Got %d aux buffers\n", auxBuffers); - if(auxBuffers > 0) { + if(GL_LIMITS(aux_buffers) > 0) { TRACE("Using auxilliary buffer for offscreen rendering\n"); This->offscreenBuffer = GL_AUX0; } else { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d3ce06f..c464fbe 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -546,6 +546,10 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display) { gl_info->max_pointsize = gl_floatv[1]; TRACE_(d3d_caps)("Maximum point size support - max point size=%f\n", gl_floatv[1]); + glGetIntegerv(GL_AUX_BUFFERS, &gl_max); + gl_info->max_aux_buffers = gl_max; + TRACE_(d3d_caps)("Offscreen rendering support - number of aux buffers=%d\n", gl_max); + /* Parse the gl supported features, in theory enabling parts of our code appropriately */ GL_Extensions = (const char *) glGetString(GL_EXTENSIONS); TRACE_(d3d_caps)("GL_Extensions reported:\n"); diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 7af8c98..4f85461 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1875,6 +1875,7 @@ typedef struct _WineD3D_GL_Info { float max_pointsize; UINT max_blends; UINT max_anisotropy; + UINT max_aux_buffers; unsigned max_vshader_constantsF; unsigned max_pshader_constantsF;

1 0