January 2010 - Wine-Commits

Matijn Woudt : winhttp: Add timeout for session handles and implement for WinHttpSetTimeouts.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: d0983e9ec2d7d1844d1aa473c7ed2092bc162374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0983e9ec2d7d1844d1aa473c… Author: Matijn Woudt <tijnema(a)gmail.com> Date: Fri Jan 29 01:45:15 2010 +0100 winhttp: Add timeout for session handles and implement for WinHttpSetTimeouts. --- dlls/winhttp/session.c | 60 ++++++++++++++++++++++++++------------- dlls/winhttp/tests/winhttp.c | 6 ++-- dlls/winhttp/winhttp_private.h | 3 ++ 3 files changed, 46 insertions(+), 23 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index a4a4ec6..d3c5de7 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -173,6 +173,9 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST session->hdr.flags = flags; session->hdr.refs = 1; session->hdr.redirect_policy = WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP; + session->connect_timeout = DEFAULT_CONNECT_TIMEOUT; + session->send_timeout = DEFAULT_SEND_TIMEOUT; + session->recv_timeout = DEFAULT_RECEIVE_TIMEOUT; list_init( &session->cookie_cache ); if (agent && !(session->agent = strdupW( agent ))) goto end; @@ -668,9 +671,9 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o list_add_head( &connect->hdr.children, &request->hdr.entry ); if (!netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE )) goto end; - request->connect_timeout = DEFAULT_CONNECT_TIMEOUT; - request->send_timeout = DEFAULT_SEND_TIMEOUT; - request->recv_timeout = DEFAULT_RECEIVE_TIMEOUT; + request->connect_timeout = connect->session->connect_timeout; + request->send_timeout = connect->session->send_timeout; + request->recv_timeout = connect->session->recv_timeout; if (!verb || !verb[0]) verb = getW; if (!(request->verb = strdupW( verb ))) goto end; @@ -1190,7 +1193,9 @@ WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback( HINTERNET handle, WINHT BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int send, int receive ) { BOOL ret = TRUE; + object_header_t *hdr; request_t *request; + session_t *session; TRACE("%p, %d, %d, %d, %d\n", handle, resolve, connect, send, receive); @@ -1203,34 +1208,49 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int if (resolve > 0) FIXME("resolve timeout (%d) not supported\n", resolve); - if (!(request = (request_t *)grab_object( handle ))) + if (!(hdr = grab_object( handle ))) { set_last_error( ERROR_INVALID_HANDLE ); return FALSE; } - if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) + switch(hdr->type) { - release_object( &request->hdr ); - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); - return FALSE; - } + case WINHTTP_HANDLE_TYPE_REQUEST: + request = (request_t *)hdr; + request->connect_timeout = connect; - request->connect_timeout = connect; + if (send < 0) send = 0; + request->send_timeout = send; - if (send < 0) send = 0; - request->send_timeout = send; + if (receive < 0) receive = 0; + request->recv_timeout = receive; - if (receive < 0) receive = 0; - request->recv_timeout = receive; + if (netconn_connected( &request->netconn )) + { + if (netconn_set_timeout( &request->netconn, TRUE, send )) ret = FALSE; + if (netconn_set_timeout( &request->netconn, FALSE, receive )) ret = FALSE; + } - if (netconn_connected( &request->netconn )) - { - if (netconn_set_timeout( &request->netconn, TRUE, send )) ret = FALSE; - if (netconn_set_timeout( &request->netconn, FALSE, receive )) ret = FALSE; - } + release_object( &request->hdr ); + break; - release_object( &request->hdr ); + case WINHTTP_HANDLE_TYPE_SESSION: + session = (session_t *)hdr; + session->connect_timeout = connect; + + if (send < 0) send = 0; + session->send_timeout = send; + + if (receive < 0) receive = 0; + session->recv_timeout = receive; + break; + + default: + release_object( hdr ); + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + return FALSE; + } return ret; } diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 0f1ebb0..b1290e3 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1064,15 +1064,15 @@ static void test_Timeouts (void) SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(ses, -1, -1, -1, -1); - todo_wine ok(ret, "%u\n", GetLastError()); + ok(ret, "%u\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(ses, 0, 0, 0, 0); - todo_wine ok(ret, "%u\n", GetLastError()); + ok(ret, "%u\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(ses, 0x0123, 0x4567, 0x89ab, 0xcdef); - todo_wine ok(ret, "%u\n", GetLastError()); + ok(ret, "%u\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 73ac5ba..1054a42 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -96,6 +96,9 @@ typedef struct object_header_t hdr; LPWSTR agent; DWORD access; + int connect_timeout; + int send_timeout; + int recv_timeout; LPWSTR proxy_server; LPWSTR proxy_bypass; LPWSTR proxy_username;

1 0

Matijn Woudt : winhttp/tests: Add timeout tests for WinHttp{Set, Query}Option.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: a09e659a37473ad407670a374b544e22f416ddd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a09e659a37473ad407670a374… Author: Matijn Woudt <tijnema(a)gmail.com> Date: Fri Jan 29 01:40:00 2010 +0100 winhttp/tests: Add timeout tests for WinHttp{Set, Query}Option. --- dlls/winhttp/tests/winhttp.c | 369 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 369 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a09e659a37473ad407670…

1 0

Christian Costa : amstream: Register media stream filter.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 607cb33fd53f93bb3fe47c0fd7f705d821182114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=607cb33fd53f93bb3fe47c0fd… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 29 16:28:22 2010 +0100 amstream: Register media stream filter. --- dlls/amstream/regsvr.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/regsvr.c b/dlls/amstream/regsvr.c index 028c68d..9c32891 100644 --- a/dlls/amstream/regsvr.c +++ b/dlls/amstream/regsvr.c @@ -456,6 +456,13 @@ static struct regsvr_coclass const coclass_list[] = { "Both" }, + { &CLSID_MediaStreamFilter, + "SFilter Class", + NULL, + "amstream.dll", + "Both" + }, + { NULL } /* list terminator */ };

1 0

Erich Hoover : hhctrl.ocx: Fix a NULL dereference mistake in the Contents tab.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 425c30f5445d8014cb49408b7efee571ccb637b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=425c30f5445d8014cb49408b7… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Jan 29 08:00:30 2010 -0700 hhctrl.ocx: Fix a NULL dereference mistake in the Contents tab. --- dlls/hhctrl.ocx/help.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index e7b7a64..e8121e7 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -419,7 +419,6 @@ static LRESULT OnTopicChange(HHInfo *info, void *user_data) } citer = citer->parent; } - chmfile = citer->merge.chm_file; break; case TAB_INDEX: iiter = (IndexItem *) user_data; @@ -458,6 +457,12 @@ static LRESULT OnTopicChange(HHInfo *info, void *user_data) return 0; } + if(!chmfile) + { + FIXME("No help file found for this item!\n"); + return 0; + } + TRACE("name %s loal %s\n", debugstr_w(name), debugstr_w(local)); NavigateToChm(info, chmfile, local);

1 0

Erich Hoover : hhctrl.ocx: Support jumping to a help topic with 'mapid'.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: db94b0c63631f3279c3e508010661c31efd13ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db94b0c63631f3279c3e50801… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Jan 28 16:16:54 2010 -0700 hhctrl.ocx: Support jumping to a help topic with 'mapid'. --- dlls/hhctrl.ocx/hhctrl.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 8268a21..c8ae0a1 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -272,12 +272,42 @@ HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD_PTR data int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) { MSG msg; - int len, buflen; + int len, buflen, mapid = -1; WCHAR *filename; char *endq = NULL; hh_process = TRUE; + /* Parse command line option of the HTML Help command. + * + * Note: The only currently handled action is "mapid", + * which corresponds to opening a specific page. + */ + while(*szCmdLine == '-') + { + LPSTR space, ptr; + + ptr = szCmdLine + 1; + space = strchr(ptr, ' '); + if(!strncmp(ptr, "mapid", space-ptr)) + { + char idtxt[10]; + + ptr += strlen("mapid")+1; + space = strchr(ptr, ' '); + memcpy(idtxt, ptr, space-ptr); + idtxt[space-ptr] = '\0'; + filename += (space-ptr)+1; + mapid = atoi(idtxt); + szCmdLine = space+1; + } + else + { + FIXME("Unhandled HTML Help command line parameter! (%.*s)\n", space-szCmdLine, szCmdLine); + return 0; + } + } + /* FIXME: Check szCmdLine for bad arguments */ if (*szCmdLine == '\"') endq = strchr(++szCmdLine, '\"'); @@ -291,7 +321,11 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) MultiByteToWideChar(CP_ACP, 0, szCmdLine, len, filename, buflen); filename[buflen-1] = 0; - HtmlHelpW(GetDesktopWindow(), filename, HH_DISPLAY_TOPIC, 0); + /* Open a specific help topic */ + if(mapid != -1) + HtmlHelpW(GetDesktopWindow(), filename, HH_HELP_CONTEXT, mapid); + else + HtmlHelpW(GetDesktopWindow(), filename, HH_DISPLAY_TOPIC, 0); heap_free(filename);

1 0

Erich Hoover : hhctrl.ocx: Fix (re)allocating string blocks.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 207ce6fcb28accbc6dbfaf7bc0e3373606ac09cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=207ce6fcb28accbc6dbfaf7bc… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Jan 28 16:18:33 2010 -0700 hhctrl.ocx: Fix (re)allocating string blocks. --- dlls/hhctrl.ocx/chm.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index b7df8e7..3e148db 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -38,12 +38,13 @@ static LPCSTR GetChmString(CHMInfo *chm, DWORD offset) return NULL; if(chm->strings_size <= (offset >> BLOCK_BITS)) { + chm->strings_size = (offset >> BLOCK_BITS)+1; if(chm->strings) chm->strings = heap_realloc_zero(chm->strings, - chm->strings_size = ((offset >> BLOCK_BITS)+1)*sizeof(char*)); + chm->strings_size*sizeof(char*)); else chm->strings = heap_alloc_zero( - chm->strings_size = ((offset >> BLOCK_BITS)+1)*sizeof(char*)); + chm->strings_size*sizeof(char*)); }

1 0

Matijn Woudt : winhttp: Implement WINHTTP_OPTION_{CONNECT, SEND, RECEIVE}_TIMEOUT.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 3ed5df1e3c1d830f34ae300ceca8cdc1a2d62424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ed5df1e3c1d830f34ae300ce… Author: Matijn Woudt <tijnema(a)gmail.com> Date: Fri Jan 29 02:11:57 2010 +0100 winhttp: Implement WINHTTP_OPTION_{CONNECT, SEND, RECEIVE}_TIMEOUT. --- dlls/winhttp/session.c | 63 +++++++++++++++++- dlls/winhttp/tests/winhttp.c | 156 +++++++++++++++++++++--------------------- 2 files changed, 140 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ed5df1e3c1d830f34ae3…

1 0

Christian Costa : d3drm: Add GUID definitions for all interfaces.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 137100f7470a683ea6121b8466371b465fefa188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=137100f7470a683ea6121b846… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 29 12:16:17 2010 +0100 d3drm: Add GUID definitions for all interfaces. --- include/d3drmobj.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index c91465d..bd22e89 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -34,7 +34,49 @@ extern "C" { */ DEFINE_GUID(IID_IDirect3DRMObject, 0xeb16cb00, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMObject2, 0x4516ec7c, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(IID_IDirect3DRMDevice, 0xe9e19280, 0x6e05, 0x11cf, 0xac, 0x4a, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMDevice2, 0x4516ec78, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(IID_IDirect3DRMDevice3, 0x549f498b, 0xbfeb, 0x11d1, 0x8e, 0xd8, 0x00, 0xa0, 0xc9, 0x67, 0xa4, 0x82); +DEFINE_GUID(IID_IDirect3DRMViewport, 0xeb16cb02, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMViewport2, 0x4a1b1be6, 0xbfed, 0x11d1, 0x8e, 0xd8, 0x00, 0xa0, 0xc9, 0x67, 0xa4, 0x82); +DEFINE_GUID(IID_IDirect3DRMFrame, 0xeb16cb03, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMFrame2, 0xc3dfbd60, 0x3988, 0x11d0, 0x9e, 0xc2, 0x00, 0x00, 0xc0, 0x29, 0x1a, 0xc3); +DEFINE_GUID(IID_IDirect3DRMFrame3, 0xff6b7f70, 0xa40e, 0x11d1, 0x91, 0xf9, 0x00, 0x00, 0xf8, 0x75, 0x8e, 0x66); DEFINE_GUID(IID_IDirect3DRMVisual, 0xeb16cb04, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMMesh, 0xa3a80d01, 0x6e12, 0x11cf, 0xac, 0x4a, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMMeshBuilder, 0xa3a80d02, 0x6e12, 0x11cf, 0xac, 0x4a, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMMeshBuilder2, 0x4516ec77, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(IID_IDirect3DRMMeshBuilder3, 0x4516ec82, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(IID_IDirect3DRMFace, 0xeb16cb07, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMFace2, 0x4516ec81, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(IID_IDirect3DRMLight, 0xeb16cb08, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMTexture, 0xeb16cb09, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMTexture2, 0x120f30c0, 0x1629, 0x11d0, 0x94, 0x1c, 0x00, 0x80, 0xc8, 0x0c, 0xfa, 0x7b); +DEFINE_GUID(IID_IDirect3DRMTexture3, 0xff6b7f73, 0xa40e, 0x11d1, 0x91, 0xf9, 0x00, 0x00, 0xf8, 0x75, 0x8e, 0x66); +DEFINE_GUID(IID_IDirect3DRMWrap, 0xeb16cb0a, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMMaterial, 0xeb16cb0b, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMMaterial2, 0xff6b7f75, 0xa40e, 0x11d1, 0x91, 0xf9, 0x00, 0x00, 0xf8, 0x75, 0x8e, 0x66); +DEFINE_GUID(IID_IDirect3DRMAnimation, 0xeb16cb0d, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMAnimation2, 0xff6b7f77, 0xa40e, 0x11d1, 0x91, 0xf9, 0x00, 0x00, 0xf8, 0x75, 0x8e, 0x66); +DEFINE_GUID(IID_IDirect3DRMAnimationSet, 0xeb16cb0e, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMAnimationSet2, 0xff6b7f79, 0xa40e, 0x11d1, 0x91, 0xf9, 0x00, 0x00, 0xf8, 0x75, 0x8e, 0x66); +DEFINE_GUID(IID_IDirect3DRMObjectArray, 0x242f6bc2, 0x3849, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(IID_IDirect3DRMDeviceArray, 0xeb16cb10, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMViewportArray, 0xeb16cb11, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMFrameArray, 0xeb16cb12, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMVisualArray, 0xeb16cb13, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMLightArray, 0xeb16cb14, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMPickedArray, 0xeb16cb16, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMFaceArray, 0xeb16cb17, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMAnimationArray, 0xd5f1cae0, 0x4bd7, 0x11d1, 0xb9, 0x74, 0x00, 0x60, 0x08, 0x3e, 0x45, 0xf3); +DEFINE_GUID(IID_IDirect3DRMUserVisual, 0x59163de0, 0x6d43, 0x11cf, 0xac, 0x4a, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMShadow, 0xaf359780, 0x6ba3, 0x11cf, 0xac, 0x4a, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMShadow2, 0x86b44e25, 0x9c82, 0x11d1, 0xbb, 0x0b, 0x00, 0xa0, 0xc9, 0x81, 0xa0, 0xa6); +DEFINE_GUID(IID_IDirect3DRMInterpolator, 0x242f6bc1, 0x3849, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(IID_IDirect3DRMProgressiveMesh, 0x4516ec79, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(IID_IDirect3DRMPicked2Array, 0x4516ec7b, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(IID_IDirect3DRMClippedVisual, 0x5434e733, 0x6d66, 0x11d1, 0xbb, 0x0b, 0x00, 0x00, 0xf8, 0x75, 0x86, 0x5a); typedef struct IDirect3DRMObject *LPDIRECT3DRMOBJECT, **LPLPDIRECT3DRMOBJECT; typedef struct IDirect3DRMObject2 *LPDIRECT3DRMOBJECT2, **LPLPDIRECT3DRMOBJECT2;

1 0

Maarten Lankhorst : qcap: Add optional dependency on libv4l.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: bf6f0750cdc3695576a0f486ca322ade78aabf57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf6f0750cdc3695576a0f486c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jan 28 23:27:12 2010 +0100 qcap: Add optional dependency on libv4l. --- configure | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 9 ++++++ dlls/qcap/v4l.c | 44 ++++++++++++++++++++++++++------ include/config.h.in | 3 ++ 4 files changed, 118 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 740e95e..2ae042f 100755 --- a/configure +++ b/configure @@ -803,6 +803,7 @@ with_oss with_png with_pthread with_sane +with_v4l with_xcomposite with_xcursor with_xinerama @@ -1488,6 +1489,7 @@ Optional Packages: --without-png do not use PNG --without-pthread do not use the pthread library --without-sane do not use SANE (scanner support) + --without-v4l do not use v4l1 (v4l support) --without-xcomposite do not use the Xcomposite extension --without-xcursor do not use the Xcursor extension --without-xinerama do not use Xinerama (multi-monitor support) @@ -2665,6 +2667,12 @@ if test "${with_sane+set}" = set; then : fi +# Check whether --with-v4l was given. +if test "${with_v4l+set}" = set; then : + withval=$with_v4l; +fi + + # Check whether --with-xcomposite was given. if test "${with_xcomposite+set}" = set; then : withval=$with_xcomposite; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi @@ -9615,6 +9623,68 @@ This is an error since --with-sane was requested." "$LINENO" 5 ;; esac fi +if test "x$with_v4l" != "xno" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lv4l1" >&5 +$as_echo_n "checking for -lv4l1... " >&6; } +if test "${ac_cv_lib_soname_v4l1+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lv4l1 $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char v4l1_open (); +int +main () +{ +return v4l1_open (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + case "$LIBEXT" in + dll) ;; + dylib) ac_cv_lib_soname_v4l1=`otool -L conftest$ac_exeext | grep "libv4l1\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libv4l1\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_v4l1=`$ac_cv_path_LDD conftest$ac_exeext | grep "libv4l1\\.$LIBEXT" | sed -e "s/^.*$libv4l1\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; + esac +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if test "x$ac_cv_lib_soname_v4l1" = "x"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_v4l1" >&5 +$as_echo "$ac_cv_lib_soname_v4l1" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBV4L1 "$ac_cv_lib_soname_v4l1" +_ACEOF + + +fi +fi +if test "x$ac_cv_lib_soname_v4l1" = "x"; then : + case "x$with_v4l" in + x) wine_notices="$wine_notices|libv4l ${notice_platform}development files not found." ;; + xno) ;; + *) as_fn_error "libv4l ${notice_platform}development files not found. +This is an error since --with-v4l was requested." "$LINENO" 5 ;; +esac +fi + if test "x$with_gphoto" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" diff --git a/configure.ac b/configure.ac index 453ba7a..f823045 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,7 @@ AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG]), AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) +AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi]) AC_ARG_WITH(xcursor, AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]), @@ -1138,6 +1139,14 @@ fi WINE_NOTICE_WITH(sane,[test "x$ac_cv_lib_soname_sane" = "x"], [libsane ${notice_platform}development files not found, scanners won't be supported.]) +dnl **** Check for libv4l1 **** +if test "x$with_v4l" != "xno" +then + WINE_CHECK_SONAME(v4l1,v4l1_open,,,) +fi +WINE_NOTICE_WITH(v4l,[test "x$ac_cv_lib_soname_v4l1" = "x"], + [libv4l ${notice_platform}development files not found.]) + dnl **** Check for libgphoto2 **** if test "x$with_gphoto" != "xno" then diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 0546797..85d4d4d 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -24,6 +24,7 @@ #include "config.h" #include "wine/port.h" +#include "wine/library.h" #define NONAMELESSSTRUCT #define NONAMELESSUNION @@ -73,6 +74,32 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap_v4l); #ifdef HAVE_LINUX_VIDEODEV_H +static typeof(open) *video_open = open; +static typeof(close) *video_close = close; +static typeof(ioctl) *video_ioctl = ioctl; +static typeof(read) *video_read = read; +static typeof(mmap) *video_mmap = mmap; +static typeof(munmap) *video_munmap = munmap; + +static void video_init(void) +{ +#ifdef SONAME_LIBV4L1 + static void *video_lib; + + if (video_lib) + return; + video_lib = wine_dlopen(SONAME_LIBV4L1, RTLD_NOW, NULL, 0); + if (!video_lib) + return; + video_open = wine_dlsym(video_lib, "v4l1_open", NULL, 0); + video_close = wine_dlsym(video_lib, "v4l1_close", NULL, 0); + video_ioctl = wine_dlsym(video_lib, "v4l1_ioctl", NULL, 0); + video_read = wine_dlsym(video_lib, "v4l1_read", NULL, 0); + video_mmap = wine_dlsym(video_lib, "v4l1_mmap", NULL, 0); + video_munmap = wine_dlsym(video_lib, "v4l1_munmap", NULL, 0); +#endif +} + typedef void (* Renderer)(const Capture *, LPBYTE bufferin, const BYTE *stream); struct _Capture @@ -146,7 +173,7 @@ static int xioctl(int fd, int request, void * arg) int r; do { - r = ioctl (fd, request, arg); + r = video_ioctl (fd, request, arg); } while (-1 == r && EINTR == errno); return r; @@ -168,8 +195,8 @@ static HRESULT V4l_Prepare(Capture *capBox) TRACE("%p: Using %d/%d buffers\n", capBox, capBox->buffers, capBox->gb_buffers.frames); - capBox->pmap = mmap( 0, capBox->gb_buffers.size, PROT_READ|PROT_WRITE, - MAP_SHARED, capBox->fd, 0 ); + capBox->pmap = video_mmap( 0, capBox->gb_buffers.size, PROT_READ|PROT_WRITE, + MAP_SHARED, capBox->fd, 0 ); if (capBox->pmap != MAP_FAILED) { int i; @@ -177,7 +204,7 @@ static HRESULT V4l_Prepare(Capture *capBox) capBox->grab_buf = CoTaskMemAlloc(sizeof(struct video_mmap) * capBox->buffers); if (!capBox->grab_buf) { - munmap(capBox->pmap, capBox->gb_buffers.size); + video_munmap(capBox->pmap, capBox->gb_buffers.size); return E_OUTOFMEMORY; } @@ -211,7 +238,7 @@ static void V4l_Unprepare(Capture *capBox) { for (capBox->curframe = 0; capBox->curframe < capBox->buffers; capBox->curframe++) xioctl(capBox->fd, VIDIOCSYNC, &capBox->grab_buf[capBox->curframe]); - munmap(capBox->pmap, capBox->gb_buffers.size); + video_munmap(capBox->pmap, capBox->gb_buffers.size); CoTaskMemFree(capBox->grab_buf); } else @@ -223,7 +250,7 @@ HRESULT qcap_driver_destroy(Capture *capBox) TRACE("%p\n", capBox); if( capBox->fd != -1 ) - close(capBox->fd); + video_close(capBox->fd); capBox->CritSect.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&capBox->CritSect); CoTaskMemFree(capBox); @@ -546,7 +573,7 @@ static void V4l_GetFrame(Capture * capBox, unsigned char ** pInput) else { int retval; - while ((retval = read(capBox->fd, capBox->grab_data, capBox->imagesize)) == -1) + while ((retval = video_read(capBox->fd, capBox->grab_data, capBox->imagesize)) == -1) if (errno != EAGAIN) break; if (retval == -1) WARN("Error occurred while reading from device: %s\n", strerror(errno)); @@ -782,6 +809,7 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card ) struct video_window window; YUV_Init(); + video_init(); capBox = CoTaskMemAlloc(sizeof(Capture)); if (!capBox) @@ -794,7 +822,7 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card ) sprintf(device, "/dev/video%i", card); TRACE("opening %s\n", device); - capBox->fd = open(device, O_RDWR | O_NONBLOCK); + capBox->fd = video_open(device, O_RDWR | O_NONBLOCK); if (capBox->fd == -1) { WARN("open failed (%d)\n", errno); diff --git a/include/config.h.in b/include/config.h.in index 0d5ce60..4e8fcd1 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1194,6 +1194,9 @@ /* Define to the soname of the libssl library. */ #undef SONAME_LIBSSL +/* Define to the soname of the libv4l1 library. */ +#undef SONAME_LIBV4L1 + /* Define to the soname of the libX11 library. */ #undef SONAME_LIBX11

1 0

Erich Hoover : hhctrl.ocx: Fix a double-click bug in the Contents tab introduced by the Index tab code .
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 3a824542a5e47a537b04896ec24fe6c8d2054dbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a824542a5e47a537b04896ec… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Jan 28 16:16:02 2010 -0700 hhctrl.ocx: Fix a double-click bug in the Contents tab introduced by the Index tab code. --- dlls/hhctrl.ocx/help.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 60614c2..e7b7a64 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -397,9 +397,8 @@ static LRESULT OnTabChange(HWND hwnd) return 0; } -static LRESULT OnTopicChange(HWND hwnd, void *user_data) +static LRESULT OnTopicChange(HHInfo *info, void *user_data) { - HHInfo *info = (HHInfo*)GetWindowLongPtrW(hwnd, GWLP_USERDATA); LPCWSTR chmfile = NULL, name = NULL, local = NULL; ContentItem *citer; IndexItem *iiter; @@ -474,14 +473,17 @@ static LRESULT CALLBACK Child_WndProc(HWND hWnd, UINT message, WPARAM wParam, LP case WM_SIZE: return Child_OnSize(hWnd); case WM_NOTIFY: { + HHInfo *info = (HHInfo*)GetWindowLongPtrW(hWnd, GWLP_USERDATA); NMHDR *nmhdr = (NMHDR*)lParam; + switch(nmhdr->code) { case TCN_SELCHANGE: return OnTabChange(hWnd); case TVN_SELCHANGEDW: - return OnTopicChange(hWnd, (void*)((NMTREEVIEWW *)lParam)->itemNew.lParam); + return OnTopicChange(info, (void*)((NMTREEVIEWW *)lParam)->itemNew.lParam); case NM_DBLCLK: - return OnTopicChange(hWnd, (void*)((NMITEMACTIVATE *)lParam)->lParam); + if(info->current_tab == TAB_INDEX) + return OnTopicChange(info, (void*)((NMITEMACTIVATE *)lParam)->lParam); } break; }

1 0