June 2008 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : msxml3: Improved checking of failed case.
by Alexandre Julliard June 20, 2008

June 20, 2008

Module: wine Branch: master Commit: 56d5332285069769986e665a44ea68451f67053b URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d5332285069769986e665a4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 18 21:40:06 2008 +1000 msxml3: Improved checking of failed case. --- dlls/msxml3/tests/xmlelem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c index 5c80f7c..71d9027 100644 --- a/dlls/msxml3/tests/xmlelem.c +++ b/dlls/msxml3/tests/xmlelem.c @@ -287,7 +287,7 @@ static void test_xmlelem_collection(void) ok(hr == S_OK || hr == ERROR_URL_NOT_FOUND, "Expected S_OK, got 0x%08x\n", hr); SysFreeString(url); - if(hr == ERROR_URL_NOT_FOUND) + if(hr != S_OK) goto cleanup; hr = IXMLDocument_get_root(doc, &element);

1 0

Alistair Leslie-Hughes : urlmon: Check pointer before use.
by Alexandre Julliard June 20, 2008

June 20, 2008

Module: wine Branch: master Commit: 031e1ae441d4908e7331258d2b247267906f28cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=031e1ae441d4908e7331258d2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 18 22:14:30 2008 +1000 urlmon: Check pointer before use. --- dlls/urlmon/tests/stream.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/tests/stream.c b/dlls/urlmon/tests/stream.c index 72a1d43..4fc96ef 100644 --- a/dlls/urlmon/tests/stream.c +++ b/dlls/urlmon/tests/stream.c @@ -294,7 +294,7 @@ static void create_file(void) static void test_URLOpenBlockingStreamW(void) { HRESULT hr; - IStream *pStream; + IStream *pStream = NULL; char buffer[256]; hr = URLOpenBlockingStreamW(NULL, NULL, &pStream, 0, &BindStatusCallback); @@ -324,12 +324,14 @@ static void test_URLOpenBlockingStreamW(void) CHECK_CALLED(OnStopBinding); ok(pStream != NULL, "pStream is NULL\n"); + if(pStream) + { + hr = IStream_Read(pStream, buffer, sizeof(buffer), NULL); + ok(hr == S_OK, "IStream_Read failed with error 0x%08x\n", hr); + ok(!memcmp(buffer, szHtmlDoc, sizeof(szHtmlDoc)-1), "read data differs from file\n"); - hr = IStream_Read(pStream, buffer, sizeof(buffer), NULL); - ok(hr == S_OK, "IStream_Read failed with error 0x%08x\n", hr); - ok(!memcmp(buffer, szHtmlDoc, sizeof(szHtmlDoc)-1), "read data differs from file\n"); - - IStream_Release(pStream); + IStream_Release(pStream); + } } static void test_URLOpenStreamW(void)

1 0

Nikolay Sivov : gdiplus: Implemented GdipGetPathData with test.
by Alexandre Julliard June 20, 2008

June 20, 2008

Module: wine Branch: master Commit: 3bacdaf664593b720afeb55a94225aab5aa04c80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bacdaf664593b720afeb55a9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jun 18 11:33:06 2008 +0400 gdiplus: Implemented GdipGetPathData with test. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 22 ++++++++++++++++++++++ dlls/gdiplus/tests/graphicspath.c | 23 +++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 3d01c16..23346fc 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -323,7 +323,7 @@ @ stub GdipGetNearestColor @ stdcall GdipGetPageScale(ptr ptr) @ stdcall GdipGetPageUnit(ptr ptr) -@ stub GdipGetPathData +@ stdcall GdipGetPathData(ptr ptr) @ stdcall GdipGetPathFillMode(ptr ptr) @ stub GdipGetPathGradientBlend @ stub GdipGetPathGradientBlendCount diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 3782ca7..24f25e1 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -479,6 +479,28 @@ GpStatus WINGDIPAPI GdipDeletePath(GpPath *path) return Ok; } +GpStatus WINGDIPAPI GdipGetPathData(GpPath *path, GpPathData* pathData) +{ + if(!path || !pathData) + return InvalidParameter; + + pathData->Count = path->pathdata.Count; + + pathData->Points = GdipAlloc(sizeof(PointF) * pathData->Count); + if(!pathData->Points) + return OutOfMemory; + + pathData->Types = GdipAlloc(pathData->Count); + if(!pathData->Points) + return OutOfMemory; + + /* copy data */ + memcpy(pathData->Points, path->pathdata.Points, sizeof(PointF) * pathData->Count); + memcpy(pathData->Types , path->pathdata.Types , pathData->Count); + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPathFillMode(GpPath *path, GpFillMode *fillmode) { if(!path || !fillmode) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 6436b1a..672f6da 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -149,6 +149,28 @@ static void test_constructor_destructor(void) expect(Ok, status); } +static void test_getpathdata(void) +{ + GpPath *path; + GpPathData data; + GpStatus status; + + GdipCreatePath(FillModeAlternate, &path); + status = GdipAddPathLine(path, 5.0, 5.0, 100.0, 50.0); + expect(Ok, status); + + status = GdipGetPathData(path, &data); + expect(Ok, status); + expect((data.Count == 2), TRUE); + expect((data.Points[0].X == 5.0) && (data.Points[0].Y == 5.0) && + (data.Points[1].X == 100.0) && (data.Points[1].Y == 50.0), TRUE); + expect((data.Types[0] == PathPointTypeStart) && (data.Types[1] == PathPointTypeLine), TRUE); + + GdipFree(data.Points); + GdipFree(data.Types); + GdipDeletePath(path); +} + static path_test_t line2_path[] = { {0.0, 50.0, PathPointTypeStart, 0, 0}, /*0*/ {5.0, 45.0, PathPointTypeLine, 0, 0}, /*1*/ @@ -605,6 +627,7 @@ START_TEST(graphicspath) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_constructor_destructor(); + test_getpathdata(); test_line2(); test_arc(); test_worldbounds(); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 152b6da..58659fe 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -225,6 +225,7 @@ GpStatus WINGDIPAPI GdipCreatePath2(GDIPCONST GpPointF*,GDIPCONST BYTE*,INT, GpFillMode,GpPath**); GpStatus WINGDIPAPI GdipCreatePath2I(GDIPCONST GpPoint*,GDIPCONST BYTE*,INT,GpFillMode,GpPath**); GpStatus WINGDIPAPI GdipDeletePath(GpPath*); +GpStatus WINGDIPAPI GdipGetPathData(GpPath*,GpPathData*); GpStatus WINGDIPAPI GdipGetPathFillMode(GpPath*,GpFillMode*); GpStatus WINGDIPAPI GdipGetPathPoints(GpPath*,GpPointF*,INT); GpStatus WINGDIPAPI GdipGetPathPointsI(GpPath*,GpPoint*,INT);

1 0

Nikolay Sivov : gdiplus: Stub for GdipFlush.
by Alexandre Julliard June 20, 2008

June 20, 2008

Module: wine Branch: master Commit: f620b663a7dfc1f804b6c38a83d29e9cb14e6347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f620b663a7dfc1f804b6c38a8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jun 18 11:33:10 2008 +0400 gdiplus: Stub for GdipFlush. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 13 +++++++++++++ include/gdiplusenums.h | 7 +++++++ include/gdiplusflat.h | 1 + include/gdiplusgpstubs.h | 1 + 5 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 70864ba..3d01c16 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -234,7 +234,7 @@ @ stdcall GdipFindFirstImageItem(ptr ptr) @ stub GdipFindNextImageItem @ stub GdipFlattenPath -@ stub GdipFlush +@ stdcall GdipFlush(long) @ stdcall GdipFree(ptr) @ stub GdipGetAdjustableArrowCapFillState @ stub GdipGetAdjustableArrowCapHeight diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 45794f0..5716341 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1957,6 +1957,19 @@ GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics *graphics, GpBrush *brush, GD return ret; } +GpStatus WINGDIPAPI GdipFlush(GpGraphics *graphics, GpFlushIntention intention) +{ + static int calls; + + if(!graphics) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + /* FIXME: Compositing mode is not used anywhere except the getter/setter. */ GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics *graphics, CompositingMode *mode) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 4e937c0..a27ed5e 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -298,6 +298,12 @@ enum CombineMode CombineModeComplement }; +enum FlushIntention +{ + FlushIntentionFlush = 0, + FlushIntentionSync = 1 +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -329,6 +335,7 @@ typedef enum HotkeyPrefix HotkeyPrefix; typedef enum PenAlignment GpPenAlignment; typedef enum ImageCodecFlags ImageCodecFlags; typedef enum CombineMode CombineMode; +typedef enum FlushIntention FlushIntention; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 5ce32b2..152b6da 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -368,6 +368,7 @@ GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *, GpGraphics *, HRGN *); GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *); GpStatus WINGDIPAPI GdipSetInfinite(GpRegion *); +GpStatus WINGDIPAPI GdipFlush(GpGraphics*, GpFlushIntention); #ifdef __cplusplus } diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 9f7d092..c5e676d 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -81,5 +81,6 @@ typedef MatrixOrder GpMatrixOrder; typedef Point GpPoint; typedef WrapMode GpWrapMode; typedef Color GpColor; +typedef FlushIntention GpFlushIntention; #endif

1 0

Nikolay Sivov : gdiplus: Implemented GdipAddPathRectangles with tests.
by Alexandre Julliard June 20, 2008

June 20, 2008

Module: wine Branch: master Commit: d4ae6fa1ea87a2efd671ef89c599c3c76d0717a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4ae6fa1ea87a2efd671ef89c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jun 18 11:32:49 2008 +0400 gdiplus: Implemented GdipAddPathRectangles with tests. --- dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/graphicspath.c | 62 +++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/graphicspath.c | 19 +++++++++++ include/gdiplusflat.h | 2 + 4 files changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f2eb2b3..70864ba 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -27,8 +27,8 @@ @ stub GdipAddPathPolygonI @ stdcall GdipAddPathRectangle(ptr long long long long) @ stdcall GdipAddPathRectangleI(ptr long long long long) -@ stub GdipAddPathRectangles -@ stub GdipAddPathRectanglesI +@ stdcall GdipAddPathRectangles(ptr ptr long) +@ stdcall GdipAddPathRectanglesI(ptr ptr long) @ stub GdipAddPathString @ stub GdipAddPathStringI @ stdcall GdipAlloc(long) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 3b09e04..3782ca7 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -758,3 +758,65 @@ GpStatus WINGDIPAPI GdipAddPathRectangleI(GpPath *path, INT x, INT y, { return GdipAddPathRectangle(path,(REAL)x,(REAL)y,(REAL)width,(REAL)height); } + +GpStatus WINGDIPAPI GdipAddPathRectangles(GpPath *path, GDIPCONST GpRectF *rects, INT count) +{ + GpPath *backup; + GpStatus retstat; + INT i; + + /* count == 0 - verified condition */ + if(!path || !rects || count == 0) + return InvalidParameter; + + if(count < 0) + return OutOfMemory; + + /* make a backup copy */ + if((retstat = GdipClonePath(path, &backup)) != Ok) + return retstat; + + for(i = 0; i < count; i++){ + if((retstat = GdipAddPathRectangle(path,rects[i].X,rects[i].Y,rects[i].Width,rects[i].Height)) != Ok) + goto fail; + } + + /* free backup */ + GdipDeletePath(backup); + return Ok; + +fail: + /* reverting */ + GdipDeletePath(path); + GdipClonePath(backup, &path); + GdipDeletePath(backup); + + return retstat; +} + +GpStatus WINGDIPAPI GdipAddPathRectanglesI(GpPath *path, GDIPCONST GpRect *rects, INT count) +{ + GpRectF *rectsF; + GpStatus retstat; + INT i; + + if(!rects || count == 0) + return InvalidParameter; + + if(count < 0) + return OutOfMemory; + + rectsF = GdipAlloc(sizeof(GpRectF)*count); + + for(i = 0;i < count;i++){ + rectsF[i].X = (REAL)rects[i].X; + rectsF[i].Y = (REAL)rects[i].Y; + rectsF[i].Width = (REAL)rects[i].Width; + rectsF[i].Height = (REAL)rects[i].Height; + } + + retstat = GdipAddPathRectangles(path, rectsF, count); + GdipFree(rectsF); + + return retstat; +} diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index e797b44..6436b1a 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -561,6 +561,7 @@ static void test_rect(void) { GpStatus status; GpPath *path; + GpRectF rects[2]; GdipCreatePath(FillModeAlternate, &path); status = GdipAddPathRectangle(path, 5.0, 5.0, 100.0, 50.0); @@ -571,6 +572,24 @@ static void test_rect(void) ok_path(path, rect_path, sizeof(rect_path)/sizeof(path_test_t), FALSE); GdipDeletePath(path); + + GdipCreatePath(FillModeAlternate, &path); + + rects[0].X = 5.0; + rects[0].Y = 5.0; + rects[0].Width = 100.0; + rects[0].Height = 50.0; + rects[1].X = 100.0; + rects[1].Y = 50.0; + rects[1].Width = 120.0; + rects[1].Height = 30.0; + + status = GdipAddPathRectangles(path, (GDIPCONST GpRectF*)&rects, 2); + expect(Ok, status); + + ok_path(path, rect_path, sizeof(rect_path)/sizeof(path_test_t), FALSE); + + GdipDeletePath(path); } START_TEST(graphicspath) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0d21c82..5ce32b2 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -215,6 +215,8 @@ GpStatus WINGDIPAPI GdipAddPathLineI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathPath(GpPath*,GDIPCONST GpPath*,BOOL); GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathRectangleI(GpPath*,INT,INT,INT,INT); +GpStatus WINGDIPAPI GdipAddPathRectangles(GpPath*,GDIPCONST GpRectF*,INT); +GpStatus WINGDIPAPI GdipAddPathRectanglesI(GpPath*,GDIPCONST GpRect*,INT); GpStatus WINGDIPAPI GdipClonePath(GpPath*,GpPath**); GpStatus WINGDIPAPI GdipClosePathFigure(GpPath*); GpStatus WINGDIPAPI GdipClosePathFigures(GpPath*);

1 0

Nikolay Sivov : gdiplus: Check pointer in GdipGetLineRectI.
by Alexandre Julliard June 20, 2008

June 20, 2008

Module: wine Branch: master Commit: 250a9d74129465ad2031ed82ae5a59b8d093145e URL: http://source.winehq.org/git/wine.git/?a=commit;h=250a9d74129465ad2031ed82a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jun 18 11:32:37 2008 +0400 gdiplus: Check pointer in GdipGetLineRectI. --- dlls/gdiplus/brush.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index aa740fc..50ba7ca 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -822,6 +822,9 @@ GpStatus WINGDIPAPI GdipGetLineRectI(GpLineGradient *brush, GpRect *rect) GpRectF rectF; GpStatus ret; + if(!rect) + return InvalidParameter; + ret = GdipGetLineRect(brush, &rectF); if(ret == Ok){

1 0

Dylan Smith : wordpad: Fixed a bug in setting the recent file list in the registry.
by Alexandre Julliard June 20, 2008

June 20, 2008

Module: wine Branch: master Commit: 8769e706cc40c97bdda89606a1fa07c065e72c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8769e706cc40c97bdda89606a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 17 21:20:19 2008 -0400 wordpad: Fixed a bug in setting the recent file list in the registry. --- programs/wordpad/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index b8e5283..28f13b9 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -285,7 +285,7 @@ void registry_set_filelist(LPCWSTR newFile, HWND hMainWnd) pFiles[0] = newFile; } else { - for(i = 0; pFiles[i] && i < FILELIST_ENTRIES-1; i++) + for(i = 0; i < FILELIST_ENTRIES-1; i++) pFiles[FILELIST_ENTRIES-1-i] = pFiles[FILELIST_ENTRIES-2-i]; pFiles[0] = newFile;

1 0

Dylan Smith : wordpad: Fixed bugs that prevented setting alignment through dialog.
by Alexandre Julliard June 20, 2008

June 20, 2008

Module: wine Branch: master Commit: d0927f63aa3efbe4d84069bd391982dc1563a8b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0927f63aa3efbe4d84069bd3… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 17 21:20:14 2008 -0400 wordpad: Fixed bugs that prevented setting alignment through dialog. The combobox to select the alignment in the paragraph format dialog did not have enough height to display the dropdown list. Also, code was missing to set the alignment when OK button is pressed. This patch fixes these issues. --- programs/wordpad/Da.rc | 2 +- programs/wordpad/De.rc | 2 +- programs/wordpad/En.rc | 2 +- programs/wordpad/Fr.rc | 2 +- programs/wordpad/Hu.rc | 2 +- programs/wordpad/Ko.rc | 2 +- programs/wordpad/Nl.rc | 2 +- programs/wordpad/No.rc | 2 +- programs/wordpad/Pl.rc | 2 +- programs/wordpad/Ru.rc | 2 +- programs/wordpad/Si.rc | 2 +- programs/wordpad/Tr.rc | 2 +- programs/wordpad/wordpad.c | 10 +++++++++- 13 files changed, 21 insertions(+), 13 deletions(-) diff --git a/programs/wordpad/Da.rc b/programs/wordpad/Da.rc index e82bc46..7b0ad62 100644 --- a/programs/wordpad/Da.rc +++ b/programs/wordpad/Da.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "F�rste linie", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Justering", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Annuller", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 0c875a5..8c60473 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "Erste Zeile", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Ausrichtung", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "A&bbrechen", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index 298fb89..87f5a97 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "First line", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Alignment", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 5646137..ac40084 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "First line", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Alignment", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Annuler", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 8b7c8de..254f435 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "First line", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Alignment", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index bfb3b05..11c8942 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -141,7 +141,7 @@ BEGIN LTEXT "ù° ��", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "��", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "Ȯ��(&O)", IDOK, 137, 15, 50, 15 PUSHBUTTON "��(&C)", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index c5e0d92..bde4be3 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "First line", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Alignment", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index b70cf5e..411e58a 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "F�rste linje", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Justering", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Avbryt", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 247d5e2..444faf8 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -140,7 +140,7 @@ BEGIN LTEXT "Pierwszy wiersz", 0, 15, 55, 40, 19 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Wyr�wnanie", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Anuluj", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index e155f77..d4a67f9 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "�� ", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "��", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&��", IDOK, 137, 15, 50, 15 PUSHBUTTON "�&��", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/Si.rc b/programs/wordpad/Si.rc index a2b2462..5242c21 100644 --- a/programs/wordpad/Si.rc +++ b/programs/wordpad/Si.rc @@ -141,7 +141,7 @@ BEGIN LTEXT "Prva vrstica", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Poravnava", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&V redu", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Prekliči", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index eeb4455..e8bf6a6 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -141,7 +141,7 @@ BEGIN LTEXT "First line", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Alignment", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index c4d858b..f26e153 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1389,6 +1389,8 @@ static INT_PTR CALLBACK newfile_proc(HWND hWnd, UINT message, WPARAM wParam, LPA static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { + static const WORD ALIGNMENT_VALUES[] = {PFA_LEFT, PFA_RIGHT, PFA_CENTER}; + switch(message) { case WM_INITDIALOG: @@ -1439,14 +1441,19 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, { case IDOK: { + HWND hListWnd = GetDlgItem(hWnd, IDC_PARA_ALIGN); HWND hLeftWnd = GetDlgItem(hWnd, IDC_PARA_LEFT); HWND hRightWnd = GetDlgItem(hWnd, IDC_PARA_RIGHT); HWND hFirstWnd = GetDlgItem(hWnd, IDC_PARA_FIRST); WCHAR buffer[MAX_STRING_LEN]; + int index; float num; int ret = 0; PARAFORMAT pf; + index = SendMessageW(hListWnd, CB_GETCURSEL, 0, 0); + pf.wAlignment = ALIGNMENT_VALUES[index]; + GetWindowTextW(hLeftWnd, buffer, MAX_STRING_LEN); if(number_from_string(buffer, &num, TRUE)) ret++; @@ -1490,7 +1497,8 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, pf.dxOffset = pf.dxOffset - pf.dxStartIndent; pf.cbSize = sizeof(pf); - pf.dwMask = PFM_OFFSET | PFM_STARTINDENT | PFM_RIGHTINDENT; + pf.dwMask = PFM_ALIGNMENT | PFM_OFFSET | PFM_RIGHTINDENT | + PFM_STARTINDENT; SendMessageW(hEditorWnd, EM_SETPARAFORMAT, 0, (LPARAM)&pf); } }

1 0

Dylan Smith : wordpad: Fixed calculations for the paragraph format dialog.
by Alexandre Julliard June 20, 2008

June 20, 2008

Module: wine Branch: master Commit: 7fe5d6ad6009c2b596d6ded744377ff18d5eac59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe5d6ad6009c2b596d6ded74… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 17 21:20:10 2008 -0400 wordpad: Fixed calculations for the paragraph format dialog. --- programs/wordpad/wordpad.c | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 596b8fc..c4d858b 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1415,7 +1415,7 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, pf.cbSize = sizeof(pf); pf.dwMask = PFM_ALIGNMENT | PFM_OFFSET | PFM_RIGHTINDENT | - PFM_OFFSETINDENT; + PFM_STARTINDENT; SendMessageW(hEditorWnd, EM_GETPARAFORMAT, 0, (LPARAM)&pf); if(pf.wAlignment == PFA_RIGHT) @@ -1425,11 +1425,11 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, SendMessageW(hListWnd, CB_SETCURSEL, index, 0); - number_with_units(buffer, pf.dxOffset); + number_with_units(buffer, pf.dxStartIndent + pf.dxOffset); SetWindowTextW(hLeftWnd, buffer); number_with_units(buffer, pf.dxRightIndent); SetWindowTextW(hRightWnd, buffer); - number_with_units(buffer, pf.dxStartIndent - pf.dxOffset); + number_with_units(buffer, -pf.dxOffset); SetWindowTextW(hFirstWnd, buffer); } break; @@ -1467,9 +1467,30 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, return FALSE; } else { + if (pf.dxOffset + pf.dxStartIndent < 0 + && pf.dxStartIndent < 0) + { + /* The first line is before the left edge, so + * make sure it is at the left edge. */ + pf.dxOffset = -pf.dxStartIndent; + } else if (pf.dxOffset < 0) { + /* The second and following lines are before + * the left edge, so set it to be at the left + * edge, and adjust the first line since it + * is relative to it. */ + pf.dxStartIndent = max(pf.dxStartIndent + pf.dxOffset, 0); + pf.dxOffset = 0; + } + /* Internally the dxStartIndent is the absolute + * offset for the first line and dxOffset is + * to it value as opposed how it is displayed with + * the first line being the relative value. + * These two lines make the adjustments. */ pf.dxStartIndent = pf.dxStartIndent + pf.dxOffset; + pf.dxOffset = pf.dxOffset - pf.dxStartIndent; + pf.cbSize = sizeof(pf); - pf.dwMask = PFM_OFFSET | PFM_OFFSETINDENT | PFM_RIGHTINDENT; + pf.dwMask = PFM_OFFSET | PFM_STARTINDENT | PFM_RIGHTINDENT; SendMessageW(hEditorWnd, EM_SETPARAFORMAT, 0, (LPARAM)&pf); } }

1 0

Dylan Smith : wordpad: Apply changes on dropdown selection for comboboxes on toolbar.
by Alexandre Julliard June 20, 2008

June 20, 2008

Module: wine Branch: master Commit: 2ee7bcc13c64c1822ae9eafaac505704b1c1a7a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ee7bcc13c64c1822ae9eafaa… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 17 21:19:15 2008 -0400 wordpad: Apply changes on dropdown selection for comboboxes on toolbar. The changes were previously being applied only when the combobox's edit control lost focus notifying an end edit event. In addition, the selection of an item from the dropdown list should also cause the changes to be applied. New functions were created to handle the duplication in expected behaviour for these two events. --- programs/wordpad/wordpad.c | 121 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 98 insertions(+), 23 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 29dc755..596b8fc 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -269,6 +269,32 @@ static void set_size(float size) SendMessageW(hEditorWnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); } +static void on_sizelist_modified(HWND hwndSizeList, LPWSTR wszNewFontSize) +{ + WCHAR sizeBuffer[MAX_STRING_LEN]; + CHARFORMAT2W format; + + ZeroMemory(&format, sizeof(format)); + format.cbSize = sizeof(format); + SendMessageW(hEditorWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&format); + + wsprintfW(sizeBuffer, stringFormat, format.yHeight / 20); + if(lstrcmpW(sizeBuffer, wszNewFontSize)) + { + float size = 0; + if(number_from_string((LPCWSTR) wszNewFontSize, &size, FALSE) + && size > 0) + { + set_size(size); + } else + { + SetWindowTextW(hwndSizeList, sizeBuffer); + MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), + wszAppTitle, MB_OK | MB_ICONINFORMATION); + } + } +} + static void add_size(HWND hSizeListWnd, unsigned size) { WCHAR buffer[3]; @@ -441,6 +467,17 @@ static void set_default_font(void) SendMessageW(hEditorWnd, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&fmt); } +static void on_fontlist_modified(HWND hwndFontList, LPWSTR wszNewFaceName) +{ + CHARFORMAT2W format; + ZeroMemory(&format, sizeof(format)); + format.cbSize = sizeof(format); + SendMessageW(hEditorWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&format); + + if(lstrcmpW(format.szFaceName, wszNewFaceName)) + set_font((LPCWSTR) wszNewFaceName); +} + static void add_font(LPCWSTR fontName, DWORD fontType, HWND hListWnd, NEWTEXTMETRICEXW *ntmc) { COMBOBOXEXITEMW cbItem; @@ -1217,6 +1254,45 @@ static void number_with_units(LPWSTR buffer, int number) MultiByteToWideChar(CP_ACP, 0, string, -1, buffer, MAX_STRING_LEN); } +static BOOL get_comboexlist_selection(HWND hComboEx, LPWSTR wszBuffer, UINT bufferLength) +{ + HANDLE hHeap; + COMBOBOXEXITEM cbItem; + COMBOBOXINFO cbInfo; + HWND hCombo, hList; + int idx, result; + char *szBuffer; + hCombo = (HWND)SendMessage(hComboEx, CBEM_GETCOMBOCONTROL, 0, 0); + if (!hCombo) + return FALSE; + cbInfo.cbSize = sizeof(COMBOBOXINFO); + result = SendMessage(hCombo, CB_GETCOMBOBOXINFO, 0, (LPARAM)&cbInfo); + if (!result) + return FALSE; + hList = cbInfo.hwndList; + idx = SendMessage(hList, LB_GETCURSEL, 0, 0); + if (idx < 0) + return FALSE; + + hHeap = GetProcessHeap(); + szBuffer = HeapAlloc(hHeap, HEAP_ZERO_MEMORY, bufferLength); + ZeroMemory(&cbItem, sizeof(cbItem)); + cbItem.mask = CBEIF_TEXT; + cbItem.iItem = idx; + cbItem.pszText = szBuffer; + cbItem.cchTextMax = bufferLength-1; + result = SendMessage(hComboEx, CBEM_GETITEM, 0, (LPARAM)&cbItem); + if (!result) + { + HeapFree(hHeap, 0, szBuffer); + return FALSE; + } + + result = MultiByteToWideChar(CP_ACP, 0, szBuffer, -1, wszBuffer, bufferLength); + HeapFree(hHeap, 0, szBuffer); + return result != 0; +} + static INT_PTR CALLBACK datetime_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch(message) @@ -1774,39 +1850,18 @@ static LRESULT OnNotify( HWND hWnd, WPARAM wParam, LPARAM lParam) NMHDR *pHdr = (NMHDR *)lParam; HWND hwndFontList = GetDlgItem(hwndReBar, IDC_FONTLIST); HWND hwndSizeList = GetDlgItem(hwndReBar, IDC_SIZELIST); - WCHAR sizeBuffer[MAX_PATH]; if (pHdr->hwndFrom == hwndFontList || pHdr->hwndFrom == hwndSizeList) { if (pHdr->code == CBEN_ENDEDITW) { - CHARFORMAT2W format; NMCBEENDEDIT *endEdit = (NMCBEENDEDIT *)lParam; - - ZeroMemory(&format, sizeof(format)); - format.cbSize = sizeof(format); - SendMessageW(hwndEditor, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&format); - if(pHdr->hwndFrom == hwndFontList) { - if(lstrcmpW(format.szFaceName, (LPWSTR)endEdit->szText)) - set_font((LPCWSTR) endEdit->szText); + on_fontlist_modified(hwndFontList, (LPWSTR)endEdit->szText); } else if (pHdr->hwndFrom == hwndSizeList) { - wsprintfW(sizeBuffer, stringFormat, format.yHeight / 20); - if(lstrcmpW(sizeBuffer, (LPWSTR)endEdit->szText)) - { - float size = 0; - if(number_from_string((LPWSTR)endEdit->szText, &size, FALSE) - && size > 0) - { - set_size(size); - } else - { - SetWindowTextW(hwndSizeList, sizeBuffer); - MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), wszAppTitle, MB_OK | MB_ICONINFORMATION); - } - } + on_sizelist_modified(hwndSizeList, (LPWSTR)endEdit->szText); } } return 0; @@ -2194,6 +2249,26 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) dialog_viewproperties(); break; + case IDC_FONTLIST: + if (HIWORD(wParam) == CBN_SELENDOK) + { + WCHAR buffer[LF_FACESIZE]; + HWND hwndFontList = (HWND)lParam; + get_comboexlist_selection(hwndFontList, buffer, LF_FACESIZE); + on_fontlist_modified(hwndFontList, buffer); + } + break; + + case IDC_SIZELIST: + if (HIWORD(wParam) == CBN_SELENDOK) + { + WCHAR buffer[MAX_STRING_LEN+1]; + HWND hwndSizeList = (HWND)lParam; + get_comboexlist_selection(hwndSizeList, buffer, MAX_STRING_LEN+1); + on_sizelist_modified(hwndSizeList, buffer); + } + break; + default: SendMessageW(hwndEditor, WM_COMMAND, wParam, lParam); break;

1 0