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

Alexandre Julliard : comctl32/imagelist: Pre-multiply the colors by the alpha channel when storing an image with alpha .
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: f2b993d414517037cf064e9aed954cdae96646f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b993d414517037cf064e9ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 14 20:19:58 2010 +0200 comctl32/imagelist: Pre-multiply the colors by the alpha channel when storing an image with alpha. --- dlls/comctl32/imagelist.c | 18 ++++++++++++++---- dlls/comctl32/tests/imagelist.c | 16 ++++++++-------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index bd1530e..7b30643 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -202,15 +202,25 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, for (j = n * width; j < (n + 1) * width; j++) if (!mask_bits || !((mask_bits[i * mask_width + j / 8] << (j % 8)) & 0x80)) bits[i * bm.bmWidth + j] |= 0xff000000; - StretchDIBits( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, - n * width, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); } else { if (himl->has_alpha) himl->has_alpha[pos + n] = 1; - StretchBlt( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, - hdc, n * width, 0, width, height, SRCCOPY ); + + /* pre-multiply by the alpha channel */ + for (i = 0; i < height; i++) + for (j = n * width; j < (n + 1) * width; j++) + { + DWORD argb = bits[i * bm.bmWidth + j]; + DWORD alpha = argb >> 24; + bits[i * bm.bmWidth + j] = ((argb & 0xff000000) | + (((argb & 0x00ff0000) * alpha / 255) & 0x00ff0000) | + (((argb & 0x0000ff00) * alpha / 255) & 0x0000ff00) | + (((argb & 0x000000ff) * alpha / 255))); + } } + StretchDIBits( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, + n * width, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); if (hdcMask) StretchBlt( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, hdcMask, n * width, 0, width, height, SRCCOPY ); diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 43eeeca..cf749c8 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1189,17 +1189,17 @@ static void test_ImageList_DrawIndirect(void) check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_IMAGE, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_PRESERVEALPHA, 0x00ABCDEF, __LINE__); + check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, 0x00D3E5F7, __LINE__); + check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_TRANSPARENT, 0x00D3E5F7, __LINE__); todo_wine { - check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, 0x00D3E5F7, __LINE__); - check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_TRANSPARENT, 0x00D3E5F7, __LINE__); check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND25, ILS_NORMAL, 0, 0x00E8F1FA, 0x009DA8B1, __LINE__); check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0x00E8F1FA, 0x008C99A3, __LINE__); - check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_MASK, 0x00D3E5F7, __LINE__); - check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_IMAGE, 0x00D3E5F7, __LINE__); - check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, 0x005D6F81, __LINE__); } + check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_MASK, 0x00D3E5F7, __LINE__); + check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_IMAGE, 0x00D3E5F7, __LINE__); + todo_wine check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, 0x005D6F81, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iTransparentImage, ILD_NORMAL, 0x00FFFFFF, __LINE__); @@ -1207,8 +1207,8 @@ static void test_ImageList_DrawIndirect(void) check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iImage, SRCINVERT, 0x00543210, __LINE__); /* ILD_ROP is ignored when the image has an alpha channel */ - todo_wine check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iAlphaImage, SRCCOPY, 0x00D3E5F7, __LINE__); - todo_wine check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iAlphaImage, SRCINVERT, 0x00D3E5F7, __LINE__); + check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iAlphaImage, SRCCOPY, 0x00D3E5F7, __LINE__); + check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iAlphaImage, SRCINVERT, 0x00D3E5F7, __LINE__); todo_wine check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_SATURATE, 0, 0x00CCCCCC, __LINE__); todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_SATURATE, 0, 0x00AFAFAF, 0x00F0F0F0, __LINE__); @@ -1217,7 +1217,7 @@ static void test_ImageList_DrawIndirect(void) check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_SHADOW, 0, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_ALPHA, 127, 0x00D5E6F7, __LINE__); - todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_ALPHA, 127, 0x00E9F2FB, 0x00AEB7C0, __LINE__); + check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_ALPHA, 127, 0x00E9F2FB, 0x00AEB7C0, __LINE__); todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_NORMAL, 127, 0x00E9F2FB, 0x00D3E5F7, __LINE__); cleanup:

1 0

Alexandre Julliard : comctl32/imagelist: Generate the mask from the alpha channel if present.
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: 45fd49bab6a0ad714f638ca13b65f1e446c08e2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=45fd49bab6a0ad714f638ca13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 16 12:48:08 2010 +0200 comctl32/imagelist: Generate the mask from the alpha channel if present. --- dlls/comctl32/imagelist.c | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 7b30643..e8d3323 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -145,15 +145,18 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, BOOL ret = FALSE; HDC hdcMask = 0; BITMAP bm; - BITMAPINFO *info; + BITMAPINFO *info, *mask_info = NULL; DWORD *bits = NULL; BYTE *mask_bits = NULL; int i, j, n; POINT pt; DWORD mask_width; - if (himl->uBitsPixel != 32) return FALSE; if (!GetObjectW( hbmImage, sizeof(bm), &bm )) return FALSE; + + /* if neither the imagelist nor the source bitmap can have an alpha channel, bail out now */ + if (himl->uBitsPixel != 32 && bm.bmBitsPixel != 32) return FALSE; + SelectObject( hdc, hbmImage ); mask_width = (bm.bmWidth + 31) / 32 * 4; @@ -174,13 +177,13 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, if (hbmMask) { - info->bmiHeader.biBitCount = 1; - info->bmiHeader.biSizeImage = mask_width * height; + if (!(mask_info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[2] )))) + goto done; + mask_info->bmiHeader = info->bmiHeader; + mask_info->bmiHeader.biBitCount = 1; + mask_info->bmiHeader.biSizeImage = mask_width * height; if (!(mask_bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done; - if (!GetDIBits( hdc, hbmMask, 0, height, mask_bits, info, DIB_RGB_COLORS )) goto done; - /* restore values for color info */ - info->bmiHeader.biBitCount = 32; - info->bmiHeader.biSizeImage = bm.bmWidth * height * 4; + if (!GetDIBits( hdc, hbmMask, 0, height, mask_bits, mask_info, DIB_RGB_COLORS )) goto done; hdcMask = CreateCompatibleDC( 0 ); SelectObject( hdcMask, hbmMask ); } @@ -202,6 +205,8 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, for (j = n * width; j < (n + 1) * width; j++) if (!mask_bits || !((mask_bits[i * mask_width + j / 8] << (j % 8)) & 0x80)) bits[i * bm.bmWidth + j] |= 0xff000000; + if (hdcMask) StretchBlt( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, + hdcMask, n * width, 0, width, height, SRCCOPY ); } else { @@ -209,6 +214,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, /* pre-multiply by the alpha channel */ for (i = 0; i < height; i++) + { for (j = n * width; j < (n + 1) * width; j++) { DWORD argb = bits[i * bm.bmWidth + j]; @@ -218,12 +224,23 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, (((argb & 0x0000ff00) * alpha / 255) & 0x0000ff00) | (((argb & 0x000000ff) * alpha / 255))); } + } + + if (mask_info && himl->hbmMask) /* generate the mask from the alpha channel */ + { + for (i = 0; i < height; i++) + for (j = n * width; j < (n + 1) * width; j++) + if ((bits[i * bm.bmWidth + j] >> 24) > 25) /* more than 10% alpha */ + mask_bits[i * mask_width + j / 8] &= ~(0x80 >> (j % 8)); + else + mask_bits[i * mask_width + j / 8] |= 0x80 >> (j % 8); + StretchDIBits( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, + n * width, 0, width, height, mask_bits, mask_info, DIB_RGB_COLORS, SRCCOPY ); + } } StretchDIBits( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, n * width, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); - if (hdcMask) StretchBlt( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, - hdcMask, n * width, 0, width, height, SRCCOPY ); } ret = TRUE;

1 0

Alexandre Julliard : configure: Rename the 64-bit loader to wine64 and keep wine always for the 32-bit loader .
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: f3831cf2cb40fc9a5fe1065f640ec9c02552780f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3831cf2cb40fc9a5fe1065f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 16 17:01:52 2010 +0200 configure: Rename the 64-bit loader to wine64 and keep wine always for the 32-bit loader. This provides better backwards compatibility when running with a 32-bit prefix. --- .gitignore | 2 +- configure | 10 +++++----- configure.ac | 10 +++++----- dlls/kernel32/process.c | 12 ++++++------ loader/Makefile.in | 2 +- tools/winewrapper | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index a01cc19..b064d05 100644 --- a/.gitignore +++ b/.gitignore @@ -236,7 +236,7 @@ loader/wine-preloader loader/wine.de.man loader/wine.fr.man loader/wine.man -loader/wine32 +loader/wine64 programs/Makeprog.rules programs/rpcss/epm.h programs/rpcss/epm_s.c diff --git a/configure b/configure index 4940ce6..2ab935b 100755 --- a/configure +++ b/configure @@ -12250,7 +12250,7 @@ esac MAIN_BINARY="wine" -test -z "$with_wine64" || MAIN_BINARY="wine32" +test "x$enable_win64" != "xyes" || MAIN_BINARY="wine64" case $host_cpu in *i[3456789]86*) @@ -14818,13 +14818,13 @@ ac_config_files="$ac_config_files Make.tmp:Makefile.in" if test -n "$with_wine64" then -wine_fn_append_rule ALL_MAKEFILE_DEPENDS "all: fonts server $with_wine64/loader/wine32 +wine_fn_append_rule ALL_MAKEFILE_DEPENDS "all: fonts server $with_wine64/loader/wine fonts server: \$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@ -$with_wine64/loader/wine32: - \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine32 \$@ +$with_wine64/loader/wine: + \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@ clean:: - \$(RM) fonts server $with_wine64/loader/wine32" + \$(RM) fonts server $with_wine64/loader/wine" fi wine_fn_append_rule ALL_MAKEFILE_DEPENDS "uninstall:: diff --git a/configure.ac b/configure.ac index 4224e37..df70de6 100644 --- a/configure.ac +++ b/configure.ac @@ -1734,7 +1734,7 @@ case $host_os in esac AC_SUBST(MAIN_BINARY,"wine") -test -z "$with_wine64" || MAIN_BINARY="wine32" +test "x$enable_win64" != "xyes" || MAIN_BINARY="wine64" case $host_cpu in *i[[3456789]]86*) @@ -2753,13 +2753,13 @@ dnl Some final makefile rules if test -n "$with_wine64" then WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS], -[all: fonts server $with_wine64/loader/wine32 +[all: fonts server $with_wine64/loader/wine fonts server: \$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@] -$with_wine64/loader/wine32: - \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine32 \$[@] +$with_wine64/loader/wine: + \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@] clean:: - \$(RM) fonts server $with_wine64/loader/wine32]) + \$(RM) fonts server $with_wine64/loader/wine]) fi WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS], diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 9a1f2f5..b71a390 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1579,17 +1579,17 @@ static const char *get_alternate_loader( char **ret_env ) *ret_env = NULL; - if (wine_get_build_dir()) loader = is_win64 ? "loader/wine32" : "server/../loader/wine"; + if (wine_get_build_dir()) loader = is_win64 ? "loader/wine" : "server/../loader/wine64"; if (loader_env) { int len = strlen( loader_env ); - if (is_win64) + if (!is_win64) { if (!(env = HeapAlloc( GetProcessHeap(), 0, sizeof("WINELOADER=") + len + 2 ))) return NULL; strcpy( env, "WINELOADER=" ); strcat( env, loader_env ); - strcat( env, "32" ); + strcat( env, "64" ); } else { @@ -1597,7 +1597,7 @@ static const char *get_alternate_loader( char **ret_env ) strcpy( env, "WINELOADER=" ); strcat( env, loader_env ); len += sizeof("WINELOADER=") - 1; - if (!strcmp( env + len - 2, "32" )) env[len - 2] = 0; + if (!strcmp( env + len - 2, "64" )) env[len - 2] = 0; } if (!loader) { @@ -1606,7 +1606,7 @@ static const char *get_alternate_loader( char **ret_env ) } *ret_env = env; } - if (!loader) loader = is_win64 ? "wine32" : "wine"; + if (!loader) loader = is_win64 ? "wine" : "wine64"; return loader; } @@ -1637,7 +1637,7 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW if (!is_win64 && !is_wow64 && (binary_info->flags & BINARY_FLAG_64BIT)) { - ERR( "starting 64-bit process %s not supported on this platform\n", debugstr_w(filename) ); + ERR( "starting 64-bit process %s not supported on this environment\n", debugstr_w(filename) ); SetLastError( ERROR_BAD_EXE_FORMAT ); return FALSE; } diff --git a/loader/Makefile.in b/loader/Makefile.in index 6e08066..df55236 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -13,7 +13,7 @@ EXTRA_BINARIES = @EXTRA_BINARIES@ PROGRAMS = \ wine \ - wine32 \ + wine64 \ wine-installed \ wine-preloader diff --git a/tools/winewrapper b/tools/winewrapper index c664142..a4d17ac 100755 --- a/tools/winewrapper +++ b/tools/winewrapper @@ -83,8 +83,8 @@ fi if [ -x "$topdir/loader/wine" ] then WINELOADER="$topdir/loader/wine" -elif [ -x "$topdir/loader/wine32" ] -then WINELOADER="$topdir/loader/wine32" +elif [ -x "$topdir/loader/wine64" ] +then WINELOADER="$topdir/loader/wine64" else echo "$0: could not find the wine loader in $topdir" exit 1

1 0

Matej Špindler : wordpad: Update Slovenian translation .
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: ebdf7edfcc4e266a02f272eab7ab49c604e8950e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebdf7edfcc4e266a02f272eab… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Fri May 14 20:34:04 2010 +0200 wordpad: Update Slovenian translation. --- programs/wordpad/Si.rc | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/programs/wordpad/Si.rc b/programs/wordpad/Si.rc index f7e0c72..556197b 100644 --- a/programs/wordpad/Si.rc +++ b/programs/wordpad/Si.rc @@ -247,13 +247,12 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Zapri" - STRING_PREVIEW_PAGE, "Page" - STRING_PREVIEW_PAGES, "Pages" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "cm" + STRING_PREVIEW_PAGE, "Stran" + STRING_PREVIEW_PAGES, "Strani" + STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "inch" + STRING_UNITS_PT, "pt" END STRINGTABLE DISCARDABLE

1 0

Matej Špindler : mapi32: Add Slovenian translation.
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: bdb373d5c4b44a184703affa29ded33585590de2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdb373d5c4b44a184703affa2… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Sun May 16 10:46:28 2010 +0200 mapi32: Add Slovenian translation. --- dlls/mapi32/Makefile.in | 1 + dlls/mapi32/Si.rc | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 35a14a8..5f334d3 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -21,6 +21,7 @@ RC_SRCS = \ Lt.rc \ Nl.rc \ Ru.rc \ + Si.rc \ version.rc @MAKE_DLL_RULES@ diff --git a/dlls/mapi32/Si.rc b/dlls/mapi32/Si.rc new file mode 100644 index 0000000..4abdc82 --- /dev/null +++ b/dlls/mapi32/Si.rc @@ -0,0 +1,32 @@ +/* +* MAPI32 Slovenian resources +* +* Copyright 2010 Matej Spindler +* +* 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 "res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "Pošiljanje ni uspelo, ker nimate nameščenega MAPI klienta." + IDS_SEND_MAIL, "Pošlji" +}

1 0

Alexandre Julliard : winedbg: Don't install the man page in a wow64 build.
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: 78f3943ab1547b8ea37eaa643ac9e252f8649395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78f3943ab1547b8ea37eaa643… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 16 17:26:46 2010 +0200 winedbg: Don't install the man page in a wow64 build. --- programs/winedbg/Makefile.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index ad9350f..c2ddc7a 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -55,8 +55,10 @@ MANPAGES = winedbg.man all: $(MANPAGES) -install install-lib:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) +install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) $(INSTALL_DATA) winedbg.man $(DESTDIR)$(mandir)/man$(prog_manext)/winedbg.$(prog_manext) +(a)WOW64_DISABLE@ install install-lib:: install-man-pages + uninstall:: $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/winedbg.$(prog_manext)

1 0

Matej Špindler : wineboot: Update Slovenian translation.
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: cb53241cba93d60e634909339b31887baae1283b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb53241cba93d60e634909339… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Fri May 14 20:46:16 2010 +0200 wineboot: Update Slovenian translation. --- programs/wineboot/wineboot_Si.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot_Si.rc b/programs/wineboot/wineboot_Si.rc index 366f170..bb210f9 100644 --- a/programs/wineboot/wineboot_Si.rc +++ b/programs/wineboot/wineboot_Si.rc @@ -37,3 +37,13 @@ BEGIN LTEXT "Če se odločite za končanje programa, lahko izgubite neshranjene podatke.", IDC_STATIC,7,28,172,15 END + +IDD_WAITDLG DIALOG 0, 0, 200, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED +CAPTION "Wine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WAITICON, 3, 3, 10, 10 + LTEXT "Konfiguracija programa Wine v %s se posodablja, prosimo počkajte...", + IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX +END

1 0

Alexandre Julliard : server: Make sure a thread doesn't get freed while it' s processing a request.
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: 5532927ed33f3682c48bdc2a2528488eeefa5bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5532927ed33f3682c48bdc2a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 16 12:34:28 2010 +0200 server: Make sure a thread doesn't get freed while it's processing a request. --- server/thread.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/server/thread.c b/server/thread.c index c4deb68..67ef6cf 100644 --- a/server/thread.c +++ b/server/thread.c @@ -248,9 +248,11 @@ static void thread_poll_event( struct fd *fd, int event ) struct thread *thread = get_fd_user( fd ); assert( thread->obj.ops == &thread_ops ); + grab_object( thread ); if (event & (POLLERR | POLLHUP)) kill_thread( thread, 0 ); else if (event & POLLIN) read_request( thread ); else if (event & POLLOUT) write_reply( thread ); + release_object( thread ); } /* cleanup everything that is no longer needed by a dead thread */

1 0

Alexandre Julliard : ntdll: Preserve registers in call_thread_entry_point on x86_64.
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: 39d54523a31594d25a2fcda44f4fe75f2d4fc97d URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d54523a31594d25a2fcda44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 16 12:34:07 2010 +0200 ntdll: Preserve registers in call_thread_entry_point on x86_64. --- dlls/ntdll/signal_x86_64.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index f3344ad..3411110 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2992,16 +2992,33 @@ void call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg, void *frame ) extern void DECLSPEC_NORETURN call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ); __ASM_GLOBAL_FUNC( call_thread_entry_point, - "subq $8,%rsp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + "subq $56,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 56\n\t") + "movq %rbp,48(%rsp)\n\t" + __ASM_CFI(".cfi_rel_offset %rbp,48\n\t") + "movq %rbx,40(%rsp)\n\t" + __ASM_CFI(".cfi_rel_offset %rbx,40\n\t") + "movq %r12,32(%rsp)\n\t" + __ASM_CFI(".cfi_rel_offset %r12,32\n\t") + "movq %r13,24(%rsp)\n\t" + __ASM_CFI(".cfi_rel_offset %r13,24\n\t") + "movq %r14,16(%rsp)\n\t" + __ASM_CFI(".cfi_rel_offset %r14,16\n\t") + "movq %r15,8(%rsp)\n\t" + __ASM_CFI(".cfi_rel_offset %r15,8\n\t") "movq %rsp,%rdx\n\t" "call " __ASM_NAME("call_thread_func") ); extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), void *frame ); __ASM_GLOBAL_FUNC( call_thread_exit_func, - "subq $8,%rsp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") "movq %rdx,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 56\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,48\n\t") + __ASM_CFI(".cfi_rel_offset %rbx,40\n\t") + __ASM_CFI(".cfi_rel_offset %r12,32\n\t") + __ASM_CFI(".cfi_rel_offset %r13,24\n\t") + __ASM_CFI(".cfi_rel_offset %r14,16\n\t") + __ASM_CFI(".cfi_rel_offset %r15,8\n\t") "call *%rsi" ); /***********************************************************************

1 0

André Hentschel : winelib: Spec files are not needed for executables.
by Alexandre Julliard May 16, 2010

May 16, 2010

Module: docs Branch: master Commit: 75823ead62f621ab446c1501d878e9ec5420ca19 URL: http://source.winehq.org/git/docs.git/?a=commit;h=75823ead62f621ab446c1501d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 14 18:43:49 2010 +0200 winelib: Spec files are not needed for executables. --- en/winelib-toolkit.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/winelib-toolkit.sgml b/en/winelib-toolkit.sgml index 2a21e21..c162a0a 100644 --- a/en/winelib-toolkit.sgml +++ b/en/winelib-toolkit.sgml @@ -863,7 +863,7 @@ ORDINAL forward EXPORTNAME SYMBOLNAME </para></note> <para> To link an executable you need to link together: your object files, - the spec file, any Windows libraries that your application depends + any Windows libraries that your application depends on, gdi32 for instance, and any additional library that you use. All the libraries you link with should be available as '.so' libraries. If one of them is available only in '.dll' form then consult

1 0