January 2009 - Wine-commits

Michael Stefaniuc : mlang: Remove superfluous pointer casts.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 8dbc7a699e252e105eff3f8acb119b50b5d9b30d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dbc7a699e252e105eff3f8ac… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jan 17 22:55:12 2009 +0100 mlang: Remove superfluous pointer casts. --- dlls/mlang/mlang.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 2365b09..375f102 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1951,7 +1951,7 @@ static HRESULT WINAPI fnIMLangFontLink_CodePagesToCodePage( DWORD Csb[2]; Csb[0] = mask; Csb[1] = 0x0; - rc = TranslateCharsetInfo((DWORD*)Csb, &cs, TCI_SRCFONTSIG); + rc = TranslateCharsetInfo(Csb, &cs, TCI_SRCFONTSIG); if (!rc) continue; @@ -3294,7 +3294,7 @@ static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj) mlang->total_scripts = sizeof(mlang_data)/sizeof(mlang_data[0]) - 1; mlang->ref = 1; - *ppObj = (LPVOID) mlang; + *ppObj = mlang; TRACE("returning %p\n", mlang); LockModule();

1 0

Michael Stefaniuc : mscms: Remove superfluous pointer casts.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: c36ce23795fd2d0fa6489e08204127e158009f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36ce23795fd2d0fa6489e082… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jan 17 22:55:25 2009 +0100 mscms: Remove superfluous pointer casts. --- dlls/mscms/icc.c | 2 +- dlls/mscms/profile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/icc.c b/dlls/mscms/icc.c index 6297bff..67b65ed 100644 --- a/dlls/mscms/icc.c +++ b/dlls/mscms/icc.c @@ -79,7 +79,7 @@ void MSCMS_get_tag_by_index( icProfile *iccprofile, DWORD index, icTag *tag ) tag->offset = tmp->offset; tag->size = tmp->size; - MSCMS_adjust_endianess32( (ULONG *)&tag->sig ); + MSCMS_adjust_endianess32( &tag->sig ); MSCMS_adjust_endianess32( &tag->offset ); MSCMS_adjust_endianess32( &tag->size ); } diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 2f9970c..1c6811e 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1461,7 +1461,7 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing { DWORD size, read, flags = 0; - TRACE( "profile file: %s\n", debugstr_w( (WCHAR *)profile->pProfileData ) ); + TRACE( "profile file: %s\n", debugstr_w( profile->pProfileData ) ); if (access & PROFILE_READ) flags = GENERIC_READ; if (access & PROFILE_READWRITE) flags = GENERIC_READ|GENERIC_WRITE;

1 0

Gerald Pfeifer : comctl32: Remove unused parameter from SYSLINK_WrapLine.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 2a06a97336a361781ef5dfee53560abc58488ffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a06a97336a361781ef5dfee5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 17 20:45:21 2009 +0100 comctl32: Remove unused parameter from SYSLINK_WrapLine. --- dlls/comctl32/syslink.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 64cea11..5c25a52 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -602,8 +602,8 @@ static PDOC_ITEM SYSLINK_GetPrevLink (const SYSLINK_INFO *infoPtr, PDOC_ITEM Cur * SYSLINK_WrapLine * Tries to wrap a line. */ -static BOOL SYSLINK_WrapLine (HDC hdc, LPWSTR Text, WCHAR BreakChar, int *LineLen, - int nFit, LPSIZE Extent, int Width) +static BOOL SYSLINK_WrapLine (LPWSTR Text, WCHAR BreakChar, int *LineLen, + int nFit, LPSIZE Extent) { WCHAR *Current; @@ -720,7 +720,7 @@ static VOID SYSLINK_Render (const SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect) if(n != 0) { - Wrap = SYSLINK_WrapLine(hdc, tx, infoPtr->BreakChar, &LineLen, nFit, &szDim, rc.right - x); + Wrap = SYSLINK_WrapLine(tx, infoPtr->BreakChar, &LineLen, nFit, &szDim); if(LineLen == 0) {

1 0

Huw Davies : comdlg32: We need to be able to type the decimal separator into the margin edit controls so ES_NUMBER is no use . Subclass them and filter WM_CHAR instead.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 2a0f86afc5e343896f650f8dbbc93a2e7db8572c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0f86afc5e343896f650f8db… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 16 13:51:18 2009 +0000 comdlg32: We need to be able to type the decimal separator into the margin edit controls so ES_NUMBER is no use. Subclass them and filter WM_CHAR instead. --- dlls/comdlg32/cdlg_Bg.rc | 8 ++++---- dlls/comdlg32/cdlg_Cs.rc | 8 ++++---- dlls/comdlg32/cdlg_Da.rc | 8 ++++---- dlls/comdlg32/cdlg_De.rc | 8 ++++---- dlls/comdlg32/cdlg_El.rc | 8 ++++---- dlls/comdlg32/cdlg_En.rc | 8 ++++---- dlls/comdlg32/cdlg_Eo.rc | 8 ++++---- dlls/comdlg32/cdlg_Es.rc | 8 ++++---- dlls/comdlg32/cdlg_Fi.rc | 8 ++++---- dlls/comdlg32/cdlg_Fr.rc | 8 ++++---- dlls/comdlg32/cdlg_It.rc | 8 ++++---- dlls/comdlg32/cdlg_Ja.rc | 8 ++++---- dlls/comdlg32/cdlg_Ko.rc | 8 ++++---- dlls/comdlg32/cdlg_Nl.rc | 8 ++++---- dlls/comdlg32/cdlg_No.rc | 8 ++++---- dlls/comdlg32/cdlg_Pl.rc | 8 ++++---- dlls/comdlg32/cdlg_Pt.rc | 16 ++++++++-------- dlls/comdlg32/cdlg_Ro.rc | 8 ++++---- dlls/comdlg32/cdlg_Ru.rc | 8 ++++---- dlls/comdlg32/cdlg_Si.rc | 8 ++++---- dlls/comdlg32/cdlg_Sv.rc | 8 ++++---- dlls/comdlg32/cdlg_Th.rc | 8 ++++---- dlls/comdlg32/cdlg_Tr.rc | 8 ++++---- dlls/comdlg32/cdlg_Zh.rc | 8 ++++---- dlls/comdlg32/printdlg.c | 36 ++++++++++++++++++++++++++++++++++++ 25 files changed, 136 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a0f86afc5e343896f650…

1 0

Detlef Riekenberg : ddrawex/tests: Fix a typo in ok().
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 0730963d56e0485b6da791f67430d331b7fe4094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0730963d56e0485b6da791f67… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 16 17:24:07 2009 +0100 ddrawex/tests: Fix a typo in ok(). --- dlls/ddrawex/tests/ddrawex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddrawex/tests/ddrawex.c b/dlls/ddrawex/tests/ddrawex.c index 848c149..608a19c 100644 --- a/dlls/ddrawex/tests/ddrawex.c +++ b/dlls/ddrawex/tests/ddrawex.c @@ -61,7 +61,7 @@ static void RefCountTest(void) ok(ref == 2, "After AddRef the refcount is %u, expected 2\n", ref); IDirectDraw_Release(dd1); ref = get_ref((IUnknown *) dd1); - ok(ref == 1, "After Release the refcount is %u, expected 2\n", ref); + ok(ref == 1, "After Release the refcount is %u, expected 1\n", ref); IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw2, (void **) &dd2); ref = get_ref((IUnknown *) dd2);

1 0

Dylan Smith : richedit: Added test for detecting ascii rtf with Unicode codepage.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 164778452c453c058eeea25abee8a5a1a5c40465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=164778452c453c058eeea25ab… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jan 16 20:38:17 2009 -0500 richedit: Added test for detecting ascii rtf with Unicode codepage. --- dlls/riched20/tests/editor.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ff5d598..2cf9a10 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3562,6 +3562,23 @@ static void test_EM_SETTEXTEX(void) ok(lstrcmpW(buf, TestItem1) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); + /* The following test demonstrates that EM_SETTEXTEX treats text as ASCII if it + * starts with ASCII characters "{\rtf" even when the codepage is unicode. */ + setText.codepage = 1200; /* Lie about code page (actual ASCII) */ + getText.codepage = CP_ACP; + getText.cb = MAX_BUF_LEN; + getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefChar = NULL; + + setText.flags = ST_SELECTION; + SendMessage(hwndRichEdit, EM_SETSEL, 0, -1); + result = SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) "{\\rtf not unicode}"); + todo_wine ok(result == 11, "EM_SETTEXTEX incorrectly returned %d\n", result); + SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) bufACP); + todo_wine ok(lstrcmpA(bufACP, "not unicode") == 0, + "'%s' != 'not unicode'\n", bufACP); + /* The following test demonstrates that EM_SETTEXTEX supports RTF strings with a selection */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "TestSomeText"); /* TestItem1 */ p = (char *)buf;

1 0

Dylan Smith : richedit: EM_SETTEXTEX detects ascii richtext with Unicode codepage.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: b4babc16bbcb610dbe17f526c5ecd30041629362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4babc16bbcb610dbe17f526c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jan 16 20:38:24 2009 -0500 richedit: EM_SETTEXTEX detects ascii richtext with Unicode codepage. --- dlls/riched20/editor.c | 56 ++++++++++++++++++++++++++--------------- dlls/riched20/tests/editor.c | 3 +- 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b67ca60..e3920d4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3208,42 +3208,56 @@ static LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { LPWSTR wszText; SETTEXTEX *pStruct = (SETTEXTEX *)wParam; - size_t len; + size_t len = 0; int from, to; ME_Style *style; + BOOL bRtf, bUnicode, bSelection; int oldModify = editor->nModifyStep; if (!pStruct) return 0; + /* If we detect ascii rtf at the start of the string, + * we know it isn't unicode. */ + bRtf = (lParam && (!strncmp((char *)lParam, "{\\rtf", 5) || + !strncmp((char *)lParam, "{\\urtf}", 6))); + bUnicode = !bRtf && pStruct->codepage == 1200; + TRACE("EM_SETTEXTEX - %s, flags %d, cp %d\n", - pStruct->codepage == 1200 ? debugstr_w((LPCWSTR)lParam) : debugstr_a((LPCSTR)lParam), + bUnicode ? debugstr_w((LPCWSTR)lParam) : debugstr_a((LPCSTR)lParam), pStruct->flags, pStruct->codepage); - /* FIXME: make use of pStruct->codepage in the to unicode translation */ - wszText = lParam ? ME_ToUnicode(pStruct->codepage == 1200, (void *)lParam) : NULL; - len = wszText ? lstrlenW(wszText) : 0; - - if (pStruct->flags & ST_SELECTION) { + bSelection = (pStruct->flags & ST_SELECTION) != 0; + if (bSelection) { ME_GetSelection(editor, &from, &to); style = ME_GetSelectionInsertStyle(editor); ME_InternalDeleteText(editor, from, to - from, FALSE); - if (pStruct->codepage != 1200 && lParam && - (!strncmp((char *)lParam, "{\\rtf", 5) || !strncmp((char *)lParam, "{\\urtf}", 6))) - ME_StreamInRTFString(editor, 1, (char *)lParam); - else ME_InsertTextFromCursor(editor, 0, wszText, len, style); - ME_ReleaseStyle(style); + } else { + ME_InternalDeleteText(editor, 0, ME_GetTextLength(editor), FALSE); + style = editor->pBuffer->pDefaultStyle; + } - if (editor->AutoURLDetect_bEnable) ME_UpdateSelectionLinkAttribute(editor); + if (bRtf) { + ME_StreamInRTFString(editor, bSelection, (char *)lParam); + if (bSelection) { + /* FIXME: The length returned is doesn't include the rtf control + * characters, only the actual text. */ + len = lParam ? strlen((char *)lParam) : 0; + } + } else { + /* FIXME: make use of pStruct->codepage in the to unicode translation */ + wszText = lParam ? ME_ToUnicode(bUnicode, (void *)lParam) : NULL; + len = wszText ? lstrlenW(wszText) : 0; + ME_InsertTextFromCursor(editor, 0, wszText, len, style); } - else { - ME_InternalDeleteText(editor, 0, ME_GetTextLength(editor), FALSE); - if (pStruct->codepage != 1200 && lParam && - (!strncmp((char *)lParam, "{\\rtf", 5) || !strncmp((char *)lParam, "{\\urtf}", 6))) - ME_StreamInRTFString(editor, 0, (char *)lParam); - else ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); - len = 1; - if (editor->AutoURLDetect_bEnable) ME_UpdateLinkAttribute(editor, 0, -1); + if (bSelection) { + ME_ReleaseStyle(style); + if (editor->AutoURLDetect_bEnable) + ME_UpdateSelectionLinkAttribute(editor); + } else { + len = 1; + if (editor->AutoURLDetect_bEnable) + ME_UpdateLinkAttribute(editor, 0, -1); } ME_CommitUndo(editor); if (!(pStruct->flags & ST_KEEPUNDO)) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 2cf9a10..1d5a04d 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3576,8 +3576,7 @@ static void test_EM_SETTEXTEX(void) result = SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) "{\\rtf not unicode}"); todo_wine ok(result == 11, "EM_SETTEXTEX incorrectly returned %d\n", result); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) bufACP); - todo_wine ok(lstrcmpA(bufACP, "not unicode") == 0, - "'%s' != 'not unicode'\n", bufACP); + ok(lstrcmpA(bufACP, "not unicode") == 0, "'%s' != 'not unicode'\n", bufACP); /* The following test demonstrates that EM_SETTEXTEX supports RTF strings with a selection */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "TestSomeText"); /* TestItem1 */

1 0

Dylan Smith : richedit: Prevent sending Ctrl-C to console and ending tests.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: d29a301ccdfe7b0545def4f515d417f1f1264547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d29a301ccdfe7b0545def4f51… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jan 16 20:38:46 2009 -0500 richedit: Prevent sending Ctrl-C to console and ending tests. --- dlls/riched20/tests/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 1d5a04d..aa78e2a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1471,7 +1471,7 @@ static void test_EM_SETOPTIONS(void) DestroyWindow(hwndRichEdit); hwndRichEdit = CreateWindow(RICHEDIT_CLASS, NULL, - WS_POPUP|WS_HSCROLL|WS_VSCROLL, + WS_POPUP|WS_HSCROLL|WS_VSCROLL|WS_VISIBLE, 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); ok(hwndRichEdit != NULL, "class: %s, error: %d\n",

1 0

Huw Davies : comdlg32: Fix spelling of millimeter.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: ef4588a08e536c161b5e3e10c08a7b2db3ea2df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef4588a08e536c161b5e3e10c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 15 14:05:11 2009 +0000 comdlg32: Fix spelling of millimeter. --- dlls/comdlg32/cdlg.h | 4 ++-- dlls/comdlg32/cdlg_Bg.rc | 4 ++-- dlls/comdlg32/cdlg_Cs.rc | 4 ++-- dlls/comdlg32/cdlg_Da.rc | 4 ++-- dlls/comdlg32/cdlg_De.rc | 4 ++-- dlls/comdlg32/cdlg_El.rc | 4 ++-- dlls/comdlg32/cdlg_En.rc | 4 ++-- dlls/comdlg32/cdlg_Eo.rc | 4 ++-- dlls/comdlg32/cdlg_Es.rc | 4 ++-- dlls/comdlg32/cdlg_Fi.rc | 4 ++-- dlls/comdlg32/cdlg_Fr.rc | 4 ++-- dlls/comdlg32/cdlg_It.rc | 4 ++-- dlls/comdlg32/cdlg_Ja.rc | 4 ++-- dlls/comdlg32/cdlg_Ko.rc | 4 ++-- dlls/comdlg32/cdlg_Nl.rc | 4 ++-- dlls/comdlg32/cdlg_No.rc | 4 ++-- dlls/comdlg32/cdlg_Pl.rc | 4 ++-- dlls/comdlg32/cdlg_Pt.rc | 8 ++++---- dlls/comdlg32/cdlg_Ro.rc | 4 ++-- dlls/comdlg32/cdlg_Ru.rc | 4 ++-- dlls/comdlg32/cdlg_Si.rc | 4 ++-- dlls/comdlg32/cdlg_Sk.rc | 4 ++-- dlls/comdlg32/cdlg_Sv.rc | 4 ++-- dlls/comdlg32/cdlg_Th.rc | 4 ++-- dlls/comdlg32/cdlg_Tr.rc | 4 ++-- dlls/comdlg32/cdlg_Uk.rc | 4 ++-- dlls/comdlg32/cdlg_Zh.rc | 8 ++++---- dlls/comdlg32/rsrc.rc | 2 +- 28 files changed, 59 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef4588a08e536c161b5e3…

1 0

Huw Davies : comdlg32: Set the margins groupbox title to reflect whether we are using metric or imperial measurements .
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 6ca8b91f390a993f536c6493deb2c9e267b6380e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ca8b91f390a993f536c6493d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 15 14:13:43 2009 +0000 comdlg32: Set the margins groupbox title to reflect whether we are using metric or imperial measurements. --- dlls/comdlg32/printdlg.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 47c3b34..be0eaf8 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2861,6 +2861,15 @@ static void update_margin_edits(HWND hDlg, const PageSetupDataA *pda) SetDlgItemTextW(hDlg, edt7, str); } +static void set_margin_groupbox_title(HWND hDlg, const PageSetupDataA *pda) +{ + WCHAR title[256]; + + if(LoadStringW(COMDLG32_hInstance, is_metric(pda) ? PD32_MARGINS_IN_MILLIMETERS : PD32_MARGINS_IN_INCHES, + title, sizeof(title)/sizeof(title[0]))) + SetDlgItemTextW(hDlg, grp4, title); +} + /******************************************************************************** * PRINTDLG_PS_WMCommandA * process WM_COMMAND message for PageSetupDlgA @@ -3351,6 +3360,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) pda->dlga->rtMargin.bottom = size; } update_margin_edits(hDlg, pda); + set_margin_groupbox_title(hDlg, pda); /* if paper disabled */ if (pda->dlga->Flags & PSD_DISABLEPAPER) {

1 0