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

André Hentschel : winebuild: Detect armv* toolchains.
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: bd545cb0697e7f2b109422cf8c336fab691c1976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd545cb0697e7f2b109422cf8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 30 00:25:52 2015 +0100 winebuild: Detect armv* toolchains. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 4860a19..08e6b01 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -64,6 +64,9 @@ static const struct { "x86_64", CPU_x86_64 }, { "powerpc", CPU_POWERPC }, { "arm", CPU_ARM }, + { "armv5", CPU_ARM }, + { "armv6", CPU_ARM }, + { "armv7", CPU_ARM }, { "arm64", CPU_ARM64 }, { "aarch64", CPU_ARM64 }, };

1 0

Daniel Lehman : shlwapi: Implement URL_ESCAPE_AS_UTF8.
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: 74e71b664350f5ec89ff6b1ec9d15b80f2bd2baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=74e71b664350f5ec89ff6b1ec… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Nov 23 17:34:24 2015 -0800 shlwapi: Implement URL_ESCAPE_AS_UTF8. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shlwapi/url.c | 50 ++++++++++++++++++++++++++++++++------ include/shlwapi.h | 1 + 3 files changed, 107 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 857ed15..85da922 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -302,6 +302,45 @@ static const TEST_URL_ESCAPE TEST_ESCAPE[] = { {"ftp\x1f\1end/", 0, 0, S_OK, "ftp%1F%01end/"} }; +typedef struct _TEST_URL_ESCAPEW { + const WCHAR url[INTERNET_MAX_URL_LENGTH]; + DWORD flags; + HRESULT expectret; + const WCHAR expecturl[INTERNET_MAX_URL_LENGTH]; + const WCHAR win7url[INTERNET_MAX_URL_LENGTH]; /* <= Win7 */ + const WCHAR vistaurl[INTERNET_MAX_URL_LENGTH]; /* <= Vista/2k8 */ +} TEST_URL_ESCAPEW; + +static const TEST_URL_ESCAPEW TEST_ESCAPEW[] = { + {{' ','<','>','"',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','2','0','%','3','C','%','3','E','%','2','2',0}}, + {{'{','}','|','\\',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','7','B','%','7','D','%','7','C','%','5','C',0}}, + {{'^',']','[','`',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','5','E','%','5','D','%','5','B','%','6','0',0}}, + {{'&','/','?','#',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','2','6','/','?','#',0}}, + {{'M','a','s','s',0}, URL_ESCAPE_AS_UTF8, S_OK, {'M','a','s','s',0}}, + + /* broken < Win8/10 */ + + {{'M','a',0xdf,0}, URL_ESCAPE_AS_UTF8, S_OK, {'M','a','%','C','3','%','9','F',0}, + {'M','a','%','D','F',0}}, + /* 0x2070E */ + {{0xd841,0xdf0e,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','F','0','%','A','0','%','9','C','%','8','E',0}, + {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, + {0xd841,0xdf0e,0}}, + /* 0x27A3E */ + {{0xd85e,0xde3e,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','F','0','%','A','7','%','A','8','%','B','E',0}, + {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, + {0xd85e,0xde3e,0}}, + + {{0xd85e,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','D',0}, + {0xd85e,0}}, + {{0xd85e,0x41}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','D','A',0}, + {0xd85e,'A',0}}, + {{0xdc00,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','D',0}, + {0xdc00,0}}, + {{0xffff,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','F',0}, + {0xffff,0}}, +}; + /* ################ */ typedef struct _TEST_URL_COMBINE { @@ -862,6 +901,15 @@ static void test_UrlEscapeA(void) ok(size == 34, "got %d, expected %d\n", size, 34); ok(empty_string[0] == 127, "String has changed, empty_string[0] = %d\n", empty_string[0]); + size = 1; + empty_string[0] = 127; + ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_AS_UTF8); + ok(ret == E_NOTIMPL || broken(ret == E_POINTER), /* < Win7/Win2k8 */ + "got %x, expected %x\n", ret, E_NOTIMPL); + ok(size == 1 || broken(size == 34), /* < Win7/Win2k8 */ + "got %d, expected %d\n", size, 1); + ok(empty_string[0] == 127, "String has changed, empty_string[0] = %d\n", empty_string[0]); + for(i=0; i<sizeof(TEST_ESCAPE)/sizeof(TEST_ESCAPE[0]); i++) { CHAR ret_url[INTERNET_MAX_URL_LENGTH]; @@ -925,6 +973,21 @@ static void test_UrlEscapeW(void) FreeWideString(urlW); FreeWideString(expected_urlW); } + + for(i=0; i<sizeof(TEST_ESCAPEW)/sizeof(TEST_ESCAPEW[0]); i++) { + WCHAR ret_url[INTERNET_MAX_URL_LENGTH]; + + size = INTERNET_MAX_URL_LENGTH; + ret = pUrlEscapeW(TEST_ESCAPEW[i].url, ret_url, &size, TEST_ESCAPEW[i].flags); + ok(ret == TEST_ESCAPEW[i].expectret, "UrlEscapeW returned 0x%08x instead of 0x%08x for \"%s\"\n", + ret, TEST_ESCAPEW[i].expectret, wine_dbgstr_w(TEST_ESCAPEW[i].url)); + ok(!lstrcmpW(ret_url, TEST_ESCAPEW[i].expecturl) || + broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].vistaurl)) || + broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].win7url)), + "Expected \"%s\" or \"%s\" or \"%s\", but got \"%s\" for \"%s\"\n", + wine_dbgstr_w(TEST_ESCAPEW[i].expecturl), wine_dbgstr_w(TEST_ESCAPEW[i].vistaurl), + wine_dbgstr_w(TEST_ESCAPEW[i].win7url), wine_dbgstr_w(ret_url), wine_dbgstr_w(TEST_ESCAPEW[i].url)); + } } /* ########################### */ diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 1a53252..0680a55 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -958,6 +958,8 @@ HRESULT WINAPI UrlEscapeA( if(!RtlCreateUnicodeStringFromAsciiz(&urlW, pszUrl)) return E_INVALIDARG; + if(dwFlags & URL_ESCAPE_AS_UTF8) + return E_NOTIMPL; if((ret = UrlEscapeW(urlW.Buffer, escapedW, &lenW, dwFlags)) == E_POINTER) { escapedW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); ret = UrlEscapeW(urlW.Buffer, escapedW, &lenW, dwFlags); @@ -994,6 +996,9 @@ static inline BOOL URL_NeedEscapeW(WCHAR ch, DWORD flags, DWORD int_flags) if ((flags & URL_ESCAPE_PERCENT) && (ch == '%')) return TRUE; + if ((flags & URL_ESCAPE_AS_UTF8) && (ch >= 0x80)) + return TRUE; + if (ch <= 31 || (ch >= 127 && ch <= 255) ) return TRUE; @@ -1069,8 +1074,8 @@ HRESULT WINAPI UrlEscapeW( LPCWSTR src; DWORD needed = 0, ret; BOOL stop_escaping = FALSE; - WCHAR next[5], *dst, *dst_ptr; - INT len; + WCHAR next[12], *dst, *dst_ptr; + INT i, len; PARSEDURLW parsed_url; DWORD int_flags; DWORD slashes = 0; @@ -1085,7 +1090,8 @@ HRESULT WINAPI UrlEscapeW( if(dwFlags & ~(URL_ESCAPE_SPACES_ONLY | URL_ESCAPE_SEGMENT_ONLY | URL_DONT_ESCAPE_EXTRA_INFO | - URL_ESCAPE_PERCENT)) + URL_ESCAPE_PERCENT | + URL_ESCAPE_AS_UTF8)) FIXME("Unimplemented flags: %08x\n", dwFlags); dst_ptr = dst = HeapAlloc(GetProcessHeap(), 0, *pcchEscaped*sizeof(WCHAR)); @@ -1188,10 +1194,40 @@ HRESULT WINAPI UrlEscapeW( if(cur == '\\' && (int_flags & WINE_URL_BASH_AS_SLASH) && !stop_escaping) cur = '/'; if(URL_NeedEscapeW(cur, dwFlags, int_flags) && stop_escaping == FALSE) { - next[0] = '%'; - next[1] = hexDigits[(cur >> 4) & 0xf]; - next[2] = hexDigits[cur & 0xf]; - len = 3; + if(dwFlags & URL_ESCAPE_AS_UTF8) { + char utf[16]; + + if ((cur >= 0xd800 && cur <= 0xdfff) && + (src[1] >= 0xdc00 && src[1] <= 0xdfff)) + { + WCHAR sur[2]; + + sur[0] = cur; + sur[1] = *++src; + len = wine_utf8_wcstombs(WC_ERR_INVALID_CHARS, sur, 2, utf, sizeof(utf)); + } + else + len = wine_utf8_wcstombs(WC_ERR_INVALID_CHARS, &cur, 1, utf, sizeof(utf)); + + if(len < 0) { + utf[0] = 0xef; + utf[1] = 0xbf; + utf[2] = 0xbd; + len = 3; + } + + for(i = 0; i < len; i++) { + next[i*3+0] = '%'; + next[i*3+1] = hexDigits[(utf[i] >> 4) & 0xf]; + next[i*3+2] = hexDigits[utf[i] & 0xf]; + } + len *= 3; + } else { + next[0] = '%'; + next[1] = hexDigits[(cur >> 4) & 0xf]; + next[2] = hexDigits[cur & 0xf]; + len = 3; + } } else { next[0] = cur; len = 1; diff --git a/include/shlwapi.h b/include/shlwapi.h index 205d5e6..e3b14b3 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -646,6 +646,7 @@ typedef enum { #define URL_UNESCAPE_INPLACE 0x00100000 #define URL_FILE_USE_PATHURL 0x00010000 +#define URL_ESCAPE_AS_UTF8 0x00040000 #define URL_ESCAPE_SEGMENT_ONLY 0x00002000 #define URL_ESCAPE_PERCENT 0x00001000

1 0

Austin English : api-ms-win-security-lsalookup-l1-1-1: Add dll.
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: 213d1094893b34bfa4896f4aa96f85b492932495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=213d1094893b34bfa4896f4aa… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 15 23:20:50 2015 -0600 api-ms-win-security-lsalookup-l1-1-1: Add dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-security-lsalookup-l1-1-1/Makefile.in | 1 + .../api-ms-win-security-lsalookup-l1-1-1.spec | 16 ++++++++++++++++ 4 files changed, 20 insertions(+) diff --git a/configure b/configure index ac6145a..a4c174a 100755 --- a/configure +++ b/configure @@ -957,6 +957,7 @@ enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 enable_api_ms_win_security_lsalookup_l1_1_0 +enable_api_ms_win_security_lsalookup_l1_1_1 enable_api_ms_win_security_sddl_l1_1_0 enable_api_ms_win_service_core_l1_1_1 enable_api_ms_win_service_management_l1_1_0 @@ -17352,6 +17353,7 @@ wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_d wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_security_lsalookup_l1_1_0 +wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-1 enable_api_ms_win_security_lsalookup_l1_1_1 wine_fn_config_dll api-ms-win-security-sddl-l1-1-0 enable_api_ms_win_security_sddl_l1_1_0 wine_fn_config_dll api-ms-win-service-core-l1-1-1 enable_api_ms_win_service_core_l1_1_1 wine_fn_config_dll api-ms-win-service-management-l1-1-0 enable_api_ms_win_service_management_l1_1_0 diff --git a/configure.ac b/configure.ac index a1d3f97..c4184cf 100644 --- a/configure.ac +++ b/configure.ac @@ -2689,6 +2689,7 @@ WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0) diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-1/Makefile.in b/dlls/api-ms-win-security-lsalookup-l1-1-1/Makefile.in new file mode 100644 index 0000000..bdbf8d2 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-lsalookup-l1-1-1.dll diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec b/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec new file mode 100644 index 0000000..215c7b7 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec @@ -0,0 +1,16 @@ +@ stub EnumerateIdentityProviders +@ stub GetDefaultIdentityProvider +@ stub GetIdentityProviderInfoByGUID +@ stub GetIdentityProviderInfoByName +@ stub LookupAccountNameLocalA +@ stub LookupAccountNameLocalW +@ stub LookupAccountSidLocalA +@ stub LookupAccountSidLocalW +@ stub LsaLookupClose +@ stub LsaLookupFreeMemory +@ stub LsaLookupGetDomainInfo +@ stub LsaLookupManageSidNameMapping +@ stub LsaLookupOpenLocalPolicy +@ stub LsaLookupTranslateNames +@ stub LsaLookupTranslateSids +@ stub ReleaseIdentityProviderEnumContext

1 0

Nikolay Sivov : msacm32.drv: Initialize reserved fields in WAVEINCAPS/ WAVEOUTCAPS (Coverity).
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: 8416bb0453c12e4975e24fd0d526fe8e3d676bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8416bb0453c12e4975e24fd0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 29 23:03:59 2015 +0300 msacm32.drv: Initialize reserved fields in WAVEINCAPS/WAVEOUTCAPS (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32.drv/wavemap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msacm32.drv/wavemap.c b/dlls/msacm32.drv/wavemap.c index 0abc8bd..4c8cb6c 100644 --- a/dlls/msacm32.drv/wavemap.c +++ b/dlls/msacm32.drv/wavemap.c @@ -520,6 +520,7 @@ static DWORD wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSW lpWaveC WAVE_FORMAT_2M08 | WAVE_FORMAT_2S08 | WAVE_FORMAT_2M16 | WAVE_FORMAT_2S16 | WAVE_FORMAT_1M08 | WAVE_FORMAT_1S08 | WAVE_FORMAT_1M16 | WAVE_FORMAT_1S16; woc.wChannels = 2; + woc.wReserved1 = 0; woc.dwSupport = WAVECAPS_VOLUME | WAVECAPS_LRVOLUME; memcpy(lpWaveCaps, &woc, min(dwParam2, sizeof(woc))); @@ -1075,6 +1076,7 @@ static DWORD widGetDevCaps(UINT wDevID, WAVEMAPDATA* wim, LPWAVEINCAPSW lpWaveCa WAVE_FORMAT_2M08 | WAVE_FORMAT_2S08 | WAVE_FORMAT_2M16 | WAVE_FORMAT_2S16 | WAVE_FORMAT_1M08 | WAVE_FORMAT_1S08 | WAVE_FORMAT_1M16 | WAVE_FORMAT_1S16; wic.wChannels = 2; + wic.wReserved1 = 0; memcpy(lpWaveCaps, &wic, min(dwParam2, sizeof(wic))); return MMSYSERR_NOERROR;

1 0

Nikolay Sivov : riched20: Initialize wEffects field before setting bits in it (Coverity).
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: c5b68d1db205cd0973c63d77ce0c0fb3880397bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b68d1db205cd0973c63d77c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 29 22:44:30 2015 +0300 riched20: Initialize wEffects field before setting bits in it (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 28c845c..a41f838 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -547,7 +547,8 @@ void ME_RTFParAttrHook(RTF_Info *info) PARAFORMAT2 fmt; fmt.cbSize = sizeof(fmt); fmt.dwMask = 0; - + fmt.wEffects = 0; + switch(info->rtfMinor) { case rtfParDef: /* restores default paragraph attributes */

1 0

Sebastian Lackner : oleaut32: Pass size without terminating null to get_cache_entry.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 4bfc49a773d594ae9de934b6506fa90579fa9459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bfc49a773d594ae9de934b65… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 25 06:37:44 2015 +0100 oleaut32: Pass size without terminating null to get_cache_entry. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 0352215..75f9cb4 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -119,7 +119,7 @@ static inline bstr_t *bstr_from_str(BSTR str) static inline bstr_cache_entry_t *get_cache_entry(size_t size) { - unsigned cache_idx = FIELD_OFFSET(bstr_t, u.ptr[size-1])/BUCKET_SIZE; + unsigned cache_idx = FIELD_OFFSET(bstr_t, u.ptr[size+sizeof(WCHAR)-1])/BUCKET_SIZE; return bstr_cache_enabled && cache_idx < sizeof(bstr_cache)/sizeof(*bstr_cache) ? bstr_cache + cache_idx : NULL; @@ -127,14 +127,14 @@ static inline bstr_cache_entry_t *get_cache_entry(size_t size) static bstr_t *alloc_bstr(size_t size) { - bstr_cache_entry_t *cache_entry = get_cache_entry(size+sizeof(WCHAR)); + bstr_cache_entry_t *cache_entry = get_cache_entry(size); bstr_t *ret; if(cache_entry) { EnterCriticalSection(&cs_bstr_cache); if(!cache_entry->cnt) { - cache_entry = get_cache_entry(size+sizeof(WCHAR)+BUCKET_SIZE); + cache_entry = get_cache_entry(size+BUCKET_SIZE); if(cache_entry && !cache_entry->cnt) cache_entry = NULL; } @@ -258,7 +258,7 @@ void WINAPI SysFreeString(BSTR str) return; bstr = bstr_from_str(str); - cache_entry = get_cache_entry(bstr->size+sizeof(WCHAR)); + cache_entry = get_cache_entry(bstr->size); if(cache_entry) { unsigned i;

1 0

Nikolay Sivov : oleview: Use proper pointer type when allocating names array (Coverity).
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: ff94fc1dafb415fb4c97b5fead66ab36fb4280db URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff94fc1dafb415fb4c97b5fea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 29 20:36:55 2015 +0300 oleview: Use proper pointer type when allocating names array (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/oleview/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 04b9067..cbf6ab1 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -616,7 +616,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen } bstrParamNames = HeapAlloc(GetProcessHeap(), 0, - sizeof(BSTR*)*(pFuncDesc->cParams+1)); + sizeof(BSTR)*(pFuncDesc->cParams+1)); if(FAILED(ITypeInfo_GetNames(pTypeInfo, pFuncDesc->memid, bstrParamNames, pFuncDesc->cParams+1, &namesNo))) {

1 0

Nikolay Sivov : commdlg: Explicitely initialize remaining fields of CHOOSECOLORA (Coverity).
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 4d3b87fc09f3d9acdb056181fa55caef6964bd92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d3b87fc09f3d9acdb056181f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 29 20:52:03 2015 +0300 commdlg: Explicitely initialize remaining fields of CHOOSECOLORA (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/commdlg.dll16/colordlg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/commdlg.dll16/colordlg.c b/dlls/commdlg.dll16/colordlg.c index 845784e..dfdea6a 100644 --- a/dlls/commdlg.dll16/colordlg.c +++ b/dlls/commdlg.dll16/colordlg.c @@ -62,6 +62,9 @@ BOOL16 WINAPI ChooseColor16( LPCHOOSECOLOR16 cc16 ) cc32.lpCustColors = MapSL( cc16->lpCustColors ); cc32.Flags = cc16->Flags & ~(CC_ENABLETEMPLATE | CC_ENABLETEMPLATEHANDLE | CC_ENABLEHOOK); cc32.lCustData = cc16->lCustData; + cc32.hInstance = NULL; + cc32.lpfnHook = NULL; + cc32.lpTemplateName = NULL; if (cc16->Flags & (CC_ENABLETEMPLATE | CC_ENABLETEMPLATEHANDLE)) FIXME( "custom templates no longer supported, using default\n" );

1 0

Nikolay Sivov : user.exe: Fully convert MSG16 to MSG in IsDialogMessage() (Coverity).
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: d07a7bbba51d6c40a5ed089ab9069451805928c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d07a7bbba51d6c40a5ed089ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 29 21:36:57 2015 +0300 user.exe: Fully convert MSG16 to MSG in IsDialogMessage() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/message.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 935b025..7bcc8e2 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -1836,6 +1836,9 @@ BOOL16 WINAPI IsDialogMessage16( HWND16 hwndDlg, MSG16 *msg16 ) msg.message = msg16->message; msg.wParam = msg16->wParam; msg.lParam = msg16->lParam; + msg.time = msg16->time; + msg.pt.x = msg16->pt.x; + msg.pt.y = msg16->pt.y; return IsDialogMessageA( hwndDlg32, &msg ); }

1 0

Piotr Caban : ole32: Make clipboard latest_snapshot access thread safe.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: d90ec79be2104acb3e2f59e31d3309591cd4f50d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90ec79be2104acb3e2f59e31… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 29 14:39:01 2015 +0100 ole32: Make clipboard latest_snapshot access thread safe. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 31 +++++++++++++++++++++++++------ dlls/ole32/tests/clipboard.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index db1e4a8..ca9520f 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -174,6 +174,15 @@ typedef struct PresentationDataHeader */ static ole_clipbrd* theOleClipboard; +static CRITICAL_SECTION latest_snapshot_cs; +static CRITICAL_SECTION_DEBUG latest_snapshot_cs_debug = +{ + 0, 0, &latest_snapshot_cs, + { &latest_snapshot_cs_debug.ProcessLocksList, &latest_snapshot_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": clipboard last snapshot") } +}; +static CRITICAL_SECTION latest_snapshot_cs = { &latest_snapshot_cs_debug, -1, 0, 0, 0, 0 }; + static inline HRESULT get_ole_clipbrd(ole_clipbrd **clipbrd) { struct oletls *info = COM_CurrentInfo(); @@ -1042,13 +1051,17 @@ static ULONG WINAPI snapshot_Release(IDataObject *iface) if (ref == 0) { - ole_clipbrd *clipbrd; - HRESULT hr = get_ole_clipbrd(&clipbrd); + EnterCriticalSection(&latest_snapshot_cs); + if (This->ref) + { + LeaveCriticalSection(&latest_snapshot_cs); + return ref; + } + if (theOleClipboard->latest_snapshot == This) + theOleClipboard->latest_snapshot = NULL; + LeaveCriticalSection(&latest_snapshot_cs); if(This->data) IDataObject_Release(This->data); - - if(SUCCEEDED(hr) && clipbrd->latest_snapshot == This) - clipbrd->latest_snapshot = NULL; HeapFree(GetProcessHeap(), 0, This); } @@ -2192,17 +2205,23 @@ HRESULT WINAPI OleGetClipboard(IDataObject **obj) if(FAILED(hr = get_ole_clipbrd(&clipbrd))) return hr; seq_no = GetClipboardSequenceNumber(); + EnterCriticalSection(&latest_snapshot_cs); if(clipbrd->latest_snapshot && clipbrd->latest_snapshot->seq_no != seq_no) clipbrd->latest_snapshot = NULL; if(!clipbrd->latest_snapshot) { clipbrd->latest_snapshot = snapshot_construct(seq_no); - if(!clipbrd->latest_snapshot) return E_OUTOFMEMORY; + if(!clipbrd->latest_snapshot) + { + LeaveCriticalSection(&latest_snapshot_cs); + return E_OUTOFMEMORY; + } } *obj = &clipbrd->latest_snapshot->IDataObject_iface; IDataObject_AddRef(*obj); + LeaveCriticalSection(&latest_snapshot_cs); return S_OK; } diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 81b3a1c..02097ea 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -1539,6 +1539,38 @@ static void test_getdatahere(void) } +static DWORD CALLBACK test_data_obj(void *arg) +{ + IDataObject *data_obj = arg; + + IDataObject_Release(data_obj); + return 0; +} + +static void test_multithreaded_clipboard(void) +{ + IDataObject *data_obj; + HANDLE thread; + HRESULT hr; + DWORD ret; + + OleInitialize(NULL); + + hr = OleGetClipboard(&data_obj); + ok(hr == S_OK, "OleGetClipboard returned %x\n", hr); + + thread = CreateThread(NULL, 0, test_data_obj, data_obj, 0, NULL); + ok(thread != NULL, "CreateThread failed (%d)\n", GetLastError()); + ret = WaitForSingleObject(thread, 5000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", ret); + + hr = OleGetClipboard(&data_obj); + ok(hr == S_OK, "OleGetClipboard returned %x\n", hr); + IDataObject_Release(data_obj); + + OleUninitialize(); +} + START_TEST(clipboard) { test_set_clipboard(); @@ -1546,4 +1578,5 @@ START_TEST(clipboard) test_flushed_getdata(); test_nonole_clipboard(); test_getdatahere(); + test_multithreaded_clipboard(); }

1 0

YongHao Hu : msvcr120: Enable MSVCRT__nextafterf when _MSVCR_VER>=120.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 072f34be730761faa2fabefa8e4a3306d19c4a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=072f34be730761faa2fabefa8… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Dec 28 20:48:23 2015 +0800 msvcr120: Enable MSVCRT__nextafterf when _MSVCR_VER>=120. Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 18 +++++++++--------- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 8d87fed..12c9ac8 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -293,9 +293,9 @@ @ stub nearbyint @ stub nearbyintf @ stub nearbyintl -@ stub nextafter -@ stub nextafterf -@ stub nextafterl +@ cdecl nextafter(double double) ucrtbase.nextafter +@ cdecl nextafterf(float float) ucrtbase.nextafterf +@ cdecl nextafterl(double double) ucrtbase.nextafterl @ stub nexttoward @ stub nexttowardf @ stub nexttowardl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 3bddaf7..6c0432d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2299,9 +2299,9 @@ @ stub nearbyint @ stub nearbyintf @ stub nearbyintl -@ stub nextafter -@ stub nextafterf -@ stub nextafterl +@ cdecl nextafter(double double) MSVCRT__nextafter +@ cdecl nextafterf(float float) MSVCRT__nextafterf +@ cdecl nextafterl(double double) MSVCRT__nextafter @ stub nexttoward @ stub nexttowardf @ stub nexttowardl diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 5883d32..80091c5 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1962,9 +1962,9 @@ @ stub nearbyint @ stub nearbyintf @ stub nearbyintl -@ stub nextafter -@ stub nextafterf -@ stub nextafterl +@ cdecl nextafter(double double) msvcr120.nextafter +@ cdecl nextafterf(float float) msvcr120.nextafterf +@ cdecl nextafterl(double double) msvcr120.nextafterl @ stub nexttoward @ stub nexttowardf @ stub nexttowardl diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 270bcda..f8937b3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -94,6 +94,15 @@ float CDECL MSVCRT__copysignf( float num, float sign ) return signbit(num) ? -num : num; } +/********************************************************************* + * _nextafterf (MSVCRT.@) + */ +float CDECL MSVCRT__nextafterf( float num, float next ) +{ + if (!finitef(num) || !finitef(next)) *MSVCRT__errno() = MSVCRT_EDOM; + return nextafterf( num, next ); +} + #endif #if defined(__x86_64__) || defined(__arm__) @@ -126,15 +135,6 @@ float CDECL MSVCRT__logbf( float num ) } /********************************************************************* - * _nextafterf (MSVCRT.@) - */ -float CDECL MSVCRT__nextafterf( float num, float next ) -{ - if (!finitef(num) || !finitef(next)) *MSVCRT__errno() = MSVCRT_EDOM; - return nextafterf( num, next ); -} - -/********************************************************************* * MSVCRT_acosf (MSVCRT.@) */ float CDECL MSVCRT_acosf( float x ) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6079bc4..3478342 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2434,9 +2434,9 @@ @ stub nearbyint @ stub nearbyintf @ stub nearbyintl -@ stub nextafter -@ stub nextafterf -@ stub nextafterl +@ cdecl nextafter(double double) MSVCRT__nextafter +@ cdecl nextafterf(float float) MSVCRT__nextafterf +@ cdecl nextafterl(double double) MSVCRT__nextafter @ stub nexttoward @ stub nexttowardf @ stub nexttowardl

1 0

Alexandre Julliard : ole32: Remove a no longer used constant.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 3c84cc18074200bf850e1eb0e0e592f833f441fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c84cc18074200bf850e1eb0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 29 17:51:47 2015 +0100 ole32: Remove a no longer used constant. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index cec8c00..e7e6510 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -120,11 +120,6 @@ static const WCHAR prop_oledroptarget[] = static const WCHAR prop_marshalleddroptarget[] = {'W','i','n','e','M','a','r','s','h','a','l','l','e','d','D','r','o','p','T','a','r','g','e','t',0}; -static const WCHAR clsidfmtW[] = - {'C','L','S','I','D','\\','{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-', - '%','0','2','x','%','0','2','x','-','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x', - '%','0','2','x','%','0','2','x','}','\\',0}; - static const WCHAR emptyW[] = { 0 }; /******************************************************************************

1 0

Qian Hong : user32/tests: Add tests for WM_DEVICECHANGE message.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 81bd72640ba98728abe678b66161d48762caea6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=81bd72640ba98728abe678b66… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Dec 29 10:18:47 2015 +0800 user32/tests: Add tests for WM_DEVICECHANGE message. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c2a0557..7204d19 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -32,6 +32,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" +#include "dbt.h" #include "wine/test.h" @@ -4520,6 +4521,49 @@ static void test_MsgWaitForMultipleObjects(HWND hwnd) ok(ret == WAIT_IO_COMPLETION, "MsgWaitForMultipleObjectsEx returned %x\n", ret); } +static void test_WM_DEVICECHANGE(HWND hwnd) +{ + DWORD ret; + MSG msg; + int i; + static const WPARAM wparams[] = {0, + DBT_DEVNODES_CHANGED, + DBT_QUERYCHANGECONFIG, + DBT_CONFIGCHANGED, + DBT_CONFIGCHANGECANCELED, + DBT_NO_DISK_SPACE, + DBT_LOW_DISK_SPACE, + DBT_CONFIGMGPRIVATE, /* 0x7fff */ + DBT_DEVICEARRIVAL, /* 0x8000 */ + DBT_DEVICEQUERYREMOVE, + DBT_DEVICEQUERYREMOVEFAILED, + DBT_DEVICEREMOVEPENDING, + DBT_DEVICEREMOVECOMPLETE, + DBT_DEVICETYPESPECIFIC, + DBT_CUSTOMEVENT}; + + for (i = 0; i < sizeof(wparams)/sizeof(wparams[0]); i++) + { + SetLastError(0xdeadbeef); + ret = PostMessageA(hwnd, WM_DEVICECHANGE, wparams[i], 0); + if (wparams[i] & 0x8000) + { + ok(ret == FALSE, "PostMessage should returned %d\n", ret); + ok(GetLastError() == ERROR_MESSAGE_SYNC_ONLY, "PostMessage error %08x\n", GetLastError()); + } + 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); + } + } + } +} + static DWORD CALLBACK show_window_thread(LPVOID arg) { HWND hwnd = arg; @@ -4911,6 +4955,7 @@ static void test_messages(void) flush_sequence(); test_MsgWaitForMultipleObjects(hparent); + test_WM_DEVICECHANGE(hparent); /* the following test causes an exception in user.exe under win9x */ if (!PostMessageW( hparent, WM_USER, 0, 0 ))

1 0

Qian Hong : include: Add defines for some more device change event.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 27ac4d887a08a666db986561f19a2cf3e3538bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ac4d887a08a666db986561f… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Dec 29 10:18:27 2015 +0800 include: Add defines for some more device change event. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbt.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/dbt.h b/include/dbt.h index b326dc2..ec8c084 100644 --- a/include/dbt.h +++ b/include/dbt.h @@ -30,6 +30,10 @@ # define DECL_WINELIB_DBT_TYPE_AW(type) typedef WINELIB_NAME_AW(type##_) type; #endif +#define DBT_DEVNODES_CHANGED 0x0007 +#define DBT_QUERYCHANGECONFIG 0x0017 +#define DBT_CONFIGCHANGED 0x0018 +#define DBT_CONFIGCHANGECANCELED 0x0019 #define DBT_NO_DISK_SPACE 0x0047 #define DBT_LOW_DISK_SPACE 0x0048 #define DBT_CONFIGMGPRIVATE 0x7FFF

1 0

Nikolay Sivov : shlwapi: Handle NULL pointer in DllGetVersion() (Coverity) .
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 0e4be06cd6d350dad230168434f02d3a86910180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e4be06cd6d350dad23016843… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 29 01:04:44 2015 +0300 shlwapi: Handle NULL pointer in DllGetVersion() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/shlwapi_main.c | 7 +++++-- dlls/shlwapi/tests/ordinal.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index 38439b7..f466bb4 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -94,6 +94,9 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) TRACE("(%p)\n",pdvi); + if (!pdvi) + return E_INVALIDARG; + switch (pdvi2->info1.cbSize) { case sizeof(DLLVERSIONINFO2): @@ -107,7 +110,7 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) pdvi2->info1.dwPlatformID = DLLVER_PLATFORM_WINDOWS; return S_OK; } - if (pdvi) - WARN("pdvi->cbSize = %d, unhandled\n", pdvi2->info1.cbSize); + + WARN("pdvi->cbSize = %d, unhandled\n", pdvi2->info1.cbSize); return E_INVALIDARG; } diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index bd3d46a..afccd3a 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -70,6 +70,7 @@ static HRESULT (WINAPI *pSKDeleteValueW)(DWORD, LPCWSTR, LPCWSTR); static HRESULT (WINAPI *pSKAllocValueW)(DWORD, LPCWSTR, LPCWSTR, DWORD*, void**, DWORD*); static HWND (WINAPI *pSHSetParentHwnd)(HWND, HWND); static HRESULT (WINAPI *pIUnknown_GetClassID)(IUnknown*, CLSID*); +static HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO2*); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -3073,6 +3074,8 @@ static void init_pointers(void) MAKEFUNC(SKDeleteValueW, 518); MAKEFUNC(SKAllocValueW, 519); #undef MAKEFUNC + + pDllGetVersion = (void*)GetProcAddress(hShlwapi, "DllGetVersion"); } static void test_SHSetParentHwnd(void) @@ -3246,6 +3249,14 @@ if (0) /* crashes on native systems */ "got wrong clsid %s\n", wine_dbgstr_guid(&clsid)); } +static void test_DllGetVersion(void) +{ + HRESULT hr; + + hr = pDllGetVersion(NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +} + START_TEST(ordinal) { char **argv; @@ -3301,6 +3312,7 @@ START_TEST(ordinal) test_SHGetShellKey(); test_SHSetParentHwnd(); test_IUnknown_GetClassID(); + test_DllGetVersion(); FreeLibrary(hshell32); FreeLibrary(hmlang);

1 0

Nikolay Sivov : dwrite/tests: Some tests for SetUnderline().
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: ead6905ddb94d9d8a6dadade27f8cfa19d171a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ead6905ddb94d9d8a6dadade2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 28 07:35:11 2015 +0300 dwrite/tests: Some tests for SetUnderline(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 13ce6f8..f1534bf 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4273,6 +4273,60 @@ static void test_SetOpticalAlignment(void) IDWriteFactory_Release(factory); } +static const struct drawcall_entry drawunderline_seq[] = { + { DRAW_GLYPHRUN, {'a','e',0x0300,0} }, /* reported runs can't mix different underline values */ + { DRAW_GLYPHRUN, {'d',0} }, + { DRAW_UNDERLINE }, + { DRAW_LAST_KIND } +}; + +static void test_SetUnderline(void) +{ + static const WCHAR strW[] = {'a','e',0x0300,'d',0}; /* accent grave */ + DWRITE_CLUSTER_METRICS clusters[4]; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + DWRITE_TEXT_RANGE range; + IDWriteFactory *factory; + UINT32 count; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextFormat_Release(format); + + count = 0; + hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, sizeof(clusters)/sizeof(clusters[0]), &count); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(count == 3, "got %u\n", count); + + range.startPosition = 0; + range.length = 2; + hr = IDWriteTextLayout_SetUnderline(layout, TRUE, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, sizeof(clusters)/sizeof(clusters[0]), &count); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(count == 3, "got %u\n", count); + + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0, 0.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, drawunderline_seq, "draw underline test", TRUE); + + IDWriteTextLayout_Release(layout); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { static const WCHAR ctrlstrW[] = {0x202a,0}; @@ -4323,6 +4377,7 @@ START_TEST(layout) test_SetTypography(); test_SetLastLineWrapping(); test_SetOpticalAlignment(); + test_SetUnderline(); IDWriteFactory_Release(factory); }

1 0

Thomas Faber : msi: Use the intended attributes when overwriting the target file in cabinet_copy_file.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 689f04849737433e282d19b535e8dcc819061138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=689f04849737433e282d19b53… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Nov 23 14:00:54 2015 +0100 msi: Use the intended attributes when overwriting the target file in cabinet_copy_file. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/media.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index d75f59f..1357a64 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -476,7 +476,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, { TRACE("removing read-only attribute on %s\n", debugstr_w(path)); SetFileAttributesW( path, attrs2 & ~FILE_ATTRIBUTE_READONLY ); - handle = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, attrs2, NULL); + handle = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, attrs, NULL); if (handle != INVALID_HANDLE_VALUE) goto done; err = GetLastError();

1 0

Nikolay Sivov : shell32/tests: Basic tests for SHCreateSessionKey().
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 2e4954eb69b8f3baf33d8e61ec4490009aac2a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4954eb69b8f3baf33d8e61e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 27 16:26:18 2015 +0300 shell32/tests: Basic tests for SHCreateSessionKey(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellole.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index 71ba477..e8cf744 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -75,6 +75,7 @@ static HRESULT (WINAPI *pSHPropStgReadMultiple)(IPropertyStorage*, UINT, static HRESULT (WINAPI *pSHPropStgWriteMultiple)(IPropertyStorage*, UINT*, ULONG, const PROPSPEC*, PROPVARIANT*, PROPID); static HRESULT (WINAPI *pSHCreateQueryCancelAutoPlayMoniker)(IMoniker**); +static HRESULT (WINAPI *pSHCreateSessionKey)(REGSAM, HKEY*); static void init(void) { @@ -84,6 +85,7 @@ static void init(void) pSHPropStgReadMultiple = (void*)GetProcAddress(hmod, "SHPropStgReadMultiple"); pSHPropStgWriteMultiple = (void*)GetProcAddress(hmod, "SHPropStgWriteMultiple"); pSHCreateQueryCancelAutoPlayMoniker = (void*)GetProcAddress(hmod, "SHCreateQueryCancelAutoPlayMoniker"); + pSHCreateSessionKey = (void*)GetProcAddress(hmod, (char*)723); } static HRESULT WINAPI PropertyStorage_QueryInterface(IPropertyStorage *This, @@ -858,6 +860,36 @@ static void test_DragQueryFile(void) } #undef DROPTEST_FILENAME +static void test_SHCreateSessionKey(void) +{ + HKEY hkey, hkey2; + HRESULT hr; + + if (!pSHCreateSessionKey) + { + skip("SHCreateSessionKey is not implemented\n"); + return; + } + +if (0) /* crashes on native */ + hr = pSHCreateSessionKey(KEY_READ, NULL); + + hkey = (HKEY)0xdeadbeef; + hr = pSHCreateSessionKey(0, &hkey); + ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr); + ok(hkey == NULL, "got %p\n", hkey); + + hr = pSHCreateSessionKey(KEY_READ, &hkey); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pSHCreateSessionKey(KEY_READ, &hkey2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2); + + RegCloseKey(hkey); + RegCloseKey(hkey2); +} + START_TEST(shellole) { init(); @@ -865,4 +897,5 @@ START_TEST(shellole) test_SHPropStg_functions(); test_SHCreateQueryCancelAutoPlayMoniker(); test_DragQueryFile(); + test_SHCreateSessionKey(); }

1 0

Nikolay Sivov : dwrite: Implement EUDC font collection.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 57bfebfc806d8e700e23898cff30bbaadeaeca52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57bfebfc806d8e700e23898cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 28 07:35:12 2015 +0300 dwrite: Implement EUDC font collection. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 198 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 148 insertions(+), 50 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9244978..89d50b3 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3234,6 +3234,27 @@ static ULONG WINAPI systemfontfileenumerator_Release(IDWriteFontFileEnumerator * return ref; } +static HRESULT create_local_file_reference(IDWriteFactory2 *factory, const WCHAR *filename, IDWriteFontFile **file) +{ + HRESULT hr; + + /* Fonts installed in 'Fonts' system dir don't get full path in registry font files cache */ + if (!strchrW(filename, '\\')) { + static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; + WCHAR fullpathW[MAX_PATH]; + + GetWindowsDirectoryW(fullpathW, sizeof(fullpathW)/sizeof(WCHAR)); + strcatW(fullpathW, fontsW); + strcatW(fullpathW, filename); + + hr = IDWriteFactory2_CreateFontFileReference(factory, fullpathW, NULL, file); + } + else + hr = IDWriteFactory2_CreateFontFileReference(factory, filename, NULL, file); + + return hr; +} + static HRESULT WINAPI systemfontfileenumerator_GetCurrentFontFile(IDWriteFontFileEnumerator *iface, IDWriteFontFile **file) { struct system_fontfile_enumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface); @@ -3266,19 +3287,7 @@ static HRESULT WINAPI systemfontfileenumerator_GetCurrentFontFile(IDWriteFontFil return E_FAIL; } - /* Fonts installed in 'Fonts' system dir don't get full path in registry font files cache */ - if (!strchrW(filename, '\\')) { - static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; - WCHAR fullpathW[MAX_PATH]; - - GetWindowsDirectoryW(fullpathW, sizeof(fullpathW)/sizeof(WCHAR)); - strcatW(fullpathW, fontsW); - strcatW(fullpathW, filename); - - hr = IDWriteFactory2_CreateFontFileReference(enumerator->factory, fullpathW, NULL, file); - } - else - hr = IDWriteFactory2_CreateFontFileReference(enumerator->factory, filename, NULL, file); + hr = create_local_file_reference(enumerator->factory, filename, file); heap_free(value); heap_free(filename); @@ -3379,56 +3388,145 @@ HRESULT get_system_fontcollection(IDWriteFactory2 *factory, IDWriteFontCollectio return hr; } -static HRESULT WINAPI eudcfontfileenumerator_QueryInterface(IDWriteFontFileEnumerator *iface, REFIID riid, void **obj) +static HRESULT eudc_collection_add_family(IDWriteFactory2 *factory, struct dwrite_fontcollection *collection, + const WCHAR *keynameW, const WCHAR *pathW) { - *obj = NULL; + static const WCHAR defaultfontW[] = {'S','y','s','t','e','m','D','e','f','a','u','l','t','E','U','D','C','F','o','n','t',0}; + static const WCHAR emptyW[] = {0}; + IDWriteLocalizedStrings *names; + DWRITE_FONT_FACE_TYPE face_type; + DWRITE_FONT_FILE_TYPE file_type; + BOOL supported; + UINT32 face_count, i; + IDWriteFontFile *file; + HRESULT hr; + struct dwrite_fontfamily_data *family_data; - if (IsEqualIID(riid, &IID_IDWriteFontFileEnumerator) || IsEqualIID(riid, &IID_IUnknown)) { - IDWriteFontFileEnumerator_AddRef(iface); - *obj = iface; - return S_OK; + /* create font file from this path */ + hr = create_local_file_reference(factory, pathW, &file); + if (FAILED(hr)) + return S_FALSE; + + /* failed font files are skipped */ + hr = IDWriteFontFile_Analyze(file, &supported, &file_type, &face_type, &face_count); + if (FAILED(hr) || !supported || face_count == 0) { + TRACE("unsupported font (%p, 0x%08x, %d, %u)\n", file, hr, supported, face_count); + IDWriteFontFile_Release(file); + return S_FALSE; } - return E_NOINTERFACE; -} + /* create and init new family */ -static ULONG WINAPI eudcfontfileenumerator_AddRef(IDWriteFontFileEnumerator *iface) -{ - return 2; -} + /* Family names are added for non-specific locale, represented with empty string. + Default family appears with empty family name. */ + create_localizedstrings(&names); + if (!strcmpiW(keynameW, defaultfontW)) + add_localizedstring(names, emptyW, emptyW); + else + add_localizedstring(names, emptyW, keynameW); -static ULONG WINAPI eudcfontfileenumerator_Release(IDWriteFontFileEnumerator *iface) -{ - return 1; -} + hr = init_fontfamily_data(names, &family_data); + IDWriteLocalizedStrings_Release(names); + if (hr != S_OK) { + IDWriteFontFile_Release(file); + return hr; + } -static HRESULT WINAPI eudcfontfileenumerator_GetCurrentFontFile(IDWriteFontFileEnumerator *iface, IDWriteFontFile **file) -{ - *file = NULL; - return E_FAIL; -} + /* fill with faces */ + for (i = 0; i < face_count; i++) { + struct dwrite_font_data *font_data; -static HRESULT WINAPI eudcfontfileenumerator_MoveNext(IDWriteFontFileEnumerator *iface, BOOL *current) -{ - *current = FALSE; - return S_OK; + /* alloc and init new font data structure */ + hr = init_font_data(factory, file, face_type, i, &names, &font_data); + if (FAILED(hr)) + continue; + + IDWriteLocalizedStrings_Release(names); + + /* add font to family */ + hr = fontfamily_add_font(family_data, font_data); + if (hr != S_OK) + release_font_data(font_data); + } + + /* add family to collection */ + hr = fontcollection_add_family(collection, family_data); + if (FAILED(hr)) + release_fontfamily_data(family_data); + IDWriteFontFile_Release(file); + + return hr; } -static const struct IDWriteFontFileEnumeratorVtbl eudcfontfileenumeratorvtbl = +HRESULT get_eudc_fontcollection(IDWriteFactory2 *factory, IDWriteFontCollection **ret) { - eudcfontfileenumerator_QueryInterface, - eudcfontfileenumerator_AddRef, - eudcfontfileenumerator_Release, - eudcfontfileenumerator_MoveNext, - eudcfontfileenumerator_GetCurrentFontFile -}; + static const WCHAR eudckeyfmtW[] = {'E','U','D','C','\\','%','u',0}; + struct dwrite_fontcollection *collection; + static const WCHAR emptyW[] = {0}; + WCHAR eudckeypathW[16]; + HKEY eudckey; + DWORD index; + BOOL exists; + LONG retval; + HRESULT hr; + UINT32 i; -static IDWriteFontFileEnumerator eudc_fontfile_enumerator = { &eudcfontfileenumeratorvtbl }; + TRACE("building EUDC font collection for factory %p, ACP %u\n", factory, GetACP()); -HRESULT get_eudc_fontcollection(IDWriteFactory2 *factory, IDWriteFontCollection **collection) -{ - TRACE("building EUDC font collection for factory %p\n", factory); - return create_font_collection(factory, &eudc_fontfile_enumerator, FALSE, collection); + *ret = NULL; + + collection = heap_alloc(sizeof(struct dwrite_fontcollection)); + if (!collection) return E_OUTOFMEMORY; + + hr = init_font_collection(collection, FALSE); + if (FAILED(hr)) { + heap_free(collection); + return hr; + } + + *ret = &collection->IDWriteFontCollection_iface; + + /* return empty collection if EUDC fonts are not configured */ + sprintfW(eudckeypathW, eudckeyfmtW, GetACP()); + if (RegOpenKeyExW(HKEY_CURRENT_USER, eudckeypathW, 0, GENERIC_READ, &eudckey)) + return S_OK; + + retval = ERROR_SUCCESS; + index = 0; + while (retval != ERROR_NO_MORE_ITEMS) { + WCHAR keynameW[64], pathW[MAX_PATH]; + DWORD type, path_len, name_len; + + path_len = sizeof(pathW)/sizeof(*pathW); + name_len = sizeof(keynameW)/sizeof(*keynameW); + retval = RegEnumValueW(eudckey, index++, keynameW, &name_len, NULL, &type, (BYTE*)pathW, &path_len); + if (retval || type != REG_SZ) + continue; + + hr = eudc_collection_add_family(factory, collection, keynameW, pathW); + if (hr != S_OK) + WARN("failed to add family %s, path %s\n", debugstr_w(keynameW), debugstr_w(pathW)); + } + RegCloseKey(eudckey); + + /* try to add global default if not defined for specific codepage */ + exists = FALSE; + hr = IDWriteFontCollection_FindFamilyName(&collection->IDWriteFontCollection_iface, emptyW, + &index, &exists); + if (FAILED(hr) || !exists) { + const WCHAR globaldefaultW[] = {'E','U','D','C','.','T','T','E',0}; + hr = eudc_collection_add_family(factory, collection, emptyW, globaldefaultW); + if (hr != S_OK) + WARN("failed to add global default EUDC font, 0x%08x\n", hr); + } + + /* EUDC collection offers simulated faces too */ + for (i = 0; i < collection->family_count; i++) { + fontfamily_add_bold_simulated_face(collection->family_data[i]); + fontfamily_add_oblique_simulated_face(collection->family_data[i]); + } + + return S_OK; } static HRESULT WINAPI dwritefontfile_QueryInterface(IDWriteFontFile *iface, REFIID riid, void **obj)

1 0

Nikolay Sivov : dwrite/tests: Fix test failures on older versions.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 8165cba0f8c774c29ef794ac49e667250d122505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8165cba0f8c774c29ef794ac4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 28 07:35:10 2015 +0300 dwrite/tests: Fix test failures on older versions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 637a8ea..13ce6f8 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2058,7 +2058,8 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); - ok(range.startPosition == 0 && range.length == ~0u, "got %u,%u\n", range.startPosition, range.length); + ok((range.startPosition == 0 && range.length == ~0u) || + broken(range.startPosition == 0 && range.length == 4) /* vista/win7 */, "got %u,%u\n", range.startPosition, range.length); /* check what's returned for positions after the text */ buffW[0] = 0; @@ -2067,7 +2068,8 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); - ok(range.startPosition == 0 && range.length == ~0u, "got %u,%u\n", range.startPosition, range.length); + ok((range.startPosition == 0 && range.length == ~0u) || + broken(range.startPosition == 4 && range.length == ~0u-4) /* vista/win7 */, "got %u,%u\n", range.startPosition, range.length); IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format);

1 0

Thomas Faber : quartz: Don' t cache IFilterMapper2 interface in FilterGraph2.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 3b48ba6c1da9f2b88f5413efcb09e954ee331131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b48ba6c1da9f2b88f5413efc… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 20 15:07:52 2015 +0100 quartz: Don't cache IFilterMapper2 interface in FilterGraph2. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 43 ++++++++++++++++++++++++++--------------- dlls/quartz/tests/filtergraph.c | 2 -- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 495f4be..9f072a8 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -176,7 +176,6 @@ typedef struct _IFilterGraphImpl { IUnknown *outer_unk; LONG ref; IUnknown *punkFilterMapper2; - IFilterMapper2 * pFilterMapper2; IBaseFilter ** ppFiltersInGraph; LPWSTR * pFilterNames; ULONG nFilters; @@ -265,11 +264,11 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown *iface, REFIID ri TRACE(" requesting IFilterMapper interface from aggregated filtermapper (%p)\n", *ppvObj); return IUnknown_QueryInterface(This->punkFilterMapper2, riid, ppvObj); } else if (IsEqualGUID(&IID_IFilterMapper2, riid)) { - *ppvObj = This->pFilterMapper2; TRACE(" returning IFilterMapper2 interface from aggregated filtermapper (%p)\n", *ppvObj); + return IUnknown_QueryInterface(This->punkFilterMapper2, riid, ppvObj); } else if (IsEqualGUID(&IID_IFilterMapper3, riid)) { - *ppvObj = This->pFilterMapper2; TRACE(" returning IFilterMapper3 interface from aggregated filtermapper (%p)\n", *ppvObj); + return IUnknown_QueryInterface(This->punkFilterMapper2, riid, ppvObj); } else if (IsEqualGUID(&IID_IGraphVersion, riid)) { *ppvObj = &This->IGraphConfig_iface; TRACE(" returning IGraphConfig interface (%p)\n", *ppvObj); @@ -319,9 +318,6 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface) IUnknown_Release(This->ItfCacheEntries[i].iface); } - /* AddRef on controlling IUnknown, to compensate for Release of cached IFilterMapper2 */ - IUnknown_AddRef(This->outer_unk); - IFilterMapper2_Release(This->pFilterMapper2); IUnknown_Release(This->punkFilterMapper2); if (This->pSite) IUnknown_Release(This->pSite); @@ -910,6 +906,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, CLSID FilterCLSID; PIN_DIRECTION dir; unsigned int i = 0; + IFilterMapper2 *pFilterMapper2 = NULL; TRACE("(%p/%p)->(%p, %p)\n", This, iface, ppinOut, ppinIn); @@ -999,10 +996,16 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, TRACE("MajorType %s\n", debugstr_guid(&mt->majortype)); TRACE("SubType %s\n", debugstr_guid(&mt->subtype)); + hr = IUnknown_QueryInterface(This->punkFilterMapper2, &IID_IFilterMapper2, (void**)&pFilterMapper2); + if (FAILED(hr)) { + WARN("Unable to get IFilterMapper2 (%x)\n", hr); + goto out; + } + /* Try to find a suitable filter that can connect to the pin to render */ tab[0] = mt->majortype; tab[1] = mt->subtype; - hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); + hr = IFilterMapper2_EnumMatchingFilters(pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); if (FAILED(hr)) { WARN("Unable to enum filters (%x)\n", hr); goto out; @@ -1172,6 +1175,8 @@ error: IEnumMoniker_Release(pEnumMoniker); out: + if (pFilterMapper2) + IFilterMapper2_Release(pFilterMapper2); if (penummt) IEnumMediaTypes_Release(penummt); if (mt) @@ -1267,6 +1272,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) ULONG nb; IMoniker* pMoniker; INT x; + IFilterMapper2 *pFilterMapper2 = NULL; TRACE("(%p/%p)->(%p)\n", This, iface, ppinOut); @@ -1376,10 +1382,20 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) continue; } + if (pFilterMapper2 == NULL) + { + hr = IUnknown_QueryInterface(This->punkFilterMapper2, &IID_IFilterMapper2, (void**)&pFilterMapper2); + if (FAILED(hr)) + { + WARN("Unable to query IFilterMapper2 (%x)\n", hr); + break; + } + } + /* Try to find a suitable renderer with the same media type */ tab[0] = mt->majortype; tab[1] = mt->subtype; - hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); + hr = IFilterMapper2_EnumMatchingFilters(pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); if (FAILED(hr)) { WARN("Unable to enum filters (%x)\n", hr); @@ -1493,6 +1509,9 @@ error: hr = S_OK; } + if (pFilterMapper2) + IFilterMapper2_Release(pFilterMapper2); + IEnumMediaTypes_Release(penummt); return hr; } @@ -5708,14 +5727,6 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) hr = CoCreateInstance(&CLSID_FilterMapper2, fimpl->outer_unk, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&fimpl->punkFilterMapper2); - if (SUCCEEDED(hr)) - hr = IUnknown_QueryInterface(fimpl->punkFilterMapper2, &IID_IFilterMapper2, - (void**)&fimpl->pFilterMapper2); - - if (SUCCEEDED(hr)) - /* Release controlling IUnknown - compensate refcount increase from caching IFilterMapper2 interface. */ - IUnknown_Release(fimpl->outer_unk); - if (FAILED(hr)) { ERR("Unable to create filter mapper (%x)\n", hr); if (fimpl->punkFilterMapper2) IUnknown_Release(fimpl->punkFilterMapper2); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f3af03e..39d6e88 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1942,9 +1942,7 @@ static void test_aggregate_filter_graph(void) ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); IUnknown_Release(punk); -todo_wine ok(unk_outer.AddRef_called == 0, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); -todo_wine ok(unk_outer.Release_called == 0, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); unk_outer.AddRef_called = 0; unk_outer.Release_called = 0;

1 0

Sebastian Lackner : oleaut32: Align terminating null character in SysAllocStringByteLen.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: e559ec2ad3ca41b7e169ab157e0d73c39b4c75b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e559ec2ad3ca41b7e169ab157… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 25 06:38:10 2015 +0100 oleaut32: Align terminating null character in SysAllocStringByteLen. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 14 ++++++-------- dlls/oleaut32/tests/vartype.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 75f9cb4..78cb083 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -149,12 +149,9 @@ static bstr_t *alloc_bstr(size_t size) if(cache_entry) { if(WARN_ON(heap)) { - size_t tail; - - memset(ret, ARENA_INUSE_FILLER, FIELD_OFFSET(bstr_t, u.ptr[size+sizeof(WCHAR)])); - tail = bstr_alloc_size(size) - FIELD_OFFSET(bstr_t, u.ptr[size+sizeof(WCHAR)]); - if(tail) - memset(ret->u.ptr+size+sizeof(WCHAR), ARENA_TAIL_FILLER, tail); + size_t fill_size = (FIELD_OFFSET(bstr_t, u.ptr[size])+2*sizeof(WCHAR)-1) & ~(sizeof(WCHAR)-1); + memset(ret, ARENA_INUSE_FILLER, fill_size); + memset((char *)ret+fill_size, ARENA_TAIL_FILLER, bstr_alloc_size(size)-fill_size); } ret->size = size; return ret; @@ -418,10 +415,11 @@ BSTR WINAPI SysAllocStringByteLen(LPCSTR str, UINT len) if(str) { memcpy(bstr->u.ptr, str, len); - bstr->u.ptr[len] = bstr->u.ptr[len+1] = 0; + bstr->u.ptr[len] = 0; }else { - memset(bstr->u.ptr, 0, len+sizeof(WCHAR)); + memset(bstr->u.ptr, 0, len+1); } + bstr->u.str[(len+sizeof(WCHAR)-1)/sizeof(WCHAR)] = 0; return bstr->u.str; } diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 7cbb059..d905d37 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5444,7 +5444,9 @@ static void test_SysAllocStringByteLen(void) { const OLECHAR szTest[10] = { 'T','e','s','t','\0' }; const CHAR szTestA[6] = { 'T','e','s','t','\0','?' }; + char *buf; BSTR str; + int i; if (sizeof(void *) == 4) /* not limited to 0x80000000 on Win64 */ { @@ -5487,6 +5489,7 @@ static void test_SysAllocStringByteLen(void) ok (bstr->dwLen == 3, "Expected 3, got %d\n", bstr->dwLen); ok (!lstrcmpA((LPCSTR)bstr->szString, szTestTruncA), "String different\n"); + ok (!bstr->szString[2], "String not terminated\n"); SysFreeString(str); } @@ -5500,6 +5503,32 @@ static void test_SysAllocStringByteLen(void) ok (!lstrcmpW(bstr->szString, szTest), "String different\n"); SysFreeString(str); } + + /* Make sure terminating null is aligned properly */ + buf = HeapAlloc(GetProcessHeap(), 0, 1025); + ok (buf != NULL, "Expected non-NULL\n"); + for (i = 0; i < 1024; i++) + { + LPINTERNAL_BSTR bstr; + + str = SysAllocStringByteLen(NULL, i); + ok (str != NULL, "Expected non-NULL\n"); + bstr = Get(str); + ok (bstr->dwLen == i, "Expected %d, got %d\n", i, bstr->dwLen); + ok (!bstr->szString[(i+sizeof(WCHAR)-1)/sizeof(WCHAR)], "String not terminated\n"); + SysFreeString(str); + + memset(buf, 0xaa, 1025); + str = SysAllocStringByteLen(buf, i); + ok (str != NULL, "Expected non-NULL\n"); + bstr = Get(str); + ok (bstr->dwLen == i, "Expected %d, got %d\n", i, bstr->dwLen); + buf[i] = 0; + ok (!lstrcmpA((LPCSTR)bstr->szString, buf), "String different\n"); + ok (!bstr->szString[(i+sizeof(WCHAR)-1)/sizeof(WCHAR)], "String not terminated\n"); + SysFreeString(str); + } + HeapFree(GetProcessHeap(), 0, buf); } static void test_SysReAllocString(void)

1 0

Sebastian Lackner : server: Implement wineserver call for SystemHandleInformation.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 08706ef357e7feb8d12f89e1b9c44fdc31cd4da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08706ef357e7feb8d12f89e1b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Dec 24 13:08:50 2015 +0100 server: Implement wineserver call for SystemHandleInformation. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 49 ++++++++++++++++++++++++++++++------ dlls/ntdll/tests/info.c | 10 ++++---- include/wine/server_protocol.h | 28 ++++++++++++++++++++- server/handle.c | 56 ++++++++++++++++++++++++++++++++++++++++++ server/protocol.def | 16 ++++++++++++ server/request.h | 5 ++++ server/trace.c | 30 ++++++++++++++++++++++ 7 files changed, 180 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08706ef357e7feb8d12f8…

1 0

Andrey Gusev : wine.inf: Fix LanguagePack entry.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 0bb7b65a32b391dd196db01b1c8e10339f9e4909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bb7b65a32b391dd196db01b1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Dec 26 13:31:18 2015 +0200 wine.inf: Fix LanguagePack entry. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index fb2583d..7178140 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -491,7 +491,7 @@ HKLM,%CurrentVersionNT%\FontSubstitutes,,16 HKLM,%CurrentVersionNT%\Gre_Initialize,,16 HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1" HKLM,%CurrentVersionNT%\Image File Execution Options,,16 -HKLM,%CurrentVersionNT%\Language Pack,,16 +HKLM,%CurrentVersionNT%\LanguagePack,,16 HKLM,%CurrentVersionNT%\NetworkCards,,16 HKLM,%CurrentVersionNT%\OpenGLDrivers,,16 HKLM,%CurrentVersionNT%\Perflib,,16 @@ -3334,7 +3334,7 @@ HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\Fonts,"SymbolicLin HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\FontSubstitutes,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\Gre_Initialize,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\Gre_Initialize" HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\Image File Execution Options,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options" -HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\Language Pack,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\Language Pack" +HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\LanguagePack,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\LanguagePack" HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\NetworkCards,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\NetworkCards" HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\Perflib,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\Perflib" HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\Ports,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\Ports"

1 0

Frédéric Delanoy : loader: Update French translation of wine manpage.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 64935d61d9d0d5f789f26260d52ccf96f1a24840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64935d61d9d0d5f789f26260d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Dec 27 01:40:48 2015 +0100 loader: Update French translation of wine manpage. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.fr.UTF-8.man.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/wine.fr.UTF-8.man.in b/loader/wine.fr.UTF-8.man.in index 2d4c543..c2a2ae6 100644 --- a/loader/wine.fr.UTF-8.man.in +++ b/loader/wine.fr.UTF-8.man.in @@ -24,11 +24,11 @@ Pour déboguer wine, utilisez plutôt Pour exécuter des applications en ligne de commande (programmes Windows console), préférez .BR wineconsole . -Cela permet d'afficher la sortie dans une fenêtre séparée (nécessite X11). +Cela permet d'afficher la sortie dans une fenêtre séparée. Si vous n'utilisez pas .B wineconsole pour les programmes en ligne de commande, le support console sera très limité et votre -programme peut ne pas fonctionner correctement. +programme pourrait ne pas fonctionner correctement. .PP Lorsque wine est invoqué avec .B --help

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: c7a0af4830c0aedfe9c0130ca4126dfe0a5cb984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7a0af4830c0aedfe9c0130ca… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 26 15:08:13 2015 +0100 po: Update French translation. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/po/fr.po b/po/fr.po index 251a140..56d34c2 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-10-03 11:45+0100\n" +"PO-Revision-Date: 2015-12-26 15:07+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: French\n" "Language: fr\n" @@ -8632,58 +8632,44 @@ msgid "Wine" msgstr "Wine" #: winemac.rc:33 -#, fuzzy -#| msgid "Hide" msgid "Hide %@" -msgstr "Cacher" +msgstr "Cacher %@" #: winemac.rc:35 -#, fuzzy -#| msgid "Other" msgid "Hide Others" -msgstr "Autre" +msgstr "Cacher les autres" #: winemac.rc:36 -#, fuzzy -#| msgid "Show" msgid "Show All" -msgstr "Afficher" +msgstr "Tout afficher" #: winemac.rc:37 msgid "Quit %@" -msgstr "" +msgstr "Quitter %@" #: winemac.rc:38 msgid "Quit" -msgstr "" +msgstr "Quitter" #: winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "&Fenêtre" +msgstr "Fenêtre" #: winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "&Réduire" +msgstr "Réduire" #: winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" -msgstr "Zoom avant" +msgstr "Zoom" #: winemac.rc:43 msgid "Enter Full Screen" -msgstr "" +msgstr "Plein écran" #: winemac.rc:44 -#, fuzzy -#| msgid "&Bring To Front" msgid "Bring All to Front" -msgstr "Toujours &visible" +msgstr "Tout amener à l'avant-plan" #: wineps.rc:31 msgid "Paper Si&ze:" @@ -13117,7 +13103,7 @@ msgstr "" "\n" "Options :\n" " --help\t Afficher ces informations.\n" -" --list\t Lister toutes les applications installées dans ce préfix " +" --list\t Lister toutes les applications installées dans ce préfixe " "Wine.\n" " --remove {GUID} Désinstaller l'application spécifiée.\n" "\t\t Utilisez « --list » pour déterminer le GUID de l'application.\n"

1 0

Austin English : include/bugs.php: don't exclude RESOLVED FIXED bugs
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: appdb Branch: master Commit: 822908762fa0e5950f626ed27df520f6d5dc50e3 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=822908762fa0e5950f626ed2… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 23 01:31:57 2015 -0600 include/bugs.php: don't exclude RESOLVED FIXED bugs This code was written before RESOLVED FIXED bugs started being closed on a regular basis. Given that the bugs are now closed with every release, bugs that aren't yet fixed in the latest release should be visible to users looking at applications. Originally reported by Rosanne Dimesio here: https://www.winehq.org/pipermail/wine-devel/2015-September/109432.html Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/bugs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/bugs.php b/include/bugs.php index d933b7c..63853d7 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -370,7 +370,7 @@ class Bug function isOpen() { - return ($this->sBug_status != 'RESOLVED' && $this->sBug_status != 'CLOSED'); + return ($this->sBug_status != 'CLOSED'); } function allowAnonymousSubmissions()

1 0

Frédéric Delanoy : French translation for release 1.8-rc2 (try 2)
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: website Branch: master Commit: 0fb28da76fbbdf6027b0f3fbcf9236f49d21530a URL: http://source.winehq.org/git/website.git/?a=commit;h=0fb28da76fbbdf6027b0f3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 26 12:51:53 2015 +0100 French translation for release 1.8-rc2 (try 2) Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2015112701.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/news/fr/2015112701.xml b/news/fr/2015112701.xml new file mode 100644 index 0000000..595d529 --- /dev/null +++ b/news/fr/2015112701.xml @@ -0,0 +1,11 @@ +<news> +<date>27 novembre 2015</date> +<title>Sortie de Wine 1.8-rc2</title> +<body> +La version de développement 1.8-rc2 de Wine est disponible. +<a href="{$root}/announce/1.8-rc2">Nouveautés</a> de cette version : +<ul> + <li>Corrections de bugs uniquement : la période de gel du code est en cours.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc2.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : Update French downloads page
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: website Branch: master Commit: 958d762fee123eaa664d308e7dc7fd74f5880c56 URL: http://source.winehq.org/git/website.git/?a=commit;h=958d762fee123eaa664d30… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Dec 27 22:03:58 2015 +0100 Update French downloads page Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/fr/download.template | 74 +++++++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 33 deletions(-) diff --git a/templates/fr/download.template b/templates/fr/download.template index 0391209..59cb7b1 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -56,60 +56,68 @@ center;">Voyez la <table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> <tr> - <td align="center" bgcolor="black">Système</td> - <td align="center" bgcolor="black">Notes</td> + <td align="center" bgcolor="black"></td> + <td align="center" bgcolor="black">Paquets binaires WineHQ</td> <td align="center" bgcolor="black">Maintenanceur</td> </tr> - + <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/ubuntu"> - <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Linux" border="0"></a> + <td align="center"></td> + <td align="center">Ces paquets sont construits et supportés par WineHQ. + Veuillez rapporter tout problème rencontré (en anglais) dans le <a href="http://bugs.winehq.org">bugzilla de WineHQ</a>. </td> - <td> <a href="{$root}/download/ubuntu">Paquets Ubuntu</a> - - .deb binaires et sources pour Ubuntu - <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> + <td></td> </tr> - <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/debian"> - <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> + <tr bgcolor="#ffffff"> + <td align="center"> + <img src="{$root}/images/winehq_logo_glass_sm.png" alt="WineHQ" border="0"></a> </td> - <td> <a href="{$root}/download/debian">Paquets Debian</a> - - .deb binaires pour Debian</td> - <td><a href="mailto:pkg-wine-party(a)lists.alioth.debian.org">Debian Wine Party</a></td> + <td> + <a href="http://wiki.winehq.org/Ubuntu">Ubuntu</a> + - paquets binaires WineHQ pour les branches de développement et staging pour Ubuntu 12.04, 14.04, 15.04, 15.10, 16.04 + <a href="http://wiki.winehq.org/Debian">Debian</a> + - paquets binaires WineHQ pour les branches de développement et staging pour Debian Wheezy, Jessie, Stretchi et Sid + <a href="http://wiki.winehq.org/Fedora">Fedora</a> + - paquets binaires WineHQ pour les branches de développement et staging pour Fedora 22 and 23 + <a href="http://wiki.winehq.org/Mageia">Mageia</a> + - paquets binaires WineHQ pour les branches de développement et staging pour Mageia 4 and 5 + Mac OS X + - prévu ; pas encore disponible pour le téléchargement. + <td><a href="mailto: michael(a)fds-team.de">Michael Müller</a></td> + </tr> + + <tr> + <td align="center" bgcolor="black"></td> + <td align="center" bgcolor="black">Paquets binaires des distributions</td> + <td align="center" bgcolor="black">Maintenanceur</td> </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine"> - <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a> + <td align="center"></td> + <td align="center">Ces paquets sont construits et supportés par les distributions. + Veuillez rapporter tout problème rencontré au maintenanceur du paquet. </td> - <td> <a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Paquets Red Hat / CentOS / Fedora</a> - - .rpm binaires et sources pour Red Hat Enterprise Linux 5 et 6, CentOS - 5 et 6, Fedora Linux 16, 17 et distributions compatibles. - Le méta-paquet wine est disponible via <tt>yum</tt> au travers du - dépôt EPEL / Fedora Extras / Fedora en exécutant - <tt>$ yum install wine </tt>" - </td> - <td><a href="mailto:andreas.bierfert_at_lowlatency.de">Andreas Bierfert</a></td> + <td></td> </tr> - + <tr bgcolor="#ffffff"> <td align="center"><a href="http://en.opensuse.org/Wine#Repositories"> <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> - <td> <a href="http://en.opensuse.org/Wine#Repositories">Paquets SUSE</a> - - .rpm binaires et sources et instantanés quotidiens pour openSUSE - 11.4 - 13.2 ainsi que SUSE Linux Enterprise 11. + <td> <a href="http://en.opensuse.org/Wine#Repositories">SUSE</a> + - .rpm binaires et sources, et instantanés quotidiens pour toutes les versions de openSUSE + (11.4 jusqu'à 13.2) et SUSE Linux Enterprise 11. </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> - + <tr bgcolor="#ffffff"> <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware Linux" border="0"></a> </td> - <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Paquets Slackware</a> - - .txz binaires (Slackware 14.0) ou .tgz (pour les versions antérieures)</td> + <td> <a href="http://sourceforge.net/projects/wine/files/Slackware Packages/">Slackware</a> + - .txz binaires (Slackware 14.1), et .tgz binaires (pour les versions plus anciennes)</td> <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> @@ -117,7 +125,7 @@ center;">Voyez la <td align="center"><a href="http://www.freshports.org/emulators/wine/"> <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> </td> - <td> <a href="http://www.freshports.org/emulators/wine/">Paquets FreeBSD</a> + <td> <a href="http://www.freshports.org/emulators/wine/">FreeBSD</a> - code source pour FreeBSD 5.3 ou ultérieur</td> <td><a href="mailto:gerald(a)pfeifer.com">Gerald Pfeifer</a></td> </tr> @@ -129,7 +137,7 @@ center;">Voyez la Parfois, il arrive qu'une adaptation de Wine permette à une application de fonctionner correctement, mais qu'elle ne puisse être incorporée à Wine pour une -raison quelconque. Pour pallier aux imperfections actuelles de Wine, diverses +raison quelconque. Pour pallier les imperfections actuelles de Wine, diverses applications tierces pour utilisateurs finaux ont été conçues au fil des ans. Les développeurs Wine ne supportent en aucun cas ces applications, mais il se peut que vous les trouviez utiles. Pour plus d'informations, voyez notre page

1 0

Frédéric Delanoy : French translation for release 1.8-rc1
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: website Branch: master Commit: bbc9a87b769da5dacbe59a4f5284ee49f100138f URL: http://source.winehq.org/git/website.git/?a=commit;h=bbc9a87b769da5dacbe59a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 26 12:31:48 2015 +0100 French translation for release 1.8-rc1 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2015112001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/fr/2015112001.xml b/news/fr/2015112001.xml new file mode 100644 index 0000000..d332b79 --- /dev/null +++ b/news/fr/2015112001.xml @@ -0,0 +1,13 @@ +<news> +<date>20 novembre 2015</date> +<title>Sortie de Wine 1.8-rc1</title> +<body> +La version de développement 1.8-rc1 de Wine est disponible. + C'est la première version candidate du prochain Wine 1.8. Merci de tester adéquatement cette +version afin que la version 1.8 soit la meilleure possible. +<a href="{$root}/announce/1.8-rc1">Nouveautés</a> de cette version : +<ul> + <li>Corrections de bugs uniquement : la période de gel du code est en cours.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc1.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.8-rc4
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: website Branch: master Commit: c2c9d8b8bfbad3b4e39942cc17a01e3d38a58bec URL: http://source.winehq.org/git/website.git/?a=commit;h=c2c9d8b8bfbad3b4e39942… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 26 12:51:55 2015 +0100 French translation for release 1.8-rc4 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2015121201.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/news/fr/2015121201.xml b/news/fr/2015121201.xml new file mode 100644 index 0000000..72cae71 --- /dev/null +++ b/news/fr/2015121201.xml @@ -0,0 +1,11 @@ +<news> +<date>12 décembre 2015</date> +<title>Sortie de Wine 1.8-rc4</title> +<body> +La version de développement 1.8-rc4 de Wine est disponible. +<a href="{$root}/announce/1.8-rc4">Nouveautés</a> de cette version : +<ul> + <li>Corrections de bugs uniquement : la période de gel du code est en cours.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc4.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.8-rc3
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: website Branch: master Commit: a20805be565576925d72aa4914dc31323eab487c URL: http://source.winehq.org/git/website.git/?a=commit;h=a20805be565576925d72aa… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 26 12:51:54 2015 +0100 French translation for release 1.8-rc3 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2015120401.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/news/fr/2015120401.xml b/news/fr/2015120401.xml new file mode 100644 index 0000000..78f0efb --- /dev/null +++ b/news/fr/2015120401.xml @@ -0,0 +1,11 @@ +<news> +<date>4 décembre 2015</date> +<title>Sortie de Wine 1.8-rc3</title> +<body> +La version de développement 1.8-rc3 de Wine est disponible. +<a href="{$root}/announce/1.8-rc3">Nouveautés</a> de cette version : +<ul> + <li>Corrections de bugs uniquement : la période de gel du code est en cours.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc3.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.8
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: website Branch: master Commit: 388fbe930bbde920f3b67b48b6d02335da485470 URL: http://source.winehq.org/git/website.git/?a=commit;h=388fbe930bbde920f3b67b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 26 13:18:42 2015 +0100 French translation for release 1.8 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2015121901.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/fr/2015121901.xml b/news/fr/2015121901.xml new file mode 100644 index 0000000..fa9132c --- /dev/null +++ b/news/fr/2015121901.xml @@ -0,0 +1,13 @@ +<news> +<date>19 décembre 2015</date> +<title>Sortie de Wine 1.8</title> +<body> + L'équipe de Wine est fière d'annoncer la disponibilité de la version stable 1.8 de Wine. + Cette version représente 17 mois d'efforts de développement et environ 13 000 changements +individuels. Les points forts principaux sont l'implémentation de DirectWrite et Direct2D, et le +nouveau pilote Pulse Audio. + Elle comprend également quantité d'améliorations dans tous les domaines, ainsi que la prise en +charge de nombreuses nouvelles applications et jeux. Voyez les <a href="{$root}/announce/1.8">notes +de version</a> pour un résumé des changements principaux. +Le <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.9.0
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: website Branch: master Commit: 34fb2e43ac3721edf561abe0a18ac4066d24bed0 URL: http://source.winehq.org/git/website.git/?a=commit;h=34fb2e43ac3721edf561ab… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 26 14:18:36 2015 +0100 French translation for release 1.9.0 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2015122501.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2015122501.xml b/news/fr/2015122501.xml new file mode 100644 index 0000000..1579a12 --- /dev/null +++ b/news/fr/2015122501.xml @@ -0,0 +1,15 @@ +<news> +<date>25 décembre 2015</date> +<title>Sortie de Wine 1.9.0</title> +<body> +La version de développement 1.9.0 de Wine est disponible. +<a href="{$root}/announce/1.9.0">Nouveautés</a> de cette version : +<ul> + <li>Certains correctifs différés par la période de gel du code.</li> + <li>Implémentation de WSAPoll.</li> + <li>Correctifs dans la boîte de dialogue standard de sélection de polices.</li> + <li>Améliorations dans le glisser-déposer X11.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.0.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Rosanne DiMesio : Redirect Ubuntu and Debian downloads pages
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: website Branch: master Commit: 25fbae3b5c1fa10b88bb9113dd5f463175d13db7 URL: http://source.winehq.org/git/website.git/?a=commit;h=25fbae3b5c1fa10b88bb91… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Tue Dec 22 15:05:58 2015 -0600 Redirect Ubuntu and Debian downloads pages Redirects /downloads/ubuntu and /downloads/debian to their respective wiki pages. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/htaccess.sample | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/htaccess.sample b/include/htaccess.sample index 5efb8bf..4d04076 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -40,7 +40,9 @@ RedirectPermanent /download.shtml https://www.winehq.org/download RedirectPermanent /download.html https://www.winehq.org/download RedirectPermanent /download-mirrors.html https://www.winehq.org/download RedirectPermanent /download-mirrors.shtml https://www.winehq.org/download -RedirectPermanent /site/download-deb https://www.winehq.org/download/debian +RedirectPermanent /site/download-deb http://wiki.winehq.org/Debian +RedirectPermanent /download/debian http://wiki.winehq.org/Debian +RedirectPermanent /download/ubuntu http://wiki.winehq.org/Ubuntu RedirectPermanent /site/getting_help https://www.winehq.org/help RedirectPermanent /support.shtml https://www.winehq.org/help RedirectPermanent /News/status.html https://www.winehq.org/status

1 0

Rosanne DiMesio : Delete Ubuntu and Debian Downloads pages
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: website Branch: master Commit: f8824624c49c1dbd3e089b03b2bb62ea531e2c2a URL: http://source.winehq.org/git/website.git/?a=commit;h=f8824624c49c1dbd3e089b… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Tue Dec 22 12:27:34 2015 -0600 Delete Ubuntu and Debian Downloads pages Instructions are now on the wiki. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/de/download/ubuntu.template | 66 ------------- templates/en/download/debian.template | 162 ------------------------------- templates/en/download/ubuntu.template | 63 ------------ templates/es/download/deb.template | 112 --------------------- templates/fr/download/ubuntu.template | 67 ------------- templates/pl/download/ubuntu.template | 63 ------------ templates/pt/download/ubuntu.template | 61 ------------ templates/tr/download/ubuntu.template | 50 ---------- templates/uk/download/ubuntu.template | 57 ----------- templates/zh-cn/download/ubuntu.template | 51 ---------- 10 files changed, 752 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=f8824624c49c1dbd3e…

1 0

Alexandre Julliard : Release 1.8.
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: docs Branch: master Commit: fd9b5244c45cf5dda83060ea6a7b3eca9e0a5366 URL: http://source.winehq.org/git/docs.git/?a=commit;h=fd9b5244c45cf5dda83060ea6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 25 20:04:21 2015 +0100 Release 1.8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 104 ++++++++++++++++++++++++++++++++++++++++++++++---------------- VERSION | 2 +- configure | 32 +++++++++++++------ 3 files changed, 100 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=fd9b5244c45cf5dda8306…

1 0

André Hentschel : winelib: Remove some outdated information about the C libraries.
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: docs Branch: master Commit: cb5403292188f6cf2a2ed748c3370a1fa34fff95 URL: http://source.winehq.org/git/docs.git/?a=commit;h=cb5403292188f6cf2a2ed748c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:07:31 2015 +0100 winelib: Remove some outdated information about the C libraries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- en/winelib-porting.sgml | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/en/winelib-porting.sgml b/en/winelib-porting.sgml index d7a6124..bd7731d 100644 --- a/en/winelib-porting.sgml +++ b/en/winelib-porting.sgml @@ -76,43 +76,7 @@ <para> Add <option>-mno-cygwin</option> to your compiler flags. This will cause <command>winebuild</command> to resolve your C - library calls to <filename class="libraryfile">msvcrt.dll</filename>. Many simple - calls which behave the same have been specified as - non-importable from msvcrt; in these cases - <command>winebuild</command> will not resolve them and the - standard linker <command>ld</command> will link to the glibc - version instead. - </para> - <para> - In order to avoid warnings in C (and potential errors in C++) - from not having prototypes, you may need to use a set of MS - compatible header files. These are scheduled for inclusion - into Wine but at the time of writing are not available. Until - they are, you can try prototyping the functions you need, or - just live with the warnings. - </para> - <para> - If you have a set of include files (or when they are available - in Wine), you need to use the <parameter>-isystem - <replaceable>include_path</replaceable></parameter> flag to gcc to tell it to use your - headers in preference to the local system headers. - </para> - <para> - To use option 3, add the names of any symbols that you don't - want to use from msvcrt into your applications - <filename class="extension">.spec</filename> file. For example, if you wanted - the MS specific functions, but not file I/O, you could have a - list like: - </para> - - <programlisting>@ignore = ( fopen fclose fwrite fread fputs fgets )</programlisting> - <para> - Obviously, the complete list would be much longer. Remember - too that some functions are implemented with an underscore in - their name and <function>#define</function>d to that name in - the MS headers. So you may need to find out the name by - examining <filename>dlls/msvcrt/msvcrt.spec</filename> to get - the correct name for your <function>@ignore</function> entry. + library calls to <filename class="libraryfile">msvcrt.dll</filename>. </para> </sect1>

1 0

André Hentschel : wineusr: Update supported versions.
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: docs Branch: master Commit: a2105653d6d0e322d7111b885ce924209fa2e75a URL: http://source.winehq.org/git/docs.git/?a=commit;h=a2105653d6d0e322d7111b885… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:07:23 2015 +0100 wineusr: Update supported versions. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- en/wineusr-introduction.sgml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/wineusr-introduction.sgml b/en/wineusr-introduction.sgml index b487e6d..16f62b1 100644 --- a/en/wineusr-introduction.sgml +++ b/en/wineusr-introduction.sgml @@ -178,7 +178,7 @@ <listitem> <para> Support for running Win64, - Win32 (Win 95/98, NT/2000/XP/2003/Vista/2008/7), + Win32 (Win 95/98, NT/2000/XP/2003/Vista/2008/7/2012/10), Win16 (Win 3.1) and DOS programs </para> </listitem>

1 0

Tag wine-docs-1.8 : Alexandre Julliard : Release 1.8
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: docs Branch: refs/tags/wine-docs-1.8 Tag: 08596751e6e8e73cd88f3faabbc89e438dbe04c8 URL: http://source.winehq.org/git/docs.git/?a=tag;h=08596751e6e8e73cd88f3faabbc8… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 25 20:04:21 2015 +0100 Release 1.8

1 0