wine-commits March 2009

wine-commits@winehq.org

2 participants
834 discussions

Christian Costa : amstream: Implement IAMMultiMediaStreamImpl_GetFilterGraph.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 8469689a71a02c21942f7caefe686de3d7505226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8469689a71a02c21942f7caef… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Mar 25 22:55:03 2009 +0100 amstream: Implement IAMMultiMediaStreamImpl_GetFilterGraph. --- dlls/amstream/amstream.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 9e4d45a..6c544f6 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -238,9 +238,17 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppGraphBuilder); + TRACE("(%p/%p)->(%p)\n", This, iface, ppGraphBuilder); - return E_NOTIMPL; + if (!ppGraphBuilder) + return E_POINTER; + + if (This->pFilterGraph) + return IFilterGraph_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)ppGraphBuilder); + else + *ppGraphBuilder = NULL; + + return S_OK; } static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream* iface, IMediaStreamFilter** ppFilter)

1 0

Andrew Talbot : winedos: Initializations fix.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 46c8ab351af1b1897bdd6ecb96334a7bb496d7c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46c8ab351af1b1897bdd6ecb9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Mar 25 20:49:52 2009 +0000 winedos: Initializations fix. --- dlls/winedos/int21.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index 0c7967f..cbce913 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -2182,6 +2182,7 @@ static BOOL INT21_FileAttributes( CONTEXT86 *context, else { TRACE( "SET FILE CREATION DATE AND TIME, file %s\n", fileA ); + MultiByteToWideChar(CP_OEMCP, 0, fileA, -1, fileW, MAX_PATH); handle = CreateFileW( fileW, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -2207,8 +2208,8 @@ static BOOL INT21_FileAttributes( CONTEXT86 *context, INT_BARF( context, 0x21 ); else { - TRACE( "GET FILE CREATION DATE AND TIME, handle %d\n", - BX_reg(context) ); + TRACE( "GET FILE CREATION DATE AND TIME, file %s\n", fileA ); + MultiByteToWideChar(CP_OEMCP, 0, fileA, -1, fileW, MAX_PATH); handle = CreateFileW( fileW, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,

1 0

Huw Davies : rpcrt4: Dynamically allocate the buffer if the fixed size one isn't large enough. Don't return an inappropriate error if we fail to get the status text, it' s only used for diagnostics.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: eaf4492c704da1190b3b3844e7340a275d71acbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf4492c704da1190b3b3844e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 19 12:23:45 2009 +0000 rpcrt4: Dynamically allocate the buffer if the fixed size one isn't large enough. Don't return an inappropriate error if we fail to get the status text, it's only used for diagnostics. --- dlls/rpcrt4/rpc_transport.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 7de6230..9e4186c 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1597,8 +1597,8 @@ static RPC_STATUS rpcrt4_http_check_response(HINTERNET hor) DWORD status_code; DWORD size; DWORD index; - WCHAR status_text[32]; - + WCHAR buf[32]; + WCHAR *status_text = buf; TRACE("\n"); index = 0; @@ -1609,11 +1609,17 @@ static RPC_STATUS rpcrt4_http_check_response(HINTERNET hor) if (status_code < 400) return RPC_S_OK; index = 0; - size = sizeof(status_text); + size = sizeof(buf); ret = HttpQueryInfoW(hor, HTTP_QUERY_STATUS_TEXT, status_text, &size, &index); - if (!ret) - return GetLastError(); - ERR("server returned: %d %s\n", status_code, debugstr_w(status_text)); + if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + status_text = HeapAlloc(GetProcessHeap(), 0, size); + ret = HttpQueryInfoW(hor, HTTP_QUERY_STATUS_TEXT, status_text, &size, &index); + } + + ERR("server returned: %d %s\n", status_code, ret ? debugstr_w(status_text) : "<status text unavailable>"); + if(status_text != buf) HeapFree(GetProcessHeap(), 0, status_text); + if (status_code == HTTP_STATUS_DENIED) return ERROR_ACCESS_DENIED; return RPC_S_SERVER_UNAVAILABLE;

1 0

Alexandre Julliard : configure: socketpair needs -lsocket on Solaris.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 98bec05ed7dbecf6d869f7b661b8b384cf672c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98bec05ed7dbecf6d869f7b66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 11:07:28 2009 +0100 configure: socketpair needs -lsocket on Solaris. --- configure | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index ef84565..3bf72df 100755 --- a/configure +++ b/configure @@ -18166,7 +18166,6 @@ CFLAGS="$CFLAGS $BUILTINFLAG" - for ac_func in \ _pclose \ _popen \ @@ -18220,7 +18219,6 @@ for ac_func in \ sigaltstack \ sigprocmask \ snprintf \ - socketpair \ spawnvp \ statfs \ statvfs \ @@ -18871,6 +18869,7 @@ fi + for ac_func in \ getaddrinfo \ getnameinfo \ @@ -18880,6 +18879,7 @@ for ac_func in \ getservbyport \ inet_network \ sendmsg \ + socketpair \ do as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index fe40d1e..6a60c9e 100644 --- a/configure.ac +++ b/configure.ac @@ -1482,7 +1482,6 @@ AC_CHECK_FUNCS(\ sigaltstack \ sigprocmask \ snprintf \ - socketpair \ spawnvp \ statfs \ statvfs \ @@ -1536,6 +1535,7 @@ AC_CHECK_FUNCS(\ getservbyport \ inet_network \ sendmsg \ + socketpair \ ) dnl **** Check for OpenLDAP ***

1 0

Alexandre Julliard : wininet/tests: Fix another instance of changed behavior on winehq.org.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 7e22055ee1a8b51ec6f152f4b7779e2b390d0f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e22055ee1a8b51ec6f152f4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 22:57:32 2009 +0100 wininet/tests: Fix another instance of changed behavior on winehq.org. --- dlls/wininet/tests/http.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 27e393b..044b96f 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -568,8 +568,8 @@ static void InternetReadFileExA_test(int flags) SET_EXPECT2(INTERNET_STATUS_REQUEST_SENT, 2); SET_EXPECT2(INTERNET_STATUS_RECEIVING_RESPONSE, 2); SET_EXPECT2(INTERNET_STATUS_RESPONSE_RECEIVED, 2); - SET_EXPECT2(INTERNET_STATUS_CLOSING_CONNECTION, 2); - SET_EXPECT2(INTERNET_STATUS_CONNECTION_CLOSED, 2); + SET_OPTIONAL2(INTERNET_STATUS_CLOSING_CONNECTION, 2); + SET_OPTIONAL2(INTERNET_STATUS_CONNECTION_CLOSED, 2); SET_EXPECT(INTERNET_STATUS_REDIRECT); SET_OPTIONAL(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_OPTIONAL(INTERNET_STATUS_CONNECTED_TO_SERVER); @@ -606,8 +606,8 @@ static void InternetReadFileExA_test(int flags) CHECK_NOTIFIED2(INTERNET_STATUS_REQUEST_SENT, 2); CHECK_NOTIFIED2(INTERNET_STATUS_RECEIVING_RESPONSE, 2); CHECK_NOTIFIED2(INTERNET_STATUS_RESPONSE_RECEIVED, 2); - todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); - todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2); + CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2); CHECK_NOTIFIED(INTERNET_STATUS_REDIRECT); if (flags & INTERNET_FLAG_ASYNC) CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE);

1 0

Huw Davies : ole32/tests: Tests for the 'Ole Private Data' clipboard format .
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: b75caee2abbde87903f2a62edb8f215e037b9d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75caee2abbde87903f2a62ed… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 14:18:51 2009 +0000 ole32/tests: Tests for the 'Ole Private Data' clipboard format. --- dlls/ole32/tests/clipboard.c | 233 +++++++++++++++++++++++++++++++++++++----- 1 files changed, 209 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b75caee2abbde87903f2a…

1 0

Huw Davies : ole32: Move the code to set the clipboard formats to a separate function.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 3383db61074d05bbf3d5e4d58e9cbacb6a4c54e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3383db61074d05bbf3d5e4d58… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 24 13:49:24 2009 +0000 ole32: Move the code to set the clipboard formats to a separate function. --- dlls/ole32/clipboard.c | 87 +++++++++++++++++++++++------------------------ 1 files changed, 43 insertions(+), 44 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 4c6f35f..008e35b 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1271,6 +1271,46 @@ static HWND OLEClipbrd_CreateWindow(void) return hwnd; } +/********************************************************************* + * set_clipboard_formats + * + * Enumerate all HGLOBAL formats supported by the source and make + * those formats available using delayed rendering using SetClipboardData. + * + * TODO: We need to additionally handle TYMED_IStorage and + * TYMED_IStream data by copying into global memory. + */ +static HRESULT set_clipboard_formats(IDataObject *data) +{ + HRESULT hr; + FORMATETC fmt; + IEnumFORMATETC *enum_fmt; + + hr = IDataObject_EnumFormatEtc(data, DATADIR_GET, &enum_fmt); + if(FAILED(hr)) return hr; + + while(IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL) == S_OK) + { + if (fmt.tymed == TYMED_HGLOBAL) + { + char fmt_name[80]; + TRACE("(cfFormat=%d:%s)\n", fmt.cfFormat, + GetClipboardFormatNameA(fmt.cfFormat, fmt_name, sizeof(fmt_name)-1) ? fmt_name : ""); + + SetClipboardData(fmt.cfFormat, NULL); + } + } + + IEnumFORMATETC_Release(enum_fmt); + return S_OK; +} + +/********************************************************************* + * set_dataobject_format + * + * Windows creates a 'DataObject' clipboard format that contains the + * clipboard window's HWND or NULL if the Ole clipboard has been flushed. + */ static HRESULT set_dataobject_format(HWND hwnd) { HGLOBAL h = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, sizeof(hwnd)); @@ -1312,8 +1352,6 @@ static HRESULT set_dataobject_format(HWND hwnd) HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) { HRESULT hr = S_OK; - IEnumFORMATETC* penumFormatetc = NULL; - FORMATETC rgelt; BOOL bClipboardOpen = FALSE; struct oletls *info = COM_CurrentInfo(); @@ -1361,54 +1399,15 @@ HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) theOleClipboard->pIDataObjectSrc = NULL; } - /* - * AddRef the data object passed in and save its pointer. - * A NULL value indicates that the clipboard should be emptied. - */ + /* A NULL value indicates that the clipboard should be emptied. */ theOleClipboard->pIDataObjectSrc = pDataObj; if ( pDataObj ) { IDataObject_AddRef(theOleClipboard->pIDataObjectSrc); + hr = set_clipboard_formats(pDataObj); + if(FAILED(hr)) goto CLEANUP; } - /* - * Enumerate all HGLOBAL formats supported by the source and make - * those formats available using delayed rendering using SetClipboardData. - * Only global memory based data items may be made available to non-OLE - * applications via the standard Windows clipboard API. Data based on other - * mediums(non TYMED_HGLOBAL) can only be accessed via the Ole Clipboard API. - * - * TODO: Do we need to additionally handle TYMED_IStorage media by copying - * the storage into global memory? - */ - if ( pDataObj ) - { - if ( FAILED(hr = IDataObject_EnumFormatEtc( pDataObj, - DATADIR_GET, - &penumFormatetc ))) - { - HANDLE_ERROR( hr ); - } - - while ( S_OK == IEnumFORMATETC_Next(penumFormatetc, 1, &rgelt, NULL) ) - { - if ( rgelt.tymed == TYMED_HGLOBAL ) - { - CHAR szFmtName[80]; - TRACE("(cfFormat=%d:%s)\n", rgelt.cfFormat, - GetClipboardFormatNameA(rgelt.cfFormat, szFmtName, sizeof(szFmtName)-1) - ? szFmtName : ""); - - SetClipboardData( rgelt.cfFormat, NULL); - } - } - IEnumFORMATETC_Release(penumFormatetc); - } - - /* - * Windows additionally creates a new "DataObject" clipboard format - * and stores the clipboard window's HWND in it - */ hr = set_dataobject_format(theOleClipboard->hWndClipboard); CLEANUP:

1 0

Rob Shearman : rpcrt4: Implement RPC over HTTP support.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 5f6ae94ad0163341c2cd79a89f29b2187367b5ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6ae94ad0163341c2cd79a89… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 18 11:13:19 2009 +0000 rpcrt4: Implement RPC over HTTP support. CodeWeavers did this work for supporting the optional HTTP connection method of Outlook 2003/2007 (must be running with Windows versions set to XP or higher to see this option). This was written before Microsoft publicly released a specification for the RPC over HTTP protocol and so was developed by examining traffic flowing between a Windows client and an IIS server. --- dlls/rpcrt4/Makefile.in | 2 +- dlls/rpcrt4/rpc_assoc.c | 1 + dlls/rpcrt4/rpc_assoc.h | 1 + dlls/rpcrt4/rpc_binding.h | 3 + dlls/rpcrt4/rpc_defs.h | 10 + dlls/rpcrt4/rpc_message.c | 332 ++++++++++++++- dlls/rpcrt4/rpc_message.h | 11 + dlls/rpcrt4/rpc_transport.c | 994 ++++++++++++++++++++++++++++++++++++++++++- 8 files changed, 1337 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f6ae94ad0163341c2cd7…

1 0

Rob Shearman : rpcrt4: Implement stubless asynchronous NDR interpreter.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 834c5b4275c376c55cbb27182069793bfd95226d URL: http://source.winehq.org/git/wine.git/?a=commit;h=834c5b4275c376c55cbb27182… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 18 10:59:35 2009 +0000 rpcrt4: Implement stubless asynchronous NDR interpreter. CodeWeavers did this work for supporting Outlook 2007. --- dlls/rpcrt4/ndr_stubless.c | 336 ++++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/ndr_stubless.h | 1 + dlls/rpcrt4/rpc_assoc.c | 1 + dlls/rpcrt4/rpc_async.c | 16 ++- dlls/rpcrt4/rpcrt4.spec | 3 +- 5 files changed, 354 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=834c5b4275c376c55cbb2…

1 0

Hans Leidekker : msi: Detect privately installed assemblies.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 9c6e6efa32976e9a91330bf5bd1c0be02d6b6167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c6e6efa32976e9a91330bf5b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 25 13:52:56 2009 +0100 msi: Detect privately installed assemblies. Another fix for the office 2007 sp1 installer. --- dlls/msi/action.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ce038a1..92b95df 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6070,9 +6070,24 @@ static UINT load_assembly(MSIRECORD *rec, LPVOID param) assembly->manifest = strdupW(MSI_RecordGetString(rec, 3)); assembly->application = strdupW(MSI_RecordGetString(rec, 4)); assembly->attributes = MSI_RecordGetInteger(rec, 5); - assembly->installed = check_assembly_installed(list->package->db, - list->cache, - assembly->component); + + if (assembly->application) + { + WCHAR version[24]; + DWORD size = sizeof(version)/sizeof(WCHAR); + + /* FIXME: we should probably check the manifest file here */ + + if (!MsiGetFileVersionW(assembly->file->TargetPath, version, &size, NULL, NULL) && + strcmpW(version, assembly->file->Version) >= 0) + { + assembly->installed = TRUE; + } + } + else + assembly->installed = check_assembly_installed(list->package->db, + list->cache, + assembly->component); list_add_head(list->assemblies, &assembly->entry); return ERROR_SUCCESS;

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
84
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 March 2009