August 2009 - Wine-commits - list.winehq.org

Vladimir Pankratov : msi: Convert the Russian resources to UTF-8.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 04deb6d7d16361e07a3d98c8c43ed6d838235537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04deb6d7d16361e07a3d98c8c… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Jul 28 15:33:27 2009 +0500 msi: Convert the Russian resources to UTF-8. --- dlls/msi/msi_Ru.rc | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/msi/msi_Ru.rc b/dlls/msi/msi_Ru.rc index d63593e..8e7aafd 100644 --- a/dlls/msi/msi_Ru.rc +++ b/dlls/msi/msi_Ru.rc @@ -20,17 +20,20 @@ #include "windef.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - 4 "�� . �� ." - 5 "�� %s �� " - 9 "�� %s" - 10 "�� " - 11 "�� , �� %s" - 12 "�� " - 13 "�� " - 14 "�� :" - 15 "�� , �� %s" + 4 "Указанный пакет не может быть открыт. Проверьте файл и повторите попытку." + 5 "путь %s не найден" + 9 "вставьте диск %s" + 10 "неверные параметры" + 11 "укажите каталог, содержащий %s" + 12 "источник установки данной возможности не указан" + 13 "сетевой диск для данной возможности не указан" + 14 "возможность из:" + 15 "выберите каталог, содержащий %s" }

1 0

Gerald Pfeifer : winhttp: Include <sys/socket.h> from winhttp_private.h. Remove now redundant inclusion from request.c.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 8c189d78ee52dae5725a9608d795a69b11de1f67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c189d78ee52dae5725a9608d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jul 25 18:57:18 2009 +0200 winhttp: Include <sys/socket.h> from winhttp_private.h. Remove now redundant inclusion from request.c. --- dlls/winhttp/request.c | 3 --- dlls/winhttp/winhttp_private.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0efada4..0d179a4 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -27,9 +27,6 @@ #ifdef HAVE_ARPA_INET_H # include <arpa/inet.h> #endif -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif #include "windef.h" #include "winbase.h" diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 83df0c0..e445109 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -27,6 +27,9 @@ #include "wine/unicode.h" #include <sys/types.h> +#ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#endif #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif

1 0

Ricardo Filipe : kernel32: Add Portuguese translation.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: bb68894313aecc9dca63d7aa5c57886ea94f9018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb68894313aecc9dca63d7aa5… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Sat Jul 25 13:33:57 2009 -0700 kernel32: Add Portuguese translation. --- .gitignore | 1 + dlls/kernel32/Makefile.in | 3 +- dlls/kernel32/nls/winerr_ptg.mc | 3736 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 3739 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb68894313aecc9dca63d…

1 0

Vincent Povirk : gdiplus: Store color key information in ImageAttributes.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 55ec1d915059a81adce18407de2c06504cf0eab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ec1d915059a81adce18407d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jul 24 17:57:38 2009 -0500 gdiplus: Store color key information in ImageAttributes. --- dlls/gdiplus/gdiplus_private.h | 7 +++++++ dlls/gdiplus/imageattributes.c | 11 ++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index be881c7..dccc834 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -223,8 +223,15 @@ struct GpCachedBitmap{ GpImage *image; }; +struct color_key{ + BOOL enabled; + ARGB low; + ARGB high; +}; + struct GpImageAttributes{ WrapMode wrap; + struct color_key colorkeys[ColorAdjustTypeCount]; }; struct GpFont{ diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 55bff18..8f49c67 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -68,15 +68,16 @@ GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes *imageattr) GpStatus WINGDIPAPI GdipSetImageAttributesColorKeys(GpImageAttributes *imageattr, ColorAdjustType type, BOOL enableFlag, ARGB colorLow, ARGB colorHigh) { - static int calls; + TRACE("(%p,%u,%i,%08x,%08x)\n", imageattr, type, enableFlag, colorLow, colorHigh); - if(!imageattr) + if(!imageattr || type >= ColorAdjustTypeCount) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + imageattr->colorkeys[type].enabled = enableFlag; + imageattr->colorkeys[type].low = colorLow; + imageattr->colorkeys[type].high = colorHigh; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipSetImageAttributesColorMatrix(GpImageAttributes *imageattr,

1 0

Vincent Povirk : gdiplus: Do not draw line-breaking spaces.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: e0d9d17536797b19b362f544f2006a8751c5156e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d9d17536797b19b362f544f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jul 24 16:24:19 2009 -0500 gdiplus: Do not draw line-breaking spaces. --- dlls/gdiplus/graphics.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index dcff926..3199dbb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2233,7 +2233,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string WCHAR* stringdup; REAL angle, ang_cos, ang_sin, rel_width, rel_height; INT sum = 0, height = 0, offsety = 0, fit, fitcpy, save_state, i, j, lret, nwidth, - nheight; + nheight, lineend; SIZE size; POINT drawbase; UINT drawflags; @@ -2384,7 +2384,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string /* Line break code (may look strange, but it imitates windows). */ if(lret < fit) - fit = lret; /* this is not an off-by-one error */ + lineend = fit = lret; /* this is not an off-by-one error */ else if(fit < (length - sum)){ if(*(stringdup + sum + fit) == ' ') while(*(stringdup + sum + fit) == ' ') @@ -2401,8 +2401,14 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string break; } } + lineend = fit; + while(*(stringdup + sum + lineend - 1) == ' ' || + *(stringdup + sum + lineend - 1) == '\t') + lineend--; } - DrawTextW(graphics->hdc, stringdup + sum, min(length - sum, fit), + else + lineend = fit; + DrawTextW(graphics->hdc, stringdup + sum, min(length - sum, lineend), &drawcoord, drawflags); sum += fit + (lret < fitcpy ? 1 : 0); @@ -3207,7 +3213,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, HFONT oldfont; WCHAR* stringdup; INT sum = 0, height = 0, fit, fitcpy, max_width = 0, i, j, lret, nwidth, - nheight; + nheight, lineend; SIZE size; TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, @@ -3260,7 +3266,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, /* Line break code (may look strange, but it imitates windows). */ if(lret < fit) - fit = lret; /* this is not an off-by-one error */ + lineend = fit = lret; /* this is not an off-by-one error */ else if(fit < (length - sum)){ if(*(stringdup + sum + fit) == ' ') while(*(stringdup + sum + fit) == ' ') @@ -3277,9 +3283,15 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, break; } } + lineend = fit; + while(*(stringdup + sum + lineend - 1) == ' ' || + *(stringdup + sum + lineend - 1) == '\t') + lineend--; } + else + lineend = fit; - GetTextExtentExPointW(graphics->hdc, stringdup + sum, fit, + GetTextExtentExPointW(graphics->hdc, stringdup + sum, lineend, nwidth, &j, NULL, &size); sum += fit + (lret < fitcpy ? 1 : 0);

1 0

Vincent Povirk : gdiplus: Don't use -escapement angle in GdipDrawString.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: b330ebfe8e895cd3a0b974feb81b2662dba122d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b330ebfe8e895cd3a0b974feb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jul 24 13:56:22 2009 -0500 gdiplus: Don't use -escapement angle in GdipDrawString. --- dlls/gdiplus/graphics.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 58ca2e6..dcff926 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2328,10 +2328,10 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string pt[1].X = 1.0; pt[1].Y = 0.0; GdipTransformMatrixPoints(graphics->worldtrans, pt, 2); - angle = gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); + angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); ang_cos = cos(angle); ang_sin = sin(angle); - lfw.lfEscapement = lfw.lfOrientation = -roundr((angle / M_PI) * 1800.0); + lfw.lfEscapement = lfw.lfOrientation = roundr((angle / M_PI) * 1800.0); gdifont = CreateFontIndirectW(&lfw); DeleteObject(SelectObject(graphics->hdc, CreateFontIndirectW(&lfw)));

1 0

Austin English : wineinstall: Ask about installation before running configure.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 1c2df36d2574d83979fc2626893239553fe8f229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c2df36d2574d83979fc26268… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jul 24 13:17:57 2009 -0500 wineinstall: Ask about installation before running configure. --- tools/wineinstall | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/tools/wineinstall b/tools/wineinstall index 17e86a9..e8e22bf 100755 --- a/tools/wineinstall +++ b/tools/wineinstall @@ -106,6 +106,17 @@ then std_sleep fi +# Ask the user if they want to build and install Wine: +echo +echo "We need to install Wine as the root user. Do you want us to build Wine," +echo "'su root' and install Wine? Enter 'no' to build Wine without installing:" +conf_yesno_answer "(yes/no) " +ROOTINSTALL="$ANSWER" + +if [ "$ROOTINSTALL" = "yes" ] +then sucommand="make install" +fi + # run the configure script, if necessary if [ -f Makefile ] @@ -124,19 +135,7 @@ else fi fi -# now do the compilation and install, we need to always do this because we -# don't want the 'make install' command we might run to run 'make' as root - -# ask the user if they want to build and install wine -echo -echo "We need to install wine as root user, do you want us to build wine," -echo "'su root' and install Wine? Enter 'no' to continue without installing" -conf_yesno_answer "(yes/no) " -ROOTINSTALL="$ANSWER" - -if [ "$ROOTINSTALL" = "yes" ] -then sucommand="make install" -fi +# Now do the compilation and (optionally) installation echo echo "Compiling Wine. Grab a lunch or two, rent a video, or whatever,"

1 0

Aric Stewart : mpr: Update Japanese resource.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 8da6acb3876b3a78c30a96718d611f20aa625d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8da6acb3876b3a78c30a96718… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jul 24 14:11:49 2009 -0500 mpr: Update Japanese resource. --- dlls/mpr/mpr_Ja.rc | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/mpr/mpr_Ja.rc b/dlls/mpr/mpr_Ja.rc index 7cd68f0..a662ce7 100644 --- a/dlls/mpr/mpr_Ja.rc +++ b/dlls/mpr/mpr_Ja.rc @@ -29,3 +29,23 @@ STRINGTABLE DISCARDABLE { IDS_ENTIRENETWORK "ネットワーク全体" } + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ネットワーク用パスワードを入力" +FONT 8, "MS Shell Dlg" +{ + LTEXT "ユーザー名とパスワードを入力してください:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "プロキシ", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "ユーザー名", -1, 40, 66, 50, 10 + LTEXT "パスワード", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "パスワードを保存する(&S)(セキュアではありません)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "キャンセル", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +}

1 0

Aric Stewart : appwiz: Update Japanese resource.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 70f00e9122636e434ef6db537b75100c2fc045be URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f00e9122636e434ef6db537… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jul 24 14:11:36 2009 -0500 appwiz: Update Japanese resource. --- dlls/appwiz.cpl/Ja.rc | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/Ja.rc b/dlls/appwiz.cpl/Ja.rc index f4e45d0..c6d32e4 100644 --- a/dlls/appwiz.cpl/Ja.rc +++ b/dlls/appwiz.cpl/Ja.rc @@ -38,9 +38,10 @@ STRINGTABLE IDS_COLUMN_NAME, "名前" IDS_COLUMN_PUBLISHER, "発行元" IDS_COLUMN_VERSION, "バージョン" + IDS_INSTALL_FILTER, "インストールプログラム\0*instal*.exe;*setup*.exe;*.msi\0プログラム(*.exe)\0*.exe\0すべてのファイル (*.*)\0*.*\0\0" - IDS_REMOVE, "&Remove..." - IDS_MODIFY_REMOVE, "&Modify/Remove..." + IDS_REMOVE, "削除(&R)…" + IDS_MODIFY_REMOVE, "変更/削除(&M)…" } IDD_MAIN DIALOG 0, 0, 320, 220

1 0

Frédéric Delanoy : jscript: Update French translation.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: af3f0ec96406f2f7b0afdf721fae717744287b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3f0ec96406f2f7b0afdf721… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 24 21:10:28 2009 +0200 jscript: Update French translation. --- dlls/jscript/jscript_Fr.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Fr.rc b/dlls/jscript/jscript_Fr.rc index 3d31d51..6ef3502 100644 --- a/dlls/jscript/jscript_Fr.rc +++ b/dlls/jscript/jscript_Fr.rc @@ -31,9 +31,14 @@ STRINGTABLE DISCARDABLE IDS_INVALID_CALL_ARG "Appel de procédure ou argument invalide" IDS_NO_PROPERTY "Cet objet ne supporte pas cette propriété ou méthode" IDS_ARG_NOT_OPT "Argument non optionnel" + IDS_SYNTAX_ERROR "Erreur de syntaxe" + IDS_SEMICOLON "« ; » attendu" + IDS_LBRACKET "« ( » attendu" + IDS_RBRACKET "« ) » attendu" IDS_NOT_FUNC "Fonction attendue" IDS_NOT_DATE "« [objet] » n'est pas un objet de type date" IDS_NOT_NUM "Nombre attendu" + IDS_ILLEGAL_ASSIGN "Affectation illégale" IDS_UNDEFINED "« | » n'est pas défini" IDS_NOT_BOOL "Booléen attendu" IDS_INVALID_LENGTH "La longueur d'un tableau doit être un entier positif"

1 0