April 2018 - Wine-Commits - list.winehq.org

Alexandre Julliard : user32: Add partial stub for GetDpiForMonitorInternal ().
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: wine Branch: master Commit: 8b7ed3630729e77766cc524d27540eac72f3b02a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b7ed3630729e77766cc524d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 19 10:46:43 2018 +0200 user32: Add partial stub for GetDpiForMonitorInternal(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../ext-ms-win-rtcore-ntuser-dpi-l1-1-0.spec | 2 +- .../ext-ms-win-rtcore-ntuser-dpi-l1-2-0.spec | 2 +- dlls/shcore/main.c | 12 ++------ dlls/user32/sysparams.c | 32 ++++++++++++++++------ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 6 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0/ext-ms-win-rtcore-ntuser-dpi-l1-1-0.spec b/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0/ext-ms-win-rtcore-ntuser-dpi-l1-1-0.spec index ca1fe1c..336d8ce 100644 --- a/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0/ext-ms-win-rtcore-ntuser-dpi-l1-1-0.spec +++ b/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0/ext-ms-win-rtcore-ntuser-dpi-l1-1-0.spec @@ -1,3 +1,3 @@ -@ stub GetDpiForMonitorInternal +@ stdcall GetDpiForMonitorInternal(long long ptr ptr) user32.GetDpiForMonitorInternal @ stdcall GetProcessDpiAwarenessInternal(long ptr) user32.GetProcessDpiAwarenessInternal @ stdcall SetProcessDpiAwarenessInternal(long) user32.SetProcessDpiAwarenessInternal diff --git a/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0/ext-ms-win-rtcore-ntuser-dpi-l1-2-0.spec b/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0/ext-ms-win-rtcore-ntuser-dpi-l1-2-0.spec index 67c40ab..cd546c2 100644 --- a/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0/ext-ms-win-rtcore-ntuser-dpi-l1-2-0.spec +++ b/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0/ext-ms-win-rtcore-ntuser-dpi-l1-2-0.spec @@ -1 +1 @@ -@ stub GetDpiForMonitorInternal +@ stdcall GetDpiForMonitorInternal(long long ptr ptr) user32.GetDpiForMonitorInternal diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 17d4b68..07918bc 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -58,14 +58,6 @@ HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS value) HRESULT WINAPI GetDpiForMonitor(HMONITOR monitor, MONITOR_DPI_TYPE type, UINT *x, UINT *y) { - HDC hDC; - - FIXME("(%p, %u, %p, %p): semi-stub\n", monitor, type, x, y); - - hDC = GetDC(0); - if (x) *x = GetDeviceCaps(hDC, LOGPIXELSX); - if (y) *y = GetDeviceCaps(hDC, LOGPIXELSY); - ReleaseDC(0, hDC); - - return S_OK; + if (GetDpiForMonitorInternal( monitor, type, x, y )) return S_OK; + return HRESULT_FROM_WIN32( GetLastError() ); } diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 425acae..8c5dd0a 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -630,11 +630,17 @@ static UINT get_system_dpi(void) static const WCHAR dpi_key_name[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p','\0'}; static const WCHAR def_dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'}; - DWORD dpi; + static UINT system_dpi; + UINT dpi; - if ((dpi = get_reg_dword( HKEY_CURRENT_USER, dpi_key_name, dpi_value_name ))) return dpi; - if ((dpi = get_reg_dword( HKEY_CURRENT_CONFIG, def_dpi_key_name, dpi_value_name ))) return dpi; - return USER_DEFAULT_SCREEN_DPI; + if (!system_dpi) + { + if (!(dpi = get_reg_dword( HKEY_CURRENT_USER, dpi_key_name, dpi_value_name )) && + !(dpi = get_reg_dword( HKEY_CURRENT_CONFIG, def_dpi_key_name, dpi_value_name ))) + dpi = USER_DEFAULT_SCREEN_DPI; + system_dpi = dpi; + } + return system_dpi; } HDC get_display_dc(void) @@ -3284,12 +3290,22 @@ BOOL WINAPI IsProcessDPIAware(void) */ UINT WINAPI GetDpiForSystem(void) { - static int display_dpi; - if (!IsProcessDPIAware()) return USER_DEFAULT_SCREEN_DPI; + return get_system_dpi(); +} + +/*********************************************************************** + * GetDpiForMonitorInternal (USER32.@) + */ +BOOL WINAPI GetDpiForMonitorInternal( HMONITOR monitor, UINT type, UINT *x, UINT *y ) +{ + UINT dpi = get_system_dpi(); - if (!display_dpi) display_dpi = get_system_dpi(); - return display_dpi; + WARN( "(%p, %u, %p, %p): semi-stub\n", monitor, type, x, y ); + + if (x) *x = dpi; + if (y) *y = dpi; + return TRUE; } /*********************************************************************** diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8d9058b..8556502 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -296,6 +296,7 @@ @ stdcall GetDlgItemTextA(long long ptr long) @ stdcall GetDlgItemTextW(long long ptr long) @ stdcall GetDoubleClickTime() +@ stdcall GetDpiForMonitorInternal(long long ptr ptr) @ stdcall GetDpiForSystem() @ stdcall GetDpiForWindow(long) @ stdcall GetFocus() diff --git a/include/winuser.h b/include/winuser.h index 86cdbf6..c2055e9 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3678,6 +3678,7 @@ WINUSERAPI UINT WINAPI GetDlgItemTextA(HWND,INT,LPSTR,INT); WINUSERAPI UINT WINAPI GetDlgItemTextW(HWND,INT,LPWSTR,INT); #define GetDlgItemText WINELIB_NAME_AW(GetDlgItemText) WINUSERAPI UINT WINAPI GetDoubleClickTime(void); +WINUSERAPI BOOL WINAPI GetDpiForMonitorInternal(HMONITOR,UINT,UINT*,UINT*); WINUSERAPI UINT WINAPI GetDpiForWindow(HWND); WINUSERAPI UINT WINAPI GetDpiForSystem(void); WINUSERAPI HWND WINAPI GetFocus(void);

1 0

Alexandre Julliard : user32: Implement LogicalToPhysicalPointForPerMonitorDPI() and PhysicalToLogicalPointForPerMonitorDPI().
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: wine Branch: master Commit: 7fdf90e395e03e03226d9c3cb9679158d9baf8e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fdf90e395e03e03226d9c3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 19 12:00:13 2018 +0200 user32: Implement LogicalToPhysicalPointForPerMonitorDPI() and PhysicalToLogicalPointForPerMonitorDPI(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 37 +++++++++++ dlls/user32/tests/sysparams.c | 141 ++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 2 + include/winuser.h | 2 + 4 files changed, 182 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7fdf90e395e03e03226d…

1 0

Francois Gouget : comctl32: Remove THEMING_SetSubclassData() . It is not used anymore.
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: wine Branch: master Commit: 44c865649b93d5cb80dbb5912adb862a5e8339b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44c865649b93d5cb80dbb591… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 18 03:25:40 2018 +0200 comctl32: Remove THEMING_SetSubclassData(). It is not used anymore. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comctl32.h | 1 - dlls/comctl32/theming.c | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 06cd59c..e2367aa 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -276,6 +276,5 @@ LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME *secon extern void THEMING_Initialize(void) DECLSPEC_HIDDEN; extern void THEMING_Uninitialize(void) DECLSPEC_HIDDEN; extern LRESULT THEMING_CallOriginalClass(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; -extern void THEMING_SetSubclassData(HWND, ULONG_PTR) DECLSPEC_HIDDEN; #endif /* __WINE_COMCTL32_H */ diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c index 9494ffa..759ab76 100644 --- a/dlls/comctl32/theming.c +++ b/dlls/comctl32/theming.c @@ -167,13 +167,3 @@ LRESULT THEMING_CallOriginalClass (HWND wnd, UINT msg, WPARAM wParam, LPARAM lPa WNDPROC oldProc = originalProcs[subclass]; return CallWindowProcW (oldProc, wnd, msg, wParam, lParam); } - -/*********************************************************************** - * THEMING_SetSubclassData - * - * Update the "refData" value of the subclassed window. - */ -void THEMING_SetSubclassData (HWND wnd, ULONG_PTR refData) -{ - SetPropW (wnd, (LPCWSTR)MAKEINTATOM(atRefDataProp), (HANDLE)refData); -}

1 0

Zebediah Figura : msi/tests: Improve COM test.
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: wine Branch: master Commit: fdb9bdc88b27ffdaea5ad31256f250b66bdf6b78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdb9bdc88b27ffdaea5ad312… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 18 18:40:01 2018 -0500 msi/tests: Improve COM test. Test for a class that Wine actually supports, and also make sure our apartment is uninitialized. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/custom.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 9cf90dc..8d32348 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -24,8 +24,7 @@ #include <windef.h> #include <winbase.h> #define COBJMACROS -#include <objbase.h> -#include <unknwn.h> +#include <msxml.h> #include <msi.h> #include <msiquery.h> @@ -248,14 +247,19 @@ UINT WINAPI main_test(MSIHANDLE hinst) { UINT res; IUnknown *unk = NULL; - HRESULT hres; + HRESULT hr; /* Test for an MTA apartment */ - hres = CoCreateInstance(&CLSID_Picture_Metafile, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); - todo_wine_ok(hinst, hres == S_OK, "CoCreateInstance failed with %08x\n", hres); + hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + todo_wine_ok(hinst, hr == S_OK, "CoCreateInstance failed with %08x\n", hr); if (unk) IUnknown_Release(unk); + /* but ours is uninitialized */ + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hinst, hr == S_OK, "got %#x\n", hr); + CoUninitialize(); + /* Test MsiGetDatabaseState() */ res = MsiGetDatabaseState(hinst); todo_wine_ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res);

1 0

Owen Rudge : wsdapi/tests: Add test for Hello message Any body element.
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: wine Branch: master Commit: 74fe8303fb012bc12a8e51b6b5ea9412588af551 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74fe8303fb012bc12a8e51b6… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Apr 17 23:04:55 2018 +0100 wsdapi/tests: Add test for Hello message Any body element. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/discovery.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 06bde89..608edb5 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -508,15 +508,17 @@ static void Publish_tests(void) WSADATA wsaData; BOOL messageOK, hello_message_seen = FALSE, endpoint_reference_seen = FALSE, app_sequence_seen = FALSE; BOOL metadata_version_seen = FALSE, any_header_seen = FALSE, wine_ns_seen = FALSE, body_hello_seen = FALSE; + BOOL any_body_seen = FALSE; int ret, i; HRESULT rc; ULONG ref; char *msg; - WSDXML_ELEMENT *header_any_element; + WSDXML_ELEMENT *header_any_element, *body_any_element; WSDXML_NAME header_any_name; WSDXML_NAMESPACE ns; WCHAR header_any_name_text[] = {'B','e','e','r',0}; static const WCHAR header_any_text[] = {'P','u','b','l','i','s','h','T','e','s','t',0}; + static const WCHAR body_any_text[] = {'B','o','d','y','T','e','s','t',0}; static const WCHAR uri[] = {'h','t','t','p',':','/','/','w','i','n','e','.','t','e','s','t','/',0}; static const WCHAR prefix[] = {'w','i','n','e',0}; @@ -590,11 +592,15 @@ static void Publish_tests(void) rc = WSDXMLBuildAnyForSingleElement(&header_any_name, header_any_text, &header_any_element); ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + rc = WSDXMLBuildAnyForSingleElement(&header_any_name, body_any_text, &body_any_element); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + /* Publish the service */ rc = IWSDiscoveryPublisher_PublishEx(publisher, publisherIdW, 1, 1, 1, sequenceIdW, NULL, NULL, NULL, - header_any_element, NULL, NULL, NULL, NULL); + header_any_element, NULL, NULL, NULL, body_any_element); WSDFreeLinkedMemory(header_any_element); + WSDFreeLinkedMemory(body_any_element); ok(rc == S_OK, "Publish failed: %08x\n", rc); @@ -630,8 +636,9 @@ static void Publish_tests(void) any_header_seen = (strstr(msg, "<wine:Beer>PublishTest</wine:Beer>") != NULL); wine_ns_seen = (strstr(msg, "xmlns:wine=\"http://wine.test/\"") != NULL); body_hello_seen = (strstr(msg, "<soap:Body><wsd:Hello") != NULL); + any_body_seen = (strstr(msg, "<wine:Beer>BodyTest</wine:Beer>") != NULL); messageOK = hello_message_seen && endpoint_reference_seen && app_sequence_seen && metadata_version_seen && - any_header_seen && wine_ns_seen && body_hello_seen; + any_header_seen && wine_ns_seen && body_hello_seen && any_body_seen; if (messageOK) break; } @@ -651,6 +658,7 @@ static void Publish_tests(void) ok(any_header_seen == TRUE, "Custom header not received\n"); ok(wine_ns_seen == TRUE, "Wine namespace not received\n"); ok(body_hello_seen == TRUE, "Body and Hello elements not received\n"); + ok(any_body_seen == TRUE, "Custom body element not received\n"); after_publish_test:

1 0

Owen Rudge : wsdapi: Ensure text node parent is NULL before calling WSDXMLAddChild.
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: wine Branch: master Commit: 3cd8986e93c98713aae17d2493e1c0349c99e290 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cd8986e93c98713aae17d24… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Apr 17 23:04:26 2018 +0100 wsdapi: Ensure text node parent is NULL before calling WSDXMLAddChild. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 8bd6b71..ad83a88 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -512,6 +512,7 @@ static HRESULT duplicate_element(WSDXML_ELEMENT *parent, const WSDXML_ELEMENT *n text_node = WSDAllocateLinkedMemory(new_element, sizeof(WSDXML_TEXT)); if (text_node == NULL) goto failed; + text_node->Node.Parent = NULL; text_node->Node.Next = NULL; text_node->Node.Type = TextType; text_node->Text = duplicate_string(text_node, ((WSDXML_TEXT *)cur_node)->Text);

1 0

Francois Gouget : dmime: Add a trailing '\n' to a FIXME().
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: wine Branch: master Commit: d5784736aa4e5c27113e81f61c49b66b4f42f518 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5784736aa4e5c27113e81f6… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 18 03:27:03 2018 +0200 dmime: Add a trailing '\n' to a FIXME(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index cbc2b3c..77c94f1 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -924,7 +924,7 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, IStream *strea return hr; break; case FOURCC_RIFF: - FIXME("Loading of embedded RIFF form %s", debugstr_fourcc(chunk.type)); + FIXME("Loading of embedded RIFF form %s\n", debugstr_fourcc(chunk.type)); break; } }

1 0

Owen Rudge : wsdapi: Register default namespaces when creating publisher.
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: wine Branch: master Commit: 1a7df56e562bf14e99cfb853e3a0a5ab17446240 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a7df56e562bf14e99cfb853… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Apr 17 23:04:40 2018 +0100 wsdapi: Register default namespaces when creating publisher. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/discovery.c | 20 +++++++++++++++++--- dlls/wsdapi/soap.c | 13 +++++++++++++ dlls/wsdapi/wsdapi_internal.h | 2 ++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index 5136a24..fc8acfb 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -25,6 +25,7 @@ #include "wsdapi_internal.h" #include "wine/debug.h" +#include "wine/heap.h" #include "guiddef.h" WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); @@ -332,6 +333,7 @@ static const IWSDiscoveryPublisherVtbl publisher_vtbl = HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscoveryPublisher **ppPublisher) { IWSDiscoveryPublisherImpl *obj; + HRESULT ret; TRACE("(%p, %p)\n", pContext, ppPublisher); @@ -356,11 +358,13 @@ HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscover if (pContext == NULL) { - if (FAILED(WSDXMLCreateContext(&obj->xmlContext))) + ret = WSDXMLCreateContext(&obj->xmlContext); + + if (FAILED(ret)) { WARN("Unable to create XML context\n"); - HeapFree (GetProcessHeap(), 0, obj); - return E_OUTOFMEMORY; + heap_free(obj); + return ret; } } else @@ -369,6 +373,16 @@ HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscover IWSDXMLContext_AddRef(pContext); } + ret = register_namespaces(obj->xmlContext); + + if (FAILED(ret)) + { + WARN("Unable to register default namespaces\n"); + heap_free(obj); + + return ret; + } + list_init(&obj->notificationSinks); *ppPublisher = &obj->IWSDiscoveryPublisher_iface; diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index ad83a88..96efefd 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -286,6 +286,19 @@ static HRESULT add_child_element(IWSDXMLContext *xml_context, WSDXML_ELEMENT *pa return ret; } +HRESULT register_namespaces(IWSDXMLContext *xml_context) +{ + HRESULT ret; + + ret = IWSDXMLContext_AddNamespace(xml_context, addressingNsUri, addressingPrefix, NULL); + if (FAILED(ret)) return ret; + + ret = IWSDXMLContext_AddNamespace(xml_context, discoveryNsUri, discoveryPrefix, NULL); + if (FAILED(ret)) return ret; + + return IWSDXMLContext_AddNamespace(xml_context, envelopeNsUri, envelopePrefix, NULL); +} + static BOOL create_guid(LPWSTR buffer) { const WCHAR formatString[] = { 'u','r','n',':','u','u','i','d',':','%','s', 0 }; diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h index dd7931c..57bf58c 100644 --- a/dlls/wsdapi/wsdapi_internal.h +++ b/dlls/wsdapi/wsdapi_internal.h @@ -62,6 +62,8 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON const WSD_URI_LIST *xaddrs_list, const WSDXML_ELEMENT *hdr_any, const WSDXML_ELEMENT *ref_param_any, const WSDXML_ELEMENT *endpoint_ref_any, const WSDXML_ELEMENT *any); +HRESULT register_namespaces(IWSDXMLContext *xml_context); + /* xml.c */ LPWSTR duplicate_string(void *parentMemoryBlock, LPCWSTR value);

1 0

Alexandre Julliard : testbot: Fix invalid package import.
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: tools Branch: master Commit: 8573515623cbc46acb0f26ea193226410eb63c48 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8573515623cbc46acb0f26e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 19 23:49:38 2018 +0200 testbot: Fix invalid package import. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/WineTestBotObjects.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/WineTestBotObjects.pm b/testbot/lib/WineTestBot/WineTestBotObjects.pm index bc34b74..ba84805 100644 --- a/testbot/lib/WineTestBot/WineTestBotObjects.pm +++ b/testbot/lib/WineTestBot/WineTestBotObjects.pm @@ -51,7 +51,7 @@ use ObjectModel::Collection; our @ISA = qw(ObjectModel::Collection); use ObjectModel::BackEnd; -use WineTestBot::Item; +use ObjectModel::Item; use WineTestBot::Config; sub GetBackEnd($)

1 0

Francois Gouget : testbot: Standardize the packages inheritance and exports.
by Alexandre Julliard April 19, 2018

April 19, 2018

Module: tools Branch: master Commit: c3737f9a96195acace98ec94aebde638207d7e9f URL: https://source.winehq.org/git/tools.git/?a=commit;h=c3737f9a96195acace98ec9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 19 03:34:42 2018 +0200 testbot: Standardize the packages inheritance and exports. Use "our" instead of the antiquated 'use vars'. Use "use Exporter 'import'" as this form avoid exporting the whole Exporter interface from each of our package. This means we can also drop @ISA in those cases where we don't need to inherit from another package. Also we don't need the Exporter module just to inherit an interface so remove unneeded uses of Exporter. Defining the package inheritance and public interface does not depend on the rest of the package so move these statements first, even before all the other imports. Remove the ampersands from the exported functions names: they are unnecessary (and reportedly slower). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/BackEnd.pm | 7 ++----- testbot/lib/ObjectModel/BasicPropertyDescriptor.pm | 8 +++----- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 9 +++------ .../lib/ObjectModel/CGI/CollectionBlockForPage.pm | 5 +---- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 7 ++----- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 +---- testbot/lib/ObjectModel/CGI/FreeFormPage.pm | 6 +----- testbot/lib/ObjectModel/CGI/ItemPage.pm | 7 ++----- testbot/lib/ObjectModel/CGI/Page.pm | 8 ++++---- testbot/lib/ObjectModel/Collection.pm | 7 ++----- testbot/lib/ObjectModel/DBIBackEnd.pm | 12 +++++------- .../lib/ObjectModel/DetailrefPropertyDescriptor.pm | 8 ++++---- testbot/lib/ObjectModel/EnumPropertyDescriptor.pm | 8 +++----- testbot/lib/ObjectModel/Item.pm | 8 +++----- .../lib/ObjectModel/ItemrefPropertyDescriptor.pm | 9 ++++----- testbot/lib/ObjectModel/PropertyDescriptor.pm | 4 ---- testbot/lib/WineTestBot/Activity.pm | 9 +++------ testbot/lib/WineTestBot/Branches.pm | 16 +++++++--------- testbot/lib/WineTestBot/CGI/PageBase.pm | 9 +++------ testbot/lib/WineTestBot/CGI/Sessions.pm | 18 +++++++----------- testbot/lib/WineTestBot/Engine/Events.pm | 6 ++---- testbot/lib/WineTestBot/Engine/Notify.pm | 16 +++++++--------- testbot/lib/WineTestBot/Jobs.pm | 20 ++++++++------------ testbot/lib/WineTestBot/LibvirtDomain.pm | 8 +++----- testbot/lib/WineTestBot/Log.pm | 9 +++------ testbot/lib/WineTestBot/Patches.pm | 21 +++++++++------------ testbot/lib/WineTestBot/PendingPatchSets.pm | 20 ++++++++------------ testbot/lib/WineTestBot/PendingPatches.pm | 17 ++++++----------- testbot/lib/WineTestBot/RecordGroups.pm | 18 ++++++------------ testbot/lib/WineTestBot/Records.pm | 18 +++++++----------- testbot/lib/WineTestBot/Roles.pm | 16 +++++----------- testbot/lib/WineTestBot/Steps.pm | 20 ++++++++------------ testbot/lib/WineTestBot/StepsTasks.pm | 19 ++++++++----------- testbot/lib/WineTestBot/Tasks.pm | 21 ++++++++------------- testbot/lib/WineTestBot/TestAgent.pm | 17 +++++++---------- testbot/lib/WineTestBot/UserRoles.pm | 17 ++++++----------- testbot/lib/WineTestBot/Users.pm | 21 +++++++++------------ testbot/lib/WineTestBot/Utils.pm | 12 +++++------- testbot/lib/WineTestBot/VMs.pm | 20 ++++++++------------ testbot/lib/WineTestBot/WineTestBotObjects.pm | 18 +++++++----------- testbot/web/index.pl | 17 +++++++++-------- 41 files changed, 199 insertions(+), 322 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=c3737f9a96195acace9…

1 0