wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Henri Verbeet : d2d1: Implement d2d_rectangle_geometry_GetBounds().
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 2485305b55a295662162d62f44ac947ae48a0b95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2485305b55a295662162d62f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:33 2017 +0200 d2d1: Implement d2d_rectangle_geometry_GetBounds(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 12 ++++++++++ dlls/d2d1/geometry.c | 45 ++++++++++++++++++++++++------------- dlls/d2d1/render_target.c | 12 ---------- dlls/d2d1/tests/d2d1.c | 57 +++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 94 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2485305b55a295662162d…

1 0

Henri Verbeet : d2d1: Implement d2d_layer_GetSize().
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: bc47dc3f41bc0614a824439d77ba74963a7e2f2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc47dc3f41bc0614a824439d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:32 2017 +0200 d2d1: Implement d2d_layer_GetSize(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 3 ++- dlls/d2d1/layer.c | 11 +++++++---- dlls/d2d1/render_target.c | 2 +- dlls/d2d1/tests/d2d1.c | 12 ++++++++++++ 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 12a230b..377adf6 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -242,9 +242,10 @@ struct d2d_layer LONG refcount; ID2D1Factory *factory; + D2D1_SIZE_F size; }; -HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) DECLSPEC_HIDDEN; +HRESULT d2d_layer_create(ID2D1Factory *factory, const D2D1_SIZE_F *size, struct d2d_layer **layer) DECLSPEC_HIDDEN; struct d2d_mesh { diff --git a/dlls/d2d1/layer.c b/dlls/d2d1/layer.c index 0fcd185..25a331b 100644 --- a/dlls/d2d1/layer.c +++ b/dlls/d2d1/layer.c @@ -84,10 +84,11 @@ static void STDMETHODCALLTYPE d2d_layer_GetFactory(ID2D1Layer *iface, ID2D1Facto static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_layer_GetSize(ID2D1Layer *iface, D2D1_SIZE_F *size) { - FIXME("iface %p, size %p stub!\n", iface, size); + struct d2d_layer *layer = impl_from_ID2D1Layer(iface); + + TRACE("iface %p, size %p.\n", iface, size); - size->width = 0; - size->height = 0; + *size = layer->size; return size; } @@ -100,7 +101,7 @@ static const struct ID2D1LayerVtbl d2d_layer_vtbl = d2d_layer_GetSize, }; -HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) +HRESULT d2d_layer_create(ID2D1Factory *factory, const D2D1_SIZE_F *size, struct d2d_layer **layer) { if (!(*layer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**layer)))) return E_OUTOFMEMORY; @@ -108,6 +109,8 @@ HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) (*layer)->ID2D1Layer_iface.lpVtbl = &d2d_layer_vtbl; (*layer)->refcount = 1; ID2D1Factory_AddRef((*layer)->factory = factory); + if (size) + (*layer)->size = *size; TRACE("Created layer %p.\n", *layer); diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index ecab51f..ec8e4d0 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -464,7 +464,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLayer(ID2D1RenderTa TRACE("iface %p, size %p, layer %p.\n", iface, size, layer); - if (SUCCEEDED(hr = d2d_layer_create(render_target->factory, &object))) + if (SUCCEEDED(hr = d2d_layer_create(render_target->factory, size, &object))) *layer = &object->ID2D1Layer_iface; return hr; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 72903ef..6993dc6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4536,6 +4536,7 @@ static void test_layer(void) ID3D10Device1 *device; IDXGISurface *surface; ID2D1Layer *layer; + D2D1_SIZE_F size; ULONG refcount; HWND window; HRESULT hr; @@ -4561,6 +4562,17 @@ static void test_layer(void) ID2D1Layer_GetFactory(layer, &layer_factory); ok(layer_factory == factory, "Got unexpected layer factory %p, expected %p.\n", layer_factory, factory); ID2D1Factory_Release(layer_factory); + size = ID2D1Layer_GetSize(layer); + ok(size.width == 0.0f, "Got unexpected width %.8e.\n", size.width); + ok(size.height == 0.0f, "Got unexpected height %.8e.\n", size.height); + ID2D1Layer_Release(layer); + + set_size_f(&size, 800.0f, 600.0f); + hr = ID2D1RenderTarget_CreateLayer(rt, &size, &layer); + ok(SUCCEEDED(hr), "Failed to create layer, hr %#x.\n", hr); + size = ID2D1Layer_GetSize(layer); + ok(size.width == 800.0f, "Got unexpected width %.8e.\n", size.width); + ok(size.height == 600.0f, "Got unexpected height %.8e.\n", size.height); ID2D1Layer_Release(layer); ID2D1RenderTarget_Release(rt);

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateLayer().
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 6d638b9e287b3240bbfd37a08d1da0ac9d3e6bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d638b9e287b3240bbfd37a08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:31 2017 +0200 d2d1: Implement d2d_d3d_render_target_CreateLayer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/Makefile.in | 1 + dlls/d2d1/d2d1_private.h | 10 ++++ dlls/d2d1/layer.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/render_target.c | 11 ++++- dlls/d2d1/tests/d2d1.c | 45 ++++++++++++++++++ 5 files changed, 180 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 68e9268..51b9627 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ factory.c \ geometry.c \ hwnd_render_target.c \ + layer.c \ mesh.c \ render_target.c \ state_block.c \ diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 7d8027b..12a230b 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -236,6 +236,16 @@ struct d2d_stroke_style HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count) DECLSPEC_HIDDEN; +struct d2d_layer +{ + ID2D1Layer ID2D1Layer_iface; + LONG refcount; + + ID2D1Factory *factory; +}; + +HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) DECLSPEC_HIDDEN; + struct d2d_mesh { ID2D1Mesh ID2D1Mesh_iface; diff --git a/dlls/d2d1/layer.c b/dlls/d2d1/layer.c new file mode 100644 index 0000000..0fcd185 --- /dev/null +++ b/dlls/d2d1/layer.c @@ -0,0 +1,115 @@ +/* + * Copyright 2017 Henri Verbeet 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 + */ + +#include "config.h" +#include "wine/port.h" + +#include "d2d1_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d2d); + +static inline struct d2d_layer *impl_from_ID2D1Layer(ID2D1Layer *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_layer, ID2D1Layer_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_layer_QueryInterface(ID2D1Layer *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1Layer) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1Layer_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_layer_AddRef(ID2D1Layer *iface) +{ + struct d2d_layer *layer = impl_from_ID2D1Layer(iface); + ULONG refcount = InterlockedIncrement(&layer->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_layer_Release(ID2D1Layer *iface) +{ + struct d2d_layer *layer = impl_from_ID2D1Layer(iface); + ULONG refcount = InterlockedDecrement(&layer->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + { + ID2D1Factory_Release(layer->factory); + HeapFree(GetProcessHeap(), 0, layer); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_layer_GetFactory(ID2D1Layer *iface, ID2D1Factory **factory) +{ + struct d2d_layer *layer = impl_from_ID2D1Layer(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + ID2D1Factory_AddRef(*factory = layer->factory); +} + +static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_layer_GetSize(ID2D1Layer *iface, D2D1_SIZE_F *size) +{ + FIXME("iface %p, size %p stub!\n", iface, size); + + size->width = 0; + size->height = 0; + return size; +} + +static const struct ID2D1LayerVtbl d2d_layer_vtbl = +{ + d2d_layer_QueryInterface, + d2d_layer_AddRef, + d2d_layer_Release, + d2d_layer_GetFactory, + d2d_layer_GetSize, +}; + +HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) +{ + if (!(*layer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**layer)))) + return E_OUTOFMEMORY; + + (*layer)->ID2D1Layer_iface.lpVtbl = &d2d_layer_vtbl; + (*layer)->refcount = 1; + ID2D1Factory_AddRef((*layer)->factory = factory); + + TRACE("Created layer %p.\n", *layer); + + return S_OK; +} diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index c55401a..ecab51f 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -458,9 +458,16 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateCompatibleRenderTar static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLayer(ID2D1RenderTarget *iface, const D2D1_SIZE_F *size, ID2D1Layer **layer) { - FIXME("iface %p, size %p, layer %p stub!\n", iface, size, layer); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_layer *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, size %p, layer %p.\n", iface, size, layer); + + if (SUCCEEDED(hr = d2d_layer_create(render_target->factory, &object))) + *layer = &object->ID2D1Layer_iface; + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTarget *iface, ID2D1Mesh **mesh) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b26b7b1..72903ef 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4528,6 +4528,50 @@ todo_wine ID2D1Factory_Release(factory); } +static void test_layer(void) +{ + ID2D1Factory *factory, *layer_factory; + IDXGISwapChain *swapchain; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + ID2D1Layer *layer; + ULONG refcount; + HWND window; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = create_window(); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + ID2D1RenderTarget_GetFactory(rt, &factory); + + ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); + ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); + + hr = ID2D1RenderTarget_CreateLayer(rt, NULL, &layer); + ok(SUCCEEDED(hr), "Failed to create layer, hr %#x.\n", hr); + ID2D1Layer_GetFactory(layer, &layer_factory); + ok(layer_factory == factory, "Got unexpected layer factory %p, expected %p.\n", layer_factory, factory); + ID2D1Factory_Release(layer_factory); + ID2D1Layer_Release(layer); + + ID2D1RenderTarget_Release(rt); + refcount = ID2D1Factory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); @@ -4552,4 +4596,5 @@ START_TEST(d2d1) test_gradient(); test_draw_geometry(); test_gdi_interop(); + test_layer(); }

1 0

Hugh McMaster : regedit: Update handling of the 'Modify' menu item.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: b332c1a6d59f4efa4a306b3aa1d9b6ef0e6de1b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b332c1a6d59f4efa4a306b3aa… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 2 10:57:58 2017 +0000 regedit: Update handling of the 'Modify' menu item. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index c46dee3..cd7dad0 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -132,7 +132,17 @@ update: SetMenuItemInfoW(hMenu, ID_TREE_EXPAND_COLLAPSE, FALSE, &info); } -static void update_delete_and_rename_items(HMENU hMenu, WCHAR *keyName) +static void update_modify_items(HMENU hMenu, int index) +{ + unsigned int state = MF_ENABLED; + + if (!g_pChildWnd->nFocusPanel || index == -1) + state = MF_GRAYED; + + EnableMenuItem(hMenu, ID_EDIT_MODIFY, state | MF_BYCOMMAND); +} + +static void update_delete_and_rename_items(HMENU hMenu, WCHAR *keyName, int index) { unsigned int state_d = MF_ENABLED, state_r = MF_ENABLED; @@ -141,13 +151,10 @@ static void update_delete_and_rename_items(HMENU hMenu, WCHAR *keyName) if (!keyName || !*keyName) state_d = state_r = MF_GRAYED; } - else + else if (index < 1) { - int index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, - MAKELPARAM(LVIS_FOCUSED | LVIS_SELECTED, 0)); - + state_r = MF_GRAYED; if (index == -1) state_d = MF_GRAYED; - if (index < 1) state_r = MF_GRAYED; } EnableMenuItem(hMenu, ID_EDIT_DELETE, state_d | MF_BYCOMMAND); @@ -170,20 +177,19 @@ static void update_new_items_and_copy_keyname(HMENU hMenu, WCHAR *keyName) static void UpdateMenuItems(HMENU hMenu) { HWND hwndTV = g_pChildWnd->hTreeWnd; - BOOL bAllowEdit = FALSE; HKEY hRootKey = NULL; LPWSTR keyName; HTREEITEM selection; + int index; selection = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); keyName = GetItemPath(hwndTV, selection, &hRootKey); - if (GetFocus() != hwndTV || (keyName && *keyName)) { /* can't modify root keys, but allow for their values */ - bAllowEdit = TRUE; - } + index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, + MAKELPARAM(LVIS_FOCUSED | LVIS_SELECTED, 0)); update_expand_or_collapse_item(hwndTV, selection, hMenu); - EnableMenuItem(hMenu, ID_EDIT_MODIFY, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); - update_delete_and_rename_items(hMenu, keyName); + update_modify_items(hMenu, index); + update_delete_and_rename_items(hMenu, keyName, index); update_new_items_and_copy_keyname(hMenu, keyName); EnableMenuItem(hMenu, ID_FAVORITES_ADDTOFAVORITES, (hRootKey ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_FAVORITES_REMOVEFAVORITE,

1 0

Marcus Meissner : hid: Increase buffer size to allow 16bit value + space + NUL (GCC7).
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 0a2e48933d02131115f139765c6e9b0d2908719e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2e48933d02131115f139765… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Jun 2 10:47:03 2017 +0200 hid: Increase buffer size to allow 16bit value + space + NUL (GCC7). Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index a4c12ce..ef2f729 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -183,7 +183,7 @@ static void process_data(HIDP_CAPS Caps, PHIDP_PREPARSED_DATA ppd, CHAR *data, D { for (j=count; j < count+15 && j < usage_length; j++) { - CHAR btn[5]; + CHAR btn[7]; sprintf(btn, "%i ", button_pages[j]); strcat(report, btn); }

1 0

Alexandre Julliard : explorer: Don' t forward the system tray to the display driver in desktop mode.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 082e4981631189c5903f838a0bc23e137c1cce17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=082e4981631189c5903f838a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 17:20:33 2017 +0200 explorer: Don't forward the system tray to the display driver in desktop mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index ddfd67d..9e58ad4 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -565,7 +565,7 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) buffer, buffer + cbMaskBits); } - /* try forward to x11drv first */ + /* try forwarding to the display driver first */ if (cds->dwData == NIM_ADD || !(icon = get_icon( nid.hWnd, nid.uID ))) { if (wine_notify_icon && ((ret = wine_notify_icon( cds->dwData, &nid )) != -1)) @@ -901,7 +901,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab WNDCLASSEXW class; static const WCHAR classname[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; - wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); + if (using_root) wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2*ICON_BORDER; icon_cy = GetSystemMetrics( SM_CYSMICON ) + 2*ICON_BORDER;

1 0

Alistair Leslie-Hughes : wmvcore: Implement WMCreateWriterPriv.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 7381cecd55e7ba8b98a43ffae6410c1f653f47e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7381cecd55e7ba8b98a43ffae… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 31 01:22:25 2017 +0000 wmvcore: Implement WMCreateWriterPriv. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 18 ++++++++++++++++++ dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/writer.c | 5 +++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 4ceef77..51ff9dc 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -22,6 +22,8 @@ #include "wine/test.h" +HRESULT WINAPI WMCreateWriterPriv(IWMWriter **writer); + static void test_wmwriter_interfaces(void) { HRESULT hr; @@ -197,6 +199,21 @@ void test_profile_manager_interfaces(void) IWMProfileManager_Release(profile); } +static void test_WMCreateWriterPriv(void) +{ + IWMWriter *writer, *writer2; + HRESULT hr; + + hr = WMCreateWriterPriv(&writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IWMWriter_QueryInterface(writer, &IID_IWMWriter, (void**)&writer2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IWMWriter_Release(writer); + IWMWriter_Release(writer2); +} + START_TEST(wmvcore) { HRESULT hr; @@ -209,6 +226,7 @@ START_TEST(wmvcore) test_wmreader_interfaces(); test_wmwriter_interfaces(); test_profile_manager_interfaces(); + test_WMCreateWriterPriv(); CoUninitialize(); } diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index bb17683..c8f582b 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -15,6 +15,6 @@ @ stdcall WMCreateWriter(ptr ptr) @ stub WMCreateWriterFileSink @ stub WMCreateWriterNetworkSink -@ stub WMCreateWriterPriv +@ stdcall WMCreateWriterPriv(ptr) @ stub WMCreateWriterPushSink @ stub WMIsContentProtected diff --git a/dlls/wmvcore/writer.c b/dlls/wmvcore/writer.c index f570148..c1c30be 100644 --- a/dlls/wmvcore/writer.c +++ b/dlls/wmvcore/writer.c @@ -369,3 +369,8 @@ HRESULT WINAPI WMCreateWriter(IUnknown *reserved, IWMWriter **writer) *writer = &ret->IWMWriter_iface; return S_OK; } + +HRESULT WINAPI WMCreateWriterPriv(IWMWriter **writer) +{ + return WMCreateWriter(NULL, writer); +}

1 0

Austin English : wmp: Add some ordinals.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 496677404953bf2b976e19508c8ab29b06ae5b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=496677404953bf2b976e19508… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 25 17:48:29 2017 -0500 wmp: Add some ordinals. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/wmp.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wmp/wmp.spec b/dlls/wmp/wmp.spec index b16365d..377bbcc 100644 --- a/dlls/wmp/wmp.spec +++ b/dlls/wmp/wmp.spec @@ -1,3 +1,8 @@ +3000 stub @ +3002 stub @ +3003 stub @ +3004 stub @ + @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer()

1 0

Austin English : msimg32: Label ordinals.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: f77bf35d11aee79d96c65ef3f6a012ebaf2edd3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f77bf35d11aee79d96c65ef3f… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 25 17:48:28 2017 -0500 msimg32: Label ordinals. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msimg32/msimg32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msimg32/msimg32.spec b/dlls/msimg32/msimg32.spec index 76b5075..a4a67ac 100644 --- a/dlls/msimg32/msimg32.spec +++ b/dlls/msimg32/msimg32.spec @@ -1,5 +1,5 @@ +1 stdcall vSetDdrawflag() @ stdcall AlphaBlend(long long long long long long long long long long long) gdi32.GdiAlphaBlend @ stdcall -private DllInitialize(long long ptr) DllMain @ stdcall GradientFill(long ptr long ptr long long) gdi32.GdiGradientFill @ stdcall TransparentBlt(long long long long long long long long long long long) gdi32.GdiTransparentBlt -@ stdcall vSetDdrawflag()

1 0

Austin English : jsproxy: Label ordinals.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: a79c6a8ab82069572234e638ecbe50a62d226d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a79c6a8ab82069572234e638e… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 25 17:48:26 2017 -0500 jsproxy: Label ordinals. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/jsproxy.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/jsproxy/jsproxy.spec b/dlls/jsproxy/jsproxy.spec index 4a80c4d..51366e7 100644 --- a/dlls/jsproxy/jsproxy.spec +++ b/dlls/jsproxy/jsproxy.spec @@ -1,5 +1,6 @@ -@ stdcall InternetInitializeAutoProxyDll(long str str ptr ptr) JSPROXY_InternetInitializeAutoProxyDll -@ stub InternetInitializeExAutoProxyDll -@ stdcall InternetDeInitializeAutoProxyDll(str long) -@ stub InternetDeInitializeExAutoProxyDll -@ stdcall InternetGetProxyInfo(str long str long ptr ptr) +101 stdcall InternetInitializeAutoProxyDll(long str str ptr ptr) JSPROXY_InternetInitializeAutoProxyDll +102 stdcall InternetDeInitializeAutoProxyDll(str long) +103 stdcall InternetGetProxyInfo(str long str long ptr ptr) +104 stub InternetInitializeAutoProxyDllEx +105 stub InternetDeInitializeAutoProxyDllEx +106 stub InternetGetProxyInfoEx

1 0

← Newer
1
...
52
53
54
55
56
57
58
59
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017