September 2008 - Wine-commits

Mikołaj Zalewski : shell32: autocomplete: Make SetOptions handle setting the ACO_AUTOSUGGEST after Init, fix ACO_AUTOSUGGEST|ACO_AUTOAPPEND case.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: ba6ddf28b468338b659d6b5c8aa8139315b87213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba6ddf28b468338b659d6b5c8… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Sep 17 21:42:41 2008 +0200 shell32: autocomplete: Make SetOptions handle setting the ACO_AUTOSUGGEST after Init, fix ACO_AUTOSUGGEST|ACO_AUTOAPPEND case. --- dlls/shell32/autocomplete.c | 50 +++++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 1871cbb..8901e8f 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -94,6 +94,25 @@ static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDr static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +static void create_listbox(IAutoCompleteImpl *This) +{ + HWND hwndParent; + + hwndParent = GetParent(This->hwndEdit); + + /* FIXME : The listbox should be resizable with the mouse. WS_THICKFRAME looks ugly */ + This->hwndListBox = CreateWindowExW(0, WC_LISTBOXW, NULL, + WS_BORDER | WS_CHILD | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + hwndParent, NULL, + (HINSTANCE)GetWindowLongPtrW( hwndParent, GWLP_HINSTANCE ), NULL); + + if (This->hwndListBox) { + This->wpOrigLBoxProc = (WNDPROC) SetWindowLongPtrW( This->hwndListBox, GWLP_WNDPROC, (LONG_PTR) ACLBoxSubclassProc); + SetWindowLongPtrW( This->hwndListBox, GWLP_USERDATA, (LONG_PTR)This); + } +} + /************************************************************************** * IAutoComplete_Constructor */ @@ -230,7 +249,6 @@ static HRESULT WINAPI IAutoComplete2_fnInit( LPCOLESTR pwszQuickComplete) { IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; - static const WCHAR lbName[] = {'L','i','s','t','B','o','x',0}; TRACE("(%p)->(0x%08lx, %p, %s, %s)\n", This, (long)hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete)); @@ -253,23 +271,8 @@ static HRESULT WINAPI IAutoComplete2_fnInit( This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW( hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); SetWindowLongPtrW( hwndEdit, GWLP_USERDATA, (LONG_PTR)This); - if (This->options & ACO_AUTOSUGGEST) { - HWND hwndParent; - - hwndParent = GetParent(This->hwndEdit); - - /* FIXME : The listbox should be resizable with the mouse. WS_THICKFRAME looks ugly */ - This->hwndListBox = CreateWindowExW(0, lbName, NULL, - WS_BORDER | WS_CHILD | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - hwndParent, NULL, - (HINSTANCE)GetWindowLongPtrW( hwndParent, GWLP_HINSTANCE ), NULL); - - if (This->hwndListBox) { - This->wpOrigLBoxProc = (WNDPROC) SetWindowLongPtrW( This->hwndListBox, GWLP_WNDPROC, (LONG_PTR) ACLBoxSubclassProc); - SetWindowLongPtrW( This->hwndListBox, GWLP_USERDATA, (LONG_PTR)This); - } - } + if (This->options & ACO_AUTOSUGGEST) + create_listbox(This); if (pwzsRegKeyPath) { WCHAR *key; @@ -343,6 +346,9 @@ static HRESULT WINAPI IAutoComplete2_fnSetOptions( This->options = dwFlag; + if ((This->options & ACO_AUTOSUGGEST) && This->hwndEdit && !This->hwndListBox) + create_listbox(This); + return hr; } @@ -562,17 +568,19 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, break; if (strstrW(strs, hwndText) == strs) { - if (This->options & ACO_AUTOAPPEND) { + if (!filled && (This->options & ACO_AUTOAPPEND)) { SetWindowTextW(hwnd, strs); SendMessageW(hwnd, EM_SETSEL, lstrlenW(hwndText), lstrlenW(strs)); - break; + if (!(This->options & ACO_AUTOSUGGEST)) + break; } if (This->options & ACO_AUTOSUGGEST) { SendMessageW(This->hwndListBox, LB_ADDSTRING, 0, (LPARAM)strs); - filled = TRUE; cpt++; } + + filled = TRUE; } }

1 0

Mikołaj Zalewski : shell32: autocomplete: Implement GetDropDownStatus.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: d9190052a2ff07793e8d2e8676ad0df8cc1da24f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9190052a2ff07793e8d2e867… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Sep 17 21:42:46 2008 +0200 shell32: autocomplete: Implement GetDropDownStatus. --- dlls/shell32/autocomplete.c | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 8901e8f..da11b25 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -361,15 +361,36 @@ static HRESULT WINAPI IAutoCompleteDropDown_fnGetDropDownStatus( LPWSTR *ppwszString) { IAutoCompleteImpl *This = impl_from_IAutoCompleteDropDown(iface); + BOOL dropped; - FIXME("(%p) -> (%p, %p): stub\n", This, pdwFlags, ppwszString); + TRACE("(%p) -> (%p, %p)\n", This, pdwFlags, ppwszString); + + dropped = IsWindowVisible(This->hwndListBox); if (pdwFlags) - *pdwFlags = 0; - if (ppwszString) - *ppwszString = NULL; + *pdwFlags = (dropped ? ACDD_VISIBLE : 0); + + if (ppwszString) { + if (dropped) { + int sel; + + sel = SendMessageW(This->hwndListBox, LB_GETCURSEL, 0, 0); + if (sel >= 0) + { + DWORD len; + + len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, 0); + *ppwszString = CoTaskMemAlloc((len+1)*sizeof(WCHAR)); + SendMessageW(This->hwndListBox, LB_GETTEXT, sel, (LPARAM)*ppwszString); + } + else + *ppwszString = NULL; + } + else + *ppwszString = NULL; + } - return E_NOTIMPL; + return S_OK; } /**************************************************************************

1 0

Mikołaj Zalewski : shell32: autocomplete: Fix a logical AND to a bitwise AND.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: db74fed6d12fdda5a65f5f6a6a7e7f997b8a4798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db74fed6d12fdda5a65f5f6a6… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Sep 17 21:42:38 2008 +0200 shell32: autocomplete: Fix a logical AND to a bitwise AND. --- dlls/shell32/autocomplete.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 2437793..1871cbb 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -450,7 +450,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, ShowWindow(This->hwndListBox, SW_HIDE); break; case WM_KILLFOCUS: - if ((This->options && ACO_AUTOSUGGEST) && + if ((This->options & ACO_AUTOSUGGEST) && ((HWND)wParam != This->hwndListBox)) { ShowWindow(This->hwndListBox, SW_HIDE);

1 0

Mikołaj Zalewski : shell32: autocomplete: Add stub IAutoCompleteDropDown interface.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: a4fd5a1f40b2dc136ab009b029a97fb7a1871f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4fd5a1f40b2dc136ab009b02… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Sep 17 21:42:36 2008 +0200 shell32: autocomplete: Add stub IAutoCompleteDropDown interface. --- dlls/shell32/autocomplete.c | 86 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 83 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index a026e8b..2437793 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -62,6 +62,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct { const IAutoComplete2Vtbl *lpVtbl; + const IAutoCompleteDropDownVtbl *lpDropDownVtbl; LONG ref; BOOL enabled; HWND hwndEdit; @@ -75,13 +76,20 @@ typedef struct } IAutoCompleteImpl; static const IAutoComplete2Vtbl acvt; +static const IAutoCompleteDropDownVtbl acdropdownvt; /* converts This to an interface pointer */ #define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) -#define _IAutoComplete2_(This) (IAutoComplete2*)&(This->lpvtbl) +#define _IAutoComplete2_(This) (IAutoComplete2*)&(This->lpVtbl) +#define _IAutoCompleteDropDown_(This) (IAutoCompleteDropDown*)&(This->lpDropDownVtbl) + +static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDropDown *iface) +{ + return (IAutoCompleteImpl *)((char *)iface - FIELD_OFFSET(IAutoCompleteImpl, lpDropDownVtbl)); +} static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -102,6 +110,7 @@ HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVO lpac->ref = 1; lpac->lpVtbl = &acvt; + lpac->lpDropDownVtbl = &acdropdownvt; lpac->enabled = TRUE; lpac->enumstr = NULL; lpac->options = ACO_AUTOAPPEND; @@ -139,6 +148,10 @@ static HRESULT WINAPI IAutoComplete2_fnQueryInterface( { *ppvObj = (IAutoComplete2*)This; } + else if (IsEqualIID(riid, &IID_IAutoCompleteDropDown)) + { + *ppvObj = _IAutoCompleteDropDown_(This); + } if (*ppvObj) { @@ -146,7 +159,7 @@ static HRESULT WINAPI IAutoComplete2_fnQueryInterface( TRACE("-- Interface: (%p)->(%p)\n", ppvObj, *ppvObj); return S_OK; } - TRACE("-- Interface: E_NOINTERFACE\n"); + WARN("unsupported interface: %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -334,7 +347,42 @@ static HRESULT WINAPI IAutoComplete2_fnSetOptions( } /************************************************************************** - * IAutoComplete2_fnVTable + * IAutoCompleteDropDown_fnGetDropDownStatus + */ +static HRESULT WINAPI IAutoCompleteDropDown_fnGetDropDownStatus( + IAutoCompleteDropDown *iface, + DWORD *pdwFlags, + LPWSTR *ppwszString) +{ + IAutoCompleteImpl *This = impl_from_IAutoCompleteDropDown(iface); + + FIXME("(%p) -> (%p, %p): stub\n", This, pdwFlags, ppwszString); + + if (pdwFlags) + *pdwFlags = 0; + if (ppwszString) + *ppwszString = NULL; + + return E_NOTIMPL; +} + +/************************************************************************** + * IAutoCompleteDropDown_fnResetEnumarator + */ +static HRESULT WINAPI IAutoCompleteDropDown_fnResetEnumerator( + IAutoCompleteDropDown *iface) +{ + IAutoCompleteImpl *This = impl_from_IAutoCompleteDropDown(iface); + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + + + +/************************************************************************** + * IAutoComplete2 VTable */ static const IAutoComplete2Vtbl acvt = { @@ -348,6 +396,38 @@ static const IAutoComplete2Vtbl acvt = IAutoComplete2_fnGetOptions, }; + +static HRESULT WINAPI IAutoCompleteDropDown_fnQueryInterface(IAutoCompleteDropDown *iface, + REFIID riid, LPVOID *ppvObj) +{ + IAutoCompleteImpl *This = impl_from_IAutoCompleteDropDown(iface); + return IAutoComplete2_fnQueryInterface(_IAutoComplete2_(This), riid, ppvObj); +} + +static ULONG WINAPI IAutoCompleteDropDown_fnAddRef(IAutoCompleteDropDown *iface) +{ + IAutoCompleteImpl *This = impl_from_IAutoCompleteDropDown(iface); + return IAutoComplete2_fnAddRef(_IAutoComplete2_(This)); +} + +static ULONG WINAPI IAutoCompleteDropDown_fnRelease(IAutoCompleteDropDown *iface) +{ + IAutoCompleteImpl *This = impl_from_IAutoCompleteDropDown(iface); + return IAutoComplete2_fnRelease(_IAutoComplete2_(This)); +} + +/************************************************************************** + * IAutoCompleteDropDown VTable + */ +static const IAutoCompleteDropDownVtbl acdropdownvt = +{ + IAutoCompleteDropDown_fnQueryInterface, + IAutoCompleteDropDown_fnAddRef, + IAutoCompleteDropDown_fnRelease, + IAutoCompleteDropDown_fnGetDropDownStatus, + IAutoCompleteDropDown_fnResetEnumerator, +}; + /* Window procedure for autocompletion */

1 0

Mikołaj Zalewski : include: Add IAutoCompleteDropDown declaration.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: edd3f2b34b56d0ff0e2b9c9865eea445fa3d16aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=edd3f2b34b56d0ff0e2b9c986… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Sep 17 20:52:41 2008 +0200 include: Add IAutoCompleteDropDown declaration. --- include/shobjidl.idl | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 7a4bd88..95e532c 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1377,3 +1377,22 @@ interface ITaskbarList : IUnknown HRESULT SetActiveAlt( [in] HWND hwnd); } + +/***************************************************************************** + * IAutoCompleteDropDown interface + */ +[ + object, + uuid(3CD141F4-3C6A-11d2-BCAA-00C04FD929DB), + pointer_default(unique) +] +interface IAutoCompleteDropDown : IUnknown +{ +cpp_quote("#define ACDD_VISIBLE 0x0001") + + HRESULT GetDropDownStatus( + [out] DWORD *pdwFlags, + [out, string] LPWSTR *ppwszString); + + HRESULT ResetEnumerator(); +}

1 0

Huw Davies : include: Fill in IMimeEnumProperties.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: f91f9c8bf9e3618315df322b67dffb3b425a7d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91f9c8bf9e3618315df322b6… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 17 14:35:26 2008 +0100 include: Fill in IMimeEnumProperties. --- include/mimeole.idl | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index b94163d..487b9fc 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -1074,6 +1074,8 @@ cpp_quote("#endif") ] interface IMimeEnumProperties : IUnknown { + typedef [unique] IMimeEnumProperties *LPMIMEENUMPROPERTIES; + typedef struct tagENUMPROPERTY { LPSTR pszName; @@ -1081,7 +1083,22 @@ cpp_quote("#endif") DWORD dwPropId; } ENUMPROPERTY, *LPENUMPROPERTY; - /* FIXME: fill this in */ + HRESULT Next( + [in] ULONG cFetch, + [in, out] LPENUMPROPERTY prgProp, + [out] ULONG *pcFetched); + + HRESULT Skip( + [in] ULONG cItems); + + HRESULT Reset(void); + + HRESULT Clone( + [out] IMimeEnumProperties **ppEnum); + + HRESULT Count( + [out] ULONG *pcItems); + } [

1 0

Huw Davies : inetcomm: Make variable static to fix crash on process detach.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: 2097387e04ab2a86c3289b9bead0abea5fca949d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2097387e04ab2a86c3289b9be… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 18 09:35:07 2008 +0100 inetcomm: Make variable static to fix crash on process detach. --- dlls/inetcomm/inetcomm_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/inetcomm_main.c b/dlls/inetcomm/inetcomm_main.c index 579b05f..1b346bf 100644 --- a/dlls/inetcomm/inetcomm_main.c +++ b/dlls/inetcomm/inetcomm_main.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - IMimeInternational *international; + static IMimeInternational *international; TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);

1 0

Jeff Zaroyko : kernel32: Modify DeleteFileW to fail on directories.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: 22a33168c9ff394508eb729848c238feeacb60b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22a33168c9ff394508eb72984… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Thu Sep 18 14:59:08 2008 +1000 kernel32: Modify DeleteFileW to fail on directories. --- dlls/kernel32/file.c | 10 +++++++++- dlls/kernel32/tests/file.c | 6 +++--- dlls/msvcrt/tests/file.c | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index a8b6d30..adbc69d 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -3,6 +3,7 @@ * * Copyright 1993 John Burton * Copyright 1996, 2004 Alexandre Julliard + * Copyright 2008 Jeff Zaroyko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1528,6 +1529,8 @@ BOOL WINAPI DeleteFileW( LPCWSTR path ) UNICODE_STRING nameW; OBJECT_ATTRIBUTES attr; NTSTATUS status; + HANDLE hFile; + IO_STATUS_BLOCK io; TRACE("%s\n", debugstr_w(path) ); @@ -1544,7 +1547,12 @@ BOOL WINAPI DeleteFileW( LPCWSTR path ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtDeleteFile(&attr); + status = NtCreateFile(&hFile, GENERIC_READ | GENERIC_WRITE | DELETE, + &attr, &io, NULL, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0); + if (status == STATUS_SUCCESS) status = NtClose(hFile); + RtlFreeUnicodeString( &nameW ); if (status) { diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 06f4caa..1686a4a 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -871,9 +871,9 @@ static void test_DeleteFileW( void ) ret = CreateDirectoryW(pathW, NULL); ok(ret == TRUE, "couldn't create directory deletefile\n"); ret = DeleteFileW(pathW); - todo_wine ok(ret == FALSE, "DeleteFile should fail for empty directories\n"); + ok(ret == FALSE, "DeleteFile should fail for empty directories\n"); ret = RemoveDirectoryW(pathW); - todo_wine ok(ret == TRUE, "expected to remove directory deletefile\n"); + ok(ret == TRUE, "expected to remove directory deletefile\n"); /* test DeleteFile on non-empty directory */ ret = CreateDirectoryW(pathW, NULL); @@ -881,7 +881,7 @@ static void test_DeleteFileW( void ) ret = CreateDirectoryW(pathsubW, NULL); ok(ret == TRUE, "couldn't create directory deletefile\\sub\n"); ret = DeleteFileW(pathW); - todo_wine ok(ret == FALSE, "DeleteFile should fail for non-empty directories\n"); + ok(ret == FALSE, "DeleteFile should fail for non-empty directories\n"); ret = RemoveDirectoryW(pathsubW); ok(ret == TRUE, "expected to remove directory deletefile\\sub\n"); ret = RemoveDirectoryW(pathW); diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 97f9646..36fcc80 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1093,7 +1093,7 @@ static void test_unlink(void) ok(file != NULL, "unable to create test file\n"); if(file) fclose(file); - todo_wine ok(_unlink("test_unlink") != 0, "unlinking a non-empty directory must fail\n"); + ok(_unlink("test_unlink") != 0, "unlinking a non-empty directory must fail\n"); unlink("test_unlink\\empty"); rmdir("test_unlink"); }

1 0

Dylan Smith : richedit: Avoid unconditionally rewrapping text on scroll.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: 87292d81ee9695341efbcc6260c7d0564d75df5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87292d81ee9695341efbcc626… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Sep 18 01:17:45 2008 -0400 richedit: Avoid unconditionally rewrapping text on scroll. --- dlls/riched20/paint.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 2ea9689..fb50a89 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1046,6 +1046,9 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type) { SCROLLINFO si; int nOrigPos, nNewPos, nActualScroll; + HWND hWnd; + LONG winStyle; + BOOL bScrollBarIsVisible, bScrollBarWillBeVisible; nOrigPos = ME_GetYScrollPos(editor); @@ -1083,7 +1086,15 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type) ME_Repaint(editor); } - editor->vert_si.nMax = 0; + hWnd = editor->hWnd; + winStyle = GetWindowLongW(hWnd, GWL_STYLE); + bScrollBarIsVisible = (winStyle & WS_VSCROLL) != 0; + bScrollBarWillBeVisible = (editor->nHeight > editor->sizeWindow.cy) + || (winStyle & ES_DISABLENOSCROLL); + if (bScrollBarIsVisible != bScrollBarWillBeVisible) + { + ShowScrollBar(hWnd, SB_VERT, bScrollBarWillBeVisible); + } ME_UpdateScrollBar(editor); }

1 0

Dylan Smith : richedit: Handle deletion at the end of text properly.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: da058cbf6715aa96ef400fa7b59d9c5349e740ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=da058cbf6715aa96ef400fa7b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Sep 17 22:02:08 2008 -0400 richedit: Handle deletion at the end of text properly. --- dlls/riched20/paint.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 9cfc21e..2ea9689 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1072,6 +1072,7 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type) } nNewPos = SetScrollInfo(editor->hWnd, SB_VERT, &si, editor->bRedraw); + editor->vert_si.nPos = nNewPos; nActualScroll = nOrigPos - nNewPos; if (editor->bRedraw) { @@ -1105,7 +1106,7 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type) bScrollBarWasVisible = ME_GetYScrollVisible(editor); bScrollBarWillBeVisible = editor->nHeight > editor->sizeWindow.cy; - si.fMask = SIF_PAGE | SIF_RANGE; + si.fMask = SIF_PAGE | SIF_RANGE | SIF_POS; if (GetWindowLongW(hWnd, GWL_STYLE) & ES_DISABLENOSCROLL) si.fMask |= SIF_DISABLENOSCROLL; if ((si.fMask & SIF_DISABLENOSCROLL)) @@ -1122,7 +1123,7 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type) si.nMin = 0; si.nMax = editor->nTotalLength; - + si.nPos = editor->vert_si.nPos; si.nPage = editor->sizeWindow.cy; if (!(si.nMin == editor->vert_si.nMin && si.nMax == editor->vert_si.nMax && si.nPage == editor->vert_si.nPage)) @@ -1138,17 +1139,18 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type) else { if (bScrollBarWasVisible && !(si.fMask & SIF_DISABLENOSCROLL)) + { + SetScrollInfo(hWnd, SB_VERT, &si, TRUE); ShowScrollBar(hWnd, SB_VERT, FALSE); + ME_ScrollAbs(editor, 0); + } } } } int ME_GetYScrollPos(ME_TextEditor *editor) { - SCROLLINFO si; - si.cbSize = sizeof(si); - si.fMask = SIF_POS; - return GetScrollInfo(editor->hWnd, SB_VERT, &si) ? si.nPos : 0; + return editor->vert_si.nPos; } BOOL ME_GetYScrollVisible(ME_TextEditor *editor)

1 0