wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

Owen Rudge : wsdapi: Create Body and Hello elements in Hello message.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 86515b390eace818af0897dce0fd943639c66801 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86515b390eace818af0897dc… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Apr 17 23:04:49 2018 +0100 wsdapi: Create Body and Hello elements in Hello message. 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 | 39 ++++++++++++++++++++++++++++++++++----- dlls/wsdapi/tests/discovery.c | 6 ++++-- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 96efefd..a2a4223 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -73,6 +73,8 @@ static const WCHAR instanceIdString[] = { 'I','n','s','t','a','n','c','e','I','d static const WCHAR messageNumberString[] = { 'M','e','s','s','a','g','e','N','u','m','b','e','r', 0 }; static const WCHAR sequenceIdString[] = { 'S','e','q','u','e','n','c','e','I','d', 0 }; static const WCHAR emptyString[] = { 0 }; +static const WCHAR bodyString[] = { 'B','o','d','y', 0 }; +static const WCHAR helloString[] = { 'H','e','l','l','o', 0 }; struct discovered_namespace { @@ -732,6 +734,10 @@ static HRESULT create_soap_envelope(IWSDXMLContext *xml_context, WSD_SOAP_HEADER ret = write_xml_element(header_element, writer); if (FAILED(ret)) goto cleanup; + /* Write the body */ + ret = write_xml_element(body_element, writer); + if (FAILED(ret)) goto cleanup; + ret = WsWriteEndElement(writer, NULL); if (FAILED(ret)) goto cleanup; @@ -774,7 +780,7 @@ static HRESULT write_and_send_message(IWSDiscoveryPublisherImpl *impl, WSD_SOAP_ char *full_xml; HRESULT ret; - ret = create_soap_envelope(impl->xmlContext, header, NULL, &heap, &xml, &xml_length, discovered_namespaces); + ret = create_soap_envelope(impl->xmlContext, header, body_element, &heap, &xml, &xml_length, discovered_namespaces); if (ret != S_OK) return ret; /* Prefix the XML header */ @@ -812,7 +818,9 @@ 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) { + WSDXML_ELEMENT *body_element = NULL, *hello_element; struct list *discoveredNamespaces = NULL; + WSDXML_NAME *body_name = NULL; WSD_SOAP_HEADER soapHeader; WSD_APP_SEQUENCE sequence; WCHAR message_id[64]; @@ -822,21 +830,42 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON sequence.MessageNumber = msg_num; sequence.SequenceId = session_id; - if (!create_guid(message_id)) goto cleanup; + if (!create_guid(message_id)) goto failed; discoveredNamespaces = WSDAllocateLinkedMemory(NULL, sizeof(struct list)); - if (!discoveredNamespaces) goto cleanup; + if (!discoveredNamespaces) goto failed; list_init(discoveredNamespaces); populate_soap_header(&soapHeader, discoveryTo, actionHello, message_id, &sequence, hdr_any); - /* TODO: Populate message body */ + ret = IWSDXMLContext_AddNameToNamespace(impl->xmlContext, envelopeNsUri, bodyString, &body_name); + if (FAILED(ret)) goto cleanup; + + /* <soap:Body>, <wsd:Hello> */ + ret = WSDXMLBuildAnyForSingleElement(body_name, NULL, &body_element); + if (FAILED(ret)) goto cleanup; + + ret = add_child_element(impl->xmlContext, body_element, discoveryNsUri, helloString, NULL, &hello_element); + if (FAILED(ret)) goto cleanup; + + /* Write any body elements */ + if (any != NULL) + { + ret = duplicate_element(hello_element, any, discoveredNamespaces); + if (FAILED(ret)) goto cleanup; + } /* Write and send the message */ - ret = write_and_send_message(impl, &soapHeader, NULL, discoveredNamespaces, NULL, APP_MAX_DELAY); + ret = write_and_send_message(impl, &soapHeader, body_element, discoveredNamespaces, NULL, APP_MAX_DELAY); + goto cleanup; + +failed: + ret = E_OUTOFMEMORY; cleanup: + WSDFreeLinkedMemory(body_name); + WSDFreeLinkedMemory(body_element); WSDFreeLinkedMemory(discoveredNamespaces); return ret; diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 20d3442..06bde89 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -507,7 +507,7 @@ static void Publish_tests(void) messageStorage *msgStorage; 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; + BOOL metadata_version_seen = FALSE, any_header_seen = FALSE, wine_ns_seen = FALSE, body_hello_seen = FALSE; int ret, i; HRESULT rc; ULONG ref; @@ -629,8 +629,9 @@ static void Publish_tests(void) metadata_version_seen = (strstr(msg, "<wsd:MetadataVersion>1</wsd:MetadataVersion>") != NULL); 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); messageOK = hello_message_seen && endpoint_reference_seen && app_sequence_seen && metadata_version_seen && - any_header_seen && wine_ns_seen; + any_header_seen && wine_ns_seen && body_hello_seen; if (messageOK) break; } @@ -649,6 +650,7 @@ static void Publish_tests(void) todo_wine ok(messageOK == TRUE, "Hello message metadata not received\n"); 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"); after_publish_test:

1 0

Owen Rudge : wsdapi: Register default namespaces when creating publisher.
by Alexandre Julliard 19 Apr '18

19 Apr '18

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

Owen Rudge : wsdapi: Ensure text node parent is NULL before calling WSDXMLAddChild.
by Alexandre Julliard 19 Apr '18

19 Apr '18

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

Alexandre Julliard : user32: Implement LogicalToPhysicalPointForPerMonitorDPI() and PhysicalToLogicalPointForPerMonitorDPI().
by Alexandre Julliard 19 Apr '18

19 Apr '18

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

Alexandre Julliard : user32: Implement GetDpiForWindow().
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: fb563978d815f74786bf25baa0bf4c4362595dd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb563978d815f74786bf25ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 19 10:47:18 2018 +0200 user32: Implement GetDpiForWindow(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 8c5dd0a..715bf59 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3313,8 +3313,21 @@ BOOL WINAPI GetDpiForMonitorInternal( HMONITOR monitor, UINT type, UINT *x, UINT */ UINT WINAPI GetDpiForWindow( HWND hwnd ) { - FIXME( "stub: %p\n", hwnd ); - return GetDpiForSystem(); + UINT dpi; + + switch (GetAwarenessFromDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd ))) + { + case DPI_AWARENESS_UNAWARE: + return USER_DEFAULT_SCREEN_DPI; + case DPI_AWARENESS_SYSTEM_AWARE: + return get_system_dpi(); + case DPI_AWARENESS_PER_MONITOR_AWARE: + GetDpiForMonitorInternal( MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ), + 0 /* MDT_EFFECTIVE_DPI */, &dpi, NULL ); + return dpi; + default: + return 0; + } } /**********************************************************************

1 0

Alexandre Julliard : user32: Add partial stub for GetDpiForMonitorInternal ().
by Alexandre Julliard 19 Apr '18

19 Apr '18

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

Roderick Colenbrander : ntdll: Read correct sysfs entry for core information.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: e502dce411439284db6f043e37bc0f4e51e50f43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e502dce411439284db6f043e… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Apr 18 22:30:27 2018 -0700 ntdll: Read correct sysfs entry for core information. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8995c36..c3f5df3 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1497,7 +1497,7 @@ static inline BOOL logical_proc_info_add_group(SYSTEM_LOGICAL_PROCESSOR_INFORMAT static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **dataex, DWORD *max_len) { - static const char core_info[] = "/sys/devices/system/cpu/cpu%u/%s"; + static const char core_info[] = "/sys/devices/system/cpu/cpu%u/topology/%s"; static const char cache_info[] = "/sys/devices/system/cpu/cpu%u/cache/index%u/%s"; static const char numa_info[] = "/sys/devices/system/node/node%u/cpumap";

1 0

Francois Gouget : dmime: Add a trailing '\n' to a FIXME().
by Alexandre Julliard 19 Apr '18

19 Apr '18

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

Alexandre Julliard : testbot: Fix invalid package import.
by Alexandre Julliard 19 Apr '18

19 Apr '18

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 19 Apr '18

19 Apr '18

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

← Newer
1
...
20
21
22
23
24
25
26
...
55
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 April 2018