December 2015 - Wine-Commits

André Hentschel : configure: Detect MinGW-w64 Clang cross toolchain.
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: 39b7c0695db13904ef28bfe687335832a217be84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b7c0695db13904ef28bfe68… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 30 14:28:18 2015 +0100 configure: Detect MinGW-w64 Clang cross toolchain. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 6 ++++-- configure | 7 +++++-- configure.ac | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 92bd39f..0769077 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -178,10 +178,12 @@ AC_DEFUN([WINE_CHECK_MINGW_PROG], i[[3456789]]86*) ac_prefix_list="m4_foreach([ac_wine_prefix],[w64-mingw32, pc-mingw32, mingw32msvc, mingw32], m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-gcc ])) - mingw32-gcc" ;; + m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-w64-mingw32-clang ]) + mingw32-gcc" ;; x86_64) ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, w64-mingw32, mingw32msvc], - m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-ac_wine_prefix-gcc ]))" ;; + m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-ac_wine_prefix-gcc ])) + m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-w64-mingw32-clang ])" ;; *) ac_prefix_list="" ;; esac diff --git a/configure b/configure index a4c174a..06e3b4a 100755 --- a/configure +++ b/configure @@ -8766,9 +8766,11 @@ then case "$host_cpu" in i[3456789]86*) ac_prefix_list="i686-w64-mingw32-gcc i586-w64-mingw32-gcc i486-w64-mingw32-gcc i386-w64-mingw32-gcc i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc - mingw32-gcc" ;; + i686-w64-mingw32-clang i586-w64-mingw32-clang i486-w64-mingw32-clang i386-w64-mingw32-clang + mingw32-gcc" ;; x86_64) - ac_prefix_list="x86_64-pc-mingw32-gcc amd64-pc-mingw32-gcc x86_64-w64-mingw32-gcc amd64-w64-mingw32-gcc x86_64-mingw32msvc-gcc amd64-mingw32msvc-gcc " ;; + ac_prefix_list="x86_64-pc-mingw32-gcc amd64-pc-mingw32-gcc x86_64-w64-mingw32-gcc amd64-w64-mingw32-gcc x86_64-mingw32msvc-gcc amd64-mingw32msvc-gcc + x86_64-w64-mingw32-clang amd64-w64-mingw32-clang " ;; *) ac_prefix_list="" ;; esac @@ -8841,6 +8843,7 @@ $as_echo "yes" >&6; } do case "$1" in *-gcc) CROSSTARGET=`expr "$1" : '$.*$-gcc'` ;; + *-clang) CROSSTARGET=`expr "$1" : '$.*$-clang'` ;; esac shift done diff --git a/configure.ac b/configure.ac index 7792f1c..d47f7e9 100644 --- a/configure.ac +++ b/configure.ac @@ -958,6 +958,7 @@ then do case "$1" in *-gcc) CROSSTARGET=`expr "$1" : '$.*$-gcc'` ;; + *-clang) CROSSTARGET=`expr "$1" : '$.*$-clang'` ;; esac shift done],

1 0

André Hentschel : configure: Get rid of the prog parameter in WINE_CHECK_MINGW_PROG.
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: 8ea38973dc43e018a61c38d66d0196535f5f729f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea38973dc43e018a61c38d66… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 30 14:27:52 2015 +0100 configure: Get rid of the prog parameter in WINE_CHECK_MINGW_PROG. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 10 +++++----- configure.ac | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 1cd7d1d..92bd39f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -171,21 +171,21 @@ LIBS="$ac_wine_check_funcs_save_LIBS"]) dnl **** Check for a mingw program, trying the various mingw prefixes **** dnl -dnl Usage: WINE_CHECK_MINGW_PROG(variable,prog,[value-if-not-found],[path]) +dnl Usage: WINE_CHECK_MINGW_PROG(variable,[value-if-not-found],[path]) dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], [case "$host_cpu" in i[[3456789]]86*) ac_prefix_list="m4_foreach([ac_wine_prefix],[w64-mingw32, pc-mingw32, mingw32msvc, mingw32], - m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-$2 ])) - mingw32-$2" ;; + m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-gcc ])) + mingw32-gcc" ;; x86_64) ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, w64-mingw32, mingw32msvc], - m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-ac_wine_prefix-$2 ]))" ;; + m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-ac_wine_prefix-gcc ]))" ;; *) ac_prefix_list="" ;; esac -AC_CHECK_PROGS([$1],[$ac_prefix_list],[$3],[$4])]) +AC_CHECK_PROGS([$1],[$ac_prefix_list],[$2],[$3])]) dnl **** Define helper functions for creating config.status files **** diff --git a/configure.ac b/configure.ac index c4184cf..7792f1c 100644 --- a/configure.ac +++ b/configure.ac @@ -944,7 +944,7 @@ dnl Check for cross compiler to build test programs AC_SUBST(CROSSTARGET,"") if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dll" then - WINE_CHECK_MINGW_PROG(CROSSCC,gcc,false) + WINE_CHECK_MINGW_PROG(CROSSCC,false) if test "$CROSSCC" != "false" then ac_save_CC="$CC"

1 0

Nikolay Sivov : msxml3: Add missing break for text node case (Valgrind).
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: e0737207e71fdabd2873422388147b7c072036a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0737207e71fdabd287342238… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 30 14:52:15 2015 +0300 msxml3: Add missing break for text node case (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 72fa92f..0bc40ff 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -778,8 +778,8 @@ static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, DWORD *first, DWORD *las xmlFree(tmp); tmp = NULL; } - break; } + break; case XML_CDATA_SECTION_NODE: case XML_ENTITY_REF_NODE: case XML_ENTITY_NODE:

1 0

Qian Hong : user32: Properly handle WM_DEVICECHANGE in is_pointer_message( ).
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: 43197e6641591c4b2955f086df7e880fbdb2d7ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=43197e6641591c4b2955f086d… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed Dec 30 17:13:49 2015 +0800 user32: Properly handle WM_DEVICECHANGE in is_pointer_message(). Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 15 ++++++++------- dlls/user32/tests/msg.c | 12 +++++------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 96e7f2e..ba3f4c6 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -422,9 +422,10 @@ static const unsigned int message_unicode_flags[] = }; /* check whether a given message type includes pointers */ -static inline BOOL is_pointer_message( UINT message ) +static inline BOOL is_pointer_message( UINT message, WPARAM wparam ) { if (message >= 8*sizeof(message_pointer_flags)) return FALSE; + if (message == WM_DEVICECHANGE && !(wparam & 0x8000)) return FALSE; return (message_pointer_flags[message / 32] & SET(message)) != 0; } @@ -3490,7 +3491,7 @@ BOOL WINAPI SendNotifyMessageA( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara { struct send_message_info info; - if (is_pointer_message(msg)) + if (is_pointer_message( msg, wparam )) { SetLastError( ERROR_MESSAGE_SYNC_ONLY ); return FALSE; @@ -3515,7 +3516,7 @@ BOOL WINAPI SendNotifyMessageW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara { struct send_message_info info; - if (is_pointer_message(msg)) + if (is_pointer_message( msg, wparam )) { SetLastError( ERROR_MESSAGE_SYNC_ONLY ); return FALSE; @@ -3540,7 +3541,7 @@ BOOL WINAPI SendMessageCallbackA( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa { struct send_message_info info; - if (is_pointer_message(msg)) + if (is_pointer_message( msg, wparam )) { SetLastError( ERROR_MESSAGE_SYNC_ONLY ); return FALSE; @@ -3568,7 +3569,7 @@ BOOL WINAPI SendMessageCallbackW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa { struct send_message_info info; - if (is_pointer_message(msg)) + if (is_pointer_message( msg, wparam )) { SetLastError( ERROR_MESSAGE_SYNC_ONLY ); return FALSE; @@ -3638,7 +3639,7 @@ BOOL WINAPI PostMessageW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { struct send_message_info info; - if (is_pointer_message( msg )) + if (is_pointer_message( msg, wparam )) { SetLastError( ERROR_MESSAGE_SYNC_ONLY ); return FALSE; @@ -3687,7 +3688,7 @@ BOOL WINAPI PostThreadMessageW( DWORD thread, UINT msg, WPARAM wparam, LPARAM lp { struct send_message_info info; - if (is_pointer_message( msg )) + if (is_pointer_message( msg, wparam )) { SetLastError( ERROR_MESSAGE_SYNC_ONLY ); return FALSE; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7204d19..bf1dab2 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4553,13 +4553,11 @@ static void test_WM_DEVICECHANGE(HWND hwnd) } else { - todo_wine { - ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 0, QS_POSTMESSAGE); - ok(ret == WAIT_OBJECT_0, "MsgWaitForMultipleObjects returned %x\n", ret); - memset(&msg, 0, sizeof(msg)); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should succeed\n"); - ok(msg.message == WM_DEVICECHANGE, "got %04x instead of WM_DEVICECHANGE\n", msg.message); - } + ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 0, QS_POSTMESSAGE); + ok(ret == WAIT_OBJECT_0, "MsgWaitForMultipleObjects returned %x\n", ret); + memset(&msg, 0, sizeof(msg)); + ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should succeed\n"); + ok(msg.message == WM_DEVICECHANGE, "got %04x instead of WM_DEVICECHANGE\n", msg.message); } } }

1 0

Austin English : pdh: Add PdhBindInputDataSourceA/W stubs.
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: de71271347dd38849aa006fe88c4eaf6ce029783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de71271347dd38849aa006fe8… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Dec 26 22:44:02 2015 -0600 pdh: Add PdhBindInputDataSourceA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/pdh.spec | 4 ++-- dlls/pdh/pdh_main.c | 18 ++++++++++++++++++ include/pdh.h | 3 +++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 41900c8..72e6fa3 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -5,8 +5,8 @@ @ stdcall PdhAddCounterW(ptr wstr long ptr) @ stdcall PdhAddEnglishCounterA(ptr str long ptr) @ stdcall PdhAddEnglishCounterW(ptr wstr long ptr) -@ stub PdhBindInputDataSourceA -@ stub PdhBindInputDataSourceW +@ stdcall PdhBindInputDataSourceA(ptr str) +@ stdcall PdhBindInputDataSourceW(ptr wstr) @ stub PdhBrowseCountersA @ stub PdhBrowseCountersHA @ stub PdhBrowseCountersHW diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 8854fd7..39f9f25 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1287,3 +1287,21 @@ PDH_STATUS WINAPI PdhGetLogFileTypeW(const WCHAR *log, DWORD *type) FIXME("%s, %p: stub\n", debugstr_w(log), type); return PDH_NOT_IMPLEMENTED; } + +/*********************************************************************** + * PdhBindInputDataSourceA (PDH.@) + */ +PDH_STATUS WINAPI PdhBindInputDataSourceA(PDH_HLOG *source, const char *filenamelist) +{ + FIXME("%p %s: stub\n", source, debugstr_a(filenamelist)); + return PDH_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PdhBindInputDataSourceW (PDH.@) + */ +PDH_STATUS WINAPI PdhBindInputDataSourceW(PDH_HLOG *source, const WCHAR *filenamelist) +{ + FIXME("%p %s: stub\n", source, debugstr_w(filenamelist)); + return PDH_NOT_IMPLEMENTED; +} diff --git a/include/pdh.h b/include/pdh.h index a25eb2e..3d688bd 100644 --- a/include/pdh.h +++ b/include/pdh.h @@ -200,6 +200,9 @@ PDH_STATUS WINAPI PdhAddCounterW(PDH_HQUERY, LPCWSTR, DWORD_PTR, PDH_HCOUNTER *) PDH_STATUS WINAPI PdhAddEnglishCounterA(PDH_HQUERY, LPCSTR, DWORD_PTR, PDH_HCOUNTER *); PDH_STATUS WINAPI PdhAddEnglishCounterW(PDH_HQUERY, LPCWSTR, DWORD_PTR, PDH_HCOUNTER *); #define PdhAddEnglishCounter WINELIB_NAME_AW(PdhAddEnglishCounter) +PDH_STATUS WINAPI PdhBindInputDataSourceA(PDH_HLOG *, const char *); +PDH_STATUS WINAPI PdhBindInputDataSourceW(PDH_HLOG *, const WCHAR *); +#define PdhBindInputDataSource WINELIB_NAME_AW(PdhBindInputDataSource) PDH_STATUS WINAPI PdhCloseQuery(PDH_HQUERY); PDH_STATUS WINAPI PdhCollectQueryData(PDH_HQUERY); PDH_STATUS WINAPI PdhCollectQueryDataEx(PDH_HQUERY, DWORD, HANDLE);

1 0

Jared Smudde : winefile: Use own icon in run dialog.
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: 6a9b4d16673fc6435a037f19f1df3e2d0123de5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9b4d16673fc6435a037f19f… Author: Jared Smudde <computerwhiz02(a)hotmail.com> Date: Tue Dec 29 13:22:00 2015 -0600 winefile: Use own icon in run dialog. Signed-off-by: Jared Smudde <computerwhiz02(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 7046ad0..34830c5 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -1634,9 +1634,10 @@ static void WineFile_OnRun( HWND hwnd ) static const WCHAR shell32_dll[] = {'S','H','E','L','L','3','2','.','D','L','L',0}; void (WINAPI *pRunFileDlgAW )(HWND, HICON, LPWSTR, LPWSTR, LPWSTR, DWORD); HMODULE hshell = GetModuleHandleW( shell32_dll ); + HICON hIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_WINEFILE)); pRunFileDlgAW = (void*)GetProcAddress(hshell, (LPCSTR)61); - if (pRunFileDlgAW) pRunFileDlgAW( hwnd, 0, NULL, NULL, NULL, RFF_NODEFAULT); + if (pRunFileDlgAW) pRunFileDlgAW( hwnd, hIcon, NULL, NULL, NULL, RFF_NODEFAULT); } static INT_PTR CALLBACK DestinationDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam)

1 0

André Hentschel : winegcc: Sync toolchain detection with winebuild.
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: b33fab40d36905bdb56efe08a35ba823fc4d79ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=b33fab40d36905bdb56efe08a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 30 00:25:55 2015 +0100 winegcc: Sync toolchain detection with winebuild. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 1326afe..1dffe74 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -160,7 +160,11 @@ static const struct { "x86_64", CPU_x86_64 }, { "powerpc", CPU_POWERPC }, { "arm", CPU_ARM }, - { "aarch64", CPU_ARM64 } + { "armv5", CPU_ARM }, + { "armv6", CPU_ARM }, + { "armv7", CPU_ARM }, + { "arm64", CPU_ARM64 }, + { "aarch64", CPU_ARM64 }, }; static const struct

1 0

Nikolay Sivov : riched20: Preserve higher bits of tabstop values (Coverity ).
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: 0db7cb60028cb1ef3354ce6f3d064d3cafd22cd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0db7cb60028cb1ef3354ce6f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 30 00:01:52 2015 +0300 riched20: Preserve higher bits of tabstop values (Coverity). Bits 24-31 are reserved for tab alignment and tab leader style, writer supports thatl. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a41f838..24121a7 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -943,7 +943,7 @@ void ME_RTFTblAttrHook(RTF_Info *info) ME_DisplayItem *para = info->editor->pCursors[0].pPara; PARAFORMAT2 *pFmt = para->member.para.pFmt; pFmt->rgxTabs[cellNum] &= ~0x00FFFFFF; - pFmt->rgxTabs[cellNum] = 0x00FFFFFF & info->rtfParam; + pFmt->rgxTabs[cellNum] |= 0x00FFFFFF & info->rtfParam; } info->tableDef->numCellsDefined++; break;

1 0

Nikolay Sivov : msxml3: Fix cloneNode() for document nodes.
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: 02e0e122a56fa33d7738c059f34a3638bd6dc9fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e0e122a56fa33d7738c059f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 30 11:47:11 2015 +0300 msxml3: Fix cloneNode() for document nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 31 +++++++++++++++++++++++++---- dlls/msxml3/tests/domdoc.c | 49 +++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 71 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index e9f2504..3643219 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1244,8 +1244,31 @@ static HRESULT WINAPI domdoc_cloneNode( IXMLDOMNode** outNode) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); + xmlNodePtr clone; + TRACE("(%p)->(%d %p)\n", This, deep, outNode); - return node_clone( &This->node, deep, outNode ); + + if (!outNode) + return E_INVALIDARG; + + *outNode = NULL; + + clone = xmlCopyNode((xmlNodePtr)get_doc(This), deep ? 1 : 2); + if (!clone) + return E_FAIL; + + clone->doc->_private = create_priv(); + xmldoc_add_orphan(clone->doc, clone); + xmldoc_add_ref(clone->doc); + + priv_from_xmlDocPtr(clone->doc)->properties = copy_properties(This->properties); + if (!(*outNode = (IXMLDOMNode*)create_domdoc(clone))) + { + xmldoc_release(clone->doc); + return E_FAIL; + } + + return S_OK; } @@ -3640,16 +3663,16 @@ HRESULT DOMDocument_create(MSXML_VERSION version, void **ppObj) IUnknown* create_domdoc( xmlNodePtr document ) { - void* pObj = NULL; + IUnknown *obj = NULL; HRESULT hr; TRACE("(%p)\n", document); - hr = get_domdoc_from_xmldoc((xmlDocPtr)document, (IXMLDOMDocument3**)&pObj); + hr = get_domdoc_from_xmldoc((xmlDocPtr)document, (IXMLDOMDocument3**)&obj); if (FAILED(hr)) return NULL; - return pObj; + return obj; } #else diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 81b0256..788b39f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4821,7 +4821,8 @@ if (0) static void test_cloneNode(void ) { - IXMLDOMDocument *doc, *doc2; + IXMLDOMDocument2 *doc, *doc_clone; + IXMLDOMDocument *doc2; VARIANT_BOOL b; IXMLDOMNodeList *pList; IXMLDOMNamedNodeMap *mapAttr; @@ -4830,14 +4831,52 @@ static void test_cloneNode(void ) IXMLDOMNode *node, *attr; IXMLDOMNode *node_clone; IXMLDOMNode *node_first; + VARIANT v; HRESULT hr; - doc = create_document(&IID_IXMLDOMDocument); + doc = create_document(&IID_IXMLDOMDocument2); - ole_check(IXMLDOMDocument_loadXML(doc, _bstr_(complete4A), &b)); + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(complete4A), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(b == VARIANT_TRUE, "failed to load XML string\n"); - hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("lc/pr"), &node); + hr = IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionLanguage"), &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(V_BSTR(&v), _bstr_("XSLPattern")), "got prop value %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_BSTR(&v) = _bstr_("XPath"); + V_VT(&v) = VT_BSTR; + hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), v); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&v); + + /* clone document node */ + hr = IXMLDOMDocument2_cloneNode(doc, VARIANT_TRUE, &node); + ok( hr == S_OK, "ret %08x\n", hr ); + ok( node != NULL, "node %p\n", node ); + + hr = IXMLDOMNode_get_childNodes(node, &pList); + ok( hr == S_OK, "ret %08x\n", hr ); + length = 0; + hr = IXMLDOMNodeList_get_length(pList, &length); + ok( hr == S_OK, "ret %08x\n", hr ); + ok(length == 2, "got %d\n", length); + IXMLDOMNodeList_Release(pList); + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMDocument2, (void**)&doc_clone); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* cloned document inherits properties */ + hr = IXMLDOMDocument2_getProperty(doc_clone, _bstr_("SelectionLanguage"), &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(V_BSTR(&v), _bstr_("XPath")), "got prop value %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + IXMLDOMDocument2_Release(doc_clone); + IXMLDOMNode_Release(node); + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("lc/pr"), &node); ok( hr == S_OK, "ret %08x\n", hr ); ok( node != NULL, "node %p\n", node ); @@ -4925,7 +4964,7 @@ static void test_cloneNode(void ) IXMLDOMNode_Release(node_clone); IXMLDOMNode_Release(node); - IXMLDOMDocument_Release(doc); + IXMLDOMDocument2_Release(doc); free_bstrs(); }

1 0

Austin English : ndis.sys: Add NdisAllocateMemoryWithTag stub.
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: 2bb17745dfc58b663323f9bba28a22465f3c29f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb17745dfc58b663323f9bba… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 15 23:56:01 2015 -0600 ndis.sys: Add NdisAllocateMemoryWithTag stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/main.c | 7 +++++++ dlls/ndis.sys/ndis.sys.spec | 2 +- include/Makefile.in | 1 + include/ddk/ndis.h | 30 ++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 820b4af..b2c1da4 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "winternl.h" #include "ddk/wdm.h" +#include "ddk/ndis.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ndis); @@ -36,3 +37,9 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) return STATUS_SUCCESS; } + +NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **address, UINT length, ULONG tag) +{ + FIXME("(%p, %u, %u): stub\n", address, length, tag); + return NDIS_STATUS_FAILURE; +} diff --git a/dlls/ndis.sys/ndis.sys.spec b/dlls/ndis.sys/ndis.sys.spec index bd83b48..1017296 100644 --- a/dlls/ndis.sys/ndis.sys.spec +++ b/dlls/ndis.sys/ndis.sys.spec @@ -12,7 +12,7 @@ @ stub NdisAllocateBufferPool @ stub NdisAllocateFromBlockPool @ stub NdisAllocateMemory -@ stub NdisAllocateMemoryWithTag +@ stdcall NdisAllocateMemoryWithTag(ptr long long) @ stub NdisAllocatePacket @ stub NdisAllocatePacketPool @ stub NdisAllocatePacketPoolEx diff --git a/include/Makefile.in b/include/Makefile.in index ea0e3fd..129ff6d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -276,6 +276,7 @@ HEADER_SRCS = \ ddk/hidtypes.h \ ddk/imm.h \ ddk/mountmgr.h \ + ddk/ndis.h \ ddk/ntddcdvd.h \ ddk/ntddk.h \ ddk/ntddser.h \ diff --git a/include/ddk/ndis.h b/include/ddk/ndis.h new file mode 100644 index 0000000..a57d9f8 --- /dev/null +++ b/include/ddk/ndis.h @@ -0,0 +1,30 @@ +/* + * ndis.h + * + * Copyright 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef _NDIS_ +#define _NDIS_ + +typedef void *NDIS_HANDLE, *PNDIS_HANDLE; +typedef int NDIS_STATUS, *PNDIS_STATUS; + +#define NDIS_STATUS_FAILURE ((NDIS_STATUS) STATUS_UNSUCCESSFUL) + +NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **, UINT, ULONG); + +#endif /* _NDIS_ */

1 0