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

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

18 Aug '08

Module: wine Branch: master Commit: 421c5b0e02cff2af46de922940ef3660df4271b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=421c5b0e02cff2af46de92294… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Aug 12 23:15:36 2008 -0400 richedit: Borders are now drawn for tables and nested tables. --- dlls/riched20/editor.c | 53 ++++++++++++ dlls/riched20/editstr.h | 15 ++++ dlls/riched20/paint.c | 202 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/riched20/reader.c | 1 + dlls/riched20/rtf.h | 43 ++++++++++ dlls/riched20/table.c | 1 + dlls/riched20/wrap.c | 36 ++++++++- 7 files changed, 338 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=421c5b0e02cff2af46de9…

1 0

Dylan Smith : richedit: Removed an unused local variable and assignments to it.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: b628482d68cd969996ab767a9e291341d97caf2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b628482d68cd969996ab767a9… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Aug 12 23:15:25 2008 -0400 richedit: Removed an unused local variable and assignments to it. --- dlls/riched20/paint.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index c93a3e5..c2bcfc2 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -667,9 +667,9 @@ void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { ME_DisplayItem *p; ME_Run *run; ME_Paragraph *para = NULL; - RECT rc, rcText, bounds; + RECT rc, bounds; int y = c->pt.y; - int height = 0, baseline = 0, no=0, pno = 0; + int height = 0, baseline = 0, no=0; BOOL visible = FALSE; c->pt.x = c->rcView.left; @@ -680,15 +680,11 @@ void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { case diParagraph: para = &p->member.para; assert(para); - pno = 0; if (para->pCell) { ME_Cell *cell = &para->pCell->member.cell; rc.left = cell->pt.x; rc.right = rc.left + cell->nWidth; - rcText.left = cell->pt.x + ME_twips2pointsX(c, para->pFmt->dxStartIndent); - rcText.right = cell->pt.x + cell->nWidth - - ME_twips2pointsX(c, para->pFmt->dxRightIndent); } if (para->nFlags & MEPF_ROWSTART) { ME_Cell *cell = &para->next_para->member.para.pCell->member.cell; @@ -697,8 +693,6 @@ void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { ME_Cell *cell = &para->prev_para->member.para.pCell->member.cell; rc.left = cell->pt.x + cell->nWidth; } - rcText.left = rc.left + ME_twips2pointsX(c, para->pFmt->dxStartIndent); - rcText.right = rc.right - ME_twips2pointsX(c, para->pFmt->dxRightIndent); ME_DrawParaDecoration(c, para, y, &bounds); y += bounds.top; break; @@ -732,8 +726,6 @@ void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { height = p->member.row.nHeight; baseline = p->member.row.nBaseline; - if (!pno++) - rcText.right += ME_twips2pointsX(c, para->pFmt->dxOffset); break; case diRun: assert(para);

1 0

Dylan Smith : richedit: Adjust table spacing with horizontal gap and left edge.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: a47d4a4c3a5c89268906b5b8db59e1de41e89ecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a47d4a4c3a5c89268906b5b8d… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Aug 12 23:15:29 2008 -0400 richedit: Adjust table spacing with horizontal gap and left edge. --- dlls/riched20/editor.c | 21 +++++++++---- dlls/riched20/editor.h | 2 + dlls/riched20/rtf.h | 2 + dlls/riched20/run.c | 12 ++++++- dlls/riched20/table.c | 21 +++++++++++++ dlls/riched20/wrap.c | 56 +++++++++++++++++++++++++++------- dlls/riched20/writer.c | 78 +++++++++++++++++++++++++---------------------- 7 files changed, 135 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a47d4a4c3a5c89268906b…

1 0

Dylan Smith : richedit: Substitute space for \tab and \par control words for simple tables.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: fe1a24ff88d641b63ffa1d85b46846fba01cd8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1a24ff88d641b63ffa1d85b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Aug 12 23:15:21 2008 -0400 richedit: Substitute space for \tab and \par control words for simple tables. For simple tables cells are represented with tabs, and a table row is ended at the end of the paragraph, so native richedit controls substitute spaces for \tab and \par rich text format control words. --- dlls/riched20/editor.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8c235a8..15ad39f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -936,9 +936,23 @@ static void ME_RTFSpecialCharHook(RTF_Info *info) } break; } + case rtfTab: case rtfPar: - if (tableDef) - tableDef->numCellsInserted = 0; + if (info->editor->bEmulateVersion10) { /* v1.0 - 3.0 */ + ME_DisplayItem *para; + PARAFORMAT2 *pFmt; + RTFFlushOutputBuffer(info); + para = ME_GetParagraph(info->editor->pCursors[0].pRun); + pFmt = para->member.para.pFmt; + if (pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) + { + /* rtfPar is treated like a space within a table. */ + info->rtfClass = rtfText; + info->rtfMajor = ' '; + } + else if (info->rtfMinor == rtfPar && tableDef) + tableDef->numCellsInserted = 0; + } break; } }

1 0

Rob Shearman : d3d9: Remove unneeded local variable in IDirect3DDevice9Impl_SetFVF.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 30cd9b473ee3f798eb4f9dd73076f3d1a41ff048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30cd9b473ee3f798eb4f9dd73… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:27:31 2008 +0100 d3d9: Remove unneeded local variable in IDirect3DDevice9Impl_SetFVF. --- dlls/d3d9/device.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2b133c1..ddeaca3 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1306,7 +1306,6 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetFVF(LPDIRECT3DDEVICE9EX iface, DWORD FV EnterCriticalSection(&d3d9_cs); if (0 != FVF) { - HRESULT hr; IDirect3DVertexDeclaration9* pDecl = getConvertedDecl(This, FVF); if(!pDecl) {

1 0

Dylan Smith : richedit: EM_[SG]ETPARAFORMAT returned the wrong value.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: a382e356001b9fac1b223fdd126f4909a3cc6215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a382e356001b9fac1b223fdd1… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Aug 12 23:15:15 2008 -0400 richedit: EM_[SG]ETPARAFORMAT returned the wrong value. The values returned by EM_SETPARAFORMAT and EM_GETPARAFORMAT previously indicated an error, and the included tests shows that Windows behaves as documented. --- dlls/riched20/editor.c | 8 +++++--- dlls/riched20/editor.h | 4 ++-- dlls/riched20/para.c | 8 ++++++-- dlls/riched20/tests/editor.c | 22 ++++++++++++++++++++++ 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 44af5a4..8c235a8 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2728,13 +2728,15 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, return tmp.dwMask; } case EM_SETPARAFORMAT: - ME_SetSelectionParaFormat(editor, (PARAFORMAT2 *)lParam); + { + BOOL result = ME_SetSelectionParaFormat(editor, (PARAFORMAT2 *)lParam); ME_RewrapRepaint(editor); ME_CommitUndo(editor); - return 0; + return result; + } case EM_GETPARAFORMAT: ME_GetSelectionParaFormat(editor, (PARAFORMAT2 *)lParam); - return 0; + return ((PARAFORMAT2 *)lParam)->dwMask; case EM_GETFIRSTVISIBLELINE: { ME_DisplayItem *p = editor->pBuffer->pFirst; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 85dbd18..b123a2d 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -222,8 +222,8 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, BOOL keepFirstParaFormat); void ME_DumpParaStyle(ME_Paragraph *s); void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]); -void ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const PARAFORMAT2 *pFmt); -void ME_SetSelectionParaFormat(ME_TextEditor *editor, const PARAFORMAT2 *pFmt); +BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const PARAFORMAT2 *pFmt); +BOOL ME_SetSelectionParaFormat(ME_TextEditor *editor, const PARAFORMAT2 *pFmt); void ME_GetParaFormat(ME_TextEditor *editor, const ME_DisplayItem *para, PARAFORMAT2 *pFmt); void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt); /* marks from first up to (but not including) last */ diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 3c20ee1..b8676d1 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -430,7 +430,7 @@ void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]) #undef DUMP_EFFECT } -void ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const PARAFORMAT2 *pFmt) +BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const PARAFORMAT2 *pFmt) { PARAFORMAT2 copy; assert(sizeof(*para->member.para.pFmt) == sizeof(PARAFORMAT2)); @@ -487,6 +487,8 @@ void ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const PARAFOR if (memcmp(&copy, para->member.para.pFmt, sizeof(PARAFORMAT2))) para->member.para.nFlags |= MEPF_REWRAP; + + return TRUE; } @@ -514,7 +516,7 @@ ME_GetSelectionParas(ME_TextEditor *editor, ME_DisplayItem **para, ME_DisplayIte } -void ME_SetSelectionParaFormat(ME_TextEditor *editor, const PARAFORMAT2 *pFmt) +BOOL ME_SetSelectionParaFormat(ME_TextEditor *editor, const PARAFORMAT2 *pFmt) { ME_DisplayItem *para, *para_end; @@ -526,6 +528,8 @@ void ME_SetSelectionParaFormat(ME_TextEditor *editor, const PARAFORMAT2 *pFmt) break; para = para->member.para.next_para; } while(1); + + return TRUE; } void ME_GetParaFormat(ME_TextEditor *editor, const ME_DisplayItem *para, PARAFORMAT2 *pFmt) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 15cef75..765e8e2 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1087,6 +1087,27 @@ static void test_EM_SETTEXTMODE(void) DestroyWindow(hwndRichEdit); } +static void test_SETPARAFORMAT(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + PARAFORMAT2 fmt; + HRESULT ret; + fmt.cbSize = sizeof(PARAFORMAT2); + fmt.dwMask = PFM_ALIGNMENT; + fmt.wAlignment = PFA_LEFT; + + ret = SendMessage(hwndRichEdit, EM_SETPARAFORMAT, 0, (LPARAM) &fmt); + ok(ret != 0, "expected non-zero got %d\n", ret); + + fmt.cbSize = sizeof(PARAFORMAT2); + fmt.dwMask = -1; + ret = SendMessage(hwndRichEdit, EM_GETPARAFORMAT, 0, (LPARAM) &fmt); + ok(ret == PFM_ALL2, "expected %x got %x\n", PFM_ALL2, ret); + ok(fmt.dwMask == PFM_ALL2, "expected %x got %x\n", PFM_ALL2, fmt.dwMask); + + DestroyWindow(hwndRichEdit); +} + static void test_TM_PLAINTEXT(void) { /*Tests plain text properties*/ @@ -5396,6 +5417,7 @@ START_TEST( editor ) test_undo_coalescing(); test_word_movement(); test_EM_CHARFROMPOS(); + test_SETPARAFORMAT(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Rob Shearman : d3d9: Fix variable type in IDirect3DDevice9Impl_GetSoftwareVertexProcessing.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 320aac97e4a2ef3983cb81e353c3bf2e4cd237c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=320aac97e4a2ef3983cb81e35… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:27:15 2008 +0100 d3d9: Fix variable type in IDirect3DDevice9Impl_GetSoftwareVertexProcessing. IWineD3DDevice_GetSoftwareVertexProcessing returns a BOOL, not an HRESULT. --- dlls/d3d9/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7376525..2b133c1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1149,13 +1149,13 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetSoftwareVertexProcessing(LPDIREC static BOOL WINAPI IDirect3DDevice9Impl_GetSoftwareVertexProcessing(LPDIRECT3DDEVICE9EX iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - HRESULT hr; + BOOL ret; TRACE("(%p) Relay\n" , This); EnterCriticalSection(&d3d9_cs); - hr = IWineD3DDevice_GetSoftwareVertexProcessing(This->WineD3DDevice); + ret = IWineD3DDevice_GetSoftwareVertexProcessing(This->WineD3DDevice); LeaveCriticalSection(&d3d9_cs); - return hr; + return ret; } static HRESULT WINAPI IDirect3DDevice9Impl_SetNPatchMode(LPDIRECT3DDEVICE9EX iface, float nSegments) {

1 0

Rob Shearman : cryptnet: Fix mismatch between sizeof and countof quantities in CRYPT_GetUrlFromCertificateCRLDistPoint .
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: b0e8143db64de479f440c82c14330f76829aaec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e8143db64de479f440c82c1… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:25:37 2008 +0100 cryptnet: Fix mismatch between sizeof and countof quantities in CRYPT_GetUrlFromCertificateCRLDistPoint. nextUrl is of type "WCHAR *" so don't multiply the length by "sizeof(WCHAR)" when incrementing the pointer. --- dlls/cryptnet/cryptnet_main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 5bf1afe..ffd4d64 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -219,8 +219,7 @@ static BOOL WINAPI CRYPT_GetUrlFromCertificateCRLDistPoint(LPCSTR pszUrlOid, pUrlArray->rgwszUrl[pUrlArray->cUrl++] = nextUrl; nextUrl += - (lstrlenW(name->rgAltEntry[j].u.pwszURL) + 1) - * sizeof(WCHAR); + (lstrlenW(name->rgAltEntry[j].u.pwszURL) + 1); } } }

1 0

Rob Shearman : appwiz.cpl: Fix leak of thread and process handles in UninstallProgram.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 0427cf087b98792620860ae9eb1c1ea58a781e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0427cf087b98792620860ae9e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:26:21 2008 +0100 appwiz.cpl: Fix leak of thread and process handles in UninstallProgram. --- dlls/appwiz.cpl/appwiz.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 44bf3b2..ce94863 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -404,8 +404,11 @@ static void UninstallProgram(int id) if (res) { + CloseHandle(info.hThread); + /* wait for the process to exit */ WaitForSingleObject(info.hProcess, INFINITE); + CloseHandle(info.hProcess); } else {

1 0

Michael Karcher : kernel32: Fix profile sharing mode.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 33ca67dcab8e99d2fddbd2d3a11d73b21ba0ef41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ca67dcab8e99d2fddbd2d3a… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Aug 17 19:03:14 2008 +0200 kernel32: Fix profile sharing mode. Based on a patch from Austin English. --- dlls/kernel32/profile.c | 2 +- dlls/kernel32/tests/profile.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 74622ad..ac983ff 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -755,7 +755,7 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) TRACE("path: %s\n", debugstr_w(buffer)); hFile = CreateFileW(buffer, GENERIC_READ | (write_access ? GENERIC_WRITE : 0), - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if ((hFile == INVALID_HANDLE_VALUE) && (GetLastError() != ERROR_FILE_NOT_FOUND)) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 2ea3955..47b1ac1 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -348,6 +348,27 @@ static void test_profile_existing(void) ok( DeleteFile(testfile2), "delete failed\n" ); } +static void test_profile_delete_on_close() +{ + static CHAR testfile[] = ".\\testwine5.ini"; + HANDLE h; + DWORD size, res; + static const char contents[] = "[" SECTION "]\n" KEY "=123\n"; + + h = CreateFile(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, + CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); + ok( WriteFile( h, contents, sizeof contents - 1, &size, NULL ), + "Cannot write test file: %x\n", GetLastError() ); + ok( size == sizeof contents - 1, "Test file: partial write\n"); + + res = GetPrivateProfileInt(SECTION, KEY, 0, testfile); + + ok( res == 123, "Got %d instead of 123\n", res); + + /* This also deletes the file */ + CloseHandle(h); +} + static void create_test_file(LPCSTR name, LPCSTR data, DWORD size) { HANDLE hfile; @@ -615,5 +636,6 @@ START_TEST(profile) test_profile_sections(); test_profile_sections_names(); test_profile_existing(); + test_profile_delete_on_close(); test_GetPrivateProfileString(); }

1 0