September 2014 - Wine-Commits

Francois Gouget : msvcrt: Prefix _set_output_format() with MSVCRT_ to avoid a collision with MinGW.
by Alexandre Julliard Sept. 15, 2014

Sept. 15, 2014

Module: wine Branch: master Commit: f63fd8261087f14c00047355e1551d693e2898bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63fd8261087f14c00047355e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 13 22:54:58 2014 +0200 msvcrt: Prefix _set_output_format() with MSVCRT_ to avoid a collision with MinGW. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/misc.c | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0d6e2dc..84ddcc9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1274,7 +1274,7 @@ @ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_invalid_parameter_handler(ptr) @ stub _set_malloc_crt_max_wait -@ cdecl _set_output_format(long) +@ cdecl _set_output_format(long) MSVCRT__set_output_format @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_purecall_handler(ptr) @ cdecl _seterrormode(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 1114190..36c4137 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1632,7 +1632,7 @@ @ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_invalid_parameter_handler(ptr) @ stub _set_malloc_crt_max_wait -@ cdecl _set_output_format(long) +@ cdecl _set_output_format(long) MSVCRT__set_output_format @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_purecall_handler(ptr) @ cdecl _seterrormode(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index fc313a4..1745f64 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -953,7 +953,7 @@ @ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_invalid_parameter_handler(ptr) @ stub _set_malloc_crt_max_wait -@ cdecl _set_output_format(long) +@ cdecl _set_output_format(long) MSVCRT__set_output_format @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_purecall_handler(ptr) @ cdecl _set_sbh_threshold(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a89dbfb..ba3757a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -929,7 +929,7 @@ @ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_invalid_parameter_handler(ptr) @ stub _set_malloc_crt_max_wait -@ cdecl _set_output_format(long) +@ cdecl _set_output_format(long) MSVCRT__set_output_format @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_purecall_handler(ptr) @ cdecl _set_sbh_threshold(long) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index fc5a5a9..c66152b 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -377,7 +377,7 @@ unsigned int CDECL MSVCRT__get_output_format(void) /********************************************************************* * _set_output_format (MSVCRT.@) */ -unsigned int CDECL _set_output_format(unsigned int new_output_format) +unsigned int CDECL MSVCRT__set_output_format(unsigned int new_output_format) { unsigned int ret = output_format; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 742ada3..96bbecc 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -898,7 +898,7 @@ @ cdecl _set_error_mode(long) # stub _set_fileinfo(long) @ cdecl _set_fmode(long) MSVCRT__set_fmode -@ cdecl _set_output_format(long) +@ cdecl _set_output_format(long) MSVCRT__set_output_format @ cdecl _set_sbh_threshold(long) @ cdecl _seterrormode(long) @ cdecl -arch=i386,x86_64,arm -norelay _setjmp(ptr) MSVCRT__setjmp

1 0

Jactry Zeng : riched20: Implement ITextRange::GetChar.
by Alexandre Julliard Sept. 15, 2014

Sept. 15, 2014

Module: wine Branch: master Commit: 0aa433438d520df0bc2f3ec65589dbe7311405f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa433438d520df0bc2f3ec65… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Sep 16 00:13:30 2014 +0800 riched20: Implement ITextRange::GetChar. --- dlls/riched20/richole.c | 19 +++++++++++-- dlls/riched20/tests/richole.c | 66 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 194f471..6a00016 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -567,14 +567,29 @@ static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR bstr) return E_NOTIMPL; } +static HRESULT range_GetChar(ME_TextEditor *editor, ME_Cursor *cursor, LONG *pch) +{ + WCHAR wch[2]; + + ME_GetTextW(editor, wch, 1, cursor, 1, FALSE, cursor->pRun->next->type == diTextEnd); + *pch = wch[0]; + + return S_OK; +} + static HRESULT WINAPI ITextRange_fnGetChar(ITextRange *me, LONG *pch) { ITextRangeImpl *This = impl_from_ITextRange(me); + ME_Cursor cursor; + if (!This->reOle) return CO_E_RELEASED; + TRACE("%p\n", pch); + if (!pch) + return E_INVALIDARG; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + ME_CursorFromCharOfs(This->reOle->editor, This->start, &cursor); + return range_GetChar(This->reOle->editor, &cursor, pch); } static HRESULT WINAPI ITextRange_fnSetChar(ITextRange *me, LONG ch) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index f56a14a..f85de2d 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -518,6 +518,71 @@ static void test_ITextDocument_Range(void) ITextRange_Release(txtRge); } +static void test_ITextRange_GetChar(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + HRESULT hres; + LONG pch = 0xdeadbeef; + int first, lim; + static const CHAR test_text1[] = "TestSomeText"; + + first = 0, lim = 4; + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + ITextDocument_Range(txtDoc, first, lim, &txtRge); + pch = 0xdeadbeef; + hres = ITextRange_GetChar(txtRge, &pch); + ok(hres == S_OK, "ITextRange_GetChar\n"); + ok(pch == 'T', "got wrong char: %c\n", pch); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); + + first = 0, lim = 0; + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + ITextDocument_Range(txtDoc, first, lim, &txtRge); + pch = 0xdeadbeef; + hres = ITextRange_GetChar(txtRge, &pch); + ok(hres == S_OK, "ITextRange_GetChar\n"); + ok(pch == 'T', "got wrong char: %c\n", pch); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); + + first = 12, lim = 12; + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + ITextDocument_Range(txtDoc, first, lim, &txtRge); + pch = 0xdeadbeef; + hres = ITextRange_GetChar(txtRge, &pch); + ok(hres == S_OK, "ITextRange_GetChar\n"); + ok(pch == '\r', "got wrong char: %c\n", pch); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); + + first = 13, lim = 13; + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + ITextDocument_Range(txtDoc, first, lim, &txtRge); + pch = 0xdeadbeef; + hres = ITextRange_GetChar(txtRge, &pch); + ok(hres == S_OK, "ITextRange_GetChar\n"); + ok(pch == '\r', "got wrong char: %c\n", pch); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + first = 12, lim = 12; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hres = ITextRange_GetChar(txtRge, NULL); + ok(hres == E_INVALIDARG, "ITextRange_GetChar\n"); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -529,4 +594,5 @@ START_TEST(richole) test_ITextDocument_Open(); test_ITextSelection_GetText(); test_ITextDocument_Range(); + test_ITextRange_GetChar(); }

1 0

Henri Verbeet : dxgi: Call wined3d_device_init_3d() on device creation.
by Alexandre Julliard Sept. 15, 2014

Sept. 15, 2014

Module: wine Branch: master Commit: 810977446a4bd11a5a93c89a173bec4578a620fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=810977446a4bd11a5a93c89a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 15 11:03:36 2014 +0200 dxgi: Call wined3d_device_init_3d() on device creation. --- dlls/dxgi/Makefile.in | 2 +- dlls/dxgi/device.c | 27 ++++++++++++------------ dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/factory.c | 54 ++++++++++++++++++++++------------------------- dlls/dxgi/swapchain.c | 14 +----------- include/wine/winedxgi.idl | 1 - 6 files changed, 43 insertions(+), 57 deletions(-) diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in index 0082a6c..ce76b8e 100644 --- a/dlls/dxgi/Makefile.in +++ b/dlls/dxgi/Makefile.in @@ -1,6 +1,6 @@ MODULE = dxgi.dll IMPORTLIB = dxgi -IMPORTS = dxguid uuid wined3d +IMPORTS = dxguid uuid wined3d user32 C_SRCS = \ adapter.c \ diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index ac3bbfc..7976a91 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -80,6 +80,7 @@ static ULONG STDMETHODCALLTYPE dxgi_device_Release(IWineDXGIDevice *iface) { if (This->child_layer) IUnknown_Release(This->child_layer); EnterCriticalSection(&dxgi_cs); + wined3d_device_uninit_3d(This->wined3d_device); wined3d_device_decref(This->wined3d_device); LeaveCriticalSection(&dxgi_cs); IDXGIFactory1_Release(This->factory); @@ -248,18 +249,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetGPUThreadPriority(IWineDXGIDevic /* IWineDXGIDevice methods */ -static struct wined3d_device * STDMETHODCALLTYPE dxgi_device_get_wined3d_device(IWineDXGIDevice *iface) -{ - struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); - - TRACE("iface %p\n", iface); - - EnterCriticalSection(&dxgi_cs); - wined3d_device_incref(This->wined3d_device); - LeaveCriticalSection(&dxgi_cs); - return This->wined3d_device; -} - static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *iface, const DXGI_SURFACE_DESC *desc, DXGI_USAGE usage, const DXGI_SHARED_RESOURCE *shared_resource, IUnknown *outer, void **surface) { @@ -338,7 +327,6 @@ static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = dxgi_device_SetGPUThreadPriority, dxgi_device_GetGPUThreadPriority, /* IWineDXGIAdapter methods */ - dxgi_device_get_wined3d_device, dxgi_device_create_surface, dxgi_device_create_swapchain, }; @@ -347,6 +335,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l IDXGIFactory *factory, IDXGIAdapter *adapter) { struct wined3d_device_parent *wined3d_device_parent; + struct wined3d_swapchain_desc swapchain_desc; IWineDXGIDeviceParent *dxgi_device_parent; struct dxgi_adapter *dxgi_adapter; struct dxgi_factory *dxgi_factory; @@ -411,6 +400,18 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l return hr; } + memset(&swapchain_desc, 0, sizeof(swapchain_desc)); + swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; + swapchain_desc.device_window = dxgi_factory_get_device_window(dxgi_factory); + swapchain_desc.windowed = TRUE; + if (FAILED(hr = wined3d_device_init_3d(device->wined3d_device, &swapchain_desc))) + { + ERR("Failed to initialize 3D, hr %#x.\n", hr); + wined3d_device_decref(device->wined3d_device); + IUnknown_Release(device->child_layer); + return hr; + } + device->factory = &dxgi_factory->IDXGIFactory1_iface; IDXGIFactory1_AddRef(device->factory); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index b4815ab..278137d 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -86,9 +86,11 @@ struct dxgi_factory UINT adapter_count; IDXGIAdapter1 **adapters; BOOL extended; + HWND device_window; }; HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) DECLSPEC_HIDDEN; +HWND dxgi_factory_get_device_window(struct dxgi_factory *factory) DECLSPEC_HIDDEN; struct dxgi_factory *unsafe_impl_from_IDXGIFactory1(IDXGIFactory1 *iface) DECLSPEC_HIDDEN; /* IDXGIDevice */ diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index c0e9197..9dbcb3e 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -72,6 +72,8 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IDXGIFactory1 *iface) { UINT i; + if (factory->device_window) + DestroyWindow(factory->device_window); for (i = 0; i < factory->adapter_count; ++i) { IDXGIAdapter1_Release(factory->adapters[i]); @@ -179,9 +181,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory1 *ifa { struct wined3d_swapchain *wined3d_swapchain; struct wined3d_swapchain_desc wined3d_desc; - struct wined3d_device *wined3d_device; IWineDXGIDevice *dxgi_device; - UINT count; HRESULT hr; FIXME("iface %p, device %p, desc %p, swapchain %p partial stub!\n", iface, device, desc, swapchain); @@ -193,17 +193,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory1 *ifa return hr; } - wined3d_device = IWineDXGIDevice_get_wined3d_device(dxgi_device); - IWineDXGIDevice_Release(dxgi_device); - - count = wined3d_device_get_swapchain_count(wined3d_device); - if (count) - { - FIXME("Only a single swapchain supported.\n"); - wined3d_device_decref(wined3d_device); - return E_FAIL; - } - if (!desc->OutputWindow) { FIXME("No output window, should use factory output window\n"); @@ -234,29 +223,16 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory1 *ifa wined3d_desc.refresh_rate = dxgi_rational_to_uint(&desc->BufferDesc.RefreshRate); wined3d_desc.swap_interval = WINED3DPRESENT_INTERVAL_DEFAULT; - hr = wined3d_device_init_3d(wined3d_device, &wined3d_desc); + hr = IWineDXGIDevice_create_swapchain(dxgi_device, &wined3d_desc, &wined3d_swapchain); + IWineDXGIDevice_Release(dxgi_device); if (FAILED(hr)) { - WARN("Failed to initialize 3D, returning %#x\n", hr); - wined3d_device_decref(wined3d_device); + WARN("Failed to create swapchain, hr %#x.\n", hr); return hr; } - wined3d_swapchain = wined3d_device_get_swapchain(wined3d_device, 0); - wined3d_device_decref(wined3d_device); - if (!wined3d_swapchain) - { - WARN("Failed to get swapchain.\n"); - return E_FAIL; - } - *swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); - /* FIXME? The swapchain is created with refcount 1 by the wined3d device, - * but the wined3d device can't hold a real reference. */ - - TRACE("Created IDXGISwapChain %p\n", *swapchain); - return S_OK; } @@ -395,3 +371,23 @@ HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) return hr; } + +HWND dxgi_factory_get_device_window(struct dxgi_factory *factory) +{ + EnterCriticalSection(&dxgi_cs); + + if (!factory->device_window) + { + if (!(factory->device_window = CreateWindowA("static", "DXGI device window", + WS_DISABLED, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + { + ERR("Failed to create a window.\n"); + return NULL; + } + TRACE("Created device window %p for factory %p.\n", factory->device_window, factory); + } + + LeaveCriticalSection(&dxgi_cs); + + return factory->device_window; +} diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0c27007..437537a 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -72,19 +72,7 @@ static ULONG STDMETHODCALLTYPE dxgi_swapchain_Release(IDXGISwapChain *iface) TRACE("%p decreasing refcount to %u\n", This, refcount); if (!refcount) - { - struct wined3d_device *wined3d_device; - HRESULT hr; - - FIXME("Only a single swapchain is supported\n"); - - wined3d_device = wined3d_swapchain_get_device(This->wined3d_swapchain); - hr = wined3d_device_uninit_3d(wined3d_device); - if (FAILED(hr)) - { - ERR("Uninit3D failed, hr %#x\n", hr); - } - } + wined3d_swapchain_decref(This->wined3d_swapchain); return refcount; } diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 88be8db..4980588 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -25,7 +25,6 @@ import "dxgi.idl"; ] interface IWineDXGIDevice : IDXGIDevice { - struct wined3d_device *get_wined3d_device(); HRESULT create_surface( [in] const DXGI_SURFACE_DESC *desc, [in] DXGI_USAGE usage,

1 0

Henri Verbeet : dxgi: Get rid of IWineDXGIAdapter.
by Alexandre Julliard Sept. 15, 2014

Sept. 15, 2014

Module: wine Branch: master Commit: 22abd896fae8d0dab7d93b875d6c83a753de4ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22abd896fae8d0dab7d93b875… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 15 11:03:34 2014 +0200 dxgi: Get rid of IWineDXGIAdapter. --- dlls/dxgi/adapter.c | 106 ++++++++++++++++++++-------------------------- dlls/dxgi/device.c | 25 ++++------- dlls/dxgi/dxgi_private.h | 7 ++- dlls/dxgi/factory.c | 8 ++-- include/wine/winedxgi.idl | 10 ----- 5 files changed, 63 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22abd896fae8d0dab7d93…

1 0

Henri Verbeet : d2d1: Simplify clip stack handling.
by Alexandre Julliard Sept. 15, 2014

Sept. 15, 2014

Module: wine Branch: master Commit: 240c45408913b6ab7f2f46ebdb6ad186ae582fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=240c45408913b6ab7f2f46ebd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 15 11:03:33 2014 +0200 d2d1: Simplify clip stack handling. --- dlls/d2d1/d2d1_private.h | 5 ++-- dlls/d2d1/render_target.c | 70 +++++++++++++++++++++-------------------------- 2 files changed, 33 insertions(+), 42 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 586b978..ade194c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -28,9 +28,8 @@ struct d2d_clip_stack { D2D1_RECT_F *stack; - unsigned int stack_size; - unsigned int current; - D2D1_RECT_F clip_rect; + unsigned int size; + unsigned int count; }; struct d2d_d3d_render_target diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 268de41..4d69697 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -63,18 +63,13 @@ static void d2d_rect_set(D2D1_RECT_F *dst, float left, float top, float right, f dst->bottom = bottom; } -static BOOL d2d_clip_stack_init(struct d2d_clip_stack *stack, unsigned int w, unsigned int h) +static BOOL d2d_clip_stack_init(struct d2d_clip_stack *stack) { if (!(stack->stack = HeapAlloc(GetProcessHeap(), 0, INITIAL_CLIP_STACK_SIZE * sizeof(*stack->stack)))) return FALSE; - stack->stack_size = INITIAL_CLIP_STACK_SIZE; - stack->current = 0; - - stack->clip_rect.left = 0.0f; - stack->clip_rect.top = 0.0f; - stack->clip_rect.right = w; - stack->clip_rect.bottom = h; + stack->size = INITIAL_CLIP_STACK_SIZE; + stack->count = 0; return TRUE; } @@ -86,45 +81,37 @@ static void d2d_clip_stack_cleanup(struct d2d_clip_stack *stack) static BOOL d2d_clip_stack_push(struct d2d_clip_stack *stack, const D2D1_RECT_F *rect) { - if (stack->current == stack->stack_size - 1) + D2D1_RECT_F r; + + if (stack->count == stack->size) { D2D1_RECT_F *new_stack; unsigned int new_size; - if (stack->stack_size > UINT_MAX / 2) + if (stack->size > UINT_MAX / 2) return FALSE; - new_size = stack->stack_size * 2; + new_size = stack->size * 2; if (!(new_stack = HeapReAlloc(GetProcessHeap(), 0, stack->stack, new_size * sizeof(*stack->stack)))) return FALSE; stack->stack = new_stack; - stack->stack_size = new_size; + stack->size = new_size; } - stack->stack[stack->current++] = *rect; - d2d_rect_intersect(&stack->clip_rect, rect); + r = *rect; + if (stack->count) + d2d_rect_intersect(&r, &stack->stack[stack->count - 1]); + stack->stack[stack->count++] = r; return TRUE; } -static void d2d_clip_stack_pop(struct d2d_clip_stack *stack, unsigned int w, unsigned int h) +static void d2d_clip_stack_pop(struct d2d_clip_stack *stack) { - unsigned int i; - - if (!stack->current) + if (!stack->count) return; - - --stack->current; - stack->clip_rect.left = 0.0f; - stack->clip_rect.top = 0.0f; - stack->clip_rect.right = w; - stack->clip_rect.bottom = h; - - for (i = 0; i < stack->current; ++i) - { - d2d_rect_intersect(&stack->clip_rect, &stack->stack[i]); - } + --stack->count; } static inline struct d2d_d3d_render_target *impl_from_ID2D1RenderTarget(ID2D1RenderTarget *iface) @@ -565,7 +552,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_PopAxisAlignedClip(ID2D1Rend TRACE("iface %p.\n", iface); - d2d_clip_stack_pop(&render_target->clip_stack, render_target->pixel_size.width, render_target->pixel_size.height); + d2d_clip_stack_pop(&render_target->clip_stack); } static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *iface, const D2D1_COLOR_F *color) @@ -573,7 +560,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); D3D10_SUBRESOURCE_DATA buffer_data; D3D10_BUFFER_DESC buffer_desc; - D3D10_RECT scissor_rect; unsigned int offset; D3D10_VIEWPORT vp; ID3D10Buffer *cb; @@ -604,11 +590,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa vp.MinDepth = 0.0f; vp.MaxDepth = 1.0f; - scissor_rect.left = render_target->clip_stack.clip_rect.left + 0.5f; - scissor_rect.top = render_target->clip_stack.clip_rect.top + 0.5f; - scissor_rect.right = render_target->clip_stack.clip_rect.right + 0.5f; - scissor_rect.bottom = render_target->clip_stack.clip_rect.bottom + 0.5f; - if (FAILED(hr = render_target->stateblock->lpVtbl->Capture(render_target->stateblock))) { WARN("Failed to capture stateblock, hr %#x.\n", hr); @@ -627,8 +608,19 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa ID3D10Device_PSSetConstantBuffers(render_target->device, 0, 1, &cb); ID3D10Device_PSSetShader(render_target->device, render_target->clear_ps); ID3D10Device_RSSetViewports(render_target->device, 1, &vp); - ID3D10Device_RSSetScissorRects(render_target->device, 1, &scissor_rect); - ID3D10Device_RSSetState(render_target->device, render_target->clear_rs); + if (render_target->clip_stack.count) + { + const D2D1_RECT_F *clip_rect; + D3D10_RECT scissor_rect; + + clip_rect = &render_target->clip_stack.stack[render_target->clip_stack.count - 1]; + scissor_rect.left = clip_rect->left + 0.5f; + scissor_rect.top = clip_rect->top + 0.5f; + scissor_rect.right = clip_rect->right + 0.5f; + scissor_rect.bottom = clip_rect->bottom + 0.5f; + ID3D10Device_RSSetScissorRects(render_target->device, 1, &scissor_rect); + ID3D10Device_RSSetState(render_target->device, render_target->clear_rs); + } ID3D10Device_OMSetRenderTargets(render_target->device, 1, &render_target->view, NULL); ID3D10Device_Draw(render_target->device, 4, 0); @@ -975,7 +967,7 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, render_target->pixel_size.height = surface_desc.Height; render_target->transform = identity; - if (!d2d_clip_stack_init(&render_target->clip_stack, surface_desc.Width, surface_desc.Height)) + if (!d2d_clip_stack_init(&render_target->clip_stack)) { WARN("Failed to initialize clip stack.\n"); hr = E_FAIL;

1 0

Jactry Zeng : riched20: Avoid invalid memory access.
by Alexandre Julliard Sept. 15, 2014

Sept. 15, 2014

Module: wine Branch: master Commit: 7d06f6ccb202f1306fb02895d4fd116fd44059c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d06f6ccb202f1306fb02895d… Author: Jactry Zeng <wine(a)jactry.com> Date: Mon Sep 15 10:49:21 2014 +0800 riched20: Avoid invalid memory access. --- dlls/riched20/richole.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 826fa68..194f471 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -492,8 +492,11 @@ static ULONG WINAPI ITextRange_fnRelease(ITextRange *me) TRACE ("%p ref=%u\n", This, ref); if (ref == 0) { - This->reOle = NULL; - list_remove(&This->entry); + if (This->reOle) + { + list_remove(&This->entry); + This->reOle = NULL; + } heap_free(This); } return ref;

1 0

Henri Verbeet : dxgi: Get rid of IWineDXGIFactory.
by Alexandre Julliard Sept. 15, 2014

Sept. 15, 2014

Module: wine Branch: master Commit: 72aaaac48697fb7f7c84480cde1e27a0d8db4f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=72aaaac48697fb7f7c84480cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 15 11:03:35 2014 +0200 dxgi: Get rid of IWineDXGIFactory. --- dlls/dxgi/adapter.c | 9 ++-- dlls/dxgi/device.c | 65 ++++++++++------------- dlls/dxgi/dxgi_private.h | 9 ++-- dlls/dxgi/factory.c | 128 +++++++++++++++++++--------------------------- dlls/dxgi/output.c | 6 +-- include/wine/winedxgi.idl | 10 ---- 6 files changed, 90 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=72aaaac48697fb7f7c844…

1 0

Jactry Zeng : riched20: Implement ITextSelection::GetChar.
by Alexandre Julliard Sept. 15, 2014

Sept. 15, 2014

Module: wine Branch: master Commit: 329252f88b6dc2d93df8f7b0320418b504182639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=329252f88b6dc2d93df8f7b03… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Sep 16 00:13:51 2014 +0800 riched20: Implement ITextSelection::GetChar. --- dlls/riched20/richole.c | 9 ++++++-- dlls/riched20/tests/richole.c | 49 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 6a00016..963368f 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1569,11 +1569,16 @@ static HRESULT WINAPI ITextSelection_fnSetText(ITextSelection *me, BSTR bstr) static HRESULT WINAPI ITextSelection_fnGetChar(ITextSelection *me, LONG *pch) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + ME_Cursor *start = NULL, *end = NULL; + if (!This->reOle) return CO_E_RELEASED; + TRACE("%p\n", pch); + if (!pch) + return E_INVALIDARG; - FIXME("not implemented\n"); - return E_NOTIMPL; + ME_GetSelection(This->reOle->editor, &start, &end); + return range_GetChar(This->reOle->editor, start, pch); } static HRESULT WINAPI ITextSelection_fnSetChar(ITextSelection *me, LONG ch) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index f85de2d..2e9b45a 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -583,6 +583,54 @@ static void test_ITextRange_GetChar(void) release_interfaces(&w, &reOle, &txtDoc, NULL); } +static void test_ITextSelection_GetChar(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextSelection *txtSel = NULL; + HRESULT hres; + LONG pch = 0xdeadbeef; + int first, lim; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, &txtSel); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + first = 0, lim = 4; + SendMessageA(w, EM_SETSEL, first, lim); + pch = 0xdeadbeef; + hres = ITextSelection_GetChar(txtSel, &pch); + ok(hres == S_OK, "ITextSelection_GetChar\n"); + ok(pch == 'T', "got wrong char: %c\n", pch); + + first = 0, lim = 0; + SendMessageA(w, EM_SETSEL, first, lim); + pch = 0xdeadbeef; + hres = ITextSelection_GetChar(txtSel, &pch); + ok(hres == S_OK, "ITextSelection_GetChar\n"); + ok(pch == 'T', "got wrong char: %c\n", pch); + + first = 12, lim = 12; + SendMessageA(w, EM_SETSEL, first, lim); + pch = 0xdeadbeef; + hres = ITextSelection_GetChar(txtSel, &pch); + ok(hres == S_OK, "ITextSelection_GetChar\n"); + ok(pch == '\r', "got wrong char: %c\n", pch); + + first = 13, lim = 13; + SendMessageA(w, EM_SETSEL, first, lim); + pch = 0xdeadbeef; + hres = ITextSelection_GetChar(txtSel, &pch); + ok(hres == S_OK, "ITextSelection_GetChar\n"); + ok(pch == '\r', "got wrong char: %c\n", pch); + + hres = ITextSelection_GetChar(txtSel, NULL); + ok(hres == E_INVALIDARG, "ITextSelection_GetChar\n"); + + release_interfaces(&w, &reOle, &txtDoc, &txtSel); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -593,6 +641,7 @@ START_TEST(richole) test_Interfaces(); test_ITextDocument_Open(); test_ITextSelection_GetText(); + test_ITextSelection_GetChar(); test_ITextDocument_Range(); test_ITextRange_GetChar(); }

1 0

Hans Leidekker : winhttp: Verify the async parameter type in IWinHttpRequest::Open.
by Alexandre Julliard Sept. 15, 2014

Sept. 15, 2014

Module: wine Branch: master Commit: 0b366dca3c05121204ab751ac597ccb45af262a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b366dca3c05121204ab751ac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 15 16:36:44 2014 +0200 winhttp: Verify the async parameter type in IWinHttpRequest::Open. --- dlls/winhttp/request.c | 2 +- dlls/winhttp/tests/winhttp.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 1f9b4aa..d497d7a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2992,7 +2992,7 @@ static HRESULT WINAPI winhttp_request_Open( path[uc.dwUrlPathLength + uc.dwExtraInfoLength] = 0; if (!(verb = strdupW( method ))) goto error; - if (V_BOOL( &async )) flags |= WINHTTP_FLAG_ASYNC; + if (V_VT( &async ) == VT_BOOL && V_BOOL( &async )) flags |= WINHTTP_FLAG_ASYNC; if (!(hsession = WinHttpOpen( user_agentW, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, flags ))) { err = get_last_error(); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 51fcc86..27fb212 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2561,6 +2561,8 @@ static void test_IWinHttpRequest(void) method = SysAllocString( method1W ); SysFreeString( url ); url = SysAllocString( url1W ); + V_VT( &async ) = VT_ERROR; + V_ERROR( &async ) = DISP_E_PARAMNOTFOUND; hr = IWinHttpRequest_Open( req, method, url, async ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Marcus Meissner : shell32: Added stub for SHEnumerateUnreadMailAccountsW.
by Alexandre Julliard Sept. 15, 2014

Sept. 15, 2014

Module: wine Branch: master Commit: 97be8d027b56806e8263f2040b9484f73f551f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97be8d027b56806e8263f2040… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 13 00:54:00 2014 +0200 shell32: Added stub for SHEnumerateUnreadMailAccountsW. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shell32_main.c | 9 +++++++++ include/shellapi.h | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index a85b45d..f219c8f 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -348,6 +348,7 @@ @ stdcall SHCreateShellItemArrayFromIDLists(long ptr ptr) @ stdcall SHEmptyRecycleBinA(long str long) @ stdcall SHEmptyRecycleBinW(long wstr long) +@ stdcall SHEnumerateUnreadMailAccountsW(ptr long ptr long) @ stdcall SHExtractIconsW(wstr long long long ptr ptr long long) user32.PrivateExtractIconsW @ stdcall SHFileOperation(ptr) SHFileOperationA @ stdcall SHFileOperationA(ptr) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 3bf442e..cabf5e4 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1385,3 +1385,12 @@ HRESULT WINAPI SHSetUnreadMailCountW(LPCWSTR mailaddress, DWORD count, LPCWSTR e FIXME("%s %x %s: stub\n", debugstr_w(mailaddress), count, debugstr_w(executecommand)); return E_NOTIMPL; } + +/*********************************************************************** + * SHEnumerateUnreadMailAccountsW (SHELL32.@) + */ +HRESULT WINAPI SHEnumerateUnreadMailAccountsW(HKEY user, DWORD idx, LPWSTR mailaddress, INT mailaddresslen) +{ + FIXME("%p %d %p %d: stub\n", user, idx, mailaddress, mailaddresslen); + return E_NOTIMPL; +} diff --git a/include/shellapi.h b/include/shellapi.h index acc345d..ecf0b21 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -649,6 +649,10 @@ DWORD WINAPI DoEnvironmentSubstA(LPSTR, UINT); DWORD WINAPI DoEnvironmentSubstW(LPWSTR, UINT); #define DoEnvironmentSubst WINELIB_NAME_AW(DoEnvironmentSubst) +HRESULT WINAPI SHEnumerateUnreadMailAccountsA(HKEY,DWORD,LPSTR,INT); +HRESULT WINAPI SHEnumerateUnreadMailAccountsW(HKEY,DWORD,LPWSTR,INT); +#define SHEnumerateUnreadMailAccounts WINELIB_NAME_AW(SHEnumerateUnreadMailAccounts) + #ifdef __cplusplus } /* extern "C" */

1 0