December 2008 - Wine-commits

Alexandre Julliard : shell32: Use Win32 functions instead of Unix ones to retrieve the current time.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: 1ccc170b32c0405f07a84a97301524f40fa9c27b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ccc170b32c0405f07a84a973… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 22 11:45:20 2008 +0100 shell32: Use Win32 functions instead of Unix ones to retrieve the current time. --- dlls/shell32/trash.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index a366f62..568c557 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -171,8 +171,7 @@ BOOL TRASH_CanTrashFile(LPCWSTR wszPath) static BOOL try_create_trashinfo_file(const char *info_dir, const char *file_name, const char *original_file_name) { - struct tm curr_time; - time_t curr_time_secs; + SYSTEMTIME curr_time; char datebuf[200]; char *path = SHAlloc(strlen(info_dir)+strlen(file_name)+strlen(trashinfo_suffix)+1); int writer = -1; @@ -186,16 +185,11 @@ static BOOL try_create_trashinfo_file(const char *info_dir, const char *file_nam write(writer, trashinfo_header, strlen(trashinfo_header)); if (!XDG_WriteDesktopStringEntry(writer, "Path", XDG_URLENCODE, original_file_name)) goto error; - - time(&curr_time_secs); - localtime_r(&curr_time_secs, &curr_time); + + GetLocalTime( &curr_time ); wnsprintfA(datebuf, 200, "%04d-%02d-%02dT%02d:%02d:%02d", - curr_time.tm_year+1900, - curr_time.tm_mon+1, - curr_time.tm_mday, - curr_time.tm_hour, - curr_time.tm_min, - curr_time.tm_sec); + curr_time.wYear, curr_time.wMonth, curr_time.wDay, + curr_time.wHour, curr_time.wMinute, curr_time.wSecond); if (!XDG_WriteDesktopStringEntry(writer, "DeletionDate", 0, datebuf)) goto error; close(writer);

1 0

Alexandre Julliard : libport: Add a stub replacement for symlink().
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: 0fbd55696c44ed50dcc3f96978e85e26a7f8be1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fbd55696c44ed50dcc3f9697… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 22 10:47:16 2008 +0100 libport: Add a stub replacement for symlink(). --- configure | 2 ++ configure.ac | 1 + include/config.h.in | 3 +++ include/wine/port.h | 4 ++++ libs/port/Makefile.in | 1 + libs/port/symlink.c | 38 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 49 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 710a174..b31a842 100755 --- a/configure +++ b/configure @@ -17787,6 +17787,7 @@ esac + for ac_func in \ _pclose \ _popen \ @@ -17851,6 +17852,7 @@ for ac_func in \ strtold \ strtoll \ strtoull \ + symlink \ tcgetattr \ thr_kill2 \ timegm \ diff --git a/configure.ac b/configure.ac index c22b4eb..137aea5 100644 --- a/configure.ac +++ b/configure.ac @@ -1417,6 +1417,7 @@ AC_CHECK_FUNCS(\ strtold \ strtoll \ strtoull \ + symlink \ tcgetattr \ thr_kill2 \ timegm \ diff --git a/include/config.h.in b/include/config.h.in index ec24fe2..cee1997 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -765,6 +765,9 @@ /* Define to 1 if `st_mtim' is member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM +/* Define to 1 if you have the `symlink' function. */ +#undef HAVE_SYMLINK + /* Define to 1 if you have the <syscall.h> header file. */ #undef HAVE_SYSCALL_H diff --git a/include/wine/port.h b/include/wine/port.h index 6e1e454..4080444 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -341,6 +341,10 @@ int strcasecmp(const char *str1, const char *str2); # endif #endif /* !defined(HAVE_STRCASECMP) */ +#ifndef HAVE_SYMLINK +int symlink(const char *from, const char *to); +#endif + #ifndef HAVE_USLEEP int usleep (unsigned int useconds); #endif /* !defined(HAVE_USLEEP) */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 68dc8f1..da0b708 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -29,6 +29,7 @@ C_SRCS = \ strcasecmp.c \ strerror.c \ strncasecmp.c \ + symlink.c \ usleep.c all: $(MODULE) diff --git a/libs/port/symlink.c b/libs/port/symlink.c new file mode 100644 index 0000000..efb44ec --- /dev/null +++ b/libs/port/symlink.c @@ -0,0 +1,38 @@ +/* + * symlink function + * + * Copyright 2008 Alexandre Julliard + * + * 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 + */ + +#include "config.h" +#include "wine/port.h" + +#include <errno.h> +#include <stdio.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif + +#ifndef HAVE_SYMLINK + +int symlink( const char *from, const char *to ) +{ + errno = ENOSYS; + return -1; +} + +#endif /* HAVE_SYMLINK */

1 0

Jacek Caban : mshtml: Move preferences settings to separated function.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: e2cb0c82a6f4705eff58212f4d31d4ce53e9a34e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2cb0c82a6f4705eff58212f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 22 01:10:56 2008 +0100 mshtml: Move preferences settings to separated function. --- dlls/mshtml/nsembed.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 34bc6d5..a653e24 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -371,7 +371,6 @@ static void set_bool_pref(nsIPrefBranch *pref, const char *pref_name, BOOL val) static void set_profile(void) { - nsIPrefBranch *pref; nsIProfile *profile; PRBool exists = FALSE; nsresult nsres; @@ -397,6 +396,12 @@ static void set_profile(void) ERR("SetCurrentProfile failed: %08x\n", nsres); nsIProfile_Release(profile); +} + +static void set_preferences(void) +{ + nsIPrefBranch *pref; + nsresult nsres; nsres = nsIServiceManager_GetServiceByContractID(pServMgr, NS_PREFERENCES_CONTRACTID, &IID_nsIPrefBranch, (void**)&pref); @@ -469,6 +474,7 @@ static BOOL init_xpcom(const PRUnichar *gre_path) } set_profile(); + set_preferences(); nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_MEMORY_CONTRACTID, NULL, &IID_nsIMemory, (void**)&nsmem);

1 0

Alexandre Julliard : configure: Better check for the broken mkdir on Windows.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: 921e6624ad63a026b27753c3ae06f931c6d65eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=921e6624ad63a026b27753c3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 22 10:39:11 2008 +0100 configure: Better check for the broken mkdir on Windows. --- configure | 61 +++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 10 +++++++- include/config.h.in | 6 ++-- include/wine/port.h | 4 +- 4 files changed, 73 insertions(+), 8 deletions(-) diff --git a/configure b/configure index e1ce1cf..710a174 100755 --- a/configure +++ b/configure @@ -17787,9 +17787,7 @@ esac - for ac_func in \ - _mkdir \ _pclose \ _popen \ _snprintf \ @@ -18979,6 +18977,65 @@ esac fi +{ $as_echo "$as_me:$LINENO: checking whether mkdir takes only one argument" >&5 +$as_echo_n "checking whether mkdir takes only one argument... " >&6; } +if test "${wine_cv_one_arg_mkdir+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <sys/stat.h> +int +main () +{ +mkdir("foo"); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + wine_cv_one_arg_mkdir=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wine_cv_one_arg_mkdir=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $wine_cv_one_arg_mkdir" >&5 +$as_echo "$wine_cv_one_arg_mkdir" >&6; } +if test "$wine_cv_one_arg_mkdir" = "yes" +then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_ONE_ARG_MKDIR 1 +_ACEOF + +fi + { $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } diff --git a/configure.ac b/configure.ac index 4bf1ec3..c22b4eb 100644 --- a/configure.ac +++ b/configure.ac @@ -1354,7 +1354,6 @@ esac dnl **** Check for functions **** AC_CHECK_FUNCS(\ - _mkdir \ _pclose \ _popen \ _snprintf \ @@ -1487,6 +1486,15 @@ fi WINE_NOTICE_WITH(ldap,[test "x$LDAPLIBS" = "x"], [libldap (OpenLDAP) ${notice_platform}development files not found, LDAP won't be supported.]) +AC_CACHE_CHECK([whether mkdir takes only one argument], + wine_cv_one_arg_mkdir, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]],[[mkdir("foo");]])], + [wine_cv_one_arg_mkdir=yes],[wine_cv_one_arg_mkdir=no])) +if test "$wine_cv_one_arg_mkdir" = "yes" +then + AC_DEFINE(HAVE_ONE_ARG_MKDIR, 1, [Define if mkdir takes only one argument]) +fi + dnl **** Check for types **** AC_C_CONST diff --git a/include/config.h.in b/include/config.h.in index 330564e..ec24fe2 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -507,6 +507,9 @@ /* Define to 1 if the system has the type `off_t'. */ #undef HAVE_OFF_T +/* Define if mkdir takes only one argument */ +#undef HAVE_ONE_ARG_MKDIR + /* Define if OpenGL is present on the system */ #undef HAVE_OPENGL @@ -1002,9 +1005,6 @@ /* Define if Xrender has the XRenderSetPictureTransform function */ #undef HAVE_XRENDERSETPICTURETRANSFORM -/* Define to 1 if you have the `_mkdir' function. */ -#undef HAVE__MKDIR - /* Define to 1 if you have the `_pclose' function. */ #undef HAVE__PCLOSE diff --git a/include/wine/port.h b/include/wine/port.h index fd37698..6e1e454 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -114,8 +114,8 @@ struct statvfs #define RTLD_GLOBAL 0x100 #endif -#ifdef HAVE__MKDIR -#define mkdir(path,mode) _mkdir(path) +#ifdef HAVE_ONE_ARG_MKDIR +#define mkdir(path,mode) mkdir(path) #endif #if !defined(HAVE_FTRUNCATE) && defined(HAVE_CHSIZE)

1 0

Andrew Talbot : riched20: Remove unused Wine debug channel.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: 634dfd65f831f2d4a02505b7e5fda79826f70729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=634dfd65f831f2d4a02505b7e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 20 15:15:30 2008 +0000 riched20: Remove unused Wine debug channel. --- dlls/riched20/table.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 3581306..c9aadb0 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -54,8 +54,7 @@ #include "editor.h" #include "rtf.h" -WINE_DEFAULT_DEBUG_CHANNEL(richedit); -WINE_DECLARE_DEBUG_CHANNEL(richedit_lists); +WINE_DEFAULT_DEBUG_CHANNEL(richedit_lists); static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, int nCursor, @@ -176,7 +175,7 @@ void ME_CheckTablesForCorruption(ME_TextEditor *editor) { if(TRACE_ON(richedit_lists)) { - TRACE_(richedit_lists)("---\n"); + TRACE("---\n"); ME_DumpDocument(editor->pBuffer); } #ifndef NDEBUG

1 0

Vitaliy Margolen : winmm: Stub joyConfigChanged.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: cb32c954bae7ff7159e4af96c0b1ee6181898431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb32c954bae7ff7159e4af96c… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Dec 20 12:25:50 2008 -0700 winmm: Stub joyConfigChanged. --- dlls/winmm/joystick.c | 9 +++++++++ dlls/winmm/winmm.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index f3cffdf..d5d620b 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -121,6 +121,15 @@ static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTi } /************************************************************************** + * joyConfigChanged [WINMM.@] + */ +MMRESULT WINAPI joyConfigChanged(DWORD flags) +{ + FIXME("(%x) - stub\n", flags); + return JOYERR_NOERROR; +} + +/************************************************************************** * joyGetNumDevs [WINMM.@] */ UINT WINAPI joyGetNumDevs(void) diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec index b4043c9..870b775 100644 --- a/dlls/winmm/winmm.spec +++ b/dlls/winmm/winmm.spec @@ -26,7 +26,7 @@ @ stdcall auxGetVolume(long ptr) @ stdcall auxOutMessage(long long long long) @ stdcall auxSetVolume(long long) -@ stub joyConfigChanged +@ stdcall joyConfigChanged(long) @ stdcall joyGetDevCapsA(long ptr long) @ stdcall joyGetDevCapsW(long ptr long) @ stdcall joyGetNumDevs()

1 0

Rico Schüller : wined3d: Fix compilation for Windows build.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: b061f64228fd25066b7123ea9ce8bf0d4865f035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b061f64228fd25066b7123ea9… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Dec 21 00:31:50 2008 +0100 wined3d: Fix compilation for Windows build. --- dlls/wined3d/directx.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d5fd0a5..7c80750 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4174,7 +4174,6 @@ BOOL InitAdapters(void) { ERR("Can't load opengl32.dll!\n"); goto nogl_adapter; } - mod_win32gl = mod_gl; #else #define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn); /* To bypass the opengl32 thunks load wglGetProcAddress from gdi32 (glXGetProcAddress wrapper) instead of opengl32's */

1 0

Jacek Caban : mshtml: Pass window to GetCommandState and DoCommand.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: 7af33293a4129a2582ef95162417cae32e55889e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af33293a4129a2582ef95162… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 22 01:10:37 2008 +0100 mshtml: Pass window to GetCommandState and DoCommand. --- dlls/mshtml/editor.c | 2 +- dlls/mshtml/olecmd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index efbaf23..7cbdf2e 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -137,7 +137,7 @@ static nsresult get_ns_command_state(NSContainer *This, const char *cmd, nsIComm return nsres; } - nsres = nsICommandManager_GetCommandState(cmdmgr, cmd, NULL, nsparam); + nsres = nsICommandManager_GetCommandState(cmdmgr, cmd, This->doc->window->nswindow, nsparam); if(NS_FAILED(nsres)) ERR("GetCommandState(%s) failed: %08x\n", debugstr_a(cmd), nsres); diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 0b1b477..a122e0c 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -52,7 +52,7 @@ void do_ns_command(NSContainer *This, const char *cmd, nsICommandParams *nsparam return; } - nsres = nsICommandManager_DoCommand(cmdmgr, cmd, nsparam, NULL); + nsres = nsICommandManager_DoCommand(cmdmgr, cmd, nsparam, This->doc->window->nswindow); if(NS_FAILED(nsres)) ERR("DoCommand(%s) failed: %08x\n", debugstr_a(cmd), nsres);

1 0

Jacek Caban : mshtml: Release owner in nsChannel destructor.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: a47292a3abbc811a5a357e82fd45fab430798c95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a47292a3abbc811a5a357e82f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 22 01:10:47 2008 +0100 mshtml: Release owner in nsChannel destructor. --- dlls/mshtml/nsio.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 1dca2a4..c918d12 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -219,6 +219,8 @@ static nsrefcnt NSAPI nsChannel_Release(nsIHttpChannel *iface) nsIChannel_Release(This->channel); if(This->http_channel) nsIHttpChannel_Release(This->http_channel); + if(This->owner) + nsISupports_Release(This->owner); if(This->post_data_stream) nsIInputStream_Release(This->post_data_stream); if(This->load_group)

1 0

Andrew Talbot : winealsa.drv: Do nothing if HAVE_ALSA is not defined.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: a3a2506d5225dfbafdcce29aaff81fe36efb25b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a2506d5225dfbafdcce29aa… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 20 15:02:38 2008 +0000 winealsa.drv: Do nothing if HAVE_ALSA is not defined. --- dlls/winealsa.drv/waveinit.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c index 4bdaeff..450c2ca 100644 --- a/dlls/winealsa.drv/waveinit.c +++ b/dlls/winealsa.drv/waveinit.c @@ -25,6 +25,9 @@ */ #include "config.h" + +#ifdef HAVE_ALSA + #include "wine/port.h" #include <stdlib.h> @@ -65,8 +68,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); -#ifdef HAVE_ALSA - /*---------------------------------------------------------------------------- ** ALSA_TestDeviceForWine **

1 0