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

Stefan Dösinger : ddraw: Implement IDirectDraw7:: GetFourCCCodes.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: e10302d95207f5a01bf3e0a2810d1671b49eed57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10302d95207f5a01bf3e0a28… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 30 15:55:20 2008 -0500 ddraw: Implement IDirectDraw7::GetFourCCCodes. --- dlls/ddraw/ddraw.c | 37 ++++++++++++++++++++++++++++++++++--- 1 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 31dfd1d..8eac776 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -879,9 +879,40 @@ IDirectDrawImpl_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes, DWORD *Codes) { ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); - FIXME("(%p)->(%p, %p): Stub!\n", This, NumCodes, Codes); + WINED3DFORMAT formats[] = { + WINED3DFMT_YUY2, WINED3DFMT_UYVY, + WINED3DFMT_DXT1, WINED3DFMT_DXT2, WINED3DFMT_DXT3, WINED3DFMT_DXT4, WINED3DFMT_DXT5, + }; + DWORD count = 0, i, outsize; + HRESULT hr; + WINED3DDISPLAYMODE d3ddm; + TRACE("(%p)->(%p, %p)\n", This, NumCodes, Codes); + + IWineD3DDevice_GetDisplayMode(This->wineD3DDevice, + 0 /* swapchain 0 */, + &d3ddm); + + outsize = NumCodes && Codes ? *NumCodes : 0; - if(NumCodes) *NumCodes = 0; + for(i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { + hr = IWineD3D_CheckDeviceFormat(This->wineD3D, + WINED3DADAPTER_DEFAULT, + WINED3DDEVTYPE_HAL, + d3ddm.Format /* AdapterFormat */, + 0 /* usage */, + WINED3DRTYPE_SURFACE, + formats[i]); + if(SUCCEEDED(hr)) { + if(count < outsize) { + Codes[count] = formats[i]; + } + count++; + } + } + if(NumCodes) { + TRACE("Returning %u FourCC codes\n", count); + *NumCodes = count; + } return DD_OK; }

1 0

Stefan Dösinger : wined3d: Remove the device-global fullscreen flag.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 376944ebe452cebfeca655b1d25cda6c5da0bf34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=376944ebe452cebfeca655b1d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 4 14:11:22 2008 -0500 wined3d: Remove the device-global fullscreen flag. --- dlls/ddraw/ddraw.c | 5 --- dlls/wined3d/device.c | 60 +++++++++++++++++--------------------- dlls/wined3d/swapchain_gdi.c | 6 ++-- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d_interface.h | 2 - 5 files changed, 30 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=376944ebe452cebfeca65…

1 0

Stefan Dösinger : wined3d: Remove the ddraw_window device member.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 25c07dc86ccba1dd95e2b2dd95ad7ae344dfc37d URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c07dc86ccba1dd95e2b2dd9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 4 14:16:49 2008 -0500 wined3d: Remove the ddraw_window device member. --- dlls/wined3d/device.c | 35 ++++++++++++++++------------------- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/swapchain_gdi.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 91da15a..43837b2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1432,13 +1432,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic if (!object->win_handle) { object->win_handle = This->createParms.hFocusWindow; } - if(!This->ddraw_window) { - if(!pPresentationParameters->Windowed && object->win_handle) { - IWineD3DDeviceImpl_SetupFullscreenWindow(iface, object->win_handle, - pPresentationParameters->BackBufferWidth, - pPresentationParameters->BackBufferHeight); - } - This->ddraw_window = object->win_handle; + if(!pPresentationParameters->Windowed && object->win_handle) { + IWineD3DDeviceImpl_SetupFullscreenWindow(iface, object->win_handle, + pPresentationParameters->BackBufferWidth, + pPresentationParameters->BackBufferHeight); } hDc = GetDC(object->win_handle); @@ -6652,8 +6649,8 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED if(buffer == GL_FRONT) { RECT windowsize; UINT h; - ClientToScreen(This->ddraw_window, &offset); - GetClientRect(This->ddraw_window, &windowsize); + ClientToScreen(((IWineD3DSwapChainImpl *)src_swapchain)->win_handle, &offset); + GetClientRect(((IWineD3DSwapChainImpl *)src_swapchain)->win_handle, &windowsize); h = windowsize.bottom - windowsize.top; src_rect->x1 -= offset.x; src_rect->x2 -=offset.x; src_rect->y1 = offset.y + h - src_rect->y1; @@ -6693,8 +6690,8 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED if(buffer == GL_FRONT) { RECT windowsize; UINT h; - ClientToScreen(This->ddraw_window, &offset); - GetClientRect(This->ddraw_window, &windowsize); + ClientToScreen(((IWineD3DSwapChainImpl *)dst_swapchain)->win_handle, &offset); + GetClientRect(((IWineD3DSwapChainImpl *)dst_swapchain)->win_handle, &windowsize); h = windowsize.bottom - windowsize.top; dst_rect->x1 -= offset.x; dst_rect->x2 -=offset.x; dst_rect->y1 = offset.y + h - dst_rect->y1; @@ -7397,21 +7394,21 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE IWineD3DDevice_SetDisplayMode(iface, 0, &mode); - if(This->ddraw_window && !pPresentationParameters->Windowed) { + if(swapchain->win_handle && !pPresentationParameters->Windowed) { if(swapchain->presentParms.Windowed) { /* switch from windowed to fs */ - IWineD3DDeviceImpl_SetupFullscreenWindow(iface, This->ddraw_window, + IWineD3DDeviceImpl_SetupFullscreenWindow(iface, swapchain->win_handle, pPresentationParameters->BackBufferWidth, pPresentationParameters->BackBufferHeight); } else { /* Fullscreen -> fullscreen mode change */ - MoveWindow(This->ddraw_window, 0, 0, - pPresentationParameters->BackBufferWidth, pPresentationParameters->BackBufferHeight, - TRUE); + MoveWindow(swapchain->win_handle, 0, 0, + pPresentationParameters->BackBufferWidth, pPresentationParameters->BackBufferHeight, + TRUE); } - } else if(This->ddraw_window && !swapchain->presentParms.Windowed) { + } else if(swapchain->win_handle && !swapchain->presentParms.Windowed) { /* Fullscreen -> windowed switch */ - IWineD3DDeviceImpl_RestoreWindow(iface, This->ddraw_window); + IWineD3DDeviceImpl_RestoreWindow(iface, swapchain->win_handle); } swapchain->presentParms.Windowed = pPresentationParameters->Windowed; } else if(!pPresentationParameters->Windowed) { @@ -7422,7 +7419,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE */ This->style = 0; This->exStyle = 0; - IWineD3DDeviceImpl_SetupFullscreenWindow(iface, This->ddraw_window, + IWineD3DDeviceImpl_SetupFullscreenWindow(iface, swapchain->win_handle, pPresentationParameters->BackBufferWidth, pPresentationParameters->BackBufferHeight); This->style = style; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dff833e..3c56d4c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3451,8 +3451,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * RECT windowsize; POINT offset = {0,0}; UINT h; - ClientToScreen(myDevice->ddraw_window, &offset); - GetClientRect(myDevice->ddraw_window, &windowsize); + ClientToScreen(dstSwapchain->win_handle, &offset); + GetClientRect(dstSwapchain->win_handle, &windowsize); h = windowsize.bottom - windowsize.top; rect.x1 -= offset.x; rect.x2 -=offset.x; rect.y1 -= offset.y; rect.y2 -=offset.y; diff --git a/dlls/wined3d/swapchain_gdi.c b/dlls/wined3d/swapchain_gdi.c index 41a5475..7aa81c2 100644 --- a/dlls/wined3d/swapchain_gdi.c +++ b/dlls/wined3d/swapchain_gdi.c @@ -93,7 +93,7 @@ void x11_copy_to_screen(IWineD3DSwapChainImpl *This, LPRECT rc) { hSurfaceDC = front->hDC; - hDisplayWnd = front->resource.wineD3DDevice->ddraw_window; + hDisplayWnd = This->win_handle; hDisplayDC = GetDCEx(hDisplayWnd, 0, DCX_CLIPSIBLINGS|DCX_CACHE); if(rc) { TRACE(" copying rect (%d,%d)->(%d,%d), offset (%d,%d)\n", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ee1e1e8..6f14790 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -920,7 +920,6 @@ struct IWineD3DDeviceImpl BOOL softwareVertexProcessing; /* DirectDraw stuff */ - HWND ddraw_window; DWORD ddraw_width, ddraw_height; WINED3DFORMAT ddraw_format;

1 0

Stefan Dösinger : wined3d: Support redirecting the primary context.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 7f2b8f9bba906b8620eb6c643a86c65b69d022fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f2b8f9bba906b8620eb6c643… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 29 12:09:34 2008 -0500 wined3d: Support redirecting the primary context. --- dlls/wined3d/device.c | 153 ++++++++++++++++++++++------------------ dlls/wined3d/swapchain.c | 6 +- dlls/wined3d/wined3d_private.h | 3 + 3 files changed, 92 insertions(+), 70 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 836b318..abcd90f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7239,15 +7239,92 @@ static BOOL is_display_mode_supported(IWineD3DDeviceImpl *This, WINED3DPRESENT_P return FALSE; } +void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain_iface) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *) swapchain_iface; + UINT i; + IWineD3DBaseShaderImpl *shader; + + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + reset_fbo_state((IWineD3DDevice *) This); + } + + IWineD3DDevice_EnumResources(iface, reset_unload_resources, NULL); + LIST_FOR_EACH_ENTRY(shader, &This->shaders, IWineD3DBaseShaderImpl, baseShader.shader_list_entry) { + This->shader_backend->shader_destroy((IWineD3DBaseShader *) shader); + } + + ENTER_GL(); + if(This->depth_blt_texture) { + glDeleteTextures(1, &This->depth_blt_texture); + This->depth_blt_texture = 0; + } + if (This->depth_blt_rb) { + GL_EXTCALL(glDeleteRenderbuffersEXT(1, &This->depth_blt_rb)); + This->depth_blt_rb = 0; + This->depth_blt_rb_w = 0; + This->depth_blt_rb_h = 0; + } + This->frag_pipe->free_private(iface); + This->shader_backend->shader_free_private(iface); + + for (i = 0; i < GL_LIMITS(textures); i++) { + /* Textures are recreated below */ + glDeleteTextures(1, &This->dummyTextureName[i]); + checkGLcall("glDeleteTextures(1, &This->dummyTextureName[i])"); + This->dummyTextureName[i] = 0; + } + LEAVE_GL(); + + while(This->numContexts) { + DestroyContext(This, This->contexts[0]); + } + This->activeContext = NULL; + HeapFree(GetProcessHeap(), 0, swapchain->context); + swapchain->context = NULL; + swapchain->num_contexts = 0; +} + +HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain_iface) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *) swapchain_iface; + HRESULT hr; + IWineD3DSurfaceImpl *target; + + /* Recreate the primary swapchain's context */ + swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)); + if(swapchain->backBuffer) { + target = (IWineD3DSurfaceImpl *) swapchain->backBuffer[0]; + } else { + target = (IWineD3DSurfaceImpl *) swapchain->frontBuffer; + } + swapchain->context[0] = CreateContext(This, target, swapchain->win_handle, FALSE, + &swapchain->presentParms); + swapchain->num_contexts = 1; + This->activeContext = swapchain->context[0]; + + create_dummy_textures(This); + + hr = This->shader_backend->shader_alloc_private(iface); + if(FAILED(hr)) { + ERR("Failed to recreate shader private data\n"); + return hr; + } + hr = This->frag_pipe->alloc_private(iface); + if(FAILED(hr)) { + TRACE("Fragment pipeline private data couldn't be allocated\n"); + return hr; + } + + return WINED3D_OK; +} + static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRESENT_PARAMETERS* pPresentationParameters) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DSwapChainImpl *swapchain; HRESULT hr; BOOL DisplayModeChanged = FALSE; WINED3DDISPLAYMODE mode; - IWineD3DBaseShaderImpl *shader; - IWineD3DSurfaceImpl *target; - UINT i; TRACE("(%p)\n", This); hr = IWineD3DDevice_GetSwapChain(iface, 0, (IWineD3DSwapChain **) &swapchain); @@ -7308,46 +7385,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE ERR("What do do about a changed auto depth stencil parameter?\n"); } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - reset_fbo_state((IWineD3DDevice *) This); - } - - IWineD3DDevice_EnumResources(iface, reset_unload_resources, NULL); - LIST_FOR_EACH_ENTRY(shader, &This->shaders, IWineD3DBaseShaderImpl, baseShader.shader_list_entry) { - This->shader_backend->shader_destroy((IWineD3DBaseShader *) shader); - } - - ENTER_GL(); - if(This->depth_blt_texture) { - glDeleteTextures(1, &This->depth_blt_texture); - This->depth_blt_texture = 0; - } - if (This->depth_blt_rb) { - GL_EXTCALL(glDeleteRenderbuffersEXT(1, &This->depth_blt_rb)); - This->depth_blt_rb = 0; - This->depth_blt_rb_w = 0; - This->depth_blt_rb_h = 0; - } - This->frag_pipe->free_private(iface); - This->shader_backend->shader_free_private(iface); - - for (i = 0; i < GL_LIMITS(textures); i++) { - /* Textures are recreated below */ - glDeleteTextures(1, &This->dummyTextureName[i]); - checkGLcall("glDeleteTextures(1, &This->dummyTextureName[i])"); - This->dummyTextureName[i] = 0; - } - LEAVE_GL(); - - while(This->numContexts) { - DestroyContext(This, This->contexts[0]); - } - This->activeContext = NULL; - HeapFree(GetProcessHeap(), 0, swapchain->context); - swapchain->context = NULL; - swapchain->num_contexts = 0; + delete_opengl_contexts(iface, (IWineD3DSwapChain *) swapchain); - if(pPresentationParameters->Windowed) { + if(pPresentationParameters->Windowed) { mode.Width = swapchain->orig_width; mode.Height = swapchain->orig_height; mode.RefreshRate = 0; @@ -7413,41 +7453,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE This->exStyle = exStyle; } - /* Recreate the primary swapchain's context */ - swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)); - if(swapchain->backBuffer) { - target = (IWineD3DSurfaceImpl *) swapchain->backBuffer[0]; - } else { - target = (IWineD3DSurfaceImpl *) swapchain->frontBuffer; - } - swapchain->context[0] = CreateContext(This, target, swapchain->win_handle, FALSE, - &swapchain->presentParms); - swapchain->num_contexts = 1; - This->activeContext = swapchain->context[0]; - IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); - hr = IWineD3DStateBlock_InitStartupStateBlock((IWineD3DStateBlock *) This->stateBlock); if(FAILED(hr)) { ERR("Resetting the stateblock failed with error 0x%08x\n", hr); } - create_dummy_textures(This); - - hr = This->shader_backend->shader_alloc_private(iface); - if(FAILED(hr)) { - ERR("Failed to recreate shader private data\n"); - return hr; - } - hr = This->frag_pipe->alloc_private(iface); - if(FAILED(hr)) { - TRACE("Fragment pipeline private data couldn't be allocated\n"); - return hr; - } + hr = create_primary_opengl_context(iface, (IWineD3DSwapChain *) swapchain); + IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); /* All done. There is no need to reload resources or shaders, this will happen automatically on the * first use */ - return WINED3D_OK; + return hr; } static HRESULT WINAPI IWineD3DDeviceImpl_SetDialogBoxMode(IWineD3DDevice *iface, BOOL bEnableDialogs) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 72b1c7c..9ec296c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -149,11 +149,13 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO TRACE("Performing dest override of swapchain %p from window %p to %p\n", This, This->win_handle, hDestWindowOverride); if(This->context[0] == This->wineD3DDevice->contexts[0]) { - /* The primary context 'owns' all the opengl resources. Destroying and recreating that context would require downloading + /* The primary context 'owns' all the opengl resources. Destroying and recreating that context requires downloading * all opengl resources, deleting the gl resources, destroying all other contexts, then recreating all other contexts * and reload the resources */ - ERR("Cannot change the destination window of the owner of the primary context\n"); + delete_opengl_contexts((IWineD3DDevice *) This->wineD3DDevice, iface); + This->win_handle = hDestWindowOverride; + create_primary_opengl_context((IWineD3DDevice *) This->wineD3DDevice, iface); } else { This->win_handle = hDestWindowOverride; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0c163f4..3cdfd1a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -629,6 +629,9 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context); void apply_fbo_state(IWineD3DDevice *iface); +void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain); +HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain); + /* Macros for doing basic GPU detection based on opengl capabilities */ #define WINE_D3D6_CAPABLE(gl_info) (gl_info->supported[ARB_MULTITEXTURE]) #define WINE_D3D7_CAPABLE(gl_info) (gl_info->supported[ARB_TEXTURE_COMPRESSION] && gl_info->supported[ARB_TEXTURE_CUBE_MAP] && gl_info->supported[ARB_TEXTURE_ENV_DOT3])

1 0

Stefan Dösinger : d3d: Remove IWineD3DDevice::SetHwnd.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 34b37fe2411d83f1a6f3e11a7a1e4d28bd9b36ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b37fe2411d83f1a6f3e11a7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 5 14:24:10 2008 -0500 d3d: Remove IWineD3DDevice::SetHwnd. --- dlls/ddraw/ddraw.c | 34 +++++++--------------------------- dlls/ddraw/ddraw_private.h | 1 + dlls/wined3d/device.c | 36 ++++++------------------------------ include/wine/wined3d_interface.h | 4 ---- 4 files changed, 14 insertions(+), 61 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d037769..6ae0269 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -357,7 +357,6 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface, { ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); HWND window; - HRESULT hr; TRACE("(%p)->(%p,%08x)\n",This,hwnd,cooplevel); DDRAW_dump_cooperativelevel(cooplevel); @@ -365,13 +364,7 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface, EnterCriticalSection(&ddraw_cs); /* Get the old window */ - hr = IWineD3DDevice_GetHWND(This->wineD3DDevice, &window); - if(hr != D3D_OK) - { - ERR("IWineD3DDevice::GetHWND failed, hr = %08x\n", hr); - LeaveCriticalSection(&ddraw_cs); - return hr; - } + window = This->dest_window; /* Tests suggest that we need one of them: */ if(!(cooplevel & (DDSCL_SETFOCUSWINDOW | @@ -413,7 +406,7 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface, hwnd = NULL; /* Use the focus window for drawing too */ - IWineD3DDevice_SetHWND(This->wineD3DDevice, This->focuswindow); + This->dest_window = This->focuswindow; /* Destroy the device window, if we have one */ if(This->devicewindow) @@ -450,7 +443,7 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface, !(This->devicewindow) && (hwnd != window) ) { - IWineD3DDevice_SetHWND(This->wineD3DDevice, hwnd); + This->dest_window = hwnd; } IWineD3DDevice_SetFullscreen(This->wineD3DDevice, @@ -483,7 +476,7 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface, !(This->devicewindow) && (hwnd != window) ) { - IWineD3DDevice_SetHWND(This->wineD3DDevice, hwnd); + This->dest_window = hwnd; } } else if(cooplevel & DDSCL_EXCLUSIVE) @@ -507,8 +500,8 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface, ShowWindow(devicewindow, SW_SHOW); /* Just to be sure */ TRACE("(%p) Created a DDraw device window. HWND=%p\n", This, devicewindow); - IWineD3DDevice_SetHWND(This->wineD3DDevice, devicewindow); This->devicewindow = devicewindow; + This->dest_window = devicewindow; } } @@ -3195,11 +3188,7 @@ static HRESULT WINAPI IDirectDrawImpl_CreateGDISwapChain(IDirectDrawImpl *This, WINED3DPRESENT_PARAMETERS presentation_parameters; HWND window; - hr = IWineD3DDevice_GetHWND(This->wineD3DDevice, - &window); - if(FAILED(hr)) { - return hr; - } + window = This->dest_window; memset(&presentation_parameters, 0, sizeof(presentation_parameters)); @@ -3253,21 +3242,12 @@ IDirectDrawImpl_AttachD3DDevice(IDirectDrawImpl *This, IDirectDrawSurfaceImpl *primary) { HRESULT hr; - HWND window; + HWND window = This->dest_window; WINED3DPRESENT_PARAMETERS localParameters; TRACE("(%p)->(%p)\n", This, primary); - /* Get the window */ - hr = IWineD3DDevice_GetHWND(This->wineD3DDevice, - &window); - if(hr != D3D_OK) - { - ERR("IWineD3DDevice::GetHWND failed\n"); - return hr; - } - /* If there's no window, create a hidden window. WineD3D needs it */ if(window == 0) { diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b7816d7..a92f7f4 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -137,6 +137,7 @@ struct IDirectDrawImpl /* Various HWNDs */ HWND focuswindow; HWND devicewindow; + HWND dest_window; /* The surface type to request */ WINED3DSURFTYPE ImplType; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index abcd90f..b89db16 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1432,7 +1432,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic if (!object->win_handle) { object->win_handle = This->createParms.hFocusWindow; } - if(!This->ddraw_window) IWineD3DDevice_SetHWND(iface, object->win_handle); + if(!This->ddraw_window) { + if(This->ddraw_fullscreen && object->win_handle) { + IWineD3DDeviceImpl_SetupFullscreenWindow(iface, object->win_handle); + } + This->ddraw_window = object->win_handle; + } hDc = GetDC(object->win_handle); TRACE("Using hDc %p\n", hDc); @@ -4827,31 +4832,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDisplayMode(IWineD3DDevice *iface, U return hr; } -static HRESULT WINAPI IWineD3DDeviceImpl_SetHWND(IWineD3DDevice *iface, HWND hWnd) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - TRACE("(%p)->(%p)\n", This, hWnd); - - if(This->ddraw_fullscreen) { - if(This->ddraw_window && This->ddraw_window != hWnd) { - IWineD3DDeviceImpl_RestoreWindow(iface, This->ddraw_window); - } - if(hWnd && This->ddraw_window != hWnd) { - IWineD3DDeviceImpl_SetupFullscreenWindow(iface, hWnd); - } - } - - This->ddraw_window = hWnd; - return WINED3D_OK; -} - -static HRESULT WINAPI IWineD3DDeviceImpl_GetHWND(IWineD3DDevice *iface, HWND *hWnd) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - TRACE("(%p)->(%p)\n", This, hWnd); - - *hWnd = This->ddraw_window; - return WINED3D_OK; -} - /***** * Stateblock related functions *****/ @@ -7734,8 +7714,6 @@ const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_GetDirect3D, IWineD3DDeviceImpl_GetDisplayMode, IWineD3DDeviceImpl_SetDisplayMode, - IWineD3DDeviceImpl_GetHWND, - IWineD3DDeviceImpl_SetHWND, IWineD3DDeviceImpl_GetNumberOfSwapChains, IWineD3DDeviceImpl_GetRasterStatus, IWineD3DDeviceImpl_GetSwapChain, @@ -7882,8 +7860,6 @@ const IWineD3DDeviceVtbl IWineD3DDevice_DirtyConst_Vtbl = IWineD3DDeviceImpl_GetDirect3D, IWineD3DDeviceImpl_GetDisplayMode, IWineD3DDeviceImpl_SetDisplayMode, - IWineD3DDeviceImpl_GetHWND, - IWineD3DDeviceImpl_SetHWND, IWineD3DDeviceImpl_GetNumberOfSwapChains, IWineD3DDeviceImpl_GetRasterStatus, IWineD3DDeviceImpl_GetSwapChain, diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index e8b4d94..72ee7fd 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -387,8 +387,6 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) STDMETHOD(GetDirect3D)(THIS_ IWineD3D** ppD3D) PURE; STDMETHOD(GetDisplayMode)(THIS_ UINT iSwapChain, WINED3DDISPLAYMODE* pMode) PURE; STDMETHOD(SetDisplayMode)(THIS_ UINT iSwapChain, WINED3DDISPLAYMODE* pMode) PURE; - STDMETHOD(GetHWND)(THIS_ HWND *hwnd) PURE; - STDMETHOD(SetHWND)(THIS_ HWND hwnd) PURE; STDMETHOD_(UINT, GetNumberOfSwapChains)(THIS) PURE; STDMETHOD(GetRasterStatus)(THIS_ UINT iSwapChain, WINED3DRASTER_STATUS* pRasterStatus) PURE; STDMETHOD(GetSwapChain)(THIS_ UINT iSwapChain, struct IWineD3DSwapChain **pSwapChain) PURE; @@ -530,8 +528,6 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) #define IWineD3DDevice_GetDirect3D(p,a) (p)->lpVtbl->GetDirect3D(p,a) #define IWineD3DDevice_GetDisplayMode(p,a,b) (p)->lpVtbl->GetDisplayMode(p,a,b) #define IWineD3DDevice_SetDisplayMode(p,a,b) (p)->lpVtbl->SetDisplayMode(p,a,b) -#define IWineD3DDevice_GetHWND(p, a) (p)->lpVtbl->GetHWND(p, a) -#define IWineD3DDevice_SetHWND(p, a) (p)->lpVtbl->SetHWND(p, a) #define IWineD3DDevice_GetNumberOfSwapChains(p) (p)->lpVtbl->GetNumberOfSwapChains(p) #define IWineD3DDevice_Reset(p,a) (p)->lpVtbl->Reset(p,a) #define IWineD3DDevice_SetDialogBoxMode(p,a) (p)->lpVtbl->SetDialogBoxMode(p,a)

1 0

Stefan Dösinger : wined3d: Move some swapchain code into a base class.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: e5de2fc82c8dc292878f72375a83f1fc4f3df787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5de2fc82c8dc292878f72375… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jul 27 18:04:16 2008 -0500 wined3d: Move some swapchain code into a base class. --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/swapchain.c | 183 +++------------------------------------- dlls/wined3d/swapchain_base.c | 182 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 13 +++ 4 files changed, 209 insertions(+), 170 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5de2fc82c8dc292878f7…

1 0

Stefan Dösinger : wined3d: Remove unused enum entry.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 66738fbb87e9e870288d755d795736adb6692f5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=66738fbb87e9e870288d755d7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jul 27 22:29:05 2008 -0500 wined3d: Remove unused enum entry. --- include/wine/wined3d_types.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index bbfbcff..bf35b9f 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -1373,7 +1373,6 @@ typedef enum _WINED3DSURFTYPE { SURFACE_UNKNOWN = 0, /* Default / Unknown surface type */ SURFACE_OPENGL, /* OpenGL surface: Renders using libGL, needed for 3D */ SURFACE_GDI, /* User surface. No 3D, DirectDraw rendering with GDI */ - SURFACE_XRENDER /* Future dreams: Use XRENDER / EXA / whatever stuff */ } WINED3DSURFTYPE; #define WINED3DCAPS2_NO2DDURING3DSCENE 0x00000002L

1 0

Stefan Dösinger : wined3d: Use a swapchain for GDI surfaces.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: e178ddd9e1e16d1a3f52492799692e289eefcf8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e178ddd9e1e16d1a3f5249279… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 5 14:23:00 2008 -0500 wined3d: Use a swapchain for GDI surfaces. This is a long-needed cleanup aimed at removing the ddraw_primary, ddraw_window, ddraw_width and ddraw_height members from IWineD3DDeviceImpl, which just do not belong there. Destination window and screen handling is supposed to be done by swapchains. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/swapchain.c | 2 +- dlls/ddraw/ddraw.c | 94 +++++++++++++- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 64 +++++---- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/device.c | 110 +++++++++++++---- dlls/wined3d/surface.c | 7 +- dlls/wined3d/surface_gdi.c | 222 ++++---------------------------- dlls/wined3d/swapchain_gdi.c | 264 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 3 +- include/wine/wined3d_interface.h | 8 +- 12 files changed, 517 insertions(+), 261 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e178ddd9e1e16d1a3f524…

1 0

Juan Lang : crypt32: Implement CertFindCertificateInStore for CERT_FIND_SIGNATURE_HASH.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: a1e14feeac8a5bbcda8ea9ecfd35252ba1a91cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e14feeac8a5bbcda8ea9ecf… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 8 10:44:46 2008 -0700 crypt32: Implement CertFindCertificateInStore for CERT_FIND_SIGNATURE_HASH. --- dlls/crypt32/cert.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 4d5d5e4..d9ab229 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1143,6 +1143,32 @@ static BOOL compare_existing_cert(PCCERT_CONTEXT pCertContext, DWORD dwType, pCertContext->pCertInfo, toCompare->pCertInfo); } +static BOOL compare_cert_by_signature_hash(PCCERT_CONTEXT pCertContext, DWORD dwType, + DWORD dwFlags, const void *pvPara) +{ + const CRYPT_HASH_BLOB *hash = (const CRYPT_HASH_BLOB *)pvPara; + DWORD size = 0; + BOOL ret; + + ret = CertGetCertificateContextProperty(pCertContext, + CERT_SIGNATURE_HASH_PROP_ID, NULL, &size); + if (ret && size == hash->cbData) + { + LPBYTE buf = CryptMemAlloc(size); + + if (buf) + { + CertGetCertificateContextProperty(pCertContext, + CERT_SIGNATURE_HASH_PROP_ID, buf, &size); + ret = !memcmp(buf, hash->pbData, size); + CryptMemFree(buf); + } + } + else + ret = FALSE; + return ret; +} + PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, DWORD dwCertEncodingType, DWORD dwFlags, DWORD dwType, const void *pvPara, PCCERT_CONTEXT pPrevCertContext) @@ -1179,6 +1205,9 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, case CERT_COMPARE_EXISTING: compare = compare_existing_cert; break; + case CERT_COMPARE_SIGNATURE_HASH: + compare = compare_cert_by_signature_hash; + break; default: FIXME("find type %08x unimplemented\n", dwType); compare = NULL;

1 0

Juan Lang : crypt32: Set *pcbStructInfo on more success paths.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 802770299dc03228e8aaa8097107e9cd8517881d URL: http://source.winehq.org/git/wine.git/?a=commit;h=802770299dc03228e8aaa8097… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 14 12:48:59 2008 -0700 crypt32: Set *pcbStructInfo on more success paths. --- dlls/crypt32/decode.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 3ac3ebb..a5df225 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2285,6 +2285,7 @@ static BOOL CRYPT_AsnDecodeBool(const BYTE *pbEncoded, DWORD cbEncoded, } else { + *pcbStructInfo = sizeof(BOOL); *(BOOL *)pvStructInfo = pbEncoded[2] ? TRUE : FALSE; ret = TRUE; } @@ -2761,6 +2762,7 @@ static BOOL CRYPT_AsnDecodePathLenConstraint(const BYTE *pbEncoded, struct PATH_LEN_CONSTRAINT *constraint = (struct PATH_LEN_CONSTRAINT *)pvStructInfo; + *pcbStructInfo = bytesNeeded; size = sizeof(constraint->dwPathLenConstraint); ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, dwFlags, &constraint->dwPathLenConstraint, &size, pcbDecoded); @@ -2962,6 +2964,7 @@ static BOOL CRYPT_AsnDecodeOctetsInternal(const BYTE *pbEncoded, { CRYPT_DATA_BLOB *blob; + *pcbStructInfo = bytesNeeded; blob = (CRYPT_DATA_BLOB *)pvStructInfo; blob->cbData = dataLen; if (dwFlags & CRYPT_DECODE_NOCOPY_FLAG) @@ -3063,6 +3066,7 @@ static BOOL CRYPT_AsnDecodeBitsInternal(const BYTE *pbEncoded, DWORD cbEncoded, { CRYPT_BIT_BLOB *blob; + *pcbStructInfo = bytesNeeded; blob = (CRYPT_BIT_BLOB *)pvStructInfo; blob->cbData = dataLen - 1; blob->cUnusedBits = *(pbEncoded + 1 + lenBytes); @@ -3250,6 +3254,7 @@ static BOOL CRYPT_AsnDecodeIntegerInternal(const BYTE *pbEncoded, { CRYPT_INTEGER_BLOB *blob = (CRYPT_INTEGER_BLOB *)pvStructInfo; + *pcbStructInfo = bytesNeeded; blob->cbData = dataLen; assert(blob->pbData); if (blob->cbData) @@ -3343,6 +3348,7 @@ static BOOL CRYPT_AsnDecodeUnsignedIntegerInternal(const BYTE *pbEncoded, { CRYPT_INTEGER_BLOB *blob = (CRYPT_INTEGER_BLOB *)pvStructInfo; + *pcbStructInfo = bytesNeeded; blob->cbData = dataLen; assert(blob->pbData); /* remove leading zero byte if it exists */ @@ -3939,6 +3945,7 @@ static BOOL CRYPT_AsnDecodeDistPointName(const BYTE *pbEncoded, { CRL_DIST_POINT_NAME *name = (CRL_DIST_POINT_NAME *)pvStructInfo; + *pcbStructInfo = bytesNeeded; if (dataLen) { name->dwDistPointNameChoice = CRL_DIST_POINT_FULL_NAME;

1 0