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

Frédéric Delanoy : shdocvw: Fix French translation.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 16f120f1ddd8484828f83796ff74580d497df23a URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f120f1ddd8484828f83796f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 28 22:51:49 2010 +0200 shdocvw: Fix French translation. --- dlls/shdocvw/Fr.rc | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/Fr.rc b/dlls/shdocvw/Fr.rc index 2d053a2..94b4a7e 100644 --- a/dlls/shdocvw/Fr.rc +++ b/dlls/shdocvw/Fr.rc @@ -1,5 +1,6 @@ /* * shdocvw French resources + * * Copyright 2010 Frédéric Delanoy * * This library is free software; you can redistribute it and/or @@ -40,7 +41,10 @@ IDR_BROWSE_MAIN_MENU MENU { POPUP "&Fichier" { - MENUITEM "&Nouvelle fenêtre" ID_BROWSE_NEW_WINDOW + POPUP "&Nouvelle" + { + MENUITEM "&Fenêtre" ID_BROWSE_NEW_WINDOW + } MENUITEM "&Ouvrir...", ID_BROWSE_OPEN MENUITEM "&Enregistrer", ID_BROWSE_SAVE MENUITEM "Enregistrer &sous...", ID_BROWSE_SAVE_AS

1 0

Andrew Eikum : comdlg32/tests: Use GetOpenFileNameA instead of GetOpenFileNameW.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 1b7a3dae6e2026679a866a8fd6a6b1fd0874751d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b7a3dae6e2026679a866a8fd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 28 09:23:00 2010 -0500 comdlg32/tests: Use GetOpenFileNameA instead of GetOpenFileNameW. --- dlls/comdlg32/tests/filedlg.c | 46 ++++++++++++++++------------------------- 1 files changed, 18 insertions(+), 28 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index fc7762b..90d4afb 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -988,59 +988,49 @@ static void test_resizable2(void) static void test_mru(void) { ok_wndproc_testcase testcase = {0}; - OPENFILENAMEW ofn = {sizeof(OPENFILENAMEW)}; - const char *test_dir_nameA = "C:\\mru_test"; - const WCHAR test_file_name[] = - {'t','e','s','t','.','t','x','t',0}; - const WCHAR test_full_path[] = - {'C',':','\\','m','r','u','_','t','e','s','t','\\','t','e','s','t','.','t','x','t',0}; - const WCHAR template1W[] = - {'t','e','m','p','l','a','t','e','1',0}; - WCHAR filename_buf[MAX_PATH]; + OPENFILENAME ofn = {sizeof(OPENFILENAME)}; + const char *test_dir_name = "C:\\mru_test"; + const char *test_file_name = "test.txt"; + const char *test_full_path = "C:\\mru_test\\test.txt"; + char filename_buf[MAX_PATH]; DWORD ret; ofn.lpstrFile = filename_buf; ofn.nMaxFile = sizeof(filename_buf); - ofn.lpTemplateName = template1W; + ofn.lpTemplateName = "template1"; ofn.hInstance = GetModuleHandle(NULL); ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER | OFN_ENABLETEMPLATE | OFN_NOCHANGEDIR; ofn.lCustData = (LPARAM)&testcase; ofn.lpfnHook = (LPOFNHOOKPROC)test_ok_wndproc; SetLastError(0xdeadbeef); - ret = CreateDirectoryA(test_dir_nameA, NULL); + ret = CreateDirectoryA(test_dir_name, NULL); ok(ret == TRUE, "CreateDirectoryA should have succeeded: %d\n", GetLastError()); /* "teach" comdlg32 about this directory */ - lstrcpyW(filename_buf, test_full_path); + strcpy(filename_buf, test_full_path); SetLastError(0xdeadbeef); - ret = GetOpenFileNameW(&ofn); - if(!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED){ - win_skip("Platform doesn't implement GetOpenFileNameW\n"); - RemoveDirectoryA(test_dir_nameA); - return; - } - ok(ret, "GetOpenFileNameW should have succeeded: %d\n", GetLastError()); - ok(testcase.actclose, "Open File dialog should have closed.\n"); + ret = GetOpenFileNameA(&ofn); + ok(ret, "GetOpenFileNameA should have succeeded: %d\n", GetLastError()); ret = CommDlgExtendedError(); ok(!ret, "CommDlgExtendedError returned %x\n", ret); - ok(!lstrcmpW(ofn.lpstrFile, test_full_path), "Expected to get %s, got %s\n", - wine_dbgstr_w(test_full_path), wine_dbgstr_w(ofn.lpstrFile)); + ok(testcase.actclose, "Open File dialog should have closed.\n"); + ok(!strcmp(ofn.lpstrFile, test_full_path), "Expected to get %s, got %s\n", test_full_path, ofn.lpstrFile); /* get a filename without a full path. it should return the file in * test_dir_name, not in the CWD */ - lstrcpyW(filename_buf, test_file_name); + strcpy(filename_buf, test_file_name); SetLastError(0xdeadbeef); - ret = GetOpenFileNameW(&ofn); - ok(ret, "GetOpenFileNameW should have succeeded: %d\n", GetLastError()); - ok(testcase.actclose, "Open File dialog should have closed.\n"); + ret = GetOpenFileNameA(&ofn); + ok(ret, "GetOpenFileNameA should have succeeded: %d\n", GetLastError()); ret = CommDlgExtendedError(); ok(!ret, "CommDlgExtendedError returned %x\n", ret); - if(lstrcmpW(ofn.lpstrFile, test_full_path) != 0) + ok(testcase.actclose, "Open File dialog should have closed.\n"); + if(strcmp(ofn.lpstrFile, test_full_path) != 0) win_skip("Platform doesn't save MRU data\n"); SetLastError(0xdeadbeef); - ret = RemoveDirectoryA(test_dir_nameA); + ret = RemoveDirectoryA(test_dir_name); ok(ret == TRUE, "RemoveDirectoryA should have succeeded: %d\n", GetLastError()); }

1 0

Alexandre Julliard : gdi32: Make the top right corner the DC origin for RTL layouts.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: e4b76dfd88b8991da903a83a8b8cde319cd265db URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4b76dfd88b8991da903a83a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 15:25:54 2010 +0200 gdi32: Make the top right corner the DC origin for RTL layouts. --- dlls/gdi32/dc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index d122aae..3aa2480 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -296,6 +296,7 @@ static void construct_window_to_viewport(DC *dc, XFORM *xform) xform->eM22 = scaleY; xform->eDx = (double)dc->vportOrgX - scaleX * (double)dc->wndOrgX; xform->eDy = (double)dc->vportOrgY - scaleY * (double)dc->wndOrgY; + if (dc->layout & LAYOUT_RTL) xform->eDx += dc->vis_rect.right - dc->vis_rect.left - 1; } /*********************************************************************** @@ -550,6 +551,7 @@ BOOL restore_dc_state( HDC hdc, INT level ) if (dc->hMetaRgn) DeleteObject( dc->hMetaRgn ); dc->hMetaRgn = 0; } + DC_UpdateXforms( dc ); CLIPPING_UpdateGCRegion( dc ); SelectObject( hdc, dcs->hBitmap );

1 0

Alexandre Julliard : gdi32: Make sure the text dimensions are always positive in the ExtTextOut normal case .
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 7c1124e49a80514ee4e40cc16584f89cd4081006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1124e49a80514ee4e40cc16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 23:15:01 2010 +0200 gdi32: Make sure the text dimensions are always positive in the ExtTextOut normal case. --- dlls/gdi32/font.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2d51445..1b36374 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1777,12 +1777,8 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, else if(flags & ETO_GLYPH_INDEX) glyphs = reordered_str; - TRACE("%p, %d, %d, %08x, %p, %s, %d, %p)\n", hdc, x, y, flags, - lprect, debugstr_wn(str, count), count, lpDx); - - if(lprect) - TRACE("rect: %d,%d - %d,%d\n", lprect->left, lprect->top, lprect->right, - lprect->bottom); + TRACE("%p, %d, %d, %08x, %s, %s, %d, %p)\n", hdc, x, y, flags, + wine_dbgstr_rect(lprect), debugstr_wn(str, count), count, lpDx); TRACE("align = %x bkmode = %x mapmode = %x\n", align, GetBkMode(hdc), GetMapMode(hdc)); if(align & TA_UPDATECP) @@ -1923,7 +1919,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, GetTextExtentPointW(hdc, reordered_str, count, &sz); done_extents = TRUE; } - width.x = INTERNAL_XWSTODS(dc, sz.cx); + width.x = abs(INTERNAL_XWSTODS(dc, sz.cx)); width.y = 0; } @@ -2018,7 +2014,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, for(j = 1; j < count; j++) { GetTextExtentPointW(hdc, reordered_str + j - 1, 1, &tmpsz); - offsets[j].x = offsets[j - 1].x + INTERNAL_XWSTODS(dc, tmpsz.cx); + offsets[j].x = offsets[j - 1].x + abs(INTERNAL_XWSTODS(dc, tmpsz.cx)); offsets[j].y = 0; } }

1 0

Mike Kaplinskiy : server: Fix some comments.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: a6203f8b5325ea32a92d3f30dfa89a8dfae6c198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6203f8b5325ea32a92d3f30d… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Tue Jul 27 00:16:28 2010 -0400 server: Fix some comments. Apparently windows reports only currently valid events for WSAEnumNetworkEvents. --- dlls/ws2_32/tests/sock.c | 3 --- server/sock.c | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b078b9f..5a8e0df 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3126,9 +3126,6 @@ static void test_events(int useMessages) ok(ret == 2, "Failed to send buffer %d err %d\n", ret, GetLastError()); broken_seq[0] = read_read_seq; /* win9x */ broken_seq[1] = NULL; - /* we like to erase pmask in server, so we have varying behavior here * - * it is only fixed for now because we refuse to send notifications with - * any kind of asyncs requests running */ ok_event_seq(src, hEvent, empty_seq, broken_seq, 0); dwRet = WaitForSingleObject(ov.hEvent, 100); diff --git a/server/sock.c b/server/sock.c index 44422ad..4922d64 100644 --- a/server/sock.c +++ b/server/sock.c @@ -961,7 +961,9 @@ DECL_HANDLER(enable_socket_event) FILE_WRITE_ATTRIBUTES, &sock_ops))) return; - sock->pmask &= ~req->mask; /* is this safe? */ + /* for event-based notification, windows erases stale events */ + sock->pmask &= ~req->mask; + sock->hmask &= ~req->mask; sock->state |= req->sstate; sock->state &= ~req->cstate;

1 0

Mariusz Pluciński : gameux: Add stub of IGameExplorer implementation.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: 9878d6b384ad2b351abb5a6f52ce15ace1e8fe96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9878d6b384ad2b351abb5a6f5… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Fri Jul 23 01:06:25 2010 +0200 gameux: Add stub of IGameExplorer implementation. --- dlls/gameux/Makefile.in | 2 + dlls/gameux/gameexplorer.c | 184 ++++++++++++++++++++++++++++++++++++++++++ dlls/gameux/gameux_private.h | 21 +++++ 3 files changed, 207 insertions(+), 0 deletions(-) diff --git a/dlls/gameux/Makefile.in b/dlls/gameux/Makefile.in index d26a8ab..7cf2600 100644 --- a/dlls/gameux/Makefile.in +++ b/dlls/gameux/Makefile.in @@ -4,8 +4,10 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = gameux.dll +IMPORTS = uuid C_SRCS = \ + gameexplorer.c \ main.c RC_SRCS = version.rc diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c new file mode 100644 index 0000000..0fa5e9c --- /dev/null +++ b/dlls/gameux/gameexplorer.c @@ -0,0 +1,184 @@ +/* + * Gameux library coclass GameExplorer implementation + * + * Copyright (C) 2010 Mariusz Pluciński + * + * 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 + */ +#define COBJMACROS + +#include "config.h" + +#include "ole2.h" + +#include "gameux.h" +#include "gameux_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gameux); + +/* + * IGameExplorer implementation + */ + +typedef struct _GameExplorerImpl +{ + const struct IGameExplorerVtbl *lpGameExplorerVtbl; + LONG ref; +} GameExplorerImpl; + +static inline GameExplorerImpl *impl_from_IGameExplorer(IGameExplorer *iface) +{ + return (GameExplorerImpl*)((char*)iface - FIELD_OFFSET(GameExplorerImpl, lpGameExplorerVtbl)); +} + +static HRESULT WINAPI GameExplorerImpl_QueryInterface( + IGameExplorer *iface, + REFIID riid, + void **ppvObject) +{ + GameExplorerImpl *This = impl_from_IGameExplorer(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); + + *ppvObject = NULL; + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IGameExplorer)) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IGameExplorer_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI GameExplorerImpl_AddRef(IGameExplorer *iface) +{ + GameExplorerImpl *This = impl_from_IGameExplorer(iface); + LONG ref; + + ref = InterlockedIncrement(&This->ref); + + TRACE("(%p): ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI GameExplorerImpl_Release(IGameExplorer *iface) +{ + GameExplorerImpl *This = impl_from_IGameExplorer(iface); + LONG ref; + + ref = InterlockedDecrement(&This->ref); + TRACE("(%p): ref=%d\n", This, ref); + + if(ref == 0) + { + TRACE("freeing GameExplorer object\n"); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI GameExplorerImpl_AddGame( + IGameExplorer *iface, + BSTR bstrGDFBinaryPath, + BSTR sGameInstallDirectory, + GAME_INSTALL_SCOPE installScope, + GUID *pInstanceID) +{ + GameExplorerImpl *This = impl_from_IGameExplorer(iface); + + TRACE("(%p, %s, %s, %d, %s)\n", This, debugstr_w(bstrGDFBinaryPath), debugstr_w(sGameInstallDirectory), installScope, debugstr_guid(pInstanceID)); + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI GameExplorerImpl_RemoveGame( + IGameExplorer *iface, + GUID instanceID) +{ + GameExplorerImpl *This = impl_from_IGameExplorer(iface); + + TRACE("(%p, %s)\n", This, debugstr_guid(&instanceID)); + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI GameExplorerImpl_UpdateGame( + IGameExplorer *iface, + GUID instanceID) +{ + GameExplorerImpl *This = impl_from_IGameExplorer(iface); + + TRACE("(%p, %s)\n", This, debugstr_guid(&instanceID)); + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI GameExplorerImpl_VerifyAccess( + IGameExplorer *iface, + BSTR sGDFBinaryPath, + BOOL *pHasAccess) +{ + GameExplorerImpl *This = impl_from_IGameExplorer(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_w(sGDFBinaryPath), pHasAccess); + FIXME("stub\n"); + return E_NOTIMPL; +} + +static const struct IGameExplorerVtbl GameExplorerImplVtbl = +{ + GameExplorerImpl_QueryInterface, + GameExplorerImpl_AddRef, + GameExplorerImpl_Release, + GameExplorerImpl_AddGame, + GameExplorerImpl_RemoveGame, + GameExplorerImpl_UpdateGame, + GameExplorerImpl_VerifyAccess +}; + +/* + * Construction routine + */ +HRESULT GameExplorer_create( + IUnknown* pUnkOuter, + IUnknown** ppObj) +{ + GameExplorerImpl *pGameExplorer; + + TRACE("(%p, %p)\n", pUnkOuter, ppObj); + + pGameExplorer = HeapAlloc(GetProcessHeap(), 0, sizeof(*pGameExplorer)); + + if(!pGameExplorer) + return E_OUTOFMEMORY; + + pGameExplorer->lpGameExplorerVtbl = &GameExplorerImplVtbl; + pGameExplorer->ref = 1; + + *ppObj = (IUnknown*)(&pGameExplorer->lpGameExplorerVtbl); + + TRACE("returning iface: %p\n", *ppObj); + return S_OK; +} diff --git a/dlls/gameux/gameux_private.h b/dlls/gameux/gameux_private.h new file mode 100644 index 0000000..3872cb9 --- /dev/null +++ b/dlls/gameux/gameux_private.h @@ -0,0 +1,21 @@ +/* + * Gameux library private header + * + * Copyright (C) 2010 Mariusz Pluciński + * + * 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 + */ + +extern HRESULT GameExplorer_create(IUnknown* pUnkOuter, IUnknown **ppObj);

1 0

Alexandre Julliard : server: Use tgkill to send signals on x86_64 too.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: 10b6d6ba4d6949a3dade22d3c87a6661b6b1e0a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b6d6ba4d6949a3dade22d3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 16:06:13 2010 +0200 server: Use tgkill to send signals on x86_64 too. --- server/ptrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index cc08d32..99f9d2b 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -219,7 +219,7 @@ static inline int tkill( int tgid, int pid, int sig ) ret = syscall(238 /*SYS_tkill*/, pid, sig); return ret; # elif defined(__x86_64__) - return syscall(200 /*SYS_tkill*/, pid, sig); + return syscall(234 /*SYS_tgkill*/, tgid, pid, sig); # else errno = ENOSYS; return -1;

1 0

Mariusz Pluciński : gameux: Add interface registration routines.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: c8861296b1408e3358b48f8ba58d9b6ae3fec9f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8861296b1408e3358b48f8ba… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Fri Jul 23 01:58:07 2010 +0200 gameux: Add interface registration routines. --- dlls/gameux/Makefile.in | 5 +- dlls/gameux/gameux.spec | 4 +- dlls/gameux/regsvr.c | 523 +++++++++++++++++++++++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 4 files changed, 529 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8861296b1408e3358b48…

1 0

Mike Kaplinskiy : server: Consume events triggered.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: 0b251c08f2e9e2693beb9a1f1ed72286d634cb3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b251c08f2e9e2693beb9a1f1… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Tue Jul 27 00:16:18 2010 -0400 server: Consume events triggered. --- dlls/ws2_32/tests/sock.c | 10 ---------- server/sock.c | 7 +++++-- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 19d29bf..b078b9f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3205,16 +3205,6 @@ static void test_events(int useMessages) ok_event_seq(src, hEvent, empty_seq, NULL, 0); } - /* wine gets a stale notifications because of the async ops, clear them. - * remove when sending messages during pending asyncs is fixed */ - ret = send(dst, "2", 1, 0); - ok(ret == 1, "Failed to send buffer %d err %d\n", ret, GetLastError()); - ok_event_seq(src, hEvent, read_seq, NULL, 0); - - ret = recv(src, buffer, 1, 0); - ok(ret == 1, "Failed to empty buffer: %d - %d\n", ret, GetLastError()); - ok_event_seq(src, hEvent, empty_seq, NULL, 0); - /* Flood the send queue */ hThread = CreateThread(NULL, 0, drain_socket_thread, &dst, 0, &id); if (hThread == NULL) diff --git a/server/sock.c b/server/sock.c index e5681b0..36f6c7a 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, int error ) +static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) { if ( sock->flags & WSA_FLAG_OVERLAPPED ) { @@ -303,11 +303,13 @@ static void sock_dispatch_asyncs( struct sock *sock, int event, int error ) { if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock ); async_wake_up( sock->read_q, STATUS_ALERTED ); + event &= ~(POLLIN|POLLPRI); } 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 ); + event &= ~POLLOUT; } if ( event & (POLLERR|POLLHUP) ) { @@ -319,6 +321,7 @@ static void sock_dispatch_asyncs( struct sock *sock, int event, int error ) async_wake_up( sock->write_q, status ); } } + return event; } static void sock_dispatch_events( struct sock *sock, int prevstate, int event, int error ) @@ -451,7 +454,7 @@ static void sock_poll_event( struct fd *fd, int event ) event |= POLLHUP; } - sock_dispatch_asyncs( sock, event, error ); + 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

Mike Kaplinskiy : server: Don't delay events, we simply shouldn' t send them in the first place.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: 93db86a7e026645007e37f23725546612e4de5c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93db86a7e026645007e37f237… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Tue Jul 27 00:16:24 2010 -0400 server: Don't delay events, we simply shouldn't send them in the first place. --- server/sock.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index 36f6c7a..44422ad 100644 --- a/server/sock.c +++ b/server/sock.c @@ -260,9 +260,7 @@ static void sock_wake_up( struct sock *sock ) unsigned int events = sock->pmask & sock->mask; int i; - /* Do not signal events if there are still pending asynchronous IO requests */ - /* We need this to delay FD_CLOSE events until all pending overlapped requests are processed */ - if ( !events || async_queued( sock->read_q ) || async_queued( sock->write_q ) ) return; + if ( !events ) return; if (sock->event) {

1 0