May 2010 - Wine-commits - list.winehq.org

Robert Wilhelm : include: Add struct _stat32i64 and struct _stat64i32.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: b3429e883c8977ceb3df6660d38b24d7d5cfbc16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3429e883c8977ceb3df6660d… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Wed May 26 10:13:31 2010 +0200 include: Add struct _stat32i64 and struct _stat64i32. --- include/msvcrt/sys/stat.h | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/sys/stat.h b/include/msvcrt/sys/stat.h index 1712788..9362d2d 100644 --- a/include/msvcrt/sys/stat.h +++ b/include/msvcrt/sys/stat.h @@ -83,6 +83,34 @@ struct stat { time_t st_ctime; }; +struct _stat32i64 { + _dev_t st_dev; + _ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + _dev_t st_rdev; + __int64 DECLSPEC_ALIGN(8) st_size; + time_t st_atime; + time_t st_mtime; + time_t st_ctime; +}; + +struct _stat64i32 { + _dev_t st_dev; + _ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + _dev_t st_rdev; + _off_t st_size; + __time64_t st_atime; + __time64_t st_mtime; + __time64_t st_ctime; +}; + struct _stati64 { _dev_t st_dev; _ino_t st_ino;

1 0

Robert Wilhelm : msvcrt90: Add fstat64i32.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: d9746e3ed72bf6d6ea072fd7f1258e909b81360f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9746e3ed72bf6d6ea072fd7f… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Wed May 26 10:34:51 2010 +0200 msvcrt90: Add fstat64i32. --- dlls/msvcr90/msvcr90.c | 31 +++++++++++++++++++++++++++++++ dlls/msvcr90/msvcr90.spec | 2 +- 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index eaf9d66..3372e0b 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" +#include "sys/stat.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcr90); @@ -158,3 +159,33 @@ void* CDECL _recalloc(void* mem, size_t num, size_t size) memset((BYTE*)mem+old_size, 0, size-old_size); return ret; } + +/********************************************************************* + * _fstat64i32 (MSVCRT.@) + */ + +static void msvcrt_stat64_to_stat64i32(const struct _stat64 *buf64, struct _stat64i32 *buf) +{ + buf->st_dev = buf64->st_dev; + buf->st_ino = buf64->st_ino; + buf->st_mode = buf64->st_mode; + buf->st_nlink = buf64->st_nlink; + buf->st_uid = buf64->st_uid; + buf->st_gid = buf64->st_gid; + buf->st_rdev = buf64->st_rdev; + buf->st_size = buf64->st_size; + buf->st_atime = buf64->st_atime; + buf->st_mtime = buf64->st_mtime; + buf->st_ctime = buf64->st_ctime; +} + +int CDECL _fstat64i32(int fd, struct _stat64i32* buf) +{ + int ret; + struct _stat64 buf64; + + ret = _fstat64(fd, &buf64); + if (!ret) + msvcrt_stat64_to_stat64i32(&buf64, buf); + return ret; +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index be4a675..f350d18 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -433,7 +433,7 @@ @ stub _fstat32 @ stub _fstat32i64 @ cdecl _fstat64(long ptr) msvcrt._fstat64 -@ stub _fstat64i32 +@ cdecl _fstat64i32(long ptr) @ stub _ftell_nolock @ stub _ftelli64 @ stub _ftelli64_nolock

1 0

Robert Wilhelm : msvcrt90: Add stat64i32.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: 5d4a7433a64dae95713fecb8a3d6c4f2a471ca37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d4a7433a64dae95713fecb8a… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Wed May 26 10:39:06 2010 +0200 msvcrt90: Add stat64i32. --- dlls/msvcr90/msvcr90.c | 14 ++++++++++++++ dlls/msvcr90/msvcr90.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 3372e0b..43a1834 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -189,3 +189,17 @@ int CDECL _fstat64i32(int fd, struct _stat64i32* buf) msvcrt_stat64_to_stat64i32(&buf64, buf); return ret; } + +/********************************************************************* + * _stat64i32 (MSVCRT.@) + */ +int CDECL _stat64i32(const char* path, struct _stat64i32 * buf) +{ + int ret; + struct _stat64 buf64; + + ret = _stat64(path, &buf64); + if (!ret) + msvcrt_stat64_to_stat64i32(&buf64, buf); + return ret; +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f350d18..6592e7c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -912,7 +912,7 @@ @ stub _stat32 @ stub _stat32i64 @ cdecl _stat64(str ptr) msvcrt._stat64 -@ stub _stat64i32 +@ cdecl _stat64i32(str ptr) @ cdecl _statusfp() msvcrt._statusfp @ stub _statusfp2 @ stub _strcoll_l

1 0

Marcus Meissner : d3dx9_36: Fixed off by 1 in the usage_idx check (Coverity ).
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: 41809d5833950d5664515cc182a07bb89e8cf99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=41809d5833950d5664515cc18… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue May 25 23:40:59 2010 +0200 d3dx9_36: Fixed off by 1 in the usage_idx check (Coverity). --- dlls/d3dx9_36/bytecodewriter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c index 384fed3..055b8ef 100644 --- a/dlls/d3dx9_36/bytecodewriter.c +++ b/dlls/d3dx9_36/bytecodewriter.c @@ -435,7 +435,7 @@ static HRESULT vs_find_builtin_varyings(struct bc_writer *This, const struct bwr break; case BWRITERDECLUSAGE_TEXCOORD: - if(usage_idx > 8) { + if(usage_idx >= 8) { WARN("dcl_color%u not supported in sm 1/2 shaders\n", usage_idx); return E_INVALIDARG; }

1 0

Michael Stefaniuc : ole32: Avoid potential NULL pointer dereferences in a TRACE.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: 162e420f0ef8c78d877113b72b74c580e2f750b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=162e420f0ef8c78d877113b72… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 26 01:27:58 2010 +0200 ole32: Avoid potential NULL pointer dereferences in a TRACE. --- dlls/ole32/clipboard.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 2afc77e..3064bb0 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1266,10 +1266,10 @@ static HRESULT WINAPI snapshot_GetDataHere(IDataObject *iface, FORMATETC *fmt, ole_priv_data_entry *entry; TYMED supported; - TRACE("(%p, %p {%s}, %p (tymed %x)\n", iface, fmt, dump_fmtetc(fmt), med, med->tymed); - if ( !fmt || !med ) return E_INVALIDARG; + TRACE("(%p, %p {%s}, %p (tymed %x)\n", iface, fmt, dump_fmtetc(fmt), med, med->tymed); + if ( !OpenClipboard(NULL)) return CLIPBRD_E_CANT_OPEN; if(!This->data)

1 0

Andrew Nguyen : configure: Don' t enable maintainer mode if it is explicitly not requested.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: 2eda9c72cd646ee37b8d94feae78206172928cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eda9c72cd646ee37b8d94fea… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue May 25 22:20:14 2010 -0500 configure: Don't enable maintainer mode if it is explicitly not requested. --- configure | 12 ++++++------ configure.ac | 9 +++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 54573a4..cf2fc9d 100755 --- a/configure +++ b/configure @@ -671,6 +671,7 @@ CPP OPENGL_LIBS XLIB PRELINK +MAINTAINER_MODE ICOTOOL CONVERT RSVG @@ -715,7 +716,6 @@ build_os build_vendor build_cpu build -MAINTAINER_MODE target_alias host_alias build_alias @@ -2490,9 +2490,6 @@ fi # Check whether --enable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; -else - MAINTAINER_MODE=\# - fi @@ -5106,8 +5103,11 @@ done test -n "$ICOTOOL" || ICOTOOL="false" -if test "${enable_maintainer_mode+set}" = set +if test "x$enable_maintainer_mode" != "xyes" then + MAINTAINER_MODE=\# + +else if test "$FONTFORGE" = "false"; then as_fn_append wine_warnings "|fontforge is missing, fonts can't be rebuilt."; fi if test "$RSVG" = "false"; then as_fn_append wine_warnings "|rsvg is missing, icons can't be rebuilt."; fi @@ -11895,7 +11895,7 @@ $as_echo "$ac_cv_c_string_h_warnings" >&6; } EXTRACFLAGS="$EXTRACFLAGS -Wpointer-arith" fi - if test "${enable_maintainer_mode+set}" = set + if test "x$enable_maintainer_mode" = "xyes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror" >&5 $as_echo_n "checking whether the compiler supports -Werror... " >&6; } diff --git a/configure.ac b/configure.ac index 4c0cdbe..8d2dffe 100644 --- a/configure.ac +++ b/configure.ac @@ -25,8 +25,7 @@ dnl **** Command-line arguments **** AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 support])) AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)])) AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests])) -AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules]), - ,[AC_SUBST([MAINTAINER_MODE],[\#])]) +AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules])) AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]), [if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi]) @@ -286,8 +285,10 @@ AC_CHECK_PROGS(RSVG, rsvg, false) AC_CHECK_PROGS(CONVERT, convert, false) AC_CHECK_PROGS(ICOTOOL, icotool, false) -if test "${enable_maintainer_mode+set}" = set +if test "x$enable_maintainer_mode" != "xyes" then + AC_SUBST([MAINTAINER_MODE],[\#]) +else if test "$FONTFORGE" = "false"; then WINE_WARNING([fontforge is missing, fonts can't be rebuilt.]); fi if test "$RSVG" = "false"; then WINE_WARNING([rsvg is missing, icons can't be rebuilt.]); fi @@ -1610,7 +1611,7 @@ then fi dnl Enable -Werror for maintainer mode - if test "${enable_maintainer_mode+set}" = set + if test "x$enable_maintainer_mode" = "xyes" then WINE_TRY_CFLAGS([-Werror]) fi

1 0

Austin English : winebuild: FreeBSD 64-bit binaries are elf_x86_64_fbsd.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: f125b82c2021f3051e86f082e72089b9cea071ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f125b82c2021f3051e86f082e… Author: Austin English <austinenglish(a)gmail.com> Date: Tue May 25 23:39:34 2010 -0500 winebuild: FreeBSD 64-bit binaries are elf_x86_64_fbsd. --- tools/winebuild/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index d9cc5ee..b690bab 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -305,7 +305,7 @@ const char *get_ld_command(void) args = (force_pointer_size == 8) ? " -arch x86_64" : " -arch i386"; break; case PLATFORM_FREEBSD: - args = (force_pointer_size == 8) ? " -m elf_x86_64" : " -m elf_i386_fbsd"; + args = (force_pointer_size == 8) ? " -m elf_x86_64_fbsd" : " -m elf_i386_fbsd"; break; default: args = (force_pointer_size == 8) ? " -m elf_x86_64" : " -m elf_i386";

1 0

Gerald Pfeifer : rsaenh: Simplify store_key_container_permissions.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: c8748d73d16e511e70a0065be50e82f425d66d94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8748d73d16e511e70a0065be… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon May 24 21:43:15 2010 +0200 rsaenh: Simplify store_key_container_permissions. --- dlls/rsaenh/rsaenh.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 89bb786..d7d63b1 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1167,16 +1167,6 @@ static void store_key_container_keys(KEYCONTAINER *pKeyContainer) static void store_key_container_permissions(KEYCONTAINER *pKeyContainer) { HKEY hKey; - DWORD dwFlags; - - /* On WinXP, persistent keys are stored in a file located at: - * $AppData$\\Microsoft\\Crypto\\RSA\\$SID$\\some_hex_string - */ - - if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET) - dwFlags = CRYPTPROTECT_LOCAL_MACHINE; - else - dwFlags = 0; if (create_container_key(pKeyContainer, KEY_WRITE, &hKey)) {

1 0

Gerald Pfeifer : dbghelp: Remove variable basic_block which is not really used from dwarf2_parse_line_numbers .
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: 72216a604d46037906fe087e2d67face21acdc49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72216a604d46037906fe087e2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon May 24 22:15:41 2010 +0200 dbghelp: Remove variable basic_block which is not really used from dwarf2_parse_line_numbers. --- dlls/dbghelp/dwarf.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4be0f6a..35c01a6 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2003,7 +2003,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, unsigned file = 1; unsigned line = 1; unsigned is_stmt = default_stmt; - BOOL basic_block = FALSE, end_sequence = FALSE; + BOOL end_sequence = FALSE; unsigned opcode, extopcode, i; while (!end_sequence) @@ -2017,7 +2017,6 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, address += (delta / line_range) * insn_size; line += line_base + (delta % line_range); - basic_block = TRUE; dwarf2_set_line_number(ctx->module, address, &files, file, line); } else @@ -2025,7 +2024,6 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, switch (opcode) { case DW_LNS_copy: - basic_block = FALSE; dwarf2_set_line_number(ctx->module, address, &files, file, line); break; case DW_LNS_advance_pc: @@ -2044,7 +2042,6 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, is_stmt = !is_stmt; break; case DW_LNS_set_basic_block: - basic_block = 1; break; case DW_LNS_const_add_pc: address += ((255 - opcode_base) / line_range) * insn_size;

1 0

Gerald Pfeifer : wordpad: Remove variable bottom which is not really used from print.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: f26b4f68e74b20995521f5c805062b1d70026614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26b4f68e74b20995521f5c80… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon May 24 22:09:16 2010 +0200 wordpad: Remove variable bottom which is not really used from print. --- programs/wordpad/print.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 226052e..1d4e6e3 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -487,7 +487,6 @@ static void print(LPPRINTDLGW pd, LPWSTR wszFileName) StartDocW(fr.hdc, &di); do { - int bottom = fr.rc.bottom; if(StartPage(fr.hdc) <= 0) break; @@ -495,7 +494,6 @@ static void print(LPPRINTDLGW pd, LPWSTR wszFileName) if(EndPage(fr.hdc) <= 0) break; - bottom = fr.rc.bottom; printedPages++; if((pd->Flags & PD_PAGENUMS) && (printedPages > (pd->nToPage - pd->nFromPage)))

1 0