January 2012 - Wine-commits

Henri Verbeet : wined3d: Get rid of the WINED3DBACKBUFFER_TYPE typedef.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 45f6def784051f5a1e0db3d1c86fb93a076da007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f6def784051f5a1e0db3d1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 6 11:20:06 2012 +0100 wined3d: Get rid of the WINED3DBACKBUFFER_TYPE typedef. --- dlls/d3d8/device.c | 2 +- dlls/d3d8/swapchain.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/d3d9/swapchain.c | 2 +- dlls/dxgi/swapchain.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/swapchain.c | 2 +- include/wine/wined3d.h | 15 +++++++-------- 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 3fcc6b3..ea75723 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -627,7 +627,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetBackBuffer(IDirect3DDevice8 *iface wined3d_mutex_lock(); hr = wined3d_device_get_back_buffer(This->wined3d_device, 0, - BackBuffer, (WINED3DBACKBUFFER_TYPE)Type, &wined3d_surface); + BackBuffer, (enum wined3d_backbuffer_type)Type, &wined3d_surface); if (SUCCEEDED(hr) && wined3d_surface && ppBackBuffer) { *ppBackBuffer = wined3d_surface_get_parent(wined3d_surface); diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 02b39f1..5ed5c60 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -117,7 +117,7 @@ static HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(IDirect3DSwapChain8 wined3d_mutex_lock(); hr = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain, - iBackBuffer, (WINED3DBACKBUFFER_TYPE)Type, &wined3d_surface); + iBackBuffer, (enum wined3d_backbuffer_type)Type, &wined3d_surface); if (SUCCEEDED(hr) && wined3d_surface) { *ppBackBuffer = wined3d_surface_get_parent(wined3d_surface); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 684ae4d..38bab06 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -620,7 +620,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetBackBuffer(IDirect3DDevice9Ex *ifa wined3d_mutex_lock(); hr = wined3d_device_get_back_buffer(This->wined3d_device, iSwapChain, - BackBuffer, (WINED3DBACKBUFFER_TYPE) Type, &wined3d_surface); + BackBuffer, (enum wined3d_backbuffer_type)Type, &wined3d_surface); if (SUCCEEDED(hr) && wined3d_surface && ppBackBuffer) { *ppBackBuffer = wined3d_surface_get_parent(wined3d_surface); diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 928bb89..7ad0021 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -126,7 +126,7 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_GetBackBuffer(IDirect3DSwapChain9 wined3d_mutex_lock(); hr = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain, - iBackBuffer, (WINED3DBACKBUFFER_TYPE)Type, &wined3d_surface); + iBackBuffer, (enum wined3d_backbuffer_type)Type, &wined3d_surface); if (SUCCEEDED(hr) && wined3d_surface) { *ppBackBuffer = wined3d_surface_get_parent(wined3d_surface); diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f0ccf32..3f35af6 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -159,7 +159,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface, EnterCriticalSection(&dxgi_cs); hr = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain, - buffer_idx, WINED3DBACKBUFFER_TYPE_MONO, &backbuffer); + buffer_idx, WINED3D_BACKBUFFER_TYPE_MONO, &backbuffer); if (FAILED(hr)) { LeaveCriticalSection(&dxgi_cs); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 00670e5..11e1d5e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3831,7 +3831,7 @@ HRESULT CDECL wined3d_device_get_texture(const struct wined3d_device *device, } HRESULT CDECL wined3d_device_get_back_buffer(const struct wined3d_device *device, UINT swapchain_idx, - UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer) + UINT backbuffer_idx, enum wined3d_backbuffer_type backbuffer_type, struct wined3d_surface **backbuffer) { struct wined3d_swapchain *swapchain; HRESULT hr; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index d48464c..a77e716 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1304,7 +1304,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) hr = wined3d_device_get_swapchain(device, 0, &swapchain); if (SUCCEEDED(hr) && swapchain) { - hr = wined3d_swapchain_get_back_buffer(swapchain, 0, WINED3DBACKBUFFER_TYPE_MONO, &backbuffer); + hr = wined3d_swapchain_get_back_buffer(swapchain, 0, WINED3D_BACKBUFFER_TYPE_MONO, &backbuffer); if (SUCCEEDED(hr) && backbuffer) { struct wined3d_resource_desc desc; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c64c5ef..865b1ba 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -174,7 +174,7 @@ HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapc } HRESULT CDECL wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, - UINT back_buffer_idx, WINED3DBACKBUFFER_TYPE type, struct wined3d_surface **back_buffer) + UINT back_buffer_idx, enum wined3d_backbuffer_type type, struct wined3d_surface **back_buffer) { TRACE("swapchain %p, back_buffer_idx %u, type %#x, back_buffer %p.\n", swapchain, back_buffer_idx, type, back_buffer); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6cc8a05..08c1c17 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -494,13 +494,12 @@ enum wined3d_patch_edge_style WINED3D_PATCH_EDGE_CONTINUOUS = 1, }; -typedef enum _WINED3DBACKBUFFER_TYPE +enum wined3d_backbuffer_type { - WINED3DBACKBUFFER_TYPE_MONO = 0, - WINED3DBACKBUFFER_TYPE_LEFT = 1, - WINED3DBACKBUFFER_TYPE_RIGHT = 2, - WINED3DBACKBUFFER_TYPE_FORCE_DWORD = 0x7fffffff -} WINED3DBACKBUFFER_TYPE; + WINED3D_BACKBUFFER_TYPE_MONO = 0, + WINED3D_BACKBUFFER_TYPE_LEFT = 1, + WINED3D_BACKBUFFER_TYPE_RIGHT = 2, +}; typedef enum _WINED3DSWAPEFFECT { @@ -2099,7 +2098,7 @@ HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, str void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_back_buffer(const struct wined3d_device *device, UINT swapchain_idx, - UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer); + UINT backbuffer_idx, enum wined3d_backbuffer_type backbuffer_type, struct wined3d_surface **backbuffer); INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, float *plane); HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, @@ -2353,7 +2352,7 @@ HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); ULONG __cdecl wined3d_swapchain_decref(struct wined3d_swapchain *swapchain); HRESULT __cdecl wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, - UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer); + UINT backbuffer_idx, enum wined3d_backbuffer_type backbuffer_type, struct wined3d_surface **backbuffer); struct wined3d_device * __cdecl wined3d_swapchain_get_device(const struct wined3d_swapchain *swapchain); HRESULT __cdecl wined3d_swapchain_get_display_mode(const struct wined3d_swapchain *swapchain, struct wined3d_display_mode *mode);

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSWAPEFFECT typedef.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 3d33887c2f21e394835e77450d89ce5c8c01ed23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d33887c2f21e394835e77450… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 6 11:20:07 2012 +0100 wined3d: Get rid of the WINED3DSWAPEFFECT typedef. --- dlls/ddraw/ddraw.c | 2 +- dlls/dxgi/factory.c | 2 +- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/swapchain.c | 8 ++++---- include/wine/wined3d.h | 15 +++++++-------- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 28122f8..4dee7af 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -685,7 +685,7 @@ static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, HWND window, BOOL swapchain_desc.backbuffer_width = mode.width; swapchain_desc.backbuffer_height = mode.height; swapchain_desc.backbuffer_format = mode.format_id; - swapchain_desc.swap_effect = WINED3DSWAPEFFECT_COPY; + swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_COPY; swapchain_desc.device_window = window; swapchain_desc.windowed = windowed; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 44ddce3..b2048ea 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -212,7 +212,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IWineDXGIFactory * wined3d_desc.multisample_type = WINED3DMULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; } - wined3d_desc.swap_effect = WINED3DSWAPEFFECT_DISCARD; + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; wined3d_desc.device_window = desc->OutputWindow; wined3d_desc.windowed = desc->Windowed; wined3d_desc.enable_auto_depth_stencil = FALSE; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b658832..fdc72ca 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1689,13 +1689,13 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC && dst_surface == dst_swapchain->front_buffer && src_surface == dst_swapchain->back_buffers[0]) { - WINED3DSWAPEFFECT swap_effect = dst_swapchain->desc.swap_effect; + enum wined3d_swap_effect swap_effect = dst_swapchain->desc.swap_effect; TRACE("Using present for backbuffer -> frontbuffer blit.\n"); /* Set the swap effect to COPY, we don't want the backbuffer * to become undefined. */ - dst_swapchain->desc.swap_effect = WINED3DSWAPEFFECT_COPY; + dst_swapchain->desc.swap_effect = WINED3D_SWAP_EFFECT_COPY; wined3d_swapchain_present(dst_swapchain, NULL, NULL, dst_swapchain->win_handle, NULL, 0); dst_swapchain->desc.swap_effect = swap_effect; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 865b1ba..feefc98 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -546,8 +546,8 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R * * The DISCARD swap effect is ok as well since any backbuffer content is allowed after * the swap. */ - if (swapchain->desc.swap_effect == WINED3DSWAPEFFECT_FLIP) - FIXME("Render-to-fbo with WINED3DSWAPEFFECT_FLIP\n"); + if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP) + FIXME("Render-to-fbo with WINED3D_SWAP_EFFECT_FLIP\n"); swapchain_blit(swapchain, context, &src_rect, &dst_rect); } @@ -588,7 +588,7 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R * bug shows up much more than it does on Windows, and the players see single pixels * with wrong colors. * (The Max Payne bug has been confirmed on Windows with the debug runtime) */ - if (FALSE && swapchain->desc.swap_effect == WINED3DSWAPEFFECT_DISCARD) + if (FALSE && swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_DISCARD) { static const struct wined3d_color cyan = {0.0f, 1.0f, 1.0f, 1.0f}; @@ -632,7 +632,7 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R * If the swapeffect is COPY, the content remains the same. If it is FLIP however, * the texture / sysmem copy needs to be reloaded from the drawable */ - if (swapchain->desc.swap_effect == WINED3DSWAPEFFECT_FLIP) + if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP) surface_modify_location(swapchain->back_buffers[0], swapchain->back_buffers[0]->draw_binding, TRUE); } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 08c1c17..4faba78 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -501,14 +501,13 @@ enum wined3d_backbuffer_type WINED3D_BACKBUFFER_TYPE_RIGHT = 2, }; -typedef enum _WINED3DSWAPEFFECT +enum wined3d_swap_effect { - WINED3DSWAPEFFECT_DISCARD = 1, - WINED3DSWAPEFFECT_FLIP = 2, - WINED3DSWAPEFFECT_COPY = 3, - WINED3DSWAPEFFECT_COPY_VSYNC = 4, - WINED3DSWAPEFFECT_FORCE_DWORD = 0xffffffff -} WINED3DSWAPEFFECT; + WINED3D_SWAP_EFFECT_DISCARD = 1, + WINED3D_SWAP_EFFECT_FLIP = 2, + WINED3D_SWAP_EFFECT_COPY = 3, + WINED3D_SWAP_EFFECT_COPY_VSYNC = 4, +}; typedef enum _WINED3DSAMPLERSTATETYPE { @@ -1629,7 +1628,7 @@ struct wined3d_swapchain_desc UINT backbuffer_count; WINED3DMULTISAMPLE_TYPE multisample_type; DWORD multisample_quality; - WINED3DSWAPEFFECT swap_effect; + enum wined3d_swap_effect swap_effect; HWND device_window; BOOL windowed; BOOL enable_auto_depth_stencil;

1 0

Jacek Caban : ntdll: Make LdrLoadDll hotpatchable.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 43a9faa734c999450659d081df12a7b16037fcf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a9faa734c999450659d081d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 6 11:21:13 2012 +0100 ntdll: Make LdrLoadDll hotpatchable. --- dlls/ntdll/loader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 311fd38..98e3dfb 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2012,8 +2012,8 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ /****************************************************************** * LdrLoadDll (NTDLL.@) */ -NTSTATUS WINAPI LdrLoadDll(LPCWSTR path_name, DWORD flags, - const UNICODE_STRING *libname, HMODULE* hModule) +NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, + const UNICODE_STRING *libname, HMODULE* hModule) { WINE_MODREF *wm; NTSTATUS nts;

1 0

Jacek Caban : jscript: Run script tests in version 2 by default.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 5640da1414c054bc61e9f1f0eed7305332c399db URL: http://source.winehq.org/git/wine.git/?a=commit;h=5640da1414c054bc61e9f1f0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 6 11:29:24 2012 +0100 jscript: Run script tests in version 2 by default. --- dlls/jscript/tests/run.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 5626bd8..66f70b9 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -108,7 +108,7 @@ static const CHAR test_valA[] = "testVal"; static BOOL strict_dispid_check; static const char *test_name = "(null)"; static IDispatch *script_disp; -static int invoke_version; +static int invoke_version = 2; static IActiveScriptError *script_error; /* Returns true if the user interface is in English. Note that this does not

1 0

Jacek Caban : ieframe: Added IServiceProvider interface to InternetExplorer object.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: a3d645022680eee34e0e45865efa217bafa09ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3d645022680eee34e0e45865… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 6 12:59:23 2012 +0100 ieframe: Added IServiceProvider interface to InternetExplorer object. --- dlls/ieframe/ie.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ieframe/ieframe.h | 1 + 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index 5fbc368..d29f64f 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -51,6 +51,9 @@ static HRESULT WINAPI InternetExplorer_QueryInterface(IWebBrowser2 *iface, REFII }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); *ppv = &This->doc_host->doc_host.cps.IConnectionPointContainer_iface; + }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { + TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); + *ppv = &This->IServiceProvider_iface; }else if(HlinkFrame_QI(&This->hlink_frame, riid, ppv)) { return S_OK; } @@ -700,7 +703,49 @@ static const IWebBrowser2Vtbl InternetExplorerVtbl = InternetExplorer_put_Resizable }; +static inline InternetExplorer *impl_from_IServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, InternetExplorer, IServiceProvider_iface); +} + +static HRESULT WINAPI IEServiceProvider_QueryInterface(IServiceProvider *iface, + REFIID riid, LPVOID *ppv) +{ + InternetExplorer *This = impl_from_IServiceProvider(iface); + return IWebBrowser_QueryInterface(&This->IWebBrowser2_iface, riid, ppv); +} + +static ULONG WINAPI IEServiceProvider_AddRef(IServiceProvider *iface) +{ + InternetExplorer *This = impl_from_IServiceProvider(iface); + return IWebBrowser_AddRef(&This->IWebBrowser2_iface); +} + +static ULONG WINAPI IEServiceProvider_Release(IServiceProvider *iface) +{ + InternetExplorer *This = impl_from_IServiceProvider(iface); + return IWebBrowser_Release(&This->IWebBrowser2_iface); +} + +static HRESULT WINAPI IEServiceProvider_QueryService(IServiceProvider *iface, + REFGUID guidService, REFIID riid, void **ppv) +{ + InternetExplorer *This = impl_from_IServiceProvider(iface); + FIXME("(%p)->(%s, %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl ServiceProviderVtbl = +{ + IEServiceProvider_QueryInterface, + IEServiceProvider_AddRef, + IEServiceProvider_Release, + IEServiceProvider_QueryService +}; + void InternetExplorer_WebBrowser_Init(InternetExplorer *This) { This->IWebBrowser2_iface.lpVtbl = &InternetExplorerVtbl; + This->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; } diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 026ab12..944b4ab 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -198,6 +198,7 @@ typedef struct { struct InternetExplorer { IWebBrowser2 IWebBrowser2_iface; + IServiceProvider IServiceProvider_iface; HlinkFrame hlink_frame; LONG ref;

1 0

Jacek Caban : ieframe: Always create doc view window when creating InternetExplore object instance .
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: f31391c77702a234efb39bc45997775d66357b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f31391c77702a234efb39bc45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 6 12:59:32 2012 +0100 ieframe: Always create doc view window when creating InternetExplore object instance. --- dlls/ieframe/iexplore.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 8dd6287..cbab8f5 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -698,6 +698,9 @@ static void create_frame_hwnd(InternetExplorer *This) | WS_MINIMIZEBOX | WS_MAXIMIZEBOX, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL /* FIXME */, ieframe_instance, This); + + This->doc_host->doc_host.frame_hwnd = This->frame_hwnd; + create_doc_view_hwnd(&This->doc_host->doc_host); } static inline IEDocHost *impl_from_DocHost(DocHost *iface) @@ -793,7 +796,6 @@ static HRESULT create_ie(InternetExplorer **ret_obj) HlinkFrame_Init(&ret->hlink_frame, (IUnknown*)&ret->IWebBrowser2_iface, &ret->doc_host->doc_host); create_frame_hwnd(ret); - ret->doc_host->doc_host.frame_hwnd = ret->frame_hwnd; InterlockedIncrement(&obj_cnt); list_add_tail(&ie_list, &ret->entry);

1 0

Jacek Caban : ieframe: Added IHTMLWindow2 stub implementation.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: aaf3202d77d87b5c6fb5405d664cbc8a17aa30e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaf3202d77d87b5c6fb5405d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 6 12:59:58 2012 +0100 ieframe: Added IHTMLWindow2 stub implementation. mshtml/ieframe separation is ugly designed. ieframe needs its own IHTMLWindow2 wrapper-like implementation. --- dlls/ieframe/Makefile.in | 1 + dlls/ieframe/dochost.c | 1 + dlls/ieframe/ie.c | 6 + dlls/ieframe/ieframe.h | 8 + dlls/ieframe/iehtmlwnd.c | 690 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 706 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aaf3202d77d87b5c6fb54…

1 0

Jacek Caban : ieframe: Added IHTMLWindow2 service tests.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 9c448d1dbfbaffbcb12d30baa5aa6bb95cf63bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c448d1dbfbaffbcb12d30baa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 6 13:00:08 2012 +0100 ieframe: Added IHTMLWindow2 service tests. --- dlls/ieframe/tests/ie.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index b761c6f..00e802f 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "ole2.h" #include "exdisp.h" +#include "mshtml.h" static void test_visible(IWebBrowser2 *wb) { @@ -49,6 +50,22 @@ static void test_visible(IWebBrowser2 *wb) ok(hres == S_OK, "put_Visible failed: %08x\n", hres); } +static void test_html_window(IWebBrowser2 *wb) +{ + IHTMLWindow2 *html_window; + IServiceProvider *sp; + HRESULT hres; + + hres = IWebBrowser2_QueryInterface(wb, &IID_IServiceProvider, (void**)&sp); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + + hres = IServiceProvider_QueryService(sp, &SID_SHTMLWindow, &IID_IHTMLWindow2, (void**)&html_window); + IServiceProvider_Release(sp); + ok(hres == S_OK, "Could not get SHTMLWindow service: %08x\n", hres); + + IHTMLWindow2_Release(html_window); +} + static void test_InternetExplorer(void) { IWebBrowser2 *wb; @@ -67,6 +84,7 @@ static void test_InternetExplorer(void) ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres); test_visible(wb); + test_html_window(wb); IWebBrowser2_Release(wb); ref = IUnknown_Release(unk);

1 0

Jörg Höhle : mmdevapi: GetDevicePeriod returns constants.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: acd8d60faaf00159e6c3cea76eed878df6fa6de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acd8d60faaf00159e6c3cea76… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 5 18:17:31 2012 +0100 mmdevapi: GetDevicePeriod returns constants. --- dlls/winecoreaudio.drv/mmdevdrv.c | 19 ++++--------------- dlls/wineoss.drv/mmdevdrv.c | 4 ---- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index a2c72da..e5d2d87 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1396,21 +1396,10 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, if(!defperiod && !minperiod) return E_POINTER; - OSSpinLockLock(&This->lock); - - if(This->period_ms){ - if(defperiod) - *defperiod = This->period_ms * 10000; - if(minperiod) - *minperiod = This->period_ms * 10000; - }else{ - if(defperiod) - *defperiod = DefaultPeriod; - if(minperiod) - *minperiod = MinimumPeriod; - } - - OSSpinLockUnlock(&This->lock); + if(defperiod) + *defperiod = DefaultPeriod; + if(minperiod) + *minperiod = MinimumPeriod; return S_OK; } diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index e80385c..304a5e1 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1261,15 +1261,11 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, if(!defperiod && !minperiod) return E_POINTER; - EnterCriticalSection(&This->lock); - if(defperiod) *defperiod = DefaultPeriod; if(minperiod) *minperiod = MinimumPeriod; - LeaveCriticalSection(&This->lock); - return S_OK; }

1 0

Jörg Höhle : winecoreaudio: Fix latency calculation.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 9bd61f433739c36fbcd14c057ad632c55392b49d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bd61f433739c36fbcd14c057… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 5 22:09:47 2012 +0100 winecoreaudio: Fix latency calculation. --- dlls/winecoreaudio.drv/mmdevdrv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index e5d2d87..93ff3d6 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1210,8 +1210,8 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, latency += stream_latency; /* pretend we process audio in Period chunks, so max latency includes * the period time */ - latency += DefaultPeriod; - *out = (latency / (double)This->fmt->nSamplesPerSec) * 10000000; + *out = MulDiv(latency, 10000000, This->fmt->nSamplesPerSec) + + This->period_ms * 10000; OSSpinLockUnlock(&This->lock);

1 0