wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Alexandre Julliard : server: Always print the full path of objects when dumping them.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: d15f47412effbcb20105d87e94f3a114e0e26449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15f47412effbcb20105d87e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 21:08:56 2016 +0900 server: Always print the full path of objects when dumping them. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/completion.c | 4 +--- server/device.c | 6 +----- server/directory.c | 12 ++---------- server/event.c | 10 ++-------- server/handle.c | 1 + server/mailslot.c | 3 +-- server/mapping.c | 4 +--- server/mutex.c | 4 +--- server/named_pipe.c | 9 ++------- server/object.c | 24 +++++++++++++++++------- server/semaphore.c | 4 +--- server/symlink.c | 6 ++---- server/timer.c | 4 +--- server/winstation.c | 8 ++------ 14 files changed, 35 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d15f47412effbcb20105d…

1 0

Austin English : winspool.drv: Add EnumPrinterKeyA/W stubs.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 110b53affcd00e375e1232b9ce0755defed1a631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=110b53affcd00e375e1232b9c… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 19 13:10:10 2016 -0600 winspool.drv: Add EnumPrinterKeyA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 20 ++++++++++++++++++++ dlls/winspool.drv/winspool.drv.spec | 2 ++ include/winspool.h | 6 ++++++ 3 files changed, 28 insertions(+) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 04def86..cebf6f7 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7527,6 +7527,26 @@ DWORD WINAPI EnumPrinterDataW( HANDLE hPrinter, DWORD dwIndex, LPWSTR pValueName } /***************************************************************************** + * EnumPrinterKeyA [WINSPOOL.@] + * + */ +DWORD WINAPI EnumPrinterKeyA(HANDLE printer, const CHAR *key, CHAR *subkey, DWORD size, DWORD *needed) +{ + FIXME("%p %s %p %x %p\n", printer, debugstr_a(key), subkey, size, needed); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/***************************************************************************** + * EnumPrinterKeyW [WINSPOOL.@] + * + */ +DWORD WINAPI EnumPrinterKeyW(HANDLE printer, const WCHAR *key, WCHAR *subkey, DWORD size, DWORD *needed) +{ + FIXME("%p %s %p %x %p\n", printer, debugstr_w(key), subkey, size, needed); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/***************************************************************************** * EnumPrintProcessorDatatypesA [WINSPOOL.@] * */ diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index b0d30b8..9b8062c 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -124,6 +124,8 @@ @ stdcall EnumPrinterDriversW(wstr wstr long ptr long ptr ptr) @ stdcall EnumPrintersA(long ptr long ptr long ptr ptr) @ stdcall EnumPrintersW(long ptr long ptr long ptr ptr) +@ stdcall EnumPrinterKeyA(long str ptr long ptr) +@ stdcall EnumPrinterKeyW(long wstr ptr long ptr) @ stdcall ExtDeviceMode(long long ptr str str ptr str long) @ stdcall FindClosePrinterChangeNotification(long) @ stdcall FindFirstPrinterChangeNotification(long long long ptr) diff --git a/include/winspool.h b/include/winspool.h index 42097fb..b11438f 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -1789,6 +1789,12 @@ BOOL WINAPI DeletePrintProvidorW(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pPrintProvidorName); #define DeletePrintProvidor WINELIB_NAME_AW(DeletePrintProvidor) +DWORD WINAPI EnumPrinterKeyA(HANDLE printer, const CHAR *key, + CHAR *subkey, DWORD size, DWORD *needed); +DWORD WINAPI EnumPrinterKeyW(HANDLE printer, const WCHAR *key, + WCHAR *subkey, DWORD size, DWORD *needed); +#define EnumPrinterKey WINELIB_NAME_AW(EnumPrinterKey) + DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, LPBYTE pEnumValues, DWORD cbEnumValues, LPDWORD pcbEnumValues, LPDWORD pnEnumValues);

1 0

Alex Henrie : server: Fix duplicate, incorrect comment describing is_fd_signaled.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: df59b040577d7b9bc093968223dcc4de5571efba URL: http://source.winehq.org/git/wine.git/?a=commit;h=df59b040577d7b9bc09396822… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 20 21:02:27 2016 -0700 server: Fix duplicate, incorrect comment describing is_fd_signaled. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/fd.c b/server/fd.c index e3fe292..559a737 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1952,7 +1952,7 @@ void set_fd_signaled( struct fd *fd, int signaled ) if (signaled) wake_up( fd->user, 0 ); } -/* set or clear the fd signaled state */ +/* check if fd is signaled */ int is_fd_signaled( struct fd *fd ) { return fd->signaled;

1 0

Piotr Caban : msvcrt: Add support for $$B datatype description format in unDName.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 6ac2acc34f266e2e59e1d1dd2de0f299e750ee01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac2acc34f266e2e59e1d1dd2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 20 22:01:23 2016 +0100 msvcrt: Add support for $$B datatype description format in unDName. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 2 ++ dlls/msvcrt/undname.c | 32 +++++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index fac1ab5..e67e344 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1321,6 +1321,8 @@ static void test_demangle(void) /* 129 */ {"??$run@XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture@X@@PEAVTask_Render_Preview@@P82@EAAXXZ@Z", "class QFuture<void> __cdecl QtConcurrent::run<void,class Task_Render_Preview>(class Task_Render_Preview * __ptr64,void (__cdecl Task_Render_Preview::*)(void) __ptr64)", "??$run@XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture@X@@PEAVTask_Render_Preview@@P82@EAAXXZ@Z"}, +/* 130 */ {"??_E?$TStrArray@$$BY0BAA@D$0BA@@@UAEPAXI@Z", + "public: virtual void * __thiscall TStrArray<char [256],16>::`vector deleting destructor'(unsigned int)"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 587a602..e6cb61f 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -991,7 +991,37 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, } break; case '$': - if (*sym->current == 'C') + if (*sym->current == 'B') + { + unsigned mark = sym->stack.num; + struct datatype_t sub_ct; + const char* arr = NULL; + sym->current++; + + /* multidimensional arrays */ + if (*sym->current == 'Y') + { + const char* n1; + int num; + + sym->current++; + if (!(n1 = get_number(sym))) goto done; + num = atoi(n1); + + while (num--) + arr = str_printf(sym, "%s[%s]", arr, get_number(sym)); + } + + if (!demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) goto done; + + if (arr) + ct->left = str_printf(sym, "%s %s", sub_ct.left, arr); + else + ct->left = sub_ct.left; + ct->right = sub_ct.right; + sym->stack.num = mark; + } + else if (*sym->current == 'C') { const char *ptr, *ptr_modif;

1 0

Piotr Caban : msvcrt: Add support for member function pointers demangling in unDName function.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 112ad7fc8766b7b09d5026db19f2e826a9c83d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=112ad7fc8766b7b09d5026db1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 20 22:01:12 2016 +0100 msvcrt: Add support for member function pointers demangling in unDName function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 3 +++ dlls/msvcrt/undname.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index cbad1c1..fac1ab5 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1318,6 +1318,9 @@ static void test_demangle(void) /* 128 */ {"??Xstd@@YAAEAV?$complex@M@0@AEAV10@AEBV10@@Z", "class std::complex<float> & std::operator*=(class std::complex<float> &,class std::complex<float> const &)", "??Xstd@@YAAEAV?$complex@M@0@AEAV10@AEBV10@@Z", 2}, +/* 129 */ {"??$run@XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture@X@@PEAVTask_Render_Preview@@P82@EAAXXZ@Z", + "class QFuture<void> __cdecl QtConcurrent::run<void,class Task_Render_Preview>(class Task_Render_Preview * __ptr64,void (__cdecl Task_Render_Preview::*)(void) __ptr64)", + "??$run@XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture@X@@PEAVTask_Render_Preview@@P82@EAAXXZ@Z"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 097f036..587a602 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -859,14 +859,55 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case 'P': /* Pointer */ if (isdigit(*sym->current)) { - /* FIXME: P6 = Function pointer, others who knows.. */ - if (*sym->current++ == '6') + /* FIXME: + * P6 = Function pointer + * P8 = Member function pointer + * others who knows.. */ + if (*sym->current == '8') { char* args = NULL; const char* call_conv; const char* exported; struct datatype_t sub_ct; unsigned mark = sym->stack.num; + const char* class; + const char* modifier; + const char* ptr_modif; + + sym->current++; + + if (!(class = get_class_name(sym))) + goto done; + if (!get_modifier(sym, &modifier, &ptr_modif)) + goto done; + if (modifier) + modifier = str_printf(sym, "%s %s", modifier, ptr_modif); + else if(ptr_modif[0]) + modifier = str_printf(sym, " %s", ptr_modif); + if (!get_calling_convention(*sym->current++, + &call_conv, &exported, + sym->flags & ~UNDNAME_NO_ALLOCATION_LANGUAGE)) + goto done; + if (!demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) + goto done; + + args = get_args(sym, pmt_ref, TRUE, '(', ')'); + if (!args) goto done; + sym->stack.num = mark; + + ct->left = str_printf(sym, "%s%s (%s %s::*", + sub_ct.left, sub_ct.right, call_conv, class); + ct->right = str_printf(sym, ")%s%s", args, modifier); + } + else if (*sym->current == '6') + { + char* args = NULL; + const char* call_conv; + const char* exported; + struct datatype_t sub_ct; + unsigned mark = sym->stack.num; + + sym->current++; if (!get_calling_convention(*sym->current++, &call_conv, &exported,

1 0

Paul Gofman : mscoree: Fix calling convention for mono callback functions.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: b9a0fe18e3cbb4e5c0ac5021b8f041f970ab6c16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a0fe18e3cbb4e5c0ac5021b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jan 20 18:03:40 2016 +0300 mscoree: Fix calling convention for mono callback functions. ms_abi calling convention is required for x86_64 arch. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 12 ++++++------ dlls/mscoree/mscoree_private.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index b0237b3..3d663f1 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -110,11 +110,11 @@ static BOOL get_mono_path(LPWSTR path); static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path); -static MonoAssembly* mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data); +static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data); -static void mono_shutdown_callback_fn(MonoProfiler *prof); +static void CDECL mono_shutdown_callback_fn(MonoProfiler *prof); -static void mono_print_handler_fn(const char *string, INT is_stdout); +static void CDECL mono_print_handler_fn(const char *string, INT is_stdout); static MonoImage* CDECL image_open_module_handle_dummy(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status) @@ -249,12 +249,12 @@ fail: return E_FAIL; } -static void mono_shutdown_callback_fn(MonoProfiler *prof) +static void CDECL mono_shutdown_callback_fn(MonoProfiler *prof) { is_mono_shutdown = TRUE; } -static void mono_print_handler_fn(const char *string, INT is_stdout) +static void CDECL mono_print_handler_fn(const char *string, INT is_stdout) { wine_dbg_printf("%s", string); } @@ -1144,7 +1144,7 @@ HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int return hr; } -static MonoAssembly* mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) +static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) { HRESULT hr; MonoAssembly *result=NULL; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 0c59c42..7843407 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -128,11 +128,11 @@ typedef enum { MONO_IMAGE_IMAGE_INVALID } MonoImageOpenStatus; -typedef MonoAssembly* (*MonoAssemblyPreLoadFunc)(MonoAssemblyName *aname, char **assemblies_path, void *user_data); +typedef MonoAssembly* (CDECL *MonoAssemblyPreLoadFunc)(MonoAssemblyName *aname, char **assemblies_path, void *user_data); -typedef void (*MonoProfileFunc)(MonoProfiler *prof); +typedef void (CDECL *MonoProfileFunc)(MonoProfiler *prof); -typedef void (*MonoPrintCallback) (const char *string, INT is_stdout); +typedef void (CDECL *MonoPrintCallback) (const char *string, INT is_stdout); extern BOOL is_mono_started DECLSPEC_HIDDEN;

1 0

Andrew Eikum : xaudio2: Use an HRESULT return code.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 2b2b179422136d3986229e9b7ff2121f000891f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2b179422136d3986229e9b7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jan 20 14:08:18 2016 -0600 xaudio2: Use an HRESULT return code. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 4f0a11f..5ca592d 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1551,7 +1551,7 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, if(!deviceId){ if(This->ndevs == 0){ LeaveCriticalSection(&This->lock); - return ERROR_NOT_FOUND; + return E_NOTFOUND; } deviceId = This->devids[0]; }

1 0

Alexandre Julliard : configure: Don't check for gst/gstpad.h that we don' t use.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: cfb88194f260b7ada7cc55d216ed2fd8f970cc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb88194f260b7ada7cc55d21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 17:01:13 2016 +0900 configure: Don't check for gst/gstpad.h that we don't use. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 13 +++---------- configure.ac | 16 +++++++--------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/configure b/configure index d0a7266..e422437 100755 --- a/configure +++ b/configure @@ -12634,13 +12634,11 @@ ac_gst_incl="" done GSTREAMER_CFLAGS=$ac_gst_incl CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS" - ac_fn_c_check_header_mongrel "$LINENO" "gst/gstpad.h" "ac_cv_header_gst_gstpad_h" "$ac_includes_default" -if test "x$ac_cv_header_gst_gstpad_h" = xyes; then : - ac_fn_c_check_header_mongrel "$LINENO" "gst/gst.h" "ac_cv_header_gst_gst_h" "$ac_includes_default" + ac_fn_c_check_header_mongrel "$LINENO" "gst/gst.h" "ac_cv_header_gst_gst_h" "$ac_includes_default" if test "x$ac_cv_header_gst_gst_h" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gint64 defined by gst/gst.h is indeed 64-bit" >&5 $as_echo_n "checking whether gint64 defined by gst/gst.h is indeed 64-bit... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <gst/gst.h> int @@ -12654,7 +12652,7 @@ _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gst_pad_new in -lgstreamer-1.0" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gst_pad_new in -lgstreamer-1.0" >&5 $as_echo_n "checking for gst_pad_new in -lgstreamer-1.0... " >&6; } if ${ac_cv_lib_gstreamer_1_0_gst_pad_new+:} false; then : $as_echo_n "(cached) " >&6 @@ -12702,11 +12700,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -else - GSTREAMER_CFLAGS="" -fi - - CPPFLAGS=$ac_save_CPPFLAGS test -z "$GSTREAMER_CFLAGS" || GSTREAMER_CFLAGS=`echo " $GSTREAMER_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` test -z "$GSTREAMER_LIBS" || GSTREAMER_LIBS=`echo " $GSTREAMER_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` diff --git a/configure.ac b/configure.ac index d20791a..6db503c 100644 --- a/configure.ac +++ b/configure.ac @@ -1472,15 +1472,13 @@ then done GSTREAMER_CFLAGS=$ac_gst_incl CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS" - AC_CHECK_HEADER([gst/gstpad.h], - [AC_CHECK_HEADER([gst/gst.h], - [AC_MSG_CHECKING([whether gint64 defined by gst/gst.h is indeed 64-bit]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/gst.h>]], - [[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])], - [AC_MSG_RESULT([yes]) - AC_CHECK_LIB(gstreamer-1.0,gst_pad_new,[:],,[$GSTREAMER_LIBS])], - [AC_MSG_RESULT([no])])])], - [GSTREAMER_CFLAGS=""])]) + AC_CHECK_HEADER([gst/gst.h], + [AC_MSG_CHECKING([whether gint64 defined by gst/gst.h is indeed 64-bit]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/gst.h>]], + [[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])], + [AC_MSG_RESULT([yes]) + AC_CHECK_LIB(gstreamer-1.0,gst_pad_new,[:],,[$GSTREAMER_LIBS])], + [AC_MSG_RESULT([no])])])]) fi WINE_NOTICE_WITH(gstreamer,[test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes], [gstreamer-1.0 base plugins ${notice_platform}development files not found, gstreamer support disabled])

1 0

Alexandre Julliard : configure: Don' t check for gnutls_hash if gnutls is missing entirely.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 90eb492a870470700a351913bc8e0724914bd9c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90eb492a870470700a351913b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 15:53:14 2016 +0900 configure: Don't check for gnutls_hash if gnutls is missing entirely. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 24 ++++++++++++------------ configure.ac | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configure b/configure index a17ad55..d0a7266 100755 --- a/configure +++ b/configure @@ -11585,18 +11585,7 @@ _ACEOF fi -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - GNUTLS_CFLAGS="" -fi - - -CPPFLAGS=$ac_save_CPPFLAGS -test -z "$GNUTLS_CFLAGS" || GNUTLS_CFLAGS=`echo " $GNUTLS_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` -test -z "$GNUTLS_LIBS" || GNUTLS_LIBS=`echo " $GNUTLS_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` - - ac_wine_check_funcs_save_LIBS="$LIBS" + ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $GNUTLS_LIBS" for ac_func in gnutls_hash do : @@ -11613,6 +11602,17 @@ done LIBS="$ac_wine_check_funcs_save_LIBS" fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + GNUTLS_CFLAGS="" +fi + + +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$GNUTLS_CFLAGS" || GNUTLS_CFLAGS=`echo " $GNUTLS_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$GNUTLS_LIBS" || GNUTLS_LIBS=`echo " $GNUTLS_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + +fi if test "x$ac_cv_lib_soname_gnutls" = "x"; then : case "x$with_gnutls" in x) as_fn_append wine_warnings "|libgnutls ${notice_platform}development files not found, no schannel support." ;; diff --git a/configure.ac b/configure.ac index 23fee7b..d20791a 100644 --- a/configure.ac +++ b/configure.ac @@ -1268,10 +1268,10 @@ then [AC_CHECK_HEADER(gnutls/gnutls.h, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h> #include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], - [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\$-deb0\$\\{0,1\\}]])])], + [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\$-deb0\$\\{0,1\\}]]) + WINE_CHECK_LIB_FUNCS(gnutls_hash,[$GNUTLS_LIBS],, + [WINE_NOTICE([libgnutls ${notice_platform}development files too old, no bcrypt hash support.])])])], [GNUTLS_CFLAGS=""])]) - WINE_CHECK_LIB_FUNCS(gnutls_hash,[$GNUTLS_LIBS],, - [WINE_NOTICE([libgnutls ${notice_platform}development files too old, no bcrypt hash support.])]) fi WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], [libgnutls ${notice_platform}development files not found, no schannel support.])

1 0

Jeremy Newman : switch wiki logo to mediawiki
by Jeremy Newman 21 Jan '16

21 Jan '16

Module: website Branch: master Commit: 14bdcd4254c559b288e70a30ae2d32cb7ec52585 URL: http://source.winehq.org/git/website.git/?a=commit;h=14bdcd4254c559b288e70a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 21 09:21:00 2016 -0600 switch wiki logo to mediawiki --- images/mediawiki.png | Bin 0 -> 4877 bytes images/moinmoin.png | Bin 2198 -> 0 bytes templates/de/help.template | 2 +- templates/en/help.template | 2 +- templates/fr/help.template | 2 +- templates/pl/help.template | 2 +- templates/pt/help.template | 2 +- templates/tr/help.template | 2 +- templates/uk/help.template | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) diff --git a/images/mediawiki.png b/images/mediawiki.png new file mode 100644 index 0000000..ce6531a Binary files /dev/null and b/images/mediawiki.png differ diff --git a/images/moinmoin.png b/images/moinmoin.png deleted file mode 100644 index 7d830bb..0000000 Binary files a/images/moinmoin.png and /dev/null differ diff --git a/templates/de/help.template b/templates/de/help.template index 936fc3c..38287e1 100644 --- a/templates/de/help.template +++ b/templates/de/help.template @@ -47,7 +47,7 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </td> <td valign="top"> Du kannst auch in unserem <a href="https://wiki.winehq.org/">Wiki</a> nachschauen, ob du diff --git a/templates/en/help.template b/templates/en/help.template index 58e1905..1358d98 100644 --- a/templates/en/help.template +++ b/templates/en/help.template @@ -45,7 +45,7 @@ <div class="row padding-md"> <div class="col-xs-2 col-md-1 center"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </div> <div class="col-xs-10 col-md-11"> You can also see our <a href="https://wiki.winehq.org/">Wiki</a> to diff --git a/templates/fr/help.template b/templates/fr/help.template index 5f4d627..a02f44d 100644 --- a/templates/fr/help.template +++ b/templates/fr/help.template @@ -47,7 +47,7 @@ payant pour Wine. <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </td> <td valign="top"> Notre <a href="https://wiki.winehq.org/PageD'Accueil">wiki</a> peut aussi vous aider. diff --git a/templates/pl/help.template b/templates/pl/help.template index e88fc56..b071f1b 100644 --- a/templates/pl/help.template +++ b/templates/pl/help.template @@ -46,7 +46,7 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </td> <td valign="top"> Szukaj odpowiedzi na swoje pytania na naszej <a href="https://wiki.winehq.org/Polish">Wiki</a>. diff --git a/templates/pt/help.template b/templates/pt/help.template index 1f59d40..1da308d 100644 --- a/templates/pt/help.template +++ b/templates/pt/help.template @@ -46,7 +46,7 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </td> <td valign="top"> Você também pode ler a nossa <a href="https://wiki.winehq.org/">Wiki</a> para tentar diff --git a/templates/tr/help.template b/templates/tr/help.template index 0c7abc7..bf4addd 100644 --- a/templates/tr/help.template +++ b/templates/tr/help.template @@ -44,7 +44,7 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Viki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Viki</a> </td> <td valign="top"> Sorunuza yanıt bulup bulamayacağınızı görmeniz için ayrıca <a href="https://wiki.winehq.org/">Viki</a> sayfamıza da bakabilirsiniz. diff --git a/templates/uk/help.template b/templates/uk/help.template index 5a2fa2a..0c3d5e6 100644 --- a/templates/uk/help.template +++ b/templates/uk/help.template @@ -41,7 +41,7 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </td> <td valign="top"> Подивіться нашу <a href="https://wiki.winehq.org/">Wiki</a>, щоб знайти відповідь на своє питання.

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2016