Module: wine Branch: master Commit: e55416a113b44d21fab5d41d0018f31d9a3b2bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55416a113b44d21fab5d41d00...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Tue Oct 2 22:15:39 2012 +0200
wined3d: wined3d_swapchain_set_window() never fails.
---
dlls/wined3d/swapchain.c | 6 ++---- include/wine/wined3d.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6be89af..8117df8 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -130,18 +130,16 @@ void * CDECL wined3d_swapchain_get_parent(const struct wined3d_swapchain *swapch return swapchain->parent; }
-HRESULT CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window) +void CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window) { if (!window) window = swapchain->device_window; if (window == swapchain->win_handle) - return WINED3D_OK; + return;
TRACE("Setting swapchain %p window from %p to %p.\n", swapchain, swapchain->win_handle, window); swapchain->win_handle = window; - - return WINED3D_OK; }
HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8db9357..c8d95ba 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2379,7 +2379,7 @@ HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, const RGNDATA *dirty_region, DWORD flags); HRESULT __cdecl wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, DWORD flags, const struct wined3d_gamma_ramp *ramp); -HRESULT __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window); +void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window);
HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region);