wine-commits February 2009

wine-commits@winehq.org

2 participants
965 discussions

Jacek Caban : shdocvw: Added loading tests.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 7ac34f9e50f742d0a7d40510dbd36ba48a4bf421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ac34f9e50f742d0a7d40510d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 23 15:38:23 2009 +0100 shdocvw: Added loading tests. --- dlls/shdocvw/tests/webbrowser.c | 148 ++++++++++++++++++++++++++++++++++----- 1 files changed, 129 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ac34f9e50f742d0a7d40…

1 0

Aurimas Fischer : mshtml: Add Lithuanian translation.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: d1c3fbbbfcd923b3c2ed50692875f0d70e08f152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c3fbbbfcd923b3c2ed50692… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Sun Feb 22 12:16:59 2009 +0200 mshtml: Add Lithuanian translation. --- dlls/mshtml/Lt.rc | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/rsrc.rc | 1 + 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Lt.rc b/dlls/mshtml/Lt.rc new file mode 100644 index 0000000..c008183 --- /dev/null +++ b/dlls/mshtml/Lt.rc @@ -0,0 +1,59 @@ +/* + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_HTMLDISABLED "HTML atvaizdavimas yra išjungtas." + IDS_HTMLDOCUMENT "HTML dokumentas" + IDS_DOWNLOADING "Atsiunčiama..." + IDS_INSTALLING "Įdiegiama..." +} + +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wine Gecko diegimo programa" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ši programa mėgina parodyti HTML puslapį. Šiam puslapiui parodyti reikia, kad būtų " \ + "įdiegtas Gecko (Mozilla HTML variklis). Spauskite įdiegti, jei norite, kad Wine " \ + "automatiškai atsiųstų ir įdiegtų Gecko.", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT + CONTROL "Eiga", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "&Įdiegti", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Atsisakyti", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP +} + +IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Saitas" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Saito informacija", -1, 5, 5, 190, 55 + LTEXT "&Tipas:", -1, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&URL:", -1, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Gerai", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Atsisakyti", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +} + +#pragma code_page(default) diff --git a/dlls/mshtml/rsrc.rc b/dlls/mshtml/rsrc.rc index 83e9d69..8be957f 100644 --- a/dlls/mshtml/rsrc.rc +++ b/dlls/mshtml/rsrc.rc @@ -43,6 +43,7 @@ #include "Hu.rc" #include "Ja.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"

1 0

Dylan Smith : richedit: Never wrap for single line controls.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 73e0c5ea8b6697b6c8955c7b73902099f267b841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73e0c5ea8b6697b6c8955c7b7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Feb 24 02:56:18 2009 -0500 richedit: Never wrap for single line controls. I tested without the ES_MULTILINE style, and found that wrapping doesn't occur where it normally would. --- dlls/riched20/editor.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4bfc9c2..dc03d42 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2636,7 +2636,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->nLastSelStart = ed->nLastSelEnd = 0; ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); ed->nAvailWidth = 0; /* wrap to client area */ - ed->bWordWrap = (props & TXTBIT_WORDWRAP) != 0; ed->bHideSelection = FALSE; ed->pfnWordBreak = NULL; ed->lpOleCallback = NULL; @@ -2665,8 +2664,12 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) if (props & TXTBIT_AUTOWORDSEL) ed->styleFlags |= ECO_AUTOWORDSELECTION; - if (props & TXTBIT_MULTILINE) + if (props & TXTBIT_MULTILINE) { ed->styleFlags |= ES_MULTILINE; + ed->bWordWrap = (props & TXTBIT_WORDWRAP) != 0; + } else { + ed->bWordWrap = FALSE; + } if (props & TXTBIT_READONLY) ed->styleFlags |= ES_READONLY; if (!(props & TXTBIT_HIDESELECTION)) @@ -4296,7 +4299,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_SETTARGETDEVICE: if (wParam == 0) { - BOOL new = (lParam == 0); + BOOL new = (lParam == 0 && (editor->styleFlags & ES_MULTILINE)); if (editor->nAvailWidth || editor->bWordWrap != new) { editor->bWordWrap = new; @@ -4305,7 +4308,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } } else { int width = max(0, lParam); - if (!editor->bWordWrap || editor->nAvailWidth != width) + if ((editor->styleFlags & ES_MULTILINE) && + (!editor->bWordWrap || editor->nAvailWidth != width)) { editor->nAvailWidth = width; editor->bWordWrap = TRUE;

1 0

Dylan Smith : richedit: EM_SHOWSCROLLBAR hides scrollbars for less than page of text.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 963407a9ef315e42efd6fa9b74cfe564077f161f URL: http://source.winehq.org/git/wine.git/?a=commit;h=963407a9ef315e42efd6fa9b7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Feb 24 02:39:03 2009 -0500 richedit: EM_SHOWSCROLLBAR hides scrollbars for less than page of text. When all the text fits on the screen, the scrollbars are not shown from EM_SHOWSCROLLBAR. The message instead adds support for the specified scrollbar when lParam is TRUE, so that the scrollbar will be shown when sufficient text is in the document. --- dlls/riched20/editor.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8af973c..4bfc9c2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3156,12 +3156,18 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; } - if (lParam) + if (lParam) { editor->styleFlags |= flags; - else - editor->styleFlags &= flags; - - ITextHost_TxShowScrollBar(editor->texthost, wParam, lParam); + if (flags & WS_HSCROLL) + ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, + editor->nTotalWidth > editor->sizeWindow.cx); + if (flags & WS_VSCROLL) + ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, + editor->nTotalLength > editor->sizeWindow.cy); + } else { + editor->styleFlags &= ~flags; + ITextHost_TxShowScrollBar(editor->texthost, wParam, FALSE); + } return 0; } case EM_SETTEXTEX:

1 0

Dylan Smith : richedit: Return FALSE for EM_LINESCROLL with single line control.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: f28988684e02f5e3992e83aa942a491352e67c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f28988684e02f5e3992e83aa9… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Feb 24 02:38:57 2009 -0500 richedit: Return FALSE for EM_LINESCROLL with single line control. --- dlls/riched20/editor.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e73679e..8af973c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3375,8 +3375,10 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_LINESCROLL: { + if (!(editor->styleFlags & ES_MULTILINE)) + return FALSE; ME_ScrollDown(editor, lParam * 8); /* FIXME follow the original */ - return TRUE; /* Should return false if a single line richedit control */ + return TRUE; } case WM_CLEAR: {

1 0

Dylan Smith : richedit: Fixed scrollbar visiblility calculation after SetScrollInfo.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 5f51221d9c1b94040ef354e7f62a0ce9a838cdab URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f51221d9c1b94040ef354e7f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Feb 24 02:38:49 2009 -0500 richedit: Fixed scrollbar visiblility calculation after SetScrollInfo. The scrollbar visibility can be changed from SetScrollRange or SetScrollInfo, but the visiblity that is a result of these calls are not consistent with the calculation made by richedit controls to decide whether to show or hide the scrollbars. --- dlls/riched20/paint.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index f235082..620ac69 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1111,6 +1111,18 @@ void ME_ScrollRight(ME_TextEditor *editor, int cx) ME_HScrollAbs(editor, editor->horz_si.nPos + cx); } +/* Calculates the visiblity after a call to SetScrollRange or + * SetScrollInfo with SIF_RANGE. */ +static BOOL ME_PostSetScrollRangeVisibility(SCROLLINFO *si) +{ + if (si->fMask & SIF_DISABLENOSCROLL) + return TRUE; + + /* This must match the check in SetScrollInfo to determine whether + * to show or hide the scrollbars. */ + return si->nMin < si->nMax - max(si->nPage - 1, 0); +} + void ME_UpdateScrollBar(ME_TextEditor *editor) { /* Note that this is the only function that should ever call @@ -1158,15 +1170,14 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) ITextHost_TxSetScrollRange(editor->texthost, SB_HORZ, si.nMin, si.nMax, FALSE); ITextHost_TxSetScrollPos(editor->texthost, SB_HORZ, si.nPos, TRUE); } + /* SetScrollInfo or SetScrollRange change scrollbar visibility. */ + bScrollBarWasVisible = ME_PostSetScrollRangeVisibility(&si); } } if (si.fMask & SIF_DISABLENOSCROLL) { bScrollBarWillBeVisible = TRUE; } else if (!(editor->styleFlags & WS_HSCROLL)) { - /* SetScrollInfo or SetScrollRange may cause the scrollbar to be - * shown, so hide the scrollbar if necessary. */ - bScrollBarWasVisible = bScrollBarWillBeVisible; bScrollBarWillBeVisible = FALSE; } @@ -1205,15 +1216,14 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) ITextHost_TxSetScrollRange(editor->texthost, SB_VERT, si.nMin, si.nMax, FALSE); ITextHost_TxSetScrollPos(editor->texthost, SB_VERT, si.nPos, TRUE); } + /* SetScrollInfo or SetScrollRange change scrollbar visibility. */ + bScrollBarWasVisible = ME_PostSetScrollRangeVisibility(&si); } } if (si.fMask & SIF_DISABLENOSCROLL) { bScrollBarWillBeVisible = TRUE; } else if (!(editor->styleFlags & WS_VSCROLL)) { - /* SetScrollInfo or SetScrollRange may cause the scrollbar to be - * shown, so hide the scrollbar if necessary. */ - bScrollBarWasVisible = bScrollBarWillBeVisible; bScrollBarWillBeVisible = FALSE; }

1 0

Dylan Smith : richedit: Don' t show vertical scrollbar for single line controls.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: a0466e2c0eb25fc0c2c6db1fbcca00b42be1d941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0466e2c0eb25fc0c2c6db1fb… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Feb 24 02:37:21 2009 -0500 richedit: Don't show vertical scrollbar for single line controls. The vertical scrollbar is not shown when the ES_MULTILINE style isn't used, unless ES_DISBALENOSCROLL is also used. --- dlls/riched20/paint.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 35ca097..f235082 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1071,7 +1071,8 @@ void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) bScrollBarIsVisible = (winStyle & WS_VSCROLL) != 0; bScrollBarWillBeVisible = (editor->nTotalLength > editor->sizeWindow.cy - && (editor->styleFlags & WS_VSCROLL)) + && (editor->styleFlags & WS_VSCROLL) + && (editor->styleFlags & ES_MULTILINE)) || (editor->styleFlags & ES_DISABLENOSCROLL); if (bScrollBarIsVisible != bScrollBarWillBeVisible) ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, @@ -1174,7 +1175,8 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) /* Update vertical scrollbar */ bScrollBarWasVisible = editor->vert_si.nMax > editor->vert_si.nPage; - bScrollBarWillBeVisible = editor->nTotalLength > editor->sizeWindow.cy; + bScrollBarWillBeVisible = editor->nTotalLength > editor->sizeWindow.cy && + (editor->styleFlags & ES_MULTILINE); if (editor->vert_si.nPos && !bScrollBarWillBeVisible) {

1 0

Dylan Smith : richedit: Added missing initialization of nAvailWidth for ME_TextEditor.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: b9b9835f9368c83e15451e04c8e0781012ac4a2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b9835f9368c83e15451e04c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Feb 24 02:37:03 2009 -0500 richedit: Added missing initialization of nAvailWidth for ME_TextEditor. --- dlls/riched20/editor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2a053d7..e73679e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2635,6 +2635,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->nParagraphs = 1; ed->nLastSelStart = ed->nLastSelEnd = 0; ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); + ed->nAvailWidth = 0; /* wrap to client area */ ed->bWordWrap = (props & TXTBIT_WORDWRAP) != 0; ed->bHideSelection = FALSE; ed->pfnWordBreak = NULL;

1 0

Paul Bryan Roberts : makedep: Let umask decide mode for makefiles.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 3e50aaf201a1d60cc551cb43c14cb4ba4e75e93c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e50aaf201a1d60cc551cb43c… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Sun Feb 22 19:39:52 2009 +0000 makedep: Let umask decide mode for makefiles. --- tools/makedep.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 7941ea0..4194073 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -878,7 +878,7 @@ static FILE *create_temp_file( char **tmp_name ) for (i = 0; i < 100; i++) { sprintf( name, "%s.tmp%08x", OutputFileName, id ); - if ((fd = open( name, O_RDWR | O_CREAT | O_EXCL, 0600 )) != -1) + if ((fd = open( name, O_RDWR | O_CREAT | O_EXCL, 0666 )) != -1) { ret = fdopen( fd, "w" ); break;

1 0

Ken Thomases : dsound: Consolidate some duplicate code.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: b6fcb2043313e46253bd2f95598a052808cd7088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6fcb2043313e46253bd2f955… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 23 17:34:03 2009 -0600 dsound: Consolidate some duplicate code. --- dlls/dsound/buffer.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index abff0c9..688ad71 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -380,17 +380,9 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(LPDIRECTSOUNDBUFFER8 iface) DirectSoundDevice_RemoveBuffer(This->device, This); RtlDeleteResource(&This->lock); - if (This->hwbuf) { + if (This->hwbuf) IDsDriverBuffer_Release(This->hwbuf); - if (This->device->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY) { - This->buffer->ref--; - list_remove(&This->entry); - if (This->buffer->ref==0) { - HeapFree(GetProcessHeap(),0,This->buffer->memory); - HeapFree(GetProcessHeap(),0,This->buffer); - } - } - } else { + if (!This->hwbuf || (This->device->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY)) { This->buffer->ref--; list_remove(&This->entry); if (This->buffer->ref==0) {

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
97
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2009