November 2006 - Wine-commits

Kirill K. Smirnov : ole32: Fix logic in Storage32Impl_SmallBlocksToBigBlocks function.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 3cd3ca68fe8f62257e1c3e0e49f80713b181e24b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd3ca68fe8f62257e1c3e0e4… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Sun Nov 26 16:47:54 2006 +0300 ole32: Fix logic in Storage32Impl_SmallBlocksToBigBlocks function. --- dlls/ole32/storage32.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index cd67465..733f659 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3555,7 +3555,8 @@ BlockChainStream* Storage32Impl_SmallBlo { ULONG bbHeadOfChain = BLOCK_END_OF_CHAIN; ULARGE_INTEGER size, offset; - ULONG cbRead, cbWritten, cbTotalRead, cbTotalWritten; + ULONG cbRead, cbWritten; + ULARGE_INTEGER cbTotalRead; ULONG propertyIndex; HRESULT resWrite = S_OK; HRESULT resRead; @@ -3585,8 +3586,7 @@ BlockChainStream* Storage32Impl_SmallBlo */ offset.u.LowPart = 0; offset.u.HighPart = 0; - cbTotalRead = 0; - cbTotalWritten = 0; + cbTotalRead.QuadPart = 0; buffer = HeapAlloc(GetProcessHeap(),0,DEF_SMALL_BLOCK_SIZE); do @@ -3601,7 +3601,7 @@ BlockChainStream* Storage32Impl_SmallBlo if (cbRead > 0) { - cbTotalRead += cbRead; + cbTotalRead.QuadPart += cbRead; resWrite = BlockChainStream_WriteAt(bbTempChain, offset, @@ -3612,10 +3612,9 @@ BlockChainStream* Storage32Impl_SmallBlo if (FAILED(resWrite)) break; - cbTotalWritten += cbWritten; offset.u.LowPart += This->smallBlockSize; } - } while (cbRead > 0); + } while (cbTotalRead.QuadPart < size.QuadPart); HeapFree(GetProcessHeap(),0,buffer); if (FAILED(resRead) || FAILED(resWrite))

1 0

Louis Lenders : crypt32: Add test for I_CryptInstallOssGlobal.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 532f57a243f442825c7c3ca56136c18757d3bf28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=532f57a243f442825c7c3ca56… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Nov 24 19:25:20 2006 +0000 crypt32: Add test for I_CryptInstallOssGlobal. --- dlls/crypt32/tests/main.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index ef2463e..73ead4a 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -343,6 +343,24 @@ static void test_getDefaultCryptProv(voi CryptReleaseContext(prov, 0); } +typedef int (WINAPI *I_CryptInstallOssGlobal)(DWORD,DWORD,DWORD); + +static void test_CryptInstallOssGlobal(void) +{ + int ret,i; + I_CryptInstallOssGlobal pI_CryptInstallOssGlobal; + + if (!hCrypt) return; + + pI_CryptInstallOssGlobal= (I_CryptInstallOssGlobal)GetProcAddress(hCrypt,"I_CryptInstallOssGlobal"); + /* passing in some random values to I_CryptInstallOssGlobal, it always returns 9 the first time, then 10, 11 etc.*/ + for(i=0;i<30;i++) + { + ret = pI_CryptInstallOssGlobal(rand(),rand(),rand()); + ok((9+i) == ret,"Expected %d, got %d\n",(9+i),ret); + } +} + START_TEST(main) { hCrypt = LoadLibraryA("crypt32.dll"); @@ -354,4 +372,5 @@ START_TEST(main) test_cryptTls(); test_readTrustedPublisherDWORD(); test_getDefaultCryptProv(); + test_CryptInstallOssGlobal(); }

1 0

Louis Lenders : crypt32: Better stub for I_CryptInstallOssGlobal.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 3fa930cb3bf10675b571296c4b45e683b6fae40e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa930cb3bf10675b571296c4… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Nov 24 19:32:10 2006 +0000 crypt32: Better stub for I_CryptInstallOssGlobal. --- dlls/crypt32/main.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 0d7ed1e..dd9e1fb 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -188,10 +188,12 @@ BOOL WINAPI I_CryptReadTrustedPublisherD return ret; } -BOOL WINAPI I_CryptInstallOssGlobal(DWORD x, DWORD y, DWORD z) +int WINAPI I_CryptInstallOssGlobal(DWORD x, DWORD y, DWORD z) { - FIXME("%08x %08x %08x\n", x, y, z); - return FALSE; + static int ret = 8; + ret++; + FIXME("%08x %08x %08x, return value %d\n", x, y, z,ret); + return ret; } BOOL WINAPI I_CryptInstallAsn1Module(void *x, DWORD y, DWORD z)

1 0

Vitaliy Margolen : wineshelllink: Use FreeDesktop standard to create Wine menu structure.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: da3676229722eb76c8a91bf8165b09cc9e58455c URL: http://source.winehq.org/git/wine.git/?a=commit;h=da3676229722eb76c8a91bf81… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Nov 24 13:53:29 2006 -0700 wineshelllink: Use FreeDesktop standard to create Wine menu structure. --- tools/wineshelllink | 254 ++++++++++++++++++++++----------------------------- 1 files changed, 110 insertions(+), 144 deletions(-) diff --git a/tools/wineshelllink b/tools/wineshelllink index db65efa..07334dc 100755 --- a/tools/wineshelllink +++ b/tools/wineshelllink @@ -4,6 +4,7 @@ # This is used by the IShellLink interface # # Copyright 2000 Alexandre Julliard +# Copyright 2006 Vitaliy Margolen # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -22,8 +23,7 @@ # Note that the link is a relative unix-style path name. Since the / character # is not valid in Windows filenames it is an adequate separator to show the -# menu structure. (This program may need to split the menu structure out for -# implementing xdg-style menus) +# menu structure. mode="" args="" @@ -82,176 +82,142 @@ if [ -z "$link" ] ; then usage fi -kde_entry() +desktop_entry() { - xname=`basename "$link"` - cat <<EOF -# KDE Config File -[KDE Desktop Entry] -Name=$xname -Exec=wine '$path' $args -Type=Application -Comment=$descr -EOF - [ -z "$workdir" ] || echo "Path=\"$workdir\"" - [ -z "$xpmicon" ] || echo "Icon=$xpmicon" -} - -gnome_entry() -{ - xname=`basename "$link"` cat <<EOF [Desktop Entry] -Name=$xname +Name=$linkname Exec=wine "$path" $args Type=Application -Comment=$descr EOF + [ -z "$descr" ] || echo "Comment=$descr" [ -z "$workdir" ] || echo "Path=$workdir" [ -z "$xpmicon" ] || echo "Icon=$xpmicon" } -mdk_entry() +directory_entry() { - base=`basename "$link"` - section=`dirname "$link"` - [ -z "$icon" ] || xicon="icon=\"$xpmicon\"" - pathmenu=`echo "$path" | sed 's+\\\\+\\\\\\\\+g'` - echo "?package(local.Wine):needs=x11 section=\"/Wine/$section\" title=\"$base\" longtitle=\"$descr\" command=\"wine '$pathmenu' $args\" $xicon" + cat <<EOF +[Desktop Entry] +Type=Directory +EOF + if [ "$1" == "wine" ] ; then + echo "Name=Wine" + echo "Icon=wine" + else + echo "Name=$1" + echo "Icon=folder" + fi } # copy the icon file to a specified dir and set xpmicon to the resulting path copy_icon() { - dir="$1" - mkdir -p "$dir" - mkdir -p "$dir/""`dirname "$link"`" || true - if [ -f "$icon" ] - then - cp "$icon" "$dir/$link.xpm" - xpmicon="$dir/$link.xpm" - else - xpmicon="" - fi + if [ -f "$icon" ] + then + xpmicon=`basename "$icon" .xpm` + + mkdir -p "$1" + cp "$icon" "$1/$xpmicon.xpm" + else + xpmicon="" + fi } -# Debian/Mandrake - -type update-menus > /dev/null 2>&1 -if [ $? = 0 -a $mode = "menu" ] -then - iconname="`basename "$link"`.xpm" - dir="$HOME/.menu/icons" - if [ -f "$icon" ] - then - mkdir -p "$dir" - cp "$icon" "$dir/$iconname" - xpmicon="$dir/$iconname" - else - xpmicon="" - fi - mdk_entry >> "$HOME/.menu/wine" - if [ -d "/usr/lib/menu" ] && [ -w "/usr/lib/menu" ] - then - mdk_entry >> "/usr/lib/menu/wine" - fi - update-menus > /dev/null 2>&1 -fi +# XDG -# KDE +xdg_config_dir="${XDG_CONFIG_HOME:-$HOME/.config}/menus/applications-merged" +xdg_data_dir="${XDG_DATA_HOME:-$HOME/.local/share}" -if [ -d "$HOME/.kde" ] -then - kdeversion=0 - if type kde-config >/dev/null 2>&1 - then - kdeversion=`kde-config -v | grep KDE: | sed -n "s/^KDE: $[^.]*$\..*$/\1/p"` - fi +# Create common directories +mkdir -p "$xdg_config_dir" +mkdir -p "$xdg_data_dir/desktop-directories" - if [ $kdeversion -ge 2 ] - then - copy_icon "$HOME/.kde/share/applnk/Wine" - if [ $mode = "menu" ] - then - gnome_entry > "$HOME/.kde/share/applnk/Wine/$link.desktop" - elif [ -d "$HOME/Desktop" ] - then - gnome_entry > "$HOME/Desktop/$link.desktop" +get_menu_entries() +{ + tmp="$xdg_config_dir/$1.menu" + + if [ -r "$tmp" ] ; then + awk ' +BEGIN { RS="<" } +/^Filename/ { + if (match($0,/>/)) { + print substr($0,RSTART+1) + } +}' $tmp fi - else - copy_icon "$HOME/.kde/share/applnk/Wine" - if [ $mode = "menu" ] - then - kde_entry > "$HOME/.kde/share/applnk/Wine/$link.kdelnk" +} - # KDE 1.x kludge. Wake up KDE, if we can find kpanel running - type kwmcom >/dev/null 2>/dev/null && \ - ps u -C kpanel >/dev/null 2>/dev/null && \ - kwmcom kpanel:restart +# Input +# menu file name +# new item +write_menu_file() +{ + tmpfile=`mktemp` + ( + echo '<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"' + echo '"http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">' + echo '<Menu>' + echo ' <Name>Applications</Name>' + + IFS="-" + + fullname='wine' + for i in $1; do + echo " <Menu>" + echo " <Name>$fullname-$i</Name>" + echo " <Directory>$fullname-$i.directory</Directory>" + + dir_file_name="$xdg_data_dir/desktop-directories/$fullname-$i.directory" + if [ ! -f "$dir_file_name" ] ; then + directory_entry "$i" > "$dir_file_name" + fi + test "$i" = "wine" || fullname="$fullname-$i" + done + + echo " <Include>" + + IFS=" +" + for i in $(get_menu_entries "$1"); do + test "$i" = "$2" && continue + echo " <Filename>$i</Filename>" + done + + # New record + echo " <Filename>$2</Filename>" + echo " </Include>" + + IFS='-' + for i in $1; do + echo " </Menu>" + done + echo '</Menu>' + ) > $tmpfile + chmod 0600 $tmpfile + + mv -f $tmpfile "$xdg_config_dir/$1.menu" +} - elif [ -d "$HOME/Desktop" ] - then - kde_entry > "$HOME/Desktop/$link.kdelnk" - # KDE 1.x kludge: wake up KDE, if we can find kfm running... - type kfmclient >/dev/null 2>/dev/null && \ - ps u -C kfm >/dev/null 2>/dev/null && \ - kfmclient refreshDesktop - fi - fi -fi -if [ -d "$HOME/.kde2" ] -then - copy_icon "$HOME/.kde2/share/applnk/Wine" - if [ $mode = "menu" ] - then - gnome_entry > "$HOME/.kde2/share/applnk/Wine/$link.desktop" - else - if [ -d "$HOME/Desktop2" ] - then - gnome_entry > "$HOME/Desktop2/$link.desktop" - fi - if [ -d "$HOME/Desktop" ] - then - gnome_entry > "$HOME/Desktop/$link.desktop" - fi - fi -fi +copy_icon "$xdg_data_dir/icons" -if [ -d "$HOME/.kde3/share/applnk" ] -then - copy_icon "$HOME/.kde3/share/applnk/Wine" - if [ $mode = "menu" ] - then - gnome_entry > "$HOME/.kde3/share/applnk/Wine/$link.desktop" - else - if [ -d "$HOME/Desktop3" ] - then - gnome_entry > "$HOME/Desktop3/$link.desktop" - fi - if [ -d "$HOME/Desktop2" ] - then - gnome_entry > "$HOME/Desktop2/$link.desktop" - fi - if [ -d "$HOME/Desktop" ] - then - gnome_entry > "$HOME/Desktop/$link.desktop" +linkname=`basename "$link"` + +if [ $mode = "menu" ] ; then + mkdir -p "$xdg_data_dir/applications/wine/`dirname "$link"`" + + linkpath=`dirname "$link" | sed 's!/!-!g'` + if [ "$linkpath" == "." ] ; then + linkpath="" + else + linkpath="-$linkpath" fi - fi -fi -# Gnome - -if [ -d "$HOME/.gnome" ] -then - copy_icon "$HOME/.gnome/apps/Wine" - if [ $mode = "menu" ] - then - gnome_entry > "$HOME/.gnome/apps/Wine/$link.desktop" - elif [ -d "$HOME/.gnome-desktop" ] - then - gnome_entry > "$HOME/.gnome-desktop/$link.desktop" - fi + desktop_entry > "$xdg_data_dir/applications/wine/$link.desktop" + write_menu_file "wine$linkpath" "wine$linkpath-$linkname.desktop" +else + desktop_entry > "$HOME/Desktop/$linkname.desktop" fi exit 0

1 0

Vitaliy Margolen : winemenubuilder: Downgrade some ERR to WARN.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: ada881cee65084a68b2c783a67db59d8d519d38e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ada881cee65084a68b2c783a6… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Nov 24 15:39:51 2006 -0700 winemenubuilder: Downgrade some ERR to WARN. --- programs/winemenubuilder/winemenubuilder.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 738b9b6..8d56c85 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -278,7 +278,7 @@ static BOOL extract_icon32(LPCWSTR szFil hModule = LoadLibraryExW(szFileName, 0, LOAD_LIBRARY_AS_DATAFILE); if (!hModule) { - WINE_ERR("LoadLibraryExW (%s) failed, error %d\n", + WINE_WARN("LoadLibraryExW (%s) failed, error %d\n", wine_dbgstr_w(szFileName), GetLastError()); return FALSE; } @@ -327,7 +327,7 @@ static BOOL extract_icon32(LPCWSTR szFil } else { - WINE_ERR("found no icon\n"); + WINE_WARN("found no icon\n"); FreeLibrary(hModule); return FALSE; } @@ -379,7 +379,7 @@ static int ExtractFromICO(LPCWSTR szFile if (fread(&iconDir, sizeof (ICONDIR), 1, fICOFile) != 1 || (iconDir.idReserved != 0) || (iconDir.idType != 1)) { - WINE_ERR("Invalid ico file format\n"); + WINE_WARN("Invalid ico file format\n"); goto error2; } @@ -962,7 +962,8 @@ static BOOL InvokeShellLinker( IShellLin WINE_WARN("Unable to extract icon, deferring.\n"); goto cleanup; } - WINE_ERR("failed to extract icon.\n"); + WINE_ERR("failed to extract icon from %s\n", + wine_dbgstr_w( szIconPath[0] ? szIconPath : szPath )); } /* check the path */

1 0

Alexandre Julliard : winex11.drv: Don' t use the specified DC when mapping RGB colors for a DIB.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: d5ee62342a11fd09721da78b9a2be3a590560254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ee62342a11fd09721da78b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 27 17:04:19 2006 +0100 winex11.drv: Don't use the specified DC when mapping RGB colors for a DIB. The DC palette only matters for DIB_PAL_COLORS. --- dlls/gdi32/tests/bitmap.c | 8 ++++---- dlls/winex11.drv/dib.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 9701a00..be4088c 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1107,10 +1107,10 @@ static void test_GetDIBits_selected_DIB( break; } } - todo_wine - { - ok(equalContents, "GetDIBits with DIB selected in DC: Invalid DIB bits\n"); - } + if (bpp != 1) + ok(equalContents, "GetDIBits with %d bpp DIB selected in DC: Invalid DIB bits\n",bpp); + else + todo_wine ok(equalContents, "GetDIBits with %d bpp DIB selected in DC: Invalid DIB bits\n",bpp); HeapFree(GetProcessHeap(), 0, bits2); DeleteDC(dc); diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 1c0c7c2..5ece5a3 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -312,7 +312,7 @@ static int *X11DRV_DIB_GenColorMap( X11D } else for (i = start; i < end; i++, rgb++) - colorMapping[i] = X11DRV_PALETTE_ToPhysical( physDev, RGB(rgb->rgbRed, + colorMapping[i] = X11DRV_PALETTE_ToPhysical( NULL, RGB(rgb->rgbRed, rgb->rgbGreen, rgb->rgbBlue)); } @@ -336,7 +336,7 @@ static int *X11DRV_DIB_GenColorMap( X11D } else for (i = start; i < end; i++, rgb++) - colorMapping[i] = X11DRV_PALETTE_ToPhysical( physDev, RGB(rgb->rgbtRed, + colorMapping[i] = X11DRV_PALETTE_ToPhysical( NULL, RGB(rgb->rgbtRed, rgb->rgbtGreen, rgb->rgbtBlue)); }

1 0

Andrew Talbot : winex11.drv: Cast-qual warnings fix.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 4659870d0d52c98e3b0e9a1410100a0c51d50a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4659870d0d52c98e3b0e9a141… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Nov 25 18:26:18 2006 +0000 winex11.drv: Cast-qual warnings fix. --- dlls/winex11.drv/pen.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/pen.c b/dlls/winex11.drv/pen.c index 32d9e73..fc6e9db 100644 --- a/dlls/winex11.drv/pen.c +++ b/dlls/winex11.drv/pen.c @@ -25,18 +25,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); -static const char PEN_dash[] = { 16,8 }; -static const char PEN_dot[] = { 4,4 }; -static const char PEN_dashdot[] = { 12,8,4,8 }; -static const char PEN_dashdotdot[] = { 12,4,4,4,4,4 }; -static const char PEN_alternate[] = { 1,1 }; - /*********************************************************************** * SelectPen (X11DRV.@) */ HPEN X11DRV_SelectPen( X11DRV_PDEVICE *physDev, HPEN hpen ) { LOGPEN logpen; + static char PEN_dash[] = { 16,8 }; + static char PEN_dot[] = { 4,4 }; + static char PEN_dashdot[] = { 12,8,4,8 }; + static char PEN_dashdotdot[] = { 12,4,4,4,4,4 }; + static char PEN_alternate[] = { 1,1 }; if (!GetObjectW( hpen, sizeof(logpen), &logpen )) { @@ -77,23 +76,23 @@ HPEN X11DRV_SelectPen( X11DRV_PDEVICE *p switch(logpen.lopnStyle & PS_STYLE_MASK) { case PS_DASH: - physDev->pen.dashes = (char *)PEN_dash; + physDev->pen.dashes = PEN_dash; physDev->pen.dash_len = sizeof(PEN_dash)/sizeof(*PEN_dash); break; case PS_DOT: - physDev->pen.dashes = (char *)PEN_dot; + physDev->pen.dashes = PEN_dot; physDev->pen.dash_len = sizeof(PEN_dot)/sizeof(*PEN_dot); break; case PS_DASHDOT: - physDev->pen.dashes = (char *)PEN_dashdot; + physDev->pen.dashes = PEN_dashdot; physDev->pen.dash_len = sizeof(PEN_dashdot)/sizeof(*PEN_dashdot); break; case PS_DASHDOTDOT: - physDev->pen.dashes = (char *)PEN_dashdotdot; + physDev->pen.dashes = PEN_dashdotdot; physDev->pen.dash_len = sizeof(PEN_dashdotdot)/sizeof(*PEN_dashdotdot); break; case PS_ALTERNATE: - physDev->pen.dashes = (char *)PEN_alternate; + physDev->pen.dashes = PEN_alternate; physDev->pen.dash_len = sizeof(PEN_alternate)/sizeof(*PEN_alternate); break; case PS_USERSTYLE:

1 0

Francois Gouget : winepath: Fix --unix so it works whether the Windows path refers to an existing file /directory or not.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 5d531fc1d5bcbc137f5b116414ec4ba5a5717fab URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d531fc1d5bcbc137f5b11641… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 10 15:40:59 2006 +0100 winepath: Fix --unix so it works whether the Windows path refers to an existing file/directory or not. --- programs/winepath/winepath.c | 59 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 53 insertions(+), 6 deletions(-) diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index 0fc4623..7179214 100644 --- a/programs/winepath/winepath.c +++ b/programs/winepath/winepath.c @@ -189,14 +189,61 @@ int wmain(int argc, const WCHAR *argv[]) printf("%s\n", path); } if (outputformats & UNIXFORMAT) { - char *unix_name; - - if ((unix_name = wine_get_unix_file_name_ptr(argv[i]))) + WCHAR *ntpath, *tail; + int ntpathlen=lstrlenW(argv[i]); + ntpath=HeapAlloc(GetProcessHeap(), 0, sizeof(*ntpath)*(ntpathlen+1)); + lstrcpyW(ntpath, argv[i]); + tail=NULL; + while (1) { - printf("%s\n", unix_name); - HeapFree( GetProcessHeap(), 0, unix_name ); + char *unix_name; + WCHAR *slash, *c; + + unix_name = wine_get_unix_file_name_ptr(ntpath); + if (unix_name) + { + if (tail) + { + WideCharToMultiByte(CP_UNIXCP, 0, tail+1, -1, path, MAX_PATH, NULL, NULL); + printf("%s/%s\n", unix_name, path); + } + else + { + printf("%s\n", unix_name); + } + HeapFree( GetProcessHeap(), 0, unix_name ); + break; + } + + slash=(tail ? tail : ntpath+ntpathlen); + while (slash != ntpath && *slash != '/' && *slash != '\\') + slash--; + if (slash == ntpath) + { + /* This is a complete path conversion failure. + * It would typically happen if ntpath == "". + */ + printf("\n"); + break; + } + c=slash+1; + while (*c != '\0' && *c != '*' && *c != '?' && + *c != '<' && *c != '>' && *c != '|' && *c != '"') + c++; + if (*c != '\0') + { + /* If this is not a valid NT path to start with, + * then obviously we cannot convert it. + */ + printf("\n"); + break; + } + if (tail) + *tail='/'; + tail=slash; + *tail='\0'; } - else printf( "\n" ); + HeapFree(GetProcessHeap(), 0, ntpath); } if (outputformats & WINDOWSFORMAT) { WCHAR* windows_name;

1 0

Vitaliy Margolen : winex11drv: State of side mouse buttons (X-buttons) is not returned from XQueryPointer.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: b4174357445c2e8331695ae893fa07623fbe7792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4174357445c2e8331695ae89… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Nov 25 14:46:35 2006 -0700 winex11drv: State of side mouse buttons (X-buttons) is not returned from XQueryPointer. --- dlls/winex11.drv/mouse.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index e6f899a..abb8306 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -97,8 +97,7 @@ static inline void update_button_state( key_state_table[VK_LBUTTON] = (state & Button1Mask ? 0x80 : 0); key_state_table[VK_MBUTTON] = (state & Button2Mask ? 0x80 : 0); key_state_table[VK_RBUTTON] = (state & Button3Mask ? 0x80 : 0); - key_state_table[VK_XBUTTON1]= (state & Button6Mask ? 0x80 : 0); - key_state_table[VK_XBUTTON2]= (state & Button7Mask ? 0x80 : 0); + /* X-buttons are not reported from XQueryPointer */ }

1 0

Andrew Talbot : winex11.drv: Cast-qual warnings fix.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 3be7b8b64c91fc0bc5a4f73aa21fe3f6c5dd438f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be7b8b64c91fc0bc5a4f73aa… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Nov 25 18:23:55 2006 +0000 winex11.drv: Cast-qual warnings fix. --- dlls/winex11.drv/clipboard.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index c9fde2c..b63fd05 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -511,7 +511,8 @@ static WINE_CLIPFORMAT *X11DRV_CLIPBOARD { LPWINE_CLIPFORMAT lpFormat; LPWINE_CLIPFORMAT lpNewFormat; - + LPWSTR new_name; + /* allocate storage for new format entry */ lpNewFormat = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_CLIPFORMAT)); @@ -521,14 +522,14 @@ static WINE_CLIPFORMAT *X11DRV_CLIPBOARD return NULL; } - if (!(lpNewFormat->Name = HeapAlloc(GetProcessHeap(), 0, (strlenW(FormatName)+1)*sizeof(WCHAR)))) + if (!(new_name = HeapAlloc(GetProcessHeap(), 0, (strlenW(FormatName)+1)*sizeof(WCHAR)))) { WARN("No more memory for the new format name!\n"); HeapFree(GetProcessHeap(), 0, lpNewFormat); return NULL; } - strcpyW((LPWSTR)lpNewFormat->Name, FormatName); + lpNewFormat->Name = strcpyW(new_name, FormatName); lpNewFormat->wFlags = 0; lpNewFormat->wFormatID = GlobalAddAtomW(lpNewFormat->Name); lpNewFormat->drvData = prop;

1 0