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

Zhiyi Zhang : comctl32/taskdialog: Add support for TDM_ENABLE_BUTTON.
by Alexandre Julliard June 14, 2018

June 14, 2018

Module: wine Branch: master Commit: 9fa19e055c469e254010b3b438a104f5d9859851 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fa19e055c469e254010b3b4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 14 16:00:57 2018 +0800 comctl32/taskdialog: Add support for TDM_ENABLE_BUTTON. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 7a09b8a..b6baffb 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -163,6 +163,26 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi return template; } +static HWND taskdialog_find_button(HWND *buttons, INT count, INT id) +{ + INT button_id; + INT i; + + for (i = 0; i < count; i++) + { + button_id = GetWindowLongW(buttons[i], GWLP_ID); + if (button_id == id) return buttons[i]; + } + + return NULL; +} + +static void taskdialog_enable_button(const struct taskdialog_info *dialog_info, INT id, BOOL enable) +{ + HWND hwnd = taskdialog_find_button(dialog_info->buttons, dialog_info->button_count, id); + if (hwnd) EnableWindow(hwnd, enable); +} + static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notification, WPARAM wparam, LPARAM lparam) { const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; @@ -525,6 +545,9 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case TDM_CLICK_BUTTON: taskdialog_on_button_click(dialog_info, LOWORD(wParam)); break; + case TDM_ENABLE_BUTTON: + taskdialog_enable_button(dialog_info, wParam, lParam); + break; case WM_INITDIALOG: dialog_info = (struct taskdialog_info *)lParam;

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for loading standard icons.
by Alexandre Julliard June 14, 2018

June 14, 2018

Module: wine Branch: master Commit: 629d9c56999ba6a4f56dc93fc919e2143e8bb62f URL: https://source.winehq.org/git/wine.git/?a=commit;h=629d9c56999ba6a4f56dc93f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 14 16:01:43 2018 +0800 comctl32/taskdialog: Add support for loading standard icons. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 14c6ccb..59a9159 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -247,6 +247,20 @@ static void taskdialog_get_label_size(struct taskdialog_info *dialog_info, HWND ReleaseDC(hwnd, hdc); } +static ULONG_PTR taskdialog_get_standard_icon(LPCWSTR icon) +{ + if (icon == TD_WARNING_ICON) + return IDI_WARNING; + else if (icon == TD_ERROR_ICON) + return IDI_ERROR; + else if (icon == TD_INFORMATION_ICON) + return IDI_INFORMATION; + else if (icon == TD_SHIELD_ICON) + return IDI_SHIELD; + else + return (ULONG_PTR)icon; +} + static void taskdialog_set_icon(struct taskdialog_info *dialog_info, INT element, HICON icon) { DWORD flags = dialog_info->taskconfig->dwFlags; @@ -259,6 +273,9 @@ static void taskdialog_set_icon(struct taskdialog_info *dialog_info, INT element else { hicon = LoadImageW(dialog_info->taskconfig->hInstance, (LPCWSTR)icon, IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE); + if (!hicon) + hicon = LoadImageW(NULL, (LPCWSTR)taskdialog_get_standard_icon((LPCWSTR)icon), IMAGE_ICON, 0, 0, + LR_SHARED | LR_DEFAULTSIZE); } if (!hicon) return;

1 0

Michael Stefaniuc : winmm/tests: Avoid and ARRAY_SIZE-like macro.
by Alexandre Julliard June 14, 2018

June 14, 2018

Module: wine Branch: master Commit: b400d4326d33d43c78b5d3563ff8196b5e45c875 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b400d4326d33d43c78b5d356… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jun 13 20:30:26 2018 +0200 winmm/tests: Avoid and ARRAY_SIZE-like macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/capture.c | 2 +- dlls/winmm/tests/wave.c | 2 +- dlls/winmm/tests/winmm_test.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index fd4005c..ba71f9c 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -398,7 +398,7 @@ static void wave_in_test_device(UINT_PTR device) HeapFree(GetProcessHeap(), 0, nameA); - for (f=0;f<NB_WIN_FORMATS;f++) { + for (f = 0; f < ARRAY_SIZE(win_formats); f++) { format.wFormatTag=WAVE_FORMAT_PCM; format.nChannels=win_formats[f][3]; format.wBitsPerSample=win_formats[f][2]; diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 8d7dfd6..b402e21 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1041,7 +1041,7 @@ static void wave_out_test_device(UINT_PTR device) CALLBACK_EVENT,&capsA,TRUE,FALSE,FALSE); } - for (f=0;f<NB_WIN_FORMATS;f++) { + for (f = 0; f < ARRAY_SIZE(win_formats); f++) { format.wFormatTag=WAVE_FORMAT_PCM; format.nChannels=win_formats[f][3]; format.wBitsPerSample=win_formats[f][2]; diff --git a/dlls/winmm/tests/winmm_test.h b/dlls/winmm/tests/winmm_test.h index 177dc2e..d5fb70a 100644 --- a/dlls/winmm/tests/winmm_test.h +++ b/dlls/winmm/tests/winmm_test.h @@ -68,7 +68,6 @@ static const unsigned int win_formats[][4] = { {WAVE_FORMAT_96M16, 96000, 16, 1}, {WAVE_FORMAT_96S16, 96000, 16, 2} }; -#define NB_WIN_FORMATS (sizeof(win_formats)/sizeof(*win_formats)) extern const char* dev_name(int); extern const char* wave_open_flags(DWORD);

1 0

Owen Rudge : wsdapi: Add critical section around notification sinks.
by Alexandre Julliard June 14, 2018

June 14, 2018

Module: wine Branch: master Commit: e4c79c13b2313db95fc00f2350fd1da49cf5d8db URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4c79c13b2313db95fc00f23… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 13 19:11:20 2018 +0100 wsdapi: Add critical section around notification sinks. 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 | 9 +++++++++ dlls/wsdapi/wsdapi_internal.h | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index 9971219..7456f90 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -97,6 +97,7 @@ static ULONG WINAPI IWSDiscoveryPublisherImpl_Release(IWSDiscoveryPublisher *ifa HeapFree(GetProcessHeap(), 0, sink); } + DeleteCriticalSection(&This->notification_sink_critical_section); HeapFree(GetProcessHeap(), 0, This); } @@ -148,7 +149,9 @@ static HRESULT WINAPI IWSDiscoveryPublisherImpl_RegisterNotificationSink(IWSDisc sink->notificationSink = pSink; IWSDiscoveryPublisherNotify_AddRef(pSink); + EnterCriticalSection(&impl->notification_sink_critical_section); list_add_tail(&impl->notificationSinks, &sink->entry); + LeaveCriticalSection(&impl->notification_sink_critical_section); if ((!impl->publisherStarted) && (!init_networking(impl))) return E_FAIL; @@ -168,6 +171,8 @@ static HRESULT WINAPI IWSDiscoveryPublisherImpl_UnRegisterNotificationSink(IWSDi return E_INVALIDARG; } + EnterCriticalSection(&impl->notification_sink_critical_section); + LIST_FOR_EACH_ENTRY(sink, &impl->notificationSinks, struct notificationSink, entry) { if (sink->notificationSink == pSink) @@ -176,10 +181,13 @@ static HRESULT WINAPI IWSDiscoveryPublisherImpl_UnRegisterNotificationSink(IWSDi list_remove(&sink->entry); HeapFree(GetProcessHeap(), 0, sink); + LeaveCriticalSection(&impl->notification_sink_critical_section); return S_OK; } } + LeaveCriticalSection(&impl->notification_sink_critical_section); + /* Notification sink is not registered */ return E_FAIL; } @@ -391,6 +399,7 @@ HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscover return ret; } + InitializeCriticalSection(&obj->notification_sink_critical_section); list_init(&obj->notificationSinks); *ppPublisher = &obj->IWSDiscoveryPublisher_iface; diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h index f88822d..3e5e163 100644 --- a/dlls/wsdapi/wsdapi_internal.h +++ b/dlls/wsdapi/wsdapi_internal.h @@ -48,6 +48,7 @@ typedef struct IWSDiscoveryPublisherImpl { IWSDXMLContext *xmlContext; DWORD addressFamily; struct list notificationSinks; + CRITICAL_SECTION notification_sink_critical_section; BOOL publisherStarted; HANDLE thread_handles[MAX_WSD_THREADS]; int num_thread_handles;

1 0

Michael Stefaniuc : winmm/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 14, 2018

June 14, 2018

Module: wine Branch: master Commit: 3f4906d19dcbcc5abaf7c7fe0417f4e6f46137ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f4906d19dcbcc5abaf7c7fe… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jun 13 20:30:27 2018 +0200 winmm/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/joystick.c | 4 ++-- dlls/winmm/tests/midi.c | 2 +- dlls/winmm/tests/mmio.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/tests/joystick.c b/dlls/winmm/tests/joystick.c index 5714001..7531bd6 100644 --- a/dlls/winmm/tests/joystick.c +++ b/dlls/winmm/tests/joystick.c @@ -139,7 +139,7 @@ static void test_api(void) /* Try some unusual period values for joySetCapture and unusual threshold values for joySetThreshold. * Windows XP allows almost all test values, Windows 8 will return error on most test values, Windows * 98 allows anything but cuts the values to their maximum supported values internally. */ - for (i = 0; i < sizeof(period) / sizeof(period[0]); i++) + for (i = 0; i < ARRAY_SIZE(period); i++) { ret = joySetCapture(window, joyid, period[i], FALSE); if (win8 && ((1 << i) & period_win8_error)) @@ -190,7 +190,7 @@ static void test_api(void) ok(ret == JOYERR_NOERROR, "Expected %d, got %d\n", JOYERR_NOERROR, ret); infoex.ex.dwSize = sizeof(infoex.ex); - for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) + for (i = 0; i < ARRAY_SIZE(flags); i++) { infoex.ex.dwFlags = flags[i]; ret = joyGetPosEx(joyid, &infoex.ex); diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index fe3cc5c..3b8bd22 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -549,7 +549,7 @@ static void CALLBACK time_stamp_callback(HMIDIOUT hmo, UINT msg, DWORD_PTR insta struct time_stamp_records *records = (struct time_stamp_records *)instance; switch (msg) { case MM_MOM_POSITIONCB: - if (records->count < sizeof(records->time_stamp)/sizeof(records->time_stamp[0])) + if (records->count < ARRAY_SIZE(records->time_stamp)) records->time_stamp[records->count] = GetTickCount(); records->count++; break; diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 48367ee..5501c31 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -606,7 +606,7 @@ static LRESULT CALLBACK mmio_test_IOProc(LPSTR lpMMIOInfo, UINT uMessage, LPARAM case MMIOM_OPEN: if (lpInfo->fccIOProc == FOURCC_DOS) lpInfo->fccIOProc = mmioFOURCC('F', 'A', 'I', 'L'); - for (i = 0; i < sizeof(lpInfo->adwInfo) / sizeof(*lpInfo->adwInfo); i++) + for (i = 0; i < ARRAY_SIZE(lpInfo->adwInfo); i++) ok(lpInfo->adwInfo[i] == 0, "[%d] Expected 0, got %u\n", i, lpInfo->adwInfo[i]); return MMSYSERR_NOERROR; case MMIOM_CLOSE:

1 0

Owen Rudge : wsdapi: Add stub for Probe message parsing, prepare notification sink message.
by Alexandre Julliard June 14, 2018

June 14, 2018

Module: wine Branch: master Commit: 023bbaa38417d715af37322c027b851e38ff15ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=023bbaa38417d715af37322c… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 13 19:11:22 2018 +0100 wsdapi: Add stub for Probe message parsing, prepare notification sink 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/network.c | 60 ++++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/soap.c | 6 +++++ dlls/wsdapi/wsdapi_internal.h | 5 ++++ 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c index e91ab76..e124a5d 100644 --- a/dlls/wsdapi/network.c +++ b/dlls/wsdapi/network.c @@ -292,6 +292,64 @@ typedef struct listener_thread_params BOOL ipv6; } listener_thread_params; +static HRESULT process_received_message(listener_thread_params *params, char *message, int message_len, + SOCKADDR_STORAGE *source_addr) +{ + IWSDUdpMessageParameters *msg_params = NULL; + IWSDUdpAddress *remote_addr = NULL; + struct notificationSink *sink; + WSD_SOAP_MESSAGE *msg = NULL; + int msg_type; + HRESULT ret; + + ret = read_message(message, message_len, &msg, &msg_type); + if (FAILED(ret)) return ret; + + switch (msg_type) + { + case MSGTYPE_PROBE: + TRACE("Received probe message\n"); + + ret = WSDCreateUdpMessageParameters(&msg_params); + + if (FAILED(ret)) + { + ERR("Unable to create IWSDUdpMessageParameters, not processing message.\n"); + goto cleanup; + } + + ret = WSDCreateUdpAddress(&remote_addr); + + if (FAILED(ret)) + { + ERR("Unable to create IWSDUdpAddress, not processing message.\n"); + goto cleanup; + } + + IWSDUdpAddress_SetSockaddr(remote_addr, source_addr); + IWSDUdpMessageParameters_SetRemoteAddress(msg_params, (IWSDAddress *)remote_addr); + + EnterCriticalSection(&params->impl->notification_sink_critical_section); + + LIST_FOR_EACH_ENTRY(sink, &params->impl->notificationSinks, struct notificationSink, entry) + { + IWSDiscoveryPublisherNotify_ProbeHandler(sink->notificationSink, msg, (IWSDMessageParameters *)msg_params); + } + + LeaveCriticalSection(&params->impl->notification_sink_critical_section); + + break; + } + +cleanup: + WSDFreeLinkedMemory(msg); + + if (remote_addr != NULL) IWSDUdpAddress_Release(remote_addr); + if (msg_params != NULL) IWSDUdpMessageParameters_Release(msg_params); + + return ret; +} + #define RECEIVE_BUFFER_SIZE 65536 static DWORD WINAPI listening_thread(LPVOID params) @@ -321,7 +379,7 @@ static DWORD WINAPI listening_thread(LPVOID params) } else { - /* TODO: Process received message */ + process_received_message(parameter, buffer, bytes_received, &source_addr); } } diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index d0fb0af..0d4a4a6 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -1080,3 +1080,9 @@ cleanup: return ret; } + +HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg, int *msg_type) +{ + /* TODO: Parse and read message */ + return E_NOTIMPL; +} diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h index 3e5e163..dc4fc4d 100644 --- a/dlls/wsdapi/wsdapi_internal.h +++ b/dlls/wsdapi/wsdapi_internal.h @@ -72,6 +72,11 @@ HRESULT send_bye_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLONG HRESULT register_namespaces(IWSDXMLContext *xml_context); +HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg, int *msg_type); + +#define MSGTYPE_UNKNOWN 0 +#define MSGTYPE_PROBE 1 + /* xml.c */ LPWSTR duplicate_string(void *parentMemoryBlock, LPCWSTR value);

1 0

Owen Rudge : wsdapi: Implement probe message parsing.
by Alexandre Julliard June 14, 2018

June 14, 2018

Module: wine Branch: master Commit: 767eeb7078bff703656635626ea5db165be23823 URL: https://source.winehq.org/git/wine.git/?a=commit;h=767eeb7078bff70365663562… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 13 19:11:28 2018 +0100 wsdapi: Implement probe message parsing. 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 | 40 +++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 4 ++-- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 34b9490..85a5fba 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -89,6 +89,7 @@ static const WCHAR sequenceIdString[] = { 'S','e','q','u','e','n','c','e','I','d static const WCHAR emptyString[] = { 0 }; static const WCHAR bodyString[] = { 'B','o','d','y', 0 }; static const WCHAR helloString[] = { 'H','e','l','l','o', 0 }; +static const WCHAR probeString[] = { 'P','r','o','b','e', 0 }; static const WCHAR byeString[] = { 'B','y','e', 0 }; static const WCHAR endpointReferenceString[] = { 'E','n','d','p','o','i','n','t','R','e','f','e','r','e','n','c','e', 0 }; static const WCHAR addressString[] = { 'A','d','d','r','e','s','s', 0 }; @@ -1346,6 +1347,19 @@ static void remove_element(WSDXML_ELEMENT *element) WSDFreeLinkedMemory(element); } +static WSDXML_TYPE *generate_type(LPCWSTR uri, void *parent) +{ + WSDXML_TYPE *type = WSDAllocateLinkedMemory(parent, sizeof(WSDXML_TYPE)); + + if (type == NULL) + return NULL; + + type->Uri = duplicate_string(parent, uri); + type->Table = NULL; + + return type; +} + HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg, int *msg_type) { WSDXML_ELEMENT *envelope = NULL, *header_element, *body_element; @@ -1491,7 +1505,31 @@ HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg /* Now figure out which message we've been sent */ if (lstrcmpW(soap_msg->Header.Action, actionProbe) == 0) { - /* TODO: Parse the Probe message */ + WSDXML_ELEMENT *probe_element; + WSD_PROBE *probe = NULL; + + probe_element = find_element(body_element, probeString, discoveryNsUri); + if (probe_element == NULL) goto cleanup; + + probe = WSDAllocateLinkedMemory(soap_msg, sizeof(WSD_PROBE)); + if (probe == NULL) goto cleanup; + + ZeroMemory(probe, sizeof(WSD_PROBE)); + + /* TODO: Check for the "types" element */ + + /* Now detach and free known headers to leave the "any" elements */ + remove_element(find_element(probe_element, typesString, discoveryNsUri)); + remove_element(find_element(probe_element, scopesString, discoveryNsUri)); + + probe->Any = (WSDXML_ELEMENT *) probe_element->FirstChild; + + if (probe->Any != NULL) + probe->Any->Node.Parent = NULL; + + soap_msg->Body = probe; + soap_msg->BodyType = generate_type(actionProbe, soap_msg); + if (soap_msg->BodyType == NULL) goto cleanup; *out_msg = soap_msg; soap_msg = NULL; /* caller will clean this up */ diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index b7496ea..94a5ebf 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -534,7 +534,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP static const WCHAR extra_info[] = {'E','x','t','r','a','I','n','f','o',0}; WSD_PROBE *probe_msg = (WSD_PROBE *) pSoap->Body; - todo_wine ok(pSoap->Body != NULL, "pSoap->Body == NULL\n"); + ok(pSoap->Body != NULL, "pSoap->Body == NULL\n"); ok(pSoap->Header.To != NULL && lstrcmpW(pSoap->Header.To, discoveryTo) == 0, "pSoap->Header.To == '%s'\n", wine_dbgstr_w(pSoap->Header.To)); ok(pSoap->Header.Action != NULL && lstrcmpW(pSoap->Header.Action, actionProbe) == 0, @@ -564,7 +564,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP static const WCHAR lager[] = {'L','a','g','e','r',0}; static const WCHAR more_info[] = {'M','o','r','e','I','n','f','o',0}; - ok(probe_msg->Types != NULL, "Probe message Types == NULL\n"); + todo_wine ok(probe_msg->Types != NULL, "Probe message Types == NULL\n"); if (probe_msg->Types != NULL) {

1 0

Owen Rudge : wsdapi: Build types list when parsing Probe message.
by Alexandre Julliard June 14, 2018

June 14, 2018

Module: wine Branch: master Commit: c6a2afc8b24c89d7b2075d8d0da7a250978f1982 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6a2afc8b24c89d7b2075d8d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 13 19:11:30 2018 +0100 wsdapi: Build types list when parsing Probe 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 | 91 ++++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 2 +- dlls/wsdapi/wsdapi_internal.h | 1 + dlls/wsdapi/xml.c | 16 ++++++++ 4 files changed, 108 insertions(+), 2 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 85a5fba..5b40cac 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -1347,6 +1347,86 @@ static void remove_element(WSDXML_ELEMENT *element) WSDFreeLinkedMemory(element); } +static WSD_NAME_LIST *build_types_list_from_string(IWSDXMLContext *context, LPCWSTR buffer, void *parent) +{ + WSD_NAME_LIST *list = NULL, *cur_list = NULL, *prev_list = NULL; + LPWSTR name_start = NULL, temp_buffer = NULL; + LPCWSTR prefix_start = buffer; + WSDXML_NAMESPACE *ns; + WSDXML_NAME *name; + int buffer_len, i; + + if (buffer == NULL) + return NULL; + + temp_buffer = duplicate_string(parent, buffer); + if (temp_buffer == NULL) goto cleanup; + + buffer_len = lstrlenW(temp_buffer); + + list = WSDAllocateLinkedMemory(parent, sizeof(WSD_NAME_LIST)); + if (list == NULL) goto cleanup; + + ZeroMemory(list, sizeof(WSD_NAME_LIST)); + prefix_start = temp_buffer; + + for (i = 0; i < buffer_len; i++) + { + if (temp_buffer[i] == ':') + { + temp_buffer[i] = 0; + name_start = &temp_buffer[i + 1]; + } + else if ((temp_buffer[i] == ' ') || (i == buffer_len - 1)) + { + WSDXML_NAMESPACE *known_ns; + + if (temp_buffer[i] == ' ') + temp_buffer[i] = 0; + + if (cur_list == NULL) + cur_list = list; + else + { + cur_list = WSDAllocateLinkedMemory(parent, sizeof(WSD_NAME_LIST)); + if (cur_list == NULL) goto cleanup; + + prev_list->Next = cur_list; + } + + name = WSDAllocateLinkedMemory(cur_list, sizeof(WSDXML_NAME)); + if (name == NULL) goto cleanup; + + ns = WSDAllocateLinkedMemory(cur_list, sizeof(WSDXML_NAMESPACE)); + if (ns == NULL) goto cleanup; + + ZeroMemory(ns, sizeof(WSDXML_NAMESPACE)); + ns->PreferredPrefix = duplicate_string(ns, prefix_start); + + known_ns = xml_context_find_namespace_by_prefix(context, ns->PreferredPrefix); + + if (known_ns != NULL) + ns->Uri = duplicate_string(ns, known_ns->Uri); + + name->Space = ns; + name->LocalName = duplicate_string(name, name_start); + + cur_list->Element = name; + prefix_start = &temp_buffer[i + 1]; + name_start = NULL; + } + } + + WSDFreeLinkedMemory(temp_buffer); + return list; + +cleanup: + WSDFreeLinkedMemory(list); + WSDFreeLinkedMemory(temp_buffer); + + return NULL; +} + static WSDXML_TYPE *generate_type(LPCWSTR uri, void *parent) { WSDXML_TYPE *type = WSDAllocateLinkedMemory(parent, sizeof(WSDXML_TYPE)); @@ -1516,7 +1596,16 @@ HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg ZeroMemory(probe, sizeof(WSD_PROBE)); - /* TODO: Check for the "types" element */ + /* Check for the "types" element */ + ret = WSDXMLGetValueFromAny(discoveryNsUri, typesString, (WSDXML_ELEMENT *) probe_element->FirstChild, &value); + + if (FAILED(ret)) + { + WARN("Unable to find Types element in received Probe message\n"); + goto cleanup; + } + + probe->Types = build_types_list_from_string(context, value, probe); /* Now detach and free known headers to leave the "any" elements */ remove_element(find_element(probe_element, typesString, discoveryNsUri)); diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 94a5ebf..84aa67d 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -564,7 +564,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP static const WCHAR lager[] = {'L','a','g','e','r',0}; static const WCHAR more_info[] = {'M','o','r','e','I','n','f','o',0}; - todo_wine ok(probe_msg->Types != NULL, "Probe message Types == NULL\n"); + ok(probe_msg->Types != NULL, "Probe message Types == NULL\n"); if (probe_msg->Types != NULL) { diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h index dc4fc4d..7dd08f9 100644 --- a/dlls/wsdapi/wsdapi_internal.h +++ b/dlls/wsdapi/wsdapi_internal.h @@ -81,5 +81,6 @@ HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg LPWSTR duplicate_string(void *parentMemoryBlock, LPCWSTR value); WSDXML_NAME *duplicate_name(void *parentMemoryBlock, WSDXML_NAME *name); +WSDXML_NAMESPACE *xml_context_find_namespace_by_prefix(IWSDXMLContext *context, LPCWSTR prefix); #endif diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 968b217..98bdec6 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -672,3 +672,19 @@ HRESULT WINAPI WSDXMLCreateContext(IWSDXMLContext **ppContext) return S_OK; } + +WSDXML_NAMESPACE *xml_context_find_namespace_by_prefix(IWSDXMLContext *context, LPCWSTR prefix) +{ + IWSDXMLContextImpl *impl = impl_from_IWSDXMLContext(context); + struct xmlNamespace *ns; + + if (prefix == NULL) return NULL; + + LIST_FOR_EACH_ENTRY(ns, impl->namespaces, struct xmlNamespace, entry) + { + if (lstrcmpW(ns->namespace->PreferredPrefix, prefix) == 0) + return ns->namespace; + } + + return NULL; +}

1 0

Alexandre Julliard : winedbg: Fix some compiler warnings.
by Alexandre Julliard June 14, 2018

June 14, 2018

Module: wine Branch: master Commit: 2fb792bd7c11b003f89c8d4740f45cbdb65db4df URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fb792bd7c11b003f89c8d47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 14 10:59:42 2018 +0200 winedbg: Fix some compiler warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 45 +++++++++++++++++++++-------------------- programs/winedbg/be_arm64.c | 49 +++++++++++++++++++++++---------------------- programs/winedbg/be_ppc.c | 24 +++++++++++----------- programs/winedbg/stack.c | 2 +- 4 files changed, 61 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2fb792bd7c11b003f89c…

1 0

Alexandre Julliard : winex11: Fix exposing partially off-screen windows.
by Alexandre Julliard June 14, 2018

June 14, 2018

Module: wine Branch: master Commit: 3a728361368cf810b9c73f4874cf90da41f881b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a728361368cf810b9c73f48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 14 13:19:50 2018 +0200 winex11: Fix exposing partially off-screen windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/bitblt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 165633c..0343d96 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -2092,11 +2092,13 @@ HRGN expose_surface( struct window_surface *window_surface, const RECT *rect ) { struct x11drv_window_surface *surface = get_x11_surface( window_surface ); HRGN region = 0; + RECT rc = *rect; if (window_surface->funcs != &x11drv_surface_funcs) return 0; /* we may get the null surface */ window_surface->funcs->lock( window_surface ); - add_bounds_rect( &surface->bounds, rect ); + OffsetRect( &rc, -window_surface->rect.left, -window_surface->rect.top ); + add_bounds_rect( &surface->bounds, &rc ); if (surface->region) { region = CreateRectRgnIndirect( rect );

1 0