November 2005 - Wine-commits

wine/dlls/rpcrt4 ndr_midl.c
by Alexandre Julliard 28 Nov '05

28 Nov '05

ChangeSet ID: 21490 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:06:21 Modified files: dlls/rpcrt4 : ndr_midl.c Log message: Robert Shearman <rob(a)codeweavers.com> Make sure to fill out the MIDL_STUB_MESSAGE structure in NdrSendReceive like we do in NdrProxySendReceive. Patch: http://cvs.winehq.org/patch.py?id=21490 Old revision New revision Changes Path 1.23 1.24 +5 -0 wine/dlls/rpcrt4/ndr_midl.c Index: wine/dlls/rpcrt4/ndr_midl.c diff -u -p wine/dlls/rpcrt4/ndr_midl.c:1.23 wine/dlls/rpcrt4/ndr_midl.c:1.24 --- wine/dlls/rpcrt4/ndr_midl.c:1.23 28 Nov 2005 11: 6:21 -0000 +++ wine/dlls/rpcrt4/ndr_midl.c 28 Nov 2005 11: 6:21 -0000 @@ -282,6 +282,11 @@ unsigned char *WINAPI NdrSendReceive( MI /* FIXME: raise exception? */ } + stubmsg->BufferLength = stubmsg->RpcMsg->BufferLength; + stubmsg->BufferStart = stubmsg->RpcMsg->Buffer; + stubmsg->BufferEnd = stubmsg->BufferStart + stubmsg->BufferLength; + stubmsg->Buffer = stubmsg->BufferStart; + /* FIXME: is this the right return value? */ return NULL; }

1 0

wine/dlls/rpcrt4 ndr_marshall.c
by Alexandre Julliard 28 Nov '05

28 Nov '05

ChangeSet ID: 21489 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:06:17 Modified files: dlls/rpcrt4 : ndr_marshall.c Log message: Robert Shearman <rob(a)codeweavers.com> Implement conformant varying array functions. Patch: http://cvs.winehq.org/patch.py?id=21489 Old revision New revision Changes Path 1.36 1.37 +72 -3 wine/dlls/rpcrt4/ndr_marshall.c Index: wine/dlls/rpcrt4/ndr_marshall.c diff -u -p wine/dlls/rpcrt4/ndr_marshall.c:1.36 wine/dlls/rpcrt4/ndr_marshall.c:1.37 --- wine/dlls/rpcrt4/ndr_marshall.c:1.36 28 Nov 2005 11: 6:17 -0000 +++ wine/dlls/rpcrt4/ndr_marshall.c 28 Nov 2005 11: 6:17 -0000 @@ -1956,7 +1956,35 @@ unsigned char* WINAPI NdrConformantVaryi unsigned char* pMemory, PFORMAT_STRING pFormat ) { - FIXME( "stub\n" ); + DWORD esize = *(const WORD*)(pFormat+2); + + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + + if (pFormat[0] != RPC_FC_CVARRAY) + { + ERR("invalid format type %x\n", pFormat[0]); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return NULL; + } + + pFormat = ComputeConformance(pStubMsg, pMemory, pFormat+4, 0); + pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, 0); + + NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->MaxCount); + pStubMsg->Buffer += 4; + NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->Offset); + pStubMsg->Buffer += 4; + NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->ActualCount); + pStubMsg->Buffer += 4; + + memcpy(pStubMsg->Buffer, pMemory + pStubMsg->Offset, pStubMsg->ActualCount*esize); + pStubMsg->BufferMark = pStubMsg->Buffer; + pStubMsg->Buffer += pStubMsg->ActualCount*esize; + + EmbeddedPointerMarshall(pStubMsg, pMemory, pFormat); + + STD_OVERFLOW_CHECK(pStubMsg); + return NULL; } @@ -1969,7 +1997,29 @@ unsigned char* WINAPI NdrConformantVaryi PFORMAT_STRING pFormat, unsigned char fMustAlloc ) { - FIXME( "stub\n" ); + DWORD offset; + DWORD esize = *(const WORD*)(pFormat+2); + + TRACE("(%p, %p, %p, %d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); + + if (pFormat[0] != RPC_FC_CVARRAY) + { + ERR("invalid format type %x\n", pFormat[0]); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return NULL; + } + pFormat = ReadConformance(pStubMsg, pFormat); + offset = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); + pStubMsg->Buffer += 4; + pFormat = ReadVariance(pStubMsg, pFormat); + + if (!*ppMemory || fMustAlloc) + *ppMemory = NdrAllocate(pStubMsg, pStubMsg->MaxCount * esize); + memcpy(*ppMemory + offset, pStubMsg->Buffer, pStubMsg->ActualCount * esize); + pStubMsg->Buffer += pStubMsg->ActualCount * esize; + + EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + return NULL; } @@ -1991,7 +2041,26 @@ void WINAPI NdrConformantVaryingArrayFre void WINAPI NdrConformantVaryingArrayBufferSize( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat ) { - FIXME( "stub\n" ); + DWORD esize = *(const WORD*)(pFormat+2); + + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + + if (pFormat[0] != RPC_FC_CVARRAY) + { + ERR("invalid format type %x\n", pFormat[0]); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return; + } + + /* compute size */ + pFormat = ComputeConformance(pStubMsg, pMemory, pFormat+4, 0); + /* compute length */ + pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, 0); + + /* conformance + offset + variance + array */ + pStubMsg->BufferLength += 3*sizeof(DWORD) + pStubMsg->ActualCount*esize; + + EmbeddedPointerBufferSize(pStubMsg, pMemory, pFormat); }

1 0

wine/dlls/rpcrt4 ndr_marshall.c
by Alexandre Julliard 28 Nov '05

28 Nov '05

ChangeSet ID: 21488 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:06:05 Modified files: dlls/rpcrt4 : ndr_marshall.c Log message: Robert Shearman <rob(a)codeweavers.com> Implement conformant struct functions. Patch: http://cvs.winehq.org/patch.py?id=21488 Old revision New revision Changes Path 1.35 1.36 +104 -3 wine/dlls/rpcrt4/ndr_marshall.c Index: wine/dlls/rpcrt4/ndr_marshall.c diff -u -p wine/dlls/rpcrt4/ndr_marshall.c:1.35 wine/dlls/rpcrt4/ndr_marshall.c:1.36 --- wine/dlls/rpcrt4/ndr_marshall.c:1.35 28 Nov 2005 11: 6: 5 -0000 +++ wine/dlls/rpcrt4/ndr_marshall.c 28 Nov 2005 11: 6: 5 -0000 @@ -2280,6 +2280,14 @@ void WINAPI NdrConvert2( PMIDL_STUB_MESS is to raise an exception */ } +typedef struct _NDR_CSTRUCT_FORMAT +{ + unsigned char type; + unsigned char alignment; + unsigned short memory_size; + short offset_to_array_description; +} NDR_CSTRUCT_FORMAT; + /*********************************************************************** * NdrConformantStructMarshall [RPCRT4.@] */ @@ -2287,7 +2295,32 @@ unsigned char * WINAPI NdrConformantStr unsigned char *pMemory, PFORMAT_STRING pFormat) { - FIXME("stub\n"); + const NDR_CSTRUCT_FORMAT * pCStructFormat = (NDR_CSTRUCT_FORMAT*)pFormat; + pFormat += sizeof(NDR_CSTRUCT_FORMAT); + + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + + if ((pCStructFormat->type != RPC_FC_CPSTRUCT) && (pCStructFormat->type != RPC_FC_CSTRUCT)) + { + ERR("invalid format type %x\n", pCStructFormat->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return NULL; + } + + TRACE("memory_size = %d\n", pCStructFormat->memory_size); + + /* copy constant sized part of struct */ + memcpy(pStubMsg->Buffer, pMemory, pCStructFormat->memory_size); + pStubMsg->Buffer += pCStructFormat->memory_size; + + if (pCStructFormat->offset_to_array_description) + { + PFORMAT_STRING pArrayFormat = (unsigned char*)&pCStructFormat->offset_to_array_description + + pCStructFormat->offset_to_array_description; + NdrConformantArrayMarshall(pStubMsg, pMemory + pCStructFormat->memory_size, pArrayFormat); + } + if (pCStructFormat->type == RPC_FC_CPSTRUCT) + EmbeddedPointerMarshall(pStubMsg, pMemory, pFormat); return NULL; } @@ -2299,7 +2332,52 @@ unsigned char * WINAPI NdrConformantStr PFORMAT_STRING pFormat, unsigned char fMustAlloc) { - FIXME("stub\n"); + const NDR_CSTRUCT_FORMAT * pCStructFormat = (NDR_CSTRUCT_FORMAT*)pFormat; + pFormat += sizeof(NDR_CSTRUCT_FORMAT); + + TRACE("(%p, %p, %p, %d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); + + if ((pCStructFormat->type != RPC_FC_CPSTRUCT) && (pCStructFormat->type != RPC_FC_CSTRUCT)) + { + ERR("invalid format type %x\n", pCStructFormat->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return NULL; + } + + TRACE("memory_size = %d\n", pCStructFormat->memory_size); + + /* work out how much memory to allocate if we need to do so */ + if (!*ppMemory || fMustAlloc) + { + SIZE_T size = pCStructFormat->memory_size; + + if (pCStructFormat->offset_to_array_description) + { + unsigned char *buffer; + PFORMAT_STRING pArrayFormat = (unsigned char*)&pCStructFormat->offset_to_array_description + + pCStructFormat->offset_to_array_description; + buffer = pStubMsg->Buffer; + pStubMsg->Buffer += pCStructFormat->memory_size; + size += NdrConformantArrayMemorySize(pStubMsg, pArrayFormat); + pStubMsg->Buffer = buffer; + } + *ppMemory = NdrAllocate(pStubMsg, size); + } + + /* now copy the data */ + memcpy(*ppMemory, pStubMsg->Buffer, pCStructFormat->memory_size); + pStubMsg->Buffer += pCStructFormat->memory_size; + if (pCStructFormat->offset_to_array_description) + { + PFORMAT_STRING pArrayFormat = (unsigned char*)&pCStructFormat->offset_to_array_description + + pCStructFormat->offset_to_array_description; + unsigned char *pMemoryArray = *ppMemory + pCStructFormat->memory_size; + /* note that we pass fMustAlloc as 0 as we have already allocated the + * memory */ + NdrConformantArrayUnmarshall(pStubMsg, &pMemoryArray, pArrayFormat, 0); + } + if (pCStructFormat->type == RPC_FC_CPSTRUCT) + EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); return NULL; } @@ -2310,7 +2388,30 @@ void WINAPI NdrConformantStructBufferSiz unsigned char *pMemory, PFORMAT_STRING pFormat) { - FIXME("stub\n"); + const NDR_CSTRUCT_FORMAT * pCStructFormat = (NDR_CSTRUCT_FORMAT*)pFormat; + pFormat += sizeof(NDR_CSTRUCT_FORMAT); + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + + if ((pCStructFormat->type != RPC_FC_CPSTRUCT) && (pCStructFormat->type != RPC_FC_CSTRUCT)) + { + ERR("invalid format type %x\n", pCStructFormat->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return; + } + + TRACE("memory_size = %d\n", pCStructFormat->memory_size); + + /* add constant sized part of struct to buffer size */ + pStubMsg->BufferLength += pCStructFormat->memory_size; + + if (pCStructFormat->offset_to_array_description) + { + PFORMAT_STRING pArrayFormat = (unsigned char*)&pCStructFormat->offset_to_array_description + + pCStructFormat->offset_to_array_description; + NdrConformantArrayBufferSize(pStubMsg, pMemory + pCStructFormat->memory_size, pArrayFormat); + } + if (pCStructFormat->type == RPC_FC_CPSTRUCT) + EmbeddedPointerBufferSize(pStubMsg, pMemory, pFormat); } /***********************************************************************

1 0

wine/dlls/rpcrt4 ndr_marshall.c
by Alexandre Julliard 28 Nov '05

28 Nov '05

ChangeSet ID: 21487 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:05:54 Modified files: dlls/rpcrt4 : ndr_marshall.c Log message: Robert Shearman <rob(a)codeweavers.com> Implement FC_STRUCTPAD2 for complex types. Patch: http://cvs.winehq.org/patch.py?id=21487 Old revision New revision Changes Path 1.34 1.35 +15 -0 wine/dlls/rpcrt4/ndr_marshall.c Index: wine/dlls/rpcrt4/ndr_marshall.c diff -u -p wine/dlls/rpcrt4/ndr_marshall.c:1.34 wine/dlls/rpcrt4/ndr_marshall.c:1.35 --- wine/dlls/rpcrt4/ndr_marshall.c:1.34 28 Nov 2005 11: 5:54 -0000 +++ wine/dlls/rpcrt4/ndr_marshall.c 28 Nov 2005 11: 5:54 -0000 @@ -1442,6 +1442,9 @@ unsigned char * WINAPI ComplexMarshall(P case RPC_FC_ALIGNM8: ALIGN_POINTER(pMemory, 7); break; + case RPC_FC_STRUCTPAD2: + pMemory += 2; + break; case RPC_FC_EMBEDDED_COMPLEX: pMemory += pFormat[1]; pFormat += 2; @@ -1505,6 +1508,9 @@ unsigned char * WINAPI ComplexUnmarshall case RPC_FC_ALIGNM8: ALIGN_POINTER(pMemory, 7); break; + case RPC_FC_STRUCTPAD2: + pMemory += 2; + break; case RPC_FC_EMBEDDED_COMPLEX: pMemory += pFormat[1]; pFormat += 2; @@ -1562,6 +1568,9 @@ unsigned char * WINAPI ComplexBufferSize case RPC_FC_ALIGNM8: ALIGN_POINTER(pMemory, 7); break; + case RPC_FC_STRUCTPAD2: + pMemory += 2; + break; case RPC_FC_EMBEDDED_COMPLEX: pMemory += pFormat[1]; pFormat += 2; @@ -1615,6 +1624,9 @@ unsigned char * WINAPI ComplexFree(PMIDL case RPC_FC_ALIGNM8: ALIGN_POINTER(pMemory, 7); break; + case RPC_FC_STRUCTPAD2: + pMemory += 2; + break; case RPC_FC_EMBEDDED_COMPLEX: pMemory += pFormat[1]; pFormat += 2; @@ -1662,6 +1674,9 @@ unsigned long WINAPI ComplexStructSize(P case RPC_FC_ALIGNM8: ALIGN_LENGTH(size, 7); break; + case RPC_FC_STRUCTPAD2: + size += 2; + break; case RPC_FC_EMBEDDED_COMPLEX: size += pFormat[1]; pFormat += 2;

1 0

wine/dlls/gdi gdi32.spec palette.c
by Alexandre Julliard 28 Nov '05

28 Nov '05

ChangeSet ID: 21486 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:05:44 Modified files: dlls/gdi : gdi32.spec palette.c Log message: Rein Klazes <wijn(a)wanadoo.nl> Add stub implementation for SetMagicColors(). Patch: http://cvs.winehq.org/patch.py?id=21486 Old revision New revision Changes Path 1.52 1.53 +1 -1 wine/dlls/gdi/gdi32.spec 1.10 1.11 +9 -0 wine/dlls/gdi/palette.c Index: wine/dlls/gdi/gdi32.spec diff -u -p wine/dlls/gdi/gdi32.spec:1.52 wine/dlls/gdi/gdi32.spec:1.53 --- wine/dlls/gdi/gdi32.spec:1.52 28 Nov 2005 11: 5:44 -0000 +++ wine/dlls/gdi/gdi32.spec 28 Nov 2005 11: 5:44 -0000 @@ -443,7 +443,7 @@ @ stdcall SetICMProfileW(long wstr) @ stdcall SetLayout(long long) # @ stub SetLayoutWidth -@ stub SetMagicColors +@ stdcall SetMagicColors(ptr long long) @ stdcall SetMapMode(long long) @ stdcall SetMapperFlags(long long) @ stdcall SetMetaFileBitsEx(long ptr) Index: wine/dlls/gdi/palette.c diff -u -p wine/dlls/gdi/palette.c:1.10 wine/dlls/gdi/palette.c:1.11 --- wine/dlls/gdi/palette.c:1.10 28 Nov 2005 11: 5:44 -0000 +++ wine/dlls/gdi/palette.c 28 Nov 2005 11: 5:44 -0000 @@ -908,6 +908,15 @@ VOID WINAPI SetMagicColors16(HDC16 hDC, } +/********************************************************************* + * SetMagicColors (GDI.@) + */ +BOOL WINAPI SetMagicColors(HDC hdc, ULONG u1, ULONG u2) +{ + FIXME("(%p 0x%08lx 0x%08lx): stub\n", hdc, u1, u2); + return TRUE; +} + /********************************************************************** * GetICMProfileA [GDI32.@] *

1 0

wine/dlls/atl atl.spec atl_main.c atlbase.h
by Alexandre Julliard 28 Nov '05

28 Nov '05

ChangeSet ID: 21485 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:05:37 Modified files: dlls/atl : atl.spec atl_main.c atlbase.h Log message: Jacek Caban <jacek(a)codeweavers.com> Added AtlAxCreateControl stub implementation. Patch: http://cvs.winehq.org/patch.py?id=21485 Old revision New revision Changes Path 1.12 1.13 +1 -1 wine/dlls/atl/atl.spec 1.16 1.17 +10 -0 wine/dlls/atl/atl_main.c 1.6 1.7 +1 -0 wine/dlls/atl/atlbase.h Index: wine/dlls/atl/atl.spec diff -u -p wine/dlls/atl/atl.spec:1.12 wine/dlls/atl/atl.spec:1.13 --- wine/dlls/atl/atl.spec:1.12 28 Nov 2005 11: 5:37 -0000 +++ wine/dlls/atl/atl.spec 28 Nov 2005 11: 5:37 -0000 @@ -30,7 +30,7 @@ 36 stub AtlAxDialogBoxA 37 stub AtlAxCreateDialogW 38 stub AtlAxCreateDialogA -39 stub AtlAxCreateControl +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) 40 stub AtlAxCreateControlEx 41 stub AtlAxAttachControl 42 stdcall AtlAxWinInit() Index: wine/dlls/atl/atl_main.c diff -u -p wine/dlls/atl/atl_main.c:1.16 wine/dlls/atl/atl_main.c:1.17 --- wine/dlls/atl/atl_main.c:1.16 28 Nov 2005 11: 5:37 -0000 +++ wine/dlls/atl/atl_main.c 28 Nov 2005 11: 5:37 -0000 @@ -314,3 +314,13 @@ HRESULT WINAPI AtlModuleUnregisterServer FIXME("%p %s\n", pm, debugstr_guid(clsid)); return E_FAIL; } + +/*********************************************************************** + * AtlAxCreateControl [ATL.@] + */ +HRESULT WINAPI AtlAxCreateControl(LPCOLESTR lpszName, HWND hWnd, + IStream *pStream, IUnknown **ppUnkContainer) +{ + FIXME("%s %p %p %p)\n", debugstr_w(lpszName), hWnd, pStream, ppUnkContainer); + return E_NOTIMPL; +} Index: wine/dlls/atl/atlbase.h diff -u -p wine/dlls/atl/atlbase.h:1.6 wine/dlls/atl/atlbase.h:1.7 --- wine/dlls/atl/atlbase.h:1.6 28 Nov 2005 11: 5:37 -0000 +++ wine/dlls/atl/atlbase.h 28 Nov 2005 11: 5:37 -0000 @@ -142,6 +142,7 @@ struct _ATL_REGMAP_ENTRY }; HRESULT WINAPI AtlAdvise(IUnknown *pUnkCP, IUnknown *pUnk, const IID * iid, LPDWORD dpw); +HRESULT WINAPI AtlAxCreateControl(LPCOLESTR,HWND,IStream*,IUnknown**); HRESULT WINAPI AtlFreeMarshalStream(IStream *pStream); HRESULT WINAPI AtlInternalQueryInterface(LPVOID pThis, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, LPVOID* ppvObject); HRESULT WINAPI AtlMarshalPtrInProc(IUnknown *pUnk, const IID *iid, IStream **ppStream);

1 0

wine/dlls/wininet http.c
by Alexandre Julliard 28 Nov '05

28 Nov '05

ChangeSet ID: 21484 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:05:32 Modified files: dlls/wininet : http.c Log message: Robert Shearman <rob(a)codeweavers.com> Replace some useless checks in HTTP_AddProxyInfo with asserts. Patch: http://cvs.winehq.org/patch.py?id=21484 Old revision New revision Changes Path 1.118 1.119 +2 -10 wine/dlls/wininet/http.c Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.118 wine/dlls/wininet/http.c:1.119 --- wine/dlls/wininet/http.c:1.118 28 Nov 2005 11: 5:32 -0000 +++ wine/dlls/wininet/http.c 28 Nov 2005 11: 5:32 -0000 @@ -363,18 +363,10 @@ static void HTTP_AddProxyInfo( LPWININET LPWININETAPPINFOW hIC = NULL; lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent; - if (NULL == lpwhs || lpwhs->hdr.htype != WH_HHTTPSESSION) - { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - return; - } + assert(lpwhs->hdr.htype == WH_HHTTPSESSION); hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent; - if (NULL == hIC || hIC->hdr.htype != WH_HINIT) - { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - return; - } + assert(hIC->hdr.htype == WH_HINIT); if (hIC && (hIC->lpszProxyUsername || hIC->lpszProxyPassword )) HTTP_InsertProxyAuthorization(lpwhr, hIC->lpszProxyUsername,

1 0

wine/dlls/shdocvw client.c shdocvw.h webbrowser.c
by Alexandre Julliard 28 Nov '05

28 Nov '05

ChangeSet ID: 21483 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:05:19 Modified files: dlls/shdocvw : client.c shdocvw.h webbrowser.c Log message: Jacek Caban <jacek(a)codeweavers.com> Added IOleDocumentSite implementation. Patch: http://cvs.winehq.org/patch.py?id=21483 Old revision New revision Changes Path 1.5 1.6 +64 -0 wine/dlls/shdocvw/client.c 1.34 1.35 +4 -0 wine/dlls/shdocvw/shdocvw.h 1.28 1.29 +1 -0 wine/dlls/shdocvw/webbrowser.c Index: wine/dlls/shdocvw/client.c diff -u -p wine/dlls/shdocvw/client.c:1.5 wine/dlls/shdocvw/client.c:1.6 --- wine/dlls/shdocvw/client.c:1.5 28 Nov 2005 11: 5:19 -0000 +++ wine/dlls/shdocvw/client.c 28 Nov 2005 11: 5:19 -0000 @@ -272,8 +272,72 @@ static const IOleInPlaceSiteVtbl OleInPl InPlaceSite_OnPosRectChange }; +#define DOCSITE_THIS(iface) DEFINE_THIS(WebBrowser, OleDocumentSite, iface) + +static HRESULT WINAPI OleDocumentSite_QueryInterface(IOleDocumentSite *iface, + REFIID riid, void **ppv) +{ + WebBrowser *This = DOCSITE_THIS(iface); + return IOleClientSite_QueryInterface(CLIENTSITE(This), riid, ppv); +} + +static ULONG WINAPI OleDocumentSite_AddRef(IOleDocumentSite *iface) +{ + WebBrowser *This = DOCSITE_THIS(iface); + return IOleClientSite_AddRef(CLIENTSITE(This)); +} + +static ULONG WINAPI OleDocumentSite_Release(IOleDocumentSite *iface) +{ + WebBrowser *This = DOCSITE_THIS(iface); + return IOleClientSite_Release(CLIENTSITE(This)); +} + +static HRESULT WINAPI OleDocumentSite_ActivateMe(IOleDocumentSite *iface, + IOleDocumentView *pViewToActivate) +{ + WebBrowser *This = DOCSITE_THIS(iface); + IOleDocument *oledoc; + RECT rect; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, pViewToActivate); + + hres = IUnknown_QueryInterface(This->document, &IID_IOleDocument, (void**)&oledoc); + if(FAILED(hres)) + return hres; + + IOleDocument_CreateView(oledoc, INPLACESITE(This), NULL, 0, &This->view); + IOleDocument_Release(oledoc); + + GetClientRect(This->doc_view_hwnd, &rect); + IOleDocumentView_SetRect(This->view, &rect); + + hres = IOleDocumentView_Show(This->view, TRUE); + + return hres; +} + +#undef DOCSITE_THIS + +static const IOleDocumentSiteVtbl OleDocumentSiteVtbl = { + OleDocumentSite_QueryInterface, + OleDocumentSite_AddRef, + OleDocumentSite_Release, + OleDocumentSite_ActivateMe +}; + void WebBrowser_ClientSite_Init(WebBrowser *This) { This->lpOleClientSiteVtbl = &OleClientSiteVtbl; This->lpOleInPlaceSiteVtbl = &OleInPlaceSiteVtbl; + This->lpOleDocumentSiteVtbl = &OleDocumentSiteVtbl; + + This->view = NULL; +} + +void WebBrowser_ClientSite_Destroy(WebBrowser *This) +{ + if(This->view) + IOleDocumentView_Release(This->view); } Index: wine/dlls/shdocvw/shdocvw.h diff -u -p wine/dlls/shdocvw/shdocvw.h:1.34 wine/dlls/shdocvw/shdocvw.h:1.35 --- wine/dlls/shdocvw/shdocvw.h:1.34 28 Nov 2005 11: 5:19 -0000 +++ wine/dlls/shdocvw/shdocvw.h 28 Nov 2005 11: 5:19 -0000 @@ -77,6 +77,7 @@ typedef struct { const IOleClientSiteVtbl *lpOleClientSiteVtbl; const IOleInPlaceSiteVtbl *lpOleInPlaceSiteVtbl; const IDocHostUIHandler2Vtbl *lpDocHostUIHandlerVtbl; + const IOleDocumentSiteVtbl *lpOleDocumentSiteVtbl; /* Interfaces of InPlaceFrame object */ @@ -88,6 +89,7 @@ typedef struct { IOleClientSite *client; IOleContainer *container; + IOleDocumentView *view; /* window context */ @@ -126,6 +128,7 @@ typedef struct { #define INPLACESITE(x) ((IOleInPlaceSite*) &(x)->lpOleInPlaceSiteVtbl) #define DOCHOSTUI(x) ((IDocHostUIHandler*) &(x)->lpDocHostUIHandlerVtbl) #define DOCHOSTUI2(x) ((IDocHostUIHandler2*) &(x)->lpDocHostUIHandlerVtbl) +#define DOCSITE(x) ((IOleDocumentSite*) &(x)->lpOleDocumentSiteVtbl) #define INPLACEFRAME(x) ((IOleInPlaceFrame*) &(x)->lpOleInPlaceFrameVtbl) @@ -143,6 +146,7 @@ void WebBrowser_Frame_Init(WebBrowser*); void WebBrowser_OleObject_Destroy(WebBrowser*); void WebBrowser_Events_Destroy(WebBrowser*); +void WebBrowser_ClientSite_Destroy(WebBrowser*); HRESULT WebBrowser_Create(IUnknown*,REFIID,void**); Index: wine/dlls/shdocvw/webbrowser.c diff -u -p wine/dlls/shdocvw/webbrowser.c:1.28 wine/dlls/shdocvw/webbrowser.c:1.29 --- wine/dlls/shdocvw/webbrowser.c:1.28 28 Nov 2005 11: 5:19 -0000 +++ wine/dlls/shdocvw/webbrowser.c 28 Nov 2005 11: 5:19 -0000 @@ -126,6 +126,7 @@ static ULONG WINAPI WebBrowser_Release(I WebBrowser_OleObject_Destroy(This); WebBrowser_Events_Destroy(This); + WebBrowser_ClientSite_Destroy(This); HeapFree(GetProcessHeap(), 0, This); SHDOCVW_UnlockModule();

1 0

wine/dlls/wininet http.c
by Alexandre Julliard 28 Nov '05

28 Nov '05

ChangeSet ID: 21482 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:05:11 Modified files: dlls/wininet : http.c Log message: Robert Shearman <rob(a)codeweavers.com> Simplify and fix Set-Cookie handling. Patch: http://cvs.winehq.org/patch.py?id=21482 Old revision New revision Changes Path 1.117 1.118 +2 -7 wine/dlls/wininet/http.c Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.117 wine/dlls/wininet/http.c:1.118 --- wine/dlls/wininet/http.c:1.117 28 Nov 2005 11: 5:11 -0000 +++ wine/dlls/wininet/http.c 28 Nov 2005 11: 5:11 -0000 @@ -285,18 +285,13 @@ static LPWSTR HTTP_BuildHeaderRequestStr static void HTTP_ProcessHeaders( LPWININETHTTPREQW lpwhr ) { - int CustHeaderIndex; - static const WCHAR szSetCookie[] = {'S','e','t','-','C','o','o','k','i','e',0 }; + LPHTTPHEADERW setCookieHeader = &lpwhr->StdHeaders[HTTP_QUERY_SET_COOKIE]; - CustHeaderIndex = HTTP_GetCustomHeaderIndex(lpwhr, szSetCookie); - if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_COOKIES) && (CustHeaderIndex >= 0)) + if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_COOKIES) && setCookieHeader->lpszValue) { - LPHTTPHEADERW setCookieHeader; int nPosStart = 0, nPosEnd = 0, len; static const WCHAR szFmt[] = { 'h','t','t','p',':','/','/','%','s','/',0}; - setCookieHeader = &lpwhr->pCustHeaders[CustHeaderIndex]; - while (setCookieHeader->lpszValue[nPosEnd] != '\0') { LPWSTR buf_cookie, cookie_name, cookie_data;

1 0

wine/dlls/ole32 defaulthandler.c
by Alexandre Julliard 28 Nov '05

28 Nov '05

ChangeSet ID: 21481 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:05:00 Modified files: dlls/ole32 : defaulthandler.c Log message: Robert Shearman <rob(a)codeweavers.com> Implement IOleObject_DoVerb function by running the object and then delegating to the remote IOleObject_DoVerb function. Patch: http://cvs.winehq.org/patch.py?id=21481 Old revision New revision Changes Path 1.38 1.39 +11 -2 wine/dlls/ole32/defaulthandler.c Index: wine/dlls/ole32/defaulthandler.c diff -u -p wine/dlls/ole32/defaulthandler.c:1.38 wine/dlls/ole32/defaulthandler.c:1.39 --- wine/dlls/ole32/defaulthandler.c:1.38 28 Nov 2005 11: 5: 0 -0000 +++ wine/dlls/ole32/defaulthandler.c 28 Nov 2005 11: 5: 0 -0000 @@ -575,8 +575,17 @@ static HRESULT WINAPI DefaultHandler_DoV HWND hwndParent, LPCRECT lprcPosRect) { - FIXME(": Stub\n"); - return E_NOTIMPL; + DefaultHandler *This = impl_from_IOleObject(iface); + IRunnableObject *pRunnableObj = (IRunnableObject *)&This->lpvtblIRunnableObject; + HRESULT hr; + + TRACE("(%ld, %p, %p, %ld, %p, %s)\n", iVerb, lpmsg, pActiveSite, lindex, hwndParent, wine_dbgstr_rect(lprcPosRect)); + + hr = IRunnableObject_Run(pRunnableObj, NULL); + if (FAILED(hr)) return hr; + + return IOleObject_DoVerb(This->pOleDelegate, iVerb, lpmsg, pActiveSite, + lindex, hwndParent, lprcPosRect); } /************************************************************************

1 0