October 2008 - Wine-Commits

James Hawkins : comctl32: Only log system messages.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 23d899d8ab1a7ab85d6e8c660ae7688c962ed5fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=23d899d8ab1a7ab85d6e8c660… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 30 20:57:27 2008 -0500 comctl32: Only log system messages. --- dlls/comctl32/tests/updown.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 3d0557d..86b72cc 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -197,8 +197,9 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP LRESULT ret; struct message msg; - /* do not log painting messages */ - if (message != WM_PAINT && + /* log system messages, except for painting */ + if (message < WM_USER && + message != WM_PAINT && message != WM_ERASEBKGND && message != WM_NCPAINT && message != WM_NCHITTEST &&

1 0

James Hawkins : comctl32: Fix several test failures in win2k.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 3e8a63d5fa06146531002fac3bb2707ade814759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8a63d5fa06146531002fac3… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 30 20:57:09 2008 -0500 comctl32: Fix several test failures in win2k. --- dlls/comctl32/tests/treeview.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index a873e3c..d0157d4 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -82,10 +82,10 @@ static const struct message DoFocusTestSeq[] = { { WM_NCCALCSIZE, sent|wparam, 0x00000001 }, { WM_WINDOWPOSCHANGED, sent }, { WM_SIZE, sent|defwinproc }, - { WM_WINDOWPOSCHANGING, sent|defwinproc }, - { WM_NCCALCSIZE, sent|wparam|defwinproc, 0x00000001 }, - { WM_WINDOWPOSCHANGED, sent|defwinproc }, - { WM_SIZE, sent|defwinproc }, + { WM_WINDOWPOSCHANGING, sent|defwinproc|optional }, + { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, 0x00000001 }, + { WM_WINDOWPOSCHANGED, sent|defwinproc|optional }, + { WM_SIZE, sent|defwinproc|optional }, { TVM_SELECTITEM, sent|wparam, 0x00000009 }, /* The following end up out of order in wine */ { WM_PAINT, sent|defwinproc }, @@ -149,8 +149,8 @@ static const struct message TestGetSetItemHeightSeq[] = { { TVM_SETITEMHEIGHT, sent|wparam|lparam, 0xffffffff, 0x00000000 }, { TVM_GETITEMHEIGHT, sent|wparam|lparam, 0x00000000, 0x00000000 }, { TVM_SETITEMHEIGHT, sent|lparam, 0xcccccccc, 0x00000000 }, - { TVM_GETITEMHEIGHT, sent|wparam|lparam, 0x00000000, 0x00000000 }, - { TVM_SETITEMHEIGHT, sent|wparam|lparam, 0x00000009, 0x00000000 }, + { TVM_GETITEMHEIGHT, sent|wparam|lparam|optional, 0x00000000, 0x00000000 }, + { TVM_SETITEMHEIGHT, sent|wparam|lparam|optional, 0x00000009, 0x00000000 }, { WM_WINDOWPOSCHANGING, sent|defwinproc }, { WM_NCCALCSIZE, sent|wparam|defwinproc, 0x00000001 }, { WM_WINDOWPOSCHANGED, sent|defwinproc },

1 0

James Hawkins : comctl32: Only log system messages.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: e1111a5bef092b1630c3173bf2b893657efd47d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1111a5bef092b1630c3173bf… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 30 20:56:45 2008 -0500 comctl32: Only log system messages. --- dlls/comctl32/tests/listview.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 41e3a22..7f7d7cb 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -157,8 +157,9 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP LRESULT ret; struct message msg; - /* do not log painting messages */ - if (message != WM_PAINT && + /* log system messages, except for painting */ + if (message < WM_USER && + message != WM_PAINT && message != WM_ERASEBKGND && message != WM_NCPAINT && message != WM_NCHITTEST &&

1 0

James Hawkins : msi: Fix a test that fails in win95.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 48e6e584d312026def717d8c6cfa0a0561074c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e6e584d312026def717d8c6… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 30 20:56:34 2008 -0500 msi: Fix a test that fails in win95. --- dlls/msi/tests/msi.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 2b00314..aae8cfc 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -435,6 +435,8 @@ static void test_MsiGetFileHash(void) for (i = 0; i < sizeof(hash_data) / sizeof(hash_data[0]); i++) { + int ret; + create_file(name, hash_data[i].data, hash_data[i].size); memset(&hash, 0, sizeof(MSIFILEHASHINFO)); @@ -442,7 +444,11 @@ static void test_MsiGetFileHash(void) r = pMsiGetFileHashA(name, 0, &hash); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!memcmp(&hash, &hash_data[i].hash, HASHSIZE), "Hash incorrect\n"); + + ret = memcmp(&hash, &hash_data[i].hash, HASHSIZE); + ok(ret == 0 || + broken(ret != 0), /* win95 */ + "Hash incorrect\n"); DeleteFile(name); }

1 0

James Hawkins : msi: Forward MsiDatabaseMergeA to MsiDatabaseMergeW.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 4749ee266236cc410f5f99fc9b7742161075ea83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4749ee266236cc410f5f99fc9… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 30 20:56:27 2008 -0500 msi: Forward MsiDatabaseMergeA to MsiDatabaseMergeW. --- dlls/msi/database.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 0ffc233..cf6e5eb 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -986,10 +986,17 @@ end: UINT WINAPI MsiDatabaseMergeA(MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, LPCSTR szTableName) { - FIXME("(%ld, %ld, %s): stub!\n", hDatabase, hDatabaseMerge, + UINT r; + LPWSTR table; + + TRACE("(%ld, %ld, %s)\n", hDatabase, hDatabaseMerge, debugstr_a(szTableName)); - return ERROR_CALL_NOT_IMPLEMENTED; + table = strdupAtoW(szTableName); + r = MsiDatabaseMergeW(hDatabase, hDatabaseMerge, table); + + msi_free(table); + return r; } UINT WINAPI MsiDatabaseMergeW(MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge,

1 0

James Hawkins : msi: Add a stub implementation of MsiDatabaseMerge.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 525865447e8f27079f36e954a277307c0e2ece4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=525865447e8f27079f36e954a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 30 20:55:55 2008 -0500 msi: Add a stub implementation of MsiDatabaseMerge. --- dlls/msi/database.c | 18 ++++++++++++++++++ dlls/msi/msi.spec | 4 ++-- include/msi.h | 4 ++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 33343cc..0ffc233 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -983,6 +983,24 @@ end: return r; } +UINT WINAPI MsiDatabaseMergeA(MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, + LPCSTR szTableName) +{ + FIXME("(%ld, %ld, %s): stub!\n", hDatabase, hDatabaseMerge, + debugstr_a(szTableName)); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + +UINT WINAPI MsiDatabaseMergeW(MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, + LPCWSTR szTableName) +{ + FIXME("(%ld, %ld, %s): stub!\n", hDatabase, hDatabaseMerge, + debugstr_w(szTableName)); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle ) { MSIDBSTATE ret = MSIDBSTATE_READ; diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 4ab0bb1..3794383 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -22,8 +22,8 @@ 26 stdcall MsiDatabaseGetPrimaryKeysW(long wstr ptr) 27 stdcall MsiDatabaseImportA(str str long) 28 stdcall MsiDatabaseImportW(wstr wstr long) -29 stub MsiDatabaseMergeA -30 stub MsiDatabaseMergeW +29 stdcall MsiDatabaseMergeA(long long str) +30 stdcall MsiDatabaseMergeW(long long wstr) 31 stdcall MsiDatabaseOpenViewA(long str ptr) 32 stdcall MsiDatabaseOpenViewW(long wstr ptr) 33 stdcall MsiDoActionA(long str) diff --git a/include/msi.h b/include/msi.h index c4f5e0d..20dca3a 100644 --- a/include/msi.h +++ b/include/msi.h @@ -599,6 +599,10 @@ UINT WINAPI MsiIsProductElevatedA(LPCSTR, BOOL *); UINT WINAPI MsiIsProductElevatedW(LPCWSTR, BOOL *); #define MsiIsProductElevated WINELIB_NAME_AW(MsiIsProductElevated) +UINT WINAPI MsiDatabaseMergeA(MSIHANDLE, MSIHANDLE, LPCSTR); +UINT WINAPI MsiDatabaseMergeW(MSIHANDLE, MSIHANDLE, LPCWSTR); +#define MsiDatabaseMerge WINELIB_NAME_AW(MsiDatabaseMerge) + /* Non Unicode */ UINT WINAPI MsiCloseHandle(MSIHANDLE); UINT WINAPI MsiCloseAllHandles(void);

1 0

Dylan Smith : richedit: Prevent assertion failure when streaming out nested tables.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: ee5342e43295f07cf0a927a6b2b8f256fad0ba29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee5342e43295f07cf0a927a6b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Sep 30 17:11:41 2008 -0400 richedit: Prevent assertion failure when streaming out nested tables. The table properties are streamed out at the start of the table for non-nested tables, and at the end of the table for nested tables. The assertion caught the fact that I didn't get the start of the table row for nested tables before trying to stream out the properties. The call to ME_GetTableRowStart will handle both of these cases by getting the table row start paragraph and asserting that it is found. This call was also the reason for removing the const qualifier on one of the parameters. --- dlls/riched20/writer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 6a6ad54..50c0c61 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -286,7 +286,7 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, static BOOL ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream, - const ME_DisplayItem *para) + ME_DisplayItem *para) { ME_DisplayItem *cell; char props[STREAMOUT_BUFFER_SIZE] = ""; @@ -294,7 +294,7 @@ ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream, if (!ME_StreamOutPrint(pStream, "\\trowd")) return FALSE; if (!editor->bEmulateVersion10) { /* v4.1 */ - assert(para->member.para.nFlags & MEPF_ROWSTART); + para = ME_GetTableRowStart(para); cell = para->member.para.next_para->member.para.pCell; assert(cell); do {

1 0

Dylan Smith : richedit: Added code to stream out table border properties.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 3af4419688f85237b75e64c81f074e4d3099d4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3af4419688f85237b75e64c81… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Sep 30 17:11:49 2008 -0400 richedit: Added code to stream out table border properties. This code was simply missing, since the table border properties are already stored and displayed. --- dlls/riched20/writer.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 50c0c61..6a03ae0 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -196,11 +196,14 @@ ME_StreamOutRTFHeader(ME_OutStream *pStream, int dwFormat) static BOOL -ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, const ME_DisplayItem *pLastRun) +ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, + ME_DisplayItem *pLastRun) { ME_DisplayItem *item = pFirstRun; ME_FontTableItem *table = pStream->fonttbl; int i; + ME_DisplayItem *pLastPara = ME_GetParagraph(pLastRun); + ME_DisplayItem *pCell = NULL; do { CHARFORMAT2W *fmt = &item->member.run.style->fmt; @@ -246,6 +249,38 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, break; item = ME_FindItemFwd(item, diRun); } while (item); + item = ME_GetParagraph(pFirstRun); + do { + if (item->member.para.pCell && item->member.para.pCell) + { + pCell = item->member.para.pCell; + if (pCell) + { + ME_Border* borders[4] = { &pCell->member.cell.border.top, + &pCell->member.cell.border.left, + &pCell->member.cell.border.bottom, + &pCell->member.cell.border.right }; + for (i = 0; i < 4; i++) + { + if (borders[i]->width > 0) + { + int j; + COLORREF crColor = borders[i]->colorRef; + for (j = 1; j < pStream->nColorTblLen; j++) + if (pStream->colortbl[j] == crColor) + break; + if (j == pStream->nColorTblLen && j < STREAMOUT_COLORTBL_SIZE) { + pStream->colortbl[j] = crColor; + pStream->nColorTblLen++; + } + } + } + } + } + if (item == pLastPara) + break; + item = item->member.para.next_para; + } while (item); if (!ME_StreamOutPrint(pStream, "{\\fonttbl")) return FALSE; @@ -290,26 +325,74 @@ ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream, { ME_DisplayItem *cell; char props[STREAMOUT_BUFFER_SIZE] = ""; + int i; + const char sideChar[4] = {'t','l','b','r'}; if (!ME_StreamOutPrint(pStream, "\\trowd")) return FALSE; if (!editor->bEmulateVersion10) { /* v4.1 */ + PARAFORMAT2 *pFmt = ME_GetTableRowEnd(para)->member.para.pFmt; para = ME_GetTableRowStart(para); cell = para->member.para.next_para->member.para.pCell; assert(cell); + if (pFmt->dxOffset) + sprintf(props + strlen(props), "\\trgaph%d", pFmt->dxOffset); + if (pFmt->dxStartIndent) + sprintf(props + strlen(props), "\\trleft%d", pFmt->dxStartIndent); do { + ME_Border* borders[4] = { &cell->member.cell.border.top, + &cell->member.cell.border.left, + &cell->member.cell.border.bottom, + &cell->member.cell.border.right }; + for (i = 0; i < 4; i++) + { + if (borders[i]->width) + { + int j; + COLORREF crColor = borders[i]->colorRef; + sprintf(props + strlen(props), "\\clbrdr%c", sideChar[i]); + sprintf(props + strlen(props), "\\brdrs"); + sprintf(props + strlen(props), "\\brdrw%d", borders[i]->width); + for (j = 1; j < pStream->nColorTblLen; j++) { + if (pStream->colortbl[j] == crColor) { + sprintf(props + strlen(props), "\\brdrcf%u", j); + break; + } + } + } + } sprintf(props + strlen(props), "\\cellx%d", cell->member.cell.nRightBoundary); cell = cell->member.cell.next_cell; } while (cell->member.cell.next_cell); } else { /* v1.0 - 3.0 */ + const ME_Border* borders[4] = { &para->member.para.border.top, + &para->member.para.border.left, + &para->member.para.border.bottom, + &para->member.para.border.right }; PARAFORMAT2 *pFmt = para->member.para.pFmt; - int i; assert(!(para->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND|MEPF_CELL))); if (pFmt->dxOffset) sprintf(props + strlen(props), "\\trgaph%d", pFmt->dxOffset); if (pFmt->dxStartIndent) sprintf(props + strlen(props), "\\trleft%d", pFmt->dxStartIndent); + for (i = 0; i < 4; i++) + { + if (borders[i]->width) + { + int j; + COLORREF crColor = borders[i]->colorRef; + sprintf(props + strlen(props), "\\trbrdr%c", sideChar[i]); + sprintf(props + strlen(props), "\\brdrs"); + sprintf(props + strlen(props), "\\brdrw%d", borders[i]->width); + for (j = 1; j < pStream->nColorTblLen; j++) { + if (pStream->colortbl[j] == crColor) { + sprintf(props + strlen(props), "\\brdrcf%u", j); + break; + } + } + } + } for (i = 0; i < pFmt->cTabCount; i++) { sprintf(props + strlen(props), "\\cellx%d", pFmt->rgxTabs[i] & 0x00FFFFFF);

1 0

Dylan Smith : richedit: Fixed a bug preventing streaming out nested table properties.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: a3ac5ef094ebb572d7b9534fffdf7c86baaac757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ac5ef094ebb572d7b9534ff… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Sep 30 17:11:36 2008 -0400 richedit: Fixed a bug preventing streaming out nested table properties. --- dlls/riched20/writer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 6a03ae0..109ada1 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -810,7 +810,7 @@ ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, int nStart, int nC } } else if (p->member.para.nFlags & MEPF_ROWEND) { pStream->nNestingLevel--; - if (pStream->nNestingLevel > 1) { + if (pStream->nNestingLevel >= 1) { if (!ME_StreamOutPrint(pStream, "{\\*\\nesttableprops")) return FALSE; if (!ME_StreamOutRTFTableProps(editor, pStream, p))

1 0

Dylan Smith : richedit: Made sure table row gap/ offset is copied on append row.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: c2bab443fa6ac2238e71f05c7cb840d16fc8ec11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2bab443fa6ac2238e71f05c7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Sep 30 17:42:21 2008 -0400 richedit: Made sure table row gap/offset is copied on append row. --- dlls/riched20/table.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index c4de61d..3581306 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -392,9 +392,10 @@ ME_DisplayItem* ME_AppendTableRow(ME_TextEditor *editor, assert(table_row); assert(table_row->type == diParagraph); if (!editor->bEmulateVersion10) { /* v4.1 */ - ME_DisplayItem *insertedCell, *para, *cell; + ME_DisplayItem *insertedCell, *para, *cell, *prevTableEnd; cell = ME_FindItemFwd(ME_GetTableRowStart(table_row), diCell); - run = ME_GetTableRowEnd(table_row)->member.para.next_para; + prevTableEnd = ME_GetTableRowEnd(table_row); + run = prevTableEnd->member.para.next_para; run = ME_FindItemFwd(run, diRun); editor->pCursors[0].pRun = run; editor->pCursors[0].nOffset = 0; @@ -412,7 +413,8 @@ ME_DisplayItem* ME_AppendTableRow(ME_TextEditor *editor, insertedCell->member.cell.nRightBoundary = cell->member.cell.nRightBoundary; insertedCell->member.cell.border = cell->member.cell.border; }; - ME_InsertTableRowEndFromCursor(editor); + para = ME_InsertTableRowEndFromCursor(editor); + *para->member.para.pFmt = *prevTableEnd->member.para.pFmt; /* return the table row start for the inserted paragraph */ return ME_FindItemFwd(cell, diParagraph)->member.para.next_para; } else { /* v1.0 - 3.0 */

1 0