wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

Vincent Povirk : gdiplus: Don' t rely on an HDC in GdipMeasureCharacterRanges.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 867f3d39e7859104bc415234a86fae773a51809f URL: http://source.winehq.org/git/wine.git/?a=commit;h=867f3d39e7859104bc415234a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Oct 30 13:28:15 2010 -0500 gdiplus: Don't rely on an HDC in GdipMeasureCharacterRanges. --- dlls/gdiplus/graphics.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8e203f3..da2d966 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3834,6 +3834,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, int i; HFONT oldfont; struct measure_ranges_args args; + HDC temp_hdc=NULL; TRACE("(%p %s %d %p %s %p %d %p)\n", graphics, debugstr_w(string), length, font, debugstr_rectf(layoutRect), stringFormat, regionCount, regions); @@ -3846,8 +3847,8 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if(!graphics->hdc) { - FIXME("graphics object has no HDC\n"); - return NotImplemented; + temp_hdc = graphics->hdc = CreateCompatibleDC(0); + if (!temp_hdc) return OutOfMemory; } if (stringFormat->attr) @@ -3869,6 +3870,12 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, DeleteObject(SelectObject(graphics->hdc, oldfont)); + if (temp_hdc) + { + graphics->hdc = NULL; + DeleteDC(temp_hdc); + } + return stat; }

1 0

Vincent Povirk : gdiplus: Don't rely on an HDC in GdipGetFontHeight.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: cb21d1caf441b5adeeb52f3c6e3af03a0dcfc844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb21d1caf441b5adeeb52f3c6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Oct 30 13:19:48 2010 -0500 gdiplus: Don't rely on an HDC in GdipGetFontHeight. --- dlls/gdiplus/font.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 2670e81..843cfb5 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -452,12 +452,16 @@ GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont *font, GDIPCONST GpGraphics *graphics, REAL *height) { REAL dpi; + GpStatus stat; TRACE("%p %p %p\n", font, graphics, height); - dpi = GetDeviceCaps(graphics->hdc, LOGPIXELSY); + stat = GdipGetDpiY((GpGraphics*)graphics, &dpi); + + if (stat == Ok) + stat = GdipGetFontHeightGivenDPI(font, dpi, height); - return GdipGetFontHeightGivenDPI(font, dpi, height); + return stat; } /*******************************************************************************

1 0

Vincent Povirk : gdiplus: Add a test for GdipCreateMatrix3.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 4fff9a7a526ad730144dbda8b8d84bc298d31602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fff9a7a526ad730144dbda8b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Oct 30 15:50:25 2010 -0500 gdiplus: Add a test for GdipCreateMatrix3. --- dlls/gdiplus/tests/matrix.c | 83 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index 16ce85a..b9992c3 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -26,6 +26,7 @@ #include "wine/test.h" #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) static void test_constructor_destructor(void) { @@ -220,6 +221,87 @@ static void test_shear(void) GdipDeleteMatrix(matrix); } +static void test_constructor3(void) +{ + /* MSDN is on crack. GdipCreateMatrix3 makes a matrix that transforms the + * corners of the given rectangle to the three points given. */ + GpMatrix *matrix; + REAL values[6]; + GpRectF rc; + GpPointF pt[3]; + GpStatus stat; + + rc.X = 10; + rc.Y = 10; + rc.Width = 10; + rc.Height = 10; + + pt[0].X = 10; + pt[0].Y = 10; + pt[1].X = 20; + pt[1].Y = 10; + pt[2].X = 10; + pt[2].Y = 20; + + stat = GdipCreateMatrix3(&rc, pt, &matrix); + expect(Ok, stat); + + stat = GdipGetMatrixElements(matrix, values); + expect(Ok, stat); + + todo_wine expectf(1.0, values[0]); + todo_wine expectf(0.0, values[1]); + todo_wine expectf(0.0, values[2]); + todo_wine expectf(1.0, values[3]); + todo_wine expectf(0.0, values[4]); + todo_wine expectf(0.0, values[5]); + + GdipDeleteMatrix(matrix); + + pt[0].X = 20; + pt[0].Y = 10; + pt[1].X = 40; + pt[1].Y = 10; + pt[2].X = 20; + pt[2].Y = 20; + + stat = GdipCreateMatrix3(&rc, pt, &matrix); + expect(Ok, stat); + + stat = GdipGetMatrixElements(matrix, values); + expect(Ok, stat); + + todo_wine expectf(2.0, values[0]); + todo_wine expectf(0.0, values[1]); + todo_wine expectf(0.0, values[2]); + todo_wine expectf(1.0, values[3]); + todo_wine expectf(0.0, values[4]); + todo_wine expectf(0.0, values[5]); + + GdipDeleteMatrix(matrix); + + pt[0].X = 10; + pt[0].Y = 20; + pt[1].X = 20; + pt[1].Y = 30; + pt[2].X = 10; + pt[2].Y = 30; + + stat = GdipCreateMatrix3(&rc, pt, &matrix); + expect(Ok, stat); + + stat = GdipGetMatrixElements(matrix, values); + expect(Ok, stat); + + todo_wine expectf(1.0, values[0]); + todo_wine expectf(1.0, values[1]); + todo_wine expectf(0.0, values[2]); + todo_wine expectf(1.0, values[3]); + todo_wine expectf(0.0, values[4]); + todo_wine expectf(0.0, values[5]); + + GdipDeleteMatrix(matrix);} + START_TEST(matrix) { struct GdiplusStartupInput gdiplusStartupInput; @@ -237,6 +319,7 @@ START_TEST(matrix) test_isinvertible(); test_invert(); test_shear(); + test_constructor3(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Povirk : gdiplus: Fix point conversion in GdipCreateLineBrushI.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: bb444e81ccb8a14c0dc1b11f4d3e5c0b6a23fb76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb444e81ccb8a14c0dc1b11f4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Oct 30 13:59:21 2010 -0500 gdiplus: Fix point conversion in GdipCreateLineBrushI. --- dlls/gdiplus/brush.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index c3e25d6..61ec6a3 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -404,7 +404,7 @@ GpStatus WINGDIPAPI GdipCreateLineBrushI(GDIPCONST GpPoint* startpoint, stF.X = (REAL)startpoint->X; stF.Y = (REAL)startpoint->Y; endF.X = (REAL)endpoint->X; - endF.X = (REAL)endpoint->Y; + endF.Y = (REAL)endpoint->Y; return GdipCreateLineBrush(&stF, &endF, startcolor, endcolor, wrap, line); }

1 0

Yaron Shahrabani : gphoto2: Added Hebrew translation.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: f3dcfa19a04c6264f062fab960b158923e93bbea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3dcfa19a04c6264f062fab96… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Wed Oct 27 15:38:36 2010 +0200 gphoto2: Added Hebrew translation. --- dlls/gphoto2.ds/Makefile.in | 1 + dlls/gphoto2.ds/gphoto2_He.rc | 62 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in index 65647bd..6943b15 100644 --- a/dlls/gphoto2.ds/Makefile.in +++ b/dlls/gphoto2.ds/Makefile.in @@ -15,6 +15,7 @@ RC_SRCS = \ gphoto2_En.rc \ gphoto2_Es.rc \ gphoto2_Fr.rc \ + gphoto2_He.rc \ gphoto2_Hu.rc \ gphoto2_It.rc \ gphoto2_Ja.rc \ diff --git a/dlls/gphoto2.ds/gphoto2_He.rc b/dlls/gphoto2.ds/gphoto2_He.rc new file mode 100644 index 0000000..6943e9f --- /dev/null +++ b/dlls/gphoto2.ds/gphoto2_He.rc @@ -0,0 +1,62 @@ +/* + * Hebrew resources for Twain + * + * Copyright 2006 CodeWeavers, Aric Stewart + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * 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 "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_CAMERAUI DIALOG 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "קבצים במצלמה" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | +WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "יבוא הנבחרים",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "תצוגה מקדימה",IDC_FETCH,7,252,64,14 + PUSHBUTTON "יבוא הכול",IDC_IMPORTALL,80,252,64,14 + CONTROL "דילוג על דו־שיח זה",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + PUSHBUTTON "יציאה",IDC_EXIT,315,252,50,14 +END + +IDD_DIALOG1 DIALOG 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "העברה" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "מתבצעת העברה... נא להמתין",IDC_STATIC,5,19,176,8, SS_CENTER +END + +IDD_CONNECTING DIALOG 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "התחברות למצלמה" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "בהתחברות למצלמה... נא להמתין",IDC_STATIC,128,58, + 116,8 +END

1 0

Yaron Shahrabani : hhctrl.ocx: Added Hebrew translation.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: b36946038283c19a4a8c762c937a9e88107de70d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b36946038283c19a4a8c762c9… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Wed Oct 27 12:35:11 2010 +0200 hhctrl.ocx: Added Hebrew translation. --- dlls/hhctrl.ocx/He.rc | 63 +++++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/Makefile.in | 1 + 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/He.rc b/dlls/hhctrl.ocx/He.rc new file mode 100644 index 0000000..8b1faa3 --- /dev/null +++ b/dlls/hhctrl.ocx/He.rc @@ -0,0 +1,63 @@ +/* + * HTML Help resources + * Hebrew Language Support + * + * Copyright 2005 James Hawkins + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * 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 "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CONTENTS "&תכנים" + IDS_INDEX "מ&פתח נושאים" + IDS_SEARCH "&חיפוש" + IDS_FAVORITES "מו&עדפים" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "הצגה" + IDTB_CONTRACT "הסתרה" + IDTB_STOP "עצירה" + IDTB_REFRESH "רענון" + IDTB_BACK "חזרה" + IDTB_HOME "דף הבית" + IDTB_SYNC "סנכרון" + IDTB_PRINT "הדפסה" + IDTB_OPTIONS "אפשרויות" + IDTB_FORWARD "קדימה" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "מעבר 1" + IDTB_JUMP2 "מעבר 2" + IDTB_CUSTOMIZE "התאמה אישית" + IDTB_ZOOM "תקריב" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 7e3ced1..737a614 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -21,6 +21,7 @@ RC_SRCS = \ Es.rc \ Fi.rc \ Fr.rc \ + He.rc \ Hu.rc \ It.rc \ Ja.rc \

1 0

Aric Stewart : ups10: Corrected rtl implementation for ScriptStringXtoCP and ScriptStringXtoCP.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 7891f05b88ab7b274c4cb9d4864ee92612ff241d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7891f05b88ab7b274c4cb9d48… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 29 13:48:48 2010 -0500 ups10: Corrected rtl implementation for ScriptStringXtoCP and ScriptStringXtoCP. --- dlls/usp10/tests/usp10.c | 16 +++++----------- dlls/usp10/usp10.c | 24 ++++++++++++++++++++---- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 1b7bab4..56385c6 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1363,7 +1363,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) hr = ScriptStringCPtoX(ssa, Cp, FALSE, &lead); ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); if (rtl[Cp]) - todo_wine ok(lead > trail, "Leading values should be after trialing for rtl chracters(%i)\n",Cp); + ok(lead > trail, "Leading values should be after trialing for rtl chracters(%i)\n",Cp); else ok(lead < trail, "Trailing values should be after leading for ltr chracters(%i)\n",Cp); @@ -1375,9 +1375,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) if (rtl[Cp]) X--; else X++; hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); - if (rtl[Cp]) todo_wine ok(Cp == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp, Ch, trail); - if (rtl[Cp]) todo_wine ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", iTrailing, X); @@ -1386,9 +1384,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) if (rtl[Cp]) X++; else X--; hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); - if (rtl[Cp]) todo_wine ok(Cp == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp, Ch, trail); - if (rtl[Cp]) todo_wine ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", iTrailing, X); @@ -1399,10 +1395,9 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) X++; hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); - if (rtl[Cp]) todo_wine ok(Cp + 1 == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp + 1, Ch, trail); if (rtl[Cp+1]) - todo_wine ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", + ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", iTrailing, X); else ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", @@ -1416,10 +1411,9 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) X--; hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); - if (rtl[Cp]) todo_wine ok(Cp - 1 == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp - 1, Ch, trail); if (Cp != 0 && rtl[Cp-1]) - todo_wine ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", + ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", iTrailing, X); else ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", @@ -1436,8 +1430,8 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) X--; hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); - todo_wine ok(Ch == 1, "ScriptStringXtoCP should return Ch = 1 not %d for X outside leading edge when rtl\n", Ch); - todo_wine ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = outside leading edge when rtl\n", + ok(Ch == 1, "ScriptStringXtoCP should return Ch = 1 not %d for X outside leading edge when rtl\n", Ch); + ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = outside leading edge when rtl\n", iTrailing); } else diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 65f6d2c..e483868 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -936,6 +936,7 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrai int runningX = 0; int runningCp = 0; StringAnalysis* analysis = ssa; + BOOL itemTrailing; TRACE("(%p), %d, %d, (%p)\n", ssa, icp, fTrailing, pX); @@ -950,15 +951,19 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrai for(i=0; i<analysis->numItems; i++) { + if (analysis->pItem[i].a.fRTL) + itemTrailing = !fTrailing; + else + itemTrailing = fTrailing; for(j=0; j<analysis->glyphs[i].numGlyphs; j++) { - if(runningCp == icp && fTrailing == FALSE) + if(runningCp == icp && itemTrailing == FALSE) { *pX = runningX; return S_OK; } runningX += analysis->glyphs[i].piAdvance[j]; - if(runningCp == icp && fTrailing == TRUE) + if(runningCp == icp && itemTrailing == TRUE) { *pX = runningX; return S_OK; @@ -992,8 +997,16 @@ HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int* piCh, /* out of range */ if(iX < 0) { - *piCh = -1; - *piTrailing = TRUE; + if (analysis->pItem[0].a.fRTL) + { + *piCh = 1; + *piTrailing = FALSE; + } + else + { + *piCh = -1; + *piTrailing = TRUE; + } return S_OK; } @@ -1009,6 +1022,9 @@ HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int* piCh, *piTrailing = TRUE; else *piTrailing = FALSE; + + if (analysis->pItem[i].a.fRTL) + *piTrailing = !*piTrailing; return S_OK; } runningX += width;

1 0

André Hentschel : include: Merge the ia64 ifdefs into one.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 5f6ea28c99ce86ea811499c360d9770ba5824e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6ea28c99ce86ea811499c36… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 29 17:13:21 2010 +0200 include: Merge the ia64 ifdefs into one. --- include/winnt.h | 474 +++++++++++++++++++++++++++---------------------------- 1 files changed, 235 insertions(+), 239 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f6ea28c99ce86ea81149…

1 0

André Hentschel : include: Better detect MIPS architecture.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 98998cbad5c7290af6850bb3d52fec380f7c252e URL: http://source.winehq.org/git/wine.git/?a=commit;h=98998cbad5c7290af6850bb3d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 29 16:34:47 2010 +0200 include: Better detect MIPS architecture. --- include/winnt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 3c38acc..f4e24d6 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1309,7 +1309,7 @@ typedef struct _CONTEXT { /* Mips context definitions */ -#ifdef _MIPS_ +#if defined(_MIPS_) || defined(__MIPS__) || defined(__mips__) #define CONTEXT_R4000 0x00010000

1 0

André Hentschel : include: Add MIPS endianess.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: a0dabd33e5f7d81d2085ce53ccfef1c2242871e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0dabd33e5f7d81d2085ce53c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 29 16:34:38 2010 +0200 include: Add MIPS endianess. --- include/basetsd.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index aa6e86d..1259ad9 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -299,6 +299,14 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY; # undef WORDS_BIGENDIAN # undef BITFIELDS_BIGENDIAN # undef ALLOW_UNALIGNED_ACCESS +#elif defined(__MIPSEB__) +# define WORDS_BIGENDIAN +# define BITFIELDS_BIGENDIAN +# undef ALLOW_UNALIGNED_ACCESS +#elif defined(__MIPSEL__) +# undef WORDS_BIGENDIAN +# undef BITFIELDS_BIGENDIAN +# undef ALLOW_UNALIGNED_ACCESS #elif !defined(RC_INVOKED) && !defined(__WIDL__) && !defined(__midl) # error Unknown CPU architecture! #endif

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2010