April 2016 - Wine-commits - list.winehq.org

Piotr Caban : msxml3: Reimplement node_get_text helper so it uses information about ignorred white space nodes.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: d175f099d040729c1e677022c74c4df8bde3dcae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d175f099d040729c1e677022c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:41:22 2015 +0100 msxml3: Reimplement node_get_text helper so it uses information about ignorred white space nodes. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 900fe6afa6903a3ace29a60dc97e010cd8cfaadd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/node.c | 47 +++++++++++++++++++++++++++++++++++++++------- dlls/msxml3/tests/domdoc.c | 4 ++-- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 8914e05..17e3838 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -742,7 +742,7 @@ static inline xmlChar* trim_whitespace(xmlChar* str) return ret; } -static xmlChar* do_get_text(xmlNodePtr node) +static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, BOOL *trail_ig_ws) { xmlNodePtr child; xmlChar* str; @@ -751,20 +751,42 @@ static xmlChar* do_get_text(xmlNodePtr node) if (!node->children) { str = xmlNodeGetContent(node); + *trail_ig_ws = *(DWORD*)&node->_private & NODE_PRIV_CHILD_IGNORABLE_WS; } else { - xmlElementType prev_type = XML_TEXT_NODE; + BOOL ig_ws = FALSE; xmlChar* tmp; str = xmlStrdup(BAD_CAST ""); + + if (node->type != XML_DOCUMENT_NODE) + ig_ws = *(DWORD*)&node->_private & NODE_PRIV_CHILD_IGNORABLE_WS; + *trail_ig_ws = FALSE; + for (child = node->children; child != NULL; child = child->next) { switch (child->type) { case XML_ELEMENT_NODE: - tmp = do_get_text(child); + tmp = do_get_text(child, FALSE, trail_ig_ws); break; case XML_TEXT_NODE: + tmp = xmlNodeGetContent(child); + if (!preserving && tmp[0]) + { + xmlChar *beg; + + for (beg = tmp; *beg; beg++) + if (!isspace(*beg)) break; + + if (!*beg) + { + ig_ws = TRUE; + xmlFree(tmp); + tmp = NULL; + } + break; + } case XML_CDATA_SECTION_NODE: case XML_ENTITY_REF_NODE: case XML_ENTITY_NODE: @@ -779,14 +801,24 @@ static xmlChar* do_get_text(xmlNodePtr node) { if (*tmp) { - if (prev_type == XML_ELEMENT_NODE && child->type == XML_ELEMENT_NODE) + if (ig_ws && str[0]) str = xmlStrcat(str, BAD_CAST " "); str = xmlStrcat(str, tmp); - prev_type = child->type; + ig_ws = FALSE; } xmlFree(tmp); } + + if (!ig_ws) + { + ig_ws = *(DWORD*)&child->_private & NODE_PRIV_TRAILING_IGNORABLE_WS; + } + if (!ig_ws) + ig_ws = *trail_ig_ws; + *trail_ig_ws = FALSE; } + + *trail_ig_ws = ig_ws; } switch (node->type) @@ -797,7 +829,7 @@ static xmlChar* do_get_text(xmlNodePtr node) case XML_ENTITY_NODE: case XML_DOCUMENT_NODE: case XML_DOCUMENT_FRAG_NODE: - if (!preserving) + if (trim && !preserving) str = trim_whitespace(str); break; default: @@ -811,10 +843,11 @@ HRESULT node_get_text(const xmlnode *This, BSTR *text) { BSTR str = NULL; xmlChar *content; + BOOL tmp; if (!text) return E_INVALIDARG; - content = do_get_text(This->node); + content = do_get_text(This->node, TRUE, &tmp); if (content) { str = bstr_from_xmlChar(content); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 00a24b6..4201bac 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4174,7 +4174,7 @@ static inline void _check_ws_ignored(int line, const char *ver, IXMLDOMDocument2 helper_ole_check_ver(IXMLDOMNode_get_text(node1, &bstr)); if (str) { - todo_wine helper_expect_bstr_and_release(bstr, str); + helper_expect_bstr_and_release(bstr, str); } else { @@ -4217,7 +4217,7 @@ static inline void _check_ws_preserved(int line, const char *ver, IXMLDOMDocumen } else { - todo_wine helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); + helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); } IXMLDOMNode_Release(node1);

1 0

Piotr Caban : msxml3: Add support for CDATA nodes in node_get_text.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: e33ea1dbc4f31e1bda1019437464079746543df2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e33ea1dbc4f31e1bda1019437… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:41:26 2015 +0100 msxml3: Add support for CDATA nodes in node_get_text. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 028d5e5179807b7be8abfb79a3877eeed58c5f3c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/node.c | 77 +++++++++++++++++++++++++++------------------- dlls/msxml3/tests/domdoc.c | 4 +-- 2 files changed, 48 insertions(+), 33 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 17e3838..72fa92f 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -723,31 +723,15 @@ HRESULT node_clone(xmlnode *This, VARIANT_BOOL deep, IXMLDOMNode **cloneNode) return S_OK; } -static inline xmlChar* trim_whitespace(xmlChar* str) -{ - xmlChar* ret = str; - int len; - - if (!str) - return NULL; - - while (*ret && isspace(*ret)) - ++ret; - len = xmlStrlen(ret); - if (len) - while (isspace(ret[len-1])) --len; - - ret = xmlStrndup(ret, len); - xmlFree(str); - return ret; -} - -static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, BOOL *trail_ig_ws) +static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, DWORD *first, DWORD *last, BOOL *trail_ig_ws) { xmlNodePtr child; xmlChar* str; BOOL preserving = is_preserving_whitespace(node); + *first = -1; + *last = 0; + if (!node->children) { str = xmlNodeGetContent(node); @@ -757,6 +741,7 @@ static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, BOOL *trail_ig_ws) { BOOL ig_ws = FALSE; xmlChar* tmp; + DWORD pos = 0; str = xmlStrdup(BAD_CAST ""); if (node->type != XML_DOCUMENT_NODE) @@ -767,9 +752,17 @@ static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, BOOL *trail_ig_ws) { switch (child->type) { - case XML_ELEMENT_NODE: - tmp = do_get_text(child, FALSE, trail_ig_ws); + case XML_ELEMENT_NODE: { + DWORD node_first, node_last; + + tmp = do_get_text(child, FALSE, &node_first, &node_last, trail_ig_ws); + + if (node_first!=-1 && pos+node_first<*first) + *first = pos+node_first; + if (node_last && pos+node_last>*last) + *last = pos+node_last; break; + } case XML_TEXT_NODE: tmp = xmlNodeGetContent(child); if (!preserving && tmp[0]) @@ -797,17 +790,22 @@ static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, BOOL *trail_ig_ws) break; } - if (tmp) + if ((tmp && *tmp) || child->type==XML_CDATA_SECTION_NODE) { - if (*tmp) + if (ig_ws && str[0]) { - if (ig_ws && str[0]) - str = xmlStrcat(str, BAD_CAST " "); - str = xmlStrcat(str, tmp); - ig_ws = FALSE; + str = xmlStrcat(str, BAD_CAST " "); + pos++; } - xmlFree(tmp); + if (tmp && *tmp) str = xmlStrcat(str, tmp); + if (child->type==XML_CDATA_SECTION_NODE && pos<*first) + *first = pos; + if (tmp && *tmp) pos += xmlStrlen(tmp); + if (child->type==XML_CDATA_SECTION_NODE && pos>*last) + *last = pos; + ig_ws = FALSE; } + if (tmp) xmlFree(tmp); if (!ig_ws) { @@ -830,7 +828,23 @@ static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, BOOL *trail_ig_ws) case XML_DOCUMENT_NODE: case XML_DOCUMENT_FRAG_NODE: if (trim && !preserving) - str = trim_whitespace(str); + { + xmlChar* ret = str; + int len; + + if (!str) + break; + + for (ret = str; *ret && isspace(*ret) && (*first)--; ret++) + if (*last) (*last)--; + for (len = xmlStrlen(ret)-1; len >= 0 && len >= *last; len--) + if(!isspace(ret[len])) break; + + ret = xmlStrndup(ret, len+1); + xmlFree(str); + str = ret; + break; + } break; default: break; @@ -843,11 +857,12 @@ HRESULT node_get_text(const xmlnode *This, BSTR *text) { BSTR str = NULL; xmlChar *content; + DWORD first, last; BOOL tmp; if (!text) return E_INVALIDARG; - content = do_get_text(This->node, TRUE, &tmp); + content = do_get_text(This->node, TRUE, &first, &last, &tmp); if (content) { str = bstr_from_xmlChar(content); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4201bac..1926f50 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4178,7 +4178,7 @@ static inline void _check_ws_ignored(int line, const char *ver, IXMLDOMDocument2 } else { - todo_wine helper_expect_bstr_and_release(bstr, " This is a description."); + helper_expect_bstr_and_release(bstr, " This is a description."); } IXMLDOMNode_Release(node1); @@ -4213,7 +4213,7 @@ static inline void _check_ws_preserved(int line, const char *ver, IXMLDOMDocumen helper_ole_check_ver(IXMLDOMNode_get_text(node1, &bstr)); if (str) { - todo_wine helper_expect_bstr_and_release(bstr, str); + helper_expect_bstr_and_release(bstr, str); } else {

1 0

Nikolay Sivov : ctl3d32: Claim success in Ctl3dRegister().
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 595dee3020081525b81cc4070bdbb77a1f60c30d URL: http://source.winehq.org/git/wine.git/?a=commit;h=595dee3020081525b81cc4070… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 24 13:33:25 2016 +0300 ctl3d32: Claim success in Ctl3dRegister(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 28afe7fc04e1a069163c3c56f28a61df1a3b068b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ctl3d32/ctl3d32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ctl3d32/ctl3d32.c b/dlls/ctl3d32/ctl3d32.c index cbcb93d..6d3ceb0 100644 --- a/dlls/ctl3d32/ctl3d32.c +++ b/dlls/ctl3d32/ctl3d32.c @@ -75,7 +75,7 @@ BOOL WINAPI Ctl3dIsAutoSubclass(void) BOOL WINAPI Ctl3dRegister(HINSTANCE hInst) { - return FALSE; + return TRUE; } BOOL WINAPI Ctl3dSubclassCtl(HWND hwnd)

1 0

Christopher Thielen : user32: Ensure that button responds only to changes in WM_CAPTURECHANGED handler.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 456aa03add985f8e1ac8dfbe2ed819e39cca0656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=456aa03add985f8e1ac8dfbe2… Author: Christopher Thielen <cthielen(a)gmail.com> Date: Sun Jan 31 20:31:02 2016 -0800 user32: Ensure that button responds only to changes in WM_CAPTURECHANGED handler. Signed-off-by: Christopher Thielen <cthielen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 85faafc0e3f3861e7c03d4f7dc842bd7d4cf6ae9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/button.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 890d154..9c52147 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -364,6 +364,7 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, case WM_CAPTURECHANGED: TRACE("WM_CAPTURECHANGED %p\n", hWnd); + if (hWnd == (HWND)lParam) break; state = get_button_state( hWnd ); if (state & BUTTON_BTNPRESSED) {

1 0

Christopher Thielen : comctl32: Ensure that trackbar respond only to changes in WM_CAPTURECHANGED handler.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 12ed4de8c9032ab9246ccd8884c08d79067f1a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12ed4de8c9032ab9246ccd888… Author: Christopher Thielen <cthielen(a)gmail.com> Date: Sun Jan 31 20:26:47 2016 -0800 comctl32: Ensure that trackbar respond only to changes in WM_CAPTURECHANGED handler. Signed-off-by: Christopher Thielen <cthielen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0bea2f73d37481546d19bd9f380d9390c3eb9ddb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/trackbar.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 87d955c..12c3e9d 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1979,6 +1979,7 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_CAPTURECHANGED: + if (hwnd == (HWND)lParam) return 0; return TRACKBAR_CaptureChanged (infoPtr); case WM_CREATE:

1 0

Christopher Thielen : comctl32: Ensure that toolbar respond only to changes in WM_CAPTURECHANGED handler.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 9a80865b5fab0fe8c5aaafc3eba7833893f9d5e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a80865b5fab0fe8c5aaafc3e… Author: Christopher Thielen <cthielen(a)gmail.com> Date: Sun Jan 31 20:26:47 2016 -0800 comctl32: Ensure that toolbar respond only to changes in WM_CAPTURECHANGED handler. Signed-off-by: Christopher Thielen <cthielen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ff063d9e250310d3cf8d27371040609b97c24f6c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/toolbar.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 890c18e..ae6f21e 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6807,6 +6807,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_MouseLeave (infoPtr); case WM_CAPTURECHANGED: + if (hwnd == (HWND)lParam) return 0; return TOOLBAR_CaptureChanged(infoPtr); case WM_NCACTIVATE:

1 0

Christopher Thielen : user32: A window may be notified with WM_CAPTURECHANGED about itself if SetCapture () is called twice.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: a73afbcb10b32fcdb9733b552c6cc1f334ba96ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73afbcb10b32fcdb9733b552… Author: Christopher Thielen <cthielen(a)gmail.com> Date: Sun Jan 31 20:32:51 2016 -0800 user32: A window may be notified with WM_CAPTURECHANGED about itself if SetCapture() is called twice. Signed-off-by: Christopher Thielen <cthielen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9bb87cc71c95f45cd6111b28b687bd753380a4c7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/input.c | 2 +- dlls/user32/tests/msg.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 40e35a9..63fae67 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -108,7 +108,7 @@ BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) { USER_Driver->pSetCapture( hwnd, gui_flags ); - if (previous && previous != hwnd) + if (previous) SendMessageW( previous, WM_CAPTURECHANGED, 0, (LPARAM)hwnd ); if (prev_ret) *prev_ret = previous; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b90f8d0..969b1af 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14906,6 +14906,33 @@ else flush_sequence(); } +static const struct message DoubleSetCaptureSeq[] = +{ + { WM_CAPTURECHANGED, sent }, + { 0 } +}; + +static void test_DoubleSetCapture(void) +{ + HWND hwnd; + + hwnd = CreateWindowExA(0, "TestWindowClass", "Test DoubleSetCapture", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (hwnd != 0, "Failed to create overlapped window\n"); + + ShowWindow( hwnd, SW_SHOW ); + UpdateWindow( hwnd ); + flush_events(); + flush_sequence(); + + SetCapture( hwnd ); + SetCapture( hwnd ); + ok_sequence(DoubleSetCaptureSeq, "SetCapture( hwnd ) twice", FALSE); + + DestroyWindow(hwnd); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -15045,6 +15072,7 @@ START_TEST(msg) test_layered_window(); test_TrackPopupMenu(); test_TrackPopupMenuEmpty(); + test_DoubleSetCapture(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */

1 0

Alistair Leslie-Hughes : olepro32: Add typelib resource.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 39f843e28f6929a0cadf2e3a26ef78ba1aaed0df URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f843e28f6929a0cadf2e3a2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 27 20:15:21 2016 +1100 olepro32: Add typelib resource. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 25aa26e81537f904f0c2c3df7bbedc3d70128616) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/olepro32/Makefile.in | 2 + dlls/olepro32/olepro.idl | 270 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 274 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39f843e28f6929a0cadf2…

1 0

Michael Müller : user32: Preserve beginning of extra data for MDI windows.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 59055be4562a15df4f898b49285c2a31acc10123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59055be4562a15df4f898b492… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Feb 26 07:24:51 2016 +0100 user32: Preserve beginning of extra data for MDI windows. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3c888a74c5c5811c46f09fc9a598fad722e9727b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/mdi.c | 1 + dlls/user32/tests/msg.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index b5a0473..b360528 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -127,6 +127,7 @@ typedef struct * states it must keep coherency with USER32 on its own. This is true for * Windows as well. */ + LONG reserved; UINT nActiveChildren; HWND hwndChildMaximized; HWND hwndActiveChild; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 969b1af..58e1437 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3377,6 +3377,7 @@ static void test_mdi_messages(void) BOOL zoomed; RECT rc; HMENU hMenu = CreateMenu(); + LONG val; if (!mdi_RegisterWindowClasses()) assert(0); @@ -3405,8 +3406,9 @@ static void test_mdi_messages(void) rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, mdi_frame, 0, GetModuleHandleA(0), &client_cs); assert(mdi_client); - ok_sequence(WmCreateMDIclientSeq, "Create visible MDI client window", FALSE); + SetWindowLongA(mdi_client, 0, 0xdeadbeef); + ok_sequence(WmCreateMDIclientSeq, "Create visible MDI client window", FALSE); ok(GetActiveWindow() == mdi_frame, "wrong active window %p\n", GetActiveWindow()); ok(GetFocus() == mdi_frame, "input focus should be on MDI frame not on %p\n", GetFocus()); @@ -3864,6 +3866,8 @@ static void test_mdi_messages(void) SetFocus(0); flush_sequence(); + val = GetWindowLongA(mdi_client, 0); + ok(val == 0xdeadbeef || broken(val == 0) /* >= Win Vista */, "Expected 0xdeadbeef, got 0x%x\n", val); DestroyWindow(mdi_client); ok_sequence(WmDestroyMDIclientSeq, "Destroy MDI client window", FALSE);

1 0

Andrew Eikum : mciqtz: Implement MCI_RESUME.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 7d02fd778133370e6a1b1f8a225d0f62219c6ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d02fd778133370e6a1b1f8a2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 19 10:48:52 2016 -0600 mciqtz: Implement MCI_RESUME. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 924c97fe9070c62652c0b19d71469a07a6dd7a60) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index d018a54..567792e 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -583,6 +583,29 @@ static DWORD MCIQTZ_mciPause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP } /*************************************************************************** + * MCIQTZ_mciResume [internal] + */ +static DWORD MCIQTZ_mciResume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + HRESULT hr; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + hr = IMediaControl_Run(wma->pmctrl); + if (FAILED(hr)) { + TRACE("Cannot run filtergraph (hr = %x)\n", hr); + return MCIERR_INTERNAL; + } + + return 0; +} + +/*************************************************************************** * MCIQTZ_mciGetDevCaps [internal] */ static DWORD MCIQTZ_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) @@ -1078,6 +1101,9 @@ static DWORD CALLBACK MCIQTZ_taskThread(LPVOID arg) case MCI_PAUSE: task->res = MCIQTZ_mciPause(task->devid, task->flags, (LPMCI_GENERIC_PARMS)task->parms); break; + case MCI_RESUME: + task->res = MCIQTZ_mciResume(task->devid, task->flags, (LPMCI_GENERIC_PARMS)task->parms); + break; case MCI_GETDEVCAPS: task->res = MCIQTZ_mciGetDevCaps(task->devid, task->flags, (LPMCI_GETDEVCAPS_PARMS)task->parms); break; @@ -1158,6 +1184,7 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_CLOSE_DRIVER: case MCI_STOP: case MCI_PAUSE: + case MCI_RESUME: return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); /* Digital Video specific */ case MCI_SETAUDIO: @@ -1167,7 +1194,6 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); case MCI_PUT: case MCI_RECORD: - case MCI_RESUME: case MCI_INFO: case MCI_LOAD: case MCI_SAVE:

1 0