July 2010 - Wine-commits - list.winehq.org

Mike Kaplinskiy : server: Move signaling FD_* events to a separate function .
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: 75c7c63886d61574566a878e8458dc453260448a URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c7c63886d61574566a878e8… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Jul 17 22:06:49 2010 -0400 server: Move signaling FD_* events to a separate function. --- server/sock.c | 112 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 56 insertions(+), 56 deletions(-) diff --git a/server/sock.c b/server/sock.c index 9cd0fc2..5d48c2d 100644 --- a/server/sock.c +++ b/server/sock.c @@ -312,10 +312,60 @@ static void sock_dispatch_asyncs( struct sock *sock, int event ) } } +static void sock_dispatch_events( struct sock *sock, int prevstate, int event, int error ) +{ + if (prevstate & FD_CONNECT) + { + sock->pmask |= FD_CONNECT; + sock->hmask |= FD_CONNECT; + sock->errors[FD_CONNECT_BIT] = error; + goto end; + } + if (prevstate & FD_WINE_LISTENING) + { + sock->pmask |= FD_ACCEPT; + sock->hmask |= FD_ACCEPT; + sock->errors[FD_ACCEPT_BIT] = error; + goto end; + } + + if (event & POLLIN) + { + sock->pmask |= FD_READ; + sock->hmask |= FD_READ; + sock->errors[FD_READ_BIT] = 0; + } + + if (event & POLLOUT) + { + sock->pmask |= FD_WRITE; + sock->hmask |= FD_WRITE; + sock->errors[FD_WRITE_BIT] = 0; + } + + if (event & POLLPRI) + { + sock->pmask |= FD_OOB; + sock->hmask |= FD_OOB; + sock->errors[FD_OOB_BIT] = 0; + } + + if (event & (POLLERR|POLLHUP)) + { + sock->pmask |= FD_CLOSE; + sock->hmask |= FD_CLOSE; + sock->errors[FD_CLOSE_BIT] = error; + } +end: + sock_wake_up( sock ); +} + static void sock_poll_event( struct fd *fd, int event ) { struct sock *sock = get_fd_user( fd ); int hangup_seen = 0; + int prevstate = sock->state; + int error = 0; assert( sock->obj.ops == &sock_ops ); if (debug_level) @@ -332,38 +382,19 @@ static void sock_poll_event( struct fd *fd, int event ) /* we got connected */ sock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE; sock->state &= ~FD_CONNECT; - sock->pmask |= FD_CONNECT; - sock->errors[FD_CONNECT_BIT] = 0; - if (debug_level) - fprintf(stderr, "socket %p connection success\n", sock); } else if (event & (POLLERR|POLLHUP)) { /* we didn't get connected? */ sock->state &= ~FD_CONNECT; - sock->pmask |= FD_CONNECT; - sock->errors[FD_CONNECT_BIT] = sock_error( fd ); - if (debug_level) - fprintf(stderr, "socket %p connection failure\n", sock); + error = sock_error( fd ); } } else if (sock->state & FD_WINE_LISTENING) { /* listening */ - if (event & POLLIN) - { - /* incoming connection */ - sock->pmask |= FD_ACCEPT; - sock->errors[FD_ACCEPT_BIT] = 0; - sock->hmask |= FD_ACCEPT; - } - else if (event & (POLLERR|POLLHUP)) - { - /* failed incoming connection? */ - sock->pmask |= FD_ACCEPT; - sock->errors[FD_ACCEPT_BIT] = sock_error( fd ); - sock->hmask |= FD_ACCEPT; - } + if (event & (POLLERR|POLLHUP)) + error = sock_error( fd ); } else { @@ -395,44 +426,15 @@ static void sock_poll_event( struct fd *fd, int event ) } } - if ( event & POLLIN ) - { - sock->pmask |= FD_READ; - sock->hmask |= FD_READ; - sock->errors[FD_READ_BIT] = 0; - if (debug_level) - fprintf(stderr, "socket %p is readable\n", sock ); - } - - if (event & POLLOUT) - { - sock->pmask |= FD_WRITE; - sock->hmask |= FD_WRITE; - sock->errors[FD_WRITE_BIT] = 0; - if (debug_level) - fprintf(stderr, "socket %p is writable\n", sock); - } - if (event & POLLPRI) - { - sock->pmask |= FD_OOB; - sock->hmask |= FD_OOB; - sock->errors[FD_OOB_BIT] = 0; - if (debug_level) - fprintf(stderr, "socket %p got OOB data\n", sock); - } - if ( (hangup_seen || event & (POLLHUP|POLLERR)) && (sock->state & (FD_READ|FD_WRITE)) ) { - sock->errors[FD_CLOSE_BIT] = sock_error( fd ); + error = sock_error( fd ); if ( (event & POLLERR) || ( sock_shutdown_type == SOCK_SHUTDOWN_EOF && (event & POLLHUP) )) sock->state &= ~FD_WRITE; sock->state &= ~FD_READ; - sock->pmask |= FD_CLOSE; - sock->hmask |= FD_CLOSE; if (debug_level) - fprintf(stderr, "socket %p aborted by error %d, event: %x - removing from select loop\n", - sock, sock->errors[FD_CLOSE_BIT], event); + fprintf(stderr, "socket %p aborted by error %d, event: %x\n", sock, error, event); } if (hangup_seen) @@ -440,9 +442,7 @@ static void sock_poll_event( struct fd *fd, int event ) } sock_dispatch_asyncs( sock, event ); - - /* wake up anyone waiting for whatever just happened */ - sock_wake_up( sock ); + sock_dispatch_events( sock, prevstate, event, error ); /* if anyone is stupid enough to wait on the socket object itself, * maybe we should wake them up too, just in case? */

1 0

Mike Kaplinskiy : server: Propagate error from recv.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: 394a142237795d0823dd73677026be0b0ee502b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=394a142237795d0823dd73677… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Jul 17 22:06:53 2010 -0400 server: Propagate error from recv. --- server/sock.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 5d48c2d..87628da 100644 --- a/server/sock.c +++ b/server/sock.c @@ -419,16 +419,17 @@ static void sock_poll_event( struct fd *fd, int event ) call and the invocation of this routine */ if ( errno != EAGAIN ) { + error = errno; + event |= POLLERR; if ( debug_level ) fprintf( stderr, "recv error on socket %p: %d\n", sock, errno ); - event |= POLLERR; } } } if ( (hangup_seen || event & (POLLHUP|POLLERR)) && (sock->state & (FD_READ|FD_WRITE)) ) { - error = sock_error( fd ); + error = error ? error : sock_error( fd ); if ( (event & POLLERR) || ( sock_shutdown_type == SOCK_SHUTDOWN_EOF && (event & POLLHUP) )) sock->state &= ~FD_WRITE; sock->state &= ~FD_READ;

1 0

Mike Kaplinskiy : server: In case of hangup/error, wake up all asyncs that can no longer be completed.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: be230adbb7400d84fcc5312a0463eee7480709e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be230adbb7400d84fcc5312a0… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Jul 17 22:06:55 2010 -0400 server: In case of hangup/error, wake up all asyncs that can no longer be completed. --- server/sock.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 87628da..568f818 100644 --- a/server/sock.c +++ b/server/sock.c @@ -299,16 +299,23 @@ static void sock_dispatch_asyncs( struct sock *sock, int event ) { if ( sock->flags & WSA_FLAG_OVERLAPPED ) { - if ( event & (POLLIN|POLLPRI|POLLERR|POLLHUP) && async_waiting( sock->read_q )) + if ( event & (POLLIN|POLLPRI) && async_waiting( sock->read_q ) ) { if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock ); async_wake_up( sock->read_q, STATUS_ALERTED ); } - if ( event & (POLLOUT|POLLERR|POLLHUP) && async_waiting( sock->write_q )) + if ( event & POLLOUT && async_waiting( sock->write_q ) ) { if (debug_level) fprintf( stderr, "activating write queue for socket %p\n", sock ); async_wake_up( sock->write_q, STATUS_ALERTED ); } + if ( event & (POLLERR|POLLHUP) ) + { + if ( !(sock->state & FD_READ) ) + async_wake_up( sock->read_q, STATUS_SUCCESS ); + if ( !(sock->state & FD_WRITE) ) + async_wake_up( sock->write_q, STATUS_SUCCESS ); + } } }

1 0

Mike Kaplinskiy : server: Forward the correct error to asyncs.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: 8d9fbe59b303e8da9062f9de12a20f5dafc07a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9fbe59b303e8da9062f9de1… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Jul 17 22:06:58 2010 -0400 server: Forward the correct error to asyncs. --- server/sock.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/server/sock.c b/server/sock.c index 568f818..e5681b0 100644 --- a/server/sock.c +++ b/server/sock.c @@ -295,7 +295,7 @@ static inline int sock_error( struct fd *fd ) return optval; } -static void sock_dispatch_asyncs( struct sock *sock, int event ) +static void sock_dispatch_asyncs( struct sock *sock, int event, int error ) { if ( sock->flags & WSA_FLAG_OVERLAPPED ) { @@ -311,10 +311,12 @@ static void sock_dispatch_asyncs( struct sock *sock, int event ) } if ( event & (POLLERR|POLLHUP) ) { + int status = sock_get_ntstatus( error ); + if ( !(sock->state & FD_READ) ) - async_wake_up( sock->read_q, STATUS_SUCCESS ); + async_wake_up( sock->read_q, status ); if ( !(sock->state & FD_WRITE) ) - async_wake_up( sock->write_q, STATUS_SUCCESS ); + async_wake_up( sock->write_q, status ); } } } @@ -449,7 +451,7 @@ static void sock_poll_event( struct fd *fd, int event ) event |= POLLHUP; } - sock_dispatch_asyncs( sock, event ); + sock_dispatch_asyncs( sock, event, error ); sock_dispatch_events( sock, prevstate, event, error ); /* if anyone is stupid enough to wait on the socket object itself,

1 0

David Hedberg : shell32/tests: Try harder to subclass the listview.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: 1d658d4bb78d2476c467da420088a9ffc74767f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d658d4bb78d2476c467da420… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Jul 18 14:51:48 2010 +0200 shell32/tests: Try harder to subclass the listview. --- dlls/shell32/tests/shlview.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index e3e0ef2..e86518d 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -78,6 +78,16 @@ static HWND subclass_listview(HWND hwnd) /* listview is a first child */ listview = FindWindowExA(hwnd, NULL, WC_LISTVIEWA, NULL); + if(!listview) + { + /* .. except for some versions of Windows XP, where things + are slightly more complicated. */ + HWND hwnd_tmp; + hwnd_tmp = FindWindowExA(hwnd, NULL, "DUIViewWndClassName", NULL); + hwnd_tmp = FindWindowExA(hwnd_tmp, NULL, "DirectUIHWND", NULL); + hwnd_tmp = FindWindowExA(hwnd_tmp, NULL, "CtrlNotifySink", NULL); + listview = FindWindowExA(hwnd_tmp, NULL, WC_LISTVIEWA, NULL); + } oldproc = (WNDPROC)SetWindowLongPtrA(listview, GWLP_WNDPROC, (LONG_PTR)listview_subclass_proc);

1 0

David Hedberg : shell32: Implement IPersistFolder2 for the desktop folder.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: fb88e06e79d9f5da72f8985c8a5db096d7aea5d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb88e06e79d9f5da72f8985c8… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Jul 18 14:34:56 2010 +0200 shell32: Implement IPersistFolder2 for the desktop folder. --- dlls/shell32/shfldr_desktop.c | 60 ++++++++++++++++++++++++++------------- dlls/shell32/tests/shlfolder.c | 46 ++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index e3798a6..e4a612a 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -65,7 +65,7 @@ extern HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisp typedef struct { const IShellFolder2Vtbl *lpVtbl; - const IPersistVtbl *lpVtblIPersist; + const IPersistFolder2Vtbl *lpVtblPF2; LONG ref; /* both paths are parsible from the desktop */ @@ -76,9 +76,9 @@ typedef struct { BOOL fAcceptFmt; /* flag for pending Drop */ } IDesktopFolderImpl; -static inline IDesktopFolderImpl *impl_from_IPersist( IPersist *iface ) +static inline IDesktopFolderImpl *impl_from_IPersistFolder2( IPersistFolder2 *iface ) { - return (IDesktopFolderImpl *)((char*)iface - FIELD_OFFSET(IDesktopFolderImpl, lpVtblIPersist)); + return (IDesktopFolderImpl *)((char*)iface - FIELD_OFFSET(IDesktopFolderImpl, lpVtblPF2)); } static const shvheader desktop_header[] = { @@ -94,7 +94,6 @@ static const shvheader desktop_header[] = { /************************************************************************** * ISF_Desktop_fnQueryInterface * - * NOTES supports not IPersistFolder */ static HRESULT WINAPI ISF_Desktop_fnQueryInterface( IShellFolder2 * iface, REFIID riid, LPVOID * ppvObj) @@ -111,9 +110,11 @@ static HRESULT WINAPI ISF_Desktop_fnQueryInterface( { *ppvObj = This; } - else if (IsEqualIID (riid, &IID_IPersist)) + else if (IsEqualIID (riid, &IID_IPersist) || + IsEqualIID (riid, &IID_IPersistFolder) || + IsEqualIID (riid, &IID_IPersistFolder2)) { - *ppvObj = &This->lpVtblIPersist; + *ppvObj = &This->lpVtblPF2; } if (*ppvObj) @@ -877,37 +878,56 @@ static const IShellFolder2Vtbl vt_MCFldr_ShellFolder2 = /************************************************************************** * IPersist */ -static HRESULT WINAPI ISF_Desktop_IPersist_fnQueryInterface( - IPersist *iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI ISF_Desktop_IPersistFolder2_fnQueryInterface( + IPersistFolder2 *iface, REFIID riid, LPVOID *ppvObj) { - IDesktopFolderImpl *This = impl_from_IPersist( iface ); + IDesktopFolderImpl *This = impl_from_IPersistFolder2( iface ); return IShellFolder2_QueryInterface((IShellFolder2*)This, riid, ppvObj); } -static ULONG WINAPI ISF_Desktop_IPersist_fnAddRef(IPersist *iface) +static ULONG WINAPI ISF_Desktop_IPersistFolder2_fnAddRef( + IPersistFolder2 *iface) { - IDesktopFolderImpl *This = impl_from_IPersist( iface ); + IDesktopFolderImpl *This = impl_from_IPersistFolder2( iface ); return IShellFolder2_AddRef((IShellFolder2*)This); } -static ULONG WINAPI ISF_Desktop_IPersist_fnRelease(IPersist *iface) +static ULONG WINAPI ISF_Desktop_IPersistFolder2_fnRelease( + IPersistFolder2 *iface) { - IDesktopFolderImpl *This = impl_from_IPersist( iface ); + IDesktopFolderImpl *This = impl_from_IPersistFolder2( iface ); return IShellFolder2_Release((IShellFolder2*)This); } -static HRESULT WINAPI ISF_Desktop_IPersist_fnGetClassID(IPersist *iface, CLSID *clsid) +static HRESULT WINAPI ISF_Desktop_IPersistFolder2_fnGetClassID( + IPersistFolder2 *iface, CLSID *clsid) { *clsid = CLSID_ShellDesktop; return S_OK; } +static HRESULT WINAPI ISF_Desktop_IPersistFolder2_fnInitialize( + IPersistFolder2 *iface, LPCITEMIDLIST pidl) +{ + IDesktopFolderImpl *This = impl_from_IPersistFolder2( iface ); + FIXME ("(%p)->(%p) stub\n", This, pidl); + return E_NOTIMPL; +} +static HRESULT WINAPI ISF_Desktop_IPersistFolder2_fnGetCurFolder( + IPersistFolder2 *iface, LPITEMIDLIST *ppidl) +{ + IDesktopFolderImpl *This = impl_from_IPersistFolder2( iface ); + *ppidl = ILClone(This->pidlRoot); + return S_OK; +} -static const IPersistVtbl vt_IPersist = +static const IPersistFolder2Vtbl vt_IPersistFolder2 = { - ISF_Desktop_IPersist_fnQueryInterface, - ISF_Desktop_IPersist_fnAddRef, - ISF_Desktop_IPersist_fnRelease, - ISF_Desktop_IPersist_fnGetClassID + ISF_Desktop_IPersistFolder2_fnQueryInterface, + ISF_Desktop_IPersistFolder2_fnAddRef, + ISF_Desktop_IPersistFolder2_fnRelease, + ISF_Desktop_IPersistFolder2_fnGetClassID, + ISF_Desktop_IPersistFolder2_fnInitialize, + ISF_Desktop_IPersistFolder2_fnGetCurFolder }; /************************************************************************** @@ -939,7 +959,7 @@ HRESULT WINAPI ISF_Desktop_Constructor ( sf->ref = 1; sf->lpVtbl = &vt_MCFldr_ShellFolder2; - sf->lpVtblIPersist = &vt_IPersist; + sf->lpVtblPF2 = &vt_IPersistFolder2; sf->pidlRoot = _ILCreateDesktop(); /* my qualified pidl */ sf->sPathTarget = SHAlloc( (lstrlenW(szMyPath) + 1)*sizeof(WCHAR) ); lstrcpyW( sf->sPathTarget, szMyPath ); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 2909818..210631d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2014,6 +2014,26 @@ static void test_SHCreateShellItem(void) IShellItem_Release(shellitem); } + ret = pSHCreateShellItem(NULL, desktopfolder, pidl_testfile, &shellitem); + ok(SUCCEEDED(ret), "SHCreateShellItem returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ret = IShellItem_QueryInterface(shellitem, &IID_IPersistIDList, (void**)&persistidl); + ok(SUCCEEDED(ret), "QueryInterface returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ret = IPersistIDList_GetIDList(persistidl, &pidl_test); + ok(SUCCEEDED(ret), "GetIDList returned %x\n", ret); + if (SUCCEEDED(ret)) + { + ok(ILIsEqual(pidl_testfile, pidl_test), "id lists are not equal\n"); + pILFree(pidl_test); + } + IPersistIDList_Release(persistidl); + } + IShellItem_Release(shellitem); + } + DeleteFileA(".\\testfile"); pILFree(pidl_abstestfile); pILFree(pidl_testfile); @@ -2084,6 +2104,7 @@ static void test_desktop_IPersist(void) { IShellFolder *desktop; IPersist *persist; + IPersistFolder2 *ppf2; CLSID clsid; HRESULT hr; @@ -2107,6 +2128,31 @@ static void test_desktop_IPersist(void) IPersist_Release(persist); } + hr = IShellFolder_QueryInterface(desktop, &IID_IPersistFolder2, (void**)&ppf2); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* pre-Vista */, "failed %08x\n", hr); + if(SUCCEEDED(hr)) + { + IPersistFolder *ppf; + LPITEMIDLIST pidl; + hr = IShellFolder_QueryInterface(desktop, &IID_IPersistFolder, (void**)&ppf); + ok(hr == S_OK, "IID_IPersistFolder2 without IID_IPersistFolder.\n"); + if(SUCCEEDED(hr)) + IPersistFolder_Release(ppf); + + todo_wine { + hr = IPersistFolder2_Initialize(ppf2, NULL); + ok(hr == S_OK, "got %08x\n", hr); + } + + pidl = NULL; + hr = IPersistFolder2_GetCurFolder(ppf2, &pidl); + ok(hr == S_OK, "got %08x\n", hr); + ok(pidl != NULL, "pidl was NULL.\n"); + if(SUCCEEDED(hr)) pILFree(pidl); + + IPersistFolder2_Release(ppf2); + } + IShellFolder_Release(desktop); }

1 0

Henri Verbeet : wined3d: Remove restoring the read buffer from read_from_framebuffer_texture().
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: 4b850ed121ea6ec317bfd0e8b389c93498e2e196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b850ed121ea6ec317bfd0e8b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 19 18:36:22 2010 +0200 wined3d: Remove restoring the read buffer from read_from_framebuffer_texture(). The few functions that care about the read buffer should explicitly set it themselves, instead of assuming any particular state. --- dlls/wined3d/surface.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e21086f..94066ed 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1493,7 +1493,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) IWineD3DDeviceImpl *device = This->resource.device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - GLint prevRead; if (!surface_is_offscreen(This)) { @@ -1518,7 +1517,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) ENTER_GL(); - glGetIntegerv(GL_READ_BUFFER, &prevRead); glReadBuffer(device->offscreenBuffer); checkGLcall("glReadBuffer"); @@ -1526,9 +1524,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) 0, 0, 0, 0, This->currentDesc.Width, This->currentDesc.Height); checkGLcall("glCopyTexSubImage2D"); - glReadBuffer(prevRead); - checkGLcall("glReadBuffer"); - LEAVE_GL(); context_release(context);

1 0

André Hentschel : winecfg: Improve German view.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: 117a436bbf562f37ddf7293ce857864f148a820a URL: http://source.winehq.org/git/wine.git/?a=commit;h=117a436bbf562f37ddf7293ce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 19 21:09:08 2010 +0200 winecfg: Improve German view. --- programs/winecfg/De.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index fb9ceef..84ed05a 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -74,13 +74,13 @@ BEGIN GROUPBOX " Fenstereinstellungen ",IDC_STATIC,8,4,244,84 CONTROL "DirectX-Anwendungen können Maus einfangen",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Erlaube dem Fenstermanager die Fenster zu &dekorieren",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 - CONTROL "Erlaube dem Fenstermanager die Fenster zu kontrollieren.",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 + CONTROL "Erlaube dem Fenstermanager die Fenster zu kontrollieren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Emuliere einen virtuellen Bildschirm",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 - LTEXT "Desktop-Größe:",IDC_DESKTOP_SIZE,15,70,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,109,70,8,8,WS_DISABLED - EDITTEXT IDC_DESKTOP_WIDTH,64,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + LTEXT "Desktop-Größe:",IDC_DESKTOP_SIZE,15,70,54,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,119,70,8,8,WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,74,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,127,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED GROUPBOX " Direct3D ",IDC_STATIC,8,95,244,49 LTEXT "Unterstützung für Vertex Shader: ",IDC_STATIC,15,106,80,32

1 0

Dylan Smith : wordpad: Fix behaviour of find/replace dialog.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: 72f735b25e883b2568b4060813b93246df0b8c12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72f735b25e883b2568b406081… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 19 18:17:57 2010 -0400 wordpad: Fix behaviour of find/replace dialog. Pressing replace should only replace a selected match, and afterwards it should find the next match. Searches should always start from the start of the selection, even if the selection is moved in between searches. Searches wrap at the end of text, and should keep track of whether it has wrapped from previous searches to determine if it reached the end position. --- programs/wordpad/wordpad.c | 117 +++++++++++++++++++++---------------------- 1 files changed, 57 insertions(+), 60 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 0e6566d..df1b254 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -89,6 +89,12 @@ typedef enum UNIT_PT } UNIT; +typedef struct +{ + int endPos; + BOOL wrapped; +} FINDREPLACE_custom; + /* Load string resources */ static void DoLoadStrings(void) { @@ -1215,13 +1221,11 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) if(pFr->Flags & FR_FINDNEXT || pFr->Flags & FR_REPLACE || pFr->Flags & FR_REPLACEALL) { - DWORD flags = FR_DOWN; - FINDTEXTW ft; - static CHARRANGE cr; - LRESULT end, ret; - GETTEXTLENGTHEX gt; - LRESULT length; - int startPos; + FINDREPLACE_custom *custom_data = (FINDREPLACE_custom*)pFr->lCustData; + DWORD flags; + FINDTEXTEXW ft; + CHARRANGE sel; + LRESULT ret = -1; HMENU hMenu = GetMenu(hMainWnd); MENUITEMINFOW mi; @@ -1230,69 +1234,59 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) mi.dwItemData = 1; SetMenuItemInfoW(hMenu, ID_FIND_NEXT, FALSE, &mi); - gt.flags = GTL_NUMCHARS; - gt.codepage = 1200; - - length = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0); - - if(pFr->lCustData == -1) - { - SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&startPos, (LPARAM)&end); - cr.cpMin = startPos; - pFr->lCustData = startPos; - cr.cpMax = length; - if(cr.cpMin == length) - cr.cpMin = 0; - } else - { - startPos = pFr->lCustData; - } - - if(cr.cpMax > length) - { - startPos = 0; - cr.cpMin = 0; - cr.cpMax = length; + SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&sel.cpMin, (LPARAM)&sel.cpMax); + if(custom_data->endPos == -1) { + custom_data->endPos = sel.cpMin; + custom_data->wrapped = FALSE; } - ft.chrg = cr; + flags = FR_DOWN | (pFr->Flags & (FR_MATCHCASE | FR_WHOLEWORD)); ft.lpstrText = pFr->lpstrFindWhat; - if(pFr->Flags & FR_MATCHCASE) - flags |= FR_MATCHCASE; - if(pFr->Flags & FR_WHOLEWORD) - flags |= FR_WHOLEWORD; - - ret = SendMessageW(hEditorWnd, EM_FINDTEXTW, flags, (LPARAM)&ft); - - if(ret == -1) + /* Only replace existing selectino if it is an exact match. */ + if (sel.cpMin != sel.cpMax && + (pFr->Flags & FR_REPLACE || pFr->Flags & FR_REPLACEALL)) { - if(cr.cpMax == length && cr.cpMax != startPos) - { - ft.chrg.cpMin = cr.cpMin = 0; - ft.chrg.cpMax = cr.cpMax = startPos; + ft.chrg = sel; + SendMessageW(hEditorWnd, EM_FINDTEXTEXW, flags, (LPARAM)&ft); + if (ft.chrgText.cpMin == sel.cpMin && ft.chrgText.cpMax == sel.cpMax) { + SendMessageW(hEditorWnd, EM_REPLACESEL, TRUE, (LPARAM)pFr->lpstrReplaceWith); + SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&sel.cpMin, (LPARAM)&sel.cpMax); + } + } - ret = SendMessageW(hEditorWnd, EM_FINDTEXTW, flags, (LPARAM)&ft); + /* Search from the start of the selection, but exclude the first character + * from search if there is a selection. */ + ft.chrg.cpMin = sel.cpMin; + if (sel.cpMin != sel.cpMax) + ft.chrg.cpMin++; + + /* Search to the end, then wrap around and search from the start. */ + if (!custom_data->wrapped) { + ft.chrg.cpMax = -1; + ret = SendMessageW(hEditorWnd, EM_FINDTEXTEXW, flags, (LPARAM)&ft); + if (ret == -1) { + custom_data->wrapped = TRUE; + ft.chrg.cpMin = 0; } } - if(ret == -1) - { - pFr->lCustData = -1; - MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_SEARCH_FINISHED), wszAppTitle, - MB_OK | MB_ICONASTERISK); - } else - { - end = ret + lstrlenW(pFr->lpstrFindWhat); - cr.cpMin = end; - SendMessageW(hEditorWnd, EM_SETSEL, ret, end); - SendMessageW(hEditorWnd, EM_SCROLLCARET, 0, 0); + if (ret == -1) { + ft.chrg.cpMax = custom_data->endPos + lstrlenW(pFr->lpstrFindWhat) - 1; + if (ft.chrg.cpMax > ft.chrg.cpMin) + ret = SendMessageW(hEditorWnd, EM_FINDTEXTEXW, flags, (LPARAM)&ft); + } - if(pFr->Flags & FR_REPLACE || pFr->Flags & FR_REPLACEALL) - SendMessageW(hEditorWnd, EM_REPLACESEL, TRUE, (LPARAM)pFr->lpstrReplaceWith); + if (ret == -1) { + custom_data->endPos = -1; + MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_SEARCH_FINISHED), + wszAppTitle, MB_OK | MB_ICONASTERISK); + } else { + SendMessageW(hEditorWnd, EM_SETSEL, ft.chrgText.cpMin, ft.chrgText.cpMax); + SendMessageW(hEditorWnd, EM_SCROLLCARET, 0, 0); - if(pFr->Flags & FR_REPLACEALL) - handle_findmsg(pFr); + if (pFr->Flags & FR_REPLACEALL) + return handle_findmsg(pFr); } } @@ -1303,6 +1297,7 @@ static void dialog_find(LPFINDREPLACEW fr, BOOL replace) { static WCHAR findBuffer[MAX_STRING_LEN]; static WCHAR replaceBuffer[MAX_STRING_LEN]; + static FINDREPLACE_custom custom_data; /* Allow only one search/replace dialog to open */ if(hFindWnd != NULL) @@ -1317,7 +1312,9 @@ static void dialog_find(LPFINDREPLACEW fr, BOOL replace) fr->Flags = FR_HIDEUPDOWN; fr->lpstrFindWhat = findBuffer; fr->lpstrReplaceWith = replaceBuffer; - fr->lCustData = -1; + custom_data.endPos = -1; + custom_data.wrapped = FALSE; + fr->lCustData = (LPARAM)&custom_data; fr->wFindWhatLen = sizeof(findBuffer); fr->wReplaceWithLen = sizeof(replaceBuffer);

1 0

Dylan Smith : wordpad: Find dialogs intialize find field with selection.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: fbd30765f0659551367d78e4fbee1c0ed9c15055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd30765f0659551367d78e4f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 19 18:18:08 2010 -0400 wordpad: Find dialogs intialize find field with selection. If there is a selection that doesn't span multiple paragraphs, then the selection text initializes the find field in native wordpad, otherwise the last search is used to initialize the field. I added an extra buffer, since closing the find dialog before doing a search will preserve the last search state. --- programs/wordpad/wordpad.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index df1b254..edee1f8 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -93,6 +93,7 @@ typedef struct { int endPos; BOOL wrapped; + WCHAR findBuffer[128]; } FINDREPLACE_custom; /* Load string resources */ @@ -1234,6 +1235,14 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) mi.dwItemData = 1; SetMenuItemInfoW(hMenu, ID_FIND_NEXT, FALSE, &mi); + /* Make sure find field is saved. */ + if (pFr->lpstrFindWhat != custom_data->findBuffer) + { + lstrcpynW(custom_data->findBuffer, pFr->lpstrFindWhat, + sizeof(custom_data->findBuffer)); + pFr->lpstrFindWhat = custom_data->findBuffer; + } + SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&sel.cpMin, (LPARAM)&sel.cpMax); if(custom_data->endPos == -1) { custom_data->endPos = sel.cpMin; @@ -1295,9 +1304,11 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) static void dialog_find(LPFINDREPLACEW fr, BOOL replace) { - static WCHAR findBuffer[MAX_STRING_LEN]; - static WCHAR replaceBuffer[MAX_STRING_LEN]; + static WCHAR selBuffer[128]; + static WCHAR replaceBuffer[128]; static FINDREPLACE_custom custom_data; + static const WCHAR endl = '\r'; + FINDTEXTW ft; /* Allow only one search/replace dialog to open */ if(hFindWnd != NULL) @@ -1310,12 +1321,28 @@ static void dialog_find(LPFINDREPLACEW fr, BOOL replace) fr->lStructSize = sizeof(FINDREPLACEW); fr->hwndOwner = hMainWnd; fr->Flags = FR_HIDEUPDOWN; - fr->lpstrFindWhat = findBuffer; + /* Find field is filled with the selected text if it is non-empty + * and stays within the same paragraph, otherwise the previous + * find field is used. */ + SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&ft.chrg.cpMin, + (LPARAM)&ft.chrg.cpMax); + ft.lpstrText = &endl; + if (ft.chrg.cpMin != ft.chrg.cpMax && + SendMessageW(hEditorWnd, EM_FINDTEXTW, FR_DOWN, (LPARAM)&ft) == -1) + { + /* Use a temporary buffer for the selected text so that the saved + * find field is only overwritten when a find/replace is clicked. */ + GETTEXTEX gt = {sizeof(selBuffer), GT_SELECTION, 1200, NULL, NULL}; + SendMessageW(hEditorWnd, EM_GETTEXTEX, (WPARAM)&gt, (LPARAM)selBuffer); + fr->lpstrFindWhat = selBuffer; + } else { + fr->lpstrFindWhat = custom_data.findBuffer; + } fr->lpstrReplaceWith = replaceBuffer; custom_data.endPos = -1; custom_data.wrapped = FALSE; fr->lCustData = (LPARAM)&custom_data; - fr->wFindWhatLen = sizeof(findBuffer); + fr->wFindWhatLen = sizeof(custom_data.findBuffer); fr->wReplaceWithLen = sizeof(replaceBuffer); if(replace)

1 0