August 2012 - Wine-Commits - list.winehq.org

Józef Kucia : d3dx9: Introduce separate functions for restoring and capturing device state.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 8c4adc06176b8f6187585528f3ce023d7a224191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c4adc06176b8f6187585528f… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jul 31 15:26:38 2012 +0200 d3dx9: Introduce separate functions for restoring and capturing device state. --- dlls/d3dx9_36/render.c | 156 ++++++++++++++++++++++++++++-------------------- 1 files changed, 92 insertions(+), 64 deletions(-) diff --git a/dlls/d3dx9_36/render.c b/dlls/d3dx9_36/render.c index 7994a8b..97a2916 100644 --- a/dlls/d3dx9_36/render.c +++ b/dlls/d3dx9_36/render.c @@ -22,50 +22,108 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -struct render_to_surface +struct device_state { - ID3DXRenderToSurface ID3DXRenderToSurface_iface; - LONG ref; + DWORD num_render_targets; + IDirect3DSurface9 **render_targets; + IDirect3DSurface9 *depth_stencil; + D3DVIEWPORT9 viewport; +}; - IDirect3DDevice9 *device; - D3DXRTS_DESC desc; +static HRESULT device_state_init(IDirect3DDevice9 *device, struct device_state *state) +{ + HRESULT hr; + D3DCAPS9 caps; + unsigned int i; - IDirect3DSurface9 *dst_surface; + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + if (FAILED(hr)) return hr; - IDirect3DSurface9 *render_target; - IDirect3DSurface9 *depth_stencil; + state->num_render_targets = caps.NumSimultaneousRTs; + state->render_targets = HeapAlloc(GetProcessHeap(), 0, + state->num_render_targets * sizeof(IDirect3DSurface9 *)); + if (!state->render_targets) + return E_OUTOFMEMORY; - DWORD num_render_targets; - D3DVIEWPORT9 previous_viewport; - IDirect3DSurface9 **previous_render_targets; - IDirect3DSurface9 *previous_depth_stencil; -}; + for (i = 0; i < state->num_render_targets; i++) + state->render_targets[i] = NULL; + state->depth_stencil = NULL; + return D3D_OK; +} -static inline struct render_to_surface *impl_from_ID3DXRenderToSurface(ID3DXRenderToSurface *iface) +static void device_state_capture(IDirect3DDevice9 *device, struct device_state *state) { - return CONTAINING_RECORD(iface, struct render_to_surface, ID3DXRenderToSurface_iface); + HRESULT hr; + unsigned int i; + + IDirect3DDevice9_GetViewport(device, &state->viewport); + + for (i = 0; i < state->num_render_targets; i++) + { + hr = IDirect3DDevice9_GetRenderTarget(device, i, &state->render_targets[i]); + if (FAILED(hr)) state->render_targets[i] = NULL; + } + + hr = IDirect3DDevice9_GetDepthStencilSurface(device, &state->depth_stencil); + if (FAILED(hr)) state->depth_stencil = NULL; } -static void restore_previous_device_state(struct render_to_surface *render) +static void device_state_restore(IDirect3DDevice9 *device, struct device_state *state) { unsigned int i; - for (i = 0; i < render->num_render_targets; i++) + for (i = 0; i < state->num_render_targets; i++) { - IDirect3DDevice9_SetRenderTarget(render->device, i, render->previous_render_targets[i]); - if (render->previous_render_targets[i]) - IDirect3DSurface9_Release(render->previous_render_targets[i]); - render->previous_render_targets[i] = NULL; + IDirect3DDevice9_SetRenderTarget(device, i, state->render_targets[i]); + if (state->render_targets[i]) + IDirect3DSurface9_Release(state->render_targets[i]); + state->render_targets[i] = NULL; } - IDirect3DDevice9_SetDepthStencilSurface(render->device, render->previous_depth_stencil); - if (render->previous_depth_stencil) + IDirect3DDevice9_SetDepthStencilSurface(device, state->depth_stencil); + if (state->depth_stencil) + { + IDirect3DSurface9_Release(state->depth_stencil); + state->depth_stencil = NULL; + } + + IDirect3DDevice9_SetViewport(device, &state->viewport); +} + +static void device_state_release(struct device_state *state) +{ + unsigned int i; + + for (i = 0; i < state->num_render_targets; i++) { - IDirect3DSurface9_Release(render->previous_depth_stencil); - render->previous_depth_stencil = NULL; + if (state->render_targets[i]) + IDirect3DSurface9_Release(state->render_targets[i]); } - IDirect3DDevice9_SetViewport(render->device, &render->previous_viewport); + HeapFree(GetProcessHeap(), 0, state->render_targets); + + if (state->depth_stencil) IDirect3DSurface9_Release(state->depth_stencil); +} + +struct render_to_surface +{ + ID3DXRenderToSurface ID3DXRenderToSurface_iface; + LONG ref; + + IDirect3DDevice9 *device; + D3DXRTS_DESC desc; + + IDirect3DSurface9 *dst_surface; + + IDirect3DSurface9 *render_target; + IDirect3DSurface9 *depth_stencil; + + struct device_state previous_state; +}; + +static inline struct render_to_surface *impl_from_ID3DXRenderToSurface(ID3DXRenderToSurface *iface) +{ + return CONTAINING_RECORD(iface, struct render_to_surface, ID3DXRenderToSurface_iface); } static HRESULT WINAPI D3DXRenderToSurface_QueryInterface(ID3DXRenderToSurface *iface, @@ -102,7 +160,6 @@ static ULONG WINAPI D3DXRenderToSurface_Release(ID3DXRenderToSurface *iface) { struct render_to_surface *render = impl_from_ID3DXRenderToSurface(iface); ULONG ref = InterlockedDecrement(&render->ref); - unsigned int i; TRACE("%p decreasing refcount to %u\n", iface, ref); @@ -113,15 +170,7 @@ static ULONG WINAPI D3DXRenderToSurface_Release(ID3DXRenderToSurface *iface) if (render->render_target) IDirect3DSurface9_Release(render->render_target); if (render->depth_stencil) IDirect3DSurface9_Release(render->depth_stencil); - for (i = 0; i < render->num_render_targets; i++) - { - if (render->previous_render_targets[i]) - IDirect3DSurface9_Release(render->previous_render_targets[i]); - } - - HeapFree(GetProcessHeap(), 0, render->previous_render_targets); - - if (render->previous_depth_stencil) IDirect3DSurface9_Release(render->previous_depth_stencil); + device_state_release(&render->previous_state); IDirect3DDevice9_Release(render->device); @@ -196,20 +245,10 @@ static HRESULT WINAPI D3DXRenderToSurface_BeginScene(ID3DXRenderToSurface *iface device = render->device; - /* save device state */ - IDirect3DDevice9_GetViewport(device, &render->previous_viewport); - - for (i = 0; i < render->num_render_targets; i++) - { - hr = IDirect3DDevice9_GetRenderTarget(device, i, &render->previous_render_targets[i]); - if (FAILED(hr)) render->previous_render_targets[i] = NULL; - } - - hr = IDirect3DDevice9_GetDepthStencilSurface(device, &render->previous_depth_stencil); - if (FAILED(hr)) render->previous_depth_stencil = NULL; + device_state_capture(device, &render->previous_state); /* prepare for rendering to surface */ - for (i = 1; i < render->num_render_targets; i++) + for (i = 1; i < render->previous_state.num_render_targets; i++) IDirect3DDevice9_SetRenderTarget(device, i, NULL); if (surface_desc.Usage & D3DUSAGE_RENDERTARGET) @@ -249,7 +288,7 @@ static HRESULT WINAPI D3DXRenderToSurface_BeginScene(ID3DXRenderToSurface *iface return IDirect3DDevice9_BeginScene(device); cleanup: - restore_previous_device_state(render); + device_state_restore(device, &render->previous_state); if (render->dst_surface) IDirect3DSurface9_Release(render->dst_surface); render->dst_surface = NULL; @@ -282,7 +321,7 @@ static HRESULT WINAPI D3DXRenderToSurface_EndScene(ID3DXRenderToSurface *iface, if (FAILED(hr)) ERR("Copying render target data to surface failed %#x\n", hr); } - restore_previous_device_state(render); + device_state_restore(render->device, &render->previous_state); /* release resources */ if (render->render_target) @@ -339,18 +378,13 @@ HRESULT WINAPI D3DXCreateRenderToSurface(IDirect3DDevice9 *device, ID3DXRenderToSurface **out) { HRESULT hr; - D3DCAPS9 caps; struct render_to_surface *render; - unsigned int i; TRACE("(%p, %u, %u, %#x, %d, %#x, %p)\n", device, width, height, format, depth_stencil, depth_stencil_format, out); if (!device || !out) return D3DERR_INVALIDCALL; - hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); - if (FAILED(hr)) return hr; - render = HeapAlloc(GetProcessHeap(), 0, sizeof(struct render_to_surface)); if (!render) return E_OUTOFMEMORY; @@ -367,19 +401,13 @@ HRESULT WINAPI D3DXCreateRenderToSurface(IDirect3DDevice9 *device, render->render_target = NULL; render->depth_stencil = NULL; - render->num_render_targets = caps.NumSimultaneousRTs; - render->previous_render_targets = HeapAlloc(GetProcessHeap(), 0, - render->num_render_targets * sizeof(IDirect3DSurface9 *)); - if (!render->previous_render_targets) + hr = device_state_init(device, &render->previous_state); + if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, render); - return E_OUTOFMEMORY; + return hr; } - for (i = 0; i < render->num_render_targets; i++) - render->previous_render_targets[i] = NULL; - render->previous_depth_stencil = NULL; - IDirect3DDevice9_AddRef(device); render->device = device;

1 0

Henri Verbeet : winex11: Explicitly clear virtual desktop maximized state.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 292869b969a3f59a44f0b5b121e51c833ee29ad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=292869b969a3f59a44f0b5b12… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 13 11:39:42 2012 +0200 winex11: Explicitly clear virtual desktop maximized state. --- dlls/winex11.drv/desktop.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 66b1e11..6572845 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -235,6 +235,11 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) wine_tsx11_lock(); XSendEvent( display, DefaultRootWindow(display), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev ); + + xev.xclient.data.l[1] = x11drv_atom(_NET_WM_STATE_MAXIMIZED_VERT); + xev.xclient.data.l[2] = x11drv_atom(_NET_WM_STATE_MAXIMIZED_HORZ); + XSendEvent( display, DefaultRootWindow(display), False, + SubstructureRedirectMask | SubstructureNotifyMask, &xev ); wine_tsx11_unlock(); }

1 0

Jacek Caban : wscript: Use proper helpers for iface calls.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: e02c33164d186e219e23d8b111881c71bfc53909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02c33164d186e219e23d8b11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:10:21 2012 +0200 wscript: Use proper helpers for iface calls. --- programs/wscript/main.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index d456e98..3d97bde 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -33,6 +33,20 @@ #include <wine/debug.h> #include <wine/unicode.h> +#ifdef _WIN64 + +#define IActiveScriptParse_Release IActiveScriptParse64_Release +#define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText + +#else + +#define IActiveScriptParse_Release IActiveScriptParse32_Release +#define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText + +#endif + WINE_DEFAULT_DEBUG_CHANNEL(wscript); static const WCHAR wscriptW[] = {'W','S','c','r','i','p','t',0}; @@ -253,7 +267,7 @@ static HRESULT init_engine(IActiveScript *script, IActiveScriptParse *parser) if(FAILED(hres)) return FALSE; - hres = IActiveScriptParse64_InitNew(parser); + hres = IActiveScriptParse_InitNew(parser); if(FAILED(hres)) return FALSE; @@ -310,7 +324,7 @@ static void run_script(const WCHAR *filename, IActiveScript *script, IActiveScri return; } - hres = IActiveScriptParse64_ParseScriptText(parser, text, NULL, NULL, NULL, 1, 1, + hres = IActiveScriptParse_ParseScriptText(parser, text, NULL, NULL, NULL, 1, 1, SCRIPTTEXT_HOSTMANAGESSOURCE|SCRIPTITEM_ISVISIBLE, NULL, NULL); SysFreeString(text); if(FAILED(hres)) { @@ -406,7 +420,7 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm } IActiveScript_Release(script); - IUnknown_Release(parser); + IActiveScriptParse_Release(parser); CoUninitialize();

1 0

Nikolay Sivov : dwrite: Implement IDWriteBitmapRenderTarget creation.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 292fd912c91b1b4bd50160820a0b914eb4c972db URL: http://source.winehq.org/git/wine.git/?a=commit;h=292fd912c91b1b4bd50160820… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 13 07:49:19 2012 +0400 dwrite: Implement IDWriteBitmapRenderTarget creation. --- dlls/dwrite/Makefile.in | 1 + dlls/dwrite/gdiinterop.c | 168 ++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/Makefile.in | 2 +- dlls/dwrite/tests/font.c | 68 +++++++++++++++++ 4 files changed, 236 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index f4ee7ae..6da8c62 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -1,5 +1,6 @@ MODULE = dwrite.dll IMPORTLIB = dwrite +IMPORTS = gdi32 C_SRCS = \ font.c \ diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index d98eb5b..c3bcc88 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -18,10 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "dwrite.h" #include "dwrite_private.h" @@ -29,6 +32,167 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); +struct rendertarget { + IDWriteBitmapRenderTarget IDWriteBitmapRenderTarget_iface; + LONG ref; + + HDC hdc; +}; + +static inline struct rendertarget *impl_from_IDWriteBitmapRenderTarget(IDWriteBitmapRenderTarget *iface) +{ + return CONTAINING_RECORD(iface, struct rendertarget, IDWriteBitmapRenderTarget_iface); +} + +static HRESULT WINAPI rendertarget_QueryInterface(IDWriteBitmapRenderTarget *iface, REFIID riid, void **obj) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteBitmapRenderTarget)) + { + *obj = iface; + IDWriteBitmapRenderTarget_AddRef(iface); + return S_OK; + } + + *obj = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI rendertarget_AddRef(IDWriteBitmapRenderTarget *iface) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI rendertarget_Release(IDWriteBitmapRenderTarget *iface) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + { + DeleteDC(This->hdc); + heap_free(This); + } + + return S_OK; +} + +static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget *iface, + FLOAT baselineOriginX, FLOAT baselineOriginY, DWRITE_MEASURING_MODE measuring_mode, + DWRITE_GLYPH_RUN const* glyph_run, IDWriteRenderingParams* params, COLORREF textColor, + RECT *blackbox_rect) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p)->(%f %f %d %p %p 0x%08x %p): stub\n", This, baselineOriginX, baselineOriginY, + measuring_mode, glyph_run, params, textColor, blackbox_rect); + return E_NOTIMPL; +} + +static HDC WINAPI rendertarget_GetMemoryDC(IDWriteBitmapRenderTarget *iface) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + TRACE("(%p)\n", This); + return This->hdc; +} + +static FLOAT WINAPI rendertarget_GetPixelsPerDip(IDWriteBitmapRenderTarget *iface) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p): stub\n", This); + return 1.0; +} + +static HRESULT WINAPI rendertarget_SetPixelsPerDip(IDWriteBitmapRenderTarget *iface, FLOAT pixels_per_dip) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p)->(%f): stub\n", This, pixels_per_dip); + return E_NOTIMPL; +} + +static HRESULT WINAPI rendertarget_GetCurrentTransform(IDWriteBitmapRenderTarget *iface, DWRITE_MATRIX *transform) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p)->(%p): stub\n", This, transform); + return E_NOTIMPL; +} + +static HRESULT WINAPI rendertarget_SetCurrentTransform(IDWriteBitmapRenderTarget *iface, DWRITE_MATRIX const *transform) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p)->(%p): stub\n", This, transform); + return E_NOTIMPL; +} + +static HRESULT WINAPI rendertarget_GetSize(IDWriteBitmapRenderTarget *iface, SIZE *size) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p)->(%p): stub\n", This, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI rendertarget_Resize(IDWriteBitmapRenderTarget *iface, UINT32 width, UINT32 height) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p)->(%u %u): stub\n", This, width, height); + return E_NOTIMPL; +} + +static const IDWriteBitmapRenderTargetVtbl rendertargetvtbl = { + rendertarget_QueryInterface, + rendertarget_AddRef, + rendertarget_Release, + rendertarget_DrawGlyphRun, + rendertarget_GetMemoryDC, + rendertarget_GetPixelsPerDip, + rendertarget_SetPixelsPerDip, + rendertarget_GetCurrentTransform, + rendertarget_SetCurrentTransform, + rendertarget_GetSize, + rendertarget_Resize +}; + +static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **target) +{ + char bmibuf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *bmi = (BITMAPINFO*)bmibuf; + struct rendertarget *This; + HBITMAP dib; + + *target = NULL; + + This = heap_alloc(sizeof(struct rendertarget)); + if (!This) return E_OUTOFMEMORY; + + This->IDWriteBitmapRenderTarget_iface.lpVtbl = &rendertargetvtbl; + This->ref = 1; + + This->hdc = CreateCompatibleDC(hdc); + + memset(bmi, 0, sizeof(bmibuf)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biHeight = height; + bmi->bmiHeader.biWidth = width; + bmi->bmiHeader.biBitCount = 32; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + + dib = CreateDIBSection(This->hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + SelectObject(This->hdc, dib); + + *target = &This->IDWriteBitmapRenderTarget_iface; + + return S_OK; +} + static HRESULT WINAPI gdiinterop_QueryInterface(IDWriteGdiInterop *iface, REFIID riid, void **obj) { TRACE("(%s %p)\n", debugstr_guid(riid), obj); @@ -88,8 +252,8 @@ static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop *iface, static HRESULT WINAPI gdiinterop_CreateBitmapRenderTarget(IDWriteGdiInterop *iface, HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **target) { - FIXME("(%p %u %u %p): stub\n", hdc, width, height, target); - return E_NOTIMPL; + TRACE("(%p %u %u %p)\n", hdc, width, height, target); + return create_rendertarget(hdc, width, height, target); } static const struct IDWriteGdiInteropVtbl gdiinteropvtbl = { diff --git a/dlls/dwrite/tests/Makefile.in b/dlls/dwrite/tests/Makefile.in index f00d0e7..98843cf 100644 --- a/dlls/dwrite/tests/Makefile.in +++ b/dlls/dwrite/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dwrite.dll -IMPORTS = dwrite +IMPORTS = dwrite gdi32 C_SRCS = \ font.c diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f169393..97cd477 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -151,6 +151,73 @@ todo_wine IDWriteGdiInterop_Release(interop); } +static void test_CreateBitmapRenderTarget(void) +{ + IDWriteBitmapRenderTarget *target, *target2; + IDWriteGdiInterop *interop; + DIBSECTION ds; + HBITMAP hbm; + HRESULT hr; + HDC hdc; + int ret; + + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + EXPECT_HR(hr, S_OK); + + target = NULL; + hr = IDWriteGdiInterop_CreateBitmapRenderTarget(interop, NULL, 0, 0, &target); + EXPECT_HR(hr, S_OK); + + target2 = NULL; + hr = IDWriteGdiInterop_CreateBitmapRenderTarget(interop, NULL, 0, 0, &target2); + EXPECT_HR(hr, S_OK); + ok(target != target2, "got %p, %p\n", target2, target); + IDWriteBitmapRenderTarget_Release(target2); + + hdc = IDWriteBitmapRenderTarget_GetMemoryDC(target); + ok(hdc != NULL, "got %p\n", hdc); + + hbm = GetCurrentObject(hdc, OBJ_BITMAP); + ok(hbm != NULL, "got %p\n", hbm); + + /* check DIB properties */ + ret = GetObjectW(hbm, sizeof(ds), &ds); + ok(ret == sizeof(BITMAP), "got %d\n", ret); + ok(ds.dsBm.bmWidth == 1, "got %d\n", ds.dsBm.bmWidth); + ok(ds.dsBm.bmHeight == 1, "got %d\n", ds.dsBm.bmHeight); + ok(ds.dsBm.bmPlanes == 1, "got %d\n", ds.dsBm.bmPlanes); + ok(ds.dsBm.bmBitsPixel == 1, "got %d\n", ds.dsBm.bmBitsPixel); + ok(!ds.dsBm.bmBits, "got %p\n", ds.dsBm.bmBits); + + IDWriteBitmapRenderTarget_Release(target); + + hbm = GetCurrentObject(hdc, OBJ_BITMAP); + ok(!hbm, "got %p\n", hbm); + + target = NULL; + hr = IDWriteGdiInterop_CreateBitmapRenderTarget(interop, NULL, 10, 5, &target); + EXPECT_HR(hr, S_OK); + + hdc = IDWriteBitmapRenderTarget_GetMemoryDC(target); + ok(hdc != NULL, "got %p\n", hdc); + + hbm = GetCurrentObject(hdc, OBJ_BITMAP); + ok(hbm != NULL, "got %p\n", hbm); + + /* check DIB properties */ + ret = GetObjectW(hbm, sizeof(ds), &ds); + ok(ret == sizeof(ds), "got %d\n", ret); + ok(ds.dsBm.bmWidth == 10, "got %d\n", ds.dsBm.bmWidth); + ok(ds.dsBm.bmHeight == 5, "got %d\n", ds.dsBm.bmHeight); + ok(ds.dsBm.bmPlanes == 1, "got %d\n", ds.dsBm.bmPlanes); + ok(ds.dsBm.bmBitsPixel == 32, "got %d\n", ds.dsBm.bmBitsPixel); + ok(ds.dsBm.bmBits != NULL, "got %p\n", ds.dsBm.bmBits); + + IDWriteBitmapRenderTarget_Release(target); + + IDWriteGdiInterop_Release(interop); +} + START_TEST(font) { HRESULT hr; @@ -164,6 +231,7 @@ START_TEST(font) } test_CreateFontFromLOGFONT(); + test_CreateBitmapRenderTarget(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Store font style provided in LOGFONT data.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 09ba9bdb0addc7ff1d24521724d0ecaedf300e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=09ba9bdb0addc7ff1d2452172… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 13 07:46:43 2012 +0400 dwrite: Store font style provided in LOGFONT data. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 15 ++++++-- dlls/dwrite/gdiinterop.c | 4 +- dlls/dwrite/tests/font.c | 76 ++++++++++++++++++++++++++++++++++++++++- include/dwrite.idl | 14 ++++++++ 5 files changed, 102 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index c52b93a..c3c7cb1 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -27,4 +27,4 @@ static inline BOOL heap_free(void *mem) } extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; -extern HRESULT create_font(IDWriteFont**) DECLSPEC_HIDDEN; +extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 29dd63c..e73ef44 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); struct dwrite_font { IDWriteFont IDWriteFont_iface; LONG ref; + + DWRITE_FONT_STYLE style; }; static inline struct dwrite_font *impl_from_IDWriteFont(IDWriteFont *iface) @@ -86,7 +88,7 @@ static DWRITE_FONT_WEIGHT WINAPI dwritefont_GetWeight(IDWriteFont *iface) { struct dwrite_font *This = impl_from_IDWriteFont(iface); FIXME("(%p): stub\n", This); - return DWRITE_FONT_WEIGHT_NORMAL; + return 0; } static DWRITE_FONT_STRETCH WINAPI dwritefont_GetStretch(IDWriteFont *iface) @@ -99,8 +101,8 @@ static DWRITE_FONT_STRETCH WINAPI dwritefont_GetStretch(IDWriteFont *iface) static DWRITE_FONT_STYLE WINAPI dwritefont_GetStyle(IDWriteFont *iface) { struct dwrite_font *This = impl_from_IDWriteFont(iface); - FIXME("(%p): stub\n", This); - return DWRITE_FONT_STYLE_NORMAL; + TRACE("(%p)\n", This); + return This->style; } static BOOL WINAPI dwritefont_IsSymbolFont(IDWriteFont *iface) @@ -169,15 +171,20 @@ static const IDWriteFontVtbl dwritefontvtbl = { dwritefont_CreateFontFace }; -HRESULT create_font(IDWriteFont **font) +HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) { struct dwrite_font *This; + *font = NULL; + This = heap_alloc(sizeof(struct dwrite_font)); if (!This) return E_OUTOFMEMORY; This->IDWriteFont_iface.lpVtbl = &dwritefontvtbl; This->ref = 1; + + This->style = logfont->lfItalic ? DWRITE_FONT_STYLE_ITALIC : DWRITE_FONT_STYLE_NORMAL; + *font = &This->IDWriteFont_iface; return S_OK; diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index d374724..d98eb5b 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -57,11 +57,11 @@ static ULONG WINAPI gdiinterop_Release(IDWriteGdiInterop *iface) static HRESULT WINAPI gdiinterop_CreateFontFromLOGFONT(IDWriteGdiInterop *iface, LOGFONTW const *logfont, IDWriteFont **font) { - FIXME("(%p %p): stub\n", logfont, font); + TRACE("(%p %p)\n", logfont, font); if (!logfont) return E_INVALIDARG; - return create_font(font); + return create_font_from_logfont(logfont, font); } static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 520fc1b..f169393 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -30,18 +30,35 @@ #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) -IDWriteFactory *factory; +static IDWriteFactory *factory; static void test_CreateFontFromLOGFONT(void) { static const WCHAR arialW[] = {'A','r','i','a','l',0}; + static const WCHAR blahW[] = {'B','l','a','h','!',0}; IDWriteGdiInterop *interop; DWRITE_FONT_WEIGHT weight; DWRITE_FONT_STYLE style; IDWriteFont *font; LOGFONTW logfont; + LONG weights[][2] = { + {FW_NORMAL, DWRITE_FONT_WEIGHT_NORMAL}, + {FW_BOLD, DWRITE_FONT_WEIGHT_BOLD}, + { 0, DWRITE_FONT_WEIGHT_NORMAL}, + { 50, DWRITE_FONT_WEIGHT_NORMAL}, + {150, DWRITE_FONT_WEIGHT_NORMAL}, + {250, DWRITE_FONT_WEIGHT_NORMAL}, + {350, DWRITE_FONT_WEIGHT_NORMAL}, + {450, DWRITE_FONT_WEIGHT_NORMAL}, + {650, DWRITE_FONT_WEIGHT_BOLD}, + {750, DWRITE_FONT_WEIGHT_BOLD}, + {850, DWRITE_FONT_WEIGHT_BOLD}, + {950, DWRITE_FONT_WEIGHT_BOLD}, + {960, DWRITE_FONT_WEIGHT_BOLD}, + }; HRESULT hr; BOOL ret; + int i; hr = IDWriteFactory_GetGdiInterop(factory, &interop); EXPECT_HR(hr, S_OK); @@ -65,10 +82,10 @@ if (0) /* now check properties */ weight = IDWriteFont_GetWeight(font); +todo_wine ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "got %d\n", weight); style = IDWriteFont_GetStyle(font); -todo_wine ok(style == DWRITE_FONT_STYLE_ITALIC, "got %d\n", style); ret = IDWriteFont_IsSymbolFont(font); @@ -76,6 +93,61 @@ todo_wine IDWriteFont_Release(font); + /* weight values */ + for (i = 0; i < sizeof(weights)/(2*sizeof(LONG)); i++) + { + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = weights[i][0]; + lstrcpyW(logfont.lfFaceName, arialW); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); + EXPECT_HR(hr, S_OK); + + weight = IDWriteFont_GetWeight(font); + todo_wine + ok(weight == weights[i][1], + "%d: got %d, expected %d\n", i, weight, weights[i][1]); + IDWriteFont_Release(font); + } + + /* weight not from enum */ + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = 550; + lstrcpyW(logfont.lfFaceName, arialW); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); + EXPECT_HR(hr, S_OK); + + weight = IDWriteFont_GetWeight(font); +todo_wine + ok(weight == DWRITE_FONT_WEIGHT_NORMAL || broken(weight == DWRITE_FONT_WEIGHT_BOLD) /* win7 w/o SP */, + "got %d\n", weight); + IDWriteFont_Release(font); + + /* empty or nonexistent face name */ + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + lstrcpyW(logfont.lfFaceName, blahW); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); +todo_wine + EXPECT_HR(hr, DWRITE_E_NOFONT); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); +todo_wine + EXPECT_HR(hr, DWRITE_E_NOFONT); + IDWriteGdiInterop_Release(interop); } diff --git a/include/dwrite.idl b/include/dwrite.idl index aff529a..60a2bae 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -1394,3 +1394,17 @@ interface IDWriteFactory : IUnknown } cpp_quote("HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE,REFIID,IUnknown**);") + +/* error codes */ +cpp_quote("#define FACILITY_DWRITE 0x898") +cpp_quote("#define DWRITE_ERR_BASE 0x5000") +cpp_quote("#define MAKE_DWRITE_HR(severity, code) MAKE_HRESULT(severity, FACILITY_DWRITE, (DWRITE_ERR_BASE + code))") +cpp_quote("#define MAKE_DWRITE_HR_ERR(code) MAKE_DWRITE_HR(SEVERITY_ERROR, code)") + +cpp_quote("#define DWRITE_E_FILEFORMAT MAKE_DWRITE_HR_ERR(0x0)") +cpp_quote("#define DWRITE_E_UNEXPECTED MAKE_DWRITE_HR_ERR(0x1)") +cpp_quote("#define DWRITE_E_NOFONT MAKE_DWRITE_HR_ERR(0x2)") +cpp_quote("#define DWRITE_E_FILENOTFOUND MAKE_DWRITE_HR_ERR(0x3)") +cpp_quote("#define DWRITE_E_FILEACCESS MAKE_DWRITE_HR_ERR(0x4)") +cpp_quote("#define DWRITE_E_FONTCOLLECTIONOBSOLETE MAKE_DWRITE_HR_ERR(0x5)") +cpp_quote("#define DWRITE_E_ALREADYREGISTERED MAKE_DWRITE_HR_ERR(0x6)")

1 0

Nikolay Sivov : dwrite: Added IDWriteFont stub.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 56d71b04b7c3f40f152acb43e68f69141d5a16d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d71b04b7c3f40f152acb43e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 13 07:44:19 2012 +0400 dwrite: Added IDWriteFont stub. --- dlls/dwrite/Makefile.in | 1 + dlls/dwrite/dwrite_private.h | 11 +++ dlls/dwrite/font.c | 184 ++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/gdiinterop.c | 3 +- dlls/dwrite/tests/font.c | 5 +- 5 files changed, 199 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index 03220d1..f4ee7ae 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -2,6 +2,7 @@ MODULE = dwrite.dll IMPORTLIB = dwrite C_SRCS = \ + font.c \ gdiinterop.c \ main.c diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 59ca09e..c52b93a 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -16,4 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; +extern HRESULT create_font(IDWriteFont**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c new file mode 100644 index 0000000..29dd63c --- /dev/null +++ b/dlls/dwrite/font.c @@ -0,0 +1,184 @@ +/* + * Font and collections + * + * Copyright 2012 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "dwrite.h" +#include "dwrite_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dwrite); + +struct dwrite_font { + IDWriteFont IDWriteFont_iface; + LONG ref; +}; + +static inline struct dwrite_font *impl_from_IDWriteFont(IDWriteFont *iface) +{ + return CONTAINING_RECORD(iface, struct dwrite_font, IDWriteFont_iface); +} + +static HRESULT WINAPI dwritefont_QueryInterface(IDWriteFont *iface, REFIID riid, void **obj) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteFont)) + { + *obj = iface; + IDWriteFont_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dwritefont_AddRef(IDWriteFont *iface) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI dwritefont_Release(IDWriteFont *iface) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + heap_free(This); + + return S_OK; +} + +static HRESULT WINAPI dwritefont_GetFontFamily(IDWriteFont *iface, IDWriteFontFamily **family) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p)->(%p): stub\n", This, family); + return E_NOTIMPL; +} + +static DWRITE_FONT_WEIGHT WINAPI dwritefont_GetWeight(IDWriteFont *iface) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p): stub\n", This); + return DWRITE_FONT_WEIGHT_NORMAL; +} + +static DWRITE_FONT_STRETCH WINAPI dwritefont_GetStretch(IDWriteFont *iface) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p): stub\n", This); + return DWRITE_FONT_STRETCH_UNDEFINED; +} + +static DWRITE_FONT_STYLE WINAPI dwritefont_GetStyle(IDWriteFont *iface) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p): stub\n", This); + return DWRITE_FONT_STYLE_NORMAL; +} + +static BOOL WINAPI dwritefont_IsSymbolFont(IDWriteFont *iface) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p): stub\n", This); + return FALSE; +} + +static HRESULT WINAPI dwritefont_GetFaceNames(IDWriteFont *iface, IDWriteLocalizedStrings **names) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p)->(%p): stub\n", This, names); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont *iface, + DWRITE_INFORMATIONAL_STRING_ID stringid, IDWriteLocalizedStrings **strings, BOOL *exists) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p)->(%d %p %p): stub\n", This, stringid, strings, exists); + return E_NOTIMPL; +} + +static DWRITE_FONT_SIMULATIONS WINAPI dwritefont_GetSimulations(IDWriteFont *iface) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p): stub\n", This); + return DWRITE_FONT_SIMULATIONS_NONE; +} + +static void WINAPI dwritefont_GetMetrics(IDWriteFont *iface, DWRITE_FONT_METRICS *metrics) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p)->(%p): stub\n", This, metrics); +} + +static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont *iface, UINT32 value, BOOL *exists) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p)->(0x%08x %p): stub\n", This, value, exists); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont *iface, IDWriteFontFace **face) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p)->(%p): stub\n", This, face); + return E_NOTIMPL; +} + +static const IDWriteFontVtbl dwritefontvtbl = { + dwritefont_QueryInterface, + dwritefont_AddRef, + dwritefont_Release, + dwritefont_GetFontFamily, + dwritefont_GetWeight, + dwritefont_GetStretch, + dwritefont_GetStyle, + dwritefont_IsSymbolFont, + dwritefont_GetFaceNames, + dwritefont_GetInformationalStrings, + dwritefont_GetSimulations, + dwritefont_GetMetrics, + dwritefont_HasCharacter, + dwritefont_CreateFontFace +}; + +HRESULT create_font(IDWriteFont **font) +{ + struct dwrite_font *This; + + This = heap_alloc(sizeof(struct dwrite_font)); + if (!This) return E_OUTOFMEMORY; + + This->IDWriteFont_iface.lpVtbl = &dwritefontvtbl; + This->ref = 1; + *font = &This->IDWriteFont_iface; + + return S_OK; +} diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 8215185..d374724 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "dwrite.h" +#include "dwrite_private.h" #include "wine/debug.h" @@ -60,7 +61,7 @@ static HRESULT WINAPI gdiinterop_CreateFontFromLOGFONT(IDWriteGdiInterop *iface, if (!logfont) return E_INVALIDARG; - return E_NOTIMPL; + return create_font(font); } static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index fa345e3..520fc1b 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -61,23 +61,20 @@ if (0) lstrcpyW(logfont.lfFaceName, arialW); hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); -todo_wine EXPECT_HR(hr, S_OK); -if (hr == S_OK) -{ /* now check properties */ weight = IDWriteFont_GetWeight(font); ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "got %d\n", weight); style = IDWriteFont_GetStyle(font); +todo_wine ok(style == DWRITE_FONT_STYLE_ITALIC, "got %d\n", style); ret = IDWriteFont_IsSymbolFont(font); ok(!ret, "got %d\n", ret); IDWriteFont_Release(font); -} IDWriteGdiInterop_Release(interop); }

1 0

Jacek Caban : ole32: Added ISynchronizeHandle implementation.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: c6793a2e27d4e6ce093b23592fb59553f2da26ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6793a2e27d4e6ce093b23592… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:41:02 2012 +0200 ole32: Added ISynchronizeHandle implementation. --- dlls/ole32/compobj.c | 63 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 51 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d0ae995..0055d15 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -464,7 +464,8 @@ static void COM_RevokeAllClasses(const struct apartment *apt) */ typedef struct ManualResetEvent { - ISynchronize ISynchronize_iface; + ISynchronize ISynchronize_iface; + ISynchronizeHandle ISynchronizeHandle_iface; LONG ref; HANDLE event; } MREImpl; @@ -477,22 +478,21 @@ static inline MREImpl *impl_from_ISynchronize(ISynchronize *iface) static HRESULT WINAPI ISynchronize_fnQueryInterface(ISynchronize *iface, REFIID riid, void **ppv) { MREImpl *This = impl_from_ISynchronize(iface); + TRACE("%p (%s, %p)\n", This, debugstr_guid(riid), ppv); - *ppv = NULL; - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_ISynchronize)) - *ppv = This; - else + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ISynchronize)) { + *ppv = &This->ISynchronize_iface; + }else if(IsEqualGUID(riid, &IID_ISynchronizeHandle)) { + *ppv = &This->ISynchronizeHandle_iface; + }else { ERR("Unknown interface %s requested.\n", debugstr_guid(riid)); - - if(*ppv) - { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + return E_NOINTERFACE; } - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI ISynchronize_fnAddRef(ISynchronize *iface) @@ -552,6 +552,44 @@ static ISynchronizeVtbl vt_ISynchronize = { ISynchronize_fnReset }; +static inline MREImpl *impl_from_ISynchronizeHandle(ISynchronizeHandle *iface) +{ + return CONTAINING_RECORD(iface, MREImpl, ISynchronizeHandle_iface); +} + +static HRESULT WINAPI SynchronizeHandle_QueryInterface(ISynchronizeHandle *iface, REFIID riid, void **ppv) +{ + MREImpl *This = impl_from_ISynchronizeHandle(iface); + return ISynchronize_QueryInterface(&This->ISynchronize_iface, riid, ppv); +} + +static ULONG WINAPI SynchronizeHandle_AddRef(ISynchronizeHandle *iface) +{ + MREImpl *This = impl_from_ISynchronizeHandle(iface); + return ISynchronize_AddRef(&This->ISynchronize_iface); +} + +static ULONG WINAPI SynchronizeHandle_Release(ISynchronizeHandle *iface) +{ + MREImpl *This = impl_from_ISynchronizeHandle(iface); + return ISynchronize_Release(&This->ISynchronize_iface); +} + +static HRESULT WINAPI SynchronizeHandle_GetHandle(ISynchronizeHandle *iface, HANDLE *ph) +{ + MREImpl *This = impl_from_ISynchronizeHandle(iface); + + *ph = This->event; + return S_OK; +} + +static const ISynchronizeHandleVtbl SynchronizeHandleVtbl = { + SynchronizeHandle_QueryInterface, + SynchronizeHandle_AddRef, + SynchronizeHandle_Release, + SynchronizeHandle_GetHandle +}; + static HRESULT ManualResetEvent_Construct(IUnknown *punkouter, REFIID iid, void **ppv) { MREImpl *This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MREImpl)); @@ -562,6 +600,7 @@ static HRESULT ManualResetEvent_Construct(IUnknown *punkouter, REFIID iid, void This->ref = 1; This->ISynchronize_iface.lpVtbl = &vt_ISynchronize; + This->ISynchronizeHandle_iface.lpVtbl = &SynchronizeHandleVtbl; This->event = CreateEventW(NULL, TRUE, FALSE, NULL); hr = ISynchronize_QueryInterface(&This->ISynchronize_iface, iid, ppv);

1 0

Jacek Caban : ole32: Added ISynchronizeHandle tests.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: b3b390d8acc7964bd4faa1eee3bac84200abb962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b390d8acc7964bd4faa1eee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:41:12 2012 +0200 ole32: Added ISynchronizeHandle tests. --- dlls/ole32/tests/marshal.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index e0213b9..2baec4b 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2853,8 +2853,10 @@ static void test_globalinterfacetable(void) static void test_manualresetevent(void) { + ISynchronizeHandle *sync_handle; ISynchronize *psync1, *psync2; IUnknown *punk; + HANDLE handle; LONG ref; HRESULT hr; @@ -2887,6 +2889,17 @@ static void test_manualresetevent(void) ok(hr == S_OK, "Got 0x%08x\n", hr); ok(!!psync2, "Got NULL.\n"); ok(psync1 != psync2, "psync1 == psync2.\n"); + + hr = ISynchronize_QueryInterface(psync2, &IID_ISynchronizeHandle, (void**)&sync_handle); + ok(hr == S_OK, "QueryInterface(IID_ISynchronizeHandle) failed: %08x\n", hr); + + handle = NULL; + hr = ISynchronizeHandle_GetHandle(sync_handle, &handle); + ok(hr == S_OK, "GetHandle failed: %08x\n", hr); + ok(handle != NULL && handle != INVALID_HANDLE_VALUE, "handle = %p\n", handle); + + ISynchronizeHandle_Release(sync_handle); + hr = ISynchronize_Wait(psync2, 0, 5); ok(hr == RPC_S_CALLPENDING, "Got 0x%08x\n", hr);

1 0

Henri Verbeet : winex11: Don' t set MWM decorations either for fullscreen virtual desktops.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 13820b6f948b4447ed8d73e2e6975155441a8653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13820b6f948b4447ed8d73e2e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 13 11:39:41 2012 +0200 winex11: Don't set MWM decorations either for fullscreen virtual desktops. --- dlls/winex11.drv/desktop.c | 5 +++++ dlls/winex11.drv/window.c | 5 +++-- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index c75c54c..66b1e11 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -203,6 +203,11 @@ static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam return TRUE; } +BOOL is_desktop_fullscreen(void) +{ + return screen_width == max_width && screen_height == max_height; +} + static void update_desktop_fullscreen( unsigned int width, unsigned int height) { Display *display = thread_display(); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b202586..46e2cdb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1063,8 +1063,9 @@ static void set_mwm_hints( Display *display, struct x11drv_win_data *data, DWORD if (data->hwnd == GetDesktopWindow()) { - mwm_hints.decorations = MWM_DECOR_TITLE | MWM_DECOR_BORDER | MWM_DECOR_MENU | MWM_DECOR_MINIMIZE; - mwm_hints.functions = MWM_FUNC_MOVE | MWM_FUNC_MINIMIZE | MWM_FUNC_CLOSE; + if (is_desktop_fullscreen()) mwm_hints.decorations = 0; + else mwm_hints.decorations = MWM_DECOR_TITLE | MWM_DECOR_BORDER | MWM_DECOR_MENU | MWM_DECOR_MINIMIZE; + mwm_hints.functions = MWM_FUNC_MOVE | MWM_FUNC_MINIMIZE | MWM_FUNC_CLOSE; } else { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 32d7772..59bc672 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -649,6 +649,7 @@ struct x11drv_mode_info extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; extern void X11DRV_resize_desktop(unsigned int width, unsigned int height) DECLSPEC_HIDDEN; +BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq) DECLSPEC_HIDDEN; unsigned int X11DRV_Settings_GetModeCount(void) DECLSPEC_HIDDEN;

1 0

André Hentschel : d3drm: Add SceneBackground handling.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: c10d95b64ac4ac77998bacd5cec9cf20185c3132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c10d95b64ac4ac77998bacd5c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 5 17:44:46 2012 +0200 d3drm: Add SceneBackground handling. --- dlls/d3drm/frame.c | 32 ++++++++++++++++++++------------ dlls/d3drm/tests/d3drm.c | 15 +++++++++++++++ 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 025c955..6cab5fa 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -55,6 +55,7 @@ struct IDirect3DRMFrameImpl { ULONG lights_capacity; IDirect3DRMLight** lights; D3DRMMATRIX4D transform; + D3DCOLOR scenebackground; }; typedef struct { @@ -981,9 +982,9 @@ static D3DCOLOR WINAPI IDirect3DRMFrame2Impl_GetSceneBackground(IDirect3DRMFrame { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return 0; + return IDirect3DRMFrame3_GetSceneBackground(&This->IDirect3DRMFrame3_iface); } static HRESULT WINAPI IDirect3DRMFrame2Impl_GetSceneBackgroundDepth(IDirect3DRMFrame2* iface, @@ -1040,9 +1041,9 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_SetSceneBackground(IDirect3DRMFrame2 { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - FIXME("(%p/%p)->(%u): stub\n", iface, This, color); + TRACE("(%p/%p)->(%u)\n", iface, This, color); - return E_NOTIMPL; + return IDirect3DRMFrame3_SetSceneBackground(&This->IDirect3DRMFrame3_iface, color); } static HRESULT WINAPI IDirect3DRMFrame2Impl_SetSceneBackgroundRGB(IDirect3DRMFrame2* iface, @@ -1051,9 +1052,9 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_SetSceneBackgroundRGB(IDirect3DRMFra { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - FIXME("(%p/%p)->(%f,%f,%f): stub\n", iface, This, red, green, blue); + TRACE("(%p/%p)->(%f,%f,%f)\n", iface, This, red, green, blue); - return E_NOTIMPL; + return IDirect3DRMFrame3_SetSceneBackgroundRGB(&This->IDirect3DRMFrame3_iface, red, green, blue); } static HRESULT WINAPI IDirect3DRMFrame2Impl_SetSceneBackgroundDepth(IDirect3DRMFrame2* iface, @@ -2078,9 +2079,9 @@ static D3DCOLOR WINAPI IDirect3DRMFrame3Impl_GetSceneBackground(IDirect3DRMFrame { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return 0; + return This->scenebackground; } static HRESULT WINAPI IDirect3DRMFrame3Impl_GetSceneBackgroundDepth(IDirect3DRMFrame3* iface, @@ -2137,9 +2138,11 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_SetSceneBackground(IDirect3DRMFrame3 { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - FIXME("(%p/%p)->(%u): stub\n", iface, This, color); + TRACE("(%p/%p)->(%u)\n", iface, This, color); - return E_NOTIMPL; + This->scenebackground = color; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMFrame3Impl_SetSceneBackgroundRGB(IDirect3DRMFrame3* iface, @@ -2148,9 +2151,13 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_SetSceneBackgroundRGB(IDirect3DRMFra { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - FIXME("(%p/%p)->(%f,%f,%f): stub\n", iface, This, red, green, blue); + TRACE("(%p/%p)->(%f,%f,%f)\n", iface, This, red, green, blue); - return E_NOTIMPL; + This->scenebackground = D3DCOLOR_ARGB(0xff, (BYTE)(red * 255.0f), + (BYTE)(green * 255.0f), + (BYTE)(blue * 255.0f)); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMFrame3Impl_SetSceneBackgroundDepth(IDirect3DRMFrame3* iface, @@ -2685,6 +2692,7 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent, IUnknown** ret_ifa object->IDirect3DRMFrame2_iface.lpVtbl = &Direct3DRMFrame2_Vtbl; object->IDirect3DRMFrame3_iface.lpVtbl = &Direct3DRMFrame3_Vtbl; object->ref = 1; + object->scenebackground = D3DCOLOR_ARGB(0xff, 0, 0, 0); memcpy(&object->transform[0][0], &identity[0][0], sizeof(D3DRMMATRIX4D)); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 91dd095..a257aea 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -602,6 +602,7 @@ static void test_Frame(void) LPDIRECT3DRMLIGHT pLight1; LPDIRECT3DRMLIGHT pLightTmp; LPDIRECT3DRMLIGHTARRAY pLightArray; + D3DCOLOR color; DWORD count; CHAR cname[64] = {0}; @@ -895,6 +896,20 @@ static void test_Frame(void) CHECK_REFCOUNT(pFrameP1, 3); IDirect3DRMLight_Release(pLight1); + /* Test SceneBackground on first parent */ + color = IDirect3DRMFrame_GetSceneBackground(pFrameP1); + ok(color == 0xff000000, "wrong color (%x)\n", color); + + hr = IDirect3DRMFrame_SetSceneBackground(pFrameP1, 0xff180587); + ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); + color = IDirect3DRMFrame_GetSceneBackground(pFrameP1); + ok(color == 0xff180587, "wrong color (%x)\n", color); + + hr = IDirect3DRMFrame_SetSceneBackgroundRGB(pFrameP1, 0.5, 0.5, 0.5); + ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); + color = IDirect3DRMFrame_GetSceneBackground(pFrameP1); + ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); + /* Cleanup */ IDirect3DRMFrame_Release(pFrameP2); CHECK_REFCOUNT(pFrameC, 2);

1 0