wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

Misha Koshelev : wine.inf: Use DDE for winebrowser as native.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: fe07efb3dc37463c4288f78df9f5681c9513dcbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe07efb3dc37463c4288f78df… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Jun 7 10:33:42 2007 -0500 wine.inf: Use DDE for winebrowser as native. --- tools/wine.inf | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 9a71005..2440c59 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -114,7 +114,11 @@ HKCR,folder\shell\open\ddeexec,,2,"[ViewFolder("%l", %I, %S)]" HKCR,folder\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,folder\shell\open\ddeexec\application,,2,"Folders" HKCR,hlpfile\shell\open\command,,2,"%10%\winhelp.exe %1" -HKCR,htmlfile\shell\open\command,,2,"winebrowser" +HKCR,htmlfile\shell\open\command,,2,"%11%\winebrowser.exe -nohome" +HKCR,htmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," +HKCR,htmlfile\shell\open\ddeexec,"NoActivateHandler",2,"" +HKCR,htmlfile\shell\open\ddeexec\Application,,2,"IExplore" +HKCR,htmlfile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" HKCR,inffile\shell\install\command,,2,"%10%\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1" HKCR,inifile\shell\open\command,,2,"%11%\notepad.exe %1" HKCR,inifile\shell\print\command,,2,"%11%\notepad.exe /p %1" @@ -134,9 +138,17 @@ HKCR,txtfile\shell\open\command,,2,"%11%\notepad.exe %1" HKCR,txtfile\shell\print\command,,2,"%11%\notepad.exe /p %1" HKCR,wrifile\shell\open\command,,2,"%11%\wordpad.exe %1" HKCR,wrifile\shell\print\command,,2,"%11%\wordpad.exe /p %1" -HKCR,http\shell\open\command,,2,"winebrowser" -HKCR,https\shell\open\command,,2,"winebrowser" -HKCR,mailto\shell\open\command,,2,"winebrowser %1" +HKCR,http\shell\open\command,,2,"%11%\winebrowser.exe -nohome" +HKCR,http\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," +HKCR,http\shell\open\ddeexec,"NoActivateHandler",2,"" +HKCR,http\shell\open\ddeexec\Application,,2,"IExplore" +HKCR,http\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" +HKCR,https\shell\open\command,,2,"%11%\winebrowser.exe -nohome" +HKCR,https\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," +HKCR,https\shell\open\ddeexec,"NoActivateHandler",2,"" +HKCR,https\shell\open\ddeexec\Application,,2,"IExplore" +HKCR,https\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" +HKCR,mailto\shell\open\command,,2,"%11%\winebrowser %1" ; FIXME: the following should be done by the dll registration HKCR,AVIFile\Compressors\auds,,,"{0002000F-0000-0000-C000-000000000046}" HKCR,AVIFile\Compressors\vids,,,"{00020001-0000-0000-C000-000000000046}"

1 0

Misha Koshelev : winebrowser: Add DDE support.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 07ad5c4c8a427ab9fa06df21b298ba74d280d762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ad5c4c8a427ab9fa06df21b… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Jun 7 10:33:35 2007 -0500 winebrowser: Add DDE support. --- programs/winebrowser/Makefile.in | 4 +- programs/winebrowser/main.c | 152 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 146 insertions(+), 10 deletions(-) diff --git a/programs/winebrowser/Makefile.in b/programs/winebrowser/Makefile.in index cfc6627..f8be2e3 100644 --- a/programs/winebrowser/Makefile.in +++ b/programs/winebrowser/Makefile.in @@ -3,8 +3,8 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winebrowser.exe -APPMODE = -mconsole -IMPORTS = shlwapi advapi32 kernel32 +APPMODE = -mwindows +IMPORTS = shlwapi user32 advapi32 kernel32 C_SRCS = \ main.c diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 6e8b8c8..976e465 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -42,6 +42,7 @@ #include <windows.h> #include <shlwapi.h> +#include <ddeml.h> #include <stdio.h> #include <stdlib.h> #include <errno.h> @@ -121,6 +122,128 @@ static int open_mailto_url( const char *url ) } /***************************************************************************** + * DDE helper functions. + */ + +static char *ddeExec = NULL; +static HSZ hszTopic = 0; + +/* Dde callback, save the execute string for processing */ +static HDDEDATA CALLBACK ddeCb(UINT uType, UINT uFmt, HCONV hConv, + HSZ hsz1, HSZ hsz2, HDDEDATA hData, + ULONG_PTR dwData1, ULONG_PTR dwData2) +{ + DWORD size = 0; + + WINE_TRACE("dde_cb: %04x, %04x, %p, %p, %p, %p, %08lx, %08lx\n", + uType, uFmt, hConv, hsz1, hsz2, hData, dwData1, dwData2); + + switch (uType) + { + case XTYP_CONNECT: + if (!DdeCmpStringHandles(hsz1, hszTopic)) + return (HDDEDATA)TRUE; + return (HDDEDATA)FALSE; + + case XTYP_EXECUTE: + if (!(size = DdeGetData(hData, NULL, 0, 0))) + WINE_ERR("DdeGetData returned zero size of execute string\n"); + else if (!(ddeExec = HeapAlloc(GetProcessHeap(), 0, size))) + WINE_ERR("Out of memory\n"); + else if (DdeGetData(hData, (LPBYTE)ddeExec, size, 0) != size) + WINE_WARN("DdeGetData did not return %d bytes\n", size); + DdeFreeDataHandle(hData); + return (HDDEDATA)DDE_FACK; + + default: + return NULL; + } +} + +static char *get_url_from_dde(void) +{ + static const char szApplication[] = "IExplore"; + static const char szTopic[] = "WWW_OpenURL"; + + HSZ hszApplication = 0; + DWORD ddeInst = 0; + UINT_PTR timer = 0; + int rc; + char *ret = NULL; + + rc = DdeInitializeA(&ddeInst, ddeCb, CBF_SKIP_ALLNOTIFICATIONS | CBF_FAIL_ADVISES | + CBF_FAIL_POKES | CBF_FAIL_REQUESTS, 0); + if (rc != DMLERR_NO_ERROR) + { + WINE_ERR("Unable to initialize DDE, DdeInitialize returned %d\n", rc); + goto done; + } + + hszApplication = DdeCreateStringHandleA(ddeInst, szApplication, CP_WINANSI); + if (!hszApplication) + { + WINE_ERR("Unable to initialize DDE, DdeCreateStringHandle failed\n"); + goto done; + } + + hszTopic = DdeCreateStringHandleA(ddeInst, szTopic, CP_WINANSI); + if (!hszTopic) + { + WINE_ERR("Unable to initialize DDE, DdeCreateStringHandle failed\n"); + goto done; + } + + if (!DdeNameService(ddeInst, hszApplication, 0, DNS_REGISTER)) + { + WINE_ERR("Unable to initialize DDE, DdeNameService failed\n"); + goto done; + } + + timer = SetTimer(NULL, 0, 5000, NULL); + if (!timer) + { + WINE_ERR("SetTimer failed to create timer\n"); + goto done; + } + + while (!ddeExec) + { + MSG msg; + if (!GetMessage(&msg, NULL, 0, 0)) break; + if (msg.message == WM_TIMER) break; + DispatchMessage(&msg); + } + + if (ddeExec) + { + if (*ddeExec == '"') + { + char *endquote = strchr(ddeExec+1, '"'); + if (!endquote) + { + WINE_ERR("Unabled to retrieve URL from string '%s'\n", ddeExec); + goto done; + } + *endquote = 0; + ret = ddeExec+1; + } + else + ret = ddeExec; + } + +done: + if (timer) KillTimer(NULL, timer); + if (ddeInst) + { + if (hszTopic && hszApplication) DdeNameService(ddeInst, hszApplication, 0, DNS_UNREGISTER); + if (hszTopic) DdeFreeStringHandle(ddeInst, hszTopic); + if (hszApplication) DdeFreeStringHandle(ddeInst, hszApplication); + DdeUninitialize(ddeInst); + } + return ret; +} + +/***************************************************************************** * Main entry point. This is a console application so we have a main() not a * winmain(). */ @@ -128,11 +251,17 @@ int main(int argc, char *argv[]) { char *url = argv[1]; wine_get_unix_file_name_t wine_get_unix_file_name_ptr; + int ret = 1; - if (argc == 1) + /* DDE used only if -nohome is specified; avoids delay in printing usage info + * when no parameters are passed */ + if (url && !strcasecmp( url, "-nohome" )) + url = argc > 2 ? argv[2] : get_url_from_dde(); + + if (!url) { fprintf( stderr, "Usage: winebrowser URL\n" ); - return 1; + goto done; } /* handle an RFC1738 file URL */ @@ -144,7 +273,7 @@ int main(int argc, char *argv[]) if (UrlUnescapeA( url, NULL, &len, URL_UNESCAPE_INPLACE ) != S_OK) { fprintf( stderr, "winebrowser: unescaping URL failed: %s\n", url ); - return 1; + goto done; } /* look for a Windows path after 'file:' */ @@ -157,7 +286,7 @@ int main(int argc, char *argv[]) if (!*p) { fprintf( stderr, "winebrowser: no valid Windows path in: %s\n", url ); - return 1; + goto done; } if (p[1] == '|') p[1] = ':'; @@ -189,13 +318,20 @@ int main(int argc, char *argv[]) struct stat dummy; if (stat( unixpath, &dummy ) >= 0) - return open_http_url( unixpath ); + { + ret = open_http_url( unixpath ); + goto done; + } } } if (!strncasecmp( url, "mailto:", 7 )) - return open_mailto_url( url ); + ret = open_mailto_url( url ); + else + /* let the browser decide how to handle the given url */ + ret = open_http_url( url ); - /* let the browser decide how to handle the given url */ - return open_http_url( url ); +done: + HeapFree(GetProcessHeap(), 0, ddeExec); + return ret; }

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 96c337f0a143b9ee0391d0c1bea627f57656c596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c337f0a143b9ee0391d0c1b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 7 11:48:55 2007 +0200 Assorted spelling fixes. --- dlls/comctl32/commctrl.c | 8 ++++---- dlls/comctl32/tests/toolbar.c | 2 +- dlls/dbghelp/type.c | 2 +- dlls/localspl/tests/localmon.c | 4 ++-- dlls/mciavi32/info.c | 4 ++-- dlls/odbccp32/tests/misc.c | 2 +- dlls/riched20/editor.c | 2 +- dlls/shell32/tests/shlexec.c | 4 ++-- dlls/shlwapi/tests/shreg.c | 12 +++++++----- dlls/version/info.c | 2 +- dlls/version/tests/info.c | 2 +- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/state.c | 2 +- dlls/wined3d/surface.c | 10 +++++----- dlls/winedos/int10.c | 8 ++++---- include/wine/wined3d_interface.h | 2 +- 16 files changed, 36 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96c337f0a143b9ee0391d…

1 0

Francois Gouget : wined3d: Fix spelling of the state_separateblend() function.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 7d55f09e7515f3ca6f9e25d9022a7f10b524568a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d55f09e7515f3ca6f9e25d90… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 7 11:48:30 2007 +0200 wined3d: Fix spelling of the state_separateblend() function. --- dlls/wined3d/state.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6676cf3..54275c2 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1452,7 +1452,7 @@ static void state_srgbwrite(DWORD state, IWineD3DStateBlockImpl *stateblock, Win FIXME("Render state WINED3DRS_SRGBWRITEENABLE not yet implemented\n"); } -static void state_seperateblend(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { +static void state_separateblend(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { TRACE("Stub\n"); if(stateblock->renderState[WINED3DRS_SEPARATEALPHABLENDENABLE]) FIXME("(WINED3DRS_SEPARATEALPHABLENDENABLE,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_SEPARATEALPHABLENDENABLE]); @@ -3654,10 +3654,10 @@ const struct StateEntry StateTable[] = { /*203, WINED3DRS_WRAP13 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, { /*204, WINED3DRS_WRAP14 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, { /*205, WINED3DRS_WRAP15 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*206, WINED3DRS_SEPARATEALPHABLENDENABLE */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_seperateblend }, - { /*207, WINED3DRS_SRCBLENDALPHA */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_seperateblend }, - { /*208, WINED3DRS_DESTBLENDALPHA */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_seperateblend }, - { /*209, WINED3DRS_BLENDOPALPHA */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_seperateblend }, + { /*206, WINED3DRS_SEPARATEALPHABLENDENABLE */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_separateblend }, + { /*207, WINED3DRS_SRCBLENDALPHA */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_separateblend }, + { /*208, WINED3DRS_DESTBLENDALPHA */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_separateblend }, + { /*209, WINED3DRS_BLENDOPALPHA */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_separateblend }, /* Texture stage states */ { /*0, 01, WINED3DTSS_COLOROP */ STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), tex_colorop }, { /*0, 02, WINED3DTSS_COLORARG1 */ STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), tex_colorop },

1 0

Hans Leidekker : wininet: More lenient parsing of the passive mode server response.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 9a6ba225e264e59125d83d6359af60aaa8322c3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a6ba225e264e59125d83d635… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Jun 7 16:32:24 2007 +0200 wininet: More lenient parsing of the passive mode server response. --- dlls/wininet/ftp.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 604f383..d9291c2 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2545,18 +2545,11 @@ static BOOL FTP_DoPassive(LPWININETFTPSESSIONW lpwfs) struct sockaddr_in dataSocketAddress; p = lpszResponseBuffer+4; /* skip status code */ + while (*p != '\0' && (*p < '0' || *p > '9')) p++; - /* do a very strict check; we can improve that later. */ - - if (strncmp(p, "Entering Passive Mode", 21)) - { - ERR("unknown response '%.*s', aborting\n", 21, p); - goto lend; - } - p += 21; /* skip string */ - if ((*p++ != ' ') || (*p++ != '(')) + if (*p == '\0') { - ERR("unknown response format, aborting\n"); + ERR("no address found in response, aborting\n"); goto lend; }

1 0

Vitaliy Margolen : atl: Use CallWindowProc instead of calling old window proc directly.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: a2daceb7c2a7abd9c465771129bdd02ec85b5532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2daceb7c2a7abd9c46577112… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Jun 7 06:51:42 2007 -0600 atl: Use CallWindowProc instead of calling old window proc directly. --- dlls/atl/atl_ax.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 4f0b7cb..8201d09 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -848,7 +848,7 @@ static LRESULT IOCS_OnWndProc( IOCS *This, HWND hWnd, UINT uMsg, WPARAM wParam, break; } - return OrigWndProc( hWnd, uMsg, wParam, lParam ); + return CallWindowProcW( OrigWndProc, hWnd, uMsg, wParam, lParam ); } static LRESULT CALLBACK AtlHost_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) @@ -862,9 +862,8 @@ static HRESULT IOCS_Attach( IOCS *This, HWND hWnd, IUnknown *pUnkControl ) /* su This->hWnd = hWnd; IUnknown_QueryInterface( pUnkControl, &IID_IOleObject, (void**)&This->control ); IOleObject_SetClientSite( This->control, THIS2IOLECLIENTSITE( This ) ); - This->OrigWndProc = (WNDPROC) GetWindowLongPtrW( This->hWnd, GWLP_WNDPROC ); SetWindowLongPtrW( hWnd, GWLP_USERDATA, (ULONG_PTR) This ); - SetWindowLongPtrW( hWnd, GWLP_WNDPROC, (ULONG_PTR) AtlHost_wndproc ); + This->OrigWndProc = (WNDPROC)SetWindowLongPtrW( hWnd, GWLP_WNDPROC, (ULONG_PTR) AtlHost_wndproc ); return S_OK; }

1 0

Paul Vriens : comdlg32/tests: Skip some not implemented functions on win98.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: b4b88b055d760f809b267feac5c2fa74b8c702e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b88b055d760f809b267feac… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jun 7 11:47:58 2007 +0200 comdlg32/tests: Skip some not implemented functions on win98. --- dlls/comdlg32/tests/filedlg.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 9ae0c40..03192ba 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -72,10 +72,16 @@ static void test_DialogCancel(void) ok(CDERR_INITIALIZATION == CommDlgExtendedError(), "expected %d, got %d\n", CDERR_INITIALIZATION, CommDlgExtendedError()); + SetLastError(0xdeadbeef); result = GetOpenFileNameW((LPOPENFILENAMEW) &ofn); - ok(0 == result, "expected %d, got %d\n", 0, result); - ok(0 == CommDlgExtendedError(), "expected %d, got %d\n", 0, - CommDlgExtendedError()); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + skip("GetOpenFileNameW is not implemented\n"); + else + { + ok(0 == result, "expected %d, got %d\n", 0, result); + ok(0 == CommDlgExtendedError(), "expected %d, got %d\n", 0, + CommDlgExtendedError()); + } PrintDlgA(NULL); ok(CDERR_INITIALIZATION == CommDlgExtendedError(), "expected %d, got %d\n", @@ -90,10 +96,16 @@ static void test_DialogCancel(void) ok(CDERR_INITIALIZATION == CommDlgExtendedError(), "expected %d, got %d\n", CDERR_INITIALIZATION, CommDlgExtendedError()); + SetLastError(0xdeadbeef); result = GetSaveFileNameW((LPOPENFILENAMEW) &ofn); - ok(0 == result, "expected %d, got %d\n", 0, result); - ok(0 == CommDlgExtendedError(), "expected %d, got %d\n", 0, - CommDlgExtendedError()); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + skip("GetSaveFileNameW is not implemented\n"); + else + { + ok(0 == result, "expected %d, got %d\n", 0, result); + ok(0 == CommDlgExtendedError(), "expected %d, got %d\n", 0, + CommDlgExtendedError()); + } }

1 0

Alexandre Julliard : winmm: Get rid of the WINE_MM_IDATA global structure, there's only one instance anyway.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 1e178be8620eab61438542d4b9d8e1d09eba1ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e178be8620eab61438542d4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 7 17:50:28 2007 +0200 winmm: Get rid of the WINE_MM_IDATA global structure, there's only one instance anyway. --- dlls/winmm/mci.c | 65 +++++++++++++++++++++++------------------------ dlls/winmm/mmio.c | 22 +++++++++------- dlls/winmm/mmsystem.c | 2 - dlls/winmm/playsound.c | 47 ++++++++++++++++++++++------------ dlls/winmm/time.c | 31 +++++++++++++++------- dlls/winmm/winemm.h | 45 +++------------------------------ dlls/winmm/winmm.c | 35 ++++++++++++++------------ 7 files changed, 118 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e178be8620eab6143854…

1 0

Maarten Lankhorst : winmm: Use unix fd' s instead of win32 events to sync internal events in timer.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 0383e4e4990e414a7dcaba51e6b81bf60499944a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0383e4e4990e414a7dcaba51e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jun 5 19:32:20 2007 +0200 winmm: Use unix fd's instead of win32 events to sync internal events in timer. --- dlls/winmm/time.c | 67 ++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 46 insertions(+), 21 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index d392786..9329b27 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -24,6 +24,7 @@ #include "wine/port.h" #include <stdarg.h> +#include <errno.h> #include <time.h> #ifdef HAVE_SYS_TIME_H # include <sys/time.h> @@ -31,6 +32,12 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#ifdef HAVE_POLL_H +#include <poll.h> +#endif +#ifdef HAVE_SYS_POLL_H +#include <sys/poll.h> +#endif #include "windef.h" #include "winbase.h" @@ -44,9 +51,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmtime); static HANDLE TIME_hMMTimer; static LPWINE_TIMERENTRY TIME_TimersList; -static HANDLE TIME_hWakeEvent; static CRITICAL_SECTION TIME_cbcrst; static BOOL TIME_TimeToDie = TRUE; +static int TIME_fdWake[2] = { -1, -1 }; /* * Some observations on the behavior of winmm on Windows. @@ -219,7 +226,12 @@ static LPWINE_TIMERENTRY lpTimers; static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) { LPWINE_MM_IDATA iData = (LPWINE_MM_IDATA)arg; - DWORD rc; + int sleep_time, ret; + char readme[16]; + struct pollfd pfd; + + pfd.fd = TIME_fdWake[0]; + pfd.events = POLLIN; TRACE("Starting main winmm thread\n"); @@ -231,17 +243,21 @@ static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) while (! TIME_TimeToDie) { - int sleep_time = TIME_MMSysTimeCallback(iData); + sleep_time = TIME_MMSysTimeCallback(iData); if (sleep_time == 0) continue; - rc = WaitForSingleObject(TIME_hWakeEvent, (sleep_time == -1) ? INFINITE : (DWORD)sleep_time); - if (rc != WAIT_TIMEOUT && rc != WAIT_OBJECT_0) - { - FIXME("Unexpected error %d(%d) in timer thread\n", rc, GetLastError()); - break; - } + if ((ret = poll(&pfd, 1, sleep_time)) < 0) + { + if (errno != EINTR && errno != EAGAIN) + { + ERR("Unexpected error in poll: %s(%d)\n", strerror(errno), errno); + break; + } + } + + while (ret > 0) ret = read(TIME_fdWake[0], readme, sizeof(readme)); } TRACE("Exiting main winmm thread\n"); return 0; @@ -253,10 +269,17 @@ static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) void TIME_MMTimeStart(void) { if (!TIME_hMMTimer) { - TIME_TimersList = NULL; - TIME_hWakeEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + TIME_TimersList = NULL; + if (pipe(TIME_fdWake) < 0) + { + TIME_fdWake[0] = TIME_fdWake[1] = -1; + ERR("Cannot create pipe: %s\n", strerror(errno)); + } else { + fcntl(TIME_fdWake[0], F_SETFL, O_NONBLOCK); + fcntl(TIME_fdWake[1], F_SETFL, O_NONBLOCK); + } TIME_TimeToDie = FALSE; - TIME_hMMTimer = CreateThread(NULL, 0, TIME_MMSysTimeThread, &WINMM_IData, 0, NULL); + TIME_hMMTimer = CreateThread(NULL, 0, TIME_MMSysTimeThread, &WINMM_IData, 0, NULL); SetThreadPriority(TIME_hMMTimer, THREAD_PRIORITY_TIME_CRITICAL); InitializeCriticalSection(&TIME_cbcrst); TIME_cbcrst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINMM.TIME_cbcrst"); @@ -269,16 +292,17 @@ void TIME_MMTimeStart(void) void TIME_MMTimeStop(void) { if (TIME_hMMTimer) { + const char a='a'; TIME_TimeToDie = TRUE; - SetEvent(TIME_hWakeEvent); - - /* FIXME: in the worst case, we're going to wait 65 seconds here :-( */ - WaitForSingleObject(TIME_hMMTimer, INFINITE); - - CloseHandle(TIME_hMMTimer); - CloseHandle(TIME_hWakeEvent); - TIME_hMMTimer = 0; + write(TIME_fdWake[1], &a, sizeof(a)); + + WaitForSingleObject(TIME_hMMTimer, INFINITE); + close(TIME_fdWake[0]); + close(TIME_fdWake[1]); + TIME_fdWake[0] = TIME_fdWake[1] = -1; + CloseHandle(TIME_hMMTimer); + TIME_hMMTimer = 0; TIME_cbcrst.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&TIME_cbcrst); TIME_TimersList = NULL; @@ -309,6 +333,7 @@ WORD TIME_SetEventInternal(UINT wDelay, UINT wResol, WORD wNewID = 0; LPWINE_TIMERENTRY lpNewTimer; LPWINE_TIMERENTRY lpTimer; + const char c = 'c'; TRACE("(%u, %u, %p, %08X, %04X);\n", wDelay, wResol, lpFunc, dwUser, wFlags); @@ -344,7 +369,7 @@ WORD TIME_SetEventInternal(UINT wDelay, UINT wResol, LeaveCriticalSection(&WINMM_IData.cs); /* Wake the service thread in case there is work to be done */ - SetEvent(TIME_hWakeEvent); + write(TIME_fdWake[1], &c, sizeof(c)); TRACE("=> %u\n", wNewID + 1);

1 0

Alexandre Julliard : winmm: Fix computation of sleep time until next timeout.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 90d94efe1061672265448d1b2071d4e357e9fd8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d94efe1061672265448d1b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 7 16:22:48 2007 +0200 winmm: Fix computation of sleep time until next timeout. --- dlls/winmm/time.c | 48 ++++++++++++++++++++---------------------------- 1 files changed, 20 insertions(+), 28 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 27a4e46..d392786 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -113,7 +113,7 @@ static void TIME_TriggerCallBack(LPWINE_TIMERENTRY lpTimer) /************************************************************************** * TIME_MMSysTimeCallback */ -static DWORD CALLBACK TIME_MMSysTimeCallback(LPWINE_MM_IDATA iData) +static int TIME_MMSysTimeCallback(LPWINE_MM_IDATA iData) { static int nSizeLpTimers; static LPWINE_TIMERENTRY lpTimers; @@ -121,14 +121,7 @@ static LPWINE_TIMERENTRY lpTimers; LPWINE_TIMERENTRY timer, *ptimer, *next_ptimer; int idx; DWORD cur_time; - DWORD delta_time; - DWORD ret_time = INFINITE; - DWORD adjust_time; - - - /* optimize for the most frequent case - no events */ - if (! TIME_TimersList) - return(ret_time); + int delta_time, ret_time = -1; /* since timeSetEvent() and timeKillEvent() can be called * from 16 bit code, there are cases where win16 lock is @@ -151,7 +144,8 @@ static LPWINE_TIMERENTRY lpTimers; for (ptimer = &TIME_TimersList; *ptimer != NULL; ) { timer = *ptimer; next_ptimer = &timer->lpNext; - if (cur_time >= timer->dwTriggerTime) + delta_time = timer->dwTriggerTime - cur_time; + if (delta_time <= 0) { if (timer->lpFunc) { if (idx == nSizeLpTimers) { @@ -180,23 +174,22 @@ static LPWINE_TIMERENTRY lpTimers; HeapFree(GetProcessHeap(), 0, timer); /* We don't need to trigger oneshots again */ - delta_time = INFINITE; + delta_time = -1; } else { /* Compute when this event needs this function to be called again */ - if (timer->dwTriggerTime <= cur_time) - delta_time = 0; - else - delta_time = timer->dwTriggerTime - cur_time; + delta_time = timer->dwTriggerTime - cur_time; + if (delta_time < 0) delta_time = 0; } - } - else - delta_time = timer->dwTriggerTime - cur_time; + } /* Determine when we need to return to this function */ - ret_time = min(ret_time, delta_time); + if (delta_time != -1) + { + if (ret_time == -1 || ret_time > delta_time) ret_time = delta_time; + } ptimer = next_ptimer; } @@ -209,15 +202,15 @@ static LPWINE_TIMERENTRY lpTimers; /* Finally, adjust the recommended wait time downward by the amount of time the processing routines actually took */ - adjust_time = GetTickCount() - cur_time; - if (adjust_time > ret_time) - ret_time = 0; - else - ret_time -= adjust_time; + if (ret_time != -1) + { + ret_time -= GetTickCount() - cur_time; + if (ret_time < 0) ret_time = 0; + } /* We return the amount of time our caller should sleep before needing to check in on us again */ - return(ret_time); + return ret_time; } /************************************************************************** @@ -226,7 +219,6 @@ static LPWINE_TIMERENTRY lpTimers; static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) { LPWINE_MM_IDATA iData = (LPWINE_MM_IDATA)arg; - DWORD sleep_time; DWORD rc; TRACE("Starting main winmm thread\n"); @@ -239,12 +231,12 @@ static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) while (! TIME_TimeToDie) { - sleep_time = TIME_MMSysTimeCallback(iData); + int sleep_time = TIME_MMSysTimeCallback(iData); if (sleep_time == 0) continue; - rc = WaitForSingleObject(TIME_hWakeEvent, sleep_time); + rc = WaitForSingleObject(TIME_hWakeEvent, (sleep_time == -1) ? INFINITE : (DWORD)sleep_time); if (rc != WAIT_TIMEOUT && rc != WAIT_OBJECT_0) { FIXME("Unexpected error %d(%d) in timer thread\n", rc, GetLastError());

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
86
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 June 2007