September 2008 - Wine-commits

Marcus Meissner : shell32: Fixed size passed to MultiByteToWideChar.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 5adbef6625be803d7d95f8bd88d6ffdf5b0a7050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5adbef6625be803d7d95f8bd8… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Sep 11 13:33:15 2008 +0200 shell32: Fixed size passed to MultiByteToWideChar. --- dlls/shell32/cpanelfolder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index d3934a0..10d2c9d 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -997,7 +997,7 @@ static HRESULT WINAPI IShellExecuteHookW_fnExecute(IShellExecuteHookW* iface, LP path[0] = '\"'; /* Return value from MultiByteToWideChar includes terminating NUL, which * compensates for the starting double quote we just put in */ - l = MultiByteToWideChar(CP_ACP, 0, pcpanel->szName, -1, path+1, MAX_PATH); + l = MultiByteToWideChar(CP_ACP, 0, pcpanel->szName, -1, path+1, MAX_PATH-1); /* pass applet name to Control_RunDLL to distinguish between applets in one .cpl file */ path[l++] = '"';

1 0

Tobias Jakobi : wined3d: Fix SHOW_FRAME_MAKEUP debug dump code.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 6e1194f06ea163d0d6260f41a1cfe157efea82d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e1194f06ea163d0d6260f41a… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Sep 10 13:25:35 2008 -0500 wined3d: Fix SHOW_FRAME_MAKEUP debug dump code. --- dlls/wined3d/drawprim.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 068e082..2099bec 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1024,11 +1024,11 @@ void drawPrimitive(IWineD3DDevice *iface, if (primCounter >= 0) { WINED3DLOCKED_RECT r; char buffer[80]; - IWineD3DSurface_LockRect(This->renderTarget, &r, NULL, WINED3DLOCK_READONLY); + IWineD3DSurface_LockRect(This->render_targets[0], &r, NULL, WINED3DLOCK_READONLY); sprintf(buffer, "/tmp/backbuffer_%d.tga", primCounter); TRACE("Saving screenshot %s\n", buffer); - IWineD3DSurface_SaveSnapshot(This->renderTarget, buffer); - IWineD3DSurface_UnlockRect(This->renderTarget); + IWineD3DSurface_SaveSnapshot(This->render_targets[0], buffer); + IWineD3DSurface_UnlockRect(This->render_targets[0]); #ifdef SHOW_TEXTURE_MAKEUP { @@ -1076,7 +1076,7 @@ static void normalize_normal(float *n) { * attributes to numbered shader attributes, so we have to store them and rebind them as needed * in drawprim. * - * To read back, the opengl feedback mode is used. This creates a proplem because we want + * To read back, the opengl feedback mode is used. This creates a problem because we want * untransformed, unlit vertices, but feedback runs everything through transform and lighting. * Thus disable lighting and set identity matrices to get unmodified colors and positions. * To overcome clipping find the biggest x, y and z values of the vertices in the patch and scale

1 0

Alistair Leslie-Hughes : msxml3: Add IXMLDOMCharacterData to IXMLDOMComment .
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 811c0e00be18808f3148642af0e0a12cd56e455c URL: http://source.winehq.org/git/wine.git/?a=commit;h=811c0e00be18808f3148642af… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 12 19:37:59 2008 +1000 msxml3: Add IXMLDOMCharacterData to IXMLDOMComment. --- dlls/msxml3/comment.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 9a45be6..1870b3b 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -59,6 +59,7 @@ static HRESULT WINAPI domcomment_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMComment ) || + IsEqualGUID( riid, &IID_IXMLDOMCharacterData) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) {

1 0

Alistair Leslie-Hughes : msxml3: Add IXMLDOMCharacterData to IXMLDOMCDATASection.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 84072a81b8eaa5e99a8cfcdc649176416dc0fa85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84072a81b8eaa5e99a8cfcdc6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 12 19:37:43 2008 +1000 msxml3: Add IXMLDOMCharacterData to IXMLDOMCDATASection. --- dlls/msxml3/cdata.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 06d8bb1..8cf3940 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -59,6 +59,7 @@ static HRESULT WINAPI domcdata_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMCDATASection ) || + IsEqualGUID( riid, &IID_IXMLDOMCharacterData) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) {

1 0

Dylan Smith : richedit: Prevent buffer overrun for tab stops buffer.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 2aa69c6c9e083b0033eb8a0a75f860795441630c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aa69c6c9e083b0033eb8a0a7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Sep 11 17:25:16 2008 -0400 richedit: Prevent buffer overrun for tab stops buffer. --- dlls/riched20/editor.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1fe23cd..253c7b8 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -843,24 +843,27 @@ void ME_RTFTblAttrHook(RTF_Info *info) break; } case rtfCellPos: + { + int cellNum; if (!info->tableDef) { info->tableDef = ME_MakeTableDef(info->editor); } - if (info->tableDef->numCellsDefined >= MAX_TABLE_CELLS) + cellNum = info->tableDef->numCellsDefined; + if (cellNum >= MAX_TABLE_CELLS) break; - info->tableDef->cells[info->tableDef->numCellsDefined].rightBoundary = info->rtfParam; - { + info->tableDef->cells[cellNum].rightBoundary = info->rtfParam; + if (cellNum < MAX_TAB_STOPS) { /* Tab stops were used to store cell positions before v4.1 but v4.1 * still seems to set the tabstops without using them. */ ME_DisplayItem *para = ME_GetParagraph(info->editor->pCursors[0].pRun); PARAFORMAT2 *pFmt = para->member.para.pFmt; - int cellNum = info->tableDef->numCellsDefined; pFmt->rgxTabs[cellNum] &= ~0x00FFFFFF; pFmt->rgxTabs[cellNum] = 0x00FFFFFF & info->rtfParam; } info->tableDef->numCellsDefined++; break; + } case rtfRowBordTop: info->borderType = RTFBorderRowTop; break; @@ -1045,7 +1048,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info) ME_InsertTextFromCursor(info->editor, 0, &tab, 1, info->style); tableDef->numCellsInserted++; } - pFmt->cTabCount = tableDef->numCellsDefined; + pFmt->cTabCount = min(tableDef->numCellsDefined, MAX_TAB_STOPS); if (!tableDef->numCellsDefined) pFmt->wEffects &= ~PFE_TABLE; ME_InsertTextFromCursor(info->editor, 0, &endl, 1, info->style);

1 0

Dylan Smith : richedit: Fixed bugs in handling unterminated nested tables in RTF.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: fab258022e3a02557060aade0f6371918328b987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab258022e3a02557060aade0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Sep 11 14:16:45 2008 -0400 richedit: Fixed bugs in handling unterminated nested tables in RTF. --- dlls/riched20/editor.c | 25 ++++++++++++------------- dlls/riched20/reader.c | 2 -- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 01ef9c1..1fe23cd 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1461,8 +1461,6 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (!invalidRTF && !inStream.editstream->dwError) { if (format & SF_RTF) { - ME_DisplayItem *para; - /* setup the RTF parser */ memset(&parser, 0, sizeof parser); RTFSetEditStream(&parser, &inStream); @@ -1486,13 +1484,13 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre RTFRead(&parser); RTFFlushOutputBuffer(&parser); if (!editor->bEmulateVersion10) { /* v4.1 */ - if (parser.tableDef && parser.tableDef->tableRowStart) + if (parser.tableDef && parser.tableDef->tableRowStart && + (parser.nestingLevel > 0 || parser.canInheritInTbl)) { /* Delete any incomplete table row at the end of the rich text. */ int nOfs, nChars; ME_DisplayItem *pCell; - - para = parser.tableDef->tableRowStart; + ME_DisplayItem *para; parser.rtfMinor = rtfRow; /* Complete the table row before deleting it. @@ -1501,14 +1499,14 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre * will be added for this change to the current paragraph format. */ if (parser.nestingLevel > 0) { - while (parser.nestingLevel--) - ME_RTFSpecialCharHook(&parser); - } else if (parser.canInheritInTbl) { + while (parser.nestingLevel > 1) + ME_RTFSpecialCharHook(&parser); /* Decrements nestingLevel */ + para = parser.tableDef->tableRowStart; ME_RTFSpecialCharHook(&parser); - } - if (parser.tableDef && parser.tableDef->tableRowStart && - para->member.para.nFlags & MEPF_ROWEND) - { + } else { + para = parser.tableDef->tableRowStart; + ME_RTFSpecialCharHook(&parser); + assert(para->member.para.nFlags & MEPF_ROWEND); para = para->member.para.next_para; } pCell = para->member.para.pCell; @@ -1518,7 +1516,8 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre nOfs = ME_GetCursorOfs(editor, 1); nChars = ME_GetCursorOfs(editor, 0) - nOfs; ME_InternalDeleteText(editor, nOfs, nChars, TRUE); - parser.tableDef->tableRowStart = NULL; + if (parser.tableDef) + parser.tableDef->tableRowStart = NULL; } } ME_CheckTablesForCorruption(editor); diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index c455c57..3d5593a 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -242,8 +242,6 @@ void RTFInit(RTF_Info *info) info->cpOutputBuffer = heap_alloc(info->dwMaxCPOutputCount); } - if (info->tableDef) - ZeroMemory(info->tableDef, sizeof(info->tableDef)); info->tableDef = NULL; info->nestingLevel = 0; info->canInheritInTbl = FALSE;

1 0

Dylan Smith : richedit: Make sure the nested tables' RTF properties are not skipped.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 0d8e9e622ff74c0083e70722aa0352acdef1c45b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8e9e622ff74c0083e70722a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Sep 11 13:32:06 2008 -0400 richedit: Make sure the nested tables' RTF properties are not skipped. --- dlls/riched20/editor.c | 3 +++ dlls/riched20/reader.c | 10 ++++++++++ dlls/riched20/rtf.h | 1 + 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 0ae8844..01ef9c1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1476,7 +1476,10 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre RTFSetDestinationCallback(&parser, rtfPict, ME_RTFReadPictGroup); RTFSetDestinationCallback(&parser, rtfObject, ME_RTFReadObjectGroup); if (!parser.editor->bEmulateVersion10) /* v4.1 */ + { RTFSetDestinationCallback(&parser, rtfNoNestTables, RTFSkipGroup); + RTFSetDestinationCallback(&parser, rtfNestTableProps, RTFReadGroup); + } BeginFile(&parser); /* do the parsing */ diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 95d88f7..c455c57 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -406,6 +406,16 @@ void RTFSkipGroup(RTF_Info *info) } } +/* + * Do no special processing on the group. + * + * This acts as a placeholder for a callback in order to indicate that it + * shouldn't be ignored. Instead it will fallback on the loop in RTFRead. + */ +void RTFReadGroup (RTF_Info *info) +{ +} + /* * Read one token. Call the read hook if there is one. The diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index ec08161..8fc8abc 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1211,6 +1211,7 @@ void RTFSetReadHook (RTF_Info *, RTFFuncPtr); RTFFuncPtr RTFGetReadHook (const RTF_Info *); void RTFRouteToken (RTF_Info *); void RTFSkipGroup (RTF_Info *); +void RTFReadGroup (RTF_Info *); void RTFExpandStyle (RTF_Info *, int); int RTFCheckCM (const RTF_Info *, int, int); int RTFCheckCMM (const RTF_Info *, int, int, int);

1 0

Dylan Smith : richedit: Enter inserts newline before table at start of document.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: d7ff24378a187a7d10080184727feaf0e586177a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ff24378a187a7d100801847… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Sep 11 12:45:58 2008 -0400 richedit: Enter inserts newline before table at start of document. --- dlls/riched20/editor.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 14c7256..0ae8844 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3725,7 +3725,24 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && !para->member.para.prev_para->member.para.nCharOfs) { - /* FIXME: Insert a newline before the table. */ + /* Insert a newline before the table. */ + WCHAR endl = '\r'; + para = para->member.para.prev_para; + para->member.para.nFlags &= ~MEPF_ROWSTART; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[1] = editor->pCursors[0]; + ME_InsertTextFromCursor(editor, 0, &endl, 1, + editor->pCursors[0].pRun->member.run.style); + para = editor->pBuffer->pFirst->member.para.next_para; + ME_SetDefaultParaFormat(para->member.para.pFmt); + para->member.para.nFlags = MEPF_REWRAP; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[1] = editor->pCursors[0]; + para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; + ME_CommitCoalescingUndo(editor); + ME_CheckTablesForCorruption(editor); + ME_UpdateRepaint(editor); + return 0; } } else { /* v1.0 - 3.0 */ ME_DisplayItem *para = ME_GetParagraph(cursor.pRun);

1 0

John Klehm : wintab32: Support overlap statuses in WTOpen.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 212488d846f6739d7f9dd611427449d140512b91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=212488d846f6739d7f9dd6114… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Tue Apr 29 00:21:30 2008 -0500 wintab32: Support overlap statuses in WTOpen. --- dlls/wintab32/context.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 271473a..5e5ada8 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -435,13 +435,12 @@ HCTX WINAPI WTOpenW(HWND hWnd, LPLOGCONTEXTW lpLogCtx, BOOL fEnable) { LPOPENCONTEXT newcontext; - TRACE("(%p, %p, %u)\n", hWnd, lpLogCtx, fEnable); + TRACE("hWnd=%p, lpLogCtx=%p, fEnable=%u\n", hWnd, lpLogCtx, fEnable); DUMPCONTEXT(*lpLogCtx); newcontext = HeapAlloc(GetProcessHeap(), 0 , sizeof(OPENCONTEXT)); newcontext->context = *lpLogCtx; newcontext->hwndOwner = hWnd; - newcontext->enabled = fEnable; newcontext->ActiveCursor = -1; newcontext->QueueSize = 10; newcontext->PacketsQueued = 0; @@ -458,7 +457,17 @@ HCTX WINAPI WTOpenW(HWND hWnd, LPLOGCONTEXTW lpLogCtx, BOOL fEnable) TABLET_PostTabletMessage(newcontext, _WT_CTXOPEN(newcontext->context.lcMsgBase), (WPARAM)newcontext->handle, newcontext->context.lcStatus, TRUE); - newcontext->context.lcStatus = CXS_ONTOP; + if (fEnable) + { + newcontext->enabled = TRUE; + /* TODO: Add to top of overlap order */ + newcontext->context.lcStatus = CXS_ONTOP; + } + else + { + newcontext->enabled = FALSE; + newcontext->context.lcStatus = CXS_DISABLED; + } TABLET_PostTabletMessage(newcontext, _WT_CTXOVERLAP(newcontext->context.lcMsgBase), (WPARAM)newcontext->handle,

1 0

John Klehm : wintab32: Support overlap statuses in WTEnable.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 20276da9af2c8cf7e679edec536117d5d544462a URL: http://source.winehq.org/git/wine.git/?a=commit;h=20276da9af2c8cf7e679edec5… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Tue Apr 29 00:37:55 2008 -0500 wintab32: Support overlap statuses in WTEnable. --- dlls/wintab32/context.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 5e5ada8..9b1da18 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -622,15 +622,27 @@ BOOL WINAPI WTEnable(HCTX hCtx, BOOL fEnable) { LPOPENCONTEXT context; - TRACE("(%p, %u)\n", hCtx, fEnable); + TRACE("hCtx=%p, fEnable=%u\n", hCtx, fEnable); - if (!hCtx) return 0; + if (!hCtx) return FALSE; EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); - if(!fEnable) + /* if we want to enable and it is not enabled then */ + if(fEnable && !context->enabled) + { + context->enabled = TRUE; + /* TODO: Add to top of overlap order */ + context->context.lcStatus = CXS_ONTOP; + } + /* if we want to disable and it is not disabled then */ + else if (!fEnable && context->enabled) + { + context->enabled = FALSE; + /* TODO: Remove from overlap order?? needs a test */ + context->context.lcStatus = CXS_DISABLED; TABLET_FlushQueue(context); - context->enabled = fEnable; + } LeaveCriticalSection(&csTablet); return TRUE;

1 0