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

Jeff Latimer : user32: Check for invalid conversation and return the correct error.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: b7e81d3e54b0d763a765a44d1937c111ffa1b3c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7e81d3e54b0d763a765a44d1… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Aug 5 22:19:17 2008 +1000 user32: Check for invalid conversation and return the correct error. --- dlls/user32/dde_client.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 738d511..00b41c4 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -191,6 +191,7 @@ HCONV WINAPI DdeConnect(DWORD idInst, HSZ hszService, HSZ hszTopic, { WARN("Done with INITIATE, but no Server window available\n"); pConv = NULL; + pInstance->lastError = DMLERR_NO_CONV_ESTABLISHED; goto theEnd; } TRACE("Connected to Server window (%p)\n", pConv->hwndServer);

1 0

Nikolay Sivov : gdiplus: Implemented GdipPathIterIsValid with tests.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 09950e3ab5cfe17754de486be25cfc4db121693c URL: http://source.winehq.org/git/wine.git/?a=commit;h=09950e3ab5cfe17754de486be… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Aug 5 20:56:17 2008 +0400 gdiplus: Implemented GdipPathIterIsValid with tests. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pathiterator.c | 10 ++++++++ dlls/gdiplus/tests/pathiterator.c | 42 +++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 57f9734..625c5a0 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -455,7 +455,7 @@ @ stdcall GdipPathIterGetCount(ptr ptr) @ stdcall GdipPathIterGetSubpathCount(ptr ptr) @ stdcall GdipPathIterHasCurve(ptr ptr) -@ stub GdipPathIterIsValid +@ stdcall GdipPathIterIsValid(ptr ptr) @ stdcall GdipPathIterNextMarker(ptr ptr ptr ptr) @ stub GdipPathIterNextMarkerPath @ stub GdipPathIterNextPathType diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c index 95f1774..5269b0c 100644 --- a/dlls/gdiplus/pathiterator.c +++ b/dlls/gdiplus/pathiterator.c @@ -225,3 +225,13 @@ GpStatus WINGDIPAPI GdipPathIterEnumerate(GpPathIterator* iterator, INT* resultC return GdipPathIterCopyData(iterator, resultCount, points, types, 0, count-1); } + +GpStatus WINGDIPAPI GdipPathIterIsValid(GpPathIterator* iterator, BOOL* valid) +{ + if(!iterator || !valid) + return InvalidParameter; + + *valid = TRUE; + + return Ok; +} diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c index a6adb19..d318360 100644 --- a/dlls/gdiplus/tests/pathiterator.c +++ b/dlls/gdiplus/tests/pathiterator.c @@ -214,6 +214,47 @@ static void test_getsubpathcount(void) GdipDeletePath(path); } +static void test_isvalid(void) +{ + GpPath *path; + GpPathIterator *iter; + GpStatus stat; + BOOL isvalid; + INT start, end, result; + + GdipCreatePath(FillModeAlternate, &path); + + /* NULL args */ + GdipCreatePathIter(&iter, path); + stat = GdipPathIterIsValid(NULL, NULL); + expect(InvalidParameter, stat); + stat = GdipPathIterIsValid(iter, NULL); + expect(InvalidParameter, stat); + stat = GdipPathIterIsValid(NULL, &isvalid); + expect(InvalidParameter, stat); + GdipDeletePathIter(iter); + + /* on empty path */ + GdipCreatePathIter(&iter, path); + isvalid = FALSE; + stat = GdipPathIterIsValid(iter, &isvalid); + expect(Ok, stat); + expect(TRUE, isvalid); + GdipDeletePathIter(iter); + + /* no markers */ + GdipAddPathLine(path, 50.0, 50.0, 110.0, 40.0); + GdipCreatePathIter(&iter, path); + GdipPathIterNextMarker(iter, &result, &start, &end); + isvalid = FALSE; + stat = GdipPathIterIsValid(iter, &isvalid); + expect(Ok, stat); + expect(TRUE, isvalid); + GdipDeletePathIter(iter); + + GdipDeletePath(path); +} + START_TEST(pathiterator) { struct GdiplusStartupInput gdiplusStartupInput; @@ -230,6 +271,7 @@ START_TEST(pathiterator) test_hascurve(); test_nextmarker(); test_getsubpathcount(); + test_isvalid(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ed88096..d7baf52 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -333,6 +333,7 @@ GpStatus WINGDIPAPI GdipPathIterGetCount(GpPathIterator*,INT*); GpStatus WINGDIPAPI GdipPathIterGetSubpathCount(GpPathIterator*,INT*); GpStatus WINGDIPAPI GdipPathIterEnumerate(GpPathIterator*,INT*,GpPointF*,BYTE*,INT); GpStatus WINGDIPAPI GdipPathIterHasCurve(GpPathIterator*,BOOL*); +GpStatus WINGDIPAPI GdipPathIterIsValid(GpPathIterator*,BOOL*); GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap*,GpCustomLineCap**); GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath*,GpPath*,GpLineCap,REAL,

1 0

Jeff Latimer : user32: DdeClientTransaction should return 0 in the last param for DDE_DATA.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: ec49e4179b489aac6e8bb9744135bc15b3de95c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec49e4179b489aac6e8bb9744… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Fri Aug 8 21:38:15 2008 +1000 user32: DdeClientTransaction should return 0 in the last param for DDE_DATA. --- dlls/user32/dde_client.c | 1 + dlls/user32/tests/dde.c | 25 +++++++------------------ 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 6f7386d..69b18d5 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -921,6 +921,7 @@ static WDML_QUEUE_STATE WDML_HandleReply(WDML_CONV* pConv, MSG* msg, HDDEDATA* h if (pConv->transactions) { + if (ack) *ack = DDE_FNOTPROCESSED; /* first check message against a pending transaction, if any */ switch (pXAct->ddeMsg) { diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 908d60a..73968d8 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -291,11 +291,8 @@ static void test_ddeml_client(void) DdeGetLastError(client_pid); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); - ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); - todo_wine - { - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08x\n", res); - } + ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); + ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %08x\n", res); if (hdata == NULL) ok(FALSE, "hdata is NULL\n"); else @@ -313,11 +310,9 @@ static void test_ddeml_client(void) DdeGetLastError(client_pid); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); - todo_wine - { - ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res); - ok(ret == DMLERR_MEMORY_ERROR, "Expected DMLERR_MEMORY_ERROR, got %d\n", ret); - } + ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res); +todo_wine + ok(ret == DMLERR_MEMORY_ERROR, "Expected DMLERR_MEMORY_ERROR, got %d\n", ret); if (hdata == NULL) ok(FALSE, "hdata is NULL\n"); else @@ -336,10 +331,7 @@ static void test_ddeml_client(void) hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); - todo_wine - { - ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res); - } + ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res); if (hdata == NULL) ok(FALSE, "hdata is NULL\n"); else @@ -457,10 +449,7 @@ static void test_ddeml_client(void) hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); - todo_wine - { - ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res); - } + ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res); if (hdata == NULL) ok(FALSE, "hdata is NULL\n"); else

1 0

Jeff Latimer : user32: DdeQueryString returns a NULL str if there is no handle.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 04a59014f8d098b1e06afe7f2a8ee444f1682d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a59014f8d098b1e06afe7f2… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Aug 5 22:14:01 2008 +1000 user32: DdeQueryString returns a NULL str if there is no handle. --- dlls/user32/dde_misc.c | 12 ++++++++++-- dlls/user32/tests/dde.c | 2 -- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index d99cdcf..227f874 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -348,8 +348,8 @@ UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, UINT ret; WNDCLASSEXW wndclass; - TRACE("(%p,%p,0x%x,%d)\n", - pidInst, pfnCallback, afCmd, ulRes); + TRACE("(%p,%p,0x%x,%d,0x%x)\n", + pidInst, pfnCallback, afCmd, ulRes, bUnicode); if (ulRes) { @@ -999,6 +999,14 @@ static int WDML_QueryString(WDML_INSTANCE* pInstance, HSZ hsz, LPVOID ptr, DWORD cchMax = MAX_BUFFER_LEN; } + /* if there is no input windows returns a NULL string */ + if (hsz == NULL) + { + CHAR *t_ptr = ptr; + *t_ptr = '\0'; + return 1; + } + switch (codepage) { case CP_WINANSI: diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 73968d8..082a8bf 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -654,7 +654,6 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon if (msg_index == 5) { - todo_wine { ok(!lstrcmpA(str, ""), "Expected empty string, got %s\n", str); ok(size == 1, "Expected 1, got %d\n", size); @@ -696,7 +695,6 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon size = DdeQueryStringA(server_pid, hsz2, str, MAX_PATH, CP_WINANSI); if (msg_index == 7) { - todo_wine { ok(!lstrcmpA(str, ""), "Expected empty string, got %s\n", str); ok(size == 1, "Expected 1, got %d\n", size);

1 0

Vladimir Pankratov : shell32: Update Russian translation.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: fe0d5b5578120b1c9baa4a0a1061d76786433117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe0d5b5578120b1c9baa4a0a1… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Aug 7 12:07:27 2008 +0500 shell32: Update Russian translation. --- dlls/shell32/shell32_Ru.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_Ru.rc b/dlls/shell32/shell32_Ru.rc index 795be24..47dcd37 100644 --- a/dlls/shell32/shell32_Ru.rc +++ b/dlls/shell32/shell32_Ru.rc @@ -142,8 +142,8 @@ FONT 8, "MS Shell Dlg" 12, 38, 194, 105 EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "�� &�� ", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP - DEFPUSHBUTTON "��", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "��", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP } SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90

1 0

Dylan Smith : richedit: Added support for changing cell border colours.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: ddc107bd26c332b7351e5355d315b0bddf407c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc107bd26c332b7351e5355d… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Aug 12 23:15:40 2008 -0400 richedit: Added support for changing cell border colours. --- dlls/riched20/editor.c | 67 ++++++++++++++++++++++++++++++++++++++++++---- dlls/riched20/editstr.h | 2 + dlls/riched20/paint.c | 14 ++++++--- dlls/riched20/para.c | 1 + dlls/riched20/rtf.h | 1 + 5 files changed, 74 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9fc11a5..aa59383 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -320,6 +320,32 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea return 0; } +static void ME_ApplyBorderProperties(RTF_Info *info, + ME_BorderRect *borderRect, + RTFBorder *borderDef) +{ + int i, colorNum; + ME_Border *pBorders[] = {&borderRect->top, + &borderRect->left, + &borderRect->bottom, + &borderRect->right}; + for (i = 0; i < 4; i++) + { + RTFColor *colorDef = info->colorList; + pBorders[i]->width = borderDef[i].width; + colorNum = borderDef[i].color; + while (colorDef && colorDef->rtfCNum != colorNum) + colorDef = colorDef->rtfNextColor; + if (colorDef) + pBorders[i]->colorRef = RGB( + colorDef->rtfCRed >= 0 ? colorDef->rtfCRed : 0, + colorDef->rtfCGreen >= 0 ? colorDef->rtfCGreen : 0, + colorDef->rtfCBlue >= 0 ? colorDef->rtfCBlue : 0); + else + pBorders[i]->colorRef = RGB(0, 0, 0); + } +} + static void ME_RTFCharAttrHook(RTF_Info *info) { CHARFORMAT2W fmt; @@ -767,7 +793,31 @@ static void ME_RTFParAttrHook(RTF_Info *info) fmt.wBorderSpace = info->rtfParam; fmt.dwMask = PFM_BORDER; break; - } + case rtfBorderColor: + { + RTFTable *tableDef = info->tableDef; + int borderSide = info->borderType & RTFBorderSideMask; + int borderType = info->borderType & RTFBorderTypeMask; + switch(borderType) + { + case RTFBorderTypePara: + if (!info->editor->bEmulateVersion10) /* v4.1 */ + break; + /* v1.0 - 3.0 treat paragraph and row borders the same. */ + case RTFBorderTypeRow: + if (tableDef) { + tableDef->border[borderSide].color = info->rtfParam; + } + break; + case RTFBorderTypeCell: + if (tableDef && tableDef->numCellsDefined < MAX_TABLE_CELLS) { + tableDef->cells[tableDef->numCellsDefined].border[borderSide].color = info->rtfParam; + } + break; + } + break; + } + } if (fmt.dwMask) { RTFFlushOutputBuffer(info); /* FIXME too slow ? how come ?*/ @@ -930,11 +980,10 @@ static void ME_RTFSpecialCharHook(RTF_Info *info) } else { for (i = 0; i < tableDef->numCellsDefined; i++) { - cell->member.cell.nRightBoundary = tableDef->cells[i].rightBoundary; - cell->member.cell.border.top.width = tableDef->cells[i].border[0].width; - cell->member.cell.border.left.width = tableDef->cells[i].border[1].width; - cell->member.cell.border.bottom.width = tableDef->cells[i].border[2].width; - cell->member.cell.border.right.width = tableDef->cells[i].border[3].width; + RTFCell *cellDef = &tableDef->cells[i]; + cell->member.cell.nRightBoundary = cellDef->rightBoundary; + ME_ApplyBorderProperties(info, &cell->member.cell.border, + cellDef->border); cell = cell->member.cell.next_cell; if (!cell) { @@ -962,6 +1011,8 @@ static void ME_RTFSpecialCharHook(RTF_Info *info) para = ME_InsertTableRowEndFromCursor(info->editor); para->member.para.pFmt->dxOffset = abs(info->tableDef->gapH); para->member.para.pFmt->dxStartIndent = info->tableDef->leftEdge; + ME_ApplyBorderProperties(info, &para->member.para.border, + tableDef->border); info->nestingLevel--; if (!info->nestingLevel) { @@ -984,6 +1035,10 @@ static void ME_RTFSpecialCharHook(RTF_Info *info) PARAFORMAT2 *pFmt = para->member.para.pFmt; pFmt->dxOffset = info->tableDef->gapH; pFmt->dxStartIndent = info->tableDef->leftEdge; + + para = ME_GetParagraph(info->editor->pCursors[0].pRun); + ME_ApplyBorderProperties(info, &para->member.para.border, + tableDef->border); while (tableDef->numCellsInserted < tableDef->numCellsDefined) { WCHAR tab = '\t'; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 3c4a083..edbeb13 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -168,6 +168,7 @@ typedef struct tagME_Document { typedef struct tagME_Border { int width; + COLORREF colorRef; } ME_Border; typedef struct tagME_BorderRect @@ -183,6 +184,7 @@ typedef struct tagME_Paragraph PARAFORMAT2 *pFmt; struct tagME_DisplayItem *pCell; /* v4.1 */ + ME_BorderRect border; int nCharOfs; int nFlags; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 0bafd1a..9cfc21e 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -755,7 +755,7 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) rc.bottom = bottom; if (cell->border.left.width > 0) { - color = RGB(0,0,0); + color = cell->border.left.colorRef; width = max(ME_twips2pointsX(c, cell->border.left.width), 1); } else { color = RGB(192,192,192); @@ -777,7 +777,7 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) if (atTop) { if (cell->border.top.width > 0) { - brush = GetStockObject(BLACK_BRUSH); + brush = CreateSolidBrush(cell->border.top.colorRef); width = max(ME_twips2pointsY(c, cell->border.top.width), 1); } else { brush = GetStockObject(LTGRAY_BRUSH); @@ -786,6 +786,8 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) rc.top = top; rc.bottom = rc.top + width; FillRect(c->hDC, &rc, brush); + if (cell->border.top.width > 0) + DeleteObject(brush); } /* Draw the bottom border if at the last paragraph in the cell, and when @@ -809,13 +811,15 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) } if (rc.left < rc.right) { if (cell->border.bottom.width > 0) { - brush = GetStockObject(BLACK_BRUSH); + brush = CreateSolidBrush(cell->border.bottom.colorRef); } else { brush = GetStockObject(LTGRAY_BRUSH); } rc.bottom = bottom; rc.top = rc.bottom - width; FillRect(c->hDC, &rc, brush); + if (cell->border.bottom.width > 0) + DeleteObject(brush); } rc.left = oldLeft; } @@ -827,7 +831,7 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) rc.top = top; rc.bottom = bottom; if (cell->border.right.width > 0) { - color = RGB(0,0,0); + color = cell->border.right.colorRef; width = max(ME_twips2pointsX(c, cell->border.right.width), 1); } else { color = RGB(192,192,192); @@ -854,7 +858,7 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) POINT oldPt; PARAFORMAT2 *pNextFmt; - pen = CreatePen(PS_SOLID, 0, RGB(0,0,0)); + pen = CreatePen(PS_SOLID, 0, para->border.top.colorRef); oldpen = SelectObject(c->hDC, pen); /* Find the start relative to the text */ diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index b8676d1..dd745ff 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -177,6 +177,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, /* FIXME initialize format style and call ME_SetParaFormat blah blah */ *new_para->member.para.pFmt = *run_para->member.para.pFmt; + new_para->member.para.border = run_para->member.para.border; /* insert paragraph into paragraph double linked list */ new_para->member.para.prev_para = run_para; diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 5cf699b..ec08161 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1010,6 +1010,7 @@ struct RTFStyleElt struct RTFBorder { int width; + int color; }; struct RTFCell

1 0

Alistair Leslie-Hughes : mshtml: Implement IDispatch for IHTMLElement2.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: e867fa253dc83d6edd3b8585fc71310df31df754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e867fa253dc83d6edd3b8585f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Aug 17 21:33:06 2008 +1000 mshtml: Implement IDispatch for IHTMLElement2. --- dlls/mshtml/htmlelem2.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 3455517..e7319ef 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -56,16 +56,14 @@ static ULONG WINAPI HTMLElement2_Release(IHTMLElement2 *iface) static HRESULT WINAPI HTMLElement2_GetTypeInfoCount(IHTMLElement2 *iface, UINT *pctinfo) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->node.dispex), pctinfo); } static HRESULT WINAPI HTMLElement2_GetTypeInfo(IHTMLElement2 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->node.dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLElement2_GetIDsOfNames(IHTMLElement2 *iface, REFIID riid, @@ -73,9 +71,7 @@ static HRESULT WINAPI HTMLElement2_GetIDsOfNames(IHTMLElement2 *iface, REFIID ri LCID lcid, DISPID *rgDispId) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->node.dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLElement2_Invoke(IHTMLElement2 *iface, DISPID dispIdMember, @@ -83,9 +79,8 @@ static HRESULT WINAPI HTMLElement2_Invoke(IHTMLElement2 *iface, DISPID dispIdMem VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(DISPATCHEX(&This->node.dispex), dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLElement2_get_scopeName(IHTMLElement2 *iface, BSTR *p)

1 0

Alistair Leslie-Hughes : mshtml: Implement IDispatch for IHTMLAnchorElement .
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 164e264a41ce8f89b29f74ff7aa44beb13493ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=164e264a41ce8f89b29f74ff7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Aug 17 21:58:05 2008 +1000 mshtml: Implement IDispatch for IHTMLAnchorElement. --- dlls/mshtml/htmlanchor.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 8663291..4809543 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -67,16 +67,14 @@ static ULONG WINAPI HTMLAnchorElement_Release(IHTMLAnchorElement *iface) static HRESULT WINAPI HTMLAnchorElement_GetTypeInfoCount(IHTMLAnchorElement *iface, UINT *pctinfo) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->element.node.dispex), pctinfo); } static HRESULT WINAPI HTMLAnchorElement_GetTypeInfo(IHTMLAnchorElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->element.node.dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLAnchorElement_GetIDsOfNames(IHTMLAnchorElement *iface, REFIID riid, @@ -84,9 +82,7 @@ static HRESULT WINAPI HTMLAnchorElement_GetIDsOfNames(IHTMLAnchorElement *iface, LCID lcid, DISPID *rgDispId) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->element.node.dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLAnchorElement_Invoke(IHTMLAnchorElement *iface, DISPID dispIdMember, @@ -94,9 +90,8 @@ static HRESULT WINAPI HTMLAnchorElement_Invoke(IHTMLAnchorElement *iface, DISPID VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(DISPATCHEX(&This->element.node.dispex), dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLAnchorElement_put_href(IHTMLAnchorElement *iface, BSTR v)

1 0

Lei Zhang : shell32: Handle directories in ShellExecute.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 215f6c47caf16f966809b92002619adb622d30df URL: http://source.winehq.org/git/wine.git/?a=commit;h=215f6c47caf16f966809b9200… Author: Lei Zhang <thestig(a)google.com> Date: Wed Aug 6 16:10:52 2008 -0700 shell32: Handle directories in ShellExecute. --- dlls/shell32/shlexec.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index fec7870..d83a132 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1755,6 +1755,34 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) sei, execfunc ); HeapFree( GetProcessHeap(), 0, env ); } + else if (PathIsDirectoryW(lpFile)) + { + static const WCHAR wExplorer[] = {'e','x','p','l','o','r','e','r',0}; + static const WCHAR wQuote[] = {'"',0}; + WCHAR wExec[MAX_PATH]; + WCHAR * lpQuotedFile = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR) * (strlenW(lpFile) + 3) ); + + if (lpQuotedFile) + { + retval = SHELL_FindExecutable( sei_tmp.lpDirectory, wExplorer, + wszOpen, wExec, MAX_PATH, + NULL, &env, NULL, NULL ); + if (retval > 32) + { + strcpyW(lpQuotedFile, wQuote); + strcatW(lpQuotedFile, lpFile); + strcatW(lpQuotedFile, wQuote); + retval = SHELL_quote_and_execute( wExec, lpQuotedFile, + lpstrProtocol, + wszApplicationName, env, + &sei_tmp, sei, execfunc ); + HeapFree( GetProcessHeap(), 0, env ); + } + HeapFree( GetProcessHeap(), 0, lpQuotedFile ); + } + else + retval = 0; /* Out of memory */ + } else if (PathIsURLW(lpFile)) /* File not found, check for URL */ { retval = SHELL_execute_url( lpFile, wFile, wcmd, &sei_tmp, sei, execfunc );

1 0

Dylan Smith : richedit: Borders are drawn for simple tables.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 967c148a68be23f7c75aad2b7d352738005396bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=967c148a68be23f7c75aad2b7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Aug 12 23:15:32 2008 -0400 richedit: Borders are drawn for simple tables. --- dlls/riched20/paint.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/wrap.c | 28 ++++++++++++++++++++- 2 files changed, 92 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index c2bcfc2..b2a8aed 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -662,6 +662,68 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT } } +static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) +{ + ME_Paragraph *para = &paragraph->member.para; + if (c->editor->bEmulateVersion10) /* v1.0 - 3.0 */ + { + if (para->pFmt->dwMask & PFM_TABLE && para->pFmt->wEffects & PFE_TABLE) { + HPEN pen = NULL, oldpen = NULL; + int i, firstX, startX, endX, rowY, rowBottom, nHeight; + POINT oldPt; + PARAFORMAT2 *pNextFmt; + + pen = CreatePen(PS_SOLID, 0, RGB(0,0,0)); + oldpen = SelectObject(c->hDC, pen); + + /* Find the start relative to the text */ + firstX = ME_FindItemFwd(paragraph, diRun)->member.run.pt.x; + /* Go back by the horizontal gap, which is stored in dxOffset */ + firstX -= ME_twips2pointsX(c, para->pFmt->dxOffset); + /* The left edge, stored in dxStartIndent affected just the first edge */ + startX = firstX - ME_twips2pointsX(c, para->pFmt->dxStartIndent); + rowY = c->pt.y; + if (para->pFmt->dwMask & PFM_SPACEBEFORE) + rowY += ME_twips2pointsY(c, para->pFmt->dySpaceBefore); + nHeight = ME_FindItemFwd(paragraph, diStartRow)->member.row.nHeight; + rowBottom = rowY + nHeight; + + /* Draw horizontal lines */ + MoveToEx(c->hDC, firstX, rowY, &oldPt); + i = para->pFmt->cTabCount - 1; + endX = startX + ME_twips2pointsX(c, para->pFmt->rgxTabs[i] & 0x00ffffff) + 1; + LineTo(c->hDC, endX, rowY); + pNextFmt = para->next_para->member.para.pFmt; + /* The bottom of the row only needs to be drawn if the next row is + * not a table. */ + if (!(pNextFmt && pNextFmt->dwMask & PFM_TABLE && pNextFmt->wEffects && + para->nRows == 1)) + { + /* Decrement rowBottom to draw the bottom line within the row, and + * to not draw over this line when drawing the vertical lines. */ + rowBottom--; + MoveToEx(c->hDC, firstX, rowBottom, NULL); + LineTo(c->hDC, endX, rowBottom); + } + + /* Draw vertical lines */ + MoveToEx(c->hDC, firstX, rowY, NULL); + LineTo(c->hDC, firstX, rowBottom); + for (i = 0; i < para->pFmt->cTabCount; i++) + { + int rightBoundary = para->pFmt->rgxTabs[i] & 0x00ffffff; + endX = startX + ME_twips2pointsX(c, rightBoundary); + MoveToEx(c->hDC, endX, rowY, NULL); + LineTo(c->hDC, endX, rowBottom); + } + + MoveToEx(c->hDC, oldPt.x, oldPt.y, NULL); + SelectObject(c->hDC, oldpen); + DeleteObject(pen); + } + } +} + void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { int align = SetTextAlign(c->hDC, TA_BASELINE); ME_DisplayItem *p; @@ -773,6 +835,9 @@ void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { } no++; } + + ME_DrawTableBorders(c, paragraph); + SetTextAlign(c->hDC, align); } diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 21121a4..70a552d 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -44,7 +44,9 @@ static ME_DisplayItem *ME_MakeRow(int height, int baseline, int width) static void ME_BeginRow(ME_WrapContext *wc, ME_DisplayItem *para) { + PARAFORMAT2 *pFmt; assert(para && para->type == diParagraph); + pFmt = para->member.para.pFmt; wc->pRowStart = NULL; wc->bOverflown = FALSE; wc->pLastSplittableRun = NULL; @@ -78,6 +80,10 @@ static void ME_BeginRow(ME_WrapContext *wc, ME_DisplayItem *para) wc->nAvailWidth = ~0u >> 1; } wc->pt.x = wc->context->pt.x; + if (wc->context->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ + pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) + /* Shift the text down because of the border. */ + wc->pt.y++; } static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) @@ -85,8 +91,10 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) ME_DisplayItem *p, *row, *para; BOOL bSkippingSpaces = TRUE; int ascent = 0, descent = 0, width=0, shift = 0, align = 0; + PARAFORMAT2 *pFmt; /* wrap text */ para = ME_GetParagraph(wc->pRowStart); + pFmt = para->member.para.pFmt; for (p = pEnd->prev; p!=wc->pRowStart->prev; p = p->prev) { @@ -125,6 +133,15 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) } row = ME_MakeRow(ascent+descent, ascent, width); + if (wc->context->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ + pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) + { + /* The text was shifted down in ME_BeginRow so move the wrap context + * back to where it should be. */ + wc->pt.y--; + /* The height of the row is increased by the borders. */ + row->member.row.nHeight += 2; + } row->member.row.pt = wc->pt; row->member.row.nLMargin = (!wc->nRow ? wc->nFirstMargin : wc->nLeftMargin); row->member.row.nRMargin = wc->nRightMargin; @@ -142,14 +159,23 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) } ME_InsertBefore(wc->pRowStart, row); wc->nRow++; - wc->pt.y += ascent+descent; + wc->pt.y += row->member.row.nHeight; ME_BeginRow(wc, para); } static void ME_WrapEndParagraph(ME_WrapContext *wc, ME_DisplayItem *p) { + ME_DisplayItem *para = p->member.para.prev_para; + PARAFORMAT2 *pFmt = para->member.para.pFmt; if (wc->pRowStart) ME_InsertRowStart(wc, p); + if (wc->context->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ + pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) + { + /* ME_BeginRow was called an extra time for the paragraph, and it shifts the + * text down by one pixel for the border, so fix up the wrap context. */ + wc->pt.y--; + } /* p = p->member.para.prev_para->next;

1 0