June 2017 - Wine-Commits - list.winehq.org

Owen Rudge : wsdapi: Add stub implementation of IWSDUdpAddress.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: ac38f7fd938eaddfaaeb44cf7d9e66e5e31447a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac38f7fd938eaddfaaeb44cf7… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 30 23:06:14 2017 +0100 wsdapi: Add stub implementation of IWSDUdpAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/Makefile.in | 1 + dlls/wsdapi/address.c | 252 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/wsdapi.spec | 2 +- 3 files changed, 254 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index 82d0ca1..30862cc 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -3,6 +3,7 @@ IMPORTLIB = wsdapi IMPORTS = user32 C_SRCS = \ + address.c \ discovery.c \ main.c \ memory.c \ diff --git a/dlls/wsdapi/address.c b/dlls/wsdapi/address.c new file mode 100644 index 0000000..7efcac2 --- /dev/null +++ b/dlls/wsdapi/address.c @@ -0,0 +1,252 @@ +/* + * Web Services on Devices + * + * Copyright 2017 Owen Rudge 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 <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" +#include "wsdapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); + +typedef struct IWSDUdpAddressImpl { + IWSDUdpAddress IWSDUdpAddress_iface; + LONG ref; +} IWSDUdpAddressImpl; + +static inline IWSDUdpAddressImpl *impl_from_IWSDUdpAddress(IWSDUdpAddress *iface) +{ + return CONTAINING_RECORD(iface, IWSDUdpAddressImpl, IWSDUdpAddress_iface); +} + +static HRESULT WINAPI IWSDUdpAddressImpl_QueryInterface(IWSDUdpAddress *iface, REFIID riid, void **ppv) +{ + IWSDUdpAddressImpl *This = impl_from_IWSDUdpAddress(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + { + WARN("Invalid parameter\n"); + return E_INVALIDARG; + } + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IWSDUdpAddress) || + IsEqualIID(riid, &IID_IWSDTransportAddress) || + IsEqualIID(riid, &IID_IWSDAddress)) + { + *ppv = &This->IWSDUdpAddress_iface; + } + else + { + WARN("Unknown IID %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI IWSDUdpAddressImpl_AddRef(IWSDUdpAddress *iface) +{ + IWSDUdpAddressImpl *This = impl_from_IWSDUdpAddress(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI IWSDUdpAddressImpl_Release(IWSDUdpAddress *iface) +{ + IWSDUdpAddressImpl *This = impl_from_IWSDUdpAddress(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_Serialize(IWSDUdpAddress *This, LPWSTR pszBuffer, DWORD cchLength, BOOL fSafe) +{ + FIXME("(%p, %p, %d, %d)\n", This, pszBuffer, cchLength, fSafe); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_Deserialize(IWSDUdpAddress *This, LPCWSTR pszBuffer) +{ + FIXME("(%p, %s)\n", This, debugstr_w(pszBuffer)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetPort(IWSDUdpAddress *This, WORD *pwPort) +{ + FIXME("(%p, %p)\n", This, pwPort); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetPort(IWSDUdpAddress *This, WORD wPort) +{ + FIXME("(%p, %d)\n", This, wPort); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddress(IWSDUdpAddress *This, LPCWSTR *ppszAddress) +{ + FIXME("(%p, %p)\n", This, ppszAddress); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddressEx(IWSDUdpAddress *This, BOOL fSafe, LPCWSTR *ppszAddress) +{ + FIXME("(%p, %d, %p)\n", This, fSafe, ppszAddress); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetTransportAddress(IWSDUdpAddress *This, LPCWSTR pszAddress) +{ + FIXME("(%p, %s)\n", This, debugstr_w(pszAddress)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetSockaddr(IWSDUdpAddress *This, const SOCKADDR_STORAGE *pSockAddr) +{ + FIXME("(%p, %p)\n", This, pSockAddr); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetSockaddr(IWSDUdpAddress *This, SOCKADDR_STORAGE *pSockAddr) +{ + FIXME("(%p, %p)\n", This, pSockAddr); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetExclusive(IWSDUdpAddress *This, BOOL fExclusive) +{ + FIXME("(%p, %d)\n", This, fExclusive); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetExclusive(IWSDUdpAddress *This) +{ + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetMessageType(IWSDUdpAddress *This, WSDUdpMessageType messageType) +{ + FIXME("(%p, %d)\n", This, messageType); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetMessageType(IWSDUdpAddress *This, WSDUdpMessageType *pMessageType) +{ + FIXME("(%p, %p)\n", This, pMessageType); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetTTL(IWSDUdpAddress *This, DWORD dwTTL) +{ + FIXME("(%p, %d)\n", This, dwTTL); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetTTL(IWSDUdpAddress *This, DWORD *pdwTTL) +{ + FIXME("(%p, %p)\n", This, pdwTTL); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetAlias(IWSDUdpAddress *This, const GUID *pAlias) +{ + FIXME("(%p, %s)\n", This, debugstr_guid(pAlias)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetAlias(IWSDUdpAddress *This, GUID *pAlias) +{ + FIXME("(%p, %p)\n", This, pAlias); + return E_NOTIMPL; +} + +static const IWSDUdpAddressVtbl udpAddressVtbl = +{ + IWSDUdpAddressImpl_QueryInterface, + IWSDUdpAddressImpl_AddRef, + IWSDUdpAddressImpl_Release, + IWSDUdpAddressImpl_Serialize, + IWSDUdpAddressImpl_Deserialize, + IWSDUdpAddressImpl_GetPort, + IWSDUdpAddressImpl_SetPort, + IWSDUdpAddressImpl_GetTransportAddress, + IWSDUdpAddressImpl_GetTransportAddressEx, + IWSDUdpAddressImpl_SetTransportAddress, + IWSDUdpAddressImpl_SetSockaddr, + IWSDUdpAddressImpl_GetSockaddr, + IWSDUdpAddressImpl_SetExclusive, + IWSDUdpAddressImpl_GetExclusive, + IWSDUdpAddressImpl_SetMessageType, + IWSDUdpAddressImpl_GetMessageType, + IWSDUdpAddressImpl_SetTTL, + IWSDUdpAddressImpl_GetTTL, + IWSDUdpAddressImpl_SetAlias, + IWSDUdpAddressImpl_GetAlias +}; + +HRESULT WINAPI WSDCreateUdpAddress(IWSDUdpAddress **ppAddress) +{ + IWSDUdpAddressImpl *obj; + + TRACE("(%p)\n", ppAddress); + + if (ppAddress == NULL) + { + WARN("Invalid parameter: ppAddress == NULL\n"); + return E_POINTER; + } + + *ppAddress = NULL; + + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); + + if (!obj) + { + WARN("Out of memory\n"); + return E_OUTOFMEMORY; + } + + obj->IWSDUdpAddress_iface.lpVtbl = &udpAddressVtbl; + obj->ref = 1; + + *ppAddress = &obj->IWSDUdpAddress_iface; + TRACE("Returning iface %p\n", *ppAddress); + + return S_OK; +} diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index 7954ede..a8f1aaa 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -23,7 +23,7 @@ @ stub WSDCreateHttpTransport @ stub WSDCreateMetadataAgent @ stub WSDCreateOutboundAttachment -@ stub WSDCreateUdpAddress +@ stdcall WSDCreateUdpAddress(ptr) @ stub WSDCreateUdpMessageParameters @ stub WSDCreateUdpTransport @ stdcall WSDDetachLinkedMemory(ptr)

1 0

Owen Rudge : wsdapi: Implement AddNameToNamespace.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: 9bf2f6b2afccd5342e7cc105f8a960e8eedb719e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf2f6b2afccd5342e7cc105f… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 30 23:05:50 2017 +0100 wsdapi: Implement AddNameToNamespace. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/xml.c | 20 ++++----- dlls/wsdapi/xml.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 121 insertions(+), 12 deletions(-) diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index 68742fe..c83f07b 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -413,24 +413,24 @@ static void XMLContext_AddNameToNamespace_tests(void) /* Test calling AddNameToNamespace with invalid arguments */ hr = IWSDXMLContext_AddNameToNamespace(context, NULL, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); hr = IWSDXMLContext_AddNameToNamespace(context, NULL, name1Text, NULL); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); /* Test calling AddNameToNamespace without the ppName parameter */ hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, name1Text, NULL); - todo_wine ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); /* Now retrieve the created name */ hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, name1Text, &name1); - todo_wine ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); /* Check the returned structure */ - todo_wine ok(name1 != NULL, "name1 == NULL\n"); + ok(name1 != NULL, "name1 == NULL\n"); if (name1 != NULL) { @@ -447,10 +447,10 @@ static void XMLContext_AddNameToNamespace_tests(void) /* Test calling AddNamespace with parameters that are too large */ hr = IWSDXMLContext_AddNameToNamespace(context, largeText, name1Text, &name2); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, largeText, &name2); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); /* Try creating a namespace explicitly */ hr = IWSDXMLContext_AddNamespace(context, ns2Uri, prefix2, &ns2); @@ -458,10 +458,10 @@ static void XMLContext_AddNameToNamespace_tests(void) /* Now add a name to it */ hr = IWSDXMLContext_AddNameToNamespace(context, ns2Uri, name2Text, &name2); - todo_wine ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); /* Check the returned structure */ - todo_wine ok(name2 != NULL, "name2 == NULL\n"); + ok(name2 != NULL, "name2 == NULL\n"); if (name2 != NULL) { diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 9fba638..a6d0b07 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -270,6 +270,64 @@ static WSDXML_NAMESPACE *find_namespace(struct list *namespaces, LPCWSTR uri) return NULL; } +static WSDXML_NAME *find_name(WSDXML_NAMESPACE *ns, LPCWSTR name) +{ + int i; + + for (i = 0; i < ns->NamesCount; i++) + { + if (lstrcmpW(ns->Names[i].LocalName, name) == 0) + { + return &ns->Names[i]; + } + } + + return NULL; +} + +static WSDXML_NAME *add_name(WSDXML_NAMESPACE *ns, LPCWSTR name) +{ + WSDXML_NAME *names; + WSDXML_NAME *newName; + int i; + + names = WSDAllocateLinkedMemory(ns, sizeof(WSDXML_NAME) * (ns->NamesCount + 1)); + + if (names == NULL) + { + return NULL; + } + + if (ns->NamesCount > 0) + { + /* Copy the existing names array over to the new allocation */ + memcpy(names, ns->Names, sizeof(WSDXML_NAME) * ns->NamesCount); + + for (i = 0; i < ns->NamesCount; i++) + { + /* Attach the local name memory to the new names allocation */ + WSDAttachLinkedMemory(names, names[i].LocalName); + } + + WSDFreeLinkedMemory(ns->Names); + } + + ns->Names = names; + + newName = &names[ns->NamesCount]; + + newName->LocalName = duplicate_string(names, name); + newName->Space = ns; + + if (newName->LocalName == NULL) + { + return NULL; + } + + ns->NamesCount++; + return newName; +} + static BOOL is_prefix_unique(struct list *namespaces, LPCWSTR prefix) { struct xmlNamespace *ns; @@ -461,8 +519,59 @@ static HRESULT WINAPI IWSDXMLContextImpl_AddNamespace(IWSDXMLContext *iface, LPC static HRESULT WINAPI IWSDXMLContextImpl_AddNameToNamespace(IWSDXMLContext *iface, LPCWSTR pszUri, LPCWSTR pszName, WSDXML_NAME **ppName) { - FIXME("(%p, %s, %s, %p)\n", iface, debugstr_w(pszUri), debugstr_w(pszName), ppName); - return E_NOTIMPL; + IWSDXMLContextImpl *This = impl_from_IWSDXMLContext(iface); + WSDXML_NAMESPACE *ns; + WSDXML_NAME *name; + + TRACE("(%p, %s, %s, %p)\n", This, debugstr_w(pszUri), debugstr_w(pszName), ppName); + + if ((pszUri == NULL) || (pszName == NULL) || (lstrlenW(pszUri) > WSD_MAX_TEXT_LENGTH) || (lstrlenW(pszName) > WSD_MAX_TEXT_LENGTH)) + { + return E_INVALIDARG; + } + + ns = find_namespace(This->namespaces, pszUri); + + if (ns == NULL) + { + /* The namespace doesn't exist, add it */ + ns = add_namespace(This->namespaces, pszUri); + + if (ns == NULL) + { + return E_OUTOFMEMORY; + } + + ns->PreferredPrefix = generate_namespace_prefix(This, ns, pszUri); + if (ns->PreferredPrefix == NULL) + { + return E_FAIL; + } + } + + name = find_name(ns, pszName); + + if (name == NULL) + { + name = add_name(ns, pszName); + + if (name == NULL) + { + return E_OUTOFMEMORY; + } + } + + if (ppName != NULL) + { + *ppName = duplicate_name(NULL, name); + + if (*ppName == NULL) + { + return E_OUTOFMEMORY; + } + } + + return S_OK; } static HRESULT WINAPI IWSDXMLContextImpl_SetNamespaces(IWSDXMLContext *iface, const PCWSDXML_NAMESPACE *pNamespaces, WORD wNamespacesCount, BYTE bLayerNumber)

1 0

Henri Verbeet : d2d1: Implement d2d_rectangle_geometry_Simplify().
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: e5733e7cd40b41bb4d8c0409e9ed5be8fe6d5618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5733e7cd40b41bb4d8c0409e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:35 2017 +0200 d2d1: Implement d2d_rectangle_geometry_Simplify(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 4 + dlls/d2d1/geometry.c | 27 +++- dlls/d2d1/tests/d2d1.c | 347 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 375 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5733e7cd40b41bb4d8c0…

1 0

Hugh McMaster : regedit: Update handling of the 'Modify' menu item.
by Alexandre Julliard June 2, 2017

June 2, 2017

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 June 2, 2017

June 2, 2017

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

Alistair Leslie-Hughes : wmvcore: Implement WMCreateWriterPriv.
by Alexandre Julliard June 2, 2017

June 2, 2017

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 : msimg32: Label ordinals.
by Alexandre Julliard June 2, 2017

June 2, 2017

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 : gameux: Label ordinals.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: 1ebf6ca29ba114fd2485990c86f58848bea03a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebf6ca29ba114fd2485990c8… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 25 17:48:25 2017 -0500 gameux: Label ordinals. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/gameux.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gameux/gameux.spec b/dlls/gameux/gameux.spec index 1a9f44f..06637b6 100644 --- a/dlls/gameux/gameux.spec +++ b/dlls/gameux/gameux.spec @@ -1,4 +1,4 @@ -@ stub GameUxShimW +1 stub GameUxShimW @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer()

1 0

Henri Verbeet : d2d1: Implement d2d_transformed_geometry_GetBounds().
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: 828e62c8e257e2741f3d6354a175e0ad87672d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=828e62c8e257e2741f3d6354a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:34 2017 +0200 d2d1: Implement d2d_transformed_geometry_GetBounds(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 11 +++++++++-- dlls/d2d1/tests/d2d1.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index d367f67..d07f68e 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -3066,9 +3066,16 @@ static void STDMETHODCALLTYPE d2d_transformed_geometry_GetFactory(ID2D1Transform static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_GetBounds(ID2D1TransformedGeometry *iface, const D2D1_MATRIX_3X2_F *transform, D2D1_RECT_F *bounds) { - FIXME("iface %p, transform %p, bounds %p stub!\n", iface, transform, bounds); + struct d2d_geometry *geometry = impl_from_ID2D1TransformedGeometry(iface); + D2D1_MATRIX_3X2_F g; - return E_NOTIMPL; + TRACE("iface %p, transform %p, bounds %p.\n", iface, transform, bounds); + + g = geometry->transform; + if (transform) + d2d_matrix_multiply(&g, transform); + + return ID2D1Geometry_GetBounds(geometry->u.transformed.src_geometry, &g, bounds); } static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_GetWidenedBounds(ID2D1TransformedGeometry *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f421b18..1387a05 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1838,6 +1838,7 @@ static void test_path_geometry(void) static void test_rectangle_geometry(void) { + ID2D1TransformedGeometry *transformed_geometry; ID2D1RectangleGeometry *geometry; D2D1_MATRIX_3X2_F matrix; D2D1_RECT_F rect, rect2; @@ -1964,8 +1965,46 @@ static void test_rectangle_geometry(void) ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); - ID2D1RectangleGeometry_Release(geometry); + set_matrix_identity(&matrix); + scale_matrix(&matrix, 4.0f, 5.0f); + rotate_matrix(&matrix, M_PI / 3.0f); + translate_matrix(&matrix, 30.0f, 20.0f); + hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)geometry, &matrix, &transformed_geometry); + ok(SUCCEEDED(hr), "Failed to create transformed geometry, hr %#x.\n", hr); + + ID2D1TransformedGeometry_GetBounds(transformed_geometry, NULL, &rect); + ok(SUCCEEDED(hr), "Failed to get bounds.\n"); + match = compare_rect(&rect, -7.85640717e+01f, 1.79903809e+02f, 1.07179594e+01f, 2.73205078e+02f, 1); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + set_matrix_identity(&matrix); + rotate_matrix(&matrix, M_PI / -3.0f); + scale_matrix(&matrix, 0.25f, 0.2f); + ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + ok(SUCCEEDED(hr), "Failed to get bounds.\n"); + match = compare_rect(&rect, 30.0f, 20.0f, 40.0f, 40.0f, 2); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + set_matrix_identity(&matrix); + scale_matrix(&matrix, 2.0f, 0.0f); + ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + ok(SUCCEEDED(hr), "Failed to get bounds.\n"); + match = compare_rect(&rect, -1.57128143e+02f, 0.00000000e+00f, 2.14359188e+01f, 0.00000000e+00f, 1); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + set_matrix_identity(&matrix); + scale_matrix(&matrix, 0.0f, 0.5f); + ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + ok(SUCCEEDED(hr), "Failed to get bounds.\n"); + match = compare_rect(&rect, 0.00000000e+00f, 8.99519043e+01f, 0.00000000e+00, 1.36602539e+02f, 1); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + ID2D1TransformedGeometry_Release(transformed_geometry); + ID2D1RectangleGeometry_Release(geometry); ID2D1Factory_Release(factory); }

1 0

Owen Rudge : include: Add definitions for IWSDUdpAddress, IWSDTransportAddress.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: bcbe4ae756f44109f858475e1e5dc1e465c515cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcbe4ae756f44109f858475e1… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 30 23:06:06 2017 +0100 include: Add definitions for IWSDUdpAddress, IWSDTransportAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wsdbase.idl | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/include/wsdbase.idl b/include/wsdbase.idl index c93262d..099dc87 100644 --- a/include/wsdbase.idl +++ b/include/wsdbase.idl @@ -22,8 +22,21 @@ cpp_quote("#define WSDAPI_ADDRESSFAMILY_IPV4 1") cpp_quote("#define WSDAPI_ADDRESSFAMILY_IPV6 2") interface IWSDAddress; +interface IWSDUdpAddress; interface IWSDMessageParameters; +cpp_quote("HRESULT WINAPI WSDCreateUdpAddress(IWSDUdpAddress **ppAddress);") + +#ifndef SOCKADDR_STORAGE +cpp_quote("#if 1") +cpp_quote("#ifndef __CSADDR_DEFINED__") +cpp_quote("typedef struct SOCKADDR_STORAGE SOCKADDR_STORAGE;") +cpp_quote("#endif") +cpp_quote("#else") +typedef void SOCKADDR_STORAGE; +cpp_quote("#endif") +#endif + [ uuid(b9574c6c-12a6-4f74-93a1-3318ff605759), object, @@ -36,6 +49,45 @@ interface IWSDAddress : IUnknown } [ +uuid(70d23498-4ee6-4340-a3df-d845d2235467), +object, +local +] +interface IWSDTransportAddress : IWSDAddress +{ + HRESULT GetPort([out] WORD *pwPort); + HRESULT SetPort([in] WORD wPort); + HRESULT GetTransportAddress([out] LPCWSTR *ppszAddress); + HRESULT GetTransportAddressEx([in] BOOL fSafe, [out] LPCWSTR *ppszAddress); + HRESULT SetTransportAddress([in] LPCWSTR pszAddress); +} + +typedef enum _WSDUdpMessageType +{ + ONE_WAY, + TWO_WAY +} WSDUdpMessageType; + +[ +uuid(74d6124a-a441-4f78-a1eb-97a8d1996893), +object, +local +] +interface IWSDUdpAddress : IWSDTransportAddress +{ + HRESULT SetSockaddr([in] const SOCKADDR_STORAGE *pSockAddr); + HRESULT GetSockaddr([out] SOCKADDR_STORAGE *pSockAddr); + HRESULT SetExclusive(BOOL fExclusive); + HRESULT GetExclusive(); + HRESULT SetMessageType([in] WSDUdpMessageType messageType); + HRESULT GetMessageType([out] WSDUdpMessageType* pMessageType); + HRESULT SetTTL([in] DWORD dwTTL); + HRESULT GetTTL([out] DWORD *pdwTTL); + HRESULT SetAlias([in] const GUID* pAlias); + HRESULT GetAlias([out] GUID *pAlias); +} + +[ uuid(1fafe8a2-e6fc-4b80-b6cf-b7d45c416d7c), object ]

1 0