November 2005 - Wine-Commits

wine/dlls/rpcrt4 ndr_marshall.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21480 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:04:53 Modified files: dlls/rpcrt4 : ndr_marshall.c Log message: Robert Shearman <rob(a)codeweavers.com> Add functions for marshaling base types (ints, floats, etc.). Patch: http://cvs.winehq.org/patch.py?id=21480 Old revision New revision Changes Path 1.33 1.34 +272 -15 wine/dlls/rpcrt4/ndr_marshall.c

1 0

wine/dlls/shdocvw dochost.c oleobject.c shdocv ...
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21479 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:04:42 Modified files: dlls/shdocvw : dochost.c oleobject.c shdocvw.h webbrowser.c Log message: Jacek Caban <jacek(a)codeweavers.com> Better windows handling. Patch: http://cvs.winehq.org/patch.py?id=21479 Old revision New revision Changes Path 1.2 1.3 +52 -0 wine/dlls/shdocvw/dochost.c 1.19 1.20 +9 -36 wine/dlls/shdocvw/oleobject.c 1.33 1.34 +2 -0 wine/dlls/shdocvw/shdocvw.h 1.27 1.28 +3 -0 wine/dlls/shdocvw/webbrowser.c Index: wine/dlls/shdocvw/dochost.c diff -u -p wine/dlls/shdocvw/dochost.c:1.2 wine/dlls/shdocvw/dochost.c:1.3 --- wine/dlls/shdocvw/dochost.c:1.2 28 Nov 2005 11: 4:42 -0000 +++ wine/dlls/shdocvw/dochost.c 28 Nov 2005 11: 4:42 -0000 @@ -21,6 +21,56 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +static ATOM doc_view_atom = 0; + +static LRESULT WINAPI doc_view_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + WebBrowser *This; + + static const WCHAR wszTHIS[] = {'T','H','I','S',0}; + + if(msg == WM_CREATE) { + This = *(WebBrowser**)lParam; + ERR("create %p\n", This); + SetPropW(hwnd, wszTHIS, This); + }else { + This = GetPropW(hwnd, wszTHIS); + } + + return DefWindowProcA(hwnd, msg, wParam, lParam); +} + +void create_doc_view_hwnd(WebBrowser *This) +{ + RECT rect; + + static const WCHAR wszShell_DocObject_View[] = + {'S','h','e','l','l',' ','D','o','c','O','b','j','e','c','t',' ','V','i','e','w',0}; + + if(!doc_view_atom) { + static WNDCLASSEXW wndclass = { + sizeof(wndclass), + CS_PARENTDC, + doc_view_proc, + 0, 0 /* native uses 4*/, NULL, NULL, NULL, + (HBRUSH)COLOR_WINDOWFRAME, NULL, + wszShell_DocObject_View, + NULL + }; + + wndclass.hInstance = shdocvw_hinstance; + + doc_view_atom = RegisterClassExW(&wndclass); + } + + GetWindowRect(This->shell_embedding_hwnd, &rect); + This->doc_view_hwnd = CreateWindowExW(0, wszShell_DocObject_View, + wszShell_DocObject_View, + WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX, + rect.left, rect.top, rect.right, rect.bottom, This->shell_embedding_hwnd, + NULL, shdocvw_hinstance, This); +} + #define DOCHOSTUI_THIS(iface) DEFINE_THIS(WebBrowser, DocHostUIHandler, iface) static HRESULT WINAPI DocHostUIHandler_QueryInterface(IDocHostUIHandler2 *iface, @@ -214,4 +264,6 @@ static const IDocHostUIHandler2Vtbl DocH void WebBrowser_DocHost_Init(WebBrowser *This) { This->lpDocHostUIHandlerVtbl = &DocHostUIHandler2Vtbl; + + This->doc_view_hwnd = NULL; } Index: wine/dlls/shdocvw/oleobject.c diff -u -p wine/dlls/shdocvw/oleobject.c:1.19 wine/dlls/shdocvw/oleobject.c:1.20 --- wine/dlls/shdocvw/oleobject.c:1.19 28 Nov 2005 11: 4:42 -0000 +++ wine/dlls/shdocvw/oleobject.c 28 Nov 2005 11: 4:42 -0000 @@ -29,46 +29,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); -static ATOM doc_view_atom = 0; static ATOM shell_embedding_atom = 0; -static LRESULT WINAPI doc_view_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - return DefWindowProcA(hwnd, msg, wParam, lParam); -} - static LRESULT WINAPI shell_embedding_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { return DefWindowProcA(hwnd, msg, wParam, lParam); } -static void create_doc_view_hwnd(WebBrowser *This) -{ - static const WCHAR wszShell_DocObject_View[] = - {'S','h','e','l','l',' ','D','o','c','O','b','j','e','c','t',' ','V','i','e','w',0}; - - if(!doc_view_atom) { - static WNDCLASSEXW wndclass = { - sizeof(wndclass), - CS_PARENTDC, - doc_view_proc, - 0, 0 /* native uses 4*/, NULL, NULL, NULL, - (HBRUSH)COLOR_WINDOWFRAME, NULL, - wszShell_DocObject_View, - NULL - }; - - wndclass.hInstance = shdocvw_hinstance; - - doc_view_atom = RegisterClassExW(&wndclass); - } - - This->doc_view_hwnd = CreateWindowExW(0, wszShell_DocObject_View, NULL, - WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX, - 0, 0, 0, 0, This->shell_embedding_hwnd, - NULL, shdocvw_hinstance, This); -} - static void create_shell_embedding_hwnd(WebBrowser *This) { IOleInPlaceSite *inplace; @@ -99,12 +66,10 @@ static void create_shell_embedding_hwnd( IOleInPlaceSite_Release(inplace); } - This->shell_embedding_hwnd = CreateWindowExW(0, wszShellEmbedding, NULL, + This->shell_embedding_hwnd = CreateWindowExW(0, wszShellEmbedding, wszShellEmbedding, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX, 0, 0, 0, 0, parent, NULL, shdocvw_hinstance, This); - - create_doc_view_hwnd(This); } /********************************************************************** @@ -266,6 +231,13 @@ static HRESULT WINAPI OleObject_DoVerb(I IOleInPlaceSite_Release(inplace); + SetWindowPos(This->shell_embedding_hwnd, NULL, + This->pos_rect.left, This->pos_rect.top, + This->pos_rect.right-This->pos_rect.left, + This->pos_rect.bottom-This->pos_rect.top, + SWP_NOZORDER | SWP_SHOWWINDOW); + + if(This->client) { IOleClientSite_ShowObject(This->client); IOleClientSite_GetContainer(This->client, &This->container); @@ -586,6 +558,7 @@ void WebBrowser_OleObject_Init(WebBrowse This->frame_hwnd = NULL; This->frame = NULL; This->uiwindow = NULL; + This->shell_embedding_hwnd = NULL; memset(&This->pos_rect, 0, sizeof(RECT)); memset(&This->clip_rect, 0, sizeof(RECT)); Index: wine/dlls/shdocvw/shdocvw.h diff -u -p wine/dlls/shdocvw/shdocvw.h:1.33 wine/dlls/shdocvw/shdocvw.h:1.34 --- wine/dlls/shdocvw/shdocvw.h:1.33 28 Nov 2005 11: 4:42 -0000 +++ wine/dlls/shdocvw/shdocvw.h 28 Nov 2005 11: 4:42 -0000 @@ -146,6 +146,8 @@ void WebBrowser_Events_Destroy(WebBrowse HRESULT WebBrowser_Create(IUnknown*,REFIID,void**); +void create_doc_view_hwnd(WebBrowser *This); + #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) /********************************************************************** Index: wine/dlls/shdocvw/webbrowser.c diff -u -p wine/dlls/shdocvw/webbrowser.c:1.27 wine/dlls/shdocvw/webbrowser.c:1.28 --- wine/dlls/shdocvw/webbrowser.c:1.27 28 Nov 2005 11: 4:43 -0000 +++ wine/dlls/shdocvw/webbrowser.c 28 Nov 2005 11: 4:43 -0000 @@ -515,6 +515,9 @@ static HRESULT WINAPI WebBrowser_Navigat if(V_VT(URL) != VT_BSTR) return E_INVALIDARG; + if(!This->doc_view_hwnd) + create_doc_view_hwnd(This); + /* * FIXME: * We should use URLMoniker's BindToObject instead creating HTMLDocument here.

1 0

wine/dlls/shell32 shell32_main.h
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21478 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:04:35 Modified files: dlls/shell32 : shell32_main.h Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Modified KeyStateToDropEffect macro to match native shellview's behaviour. Patch: http://cvs.winehq.org/patch.py?id=21478 Old revision New revision Changes Path 1.109 1.110 +3 -3 wine/dlls/shell32/shell32_main.h Index: wine/dlls/shell32/shell32_main.h diff -u -p wine/dlls/shell32/shell32_main.h:1.109 wine/dlls/shell32/shell32_main.h:1.110 --- wine/dlls/shell32/shell32_main.h:1.109 28 Nov 2005 11: 4:35 -0000 +++ wine/dlls/shell32/shell32_main.h 28 Nov 2005 11: 4:35 -0000 @@ -121,9 +121,9 @@ HRESULT WINAPI Shell_MergeMenus (HMENU h }; #define KeyStateToDropEffect(kst)\ - (((kst) & MK_CONTROL) ?\ - (((kst) & MK_SHIFT) ? DROPEFFECT_LINK : DROPEFFECT_COPY):\ - DROPEFFECT_MOVE) + ((((kst)&(MK_CONTROL|MK_SHIFT))==(MK_CONTROL|MK_SHIFT)) ? DROPEFFECT_LINK :\ + (((kst)&(MK_CONTROL|MK_SHIFT)) ? DROPEFFECT_COPY :\ + DROPEFFECT_MOVE)) /* Systray */ BOOL SYSTRAY_Init(void);

1 0

wine/dlls/wininet http.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21477 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:04:31 Modified files: dlls/wininet : http.c Log message: Robert Shearman <rob(a)codeweavers.com> Simplify HTTP_InsertProxyAuthorization. Patch: http://cvs.winehq.org/patch.py?id=21477 Old revision New revision Changes Path 1.116 1.117 +9 -19 wine/dlls/wininet/http.c Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.116 wine/dlls/wininet/http.c:1.117 --- wine/dlls/wininet/http.c:1.116 28 Nov 2005 11: 4:31 -0000 +++ wine/dlls/wininet/http.c 28 Nov 2005 11: 4:31 -0000 @@ -873,30 +873,20 @@ static LPWSTR HTTP_EncodeBasicAuth( LPCW static BOOL HTTP_InsertProxyAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR username, LPCWSTR password ) { - HTTPHEADERW hdr; - INT index; - static const WCHAR szProxyAuthorization[] = { - 'P','r','o','x','y','-','A','u','t','h','o','r','i','z','a','t','i','o','n',0 }; + WCHAR *authorization = HTTP_EncodeBasicAuth( username, password ); + BOOL ret; - hdr.lpszValue = HTTP_EncodeBasicAuth( username, password ); - hdr.lpszField = (WCHAR *)szProxyAuthorization; - hdr.wFlags = HDR_ISREQUEST; - hdr.wCount = 0; - if( !hdr.lpszValue ) + if (!authorization) return FALSE; - TRACE("Inserting %s = %s\n", - debugstr_w( hdr.lpszField ), debugstr_w( hdr.lpszValue ) ); + TRACE( "Inserting authorization: %s\n", debugstr_w( authorization ) ); - /* remove the old proxy authorization header */ - index = HTTP_GetCustomHeaderIndex( lpwhr, hdr.lpszField ); - if( index >=0 ) - HTTP_DeleteCustomHeader( lpwhr, index ); - - HTTP_InsertCustomHeader(lpwhr, &hdr); - HeapFree( GetProcessHeap(), 0, hdr.lpszValue ); + ret = HTTP_ReplaceHeaderValue( &lpwhr->StdHeaders[HTTP_QUERY_PROXY_AUTHORIZATION], + authorization ); + + HeapFree( GetProcessHeap(), 0, authorization ); - return TRUE; + return ret; } /***********************************************************************

1 0

wine/dlls/ole32 compobj_private.h defaulthandl ...
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21476 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:04:19 Modified files: dlls/ole32 : compobj_private.h defaulthandler.c oleobj.c Log message: Robert Shearman <rob(a)codeweavers.com> Delegate advises to the remote object to enable the client to receive data change notifications. Patch: http://cvs.winehq.org/patch.py?id=21476 Old revision New revision Changes Path 1.59 1.60 +4 -0 wine/dlls/ole32/compobj_private.h 1.37 1.38 +20 -1 wine/dlls/ole32/defaulthandler.c 1.27 1.28 +32 -1 wine/dlls/ole32/oleobj.c Index: wine/dlls/ole32/compobj_private.h diff -u -p wine/dlls/ole32/compobj_private.h:1.59 wine/dlls/ole32/compobj_private.h:1.60 --- wine/dlls/ole32/compobj_private.h:1.59 28 Nov 2005 11: 4:19 -0000 +++ wine/dlls/ole32/compobj_private.h 28 Nov 2005 11: 4:19 -0000 @@ -263,4 +263,8 @@ extern HINSTANCE OLE32_hInstance; /* FIX #define CHARS_IN_GUID 39 /* including NULL */ +/* Exported non-interface Data Advise Holder functions */ +HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate); +void DataAdviseHolder_OnDisconnect(IDataAdviseHolder *iface); + #endif /* __WINE_OLE_COMPOBJ_H */ Index: wine/dlls/ole32/defaulthandler.c diff -u -p wine/dlls/ole32/defaulthandler.c:1.37 wine/dlls/ole32/defaulthandler.c:1.38 --- wine/dlls/ole32/defaulthandler.c:1.37 28 Nov 2005 11: 4:19 -0000 +++ wine/dlls/ole32/defaulthandler.c 28 Nov 2005 11: 4:19 -0000 @@ -55,8 +55,11 @@ #include "winbase.h" #include "winuser.h" #include "winerror.h" -#include "wine/unicode.h" #include "ole2.h" + +#include "compobj_private.h" + +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -108,6 +111,8 @@ struct DefaultHandler IOleObject *pOleDelegate; /* IPersistStorage delegate */ IPersistStorage *pPSDelegate; + /* IDataObject delegate */ + IDataObject *pDataDelegate; /* connection cookie for the advise on the delegate OLE object */ DWORD dwAdvConn; @@ -411,6 +416,12 @@ static void WINAPI DefaultHandler_Stop(D /* FIXME: call IOleCache_OnStop */ + DataAdviseHolder_OnDisconnect(This->dataAdviseHolder); + if (This->pDataDelegate) + { + IDataObject_Release(This->pDataDelegate); + This->pDataDelegate = NULL; + } if (This->pPSDelegate) { IPersistStorage_Release(This->pPSDelegate); @@ -1284,6 +1295,13 @@ static HRESULT WINAPI DefaultHandler_Run * - IOleCache_OnRun */ + if (SUCCEEDED(hr)) + hr = IOleObject_QueryInterface(This->pOleDelegate, &IID_IDataObject, + (void **)&This->pDataDelegate); + + if (SUCCEEDED(hr) && This->dataAdviseHolder) + hr = DataAdviseHolder_OnConnect(This->dataAdviseHolder, This->pDataDelegate); + if (FAILED(hr)) DefaultHandler_Stop(This); @@ -1558,6 +1576,7 @@ static DefaultHandler* DefaultHandler_Co This->containerObj = NULL; This->pOleDelegate = NULL; This->pPSDelegate = NULL; + This->pDataDelegate = NULL; This->dwAdvConn = 0; Index: wine/dlls/ole32/oleobj.c diff -u -p wine/dlls/ole32/oleobj.c:1.27 wine/dlls/ole32/oleobj.c:1.28 --- wine/dlls/ole32/oleobj.c:1.27 28 Nov 2005 11: 4:19 -0000 +++ wine/dlls/ole32/oleobj.c 28 Nov 2005 11: 4:19 -0000 @@ -351,6 +351,7 @@ typedef struct DataAdviseConnection { IAdviseSink *sink; FORMATETC fmat; DWORD advf; + DWORD remote_connection; } DataAdviseConnection; typedef struct DataAdviseHolder @@ -362,6 +363,9 @@ typedef struct DataAdviseHolder DataAdviseConnection* Connections; } DataAdviseHolder; +/* this connection has also has been advised to the delegate data object */ +#define WINE_ADVF_REMOTE 0x80000000 + /****************************************************************************** * DataAdviseHolder_Destructor */ @@ -520,7 +524,7 @@ static HRESULT WINAPI DataAdviseHolder_A */ This->Connections[index].sink = pAdvise; memcpy(&(This->Connections[index].fmat), pFetc, sizeof(FORMATETC)); - This->Connections[index].advf = advf; + This->Connections[index].advf = advf & ~WINE_ADVF_REMOTE; if (This->Connections[index].sink != NULL) { IAdviseSink_AddRef(This->Connections[index].sink); @@ -636,6 +640,33 @@ static const IDataAdviseHolderVtbl DataA DataAdviseHolder_SendOnDataChange }; +HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate) +{ + DataAdviseHolder *This = (DataAdviseHolder *)iface; + DWORD index; + HRESULT hr = S_OK; + + for(index = 0; index < This->maxCons; index++) + { + if(This->Connections[index].sink != NULL) + { + hr = IDataObject_DAdvise(pDelegate, &This->Connections[index].fmat, + This->Connections[index].advf, + This->Connections[index].sink, + &This->Connections[index].remote_connection); + if (FAILED(hr)) break; + This->Connections[index].advf |= WINE_ADVF_REMOTE; + } + } + /* FIXME: store pDelegate somewhere */ + return hr; +} + +void DataAdviseHolder_OnDisconnect(IDataAdviseHolder *iface) +{ + /* FIXME: Unadvise all remote interfaces */ +} + /****************************************************************************** * DataAdviseHolder_Constructor */

1 0

wine/dlls/rpcrt4 ndr_marshall.c ndr_misc.h
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21475 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:04:09 Modified files: dlls/rpcrt4 : ndr_marshall.c ndr_misc.h Log message: Robert Shearman <rob(a)codeweavers.com> Extend conformance computation function to also compute variances. MSDN suggests that conformance and variance are pretty much the same, but there may be some subtleties to it. Patch: http://cvs.winehq.org/patch.py?id=21475 Old revision New revision Changes Path 1.32 1.33 +17 -7 wine/dlls/rpcrt4/ndr_marshall.c 1.5 1.6 +5 -2 wine/dlls/rpcrt4/ndr_misc.h Index: wine/dlls/rpcrt4/ndr_marshall.c diff -u -p wine/dlls/rpcrt4/ndr_marshall.c:1.32 wine/dlls/rpcrt4/ndr_marshall.c:1.33 --- wine/dlls/rpcrt4/ndr_marshall.c:1.32 28 Nov 2005 11: 4: 9 -0000 +++ wine/dlls/rpcrt4/ndr_marshall.c 28 Nov 2005 11: 4: 9 -0000 @@ -286,17 +286,27 @@ PFORMAT_STRING ReadConformance(MIDL_STUB return pFormat+4; } -PFORMAT_STRING ComputeConformance(MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pMemory, - PFORMAT_STRING pFormat, ULONG_PTR def) +static inline PFORMAT_STRING ReadVariance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) +{ + pStubMsg->ActualCount = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); + pStubMsg->Buffer += 4; + TRACE("unmarshalled variance is %ld\n", pStubMsg->ActualCount); + return pFormat+4; +} + +PFORMAT_STRING ComputeConformanceOrVariance( + MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pMemory, + PFORMAT_STRING pFormat, ULONG_PTR def, ULONG *pCount) { BYTE dtype = pFormat[0] & 0xf; short ofs = *(short *)&pFormat[2]; LPVOID ptr = NULL; DWORD data = 0; + /* FIXME: is this correct? */ if (pFormat[0] == 0xff) { /* null descriptor */ - pStubMsg->MaxCount = def; + *pCount = def; goto finish_conf; } @@ -315,14 +325,14 @@ PFORMAT_STRING ComputeConformance(MIDL_S ptr = pStubMsg->StackTop + ofs; } else { - /* -Os mode, MaxCount is already set */ + /* -Os mode, *pCount is already set */ goto finish_conf; } break; case RPC_FC_CONSTANT_CONFORMANCE: data = ofs | ((DWORD)pFormat[1] << 16); TRACE("constant conformance, val=%ld\n", data); - pStubMsg->MaxCount = data; + *pCount = data; goto finish_conf; case RPC_FC_TOP_LEVEL_MULTID_CONFORMANCE: FIXME("toplevel multidimensional conformance, ofs=%d\n", ofs); @@ -376,7 +386,7 @@ PFORMAT_STRING ComputeConformance(MIDL_S done_conf_grab: switch (pFormat[1]) { case 0: /* no op */ - pStubMsg->MaxCount = data; + *pCount = data; break; case RPC_FC_DEREFERENCE: /* already handled */ @@ -387,7 +397,7 @@ done_conf_grab: } finish_conf: - TRACE("resulting conformance is %ld\n", pStubMsg->MaxCount); + TRACE("resulting conformance is %ld\n", *pCount); return pFormat+4; } Index: wine/dlls/rpcrt4/ndr_misc.h diff -u -p wine/dlls/rpcrt4/ndr_misc.h:1.5 wine/dlls/rpcrt4/ndr_misc.h:1.6 --- wine/dlls/rpcrt4/ndr_misc.h:1.5 28 Nov 2005 11: 4: 9 -0000 +++ wine/dlls/rpcrt4/ndr_misc.h 28 Nov 2005 11: 4: 9 -0000 @@ -35,8 +35,11 @@ LONG_PTR RPCRT4_NdrClientCall2(PMIDL_STU HRESULT RPCRT4_GetPSFactory(REFIID riid, struct IPSFactoryBuffer **ppPS); -PFORMAT_STRING ComputeConformance(MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pMemory, - PFORMAT_STRING pFormat, ULONG_PTR def); +#define ComputeConformance(pStubMsg, pMemory, pFormat, def) ComputeConformanceOrVariance(pStubMsg, pMemory, pFormat, def, &pStubMsg->MaxCount) +#define ComputeVariance(pStubMsg, pMemory, pFormat, def) ComputeConformanceOrVariance(pStubMsg, pMemory, pFormat, def, &pStubMsg->ActualCount) +PFORMAT_STRING ComputeConformanceOrVariance( + MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pMemory, + PFORMAT_STRING pFormat, ULONG_PTR def, ULONG *pCount); typedef unsigned char* (WINAPI *NDR_MARSHALL) (PMIDL_STUB_MESSAGE, unsigned char*, PFORMAT_STRING); typedef unsigned char* (WINAPI *NDR_UNMARSHALL)(PMIDL_STUB_MESSAGE, unsigned char**,PFORMAT_STRING, unsigned char);

1 0

wine/dlls/shdocvw Makefile.in client.c shdocvw ...
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21474 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:03:59 Modified files: dlls/shdocvw : Makefile.in client.c shdocvw.h webbrowser.c Added files: dlls/shdocvw : frame.c Log message: Jacek Caban <jacek(a)codeweavers.com> Added implementation of GetWindowContext. Added stub implementation of IOleInPlaceFrame interface. Patch: http://cvs.winehq.org/patch.py?id=21474 Old revision New revision Changes Path 1.20 1.21 +1 -0 wine/dlls/shdocvw/Makefile.in 1.4 1.5 +15 -2 wine/dlls/shdocvw/client.c 1.32 1.33 +8 -0 wine/dlls/shdocvw/shdocvw.h 1.26 1.27 +1 -0 wine/dlls/shdocvw/webbrowser.c Added 1.1 +0 -0 wine/dlls/shdocvw/frame.c

1 0

wine/dlls iccvid/.cvsignore msvidc32/.cvsignore
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21473 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:03:46 Modified files: dlls/iccvid : .cvsignore dlls/msvidc32 : .cvsignore Log message: Ignore generated rsrc.res. Patch: http://cvs.winehq.org/patch.py?id=21473 Old revision New revision Changes Path 1.5 1.6 +1 -0 wine/dlls/iccvid/.cvsignore 1.5 1.6 +1 -0 wine/dlls/msvidc32/.cvsignore Index: wine/dlls/iccvid/.cvsignore diff -u -p wine/dlls/iccvid/.cvsignore:1.5 wine/dlls/iccvid/.cvsignore:1.6 --- wine/dlls/iccvid/.cvsignore:1.5 28 Nov 2005 11: 3:46 -0000 +++ wine/dlls/iccvid/.cvsignore 28 Nov 2005 11: 3:46 -0000 @@ -1 +1,2 @@ Makefile +rsrc.res Index: wine/dlls/msvidc32/.cvsignore diff -u -p wine/dlls/msvidc32/.cvsignore:1.5 wine/dlls/msvidc32/.cvsignore:1.6 --- wine/dlls/msvidc32/.cvsignore:1.5 28 Nov 2005 11: 3:46 -0000 +++ wine/dlls/msvidc32/.cvsignore 28 Nov 2005 11: 3:46 -0000 @@ -1 +1,2 @@ Makefile +rsrc.res

1 0

wine/dlls/shell32 shlview.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21472 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:03:43 Modified files: dlls/shell32 : shlview.c Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Register the shell view itself as the drop target, not it's parent folder. Forward drag&drop method calls to the folder currently under the cursor. Patch: http://cvs.winehq.org/patch.py?id=21472 Old revision New revision Changes Path 1.120 1.121 +96 -32 wine/dlls/shell32/shlview.c Index: wine/dlls/shell32/shlview.c diff -u -p wine/dlls/shell32/shlview.c:1.120 wine/dlls/shell32/shlview.c:1.121 --- wine/dlls/shell32/shlview.c:1.120 28 Nov 2005 11: 3:43 -0000 +++ wine/dlls/shell32/shlview.c 28 Nov 2005 11: 3:43 -0000 @@ -100,6 +100,9 @@ typedef struct DWORD dwAspects; DWORD dwAdvf; IAdviseSink *pAdvSink; + IDropTarget* pCurDropTarget; /* The sub-item, which is currently dragged over */ + IDataObject* pCurDataObject; /* The dragged data-object */ + LONG iDragOverItem; /* Dragged over item's index, iff pCurDropTarget != NULL */ } IShellViewImpl; static const IShellViewVtbl svvt; @@ -190,6 +193,10 @@ IShellView * IShellView_Constructor( ISh if(pFolder) IShellFolder_AddRef(pFolder); IShellFolder_QueryInterface(sv->pSFParent, &IID_IShellFolder2, (LPVOID*)&sv->pSF2Parent); + sv->pCurDropTarget = NULL; + sv->pCurDataObject = NULL; + sv->iDragOverItem = 0; + TRACE("(%p)->(%p)\n",sv, pFolder); return (IShellView *) sv; } @@ -671,7 +678,7 @@ static LRESULT ShellView_OnCreate(IShell } } - if (SUCCEEDED(IShellFolder_CreateViewObject(This->pSFParent, This->hWnd, &IID_IDropTarget, (LPVOID*)&pdt))) + if (SUCCEEDED(IUnknown_QueryInterface((IUnknown*)&This->lpVtbl, &IID_IDropTarget, (LPVOID*)&pdt))) { RegisterDragDrop(This->hWnd, pdt); IDropTarget_Release(pdt); @@ -2169,56 +2176,113 @@ static ULONG WINAPI ISVDropTarget_Releas return IShellFolder_Release((IShellFolder*)This); } -static HRESULT WINAPI ISVDropTarget_DragEnter( - IDropTarget *iface, - IDataObject *pDataObject, - DWORD grfKeyState, - POINTL pt, - DWORD *pdwEffect) +/****************************************************************************** + * drag_notify_subitem [Internal] + * + * Figure out the shellfolder object, which is currently under the mouse cursor + * and notify it via the IDropTarget interface. + */ +static HRESULT drag_notify_subitem(IShellViewImpl *This, DWORD grfKeyState, POINTL pt, + DWORD *pdwEffect) { + LVHITTESTINFO htinfo; + LVITEMA lvItem; + LONG lResult; + HRESULT hr; + + /* Map from global to client coordinates and query the index of the listview-item, which is + * currently under the mouse cursor. */ + htinfo.pt.x = pt.x; + htinfo.pt.y = pt.y; + htinfo.flags = LVHT_ONITEM; + MapWindowPoints(NULL, This->hWndList, &htinfo.pt, 1); + lResult = SendMessageW(This->hWndList, LVM_HITTEST, 0, (LPARAM)&htinfo); + + /* If we are still over the previous sub-item, notify it via DragOver and return. */ + if (This->pCurDropTarget && lResult == This->iDragOverItem) + return IDropTarget_DragOver(This->pCurDropTarget, grfKeyState, pt, pdwEffect); + + /* We've left the previous sub-item, notify it via DragLeave and Release it. */ + if (This->pCurDropTarget) { + IDropTarget_DragLeave(This->pCurDropTarget); + IDropTarget_Release(This->pCurDropTarget); + This->pCurDropTarget = NULL; + } - IShellViewImpl *This = impl_from_IDropTarget(iface); + This->iDragOverItem = lResult; + if (lResult == -1) { + /* We are not above one of the listview's subitems. Bind to the parent folder's + * DropTarget interface. */ + hr = IShellFolder_QueryInterface(This->pSFParent, &IID_IDropTarget, + (LPVOID*)&This->pCurDropTarget); + } else { + /* Query the relative PIDL of the shellfolder object represented by the currently + * dragged over listview-item ... */ + ZeroMemory(&lvItem, sizeof(lvItem)); + lvItem.mask = LVIF_PARAM; + lvItem.iItem = lResult; + ListView_GetItemA(This->hWndList, &lvItem); + + /* ... and bind pCurDropTarget to this folder's IDropTarget interface */ + hr = IShellFolder_BindToObject(This->pSFParent, (LPITEMIDLIST)lvItem.lParam, NULL, + &IID_IDropTarget, (LPVOID*)&This->pCurDropTarget); + } - FIXME("Stub: This=%p, DataObject=%p\n",This,pDataObject); + /* If anything failed, pCurDropTarget should be NULL now, which ought to be a save state. */ + if (FAILED(hr)) + return hr; - return E_NOTIMPL; + /* Notify the item just entered via DragEnter. */ + return IDropTarget_DragEnter(This->pCurDropTarget, This->pCurDataObject, grfKeyState, pt, pdwEffect); } -static HRESULT WINAPI ISVDropTarget_DragOver( - IDropTarget *iface, - DWORD grfKeyState, - POINTL pt, - DWORD *pdwEffect) +static HRESULT WINAPI ISVDropTarget_DragEnter(IDropTarget *iface, IDataObject *pDataObject, + DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { - IShellViewImpl *This = impl_from_IDropTarget(iface); + IShellViewImpl *This = impl_from_IDropTarget(iface); - FIXME("Stub: This=%p\n",This); + /* Get a hold on the data object for later calls to DragEnter on the sub-folders */ + This->pCurDataObject = pDataObject; + IDataObject_AddRef(pDataObject); - return E_NOTIMPL; + return drag_notify_subitem(This, grfKeyState, pt, pdwEffect); } -static HRESULT WINAPI ISVDropTarget_DragLeave( - IDropTarget *iface) +static HRESULT WINAPI ISVDropTarget_DragOver(IDropTarget *iface, DWORD grfKeyState, POINTL pt, + DWORD *pdwEffect) { - IShellViewImpl *This = impl_from_IDropTarget(iface); + IShellViewImpl *This = impl_from_IDropTarget(iface); + return drag_notify_subitem(This, grfKeyState, pt, pdwEffect); +} - FIXME("Stub: This=%p\n",This); +static HRESULT WINAPI ISVDropTarget_DragLeave(IDropTarget *iface) { + IShellViewImpl *This = impl_from_IDropTarget(iface); - return E_NOTIMPL; + IDropTarget_DragLeave(This->pCurDropTarget); + + IDropTarget_Release(This->pCurDropTarget); + IDataObject_Release(This->pCurDataObject); + This->pCurDataObject = NULL; + This->pCurDropTarget = NULL; + This->iDragOverItem = 0; + + return S_OK; } -static HRESULT WINAPI ISVDropTarget_Drop( - IDropTarget *iface, - IDataObject* pDataObject, - DWORD grfKeyState, - POINTL pt, - DWORD *pdwEffect) +static HRESULT WINAPI ISVDropTarget_Drop(IDropTarget *iface, IDataObject* pDataObject, + DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { - IShellViewImpl *This = impl_from_IDropTarget(iface); + IShellViewImpl *This = impl_from_IDropTarget(iface); - FIXME("Stub: This=%p\n",This); + IDropTarget_Drop(This->pCurDropTarget, pDataObject, grfKeyState, pt, pdwEffect); - return E_NOTIMPL; + IDropTarget_Release(This->pCurDropTarget); + IDataObject_Release(This->pCurDataObject); + This->pCurDataObject = NULL; + This->pCurDropTarget = NULL; + This->iDragOverItem = 0; + + return S_OK; } static const IDropTargetVtbl dtvt =

1 0

wine/dlls/wininet internet.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21471 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:03:34 Modified files: dlls/wininet : internet.c Log message: Robert Shearman <rob(a)codeweavers.com> Change some SendAsyncCallback calls to INTERNET_SendCallback as the tests show that the callbacks happen either synchronously or within an alternative asynchronous call. Remove a check for a NULL lpfnStatusCB that is already performed by INTERNET_SendCallback and add a comment about a difference to native. Patch: http://cvs.winehq.org/patch.py?id=21471 Old revision New revision Changes Path 1.145 1.146 +12 -10 wine/dlls/wininet/internet.c Index: wine/dlls/wininet/internet.c diff -u -p wine/dlls/wininet/internet.c:1.145 wine/dlls/wininet/internet.c:1.146 --- wine/dlls/wininet/internet.c:1.145 28 Nov 2005 11: 3:34 -0000 +++ wine/dlls/wininet/internet.c 28 Nov 2005 11: 3:34 -0000 @@ -951,7 +951,7 @@ BOOL WINAPI INTERNET_FindNextFileW(LPWIN lend: - if (lpwh->hdr.dwFlags & INTERNET_FLAG_ASYNC && lpwh->hdr.lpfnStatusCB) + if (lpwh->hdr.dwFlags & INTERNET_FLAG_ASYNC) { INTERNET_ASYNC_RESULT iar; @@ -959,9 +959,9 @@ lend: iar.dwError = iar.dwError = bSuccess ? ERROR_SUCCESS : INTERNET_GetLastError(); - SendAsyncCallback(&lpwh->hdr, lpwh->hdr.dwContext, - INTERNET_STATUS_REQUEST_COMPLETE, &iar, - sizeof(INTERNET_ASYNC_RESULT)); + INTERNET_SendCallback(&lpwh->hdr, lpwh->hdr.dwContext, + INTERNET_STATUS_REQUEST_COMPLETE, &iar, + sizeof(INTERNET_ASYNC_RESULT)); } return bSuccess; @@ -1015,9 +1015,11 @@ BOOL WINAPI InternetCloseHandle(HINTERNE return FALSE; } - SendAsyncCallback(lpwh, lpwh->dwContext, - INTERNET_STATUS_HANDLE_CLOSING, &hInternet, - sizeof(HINTERNET)); + /* FIXME: native appears to send this from the equivalent of + * WININET_Release */ + INTERNET_SendCallback(lpwh, lpwh->dwContext, + INTERNET_STATUS_HANDLE_CLOSING, &hInternet, + sizeof(HINTERNET)); if( lpwh->lpwhparent ) WININET_Release( lpwh->lpwhparent ); @@ -1753,9 +1755,9 @@ static BOOL INTERNET_ReadFile(LPWININETH iar.dwError = iar.dwError = retval ? ERROR_SUCCESS : INTERNET_GetLastError(); - SendAsyncCallback(lpwh, lpwh->dwContext, - INTERNET_STATUS_REQUEST_COMPLETE, &iar, - sizeof(INTERNET_ASYNC_RESULT)); + INTERNET_SendCallback(lpwh, lpwh->dwContext, + INTERNET_STATUS_REQUEST_COMPLETE, &iar, + sizeof(INTERNET_ASYNC_RESULT)); } return retval; }

1 0